@evanp/activitypub-bot 0.45.19 → 0.45.20

package/CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.45.20] - 2026-05-14
+
+### Fixed
+
+- Handle some pathological formats for request throttle resets -- epoch in
+  ms and offset in ms.
+
 ## [0.45.19] - 2026-05-14
 
 ### Changed

package/lib/requestthrottler.js

@@ -2,7 +2,8 @@ import { setTimeout as sleep } from 'node:timers/promises'
 import assert from 'node:assert'
 
 const BETA = 0.75
-const EPOCH_THRESHOLD = 30 * 24 * 60 * 60
+const OFFSET_THRESHOLD = 30 * 24 * 60 * 60
+const DEFAULT_RESET = 30 * 1000
 
 export class ThrottleError extends Error {
   constructor (message, waitTime) {
@@ -43,25 +44,33 @@ export class RequestThrottler {
     assert.strictEqual(typeof host, 'string')
     assert.strictEqual(typeof headers, 'object')
 
+    const retryAfterHeader = headers.get('retry-after')
     const resetHeader = headers.get('x-ratelimit-reset')
     const remainingHeader = headers.get('x-ratelimit-remaining')
 
-    if (resetHeader && remainingHeader) {
+    if (retryAfterHeader) {
+      const remaining = 0
+      const reset = this.#headerToReset(retryAfterHeader)
+      this.#logger.debug(
+        { reset, remaining, host, retryAfterHeader },
+        'updating'
+      )
+      await this.#connection.query(
+        `INSERT INTO rate_limit (host, remaining, reset)
+        VALUES (?, ?, ?)
+        ON CONFLICT (host) DO UPDATE
+        SET remaining = EXCLUDED.remaining,
+            reset = EXCLUDED.reset,
+            updated_at = CURRENT_TIMESTAMP`,
+        { replacements: [host, remaining, reset] }
+      )
+    } else if (resetHeader && remainingHeader) {
       const remaining = parseInt(remainingHeader)
-      let resetSeconds
-      let reset
-      if (resetHeader.match(/^\d+$/)) {
-        resetSeconds = parseInt(resetHeader)
-        if (resetSeconds < EPOCH_THRESHOLD) {
-          reset = new Date(Date.now() + (resetSeconds * 1000))
-        } else {
-          reset = new Date(resetSeconds * 1000)
-        }
-      } else {
-        reset = new Date(resetHeader)
-        resetSeconds = reset - Date.now()
-      }
-      this.#logger.debug({ reset, remaining, host }, 'updating')
+      const reset = this.#headerToReset(resetHeader)
+      this.#logger.debug(
+        { reset, remaining, host, resetHeader, remainingHeader },
+        'updating'
+      )
       await this.#connection.query(
         `INSERT INTO rate_limit (host, remaining, reset)
         VALUES (?, ?, ?)
@@ -165,4 +174,39 @@ export class RequestThrottler {
       { replacements: [host] }
     )
   }
+
+  #headerToReset (header) {
+    let reset
+    const now = Date.now()
+    if (header.match(/^\d+$/)) {
+      const num = parseInt(header)
+
+      if (num > now - (3600 * 1000)) {
+        // epoch in ms
+        reset = new Date(num)
+      } else if (num > (now / 1000) - 3600) {
+        // epoch in s
+        reset = new Date(num * 1000)
+      } else if (num < OFFSET_THRESHOLD) {
+        // offset in s
+        reset = new Date(now + (num * 1000))
+      } else if (num < OFFSET_THRESHOLD * 1000) {
+        // offset in ms
+        reset = new Date(now + num)
+      } else {
+        // no good guesses; default
+        reset = new Date(now + DEFAULT_RESET)
+      }
+    } else {
+      reset = new Date(header)
+      if (Number.isNaN(reset.getTime())) {
+        this.#logger.warn(
+          { header },
+          'Error parsing header for request throttling'
+        )
+        reset = new Date(now + DEFAULT_RESET)
+      }
+    }
+    return reset
+  }
 }

package/package.json

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