@atproto/ozone 0.2.5 → 0.2.7

package/src/api/index.ts

@@ -41,6 +41,7 @@ import getLatestReport from './report/getLatestReport.js'
 import getLiveStats from './report/getLiveStats.js'
 import getReport from './report/getReport.js'
 import listActivities from './report/listActivities.js'
+import queryActivities from './report/queryActivities.js'
 import queryReports from './report/queryReports.js'
 import reassignQueue from './report/reassignQueue.js'
 import refreshStats from './report/refreshStats.js'
@@ -139,6 +140,7 @@ export default function (server: Server, ctx: AppContext) {
   getReportAssignments(server, ctx)
   createActivity(server, ctx)
   listActivities(server, ctx)
+  queryActivities(server, ctx)
   reassignQueue(server, ctx)
   return server
 }

package/src/api/report/queryActivities.ts

@@ -0,0 +1,64 @@
+import { AppContext } from '../../context.js'
+import { Server } from '../../lexicon/index.js'
+import { ReportView } from '../../lexicon/types/tools/ozone/report/defs.js'
+import { getReportsByIds } from '../../mod-service/report.js'
+import {
+  formatActivityView,
+  queryReportActivities,
+} from '../../report/activity.js'
+import { buildReportView, hydrateReportInfo } from '../../report/views.js'
+import { getPdsAccountInfos } from '../util.js'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.report.queryActivities({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params, auth, req }) => {
+      const db = ctx.db
+      const modService = ctx.modService(db)
+      const labelers = ctx.reqLabelers(req)
+
+      const { activities, cursor: nextCursor } = await queryReportActivities(
+        db,
+        params,
+      )
+
+      // Dedupe report IDs across the page. Many activities can share the
+      // same report so we want one bulk fetch + hydrate rather than N.
+      const reportIds = Array.from(new Set(activities.map((a) => a.reportId)))
+
+      const queueService = ctx.queueService(db)
+      const teamService = ctx.teamService(db)
+      const reports = await getReportsByIds(db, reportIds)
+      const hydrated = await hydrateReportInfo(
+        reports,
+        modService.views,
+        (dids) => getPdsAccountInfos(ctx, dids),
+        (queueIds) => queueService.getViewsByIds(queueIds),
+        (dids) => teamService.viewByDids(dids),
+        labelers,
+      )
+      const reportViews = new Map<number, ReportView>()
+      for (const report of reports) {
+        reportViews.set(
+          report.id,
+          buildReportView(report, hydrated, auth.credentials.isModerator),
+        )
+      }
+
+      const createdByDids = Array.from(
+        new Set(activities.map((a) => a.createdBy)),
+      )
+      const memberViews = await teamService.viewByDids(createdByDids)
+
+      return {
+        encoding: 'application/json',
+        body: {
+          activities: activities.map((activity) =>
+            formatActivityView(activity, memberViews, reportViews),
+          ),
+          cursor: nextCursor,
+        },
+      }
+    },
+  })
+}

package/src/background.ts

@@ -9,9 +9,19 @@ import {
 
 type Task = (db: Database, signal: AbortSignal) => Promise<void>
 
+export type BackgroundQueueOptions = NonNullable<
+  ConstructorParameters<typeof PQueue>[0]
+> & {
+  concurrency: number
+}
+
 /**
  * A simple queue for in-process, out-of-band/backgrounded work
  */
+// @NOTE Keep this in sync with the BackgroundQueue in
+// - packages/bsky/src/data-plane/server/background.ts
+// - packages/ozone/src/background.ts
+// - packages/pds/src/background.ts
 export class BackgroundQueue {
   private abortController = new AbortController()
   private queue: PQueue
@@ -26,9 +36,9 @@ export class BackgroundQueue {
 
   constructor(
     protected db: Database,
-    queueOpts?: { concurrency?: number },
+    options: BackgroundQueueOptions,
   ) {
-    this.queue = new PQueue(queueOpts ?? { concurrency: 20 })
+    this.queue = new PQueue(options)
   }
 
   getStats() {
@@ -76,7 +86,8 @@ export class BackgroundQueue {
   }
 
   async processAll() {
-    await this.queue.onIdle()
+    const { queue } = this
+    while (queue.size || queue.pending) await queue.onIdle()
   }
 
   /**
@@ -86,8 +97,12 @@ export class BackgroundQueue {
    * only once http connections have drained (tasks no longer being added).
    */
   async destroy() {
+    if (this.destroyed) {
+      dbLogger.warn('BackgroundQueue.destroy() called multiple times')
+    }
+
     this.abortController.abort()
-    await this.queue.onIdle()
+    return this.processAll()
   }
 }
 

package/src/context.ts

@@ -135,7 +135,7 @@ export class AppContext {
         keypair: signingKey,
       })
 
-    const backgroundQueue = new BackgroundQueue(db)
+    const backgroundQueue = new BackgroundQueue(db, { concurrency: 20 })
     const blobDiverter = cfg.blobDivert
       ? new BlobDiverter(db, {
           idResolver,

package/src/daemon/context.ts

@@ -73,7 +73,7 @@ export class DaemonContext {
       pds: cfg.pds ?? undefined,
     })
 
-    const backgroundQueue = new BackgroundQueue(db)
+    const backgroundQueue = new BackgroundQueue(db, { concurrency: 20 })
 
     const settingService = SettingService.creator()
     const strikeService = StrikeService.creator()

package/src/daemon/verification-listener.ts

@@ -156,9 +156,14 @@ export class VerificationListener {
     })
   }
 
-  stop() {
-    this.jetstream?.close()
-    this.backgroundQueue.destroy()
-    this.destroyed = true
+  async stop() {
+    if (!this.destroyed) {
+      this.destroyed = true
+      try {
+        await this.jetstream?.close()
+      } finally {
+        await this.backgroundQueue.destroy()
+      }
+    }
   }
 }

package/src/db/migrations/20260602T120000000Z-add-report-activity-created-index.ts

@@ -0,0 +1,17 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  // Supports time-ordered scans across all reports for downstream pollers
+  // (e.g. Nimbus' report-activity watcher). The existing indexes are all
+  // leading-`reportId`, which would force a sequential scan for global
+  // ordered queries.
+  await db.schema
+    .createIndex('idx_report_activity_created')
+    .on('report_activity')
+    .columns(['createdAt', 'id'])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropIndex('idx_report_activity_created').execute()
+}

package/src/db/migrations/index.ts

@@ -41,3 +41,4 @@ export * as _20260313T000000000Z from './20260313T000000000Z-add-report-activity
 export * as _20260318T152058935Z from './20260318T152058935Z-add-report-stat.js'
 export * as _20260428T000000000Z from './20260428T000000000Z-add-expiring-tag-table.js'
 export * as _20260513T202941104Z from './20260513T202941104Z-add-subject-convo-id.js'
+export * as _20260602T120000000Z from './20260602T120000000Z-add-report-activity-created-index.js'

package/src/index.ts

@@ -4,11 +4,8 @@ import { AddressInfo } from 'node:net'
 import compression from 'compression'
 import cors from 'cors'
 import express from 'express'
-// eslint-disable-next-line import/default, import/no-named-as-default-member
+// eslint-disable-next-line import/default
 import httpTerminator from 'http-terminator'
-// eslint-disable-next-line import/no-named-as-default-member
-const { createHttpTerminator } = httpTerminator
-type HttpTerminator = ReturnType<typeof createHttpTerminator>
 import { DAY, SECOND } from '@atproto/common'
 import API, { health, wellKnown } from './api/index.js'
 import { OzoneConfig, OzoneSecrets } from './config/index.js'
@@ -29,7 +26,7 @@ export class OzoneService {
   public ctx: AppContext
   public app: express.Application
   public server?: http.Server
-  private terminator?: HttpTerminator
+  private terminator?: httpTerminator.HttpTerminator
   private dbStatsInterval?: NodeJS.Timeout
 
   constructor(opts: { ctx: AppContext; app: express.Application }) {
@@ -108,23 +105,25 @@ export class OzoneService {
     // so we need to sync them from env var to the database
     await this.seedInitialMembers()
 
-    const { db, backgroundQueue } = this.ctx
     this.dbStatsInterval = setInterval(() => {
       dbLogger.info(
         {
-          idleCount: db.pool.idleCount,
-          totalCount: db.pool.totalCount,
-          waitingCount: db.pool.waitingCount,
+          idleCount: this.ctx.db.pool.idleCount,
+          totalCount: this.ctx.db.pool.totalCount,
+          waitingCount: this.ctx.db.pool.waitingCount,
         },
         'db pool stats',
       )
-      dbLogger.info(backgroundQueue.getStats(), 'background queue stats')
+      dbLogger.info(
+        this.ctx.backgroundQueue.getStats(),
+        'background queue stats',
+      )
     }, 10000)
     await this.ctx.sequencer.start()
     const server = this.app.listen(this.ctx.cfg.service.port)
     this.server = server
     server.keepAliveTimeout = 90000
-    this.terminator = createHttpTerminator({ server })
+    this.terminator = httpTerminator.createHttpTerminator({ server })
     await events.once(server, 'listening')
     const { port } = server.address() as AddressInfo
     this.ctx.assignPort(port)
@@ -132,12 +131,23 @@ export class OzoneService {
   }
 
   async destroy(): Promise<void> {
-    await this.terminator?.terminate()
-    await this.ctx.backgroundQueue.destroy()
-    await this.ctx.sequencer.destroy()
-    await this.ctx.db.close()
     clearInterval(this.dbStatsInterval)
     this.dbStatsInterval = undefined
+
+    // @TODO Use a disposable stack when Node24 becomes the min supported version
+    try {
+      await this.terminator?.terminate()
+    } finally {
+      try {
+        await this.ctx.backgroundQueue.destroy()
+      } finally {
+        try {
+          await this.ctx.sequencer.destroy()
+        } finally {
+          await this.ctx.db.close()
+        }
+      }
+    }
   }
 }
 

package/src/jetstream/service.ts

@@ -99,7 +99,9 @@ export class Jetstream {
   /**
    * Closes the WebSocket connection.
    */
-  close() {
+  async close() {
+    // @TODO This should return a promise that fulfills when the connection is
+    // fully closed.
     this.ws?.ws?.close()
   }
 }

package/src/mod-service/report.ts

@@ -175,6 +175,25 @@ export async function getReportById(
     .executeTakeFirst()
 }
 
+export async function getReportsByIds(
+  db: Database,
+  ids: number[],
+): Promise<ReportWithEvent[]> {
+  if (!ids.length) return []
+  return reportQuery(db)
+    .where('r.id', 'in', ids)
+    .selectAll('r')
+    .select([
+      'me.subjectDid',
+      'me.subjectUri',
+      'me.subjectCid',
+      'me.createdBy as reportedBy',
+      'me.comment',
+      'me.meta',
+    ])
+    .execute()
+}
+
 export async function getLatestReport(
   db: Database,
 ): Promise<ReportWithEvent | undefined> {

package/src/report/activity.ts

@@ -1,5 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Database } from '../db/index.js'
+import { TimeIdKeyset, paginate } from '../db/pagination.js'
+import { ReportView } from '../lexicon/types/tools/ozone/report/defs.js'
+import { QueryParams as QueryActivitiesParams } from '../lexicon/types/tools/ozone/report/queryActivities.js'
 import { Member } from '../lexicon/types/tools/ozone/team/defs.js'
 import {
   AlreadyInTargetState,
@@ -190,6 +193,48 @@ export async function listReportActivities(
   return { activities, cursor: nextCursor }
 }
 
+export async function queryReportActivities(
+  db: Database,
+  params: QueryActivitiesParams,
+) {
+  const {
+    activityTypes,
+    createdAfter,
+    createdBefore,
+    sortDirection,
+    limit,
+    cursor,
+  } = params
+  const { ref } = db.db.dynamic
+
+  let builder = db.db.selectFrom('report_activity').selectAll()
+
+  if (activityTypes && activityTypes.length > 0) {
+    builder = builder.where('activityType', 'in', activityTypes)
+  }
+  if (createdAfter) {
+    builder = builder.where('createdAt', '>=', createdAfter)
+  }
+  if (createdBefore) {
+    builder = builder.where('createdAt', '<=', createdBefore)
+  }
+
+  const keyset = new TimeIdKeyset(
+    ref('report_activity.createdAt'),
+    ref('report_activity.id'),
+  )
+  const paginatedBuilder = paginate(builder, {
+    limit,
+    cursor,
+    keyset,
+    direction: sortDirection,
+    tryIndex: true,
+  })
+
+  const activities = await paginatedBuilder.execute()
+  return { activities, cursor: keyset.packFromResult(activities) }
+}
+
 function buildActivityObject(
   activityType: string,
   previousStatus: string | null,
@@ -215,6 +260,7 @@ export function formatActivityView(
     createdAt: string
   },
   memberViews?: Map<string, Member>,
+  reportViews?: Map<number, ReportView>,
 ) {
   return {
     id: activity.id,
@@ -229,6 +275,7 @@ export function formatActivityView(
     isAutomated: activity.isAutomated,
     createdBy: activity.createdBy,
     moderator: memberViews?.get(activity.createdBy),
+    report: reportViews?.get(activity.reportId),
     createdAt: activity.createdAt,
   }
 }

package/tests/3p-labeler.test.ts

@@ -53,8 +53,8 @@ describe('labels from 3p labelers', () => {
   })
 
   afterAll(async () => {
-    await network.close()
-    await thirdPartyLabeler.close()
+    await network?.close()
+    await thirdPartyLabeler?.close()
   })
 
   const getPostSubject = () => ({

package/tests/_util.ts

@@ -1,6 +1,7 @@
-import { Server } from 'node:http'
+import { RequestListener, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { type Express } from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import { CID } from 'multiformats/cid'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
@@ -215,19 +216,11 @@ export const stripViewerFromThread = <T extends ThreadViewPost>(
   return thread
 }
 
-export async function startServer(app: Express) {
-  return new Promise<{
-    origin: string
-    server: Server
-    stop: () => Promise<void>
-  }>((resolve, reject) => {
+export async function startServer(listener: RequestListener) {
+  return new Promise<AsyncDisposable & { port: number }>((resolve, reject) => {
     const onListen = () => {
       const port = (server.address() as AddressInfo).port
-      resolve({
-        server,
-        origin: `http://localhost:${port}`,
-        stop: () => stopServer(server),
-      })
+      resolve({ port, [Symbol.asyncDispose]: () => terminator.terminate() })
       cleanup()
     }
     const onError = (err: Error) => {
@@ -239,21 +232,11 @@ export async function startServer(app: Express) {
       server.removeListener('error', onError)
     }
 
-    const server = app
+    const server = createServer(listener)
       .listen(0)
       .once('listening', onListen)
       .once('error', onError)
-  })
-}
 
-export async function stopServer(server: Server) {
-  return new Promise<void>((resolve, reject) => {
-    server.close((err) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve()
-      }
-    })
+    const terminator = httpTerminator.createHttpTerminator({ server })
   })
 }

package/tests/account-strikes.test.ts

@@ -65,7 +65,7 @@ describe('account-strikes', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('tracks strikes and exposes them through queryStatuses and queryEvents', async () => {

package/tests/ack-all-subjects-of-account.test.ts

@@ -93,7 +93,7 @@ describe('acknowledge all subjects of account', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('acknowledges all open/escalated review subjects with takedown.', async () => {

package/tests/age-assurance.test.ts

@@ -22,7 +22,7 @@ describe('age assurance events', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('handles age assurance events from user', async () => {

package/tests/blob-divert.test.ts

@@ -30,7 +30,7 @@ describe('blob divert', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const mockReportServiceResponse = (succeeds: boolean) => {

package/tests/communication-templates.test.ts

@@ -18,7 +18,7 @@ describe('communication-templates', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const templateOne = {

package/tests/content-tagger.test.ts

@@ -23,7 +23,7 @@ describe('moderation subject content tagging', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getStatus = async (subject: string) => {

package/tests/db.test.ts

@@ -15,7 +15,7 @@ describe('db', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('handles client errors without crashing.', async () => {

package/tests/expiring-label.test.ts

@@ -25,7 +25,7 @@ describe('expiring label', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const emitExpiringLabel = async (did: string) =>

package/tests/expiring-tags.test.ts

@@ -23,7 +23,7 @@ describe('expiring tags', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const emitTagEvent = (

package/tests/get-account-timeline.test.ts

@@ -62,7 +62,7 @@ describe('account timeline', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('Returns entire timeline of events for a given account', async () => {

package/tests/get-config.test.ts

@@ -19,7 +19,7 @@ describe('get-config', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getConfig = async (role: 'moderator' | 'admin' | 'triage') => {

package/tests/get-lists.test.ts

@@ -35,8 +35,9 @@ describe('admin get lists', () => {
   })
 
   afterAll(async () => {
+    // @TODO figure out why we even need this in afterAll ?
     AtpAgent.configure({ appLabelers: [BSKY_LABELER_DID] })
-    await network.close()
+    await network?.close()
   })
 
   const getAlicesList = async () => {

package/tests/get-profiles.test.ts

@@ -26,7 +26,7 @@ describe('get profiles through ozone', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows getting profiles by dids for takendown accounts.', async () => {

package/tests/get-record.test.ts

@@ -38,7 +38,7 @@ describe('admin get record view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-records.test.ts

@@ -37,7 +37,7 @@ describe('admin get records view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-repo.test.ts

@@ -43,7 +43,7 @@ describe('admin get repo view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-report.test.ts

@@ -29,7 +29,7 @@ describe('ozone-get-report', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('returns a single report by id', async () => {

package/tests/get-reporter-stats.test.ts

@@ -28,7 +28,7 @@ describe('reporter-stats', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getReporterStats = async (

package/tests/get-repos.test.ts

@@ -43,7 +43,7 @@ describe('admin get multiple repos', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/get-starter-pack.test.ts

@@ -30,7 +30,7 @@ describe('admin get starter pack view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {