@evanp/activitypub-bot 0.20.1 → 0.21.1

package/lib/activitydeliverer.js

@@ -2,6 +2,10 @@ import BotMaker from './botmaker.js'
 import assert from 'node:assert'
 import as2 from './activitystreams.js'
 import PQueue from 'p-queue'
+import * as ttlcachePkg from '@isaacs/ttlcache'
+
+const TTLCache =
+  ttlcachePkg.TTLCache ?? ttlcachePkg.default ?? ttlcachePkg
 
 const NS = 'https://www.w3.org/ns/activitystreams#'
 
@@ -19,7 +23,8 @@ const COLLECTION_TYPES = [
 export class ActivityDeliverer {
   static #MAX_ALL_QUEUE = 16
   static #MAX_BOT_QUEUE = 32
-
+  static #TTL_SEEN_PUBLIC = 3 * 24 * 60 * 60 * 1000 // 3 days
+  static #MAX_SEEN_PUBLIC = 1000000
   #actorStorage
   #activityHandler
   #formatter
@@ -27,6 +32,7 @@ export class ActivityDeliverer {
   #client
   #deliverAllQueue
   #deliverBotQueue
+  #seenPublic
 
   constructor (actorStorage, activityHandler, formatter, logger, client) {
     this.#actorStorage = actorStorage
@@ -36,6 +42,10 @@ export class ActivityDeliverer {
     this.#logger = logger.child({ class: this.constructor.name })
     this.#deliverAllQueue = new PQueue({ max: ActivityDeliverer.#MAX_ALL_QUEUE })
     this.#deliverBotQueue = new PQueue({ max: ActivityDeliverer.#MAX_BOT_QUEUE })
+    this.#seenPublic = new TTLCache({
+      ttl: ActivityDeliverer.#TTL_SEEN_PUBLIC,
+      max: ActivityDeliverer.#MAX_SEEN_PUBLIC
+    })
   }
 
   getActor (activity) {
@@ -53,6 +63,38 @@ export class ActivityDeliverer {
     return r
   }
 
+  isPublic (activity) {
+    for (const prop of ['to', 'cc', 'audience']) {
+      const vals = activity.get(prop)
+      if (vals) {
+        for (const val of vals) {
+          if (this.#isPublic(val)) {
+            return true
+          }
+        }
+      }
+    }
+    return false
+  }
+
+  async deliverPublic (activity, bots) {
+    if (!this.#seenPublic.has(activity.id)) {
+      await Promise.all(Object.values(bots).map(async (bot) => {
+        let result
+        try {
+          result = await bot.onPublic(activity)
+        } catch (err) {
+          this.#logger.warn(
+            { err, activity: activity.id, bot: bot.id },
+            'Error handling public activity for bot'
+          )
+        }
+        return result
+      }))
+      this.#seenPublic.set(activity.id, true)
+    }
+  }
+
   async deliverTo (activity, bot) {
     this.#deliverBotQueue.add(() =>
       this.#deliverTo(activity, bot)
@@ -99,7 +141,7 @@ export class ActivityDeliverer {
       this.#logger.debug(`Checking recipient ${recipient.id}`)
       if (this.#isPublic(recipient)) {
         this.#logger.debug(`Public recipient for ${activity.id}`)
-        await this.#deliverPublic(activity, bots)
+        await this.deliverPublic(activity, bots)
       } else if (this.#isLocal(recipient)) {
         this.#logger.debug(`Local recipient for ${activity.id}`)
         const parts = this.#formatter.unformat(recipient.id)
@@ -242,10 +284,6 @@ export class ActivityDeliverer {
     return !!recipient.inbox?.first?.id
   }
 
-  async #deliverPublic (activity, bots) {
-    await Promise.all(Object.values(bots).map(bot => bot.onPublic(activity)))
-  }
-
   async #deliverLocalFollowersCollection (activity, username, bots, deliveredTo) {
     const id = this.#formatter.format({ username })
     const followed = await as2.import({ id })

package/lib/botcontext.js

@@ -369,10 +369,12 @@ export class BotContext {
     const owners = obj.attributedTo
       ? Array.from(obj.attributedTo).map((owner) => owner.id)
       : Array.from(obj.actor).map((owner) => owner.id)
+    const summary = `${this.#botId} shared "${await this.#nameOf(obj)}"`
     const activity = await this.#doActivity({
       type: 'Announce',
-      summary: {
-        en: `${this.#botId} shared "${await this.#nameOf(obj)}"`
+      summary,
+      summaryMap: {
+        en: summary
       },
       object: obj.id,
       to: [
@@ -380,7 +382,7 @@ export class BotContext {
           username: this.#botId,
           collection: 'followers'
         }),
-        'https://www.w3.org/ns/activitystreams#Public'
+        'as:Public'
       ],
       cc: owners
     })

package/lib/bots/relayserver.js

@@ -17,7 +17,7 @@ export default class RelayServerBot extends Bot {
   }
 
   get description () {
-    return 'A bot for subscribing to relays'
+    return 'A bot for accepting relay subscriptions'
   }
 
   async handleActivity (activity) {

package/lib/routes/inbox.js

@@ -65,6 +65,10 @@ router.post('/user/:username/inbox', async (req, res, next) => {
 
   await deliverer.deliverTo(activity, bot)
 
+  if (deliverer.isPublic(activity)) {
+    await deliverer.deliverPublic(activity, bots)
+  }
+
   res.status(202)
   res.type('text/plain')
   res.send(http.STATUS_CODES[202])

package/package.json

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