@evanp/activitypub-bot 0.45.14 → 0.45.15

package/CHANGELOG.md

@@ -9,6 +9,17 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.45.15] - 2026-05-11
+
+### Fixed
+
+- Heuristic to check if an integer in X-RateLimit-Reset is probably an offset or
+  probably a Unix epoch in seconds. Anything less than 30 days is treated as an
+  offset; otherwise it's an epoch.
+- Fix job queue to clamp job retry delays between 0 and 30 days.
+- Fix workers to continue operating even if retry or fail calls
+  fail.
+
 ## [0.45.14] - 2026-05-10
 
 ### Changed

package/lib/jobqueue.js

@@ -6,6 +6,7 @@ import { QueryTypes } from 'sequelize'
 
 const MAX_DELAY = 30000
 const DEFAULT_PRIORITY = 1000000
+const MAX_RETRY = 30 * 24 * 60 * 60 * 1000
 
 export class JobQueue {
   #connection
@@ -94,7 +95,11 @@ export class JobQueue {
     assert.strictEqual(typeof jobRunnerId, 'string')
     assert.strictEqual(typeof delay, 'number')
 
-    const retryAfter = new Date(Date.now() + delay)
+    const retryAfter = (isNaN(delay))
+      ? new Date(Date.now() + 1000)
+      : (!isFinite(delay))
+          ? new Date(Date.now() + MAX_RETRY)
+          : new Date(Date.now() + Math.max(0, Math.min(delay, MAX_RETRY)))
 
     await this.#connection.query(`
       UPDATE job

package/lib/requestthrottler.js

@@ -2,6 +2,7 @@ import { setTimeout as sleep } from 'node:timers/promises'
 import assert from 'node:assert'
 
 const BETA = 0.75
+const EPOCH_THRESHOLD = 30 * 24 * 60 * 60
 
 export class ThrottleError extends Error {
   constructor (message, waitTime) {
@@ -51,7 +52,11 @@ export class RequestThrottler {
       let reset
       if (resetHeader.match(/^\d+$/)) {
         resetSeconds = parseInt(resetHeader)
-        reset = new Date(Date.now() + (resetSeconds * 1000))
+        if (resetSeconds < EPOCH_THRESHOLD) {
+          reset = new Date(Date.now() + (resetSeconds * 1000))
+        } else {
+          reset = new Date(resetSeconds * 1000)
+        }
       } else {
         reset = new Date(resetHeader)
         resetSeconds = reset - Date.now()

package/lib/worker.js

@@ -68,10 +68,17 @@ export class Worker {
         await this.doJob(payload, attempts)
         await this.#jobQueue.complete(jobId, this.#workerId)
       } catch (err) {
-        if (err instanceof RecoverableError) {
-          await this.#jobQueue.retryAfter(jobId, this.#workerId, err.delay, err.stack)
-        } else {
-          await this.#jobQueue.fail(jobId, this.#workerId, err.stack)
+        try {
+          if (err instanceof RecoverableError) {
+            await this.#jobQueue.retryAfter(jobId, this.#workerId, err.delay, err.stack)
+          } else {
+            await this.#jobQueue.fail(jobId, this.#workerId, err.stack)
+          }
+        } catch (queueError) {
+          this.#logger.error(
+            { err: queueError, original: err, jobId, workerId: this.#workerId },
+            'job retry/fail error'
+          )
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.45.14",
+  "version": "0.45.15",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",