@evanp/activitypub-bot 0.14.2 → 0.15.4

package/lib/activitydistributor.js

@@ -4,6 +4,13 @@ import { LRUCache } from 'lru-cache'
 import PQueue from 'p-queue'
 import { setTimeout } from 'node:timers/promises'
 
+const NS = 'https://www.w3.org/ns/activitystreams#'
+
+const COLLECTION_TYPES = [
+  `${NS}Collection`,
+  `${NS}OrderedCollection`
+]
+
 export class ActivityDistributor {
   static #MAX_CACHE_SIZE = 1000000
   static #CONCURRENCY = 32
@@ -88,45 +95,66 @@ export class ActivityDistributor {
   }
 
   async * #public (activity, username) {
-    const followers = this.#formatter.format({
-      username,
-      collection: 'followers'
-    })
-    for (const prop of ['to', 'cc', 'audience']) {
-      const p = activity.get(prop)
-      if (p) {
-        for (const value of p) {
-          const id = value.id
-          if (id === followers ||
-            ActivityDistributor.#PUBLIC.includes(id)) {
-            for await (const follower of this.#actorStorage.items(username, 'followers')) {
-              yield follower.id
-            }
-          } else {
-            yield id
-          }
-        }
-      }
-    }
+    yield* this.#recipients(activity, username, ['to', 'cc', 'audience'])
   }
 
   async * #private (activity, username) {
-    const followers = this.#formatter.format({
-      username,
-      collection: 'followers'
-    })
-    for (const prop of ['bto', 'bcc']) {
+    yield* this.#recipients(activity, username, ['bto', 'bcc'])
+  }
+
+  async * #recipients (activity, username, props) {
+    for (const prop of props) {
       const p = activity.get(prop)
       if (p) {
         for (const value of p) {
           const id = value.id
-          if (id === followers ||
-            ActivityDistributor.#PUBLIC.includes(id)) {
-            for await (const follower of this.#actorStorage.items(username, 'followers')) {
-              yield follower.id
+          this.#logger.debug({id}, 'Checking recipient')
+          if (ActivityDistributor.#PUBLIC.includes(id)) {
+            this.#logger.debug(
+              { activity: activity.id },
+              'Skipping public delivery'
+            )
+          } else if (this.#formatter.isLocal(id)) {
+            this.#logger.debug({id}, 'Unformatting local recipient')
+            const parts = this.#formatter.unformat(id)
+            this.#logger.debug(parts, 'Local recipient')
+            if (this.#isLocalActor(parts)) {
+              this.#logger.debug({id}, 'Local actor')
+              yield id
+            } else if (this.#isLocalCollection(parts)) {
+              this.#logger.debug({id}, 'Local collection')
+              for await (const item of this.#actorStorage.items(parts.username, parts.collection)) {
+                this.#logger.debug({id: item.id}, 'Local collection member')
+                yield item.id
+              }
+            } else {
+              this.#logger.warn({id}, 'Local non-actor non-collection')
             }
           } else {
-            yield id
+            let obj
+            try {
+              obj = await this.#client.get(id, username)
+            } catch (err) {
+              this.#logger.warn({id, err}, 'Cannot get recipient, skipping')
+              continue
+            }
+            if (this.#isRemoteActor(obj)) {
+              this.#logger.debug({id}, 'Remote actor')
+              yield id
+            } else if (this.#isRemoteCollection(obj)) {
+              this.#logger.debug({id}, 'Remote collection')
+              try {
+                for await (const item of this.#client.items(obj.id, username)) {
+                  this.#logger.debug({id: item.id}, 'Remote collection member')
+                  yield item.id
+                }
+              } catch (err) {
+                this.#logger.warn({id, err}, 'Cannot iterate, skipping')
+                continue
+              }
+            } else {
+              this.#logger.warn({id}, 'Remote non-actor non-collection')
+            }
           }
         }
       }
@@ -260,4 +288,22 @@ export class ActivityDistributor {
       await this.#actorStorage.addToCollection(username, 'inbox', activity)
     }
   }
+
+  #isLocalActor (parts) {
+    return parts.username && !parts.type && !parts.collection
+  }
+
+  #isLocalCollection (parts) {
+    return parts.username && !parts.type && parts.collection && !parts.page
+  }
+
+  #isRemoteActor (obj) {
+    return !!obj.inbox
+  }
+
+  #isRemoteCollection (obj) {
+    return (Array.isArray(obj.type))
+      ? obj.type.some(t => COLLECTION_TYPES.includes(t))
+      : COLLECTION_TYPES.includes(obj.type)
+  }
 }

package/lib/routes/collection.js

@@ -7,7 +7,15 @@ import assert from 'node:assert'
 const collections = ['outbox', 'liked', 'followers', 'following']
 const router = express.Router()
 
+function toArray (value) {
+  return (Array.isArray(value))
+    ? value
+    : [value]
+}
+
 async function filterAsync (array, asyncPredicate) {
+  assert.ok(array)
+  assert.ok(Array.isArray(array))
   // 1. Kick off all predicate calls in parallel:
   const checks = array.map(item => asyncPredicate(item))
 
@@ -76,7 +84,7 @@ function collectionPageHandler (collection) {
       exported = await page.export({ useOriginalContext: true })
 
       if (['outbox', 'liked'].includes(collection)) {
-        exported.items = await filterAsync(exported.items, async (id) => {
+        exported.items = await filterAsync(toArray(exported.items), async (id) => {
           const object = (formatter.isLocal(id))
             ? await objectStorage.read(id)
             : await client.get(id)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.14.2",
+  "version": "0.15.4",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",
@@ -42,7 +42,7 @@
     "sequelize": "^6.37.7"
   },
   "devDependencies": {
-    "@evanp/activitypub-nock": "^0.2.1",
+    "@evanp/activitypub-nock": "^0.4.4",
     "nock": "^14.0.5",
     "standard": "^17.1.2",
     "supertest": "^7.1.4"