@evanp/activitypub-bot 0.13.14 → 0.14.1

package/lib/activitydeliverer.js

@@ -1,6 +1,7 @@
 import BotMaker from './botmaker.js'
 import assert from 'node:assert'
 import as2 from './activitystreams.js'
+import PQueue from 'p-queue'
 
 const NS = 'https://www.w3.org/ns/activitystreams#'
 
@@ -16,11 +17,16 @@ const COLLECTION_TYPES = [
 ]
 
 export class ActivityDeliverer {
+  static #MAX_ALL_QUEUE = 16
+  static #MAX_BOT_QUEUE = 32
+
   #actorStorage
   #activityHandler
   #formatter
   #logger
   #client
+  #deliverAllQueue
+  #deliverBotQueue
 
   constructor (actorStorage, activityHandler, formatter, logger, client) {
     this.#actorStorage = actorStorage
@@ -28,6 +34,8 @@ export class ActivityDeliverer {
     this.#formatter = formatter
     this.#client = client
     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 })
   }
 
   isActivity (object) {
@@ -50,6 +58,19 @@ export class ActivityDeliverer {
   }
 
   async deliverTo (activity, bot) {
+    this.#deliverBotQueue.add(() =>
+      this.#deliverTo(activity, bot)
+    )
+  }
+
+  async onIdle () {
+    this.#logger.debug(`Awaiting delivery queues`)
+    await this.#deliverAllQueue.onIdle()
+    await this.#deliverBotQueue.onIdle()
+    this.#logger.debug(`Done awaiting delivery queues`)
+  }
+
+  async #deliverTo (activity, bot) {
     if (await this.#actorStorage.isInCollection(bot.username, 'inbox', activity)) {
       this.#logger.info(
         { activity: activity.id, username: bot.username },
@@ -64,9 +85,16 @@ export class ActivityDeliverer {
     }
     this.#logger.debug(`Adding ${activity.id} to ${bot.username} inbox`)
     await this.#actorStorage.addToCollection(bot.username, 'inbox', activity)
+    this.#logger.debug(`Done adding ${activity.id} to ${bot.username} inbox`)
   }
 
   async deliverToAll (activity, bots) {
+    this.#deliverAllQueue.add(() =>
+      this.#deliverToAll(activity, bots)
+    )
+  }
+
+  async #deliverToAll (activity, bots) {
     const deliveredTo = new Set()
     const actor = this.getActor(activity)
     const recipients = this.getRecipients(activity)

package/lib/activityhandler.js

@@ -479,13 +479,17 @@ export class ActivityHandler {
     await this.#objectStorage.addToCollection(object.id, 'likers', actor)
     const recipients = this.#getRecipients(object)
     this.#addRecipient(recipients, actor, 'to')
+    const parts = this.#formatter.unformat(object.id)
+    const likesCollectionId = this.#formatter.format({
+      username: parts.username,
+      type: parts.type,
+      nanoid: parts.nanoid,
+      collection: 'likes'
+    })
     await this.#doActivity(bot, {
       type: 'Add',
       object: activity,
-      target: this.#formatter.format({
-        username: bot.username,
-        collection: 'likes'
-      }),
+      target: likesCollectionId,
       ...recipients
     })
     await bot.onLike(object, activity)
@@ -550,13 +554,17 @@ export class ActivityHandler {
     await this.#objectStorage.addToCollection(object.id, 'sharers', actor)
     const recipients = this.#getRecipients(object)
     this.#addRecipient(recipients, actor, 'to')
+    const parts = this.#formatter.unformat(object.id)
+    const sharesCollectionId = this.#formatter.format({
+      username: parts.username,
+      type: parts.type,
+      nanoid: parts.nanoid,
+      collection: 'shares'
+    })
     await this.#doActivity(bot, {
       type: 'Add',
       object: activity,
-      target: this.#formatter.format({
-        username: bot.username,
-        collection: 'shares'
-      }),
+      target: sharesCollectionId,
       ...recipients
     })
     try {
@@ -840,7 +848,11 @@ export class ActivityHandler {
     const activity = await as2.import({
       ...activityData,
       id: this.#formatActivityId(bot, activityData.type),
-      actor: await this.#botActor(bot),
+      actor: {
+        id: this.#botId(bot),
+        name: bot.fullname,
+        type: 'Service'
+      },
       published: now,
       updated: now
     })
@@ -948,7 +960,9 @@ export class ActivityHandler {
 
   async #botActor (bot) {
     return await as2.import({
-      id: this.#formatter.format({ username: bot.username })
+      id: this.#formatter.format({ username: bot.username }),
+      name: bot.fullname,
+      type: 'Service'
     })
   }
 

package/lib/app.js

@@ -187,7 +187,10 @@ export async function makeApp (databaseUrl, origin, bots, logLevel = 'silent') {
   })
 
   app.onIdle = async () => {
+    logger.debug(`Awaiting components`)
     await distributor.onIdle()
+    await deliverer.onIdle()
+    logger.debug(`Awaiting components`)
   }
 
   app.cleanup = async () => {

package/lib/authorizer.js

@@ -92,11 +92,11 @@ export class Authorizer {
   }
 
   async #getOwner (object) {
-    if (object.attributedTo) {
+    if (object.attributedTo && object.attributedTo.first) {
       return object.attributedTo.first
-    } else if (object.actor) {
+    } else if (object.actor && object.actor.first) {
       return object.actor.first
-    } else if (object.owner) {
+    } else if (object.owner && object.owner.first) {
       return object.owner.first
     } else if (this.#formatter.isLocal(object.id)) {
       const parts = this.#formatter.unformat(object.id)

package/lib/routes/inbox.js

@@ -2,6 +2,7 @@ import express from 'express'
 import as2 from '../activitystreams.js'
 import createHttpError from 'http-errors'
 import BotMaker from '../botmaker.js'
+import http from 'node:http'
 
 const router = express.Router()
 
@@ -64,9 +65,9 @@ router.post('/user/:username/inbox', async (req, res, next) => {
 
   await deliverer.deliverTo(activity, bot)
 
-  res.status(200)
+  res.status(202)
   res.type('text/plain')
-  res.send('OK')
+  res.send(http.STATUS_CODES[202])
 })
 
 router.get('/user/:username/inbox', async (req, res, next) => {

package/lib/routes/sharedinbox.js

@@ -1,6 +1,7 @@
 import express from 'express'
 import as2 from '../activitystreams.js'
 import createHttpError from 'http-errors'
+import http from 'node:http'
 
 const router = express.Router()
 
@@ -48,9 +49,9 @@ router.post('/shared/inbox', async (req, res, next) => {
 
   await deliverer.deliverToAll(activity, bots)
 
-  res.status(200)
+  res.status(202)
   res.type('text/plain')
-  res.send('OK')
+  res.send(http.STATUS_CODES[201])
 })
 
 export default router

package/package.json

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