@atproto/bsky 0.0.243 → 0.0.245

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 { expect } from 'vitest'
 import {
   $Typed,
@@ -265,19 +266,11 @@ export const stripViewerFromLabeler = (
   return stripViewer(labeler)
 }
 
-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) => {
@@ -289,21 +282,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/admin/admin-auth.test.ts

@@ -62,10 +62,10 @@ describe('admin auth', () => {
       $type: 'com.atproto.admin.defs#repoRef',
       did: sc.dids.bob,
     }
-  }, 20_000) // @NOTE seeding can take a while
+  })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows service auth requests from the configured appview did', async () => {

package/tests/admin/moderation.test.ts

@@ -46,7 +46,7 @@ describe('moderation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('takes down accounts', async () => {

package/tests/auth.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
@@ -20,15 +20,13 @@ describe('auth', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await usersSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   // @TODO invalidations do not originate from appview frontends: requires identity event on the repo stream.
   it.skip('handles signing key change for service auth.', async () => {
     const issuer = sc.dids.alice

package/tests/blob-resolver.test.ts

@@ -1,5 +1,5 @@
 import { request } from 'undici'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { cidForCbor, verifyCidForBytes } from '@atproto/common'
 import { randomBytes } from '@atproto/crypto'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
@@ -17,15 +17,14 @@ describe('blob resolver', () => {
     })
     const sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
+
     fileDid = sc.dids.carol
     fileCid = sc.posts[fileDid][0].images[0].image.ref
     fileSize = sc.posts[fileDid][0].images[0].image.size
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('resolves blob with good signature check.', async () => {
     const response = await request(

package/tests/data-plane/db.test.ts

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

package/tests/data-plane/duplicate-records.test.ts

@@ -21,7 +21,7 @@ describe('duplicate record', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const countRecords = async (db: Database, table: string) => {

package/tests/data-plane/handle-invalidation.test.ts

@@ -38,10 +38,10 @@ describe('handle invalidation', () => {
       }
       return origResolve(handle)
     }
-  }, 20_000) // @NOTE seeding can take a while
+  })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const backdateIndexedAt = async (did: string) => {

package/tests/data-plane/indexing.test.ts

@@ -1,5 +1,5 @@
 import { sql } from 'kysely'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyActorProfile,
   AppBskyFeedLike,
@@ -16,6 +16,7 @@ import { repoPrepare } from '@atproto/pds'
 import { WriteOpAction } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { Database } from '../../src/data-plane/server/db/index.js'
+import { IndexingService } from '../../src/data-plane/server/indexing/index.js'
 import { forSnapshot } from '../_util.js'
 
 describe('indexing', () => {
@@ -34,18 +35,19 @@ describe('indexing', () => {
     sc = network.getSeedClient()
     db = network.bsky.db
     await usersSeed(sc)
-    // Data in tests is not processed from subscription
     await network.processAll()
-    await network.bsky.sub.destroy()
-  }, 20_000) // @NOTE seeding can take a while
 
-  afterAll(async () => {
-    await network.close()
+    // Data in tests is not processed from subscription, instead we call
+    // indexing service methods directly.
+    await network.bsky.sub.stop()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   it('indexes posts.', async () => {
     const createdAt = new Date().toISOString()
-    const createRecord = await prepareCreate({
+    const createRecord = await prepareCreate<AppBskyFeedPost.Record>({
       did: sc.dids.alice,
       collection: ids.AppBskyFeedPost,
       record: {
@@ -63,10 +65,10 @@ describe('indexing', () => {
           },
         ],
         createdAt,
-      } satisfies AppBskyFeedPost.Record,
+      },
     })
     const [uri] = createRecord
-    const updateRecord = await prepareUpdate({
+    const updateRecord = await prepareUpdate<AppBskyFeedPost.Record>({
       did: sc.dids.alice,
       collection: ids.AppBskyFeedPost,
       rkey: uri.rkey,
@@ -85,7 +87,7 @@ describe('indexing', () => {
           },
         ],
         createdAt,
-      } satisfies AppBskyFeedPost.Record,
+      },
     })
     const deleteRecord = prepareDelete({
       did: sc.dids.alice,
@@ -434,8 +436,7 @@ describe('indexing', () => {
       await network.bsky.sub.restart()
       await basicSeed(sc, false)
       await network.processAll()
-      await network.bsky.sub.destroy()
-      await network.bsky.sub.background.processAll()
+      await network.bsky.sub.stop()
     })
 
     it('preserves indexes when no record changes.', async () => {
@@ -782,13 +783,13 @@ describe('indexing', () => {
   }
 })
 
-async function prepareCreate(opts: {
+async function prepareCreate<TRecord>(opts: {
   did: string
   collection: string
   rkey?: string
-  record: unknown
+  record: TRecord
   timestamp?: string
-}): Promise<[AtUri, Cid, unknown, WriteOpAction.Create, string]> {
+}): Promise<[AtUri, Cid, TRecord, WriteOpAction.Create, string]> {
   const rkey = opts.rkey ?? TID.nextStr()
   return [
     AtUri.make(opts.did, opts.collection, rkey),
@@ -796,23 +797,23 @@ async function prepareCreate(opts: {
     opts.record,
     WriteOpAction.Create,
     opts.timestamp ?? new Date().toISOString(),
-  ]
+  ] satisfies Parameters<IndexingService['indexRecord']>
 }
 
-async function prepareUpdate(opts: {
+async function prepareUpdate<TRecord>(opts: {
   did: string
   collection: string
   rkey: string
-  record: unknown
+  record: TRecord
   timestamp?: string
-}): Promise<[AtUri, Cid, unknown, WriteOpAction.Update, string]> {
+}): Promise<[AtUri, Cid, TRecord, WriteOpAction.Update, string]> {
   return [
     AtUri.make(opts.did, opts.collection, opts.rkey),
     await cidForCbor(opts.record),
     opts.record,
     WriteOpAction.Update,
     opts.timestamp ?? new Date().toISOString(),
-  ]
+  ] satisfies Parameters<IndexingService['indexRecord']>
 }
 
 function prepareDelete(opts: {
@@ -820,5 +821,7 @@ function prepareDelete(opts: {
   collection: string
   rkey: string
 }): [AtUri] {
-  return [AtUri.make(opts.did, opts.collection, opts.rkey)]
+  return [
+    AtUri.make(opts.did, opts.collection, opts.rkey),
+  ] satisfies Parameters<IndexingService['deleteRecord']>
 }

package/tests/data-plane/subscription.test.ts

@@ -23,7 +23,7 @@ describe('sync', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('indexes permit history being replayed.', async () => {

package/tests/data-plane/thread-mutes.test.ts

@@ -25,10 +25,10 @@ describe('thread mutes', () => {
     rootPost = (await sc.post(alice, 'root post')).ref
     replyPost = (await sc.reply(alice, rootPost, rootPost, 'first reply')).ref
     await network.processAll()
-  }, 20_000) // @NOTE seeding can take a while
+  })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('mutes threads', async () => {

package/tests/entryway-auth.test.ts

@@ -3,7 +3,7 @@ import * as nodeCrypto from 'node:crypto'
 import * as jose from 'jose'
 import KeyEncoderModule from 'key-encoder'
 import * as ui8 from 'uint8arrays'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtUri, AtpAgent } from '@atproto/api'
 import { MINUTE } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
@@ -51,13 +51,12 @@ describe('entryway auth', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
+
     alice = sc.dids.alice
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('works', async () => {
     const signer = new jose.SignJWT({ scope: 'com.atproto.access' })

package/tests/feed-generation.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyFeedDefs,
   AppBskyFeedGetActorFeeds,
@@ -46,6 +46,7 @@ describe('feed generation', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'bsky_feed_generation',
     })
+
     agent = network.bsky.getAgent()
     pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
@@ -103,10 +104,9 @@ describe('feed generation', () => {
       .execute()
   })
 
-  afterAll(async () => {
-    await gen.close()
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+  afterAll(async () => gen?.close())
 
   it('feed gen records can be created.', async () => {
     const all = await pdsAgent.api.app.bsky.feed.generator.create(

package/tests/image/server.test.ts

@@ -23,7 +23,7 @@ describe('image processing server', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('processes image from blob resolver.', async () => {

package/tests/label-hydration.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtpAgent } from '@atproto/api'
 import { MINUTE } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
@@ -49,12 +49,10 @@ describe('label hydration', () => {
       val: 'not-expired',
       exp: new Date(Date.now() + MINUTE).toISOString(),
     })
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('hydrates labels based on a supplied labeler header', async () => {
     AtpAgent.configure({ appLabelers: [alice] })

package/tests/postgates.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyEmbedRecord, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { Users, postgatesSeed } from './seed/postgates.js'
@@ -20,13 +20,10 @@ describe('postgates', () => {
 
     const result = await postgatesSeed(sc)
     users = result.users
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   describe(`quotee <-> quoter`, () => {
     it(`quotee detaches own post from quoter`, async () => {

package/tests/query-labels.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
@@ -31,12 +31,10 @@ describe('label hydration', () => {
       cid: '',
       val: 'misleading',
     })
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('returns labels based for a subject', async () => {
     const { data } = await pdsAgent.api.com.atproto.label.queryLabels(

package/tests/redis-cache.test.ts

@@ -10,9 +10,7 @@ describe('redis cache', () => {
     redis = new Redis({ host: process.env.REDIS_HOST || '' })
   })
 
-  afterAll(async () => {
-    await redis.destroy()
-  })
+  afterAll(async () => redis.destroy())
 
   it('caches according to namespace', async () => {
     const ns1 = redis.withNamespace('ns1')

package/tests/server.test.ts

@@ -3,7 +3,7 @@ import { AddressInfo } from 'node:net'
 import { finished } from 'node:stream/promises'
 import express from 'express'
 import { request } from 'undici'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error.js'
 import { startServer } from './_util.js'
@@ -18,13 +18,11 @@ describe('server', () => {
     })
     const sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('preserves 404s.', async () => {
     const response = await fetch(`${network.bsky.url}/unknown`)
@@ -37,17 +35,14 @@ describe('server', () => {
       throw new Error('Oops!')
     })
     app.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/sitemap.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { TestNetwork } from '@atproto/dev-env'
 
 describe('sitemap', () => {
@@ -10,9 +10,8 @@ describe('sitemap', () => {
     })
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('returns sitemap index', async () => {
     const response = await fetch(

package/tests/stash.test.ts

@@ -1,4 +1,12 @@
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+} from 'vitest'
 import { TestNetwork } from '@atproto/dev-env'
 import { lexStringify } from '@atproto/lex'
 import { StashClient } from '../dist/stash.js'
@@ -35,13 +43,9 @@ describe('private data', () => {
     stashClient = network.bsky.ctx.stashClient
   })
 
-  afterEach(async () => {
-    await clearPrivateData(db)
-  })
-
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterEach(async () => clearPrivateData(network.bsky.db))
+  afterAll(async () => network?.close())
 
   describe('create', () => {
     it('creates entry', async () => {

package/tests/utils.test.ts

@@ -1,16 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import {
-  PostSearchQuery,
-  parsePostSearchQuery,
-} from '../src/data-plane/server/util.js'
+import { parsePostSearchQuery } from '../src/data-plane/server/util.js'
 
 describe('parsePostSearchQuery', () => {
-  type TestCase = {
-    input: string
-    output: PostSearchQuery
-  }
-
-  const tests: TestCase[] = [
+  it.each([
     {
       input: `bluesky `,
       output: { q: `bluesky`, author: undefined },
@@ -38,9 +30,7 @@ describe('parsePostSearchQuery', () => {
         author: `did:test:123`,
       },
     },
-  ]
-
-  it.each(tests)(`'$input' -> '$output'`, ({ input, output }) => {
+  ])(`'$input' -> '$output'`, ({ input, output }) => {
     expect(parsePostSearchQuery(input)).toEqual(output)
   })
 })

package/tests/views/account-deactivation.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
@@ -22,12 +22,10 @@ describe('bsky account deactivation', () => {
       {},
       { encoding: 'application/json', headers: sc.getHeaders(alice) },
     )
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('does not return deactivated profiles', async () => {
     const attempt = agent.api.app.bsky.actor.getProfile({

package/tests/views/actor-likes.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AtUri, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
@@ -21,15 +21,13 @@ describe('bsky actor likes feed views', () => {
     pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('returns posts liked by actor', async () => {
     const {