From fe0ba18faafd329ab927e00cbbeee3f91df52c39 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Thu, 28 May 2026 06:48:51 -0700
Subject: [PATCH] release: archivebox 0.9.33rc16

---
 bin/fuzz_test.sh | 42 ++++++++----------------------------------
 etc/package.json |  2 +-
 pyproject.toml   |  8 ++++----
 3 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/bin/fuzz_test.sh b/bin/fuzz_test.sh
index c508ac47..f09b4951 100755
--- a/bin/fuzz_test.sh
+++ b/bin/fuzz_test.sh
@@ -73,31 +73,15 @@ random_start_delay() {
     random_between 0 "$SLEEP_BETWEEN_JOBS_MAX"
 }
 
-tree_pids() {
+kill_tree() {
     local pid="$1"
     local child
     if command -v pgrep >/dev/null 2>&1; then
         for child in $(pgrep -P "$pid" 2>/dev/null || true); do
-            tree_pids "$child"
-        done
-    fi
-    echo "$pid"
-}
-
-kill_tree() {
-    local pid="$1"
-    local signal="${2:-TERM}"
-    local tree_file="${3:-}"
-    if [[ -n "$tree_file" ]]; then
-        tree_pids "$pid" >> "$tree_file"
-        sort -u "$tree_file" | while IFS= read -r tree_pid; do
-            kill "-$signal" "$tree_pid" >/dev/null 2>&1 || true
-        done
-    else
-        tree_pids "$pid" | while IFS= read -r tree_pid; do
-            kill "-$signal" "$tree_pid" >/dev/null 2>&1 || true
+            kill_tree "$child"
         done
     fi
+    kill "$pid" >/dev/null 2>&1 || true
 }
 
 cleanup() {
@@ -118,13 +102,11 @@ run_with_timeout() {
     local label="$1"
     shift 1
 
-    local slug token timeout timeout_marker tree_file
+    local slug token timeout
     timeout="$(random_kill_after)"
     slug="$(echo "$label" | tr ' /:' '____' | tr -cd '[:alnum:]_.-')"
     token="$(date +%s).$RANDOM.$RANDOM"
     local logfile="$LOG_DIR/${slug}.${token}.log"
-    timeout_marker="$LOG_DIR/.timeout.${token}"
-    tree_file="$LOG_DIR/.tree.${token}"
 
     {
         echo "[$(ts)] START label=$label shell=$$ data=$DATA_DIR"
@@ -141,11 +123,9 @@ run_with_timeout() {
         sleep "$timeout"
         if kill -0 "$child" >/dev/null 2>&1; then
             echo "[$(ts)] TIMEOUT label=$label pid=$child after=${timeout}s" >> "$logfile"
-            : > "$timeout_marker"
-            : > "$tree_file"
-            kill_tree "$child" TERM "$tree_file"
+            kill "$child" >/dev/null 2>&1 || true
             sleep 5
-            kill_tree "$child" KILL "$tree_file"
+            kill -9 "$child" >/dev/null 2>&1 || true
         fi
     ) &
     local watchdog=$!
@@ -154,14 +134,8 @@ run_with_timeout() {
 
     wait "$child"
     local code=$?
-    if [[ -e "$timeout_marker" ]]; then
-        wait "$watchdog" >/dev/null 2>&1 || true
-    else
-        kill "$watchdog" >/dev/null 2>&1 || true
-    fi
+    kill "$watchdog" >/dev/null 2>&1 || true
     wait "$watchdog" >/dev/null 2>&1 || true
-    kill_tree "$child"
-    rm -f "$timeout_marker" "$tree_file"
     trap - INT TERM
 
     echo "[$(ts)] END label=$label pid=$child exit=$code log=$logfile" | tee -a "$logfile"
@@ -196,7 +170,7 @@ run_server_for_a_bit() {
     echo "[$(ts)] STOP label=$label pid=$child after=${hold}s" | tee -a "$logfile"
     kill_tree "$child"
     sleep 5
-    kill_tree "$child" KILL
+    kill -9 "$child" >/dev/null 2>&1 || true
     wait "$child" >/dev/null 2>&1
     local code=$?
     trap - INT TERM
diff --git a/etc/package.json b/etc/package.json
index 9a193383..981767f0 100644
--- a/etc/package.json
+++ b/etc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "archivebox",
-  "version": "0.9.33rc15",
+  "version": "0.9.33rc16",
   "repository": "github:ArchiveBox/ArchiveBox",
   "license": "MIT",
   "dependencies": {
diff --git a/pyproject.toml b/pyproject.toml
index 17296f07..8ca7aa52 100755
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "archivebox"
-version = "0.9.33rc15"
+version = "0.9.33rc16"
 requires-python = ">=3.13"
 description = "Self-hosted internet archiving solution."
 authors = [{name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"}]
@@ -79,9 +79,9 @@ dependencies = [
     ### Extractor dependencies (optional binaries detected at runtime via shutil.which)
     ### Binary/Package Management
     "abxbus==2.5.7",          # EventBus API
-    "abxpkg>=1.11.39",        # for: detecting, versioning, and installing binaries via apt/brew/pip/npm
-    "abx-plugins>=1.11.45",  # shared ArchiveBox plugin package with Chrome/Puppeteer dependency wiring
-    "abx-dl>=1.11.45",       # shared ArchiveBox downloader package with blocking install preflight
+    "abxpkg>=1.11.40",        # for: detecting, versioning, and installing binaries via apt/brew/pip/npm
+    "abx-plugins>=1.11.46",  # shared ArchiveBox plugin package with Chrome/Puppeteer dependency wiring
+    "abx-dl>=1.11.46",       # shared ArchiveBox downloader package with blocking install preflight
     ### UUID7 backport for Python <3.14
     "uuid7>=0.1.0; python_version < '3.14'",  # provides the uuid_extensions module on Python 3.13
 ]