@evanp/activitypub-bot 0.39.0 → 0.39.2

package/lib/activitypubclient.js

@@ -4,7 +4,6 @@ import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import fetch from 'node-fetch'
-import { ProblemDetailsError } from './errors.js'
 
 import as2 from './activitystreams.js'
 import { SignaturePolicyStorage } from './signaturepolicystorage.js'
@@ -23,6 +22,32 @@ const COLLECTION_TYPES = [
   `${NS}OrderedCollection`
 ]
 
+function normalizeHeaders (headers) {
+  if (!headers) {
+    return headers
+  }
+  if (typeof headers.forEach === 'function') {
+    const result = {}
+    headers.forEach((value, key) => {
+      result[key] = value
+    })
+    return result
+  }
+  return headers
+}
+
+export class ActivityPubClientError extends Error {
+  constructor (status, message, { url, method, headers, body } = {}) {
+    super(message)
+    this.name = 'ActivityPubClientError'
+    this.status = status
+    this.url = url
+    this.method = method
+    this.headers = normalizeHeaders(headers)
+    this.body = body
+  }
+}
+
 export class ActivityPubClient {
   static #githubUrl = 'https://github.com/evanp/activitypub-bot'
   static #userAgent = `activitypub.bot/${version} (${ActivityPubClient.#githubUrl})`
@@ -188,10 +213,10 @@ export class ActivityPubClient {
         { status: res.status, body, url: baseUrl },
         'Could not fetch url'
       )
-      throw new ProblemDetailsError(
-        500,
+      throw new ActivityPubClientError(
+        res.status,
         `Could not fetch ${baseUrl}`,
-        { headers: res.headers }
+        { url: baseUrl, method, headers: res.headers, body }
       )
     }
 
@@ -247,23 +272,32 @@ export class ActivityPubClient {
     const json = await obj.export()
     this.#fixupJson(json)
     const body = JSON.stringify(json)
-    const headers = {
+    const digest = await this.#digester.digest(body)
+    const contentDigest = await this.#digester.contentDigest(body)
+    const baseHeaders = {
       date: new Date().toUTCString(),
       'user-agent': ActivityPubClient.#userAgent,
-      'content-type': 'application/activity+json',
-      digest: await this.#digester.digest(body)
+      'content-type': 'application/activity+json'
     }
     const method = 'POST'
-    assert.ok(headers)
+    let headers
     this.#logger.debug({ url }, 'Signing POST')
     let lastPolicy
     const storedPolicy = await this.#policyStorage.get(parsed.origin)
     if (!storedPolicy || storedPolicy === SignaturePolicyStorage.RFC9421) {
       lastPolicy = SignaturePolicyStorage.RFC9421
+      headers = {
+        ...baseHeaders,
+        'content-digest': contentDigest
+      }
       const sigHeaders = await this.#messageSign({ username, url, method, headers })
       Object.assign(headers, sigHeaders || {})
     } else if (storedPolicy === SignaturePolicyStorage.DRAFT_CAVAGE_12) {
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
+      headers = {
+        ...baseHeaders,
+        digest
+      }
       headers.signature =
         await this.#sign({ username, url, method, headers })
     } else {
@@ -282,7 +316,10 @@ export class ActivityPubClient {
     )
     if ([401, 403].includes(res.status) && !storedPolicy) {
       lastPolicy = SignaturePolicyStorage.DRAFT_CAVAGE_12
-      delete headers['signature-input']
+      headers = {
+        ...baseHeaders,
+        digest
+      }
       headers.signature =
         await this.#sign({ username, url, method, headers })
       res = await fetch(url,
@@ -297,10 +334,10 @@ export class ActivityPubClient {
     await this.#limiter.update(hostname, res.headers)
     this.#logger.debug({ url }, 'Done fetching POST')
     if (res.status < 200 || res.status > 299) {
-      throw new ProblemDetailsError(
-        500,
+      throw new ActivityPubClientError(
+        res.status,
         `Could not post to ${url}`,
-        { headers: res.headers }
+        { url, method, headers: res.headers }
       )
     }
     if (!storedPolicy && lastPolicy) {

package/lib/app.js

@@ -9,7 +9,7 @@ import Logger from 'pino'
 import HTTPLogger from 'pino-http'
 
 import { ActivityDistributor } from './activitydistributor.js'
-import { ActivityPubClient } from './activitypubclient.js'
+import { ActivityPubClient, ActivityPubClientError } from './activitypubclient.js'
 import { ActorStorage } from './actorstorage.js'
 import { BotDataStorage } from './botdatastorage.js'
 import { KeyStorage } from './keystorage.js'
@@ -255,31 +255,46 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
 
   app.use((err, req, res, next) => {
     const { logger } = req.app.locals
-    let status = 500
-    if (err.status) {
-      status = err.status
-    }
-    const title = (http.STATUS_CODES[status])
-      ? http.STATUS_CODES[status]
-      : 'Unknown Status'
-
-    if (status >= 500 && status < 600) {
-      logger.error(err)
-    } else if (status >= 400 && status < 500) {
-      logger.warn(err)
+    if (err instanceof ActivityPubClientError) {
+      logger.error({
+        err,
+        status: err.status,
+        url: err.url,
+        method: err.method
+      }, 'ActivityPub client request failed')
+      res.status(500).type('application/problem+json').json({
+        type: 'about:blank',
+        title: 'Internal Server Error',
+        status: 500,
+        detail: 'Internal Server Error'
+      })
     } else {
-      logger.debug(err)
-    }
-    const type = err.type || 'about:blank'
-    const problemTitle = err.title || title
-    const extra = Object.fromEntries(
-      Object.entries(err).filter(
-        ([k]) => !['status', 'type', 'title', 'detail', 'stack'].includes(k)
+      let status = 500
+      if (err.status) {
+        status = err.status
+      }
+      const title = (http.STATUS_CODES[status])
+        ? http.STATUS_CODES[status]
+        : 'Unknown Status'
+
+      if (status >= 500 && status < 600) {
+        logger.error(err)
+      } else if (status >= 400 && status < 500) {
+        logger.warn(err)
+      } else {
+        logger.debug(err)
+      }
+      const type = err.type || 'about:blank'
+      const problemTitle = err.title || title
+      const extra = Object.fromEntries(
+        Object.entries(err).filter(
+          ([k]) => !['status', 'type', 'title', 'detail', 'stack'].includes(k)
+        )
       )
-    )
-    res.status(status)
-    res.type('application/problem+json')
-    res.json({ type, title: problemTitle, status, detail: err.message, ...extra })
+      res.status(status)
+      res.type('application/problem+json')
+      res.json({ type, title: problemTitle, status, detail: err.message, ...extra })
+    }
   })
 
   app.onIdle = async () => {

package/lib/httpmessagesignature.js

@@ -15,7 +15,7 @@ export class HTTPMessageSignature {
   constructor (logger) {
     assert.ok(logger)
     assert.strictEqual(typeof logger, 'object')
-    this.#logger = logger
+    this.#logger = logger.child({ class: this.constructor.name })
   }
 
   keyId (signatureInput) {

package/lib/ratelimiter.js

@@ -11,7 +11,7 @@ export class RateLimiter {
     assert.strictEqual(typeof connection, 'object')
     assert.strictEqual(typeof logger, 'object')
     this.#connection = connection
-    this.#logger = logger
+    this.#logger = logger.child({ class: this.constructor.name })
   }
 
   async limit (host, maxWaitTime = 30000) {

package/lib/remoteobjectcache.js

@@ -15,7 +15,7 @@ export class RemoteObjectCache {
     assert.ok(connection)
     assert.ok(logger)
     this.#connection = connection
-    this.#logger = logger
+    this.#logger = logger.child({ class: this.constructor.name })
   }
 
   async get (id, username) {

package/lib/signaturepolicystorage.js

@@ -18,7 +18,7 @@ export class SignaturePolicyStorage {
     assert.ok(logger)
     assert.strictEqual(typeof logger, 'object')
     this.#connection = connection
-    this.#logger = logger
+    this.#logger = logger.child({ class: this.constructor.name })
   }
 
   async get (origin) {

package/package.json

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