@evanp/activitypub-bot 0.13.4 → 0.13.9

package/lib/activitydeliverer.js

@@ -65,15 +65,21 @@ export class ActivityDeliverer {
     const recipients = this.getRecipients(activity)
 
     for (const recipient of recipients) {
+      this.#logger.debug(`Checking recipient ${recipient.id}`)
       if (this.#isPublic(recipient)) {
+        this.#logger.debug(`Public recipient for ${activity.id}`)
         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)
         if (this.#isLocalActor(parts)) {
+          this.#logger.debug(`Local actor ${recipient.id} for ${activity.id}`)
           await this.#deliverLocalActor(activity, recipient, bots, deliveredTo)
         } else if (this.#isLocalFollowersCollection(parts)) {
+          this.#logger.debug(`Local followers for ${parts.username} for ${activity.id}`)
           await this.#deliverLocalFollowersCollection(activity, parts.username, bots, deliveredTo)
         } else if (this.#isLocalFollowingCollection(parts)) {
+          this.#logger.debug(`Local following for ${parts.username} for ${activity.id}`)
           await this.#deliverLocalFollowingCollection(activity, parts.username, bots, deliveredTo)
         } else {
           this.#logger.warn(
@@ -86,10 +92,13 @@ export class ActivityDeliverer {
         if (await this.#isRemoteActor(fullRecipient)) {
           this.#logger.warn(`Skipping remote actor ${recipient.id}`)
         } else if (await this.#isRemoteFollowersCollection(fullActor, fullRecipient)) {
+          this.#logger.debug(`Remote followers for ${fullActor.id} for ${activity.id}`)
           await this.#deliverRemoteFollowersCollection(activity, fullRecipient, fullActor, deliveredTo, bots)
         } else if (await this.#isRemoteFollowingCollection(fullActor, fullRecipient)) {
+          this.#logger.debug(`Remote following for ${fullActor.id} for ${activity.id}`)
           await this.#deliverRemoteFollowingCollection(activity, fullRecipient, fullActor, deliveredTo, bots)
         } else if (await this.#isRemoteCollection(fullRecipient)) {
+          this.#logger.debug(`Remote collection ${fullRecipient.id} for ${activity.id}`)
           await this.#deliverRemoteCollection(activity, fullRecipient, deliveredTo, bots)
         } else {
           this.#logger.warn(`Unrecognized recipient: ${recipient.id}`)

package/lib/activityhandler.js

@@ -58,16 +58,16 @@ export class ActivityHandler {
     const actor = this.#getActor(activity)
     if (!actor) {
       this.#logger.warn(
-        'Create activity has no actor',
-        { activity: activity.id }
+        { activity: activity.id },
+        'Create activity has no actor'
       )
       return
     }
     const object = this.#getObject(activity)
     if (!object) {
       this.#logger.warn(
-        'Create activity has no object',
-        { activity: activity.id }
+        { activity: activity.id },
+        'Create activity has no object'
       )
       return
     }
@@ -79,6 +79,10 @@ export class ActivityHandler {
     await this.#handleCreateReplies(bot, activity, actor, object)
     await this.#handleCreateThread(bot, activity, actor, object)
     if (this.#isMention(bot, object)) {
+      this.#logger.debug(
+         { username: bot.username, object: object.id },
+        'bot mentioned'
+      )
       await bot.onMention(object, activity)
     }
   }

package/lib/bots/ok.js

@@ -10,13 +10,30 @@ export default class OKBot extends Bot {
   }
 
   async onMention (object, activity) {
+    this._context.logger.debug(
+      { object: object.id, activity: activity.id },
+      'bot mentioned'
+    )
     if (!await this.hasSeen(object)) {
+      this._context.logger.debug(
+        { object: object.id },
+        'not previously seen'
+      )
       const attributedTo =
         object.attributedTo?.first.id ||
         activity.actor?.first.id
+      this._context.logger.debug(
+        { object: object.id, attributedTo: attributedTo },
+        'attributed to'
+      )
       const wf = await this._context.toWebfinger(attributedTo)
-      this._context.logger.info({ object: object.id, attributedTo, wf }, 'received mention')
       const content = (wf) ? `@${wf} OK` : 'OK'
+      this._context.logger.info({
+        object: object.id,
+        attributedTo,
+        wf,
+        content
+      }, 'sending reply')
       const reply = await this._context.sendReply(content, object)
       this._context.logger.info({
         reply: reply.id,

package/lib/keystorage.js

@@ -36,11 +36,12 @@ export class KeyStorage {
   async #getKeys (username) {
     let privateKey
     let publicKey
-    const qry = (username)
-      ? 'SELECT public_key, private_key FROM new_keys WHERE username = ?'
-      : 'SELECT public_key, private_key FROM new_keys WHERE username IS NULL'
+    // system key uses username null but primary key can't be null
+    if (!username) {
+      username = ''
+    }
     const [result] = await this.#connection.query(
-      qry,
+      'SELECT public_key, private_key FROM new_keys WHERE username = ?',
       { replacements: [username] }
     )
     if (result.length > 0) {

package/lib/routes/inbox.js

@@ -60,6 +60,8 @@ router.post('/user/:username/inbox', async (req, res, next) => {
     return next(createHttpError(400, 'Activity already delivered'))
   }
 
+  logger.info(`Activity ${activity.id} received at ${bot.username} inbox`)
+
   await deliverer.deliverTo(activity, bot)
 
   res.status(200)

package/lib/routes/sharedinbox.js

@@ -44,6 +44,8 @@ router.post('/shared/inbox', async (req, res, next) => {
     return next(createHttpError(403, `${subject} is not the actor ${actor.id}`))
   }
 
+  logger.info(`Activity ${activity.id} received at shared inbox`)
+
   await deliverer.deliverToAll(activity, bots)
 
   res.status(200)

package/package.json

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