@atproto/pds 0.5.5 → 0.5.7

package/tests/plc-operations.test.ts

@@ -48,7 +48,7 @@ describe('plc operations', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getMailFrom = async (promise): Promise<SendMailOptions> => {

package/tests/preferences.test.ts

@@ -29,7 +29,7 @@ describe('user preferences', () => {
   }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('requires auth to set or put preferences.', async () => {

package/tests/proxied/admin.test.ts

@@ -69,7 +69,7 @@ describe('proxies admin requests', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('creates reports of a repo.', async () => {

package/tests/proxied/feedgen.test.ts

@@ -51,7 +51,7 @@ describe('feedgen proxy view', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('performs basic proxy of getFeed', async () => {

package/tests/proxied/notif.test.ts

@@ -1,16 +1,13 @@
-import { once } from 'node:events'
-import http from 'node:http'
-import { AddressInfo } from 'node:net'
-import express from 'express'
 import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { createServer, verifyJwt } from '@atproto/xrpc-server'
 import { app } from '../../src/lexicons/index.js'
+import { startServer } from '../_util.js'
 import usersSeed from '../seeds/users.js'
 
 describe('notif service proxy', () => {
   let network: TestNetworkNoAppView
-  let notifServer: http.Server
+  let notifServer: AsyncDisposable & { port: number }
   let notifDid: string
   let agent: AtpAgent
   let sc: SeedClient
@@ -29,10 +26,9 @@ describe('notif service proxy', () => {
     notifServer = await createMockNotifService(spy)
     notifDid = sc.dids.dan
     await plc.updateData(notifDid, network.pds.ctx.plcRotationKey, (x) => {
-      const addr = notifServer.address() as AddressInfo
       x.services['bsky_notif'] = {
         type: 'BskyNotificationService',
-        endpoint: `http://localhost:${addr.port}`,
+        endpoint: `http://localhost:${notifServer.port}`,
       }
       return x
     })
@@ -40,9 +36,8 @@ describe('notif service proxy', () => {
   }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
-    await network.close()
-    notifServer.close()
-    await once(notifServer, 'close')
+    await notifServer?.[Symbol.asyncDispose]()
+    await network?.close()
   })
 
   it('proxies to notif service.', async () => {
@@ -86,7 +81,5 @@ async function createMockNotifService(ref: { current: unknown }) {
       jwt: req.headers.authorization?.replace('Bearer ', ''),
     }
   })
-  const server = express().use(svc.router).listen()
-  await once(server, 'listening')
-  return server
+  return startServer(svc.router)
 }

package/tests/proxied/procedures.test.ts

@@ -25,7 +25,7 @@ describe('proxies appview procedures', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('maintains muted actors.', async () => {

package/tests/proxied/proxy-catchall.test.ts

@@ -4,6 +4,8 @@ import { AddressInfo } from 'node:net'
 import { setTimeout as sleep } from 'node:timers/promises'
 import * as plc from '@did-plc/lib'
 import express from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import AtpAgent from '@atproto/api'
 import { Keypair } from '@atproto/crypto'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
@@ -158,10 +160,14 @@ describe('proxy header', () => {
 })
 
 class ProxyServer {
+  private terminator: httpTerminator.HttpTerminator
+
   constructor(
-    private server: http.Server,
+    server: http.Server,
     public did: string,
-  ) {}
+  ) {
+    this.terminator = httpTerminator.createHttpTerminator({ server })
+  }
 
   static async create(
     plcClient: plc.Client,
@@ -245,11 +251,6 @@ class ProxyServer {
   }
 
   async close() {
-    await new Promise<void>((resolve, reject) => {
-      this.server.close((err) => {
-        if (err) reject(err)
-        else resolve()
-      })
-    })
+    await this.terminator.terminate()
   }
 }

package/tests/proxied/proxy-header.test.ts

@@ -4,6 +4,8 @@ import http from 'node:http'
 import { AddressInfo } from 'node:net'
 import * as plc from '@did-plc/lib'
 import express from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import { Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView, usersSeed } from '@atproto/dev-env'
 import { verifyJwt } from '@atproto/xrpc-server'
@@ -35,8 +37,8 @@ describe('proxy header', () => {
   }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
-    await proxyServer.close()
-    await network.close()
+    await proxyServer?.close()
+    await network?.close()
   })
 
   it('parses proxy header', async () => {
@@ -171,12 +173,16 @@ type ProxyReq = {
 }
 
 class ProxyServer {
+  private terminator: httpTerminator.HttpTerminator
+
   constructor(
-    public server: http.Server,
+    server: http.Server,
     public url: string,
     public did: string,
     public requests: ProxyReq[],
-  ) {}
+  ) {
+    this.terminator = httpTerminator.createHttpTerminator({ server })
+  }
 
   static async create(
     plcClient: plc.Client,
@@ -226,9 +232,7 @@ class ProxyServer {
     return new ProxyServer(server, url, did, requests)
   }
 
-  close(): Promise<void> {
-    return new Promise<void>((resolve) => {
-      this.server.close(() => resolve())
-    })
+  async close(): Promise<void> {
+    await this.terminator.terminate()
   }
 }

package/tests/proxied/proxy-oauth-aud.test.ts

@@ -3,6 +3,8 @@ import http from 'node:http'
 import { AddressInfo } from 'node:net'
 import * as plc from '@did-plc/lib'
 import express from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import { Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView, usersSeed } from '@atproto/dev-env'
 import { ScopePermissions } from '@atproto/oauth-scopes'
@@ -30,7 +32,7 @@ describe('proxy oauth audience', () => {
   let sc: SeedClient
   let alice: string
   let upstream: ProxyServer
-  let server: http.Server
+  let terminator: httpTerminator.HttpTerminator
   let serverUrl: string
 
   beforeAll(async () => {
@@ -88,15 +90,18 @@ describe('proxy oauth audience', () => {
         res.status(err.status ?? err.statusCode ?? 500).end()
       },
     )
-    server = app.listen(0)
+    const server = app.listen(0)
     await once(server, 'listening')
+    terminator = httpTerminator.createHttpTerminator({ server })
     serverUrl = `http://localhost:${(server.address() as AddressInfo).port}`
   })
 
   afterAll(async () => {
-    await new Promise<void>((resolve) => server.close(() => resolve()))
-    await upstream.close()
-    await network.close()
+    await Promise.all([
+      terminator?.terminate(),
+      upstream?.close(),
+      network?.close(),
+    ])
   })
 
   it('matches an OAuth rpc scope granted with combined did#serviceId aud', async () => {
@@ -127,11 +132,15 @@ describe('proxy oauth audience', () => {
 })
 
 class ProxyServer {
+  private terminator: httpTerminator.HttpTerminator
+
   constructor(
-    public server: http.Server,
+    server: http.Server,
     public url: string,
     public did: string,
-  ) {}
+  ) {
+    this.terminator = httpTerminator.createHttpTerminator({ server })
+  }
 
   static async create(
     plcClient: plc.Client,
@@ -168,8 +177,6 @@ class ProxyServer {
   }
 
   close(): Promise<void> {
-    return new Promise<void>((resolve) => {
-      this.server.close(() => resolve())
-    })
+    return this.terminator.terminate()
   }
 }

package/tests/proxied/read-after-write.test.ts

@@ -27,15 +27,14 @@ describe('proxy read after write', () => {
     agent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc, { addModLabels: network.bsky })
-    await network.processAll()
     alice = sc.dids.alice
     carol = sc.dids.carol
-    await network.bsky.sub.destroy()
+    await network.processAll()
+    await network.bsky.sub.stop()
   })
 
-  afterAll(async () => {
-    await network.close()
-  })
+  beforeEach(async () => network.processAll())
+  afterAll(async () => network?.close())
 
   it('handles read after write on profiles', async () => {
     await sc.updateProfile(alice, { displayName: 'blah' })

package/tests/proxied/views.test.ts

@@ -45,7 +45,7 @@ describe('proxies view requests', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('actor.getProfile', async () => {

package/tests/races.test.ts

@@ -31,7 +31,7 @@ describe('races', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const processCommitWithWait = async (

package/tests/rate-limits.test.ts

@@ -27,7 +27,7 @@ describe('rate limits', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('rate limits by ip', async () => {

package/tests/recovery.test.ts

@@ -31,7 +31,7 @@ describe('recovery', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getStats = (did: string) => {

package/tests/seeds/basic.ts

@@ -2,10 +2,10 @@ import { EXAMPLE_LABELER, SeedClient, TestBsky } from '@atproto/dev-env'
 import { app, com } from '../../src/lexicons/index.js'
 import usersSeed from './users.js'
 
-export default async (
+export default async function basicSeed(
   sc: SeedClient,
   opts?: { inviteCode?: string; addModLabels?: TestBsky },
-) => {
+) {
   await usersSeed(sc, opts)
 
   const alice = sc.dids.alice

package/tests/seeds/users.ts

@@ -1,6 +1,9 @@
 import { SeedClient } from '@atproto/dev-env'
 
-export default async (sc: SeedClient, opts?: { inviteCode?: string }) => {
+export default async function usersSeed(
+  sc: SeedClient,
+  opts?: { inviteCode?: string },
+) {
   await sc.createAccount('alice', {
     ...users.alice,
     inviteCode: opts?.inviteCode,

package/tests/sequencer.test.ts

@@ -45,7 +45,7 @@ describe('sequencer', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const randomPost = async (by: string) => sc.post(by, randomStr(8, 'base32'))

package/tests/server.test.ts

@@ -28,7 +28,7 @@ describe('server', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('preserves 404s.', async () => {
@@ -43,17 +43,14 @@ describe('server', () => {
       })
       .use(errorHandler)
 
-    const { origin, stop } = await startServer(app)
-    try {
-      const res = await fetch(new URL(`/oops`, origin))
-      expect(res.status).toEqual(500)
-      await expect(res.json()).resolves.toEqual({
-        error: 'InternalServerError',
-        message: 'Internal Server Error',
-      })
-    } finally {
-      await stop()
-    }
+    await using server = await startServer(app)
+
+    const res = await fetch(`http://localhost:${server.port}/oops`)
+    expect(res.status).toEqual(500)
+    await expect(res.json()).resolves.toEqual({
+      error: 'InternalServerError',
+      message: 'Internal Server Error',
+    })
   })
 
   it('limits size of json input.', async () => {

package/tests/sync/invertible-ops.test.ts

@@ -40,7 +40,7 @@ describe('invertible ops', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('works', async () => {

package/tests/sync/list.test.ts

@@ -17,7 +17,7 @@ describe('sync listing', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('lists hosted repos in order of creation', async () => {

package/tests/sync/subscribe-repos.test.ts

@@ -51,7 +51,7 @@ describe('repo subscribe repos', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getRepo = async (did: string): Promise<repo.VerifiedRepo> => {

package/tests/sync/sync.test.ts

@@ -39,7 +39,7 @@ describe('repo sync', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('creates and syncs some records', async () => {

package/tests/takedown-appeal.test.ts

@@ -25,7 +25,7 @@ describe('appeal account takedown', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('actor takedown allows appeal request.', async () => {