@evanp/activitypub-bot 0.32.1 → 0.32.3

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,22 +58,43 @@ export class DistributionWorker {
               { error, activity: activity.id, inbox },
               'Could not deliver activity due to client error'
             )
-            await this.#jobQueue.fail(jobId, this.#workerId)
+            if ([408, 425, 429].includes(error.status)) {
+              this.#logger.debug(
+                { error, activity: activity.id, inbox },
+                'Retrying on recoverable status'
+              )
+              const delay = this.#retryDelay(error.headers, attempts)
+              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) {
+            if ([501, 505, 508, 510].includes(error.status)) {
+              this.#logger.warn(
+                { error, activity: activity.id, inbox, attempts },
+                'Could not deliver activity due to unrecoverable server error'
+              )
+              await this.#jobQueue.fail(jobId, this.#workerId)
+            } else if (attempts >= DistributionWorker.#MAX_ATTEMPTS) {
               this.#logger.warn(
                 { error, activity: activity.id, inbox, attempts },
                 'Could not deliver activity due to server error; no more attempts'
               )
               await this.#jobQueue.fail(jobId, this.#workerId)
             } else {
-              const delay = Math.round((2 ** (attempts - 1) * 1000) * (0.5 + Math.random()))
+              const delay = this.#retryDelay(error.headers, attempts)
               this.#logger.warn(
                 { error, activity: activity.id, inbox, attempts, delay },
                 'Could not deliver activity due to server error; will retry'
               )
               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,12 +104,31 @@ export class DistributionWorker {
         }
         this.#logger.warn({ err, jobId }, 'Error delivering to bot')
         if (jobId) {
-          await this.#jobQueue.release(jobId, this.#workerId)
+          const delay = this.#retryDelay(null, attempts ?? 1)
+          this.#logger.warn(
+            { err, jobId, attempts, delay },
+            'Retrying job after a delay'
+          )
+          await this.#jobQueue.retryAfter(jobId, this.#workerId, delay)
         }
       }
     }
   }
 
+  #retryDelay (headers, attempts) {
+    if (headers?.['retry-after']) {
+      this.#logger.debug('using retry-after header')
+      const retryAfter = headers['retry-after']
+      if (/^\d+$/.test(retryAfter)) {
+        return parseInt(retryAfter, 10) * 1000
+      } else {
+        return new Date(retryAfter) - Date.now()
+      }
+    }
+    this.#logger.debug('exponential backoff')
+    return Math.round((2 ** (attempts - 1) * 1000) * (0.5 + Math.random()))
+  }
+
   stop () {
     this.#running = false
   }

package/package.json

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