@evanp/activitypub-bot 0.45.2 → 0.45.4

package/CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.45.4] - 2026-04-26
+
+### Fixed
+
+- Retry throttled deliveries
+
+## [0.45.3] - 2026-04-24
+
+### Fixed
+
+- Correct summary for Announce activities
+
 ## [0.45.2] - 2026-04-24
 
 ### Fixed

package/lib/botcontext.js

@@ -10,6 +10,8 @@ const AS2_TYPES = [
   'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
 ]
 
+const AS2_NS = 'https://www.w3.org/ns/activitystreams#'
+
 const WF_NS = 'https://purl.archive.org/socialweb/webfinger#'
 
 const THREAD_PROP = 'https://purl.archive.org/socialweb/thread#thread'
@@ -558,7 +560,13 @@ export class BotContext {
     } else if (obj.summary) {
       return obj.summary.get()
     } else if (obj.type) {
-      return `a(n) ${obj.type.first}`
+      const type = (Array.isArray(obj.type))
+        ? obj.type[0]
+        : obj.type
+      const shortType = (type.startsWith(AS2_NS))
+        ? type.slice(AS2_NS.length)
+        : type
+      return `a(n) ${shortType}`
     } else {
       return 'an object'
     }

package/lib/distributionworker.js

@@ -2,6 +2,7 @@ import assert from 'node:assert'
 
 import as2 from './activitystreams.js'
 import { Worker, RecoverableError } from './worker.js'
+import { ThrottleError } from './requestthrottler.js'
 
 export class DistributionWorker extends Worker {
   static #MAX_ATTEMPTS = 21 // ~24 days
@@ -21,6 +22,12 @@ export class DistributionWorker extends Worker {
       this._logger.info({ activity: activity.id, inbox }, 'Delivered activity')
     } catch (err) {
       if (!err.status) {
+        if (err instanceof ThrottleError) {
+          this._logger.warn(
+            { err, activity: activity.id, inbox },
+            'Throttled delivery, waiting to retry')
+          throw new RecoverableError(err.message, err.waitTime)
+        }
         this._logger.warn(
           { err, activity: activity.id, inbox },
           'Could not deliver activity and no HTTP status available')

package/lib/requestthrottler.js

@@ -3,6 +3,14 @@ import assert from 'node:assert'
 
 const BETA = 0.75
 
+export class ThrottleError extends Error {
+  constructor (message, waitTime) {
+    super(message)
+    this.name = this.constructor.name
+    this.waitTime = waitTime
+  }
+}
+
 export class RequestThrottler {
   #connection
   #logger
@@ -19,7 +27,10 @@ export class RequestThrottler {
     assert.strictEqual(typeof maxWaitTime, 'number')
     const waitTime = await this.#getWaitTime(host, maxWaitTime)
     if (waitTime > maxWaitTime) {
-      throw new Error(`Wait time is too long; ${waitTime} > ${maxWaitTime}`)
+      throw new ThrottleError(
+        `Wait time is too long; ${waitTime} > ${maxWaitTime}`,
+        waitTime
+      )
     }
     if (waitTime > 0) {
       await this.#decrement(host)

package/lib/worker.js

@@ -2,7 +2,12 @@ import assert from 'node:assert'
 import { nanoid } from 'nanoid'
 
 export class RecoverableError extends Error {
-  delay = 1000
+  delay
+  constructor (message, delay = 1000) {
+    super(message)
+    this.name = this.constructor.name
+    this.delay = delay
+  }
 }
 
 export class Worker {

package/package.json

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