@evanp/activitypub-bot 0.29.0 → 0.30.2

package/lib/activityhandler.js

@@ -151,10 +151,16 @@ export class ActivityHandler {
         )
         const recipients = this.#getRecipients(original)
         this.#addRecipient(recipients, actor, 'to')
+        this.#removeRecipient(recipients, await this.#botActor(bot))
+        const parts = await this.#formatter.unformat(original.id)
+        const repliesId = await this.#formatter.format({
+          collection: 'replies',
+          ...parts
+        })
         await this.#doActivity(bot, {
           type: 'Add',
-          object,
-          target: original.replies,
+          object: object.id,
+          target: repliesId,
           ...recipients
         })
       }
@@ -205,10 +211,16 @@ export class ActivityHandler {
         )
         const recipients = this.#getRecipients(root)
         this.#addRecipient(recipients, actor, 'to')
+        this.#removeRecipient(recipients, await this.#botActor(bot))
+        const parts = await this.#formatter.unformat(root.id)
+        const threadId = await this.#formatter.format({
+          collection: 'thread',
+          ...parts
+        })
         await this.#doActivity(bot, {
           type: 'Add',
           object,
-          target: root.thread,
+          target: threadId,
           ...recipients
         })
       }
@@ -301,20 +313,26 @@ export class ActivityHandler {
       'Sending accept',
       { actor: actor.id }
     )
-    await this.#doActivity(bot, {
+    const followersId = this.#formatter.format({
+      username: bot.username,
+      collection: 'followers'
+    })
+    const add = await this.#doActivity(bot, {
       type: 'Add',
-      object: actor,
-      target: this.#formatter.format({
-        username: bot.username,
-        collection: 'followers'
-      }),
-      to: ['as:Public', actor.id]
+      object: actor.id,
+      target: followersId,
+      to: ['as:Public', actor.id, followersId]
     })
-    await this.#doActivity(bot, {
+    this.#logger.debug({ add: await add.export() }, 'added follower')
+    const recipients = await this.#getRecipients(activity)
+    this.#addRecipient(recipients, actor, 'to')
+    this.#removeRecipient(recipients, await this.#botActor(bot))
+    const accept = await this.#doActivity(bot, {
       type: 'Accept',
-      object: activity,
-      to: actor
+      object: activity.id,
+      ...recipients
     })
+    this.#logger.debug({ accept: await accept.export() }, 'accepted follow')
     this.#logger.debug({
       msg: 'Notifying bot of new follow',
       actor: actor.id
@@ -378,7 +396,7 @@ export class ActivityHandler {
     )
     await this.#doActivity(bot, {
       type: 'Add',
-      object: actor,
+      object: actor.id,
       target: this.#formatter.format({
         username: bot.username,
         collection: 'following'
@@ -510,7 +528,7 @@ export class ActivityHandler {
     })
     await this.#doActivity(bot, {
       type: 'Add',
-      object: activity,
+      object: activity.id,
       target: likesCollectionId,
       ...recipients
     })
@@ -585,7 +603,7 @@ export class ActivityHandler {
     })
     await this.#doActivity(bot, {
       type: 'Add',
-      object: activity,
+      object: activity.id,
       target: sharesCollectionId,
       ...recipients
     })
@@ -852,6 +870,8 @@ export class ActivityHandler {
   }
 
   #removeRecipient (recipients, actor) {
+    assert.ok(typeof recipients, 'object')
+    assert.ok(typeof actor, 'object')
     const remove = (list) => {
       if (!list) {
         return
@@ -869,6 +889,9 @@ export class ActivityHandler {
   }
 
   #addRecipient (recipients, actor, key = 'to') {
+    assert.ok(typeof recipients, 'object')
+    assert.ok(typeof actor, 'object')
+    assert.ok(typeof key, 'string')
     if (!actor.id) {
       return
     }
@@ -897,6 +920,7 @@ export class ActivityHandler {
     await this.#actorStorage.addToCollection(bot.username, 'outbox', activity)
     await this.#actorStorage.addToCollection(bot.username, 'inbox', activity)
     await this.#distributor.distribute(activity, bot.username)
+    return activity
   }
 
   #formatActivityId (bot, type) {

package/lib/activitypubclient.js

@@ -53,6 +53,7 @@ export class ActivityPubClient {
   async get (url, username = null) {
     assert.ok(url)
     assert.equal(typeof url, 'string')
+    assert.ok(username === null || username !== '*')
     const res = await this.#getRes(url, username, true)
     return await this.#handleRes(res, url)
   }
@@ -101,6 +102,8 @@ export class ActivityPubClient {
 
   async #handleRes (res, url) {
     if (res.status < 200 || res.status > 299) {
+      const body = await res.text()
+      this.#logger.warn({ status: res.status, body, url }, 'Could not fetch url')
       throw createHttpError(res.status, `Could not fetch ${url}`)
     }
     const contentType = res.headers.get('content-type')
@@ -136,6 +139,7 @@ export class ActivityPubClient {
     assert.equal(typeof obj, 'object')
     assert.ok(username)
     assert.equal(typeof username, 'string')
+    assert.ok(username !== '*')
     const json = await obj.export()
     this.#fixupJson(json)
     const body = JSON.stringify(json)
@@ -186,6 +190,13 @@ export class ActivityPubClient {
   }
 
   async * items (id, username = null) {
+    assert.ok(id)
+    assert.equal(typeof id, 'string')
+    assert.ok(
+      username === null ||
+      (typeof username === 'string' && username !== '*')
+    )
+
     const coll = await this.get(id, username)
 
     this.#logger.debug(`Got object ${id}`)

package/lib/botcontext.js

@@ -91,7 +91,7 @@ export class BotContext {
     if (this.#formatter.isLocal(id)) {
       return await this.#objectStorage.read(id)
     } else {
-      return await this.#client.get(id, this.#botId)
+      return await this.#getRemoteObject(id)
     }
   }
 
@@ -362,7 +362,7 @@ export class BotContext {
   }
 
   async toWebfinger (actorId) {
-    const actor = await this.#client.get(actorId)
+    const actor = await this.#getRemoteObject(actorId)
     if (!actor) {
       return null
     }
@@ -526,4 +526,12 @@ export class BotContext {
   async onIdle () {
     await this.#distributor.onIdle()
   }
+
+  async #getRemoteObject (id) {
+    if (this.#botId === '*') {
+      return await this.#client.get(id)
+    } else {
+      return await this.#client.get(id, this.#botId)
+    }
+  }
 }

package/lib/keystorage.js

@@ -17,7 +17,9 @@ export class KeyStorage {
     this.#hasher = new HumanHasher()
   }
 
-  async getPublicKey (username) {
+  async getPublicKey (username = null) {
+    assert.ok(username === null || typeof username === 'string')
+    assert.ok(username !== '*')
     this.#logger.debug(
       { username, method: 'KeyStorage.getPublicKey' },
       'getting public key for bot')
@@ -25,7 +27,9 @@ export class KeyStorage {
     return publicKey
   }
 
-  async getPrivateKey (username) {
+  async getPrivateKey (username = null) {
+    assert.ok(username === null || typeof username === 'string')
+    assert.ok(username !== '*')
     this.#logger.debug(
       { username, method: 'KeyStorage.getPrivateKey' },
       'getting private key for bot')

package/lib/ratelimiter.js

@@ -1,6 +1,8 @@
 import { setTimeout as sleep } from 'node:timers/promises'
 import assert from 'node:assert'
 
+const BETA = 0.75
+
 export class RateLimiter {
   #connection
   #logger
@@ -15,7 +17,7 @@ export class RateLimiter {
   async limit (host, maxWaitTime = 30000) {
     assert.strictEqual(typeof host, 'string')
     assert.strictEqual(typeof maxWaitTime, 'number')
-    const waitTime = await this.#getWaitTime(host)
+    const waitTime = await this.#getWaitTime(host, maxWaitTime)
     if (waitTime > maxWaitTime) {
       throw new Error(`Wait time is too long; ${waitTime} > ${maxWaitTime}`)
     }
@@ -49,8 +51,9 @@ export class RateLimiter {
     }
   }
 
-  async #getWaitTime (host) {
+  async #getWaitTime (host, maxWaitTime) {
     assert.strictEqual(typeof host, 'string')
+    assert.ok(maxWaitTime > 0)
 
     const [result] = await this.#connection.query(
       'SELECT remaining, reset FROM rate_limit WHERE host = ?',
@@ -64,6 +67,7 @@ export class RateLimiter {
     const { remaining, reset } = result[0]
     const resetDate = new Date(reset)
     const now = new Date()
+    const window = Math.round(resetDate - now)
 
     if (now > resetDate) {
       this.#logger.debug(
@@ -78,19 +82,20 @@ export class RateLimiter {
         { remaining, resetDate, host },
         'no more requests remaining'
       )
-      return Math.round(resetDate - now)
+      return window
     }
 
     this.#logger.debug(
       { remaining, resetDate, host },
-      'no more requests remaining'
+      'requests remain'
     )
 
-    const waitTime = Math.round((resetDate - now) / (remaining * 1.0))
+    const space = (window / remaining)
+    const waitTime = (space) * Math.pow(space / maxWaitTime, BETA)
 
     this.#logger.debug(
       { remaining, resetDate, host, waitTime },
-      'no more requests remaining'
+      'wait time calculated'
     )
     return waitTime
   }

package/lib/routes/server.js

@@ -15,6 +15,7 @@ router.get('/actor', async (req, res) => {
   const publicKeyPem = await keyStorage.getPublicKey(null)
   const acct = formatter.acct()
   const webfinger = acct.slice(5)
+  const [username] = webfinger.split('@', 1)
   const server = await as2.import({
     '@context': [
       'https://www.w3.org/ns/activitystreams',
@@ -24,6 +25,7 @@ router.get('/actor', async (req, res) => {
     id: formatter.format({ server: true }),
     type: 'Service',
     to: 'as:Public',
+    preferredUsername: username,
     alsoKnownAs: acct,
     webfinger,
     publicKey: {

package/package.json

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