@evanp/activitypub-bot 0.45.8 → 0.45.9

package/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.45.9] - 2026-04-29
+
+### Fixed
+
+- Don't infinitely retry on 429 status code.
+
 ## [0.45.8] - 2026-04-29
 
 ### Added

package/lib/distributionworker.js

@@ -44,13 +44,21 @@ export class DistributionWorker extends Worker {
           'Could not deliver activity due to client error'
         )
         if ([408, 425, 429].includes(err.status)) {
-          this._logger.debug(
-            { err, activity: activity.id, inbox },
-            'Retrying on recoverable status'
-          )
-          const recoverable = new RecoverableError(err.message)
-          recoverable.delay = this.#retryDelay(err.headers, attempts)
-          throw recoverable
+          if (attempts >= DistributionWorker.#MAX_ATTEMPTS) {
+            this._logger.warn(
+              { err, activity: activity.id, inbox, attempts },
+              'Could not deliver activity due to client error; no more attempts'
+            )
+            throw err
+          } else {
+            this._logger.debug(
+              { err, activity: activity.id, inbox },
+              'Retrying on recoverable status'
+            )
+            const recoverable = new RecoverableError(err.message)
+            recoverable.delay = this.#retryDelay(err.headers, attempts)
+            throw recoverable
+          }
         } else {
           throw err
         }
@@ -87,6 +95,12 @@ export class DistributionWorker extends Worker {
   }
 
   #retryDelay (headers, attempts) {
+    const headerDelay = this.#headerDelay(headers)
+    const attemptsDelay = this.#attemptsDelay(attempts)
+    return Math.max(headerDelay, attemptsDelay)
+  }
+
+  #headerDelay (headers) {
     if (headers?.['retry-after']) {
       this._logger.debug('using retry-after header')
       const retryAfter = headers['retry-after']
@@ -96,7 +110,10 @@ export class DistributionWorker extends Worker {
         return new Date(retryAfter) - Date.now()
       }
     }
-    this._logger.debug('exponential backoff')
+    return 0
+  }
+
+  #attemptsDelay (attempts) {
     return Math.round((2 ** (attempts - 1) * 1000) * (0.5 + Math.random()))
   }
 }

package/package.json

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