@evanp/activitypub-bot 0.23.0 → 0.24.1

package/lib/activitypubclient.js

@@ -102,7 +102,9 @@ export class ActivityPubClient {
     assert.equal(typeof obj, 'object')
     assert.ok(username)
     assert.equal(typeof username, 'string')
-    const body = await obj.write()
+    const json = await obj.export()
+    this.#fixupJson(json)
+    const body = JSON.stringify(json)
     const headers = {
       date: new Date().toUTCString(),
       'user-agent': ActivityPubClient.#userAgent,
@@ -174,4 +176,30 @@ export class ActivityPubClient {
       }
     }
   }
+
+  #fixupJson (json) {
+    this.#fixupRelayFollow(json)
+    this.#fixupRelayUndoFollow(json)
+  }
+
+  #fixupRelayFollow (json) {
+    if (typeof json.type === 'string' &&
+      json.type === 'Follow' &&
+      typeof json.object === 'string' &&
+      json.object === 'as:Public') {
+      json.object = 'https://www.w3.org/ns/activitystreams#Public'
+    }
+  }
+
+  #fixupRelayUndoFollow (json) {
+    if (typeof json.type === 'string' &&
+      json.type === 'Undo' &&
+      typeof json.object === 'object' &&
+      typeof json.object.type === 'string' &&
+      json.object.type === 'Follow' &&
+      typeof json.object.object === 'string' &&
+      json.object.object === 'as:Public') {
+      json.object.object = 'https://www.w3.org/ns/activitystreams#Public'
+    }
+  }
 }

package/lib/bots/relayclient.js

@@ -2,10 +2,12 @@ import Bot from '../bot.js'
 
 export default class RelayClientBot extends Bot {
   #relay
+  #unsubscribe
 
-  constructor (username, relay) {
+  constructor (username, relay, unsubscribe = null) {
     super(username)
     this.#relay = relay
+    this.#unsubscribe = !!unsubscribe
   }
 
   get fullname () {
@@ -18,21 +20,61 @@ export default class RelayClientBot extends Bot {
 
   async initialize (context) {
     super.initialize(context)
-    if (!(await this._context.hasData(`follow:${this.#relay}`))) {
-      await this.#followRelay()
+    this._context.logger.info(
+      { relay: this.#relay, unsubscribe: this.#unsubscribe },
+      'Initialising relay client'
+    )
+    if (this.#unsubscribe) {
+      if (await this._context.hasData(`follow:${this.#relay}`)) {
+        await this.#unfollowRelay()
+      }
+    } else {
+      if (!(await this._context.hasData(`follow:${this.#relay}`))) {
+        await this.#followRelay()
+      }
     }
   }
 
   async #followRelay () {
+    this._context.logger.info(
+      { relay: this.#relay },
+      'Following relay'
+    )
     const activity = await this._context.doActivity({
       to: this.#relay,
       type: 'Follow',
       object: 'https://www.w3.org/ns/activitystreams#Public'
     })
+    this._context.logger.info(
+      { relay: this.#relay, activity: activity.id },
+      'Saving follow for later'
+    )
     this._context.setData(`follow:${this.#relay}`, activity.id)
   }
 
+  async #unfollowRelay () {
+    const activityId = await this._context.getData(`follow:${this.#relay}`)
+    this._context.logger.info(
+      { relay: this.#relay, activity: activityId },
+      'Unfollowing relay'
+    )
+    await this._context.doActivity({
+      to: this.#relay,
+      type: 'Undo',
+      object: {
+        id: activityId,
+        type: 'Follow',
+        object: 'https://www.w3.org/ns/activitystreams#Public'
+      }
+    })
+    this._context.logger.info(
+      { relay: this.#relay },
+      'Clearing follow data'
+    )
+    this._context.setData(`follow:${this.#relay}`, null)
+  }
+
   async actorOK (actorId, activity) {
-    return (actorId === this.#relay)
+    return (actorId === this.#relay && !this.#unsubscribe)
   }
 }

package/package.json

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