@atproto/pds 0.5.6 → 0.5.8

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

@@ -9,6 +9,7 @@ import {
   AtpAgent,
 } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { app } from '../../src/lexicons/index.js'
 import basicSeed from '../seeds/basic.js'
 
@@ -17,8 +18,8 @@ describe('proxy read after write', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let alice: string
-  let carol: string
+  let alice: DidString
+  let carol: DidString
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -27,15 +28,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

@@ -1,5 +1,6 @@
 import { AtUri, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { forSnapshot } from '../_util.js'
 import basicSeed from '../seeds/basic.js'
 
@@ -8,10 +9,10 @@ describe('proxies view requests', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let alice: string
-  let bob: string
-  let carol: string
-  let dan: string
+  let alice: DidString
+  let bob: DidString
+  let carol: DidString
+  let dan: DidString
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -45,7 +46,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/follows.ts

@@ -54,4 +54,4 @@ const users = {
     handle: 'eve.test',
     password: 'eve-pass',
   },
-}
+} as const

package/tests/seeds/users-bulk.ts

@@ -1,5 +1,6 @@
 import { chunkArray } from '@atproto/common'
 import { SeedClient } from '@atproto/dev-env'
+import type { HandleString } from '@atproto/syntax'
 
 export default async (sc: SeedClient, max = Infinity) => {
   // @TODO when these are run in parallel, seem to get an intermittent
@@ -41,7 +42,7 @@ export default async (sc: SeedClient, max = Infinity) => {
 //   return sc
 // }
 
-const users = [
+const users: { handle: HandleString; displayName: string | null }[] = [
   { handle: 'silas77.test', displayName: 'Tanya Denesik' },
   { handle: 'nicolas-krajcik10.test', displayName: null },
   { handle: 'lennie-strosin.test', displayName: null },

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,
@@ -61,4 +64,4 @@ export const users = {
     description: undefined,
     selfLabels: undefined,
   },
-}
+} as const

package/tests/sequencer.test.ts

@@ -7,6 +7,7 @@ import {
 import { randomStr } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { readCarWithRoot } from '@atproto/repo'
+import type { DidString } from '@atproto/syntax'
 import {
   SeqEvt,
   Sequencer,
@@ -20,8 +21,8 @@ describe('sequencer', () => {
   let network: TestNetworkNoAppView
   let sequencer: Sequencer
   let sc: SeedClient
-  let alice: string
-  let bob: string
+  let alice: DidString
+  let bob: DidString
 
   let totalEvts
   let lastSeen: number
@@ -45,10 +46,11 @@ describe('sequencer', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
-  const randomPost = async (by: string) => sc.post(by, randomStr(8, 'base32'))
+  const randomPost = async (by: DidString) =>
+    sc.post(by, randomStr(8, 'base32'))
   const createPosts = async (count: number): Promise<void> => {
     const promises: Promise<unknown>[] = []
     for (let i = 0; i < count; i++) {

package/tests/server.test.ts

@@ -4,6 +4,7 @@ import { request } from 'undici'
 import { AtUri, AtpAgent } from '@atproto/api'
 import { randomStr } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { handler as errorHandler } from '../src/error.js'
 import { startServer } from './_util.js'
 import basicSeed from './seeds/basic.js'
@@ -12,7 +13,7 @@ describe('server', () => {
   let network: TestNetworkNoAppView
   let agent: AtpAgent
   let sc: SeedClient
-  let alice: string
+  let alice: DidString
 
   beforeAll(async () => {
     network = await TestNetworkNoAppView.create({
@@ -28,7 +29,7 @@ describe('server', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('preserves 404s.', async () => {
@@ -43,17 +44,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

@@ -1,6 +1,8 @@
+import assert from 'node:assert'
 import { AtUri } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import * as repo from '@atproto/repo'
+import { isValidDid } from '@atproto/syntax'
 import { Subscription } from '@atproto/xrpc-server'
 import { com } from '../../src/lexicons.js'
 import basicSeed from '../seeds/basic.js'
@@ -33,6 +35,7 @@ describe('invertible ops', () => {
       ]
     }
     for (const post of posts) {
+      assert(isValidDid(post.hostname))
       await sc.deletePost(post.hostname, post)
     }
 
@@ -40,7 +43,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

@@ -12,6 +12,7 @@ import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { Cid } from '@atproto/lex-data'
 import * as repo from '@atproto/repo'
 import { readCar } from '@atproto/repo'
+import type { DidString } from '@atproto/syntax'
 import { ErrorFrame, Frame, MessageFrame, byFrame } from '@atproto/xrpc-server'
 import { AccountStatus } from '../../src/account-manager/account-manager.js'
 import { AppContext } from '../../src/index.js'
@@ -26,10 +27,10 @@ describe('repo subscribe repos', () => {
 
   let agent: AtpAgent
   let sc: SeedClient
-  let alice: string
-  let bob: string
-  let carol: string
-  let dan: string
+  let alice: DidString
+  let bob: DidString
+  let carol: DidString
+  let dan: DidString
 
   beforeAll(async () => {
     network = await TestNetworkNoAppView.create({
@@ -51,7 +52,7 @@ describe('repo subscribe repos', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getRepo = async (did: string): Promise<repo.VerifiedRepo> => {
@@ -219,7 +220,7 @@ describe('repo subscribe repos', () => {
     }
   }
 
-  const randomPost = (by: string) => sc.post(by, randomStr(8, 'base32'))
+  const randomPost = (by: DidString) => sc.post(by, randomStr(8, 'base32'))
   const makePosts = async () => {
     for (let i = 0; i < 10; i++) {
       await Promise.all([

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 () => {
@@ -301,7 +301,7 @@ describe('repo sync', () => {
   })
 })
 
-const makePost = async (sc: SeedClient, did: string) => {
+const makePost = async (sc: SeedClient, did: DidString) => {
   const res = await sc.post(did, randomStr(32, 'base32'))
   const uri = res.ref.uri
   const data = await sc.client.call(com.atproto.repo.getRecord, {

package/tests/takedown-appeal.test.ts

@@ -1,12 +1,13 @@
 import { AtpAgent, ComAtprotoModerationDefs } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { forSubjectStatusSnapshot } from './_util.js'
 
 describe('appeal account takedown', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
-  let moderator: string
+  let moderator: DidString
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -25,7 +26,7 @@ describe('appeal account takedown', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('actor takedown allows appeal request.', async () => {