@evanp/activitypub-bot 0.32.1 → 0.32.2

package/lib/activitypubclient.js

@@ -108,7 +108,11 @@ export class ActivityPubClient {
     if (res.status < 200 || res.status > 299) {
       const body = await res.text()
       this.#logger.warn({ status: res.status, body, url }, 'Could not fetch url')
-      throw createHttpError(res.status, `Could not fetch ${url}`)
+      throw createHttpError(
+        res.status,
+        `Could not fetch ${url}`,
+        { headers: res.headers }
+      )
     }
     const contentType = res.headers.get('content-type')
     const mimeType = contentType?.split(';')[0].trim()
@@ -172,7 +176,11 @@ export class ActivityPubClient {
     await this.#limiter.update(hostname, res.headers)
     this.#logger.debug(`Done fetching POST for ${url}`)
     if (res.status < 200 || res.status > 299) {
-      throw createHttpError(res.status, await res.text())
+      throw createHttpError(
+        res.status,
+        await res.text(),
+        { headers: res.headers }
+      )
     }
   }
 

package/lib/distributionworker.js

@@ -58,7 +58,28 @@ export class DistributionWorker {
               { error, activity: activity.id, inbox },
               'Could not deliver activity due to client error'
             )
-            await this.#jobQueue.fail(jobId, this.#workerId)
+            if (error.status === 429) {
+              this.#logger.debug(
+                { error, activity: activity.id, inbox },
+                'Retrying on 429 status'
+              )
+              let delay
+              if (error.headers && error.headers['retry-after']) {
+                this.#logger.debug('using retry-after header')
+                const retryAfter = error.headers['retry-after']
+                if (/^\d+$/.test(retryAfter)) {
+                  delay = parseInt(retryAfter, 10) * 1000
+                } else {
+                  delay = new Date(retryAfter) - Date.now()
+                }
+              } else {
+                this.#logger.debug('exponential backoff')
+                delay = Math.round((2 ** (attempts - 1) * 1000) * (0.5 + Math.random()))
+              }
+              await this.#jobQueue.retryAfter(jobId, this.#workerId, delay)
+            } else {
+              await this.#jobQueue.fail(jobId, this.#workerId)
+            }
           } else if (error.status >= 500 && error.status < 600) {
             if (attempts >= DistributionWorker.#MAX_ATTEMPTS) {
               this.#logger.warn(
@@ -74,6 +95,12 @@ export class DistributionWorker {
               )
               await this.#jobQueue.retryAfter(jobId, this.#workerId, delay)
             }
+          } else {
+            this.#logger.warn(
+              { error, activity: activity.id, inbox },
+              'Could not deliver activity due to unexpected status range'
+            )
+            await this.#jobQueue.fail(jobId, this.#workerId)
           }
         }
       } catch (err) {
@@ -83,7 +110,12 @@ export class DistributionWorker {
         }
         this.#logger.warn({ err, jobId }, 'Error delivering to bot')
         if (jobId) {
-          await this.#jobQueue.release(jobId, this.#workerId)
+          const delay = Math.round((2 ** ((attempts ?? 1) - 1) * 1000) * (0.5 + Math.random()))
+          this.#logger.warn(
+            { err, jobId, attempts, delay },
+            'Retrying job after a delay'
+          )
+          await this.#jobQueue.retryAfter(jobId, this.#workerId, delay)
         }
       }
     }

package/package.json

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