@evanp/activitypub-bot 0.39.2 → 0.39.4

package/lib/activitypubclient.js

@@ -160,15 +160,17 @@ export class ActivityPubClient {
     }
     this.#logger.debug({ headers }, 'Sending headers')
     const method = 'GET'
-    this.#logger.debug({ url: baseUrl }, 'Signing GET request')
     let storedPolicy, lastPolicy
     if (sign) {
+      this.#logger.debug({ url: baseUrl }, 'Signing GET request')
       storedPolicy = await this.#policyStorage.get(parsed.origin)
       if (!storedPolicy || storedPolicy === SignaturePolicyStorage.RFC9421) {
+        this.#logger.debug({ origin: parsed.origin, storedPolicy }, 'Signing with RFC 9421')
         lastPolicy = SignaturePolicyStorage.RFC9421
         const sigHeaders = await this.#messageSign({ username, url: baseUrl, method, headers })
         Object.assign(headers, sigHeaders || {})
       } else if (storedPolicy === SignaturePolicyStorage.DRAFT_CAVAGE_12) {
+        this.#logger.debug({ origin: parsed.origin, storedPolicy }, 'Signing with draft-cavage-12')
         lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
         headers.signature =
         await this.#sign({ username, url: baseUrl, method, headers })
@@ -190,6 +192,10 @@ export class ActivityPubClient {
     if ([401, 403].includes(res.status) &&
         sign &&
         !storedPolicy) {
+      const body = await res.text()
+      this.#logger.debug(
+        { url, status: res.status, body, headers: res.headers },
+        'Authentication error; retrying with draft-cavage-12 signature')
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
       delete headers['signature-input']
       headers.signature =
@@ -285,6 +291,9 @@ export class ActivityPubClient {
     let lastPolicy
     const storedPolicy = await this.#policyStorage.get(parsed.origin)
     if (!storedPolicy || storedPolicy === SignaturePolicyStorage.RFC9421) {
+      this.#logger.debug(
+        { origin: parsed.origin, storedPolicy }, 'Signing with RFC9421'
+      )
       lastPolicy = SignaturePolicyStorage.RFC9421
       headers = {
         ...baseHeaders,
@@ -293,6 +302,9 @@ export class ActivityPubClient {
       const sigHeaders = await this.#messageSign({ username, url, method, headers })
       Object.assign(headers, sigHeaders || {})
     } else if (storedPolicy === SignaturePolicyStorage.DRAFT_CAVAGE_12) {
+      this.#logger.debug(
+        { origin: parsed.origin, storedPolicy }, 'Signing with draft-cavage-12'
+      )
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
       headers = {
         ...baseHeaders,
@@ -315,6 +327,11 @@ export class ActivityPubClient {
       }
     )
     if ([401, 403].includes(res.status) && !storedPolicy) {
+      const body = await res.text()
+      this.#logger.debug(
+        { url, status: res.status, body, headers: res.headers },
+        'Authentication error; retrying with draft-cavage-12 signature'
+      )
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
       headers = {
         ...baseHeaders,
@@ -334,10 +351,15 @@ export class ActivityPubClient {
     await this.#limiter.update(hostname, res.headers)
     this.#logger.debug({ url }, 'Done fetching POST')
     if (res.status < 200 || res.status > 299) {
+      const body = await res.text()
+      this.#logger.debug(
+        { url, status: res.status, body, headers: res.headers },
+        'Error posting to url'
+      )
       throw new ActivityPubClientError(
         res.status,
         `Could not post to ${url}`,
-        { url, method, headers: res.headers }
+        { url, method, headers: res.headers, body }
       )
     }
     if (!storedPolicy && lastPolicy) {

package/package.json

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