@evanp/activitypub-bot 0.45.12 → 0.45.13

package/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.45.12",
+  "version": "0.45.13",
   "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))
-  }
-}