@atproto/ozone 0.2.5 → 0.2.7

package/tests/get-subjects.test.ts

@@ -37,7 +37,7 @@ describe('admin get multiple subjects with all relevant details', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/mod-tool.test.ts

@@ -21,7 +21,7 @@ describe('mod-tool tracking', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('stores and returns modTool with name and meta metadata', async () => {

package/tests/moderation-appeals.test.ts

@@ -30,7 +30,7 @@ describe('moderation-appeals', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const assertSubjectStatus = async (

package/tests/moderation-events.test.ts

@@ -75,7 +75,7 @@ describe('moderation-events', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('query events', () => {

package/tests/moderation-status-tags.test.ts

@@ -24,7 +24,7 @@ describe('moderation-status-tags', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('manage tags on subject status', () => {

package/tests/moderation-statuses.test.ts

@@ -80,7 +80,7 @@ describe('moderation-statuses', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('query statuses', () => {

package/tests/moderation.test.ts

@@ -81,7 +81,7 @@ describe('moderation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('reporting', () => {

package/tests/protected-tags.test.ts

@@ -30,7 +30,7 @@ describe('protected-tags', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('Settings management', () => {

package/tests/query-labels.test.ts

@@ -70,7 +70,7 @@ describe('ozone query labels', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('returns all labels', async () => {

package/tests/query-reports.test.ts

@@ -91,7 +91,7 @@ describe('query-reports', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('queryReports', () => {

package/tests/queue-assignment.test.ts

@@ -106,7 +106,7 @@ describe('queue', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('get active assignments', async () => {

package/tests/queue-router.test.ts

@@ -91,7 +91,7 @@ describe('queue-router', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('inserts report rows with no queue assignment when no queues are configured', async () => {

package/tests/queues.test.ts

@@ -109,7 +109,7 @@ describe('ozone-queues', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('createQueue', () => {

package/tests/record-and-account-events.test.ts

@@ -32,7 +32,7 @@ describe('record and account events on moderation subjects', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getSubjectStatus = async (

package/tests/repo-search.test.ts

@@ -28,10 +28,10 @@ describe('admin repo search view', () => {
       ids.ToolsOzoneModerationSearchRepos,
     )
     await network.processAll()
-  }, 20_000) // @NOTE seeding can take a while
+  }, 40_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   beforeAll(async () => {

package/tests/report-action.test.ts

@@ -29,7 +29,7 @@ describe('report-action', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('emitEvent with reportAction', () => {

package/tests/report-activity.test.ts

@@ -75,7 +75,7 @@ describe('report-activity', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('createActivity — noteActivity', () => {
@@ -564,4 +564,148 @@ describe('report-activity', () => {
       expect(data.activities.some((a) => a.reportId === reportB.id)).toBe(false)
     })
   })
+
+  describe('queryActivities', () => {
+    const queryActivities = async (
+      params: {
+        activityTypes?: string[]
+        createdAfter?: string
+        createdBefore?: string
+        sortDirection?: 'asc' | 'desc'
+        limit?: number
+        cursor?: string
+      },
+      role: 'admin' | 'triage' = 'admin',
+    ) => {
+      return agent.tools.ozone.report.queryActivities(params, {
+        headers: await network.ozone.modHeaders(
+          ids.ToolsOzoneReportQueryActivities,
+          role,
+        ),
+      })
+    }
+
+    it('hydrates the report on each activity', async () => {
+      const report = await createReport(sc.dids.alice)
+      await createActivity({
+        reportId: report.id,
+        activity: { $type: `${DEFS}#closeActivity` },
+      })
+
+      const { data } = await queryActivities({
+        activityTypes: ['closeActivity'],
+        sortDirection: 'desc',
+        limit: 100,
+      })
+      const hit = data.activities.find((a) => a.reportId === report.id)
+      expect(hit).toBeDefined()
+      expect(hit!.report).toBeDefined()
+      expect(hit!.report!.id).toBe(report.id)
+      expect(hit!.report!.subject).toBeDefined()
+    })
+
+    it('filters by activity types across reports', async () => {
+      const reportA = await createReport(sc.dids.alice)
+      const reportB = await createReport(sc.dids.bob)
+      await createActivity({
+        reportId: reportA.id,
+        activity: { $type: `${DEFS}#noteActivity` },
+        internalNote: 'note',
+      })
+      await createActivity({
+        reportId: reportA.id,
+        activity: { $type: `${DEFS}#closeActivity` },
+      })
+      await createActivity({
+        reportId: reportB.id,
+        activity: { $type: `${DEFS}#escalationActivity` },
+      })
+
+      const { data } = await queryActivities({
+        activityTypes: ['closeActivity', 'escalationActivity'],
+        sortDirection: 'asc',
+      })
+
+      const types = new Set(data.activities.map((a) => a.activity.$type))
+      expect(types.has(`${DEFS}#noteActivity`)).toBe(false)
+      expect(types.has(`${DEFS}#closeActivity`)).toBe(true)
+      expect(types.has(`${DEFS}#escalationActivity`)).toBe(true)
+      const reportIds = new Set(data.activities.map((a) => a.reportId))
+      expect(reportIds.has(reportA.id)).toBe(true)
+      expect(reportIds.has(reportB.id)).toBe(true)
+    })
+
+    it('paginates ascending across multiple reports with stable cursor', async () => {
+      const reportA = await createReport(sc.dids.alice)
+      const reportB = await createReport(sc.dids.bob)
+      const created: number[] = []
+      for (let i = 0; i < 3; i++) {
+        const r = await createActivity({
+          reportId: i % 2 === 0 ? reportA.id : reportB.id,
+          activity: { $type: `${DEFS}#noteActivity` },
+          internalNote: `n-${i}`,
+        })
+        created.push(r.data.activity.id)
+      }
+      const minId = Math.min(...created)
+
+      const seen: number[] = []
+      let cursor: string | undefined
+      let pages = 0
+      do {
+        const { data } = await queryActivities({
+          sortDirection: 'asc',
+          limit: 2,
+          cursor,
+        })
+        for (const a of data.activities) {
+          if (a.id >= minId) seen.push(a.id)
+        }
+        cursor = data.cursor
+        pages++
+        if (pages > 50) break // safety net for runaway loops
+      } while (cursor)
+
+      // The created activities should appear in ascending ID order, no dupes.
+      const sortedCreated = [...created].sort((a, b) => a - b)
+      const seenForCreated = seen.filter((id) => created.includes(id))
+      expect(seenForCreated).toEqual(sortedCreated)
+    })
+
+    it('respects createdBefore and createdAfter bounds', async () => {
+      const report = await createReport(sc.dids.alice)
+      const before = await createActivity({
+        reportId: report.id,
+        activity: { $type: `${DEFS}#noteActivity` },
+        internalNote: 'before',
+      })
+      // Small wait so the next activity's createdAt is strictly later.
+      await new Promise((r) => setTimeout(r, 50))
+      const cutoff = new Date().toISOString()
+      await new Promise((r) => setTimeout(r, 50))
+      const after = await createActivity({
+        reportId: report.id,
+        activity: { $type: `${DEFS}#noteActivity` },
+        internalNote: 'after',
+      })
+
+      const beforeRes = await queryActivities({
+        createdBefore: cutoff,
+        sortDirection: 'asc',
+        limit: 100,
+      })
+      const beforeIds = new Set(beforeRes.data.activities.map((a) => a.id))
+      expect(beforeIds.has(before.data.activity.id)).toBe(true)
+      expect(beforeIds.has(after.data.activity.id)).toBe(false)
+
+      const afterRes = await queryActivities({
+        createdAfter: cutoff,
+        sortDirection: 'asc',
+        limit: 100,
+      })
+      const afterIds = new Set(afterRes.data.activities.map((a) => a.id))
+      expect(afterIds.has(before.data.activity.id)).toBe(false)
+      expect(afterIds.has(after.data.activity.id)).toBe(true)
+    })
+  })
 })

package/tests/report-assignment.test.ts

@@ -132,7 +132,7 @@ describe('report-assignment', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('can get assignment history', async () => {

package/tests/report-muting.test.ts

@@ -29,7 +29,7 @@ describe('report-muting', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const assertSubjectStatus = async (

package/tests/report-reason.test.ts

@@ -45,7 +45,7 @@ describe('report reason', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('createReport', () => {

package/tests/report-reassign-queue.test.ts

@@ -143,7 +143,7 @@ describe('report-reassign-queue', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('happy path: assigning to a real queue', () => {

package/tests/report-routing.test.ts

@@ -122,7 +122,7 @@ describe('queue-router', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('routes unassigned AND unmatched reports to a newly created queue', async () => {

package/tests/report-stats.test.ts

@@ -119,7 +119,7 @@ describe('report-stats', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('aggregate', () => {

package/tests/revoke-account-credentials.test.ts

@@ -21,7 +21,7 @@ describe('revoke account credentials event', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('fails on non account subjects and for non admins', async () => {

package/tests/safelink.test.ts

@@ -29,7 +29,7 @@ describe('safelink management', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('addRule', () => {

package/tests/scheduled-action-processor.test.ts

@@ -73,7 +73,7 @@ describe('scheduled action processor', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('findAndExecuteScheduledActions', () => {

package/tests/scheduled-action.test.ts

@@ -57,7 +57,7 @@ describe('scheduled action management', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('scheduleAction', () => {

package/tests/sequencer.test.ts

@@ -21,7 +21,7 @@ describe('sequencer', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const loadFromDb = (lastSeen: number) => {

package/tests/server.test.ts

@@ -15,7 +15,7 @@ describe('server', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('preserves 404s.', async () => {
@@ -30,17 +30,14 @@ describe('server', () => {
       })
       .use(errorHandler)
 
-    const { origin, stop } = await startServer(app)
-    try {
-      const response = await fetch(new URL(`/oops`, origin))
-      expect(response.status).toEqual(500)
-      await expect(response.json()).resolves.toEqual({
-        error: 'InternalServerError',
-        message: 'Internal Server Error',
-      })
-    } finally {
-      await stop()
-    }
+    await using server = await startServer(app)
+
+    const response = await fetch(`http://localhost:${server.port}/oops`)
+    expect(response.status).toEqual(500)
+    await expect(response.json()).resolves.toEqual({
+      error: 'InternalServerError',
+      message: 'Internal Server Error',
+    })
   })
 
   it('healthcheck succeeds when database is available.', async () => {

package/tests/sets.test.ts

@@ -97,7 +97,7 @@ describe('ozone-sets', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('querySets', () => {

package/tests/settings.test.ts

@@ -68,7 +68,7 @@ describe('ozone-settings', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('upsertOption', () => {

package/tests/strike-expiry-processor.test.ts

@@ -68,7 +68,7 @@ describe('strike expiry processor', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('processes expired strikes and updates active strike count', async () => {

package/tests/subject-priority-score.test.ts

@@ -49,7 +49,7 @@ describe('moderation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows setting a priority score.', async () => {

package/tests/takedown.test.ts

@@ -37,7 +37,7 @@ describe('moderation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows specifying policy for takedown actions.', async () => {

package/tests/team.test.ts

@@ -36,7 +36,7 @@ describe('team management', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('listMembers', () => {

package/tests/verification-listener.test.ts

@@ -1,4 +1,9 @@
-import { Sender, WebSocketServer } from 'ws'
+import { once } from 'node:events'
+import { createServer } from 'node:http'
+import { AddressInfo } from 'node:net'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
+import { WebSocket, WebSocketServer } from 'ws'
 import { AppBskyGraphVerification, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from './_util.js'
@@ -8,16 +13,38 @@ describe('verification-listener', () => {
   let sc: SeedClient
   let adminAgent: AtpAgent
   let jetstream: WebSocketServer
-  let relay: Sender
+  let relay: WebSocket
+  let terminator: httpTerminator.HttpTerminator
 
   beforeAll(async () => {
-    const jetstreamPort = 2511
-    jetstream = new WebSocketServer({
-      port: jetstreamPort,
-    })
-    jetstream.on('connection', (ws) => {
-      relay = ws
+    const server = createServer()
+    terminator = httpTerminator.createHttpTerminator({ server })
+
+    await once(server.listen(0), 'listening')
+    const jetstreamPort = (server.address() as AddressInfo).port
+
+    jetstream = new WebSocketServer({ server })
+    const relayPromise = new Promise<WebSocket>((resolve, reject) => {
+      const cleanup = () => {
+        jetstream.off('connection', onConnection)
+        jetstream.off('error', onError)
+      }
+
+      const onConnection = (ws: WebSocket) => {
+        cleanup()
+        resolve(ws)
+      }
+
+      const onError = (err: Error) => {
+        cleanup()
+        reject(err)
+      }
+
+      jetstream.on('connection', onConnection)
+      jetstream.on('error', onError)
     })
+    relayPromise.catch(() => {})
+
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_verification_listener_test',
       ozone: {
@@ -37,13 +64,13 @@ describe('verification-listener', () => {
     })
     await network.ozone.addAdminDid(sc.dids.alice)
 
-    await network.processAll()
+    relay = await relayPromise
   })
 
-  afterAll(async () => {
-    await jetstream.close()
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+  afterAll(async () => relay.close())
+  afterAll(async () => terminator?.terminate())
 
   it('indexes new and revoked verifications', async () => {
     const { verificationListener } = network.ozone.daemon.ctx

package/tests/verification.test.ts

@@ -51,7 +51,7 @@ describe('verification', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   describe('list', () => {