@evanp/activitypub-bot 0.45.7 → 0.45.9

package/CHANGELOG.md

@@ -9,7 +9,19 @@ and this project adheres to
 
 ## [Unreleased]
 
-## [0.45.6] - 2026-04-27
+## [0.45.9] - 2026-04-29
+
+### Fixed
+
+- Don't infinitely retry on 429 status code.
+
+## [0.45.8] - 2026-04-29
+
+### Added
+
+- Log memory usage.
+
+## [0.45.7] - 2026-04-27
 
 ### Fixed
 

package/lib/app.js

@@ -2,6 +2,7 @@ import http from 'node:http'
 import { resolve, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { randomUUID } from 'node:crypto'
+import v8 from 'node:v8'
 
 import { Sequelize } from 'sequelize'
 import express from 'express'
@@ -69,6 +70,19 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     level: logLevel
   })
   logger.debug('Logger initialized')
+  const memoryStatus = (message = 'memory', level = 'debug') => {
+    const mem = process.memoryUsage()
+    const heap = v8.getHeapStatistics()
+    logger[level]({
+      rss: mem.rss,
+      heapUsed: mem.heapUsed,
+      heapTotal: mem.heapTotal,
+      external: mem.external,
+      arrayBuffers: mem.arrayBuffers,
+      heapSizeLimit: heap.heap_size_limit
+    }, message)
+  }
+  memoryStatus('makeApp started')
   const connection = databaseUrl === 'sqlite::memory:' || databaseUrl === 'sqlite::memory'
     ? new Sequelize({ dialect: 'sqlite', storage: ':memory:', logging: false })
     : new Sequelize(databaseUrl, { logging: false })
@@ -132,6 +146,8 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     await redisClient.connect()
   }
 
+  memoryStatus('services initialized')
+
   await Promise.all(
     Object.entries(bots).map(([key, bot]) => bot.initialize(
       new BotContext(
@@ -169,6 +185,8 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     bots
   ))
 
+  memoryStatus('bots initialized')
+
   const { workers: deliveryWorkers, runs: deliveryWorkerRuns } = createWorkers(logger, deliveryWorkerCount, DeliveryWorker, jobQueue, logger, { actorStorage, activityHandler, bots })
   const { workers: distributionWorkers, runs: distributionWorkerRuns } = createWorkers(logger, distributionWorkerCount, DistributionWorker, jobQueue, logger, { client })
   const { workers: fanoutWorkers, runs: fanoutWorkerRuns } = createWorkers(logger, fanoutWorkerCount, FanoutWorker, jobQueue, logger, { distributor })
@@ -179,6 +197,11 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     logger.error({ err }, 'unexpected error in job reaper')
   })
 
+  memoryStatus('workers initialized')
+
+  const memInterval = setInterval(() => memoryStatus('memory', 'info'), 60_000)
+  memInterval.unref()
+
   const app = express()
 
   app.locals = {
@@ -415,8 +438,11 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     }
     logger.info('Closing database connection')
     await connection.close()
+    clearInterval(memInterval)
     logger.info('Done')
   }
 
+  memoryStatus('app initialized', 'info')
+
   return app
 }

package/lib/distributionworker.js

@@ -44,13 +44,21 @@ export class DistributionWorker extends Worker {
           'Could not deliver activity due to client error'
         )
         if ([408, 425, 429].includes(err.status)) {
-          this._logger.debug(
-            { err, activity: activity.id, inbox },
-            'Retrying on recoverable status'
-          )
-          const recoverable = new RecoverableError(err.message)
-          recoverable.delay = this.#retryDelay(err.headers, attempts)
-          throw recoverable
+          if (attempts >= DistributionWorker.#MAX_ATTEMPTS) {
+            this._logger.warn(
+              { err, activity: activity.id, inbox, attempts },
+              'Could not deliver activity due to client error; no more attempts'
+            )
+            throw err
+          } else {
+            this._logger.debug(
+              { err, activity: activity.id, inbox },
+              'Retrying on recoverable status'
+            )
+            const recoverable = new RecoverableError(err.message)
+            recoverable.delay = this.#retryDelay(err.headers, attempts)
+            throw recoverable
+          }
         } else {
           throw err
         }
@@ -87,6 +95,12 @@ export class DistributionWorker extends Worker {
   }
 
   #retryDelay (headers, attempts) {
+    const headerDelay = this.#headerDelay(headers)
+    const attemptsDelay = this.#attemptsDelay(attempts)
+    return Math.max(headerDelay, attemptsDelay)
+  }
+
+  #headerDelay (headers) {
     if (headers?.['retry-after']) {
       this._logger.debug('using retry-after header')
       const retryAfter = headers['retry-after']
@@ -96,7 +110,10 @@ export class DistributionWorker extends Worker {
         return new Date(retryAfter) - Date.now()
       }
     }
-    this._logger.debug('exponential backoff')
+    return 0
+  }
+
+  #attemptsDelay (attempts) {
     return Math.round((2 ** (attempts - 1) * 1000) * (0.5 + Math.random()))
   }
 }

package/package.json

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