@atproto/ozone 0.2.5 → 0.2.6

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 () => {

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 () => {