@evanp/activitypub-bot 0.30.4 → 0.30.6

package/lib/app.js

@@ -188,15 +188,20 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     }
   }))
 
-  app.use(signature.authenticate.bind(signature))
+  // These should not check HTTP Signature even if provided
 
   app.use('/', serverRouter)
+  app.use('/', healthRouter)
+  app.use('/', webfingerRouter)
+
+  // These should check HTTP Signature if provided
+
+  app.use(signature.authenticate.bind(signature))
+
   app.use('/', userRouter)
   app.use('/', collectionRouter)
   app.use('/', inboxRouter)
   app.use('/', objectRouter)
-  app.use('/', healthRouter)
-  app.use('/', webfingerRouter)
   app.use('/', sharedInboxRouter)
 
   app.use(async (req, res) => {

package/lib/ratelimiter.js

@@ -36,8 +36,15 @@ export class RateLimiter {
 
     if (resetHeader && remainingHeader) {
       const remaining = parseInt(remainingHeader)
-      const resetSeconds = parseInt(resetHeader)
-      const reset = new Date(Date.now() + (resetSeconds * 1000))
+      let resetSeconds
+      let reset
+      if (resetHeader.match(/^\d+$/)) {
+        resetSeconds = parseInt(resetHeader)
+        reset = new Date(Date.now() + (resetSeconds * 1000))
+      } else {
+        reset = new Date(resetHeader)
+        resetSeconds = reset - Date.now()
+      }
       this.#logger.debug({ reset, remaining, host }, 'updating')
       await this.#connection.query(
         `INSERT INTO rate_limit (host, remaining, reset)

package/package.json

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