@evanp/activitypub-bot 0.46.2 → 0.46.4

package/CHANGELOG.md

@@ -9,6 +9,23 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [0.46.4] - 2026-05-25
+
+### Added
+
+- server_stats table to cache the calculations for nodeinfo.
+
+### Changed
+
+- nodeinfo uses cached server stats
+  when available.
+
+## [0.46.3] - 2026-05-25
+
+### Fixed
+
+- Inefficient index on actorcollectionpage.
+
 ## [0.46.2] - 2026-05-25
 
 ### Fixed

package/lib/app.js

@@ -53,6 +53,7 @@ import { HTTPMessageSignature } from './httpmessagesignature.js'
 import { SignaturePolicyStorage } from './signaturepolicystorage.js'
 import { SafeFetcher } from './safefetcher.js'
 import { EndpointCache } from './endpointcache.js'
+import { ServerStats } from './serverstats.js'
 
 const currentDir = dirname(fileURLToPath(import.meta.url))
 const DEFAULT_INDEX_FILENAME = resolve(currentDir, '..', 'web', 'index.html')
@@ -130,7 +131,7 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     client,
     jobQueue
   )
-
+  const stats = new ServerStats(keyStorage, actorStorage, formatter.hostname, connection)
   // TODO: Make an endpoint for tagged objects
   const transformer = new Transformer(
     origin + '/tag/', client, fetcher, formatter
@@ -222,7 +223,8 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
     deliverer,
     deliveryWorkers,
     indexFileName,
-    profileFileName
+    profileFileName,
+    stats
   }
 
   app.disable('x-powered-by')

package/lib/migrations/013-actor-outbox-createdat-username.js

@@ -0,0 +1,12 @@
+export const id = '013-actor-outbox-createdat-username'
+
+export async function up (connection, queryOptions = {}) {
+  await connection.query(`
+    DROP INDEX actorcollectionpage_outbox_createdat;
+  `, queryOptions)
+  await connection.query(`
+    CREATE INDEX actorcollectionpage_outbox_createdat_username
+    ON actorcollectionpage (createdat, username)
+    WHERE property = 'outbox';
+  `, queryOptions)
+}

package/lib/migrations/014-server-stats.js

@@ -0,0 +1,17 @@
+export const id = '014-server-stats'
+
+export async function up (connection, queryOptions = {}) {
+  const tsType = (connection.getDialect() === 'postgres')
+    ? 'TIMESTAMPTZ'
+    : 'TIMESTAMP'
+  await connection.query(`
+    CREATE TABLE server_stats (
+      domain VARCHAR(256) PRIMARY KEY,
+      total_users INT NOT NULL DEFAULT 0,
+      active_monthly INT NOT NULL DEFAULT 0,
+      active_half_yearly INT NOT NULL DEFAULT 0,
+      created_at ${tsType} NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      updated_at ${tsType}  NOT NULL DEFAULT CURRENT_TIMESTAMP
+    )
+  `, queryOptions)
+}

package/lib/routes/nodeinfo.js

@@ -33,10 +33,11 @@ router.get('/.well-known/nodeinfo', async (req, res, next) => {
 
 router.get('/nodeinfo/:nodeinfoVersion', async (req, res, next) => {
   const { nodeinfoVersion } = req.params
-  const { keyStorage, actorStorage } = req.app.locals
+  const { stats } = req.app.locals
   if (!VERSIONS.includes(nodeinfoVersion)) {
     throw new ProblemDetailsError(404, 'unsupported nodeinfo version')
   }
+  const data = await stats.get()
   res.status(200).json({
     version: nodeinfoVersion,
     software: {
@@ -51,9 +52,9 @@ router.get('/nodeinfo/:nodeinfoVersion', async (req, res, next) => {
     openRegistrations: false,
     usage: {
       users: {
-        total: await keyStorage.count(),
-        activeMonth: await actorStorage.activeUsers(30),
-        activeHalfyear: await actorStorage.activeUsers(180)
+        total: data.totalUsers,
+        activeMonth: data.activeMonthly,
+        activeHalfyear: data.activeHalfYearly
       }
     },
     metadata: {}

package/lib/serverstats.js

@@ -0,0 +1,80 @@
+import assert from 'node:assert'
+
+const STATS_EXPIRY = 24 * 60 * 60 * 1000
+
+export class ServerStats {
+  #keyStorage
+  #actorStorage
+  #domain
+  #connection
+
+  constructor (keyStorage, actorStorage, domain, connection) {
+    assert.strictEqual(typeof keyStorage, 'object')
+    assert.strictEqual(typeof actorStorage, 'object')
+    assert.strictEqual(typeof domain, 'string')
+    assert.strictEqual(typeof connection, 'object')
+
+    this.#keyStorage = keyStorage
+    this.#actorStorage = actorStorage
+    this.#domain = domain
+    this.#connection = connection
+  }
+
+  async get () {
+    let data = await this.#get()
+    if (!data || new Date() - data.updatedAt > STATS_EXPIRY) {
+      data = {
+        totalUsers: await this.#keyStorage.count(),
+        activeMonthly: await this.#actorStorage.activeUsers(30),
+        activeHalfYearly: await this.#actorStorage.activeUsers(180),
+        updatedAt: new Date()
+      }
+      await this.#update(data)
+    }
+    return data
+  }
+
+  async #update (data) {
+    await this.#connection.query(
+      `
+        INSERT INTO server_stats (domain, total_users, active_monthly, active_half_yearly)
+        VALUES (?, ?, ?, ?)
+        ON CONFLICT (domain) DO UPDATE
+        SET total_users = EXCLUDED.total_users,
+            active_monthly = EXCLUDED.active_monthly,
+            active_half_yearly = EXCLUDED.active_half_yearly,
+            updated_at = CURRENT_TIMESTAMP
+      `,
+      {
+        replacements: [
+          this.#domain,
+          data.totalUsers,
+          data.activeMonthly,
+          data.activeHalfYearly
+        ]
+      }
+    )
+    return data
+  }
+
+  async #get () {
+    const [rows] = await this.#connection.query(
+      `SELECT total_users, active_monthly, active_half_yearly, updated_at
+       FROM server_stats
+       WHERE domain = ?
+      ;`,
+      { replacements: [this.#domain] }
+    )
+
+    if (rows.length === 0) {
+      return null
+    } else {
+      return {
+        totalUsers: rows[0].total_users,
+        activeMonthly: rows[0].active_monthly,
+        activeHalfYearly: rows[0].active_half_yearly,
+        updatedAt: rows[0].updated_at
+      }
+    }
+  }
+}

package/package.json

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