@atproto/bsky 0.0.243 → 0.0.245

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

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyActorSearchActors, AtpAgent, ids } from '@atproto/api'
 import { wait } from '@atproto/common'
 import { SeedClient, TestNetwork, usersBulkSeed } from '@atproto/dev-env'
@@ -21,7 +21,8 @@ describe.skip('pds actor search views', () => {
     sc = network.getSeedClient()
 
     await wait(50) // allow pending sub to be established
-    await network.bsky.sub.destroy()
+    await network.processAll()
+    await network.bsky.sub.stop()
     await usersBulkSeed(sc)
 
     // Skip did/handle resolution for expediency
@@ -41,7 +42,6 @@ describe.skip('pds actor search views', () => {
 
     // Process remaining profiles
     await network.bsky.sub.restart()
-    await network.processAll(50000)
     headers = await network.serviceHeaders(
       Object.values(sc.dids)[0],
       ids.AppBskyActorSearchActors,
@@ -50,12 +50,11 @@ describe.skip('pds actor search views', () => {
       Object.values(sc.dids)[0],
       ids.AppBskyActorSearchActorsTypeahead,
     )
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll(50_000), 50_100)
+  afterAll(async () => network?.close())
+
   it('typeahead gives relevant results', async () => {
     const result = await agent.api.app.bsky.actor.searchActorsTypeahead(
       { term: 'car' },

package/tests/views/age-assurance-v2.test.ts

@@ -3,6 +3,8 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application, json } from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import {
   afterAll,
   afterEach,
@@ -172,10 +174,8 @@ describe('age assurance v2 views', () => {
     await clearActorAgeAssurance(db)
   })
 
-  afterAll(async () => {
-    await network.close()
-    await kws.stop()
-  })
+  afterAll(async () => network?.close())
+  afterAll(async () => kws?.stop())
 
   const getState = async (params: AppBskyAgeassuranceGetState.QueryParams) => {
     const { data } = await agent.app.bsky.ageassurance.getState(params, {
@@ -667,6 +667,7 @@ class MockKwsServer {
 
   private app: Application
   private server: Server
+  private terminator: httpTerminator.HttpTerminator
   private bskyUrlBase = ''
 
   constructor({
@@ -693,6 +694,9 @@ class MockKwsServer {
       })
 
     this.server = createServer(this.app)
+    this.terminator = httpTerminator.createHttpTerminator({
+      server: this.server,
+    })
   }
 
   async listen(port?: number) {
@@ -701,8 +705,7 @@ class MockKwsServer {
   }
 
   async stop() {
-    this.server.close()
-    await once(this.server, 'close')
+    await this.terminator.terminate()
   }
 
   setBskyBaseUrl(url: string) {

package/tests/views/age-assurance.test.ts

@@ -2,7 +2,9 @@ import crypto from 'node:crypto'
 import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
-import express, { Application } from 'express'
+import express, { Application, RequestHandler } from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import {
   afterAll,
   afterEach,
@@ -41,8 +43,17 @@ describe('age assurance views', () => {
   let actorDid: string
 
   let kwsServer: MockKwsServer
-  const authMock = vi.fn<MockHandler>()
-  const sendEmailMock = vi.fn<MockHandler>()
+
+  const authMock = vi.fn<RequestHandler>((req, res) =>
+    res.json({
+      access_token:
+        'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIn0.INVALID',
+      expires_in: 3600,
+    }),
+  )
+  const sendEmailMock = vi.fn<RequestHandler>((req, res) => {
+    res.json({})
+  })
 
   beforeAll(async () => {
     kwsServer = new MockKwsServer({
@@ -74,38 +85,24 @@ describe('age assurance views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
-
     actorDid = sc.dids.alice
   })
 
+  beforeEach(async () => network.processAll())
+
   beforeEach(async () => {
-    // Default mocks for KWS endpoints.
-    authMock.mockImplementation(
-      (_req: express.Request, res: express.Response) =>
-        res.json({
-          access_token:
-            'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIn0.INVALID',
-          expires_in: 3600,
-        }),
-    )
-    sendEmailMock.mockImplementation(
-      (_req: express.Request, res: express.Response) => {
-        res.json({})
-      },
-    )
+    // @TODO Use the clearMocks setting in the configuration instead of:
+    authMock.mockClear()
+    sendEmailMock.mockClear()
   })
 
   afterEach(async () => {
-    vi.resetAllMocks()
     await clearPrivateData(db)
     await clearActorAgeAssurance(db)
   })
 
-  afterAll(async () => {
-    await network.close()
-    await kwsServer.stop()
-  })
+  afterAll(async () => network?.close())
+  afterAll(async () => kwsServer?.stop())
 
   const getAgeAssurance = async (did: string) => {
     const { data } = await agent.app.bsky.unspecced.getAgeAssuranceState(
@@ -372,13 +369,12 @@ const clearActorAgeAssurance = async (db: Database) => {
     .execute()
 }
 
-type MockHandler = (req: express.Request, res: express.Response) => void
-
 class MockKwsServer {
   private verificationSecret: string
   private webhookSecret: string
   private app: Application
   private server: Server
+  private terminator: httpTerminator.HttpTerminator
 
   constructor({
     verificationSecret,
@@ -388,21 +384,20 @@ class MockKwsServer {
   }: {
     verificationSecret: string
     webhookSecret: string
-    authMock: ReturnType<typeof vi.fn<MockHandler>>
-    sendEmailMock: ReturnType<typeof vi.fn<MockHandler>>
+    authMock: RequestHandler
+    sendEmailMock: RequestHandler
   }) {
     this.verificationSecret = verificationSecret
     this.webhookSecret = webhookSecret
 
     this.app = express()
-      .post('/auth/realms/kws/protocol/openid-connect/token', (req, res) =>
-        authMock(req, res),
-      )
-      .post('/v1/verifications/send-email', (req, res) =>
-        sendEmailMock(req, res),
-      )
+      .post('/auth/realms/kws/protocol/openid-connect/token', authMock)
+      .post('/v1/verifications/send-email', sendEmailMock)
 
     this.server = createServer(this.app)
+    this.terminator = httpTerminator.createHttpTerminator({
+      server: this.server,
+    })
   }
 
   async listen(port?: number) {
@@ -411,8 +406,7 @@ class MockKwsServer {
   }
 
   async stop() {
-    this.server.close()
-    await once(this.server, 'close')
+    await this.terminator.terminate()
   }
 
   callVerificationResponse(

package/tests/views/author-feed.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 {
   AppBskyActorProfile,
   AppBskyEmbedGallery,
@@ -46,18 +46,16 @@ describe('pds author feed views', () => {
     pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
     await authorFeedSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
     dan = sc.dids.dan
     eve = sc.dids.eve
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   // @TODO(bsky) blocked by actor takedown via labels.
   // @TODO(bsky) blocked by record takedown via labels.
 

package/tests/views/block-lists.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 { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from '../_util.js'
@@ -36,12 +36,10 @@ describe('pds views with blocking from block lists', () => {
       sc.posts[dan][0].ref,
       'alice replies to dan',
     )
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   let listUri: string
 

package/tests/views/blocks.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 {
   AppBskyEmbedRecord,
   AppBskyFeedDefs,
@@ -65,12 +65,10 @@ describe('pds views with blocking', () => {
       sc.getHeaders(dan),
     )
     danBlockUri = danBlockCarol.uri
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('blocks thread post', async () => {
     const { data: threadAlice } = await agent.api.app.bsky.feed.getPostThread(

package/tests/views/bookmarks.test.ts

@@ -3,6 +3,7 @@ import {
   afterAll,
   afterEach,
   beforeAll,
+  beforeEach,
   describe,
   expect,
   it,
@@ -43,7 +44,6 @@ describe('appview bookmarks views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
 
     alice = sc.dids.alice
     bob = sc.dids.bob
@@ -51,15 +51,15 @@ describe('appview bookmarks views', () => {
     dan = sc.dids.dan
   })
 
+  beforeEach(async () => network.processAll())
+
   afterEach(async () => {
     vi.resetAllMocks()
     await clearPrivateData(db)
     await clearBookmarks(db)
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  afterAll(async () => network?.close())
 
   const get = async (actor: string, limit?: number, cursor?: string) =>
     agent.app.bsky.bookmark.getBookmarks(

package/tests/views/drafts.test.ts

@@ -2,6 +2,7 @@ import {
   afterAll,
   afterEach,
   beforeAll,
+  beforeEach,
   describe,
   expect,
   it,
@@ -16,7 +17,7 @@ import {
   ids,
 } from '@atproto/api'
 import { TID } from '@atproto/common'
-import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import { TestNetwork, basicSeed } from '@atproto/dev-env'
 import { paginateAll } from '../_util.js'
 
 type Database = TestNetwork['bsky']['db']
@@ -26,8 +27,6 @@ const LIMIT = 10
 describe('appview drafts views', () => {
   let network: TestNetwork
   let agent: AtpAgent
-  let sc: SeedClient
-  let db: Database
 
   // account dids, for convenience
   let alice: string
@@ -40,24 +39,18 @@ describe('appview drafts views', () => {
         draftsLimit: LIMIT,
       },
     })
-    db = network.bsky.db
     agent = network.bsky.getAgent()
-    sc = network.getSeedClient()
+    const sc = network.getSeedClient()
     await basicSeed(sc)
-    await network.processAll()
 
     alice = sc.dids.alice
     bob = sc.dids.bob
   })
 
-  afterEach(async () => {
-    vi.resetAllMocks()
-    await clearDrafts(db)
-  })
-
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterEach(async () => vi.resetAllMocks())
+  afterEach(async () => clearDrafts(network.bsky.db))
+  afterAll(async () => network?.close())
 
   const makeDraft = (): AppBskyDraftDefs.Draft => ({
     posts: [{ text: 'Hello, world!' }],

package/tests/views/feed-hidden-replies.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 } from '@atproto/dev-env'
 import { Users, feedHiddenRepliesSeed } from '../seed/feed-hidden-replies.js'
@@ -20,13 +20,10 @@ describe('feed hidden replies', () => {
 
     const result = await feedHiddenRepliesSeed(sc)
     users = result.users
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   describe(`notifications`, () => {
     it(`[A] -> [B] : B is hidden`, async () => {

package/tests/views/feed-view-post.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, AtUri, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
@@ -47,13 +47,10 @@ describe('pds thread views', () => {
     await sc.follow(dan, alice)
     await sc.follow(dan, bob)
     await sc.follow(dan, carol)
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it(`[A] -> [B], A blocks B, viewed as C`, async () => {
     const A = await sc.post(alice, `A`)

package/tests/views/follows.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyGraphGetFollowers,
   AppBskyGraphGetFollows,
@@ -23,14 +23,12 @@ describe('pds follow views', () => {
     agent = network.bsky.getAgent()
     sc = network.getSeedClient()
     await followsSeed(sc)
-    await network.processAll()
     alice = sc.dids.alice
-  }, 20_000) // @NOTE seeding can take a while
-
-  afterAll(async () => {
-    await network.close()
   })
 
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+
   // TODO(bsky) blocks followers by actor takedown via labels
   // TODO(bsky) blocks follows by actor takedown via labels
 

package/tests/views/get-config.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 { TestNetwork } from '@atproto/dev-env'
 
@@ -12,13 +12,10 @@ describe('get config', () => {
         dbPostgresSchema: 'bsky_tests_live_now_config_off',
       })
       agent = network.bsky.getAgent()
-
-      await network.processAll()
     })
 
-    afterAll(async () => {
-      await network.close()
-    })
+    beforeEach(async () => network.processAll())
+    afterAll(async () => network?.close())
 
     it('omits the live now config', async () => {
       const res = await agent.app.bsky.unspecced.getConfig()
@@ -55,7 +52,7 @@ describe('get config', () => {
     })
 
     afterAll(async () => {
-      await network.close()
+      await network?.close()
     })
 
     it(`returns the config`, async () => {

package/tests/views/get-suggested-onboarding-users.test.ts

@@ -2,7 +2,9 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyUnspeccedGetOnboardingSuggestedUsersSkeleton,
   AtpAgent,
@@ -83,14 +85,11 @@ describe('getSuggestedOnboardingUsers', () => {
 
     const result = await seed(sc)
     seededUsers = result.users
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-    await mockServer.stop()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+  afterAll(async () => mockServer?.stop())
 
   describe(`basic handling`, () => {
     beforeAll(() => {
@@ -150,12 +149,16 @@ describe('getSuggestedOnboardingUsers', () => {
 class MockServer {
   app: Application
   server: Server
+  terminator: httpTerminator.HttpTerminator
 
   mockedDids = new Map<string, string>()
 
   constructor() {
     this.app = this.createApp()
     this.server = createServer(this.app)
+    this.terminator = httpTerminator.createHttpTerminator({
+      server: this.server,
+    })
   }
 
   async listen(port?: number) {
@@ -164,8 +167,7 @@ class MockServer {
   }
 
   async stop() {
-    this.server.close()
-    await once(this.server, 'close')
+    await this.terminator.terminate()
   }
 
   get url() {

package/tests/views/get-suggested-starter-packs.test.ts

@@ -2,7 +2,9 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import {
   AppBskyUnspeccedGetSuggestedStarterPacksSkeleton,
   AtpAgent,
@@ -40,14 +42,11 @@ describe('getSuggestedStarterPacks', () => {
     const result = await starterPacksSeed(sc)
     users = result.users
     starterpacks = result.starterpacks
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-    await mockServer.stop()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+  afterAll(async () => mockServer?.stop())
 
   describe(`basic handling`, () => {
     beforeAll(() => {
@@ -92,6 +91,7 @@ describe('getSuggestedStarterPacks', () => {
 class MockServer {
   app: Application
   server: Server
+  terminator: httpTerminator.HttpTerminator
 
   mockedStarterPackUris = new Map<
     string,
@@ -101,6 +101,9 @@ class MockServer {
   constructor() {
     this.app = this.createApp()
     this.server = createServer(this.app)
+    this.terminator = httpTerminator.createHttpTerminator({
+      server: this.server,
+    })
   }
 
   async listen(port?: number) {
@@ -109,8 +112,7 @@ class MockServer {
   }
 
   async stop() {
-    this.server.close()
-    await once(this.server, 'close')
+    await this.terminator.terminate()
   }
 
   get url() {

package/tests/views/get-trends.test.ts

@@ -3,7 +3,9 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyUnspeccedGetTrendsSkeleton, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { Users, trendsSeed } from '../seed/get-trends.js'
@@ -31,14 +33,11 @@ describe('getTrends', () => {
 
     const result = await trendsSeed(sc)
     users = result.users
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-    await mockTrendServer.stop()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
+  afterAll(async () => mockTrendServer?.stop())
 
   describe(`basic handling`, () => {
     beforeAll(() => {
@@ -96,6 +95,7 @@ describe('getTrends', () => {
 class MockTrendsServer {
   app: Application
   server: Server
+  terminator: httpTerminator.HttpTerminator
 
   mockedTrendSkeletons = new Map<
     string,
@@ -105,6 +105,9 @@ class MockTrendsServer {
   constructor() {
     this.app = this.createApp()
     this.server = createServer(this.app)
+    this.terminator = httpTerminator.createHttpTerminator({
+      server: this.server,
+    })
   }
 
   async listen(port?: number) {
@@ -113,8 +116,11 @@ class MockTrendsServer {
   }
 
   async stop() {
-    this.server.close()
-    await once(this.server, 'close')
+    await this.terminator.terminate()
+  }
+
+  async [Symbol.asyncDispose]() {
+    await this.stop()
   }
 
   get url() {

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

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 import { AppBskyActorDefs, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { knownFollowersSeed } from '../seed/known-followers.js'
@@ -35,13 +35,10 @@ describe('internal actor views', () => {
       { createdAt: new Date().toISOString(), subject: dids.mix_sp_block_res },
       seedClient.getHeaders(dids.mix_sub_1),
     )
-
-    await network.processAll()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   describe('getProfiles', () => {
     const getProfiles = async (