@evanp/activitypub-bot 0.45.12 → 0.45.14

package/CHANGELOG.md

@@ -9,6 +9,21 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.45.14] - 2026-05-10
+
+### Changed
+
+- Depend on inbox forwarding for distribution to remote collections.
+- More robust handling of client request failures in delivery and distribution.
+- More robust handling of intake, fanout throttle errors.
+- Store error stack for failing jobs in queue job entries.
+
+## [0.45.13] - 2026-05-10
+
+### Changed
+
+- Replace in-memory ObjectCache with persistent and shared RemoteObjectCache.
+
 ## [0.45.12] - 2026-05-09
 
 ### Changed

package/lib/activitydeliverer.js

@@ -4,6 +4,7 @@ import * as ttlcachePkg from '@isaacs/ttlcache'
 
 import as2 from './activitystreams.js'
 import BotMaker from './botmaker.js'
+import { ThrottleError } from './requestthrottler.js'
 
 const TTLCache =
   ttlcachePkg.TTLCache ?? ttlcachePkg.default ?? ttlcachePkg
@@ -128,6 +129,7 @@ export class ActivityDeliverer {
     const deliveredTo = new Set()
     const actor = this.getActor(activity)
     const recipients = this.getRecipients(activity)
+    let fullActor
 
     for (const recipient of recipients) {
       this.#logger.debug({ recipient: recipient.id }, 'Checking recipient')
@@ -152,8 +154,18 @@ export class ActivityDeliverer {
           )
         }
       } else {
-        const fullActor = await this.#client.get(actor.id)
-        const fullRecipient = await this.#client.get(recipient.id)
+        fullActor = fullActor ?? await this.#client.get(actor.id)
+        let fullRecipient
+        try {
+          fullRecipient = await this.#client.get(recipient.id)
+        } catch (err) {
+          if (err instanceof ThrottleError) throw err
+          this.#logger.warn(
+            { recipient: recipient.id },
+            'Unreachable remote recipient'
+          )
+          continue
+        }
         if (await this.#isRemoteActor(fullRecipient)) {
           this.#logger.warn({ recipient: recipient.id }, 'Skipping remote actor')
         } else if (await this.#isRemoteFollowersCollection(fullActor, fullRecipient)) {

package/lib/activitydistributor.js

@@ -164,6 +164,14 @@ export class ActivityDistributor {
               yield id
             } else if (this.#isRemoteCollection(obj)) {
               this.#logger.debug({ id }, 'Remote collection')
+              const owner = await this.#getCollectionOwner(obj, username)
+              if (owner && this.#isRecipient(activity, owner)) {
+                this.#logger.debug(
+                  { id, owner: owner.id },
+                  'Leaving remote collection up to inbox forwarding'
+                )
+                continue
+              }
               try {
                 for await (const item of this.#client.items(obj.id, username)) {
                   this.#logger.debug({ id: item.id }, 'Remote collection member')
@@ -194,7 +202,16 @@ export class ActivityDistributor {
       return sharedInbox
     }
 
-    const obj = await this.#client.get(actorId, username)
+    let obj
+    try {
+      obj = await this.#client.get(actorId, username)
+    } catch (err) {
+      this.#logger.warn(
+        { actorId, username, err },
+        'Could not get actor in #getInbox'
+      )
+      return null
+    }
 
     // Get the shared inbox if it exists
 
@@ -232,7 +249,16 @@ export class ActivityDistributor {
       return directInbox
     }
 
-    const obj = await this.#client.get(actorId, username)
+    let obj
+    try {
+      obj = await this.#client.get(actorId, username)
+    } catch (err) {
+      this.#logger.warn(
+        { actorId, username, err },
+        'Could not get actor in #getDirectInbox'
+      )
+      return null
+    }
 
     if (!obj.inbox) {
       return null
@@ -274,4 +300,47 @@ export class ActivityDistributor {
       ? obj.type.some(t => COLLECTION_TYPES.includes(t))
       : COLLECTION_TYPES.includes(obj.type)
   }
+
+  async #getCollectionOwner (obj, username) {
+    if (obj.attributedTo) {
+      return obj.attributedTo.first
+    } else {
+      let ownerId
+      let owner
+
+      if (obj.id.endsWith('/followers')) {
+        ownerId = obj.id.replace('/followers', '')
+      } else if (obj.id.endsWith('/following')) {
+        ownerId = obj.id.replace('/following', '')
+      }
+
+      if (ownerId) {
+        try {
+          owner = await this.#client.get(ownerId, username)
+        } catch (err) {
+          this.#logger.debug(
+            { ownerId },
+            'Owner unreachable'
+          )
+        }
+      }
+
+      return owner
+    }
+  }
+
+  #isRecipient (activity, obj) {
+    const props = ['to', 'cc', 'audience', 'bto', 'bcc']
+    for (const prop of props) {
+      const p = activity.get(prop)
+      if (p) {
+        for (const value of p) {
+          if (value.id === obj.id) {
+            return true
+          }
+        }
+      }
+    }
+    return false
+  }
 }

package/lib/activityhandler.js

@@ -47,6 +47,12 @@ export class ActivityHandler {
       'activity parameter must be an object'
     )
 
+    await this.#cache.set(
+      activity.id,
+      bot.username,
+      await activity.export({ useOriginalContext: true })
+    )
+
     let handled = false
 
     try {
@@ -96,9 +102,11 @@ export class ActivityHandler {
       return
     }
     if (await this.#authz.sameOrigin(activity, object)) {
-      await this.#cache.save(object)
-    } else {
-      await this.#cache.saveReceived(object)
+      await this.#cache.set(
+        object.id,
+        bot.username,
+        await object.export({ useOriginalContext: true })
+      )
     }
     await this.#handleCreateReplies(bot, activity, actor, object)
     await this.#handleCreateThread(bot, activity, actor, object)
@@ -183,6 +191,7 @@ export class ActivityHandler {
         'Not a local thread',
         { thread: thread.id }
       )
+      await this.#cache.clear(thread.id)
       return
     }
     const root = await this.#threadRoot(thread)
@@ -231,52 +240,22 @@ export class ActivityHandler {
 
   async #handleUpdate (bot, activity) {
     const object = this.#getObject(activity)
-    if (await this.#authz.sameOrigin(activity, object)) {
-      await this.#cache.save(object)
-    } else {
-      await this.#cache.saveReceived(object)
-    }
+    await this.#cache.clear(object.id)
   }
 
   async #handleDelete (bot, activity) {
     const object = this.#getObject(activity)
-    await this.#cache.clear(object)
+    await this.#cache.clear(object.id)
   }
 
   async #handleAdd (bot, activity) {
-    const actor = this.#getActor(activity)
     const target = this.#getTarget(activity)
-    const object = this.#getObject(activity)
-    if (await this.#authz.sameOrigin(actor, object)) {
-      await this.#cache.save(object)
-    } else {
-      await this.#cache.saveReceived(object)
-    }
-    if (await this.#authz.sameOrigin(actor, target)) {
-      await this.#cache.save(target)
-      await this.#cache.saveMembership(target, object)
-    } else {
-      await this.#cache.saveReceived(target)
-      await this.#cache.saveMembershipReceived(target, object)
-    }
+    await this.#cache.clear(target.id)
   }
 
   async #handleRemove (bot, activity) {
-    const actor = this.#getActor(activity)
     const target = this.#getTarget(activity)
-    const object = this.#getObject(activity)
-    if (await this.#authz.sameOrigin(actor, object)) {
-      await this.#cache.save(object)
-    } else {
-      await this.#cache.saveReceived(object)
-    }
-    if (await this.#authz.sameOrigin(actor, target)) {
-      await this.#cache.save(target)
-      await this.#cache.saveMembership(target, object, false)
-    } else {
-      await this.#cache.saveReceived(target)
-      await this.#cache.saveMembershipReceived(target, object, false)
-    }
+    await this.#cache.clear(target.id)
   }
 
   async #handleFollow (bot, activity) {
@@ -993,7 +972,7 @@ export class ActivityHandler {
       // Check it from cache
       const id = object.id
       this.#logger.debug({ msg: 'Checking cache', object: id })
-      object = await this.#cache.get(id)
+      object = await as2.import((await this.#cache.get(id, bot.username)).object)
       if (object &&
         (!required.includes('type') || object.type) &&
         !others.find((prop) => !object.has(prop))) {
@@ -1004,7 +983,11 @@ export class ActivityHandler {
       this.#logger.debug({ msg: 'Checking remote', object: id })
       object = await this.#client.get(id, bot.username)
       this.#logger.debug({ msg: 'Object fetched from remote', object: object.id, objectText: await object.write() })
-      this.#cache.save(object)
+      await this.#cache.set(
+        object.id,
+        bot.username,
+        await object.export({ useOriginalContext: true })
+      )
       if (object &&
         (!required.includes('type') || object.type) &&
         !others.find((prop) => !object.has(prop))) {

package/lib/app.js

@@ -23,7 +23,6 @@ import { HTTPSignature } from './httpsignature.js'
 import { Authorizer } from './authorizer.js'
 import { RemoteKeyStorage } from './remotekeystorage.js'
 import { ActivityHandler } from './activityhandler.js'
-import { ObjectCache } from '../lib/objectcache.js'
 import serverRouter from './routes/server.js'
 import userRouter from './routes/user.js'
 import objectRouter from './routes/object.js'
@@ -116,17 +115,12 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     endpointCache
   )
   const authorizer = new Authorizer(actorStorage, formatter, client)
-  const cache = new ObjectCache({
-    longTTL: 3600 * 1000,
-    shortTTL: 300 * 1000,
-    maxItems: 1000
-  })
   const activityHandler = new ActivityHandler(
     actorStorage,
     objectStorage,
     distributor,
     formatter,
-    cache,
+    remoteObjectCache,
     authorizer,
     logger,
     client

package/lib/fanoutworker.js

@@ -1,7 +1,8 @@
 import assert from 'node:assert'
 
 import as2 from './activitystreams.js'
-import { Worker } from './worker.js'
+import { Worker, RecoverableError } from './worker.js'
+import { ThrottleError } from './requestthrottler.js'
 
 export class FanoutWorker extends Worker {
   #distributor
@@ -15,6 +16,17 @@ export class FanoutWorker extends Worker {
   async doJob (payload, attempts) {
     const activity = await as2.import(payload.activity)
     const { username } = payload
-    await this.#distributor.fanout(activity, username)
+    try {
+      await this.#distributor.fanout(activity, username)
+    } catch (err) {
+      if (err instanceof ThrottleError) {
+        this._logger.warn(
+          { err, activity: activity.id, username },
+          'Throttled fanout, waiting to retry')
+        throw new RecoverableError(err.message, err.waitTime)
+      } else {
+        throw err
+      }
+    }
   }
 }

package/lib/intakeworker.js

@@ -1,7 +1,8 @@
 import assert from 'node:assert'
 
 import as2 from './activitystreams.js'
-import { Worker } from './worker.js'
+import { Worker, RecoverableError } from './worker.js'
+import { ThrottleError } from './requestthrottler.js'
 
 export class IntakeWorker extends Worker {
   #deliverer
@@ -17,6 +18,17 @@ export class IntakeWorker extends Worker {
   async doJob (payload, attempts) {
     const raw = payload.activity
     const activity = await as2.import(raw)
-    await this.#deliverer.deliverToAll(activity, this.#bots)
+    try {
+      await this.#deliverer.deliverToAll(activity, this.#bots)
+    } catch (err) {
+      if (err instanceof ThrottleError) {
+        this._logger.warn(
+          { err, activity: activity.id },
+          'Throttled intake, waiting to retry')
+        throw new RecoverableError(err.message, err.waitTime)
+      } else {
+        throw err
+      }
+    }
   }
 }

package/lib/jobqueue.js

@@ -87,12 +87,11 @@ export class JobQueue {
     this.#logger.debug({ method: 'release', jobRunnerId, jobId }, 'released job')
   }
 
-  async retryAfter (jobId, jobRunnerId, delay) {
+  async retryAfter (jobId, jobRunnerId, delay, lastError = null) {
     assert.ok(jobId)
     assert.strictEqual(typeof jobId, 'string')
     assert.ok(jobRunnerId)
     assert.strictEqual(typeof jobRunnerId, 'string')
-    assert.ok(delay)
     assert.strictEqual(typeof delay, 'number')
 
     const retryAfter = new Date(Date.now() + delay)
@@ -102,9 +101,10 @@ export class JobQueue {
       SET claimed_by = NULL,
           claimed_at = NULL,
           updated_at = CURRENT_TIMESTAMP,
-          retry_after = ?
+          retry_after = ?,
+          last_error = ?
       WHERE job_id = ? AND claimed_by = ?;`,
-    { replacements: [retryAfter, jobId, jobRunnerId] }
+    { replacements: [retryAfter, lastError, jobId, jobRunnerId] }
     )
     this.#logger.debug(
       { method: 'retry', jobRunnerId, jobId, delay },
@@ -157,7 +157,7 @@ export class JobQueue {
     this.#ac.abort()
   }
 
-  async fail (jobId, jobRunnerId) {
+  async fail (jobId, jobRunnerId, lastError = null) {
     await this.#connection.query(`
       INSERT INTO failed_job
       (job_id, queue_id, priority, payload, claimed_at, claimed_by, attempts, retry_after, created_at, updated_at)
@@ -170,6 +170,14 @@ export class JobQueue {
       DELETE FROM job
       WHERE job_id = ? AND claimed_by = ?;`,
     { replacements: [jobId, jobRunnerId] })
+
+    if (lastError) {
+      await this.#connection.query(`
+      UPDATE failed_job
+      SET last_error = ?
+      WHERE job_id = ?;`,
+      { replacements: [lastError, jobId] })
+    }
     this.#logger.debug({ method: 'complete', jobRunnerId, jobId }, 'completed job')
   }
 

package/lib/migrations/011-job-last-error.js

@@ -0,0 +1,12 @@
+export const id = '011-job-last-error'
+
+export async function up (connection, queryOptions = {}) {
+  await connection.query(`
+    ALTER TABLE job
+    ADD COLUMN last_error TEXT;
+  `, queryOptions)
+  await connection.query(`
+    ALTER TABLE failed_job
+    ADD COLUMN last_error TEXT;
+  `, queryOptions)
+}

package/lib/remoteobjectcache.js

@@ -59,7 +59,7 @@ export class RemoteObjectCache {
     return result
   }
 
-  async set (id, username, object, headers) {
+  async set (id, username, object, headers = new Headers()) {
     assert.ok(id)
     assert.strictEqual(typeof id, 'string')
     assert.ok(username)
@@ -95,6 +95,14 @@ export class RemoteObjectCache {
     )
   }
 
+  async clear (id) {
+    await this.#connection.query(
+      `DELETE FROM remote_object_cache
+      WHERE id = ?`,
+      { replacements: [id] }
+    )
+  }
+
   async #getExpiry (object, headers) {
     assert.ok(object)
     assert.strictEqual(typeof object, 'object')

package/lib/worker.js

@@ -55,7 +55,7 @@ export class Worker {
           this.#logger.warn({ err, jobId }, 'error before job, retrying')
           if (jobId) {
             const delay = this.#retryDelay(attempts ?? 1)
-            await this.#jobQueue.retryAfter(jobId, this.#workerId, delay)
+            await this.#jobQueue.retryAfter(jobId, this.#workerId, delay, err.stack)
           }
           continue
         }
@@ -69,9 +69,9 @@ export class Worker {
         await this.#jobQueue.complete(jobId, this.#workerId)
       } catch (err) {
         if (err instanceof RecoverableError) {
-          await this.#jobQueue.retryAfter(jobId, this.#workerId, err.delay)
+          await this.#jobQueue.retryAfter(jobId, this.#workerId, err.delay, err.stack)
         } else {
-          await this.#jobQueue.fail(jobId, this.#workerId)
+          await this.#jobQueue.fail(jobId, this.#workerId, err.stack)
         }
       }
     }

package/package.json

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

package/lib/objectcache.js

@@ -1,51 +0,0 @@
-import * as ttlcachePkg from '@isaacs/ttlcache'
-
-const TTLCache =
-  ttlcachePkg.TTLCache ?? ttlcachePkg.default ?? ttlcachePkg
-
-export class ObjectCache {
-  #objects = null
-  #members = null
-  constructor ({ longTTL, shortTTL, maxItems }) {
-    this.#objects = new TTLCache({ ttl: shortTTL, max: maxItems })
-    this.#members = new TTLCache({ ttl: shortTTL, max: maxItems })
-    this.longTTL = longTTL
-    this.shortTTL = shortTTL
-    this.maxItems = maxItems
-  }
-
-  async initialize () {
-  }
-
-  async get (id) {
-    return this.#objects.get(id)
-  }
-
-  async save (object) {
-    return this.#objects.set(object.id, object, { ttl: this.longTTL })
-  }
-
-  async saveReceived (object) {
-    return this.#objects.set(object.id, object, { ttl: this.shortTTL })
-  }
-
-  async clear (object) {
-    return this.#objects.delete(object.id)
-  }
-
-  membershipKey (collection, object) {
-    return `${collection.id}:${object.id}`
-  }
-
-  async saveMembership (collection, object, isMember = true) {
-    return this.#members.set(this.membershipKey(collection, object), isMember, { ttl: this.longTTL })
-  }
-
-  async saveMembershipReceived (collection, object, isMember = true) {
-    return this.#members.set(this.membershipKey(collection, object), isMember, { ttl: this.shortTTL })
-  }
-
-  async isMember (collection, object) {
-    return this.#members.get(this.membershipKey(collection, object))
-  }
-}