@atproto/pds 0.4.216 → 0.4.218

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

@@ -1,4 +1,3 @@
-import { CID } from 'multiformats/cid'
 import { WebSocket } from 'ws'
 import { AtpAgent } from '@atproto/api'
 import {
@@ -10,17 +9,13 @@ import {
 } from '@atproto/common'
 import { randomStr } from '@atproto/crypto'
 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 { ErrorFrame, Frame, MessageFrame, byFrame } from '@atproto/xrpc-server'
 import { AppContext } from '../../src'
 import { AccountStatus } from '../../src/account-manager/account-manager'
-import {
-  Account as AccountEvt,
-  Commit as CommitEvt,
-  Identity as IdentityEvt,
-  Sync as SyncEvt,
-} from '../../src/lexicon/types/com/atproto/sync/subscribeRepos'
+import { com } from '../../src/lexicons.js'
 import basicSeed from '../seeds/basic'
 
 describe('repo subscribe repos', () => {
@@ -46,7 +41,7 @@ describe('repo subscribe repos', () => {
     serverHost = network.pds.url.replace('http://', '')
     // @ts-expect-error Error due to circular dependency with the dev-env package
     ctx = network.pds.ctx
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
     sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
@@ -72,13 +67,17 @@ describe('repo subscribe repos', () => {
       if (frame instanceof MessageFrame) {
         if (
           (frame.header.t === '#commit' &&
-            (frame.body as CommitEvt).repo === userDid) ||
+            (frame.body as com.atproto.sync.subscribeRepos.Commit).repo ===
+              userDid) ||
           (frame.header.t === '#sync' &&
-            (frame.body as SyncEvt).did === userDid) ||
+            (frame.body as com.atproto.sync.subscribeRepos.Sync).did ===
+              userDid) ||
           (frame.header.t === '#identity' &&
-            (frame.body as IdentityEvt).did === userDid) ||
+            (frame.body as com.atproto.sync.subscribeRepos.Identity).did ===
+              userDid) ||
           (frame.header.t === '#account' &&
-            (frame.body as AccountEvt).did === userDid)
+            (frame.body as com.atproto.sync.subscribeRepos.Account).did ===
+              userDid)
         ) {
           types.push(frame.body)
         }
@@ -97,24 +96,32 @@ describe('repo subscribe repos', () => {
     return evts
   }
 
-  const getSyncEvts = (frames: Frame[]): SyncEvt[] => {
+  const getSyncEvts = (
+    frames: Frame[],
+  ): com.atproto.sync.subscribeRepos.Sync[] => {
     return getEventType(frames, '#sync')
   }
 
-  const getAccountEvts = (frames: Frame[]): AccountEvt[] => {
+  const getAccountEvts = (
+    frames: Frame[],
+  ): com.atproto.sync.subscribeRepos.Account[] => {
     return getEventType(frames, '#account')
   }
 
-  const getIdentityEvts = (frames: Frame[]): IdentityEvt[] => {
+  const getIdentityEvts = (
+    frames: Frame[],
+  ): com.atproto.sync.subscribeRepos.Identity[] => {
     return getEventType(frames, '#identity')
   }
 
-  const getCommitEvents = (frames: Frame[]): CommitEvt[] => {
+  const getCommitEvents = (
+    frames: Frame[],
+  ): com.atproto.sync.subscribeRepos.Commit[] => {
     return getEventType(frames, '#commit')
   }
 
   const verifyIdentityEvent = (
-    evt: IdentityEvt,
+    evt: com.atproto.sync.subscribeRepos.Identity,
     did: string,
     handle?: string,
   ) => {
@@ -125,7 +132,7 @@ describe('repo subscribe repos', () => {
   }
 
   const verifyAccountEvent = (
-    evt: AccountEvt,
+    evt: com.atproto.sync.subscribeRepos.Account,
     did: string,
     active: boolean,
     status?: AccountStatus,
@@ -138,9 +145,9 @@ describe('repo subscribe repos', () => {
   }
 
   const verifySyncEvent = async (
-    evt: SyncEvt,
+    evt: com.atproto.sync.subscribeRepos.Sync,
     did: string,
-    commit: CID,
+    commit: Cid,
     rev: string,
   ) => {
     expect(typeof evt.seq).toBe('number')
@@ -154,8 +161,9 @@ describe('repo subscribe repos', () => {
   }
 
   const verifyCommitEvents = async (frames: Frame[]) => {
-    const forUser = (user: string) => (commit: CommitEvt) =>
-      commit.repo === user
+    const forUser =
+      (user: string) => (commit: com.atproto.sync.subscribeRepos.Commit) =>
+        commit.repo === user
     const commits = getCommitEvents(frames)
     await verifyRepo(alice, commits.filter(forUser(alice)))
     await verifyRepo(bob, commits.filter(forUser(bob)))
@@ -163,9 +171,12 @@ describe('repo subscribe repos', () => {
     await verifyRepo(dan, commits.filter(forUser(dan)))
   }
 
-  const verifyRepo = async (did: string, evts: CommitEvt[]) => {
+  const verifyRepo = async (
+    did: string,
+    evts: com.atproto.sync.subscribeRepos.Commit[],
+  ) => {
     const fromRpc = await getRepo(did)
-    const contents = {} as Record<string, Record<string, CID>>
+    const contents = {} as Record<string, Record<string, Cid>>
     const allBlocks = new repo.BlockMap()
     for (const evt of evts) {
       const car = await readCar(evt.blocks)
@@ -342,9 +353,10 @@ describe('repo subscribe repos', () => {
     const seqSlice = seqs.slice(midPoint + 1)
     expect(evts.length).toBe(seqSlice.length)
     for (let i = 0; i < evts.length; i++) {
-      const evt = evts[i].body as unknown as CommitEvt
+      const evt = evts[i]
+        .body as unknown as com.atproto.sync.subscribeRepos.Commit
       const seq = seqSlice[i]
-      const seqEvt = cborDecode(seq.event) as { commit: CID }
+      const seqEvt = cborDecode(seq.event) as { commit: Cid }
       expect(evt.time).toEqual(seq.sequencedAt)
       expect(evt.commit.equals(seqEvt.commit)).toBeTruthy()
       expect(evt.repo).toEqual(seq.did)
@@ -611,7 +623,7 @@ describe('repo subscribe repos', () => {
     const didEvts = getAllEvents(baddie3, evts)
     expect(didEvts.length).toBe(1)
     verifyAccountEvent(
-      didEvts[0] as AccountEvt,
+      didEvts[0] as com.atproto.sync.subscribeRepos.Account,
       baddie3,
       false,
       AccountStatus.Deleted,

package/tests/sync/sync.test.ts

@@ -1,30 +1,33 @@
-import { CID } from 'multiformats/cid'
-import { AtpAgent } from '@atproto/api'
-import { TID, cidForCbor } from '@atproto/common'
+import assert from 'node:assert'
+import { TID } from '@atproto/common'
 import { Keypair, randomStr } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { Client, isNsidString, isRecordKeyString } from '@atproto/lex'
+import { cidForLex } from '@atproto/lex-cbor'
+import { Cid } from '@atproto/lex-data'
 import * as repo from '@atproto/repo'
 import { MemoryBlockstore } from '@atproto/repo'
-import { AtUri } from '@atproto/syntax'
+import { AtUri, DidString, NsidString } from '@atproto/syntax'
+import { com } from '../../src/lexicons.js'
 
 describe('repo sync', () => {
   let network: TestNetworkNoAppView
-  let agent: AtpAgent
+  let client: Client
   let sc: SeedClient
-  let did: string
+  let did: DidString
   let signingKey: Keypair
 
   const repoData: repo.RepoContents = {}
   const uris: AtUri[] = []
   const storage = new MemoryBlockstore()
-  let currRoot: CID | undefined
+  let currRoot: Cid | undefined
   let currRev: string | undefined
 
   beforeAll(async () => {
     network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'repo_sync',
     })
-    agent = network.pds.getClient()
+    client = network.pds.getClient()
     sc = network.getSeedClient()
     await sc.createAccount('alice', {
       email: 'alice@test.com',
@@ -50,8 +53,8 @@ describe('repo sync', () => {
       uris.push(uri)
     }
 
-    const carRes = await agent.api.com.atproto.sync.getRepo({ did })
-    const car = await repo.readCarWithRoot(carRes.data)
+    const carRes = await client.call(com.atproto.sync.getRepo, { did })
+    const car = await repo.readCarWithRoot(carRes)
     const synced = await repo.verifyRepo(
       car.blocks,
       car.root,
@@ -86,8 +89,8 @@ describe('repo sync', () => {
       delete repoData[uri.collection][uri.rkey]
     }
 
-    const carRes = await agent.api.com.atproto.sync.getRepo({ did })
-    const car = await repo.readCarWithRoot(carRes.data)
+    const carRes = await client.call(com.atproto.sync.getRepo, { did })
+    const car = await repo.readCarWithRoot(carRes)
     const currRepo = await repo.Repo.load(storage, currRoot)
     const synced = await repo.verifyDiff(
       currRepo,
@@ -107,8 +110,8 @@ describe('repo sync', () => {
   })
 
   it('syncs repo status', async () => {
-    const status = await agent.api.com.atproto.sync.getRepoStatus({ did })
-    expect(status.data).toEqual({
+    const status = await client.call(com.atproto.sync.getRepoStatus, { did })
+    expect(status).toEqual({
       did,
       active: true,
       rev: currRev,
@@ -116,8 +119,8 @@ describe('repo sync', () => {
   })
 
   it('syncs latest repo commit', async () => {
-    const commit = await agent.api.com.atproto.sync.getLatestCommit({ did })
-    expect(commit.data.cid).toEqual(currRoot?.toString())
+    const commit = await client.call(com.atproto.sync.getLatestCommit, { did })
+    expect(commit.cid).toEqual(currRoot?.toString())
   })
 
   it('syncs `since` a given rev', async () => {
@@ -131,11 +134,11 @@ describe('repo sync', () => {
     repoData[uri.collection][uri.rkey] = obj
     uris.push(uri)
 
-    const carRes = await agent.api.com.atproto.sync.getRepo({
+    const carRes = await client.call(com.atproto.sync.getRepo, {
       did,
       since: repoBefore.commit.rev,
     })
-    const car = await repo.readCarWithRoot(carRes.data)
+    const car = await repo.readCarWithRoot(carRes)
     expect(car.blocks.size).toBeLessThan(10) // should only contain new blocks
     const synced = await repo.verifyDiff(
       repoBefore,
@@ -154,27 +157,27 @@ describe('repo sync', () => {
   })
 
   it('sync a record proof', async () => {
-    const collection = Object.keys(repoData)[0]
+    const collection = Object.keys(repoData)[0] as NsidString
     const rkey = Object.keys(repoData[collection])[0]
-    const car = await agent.api.com.atproto.sync.getRecord({
+    const car = await client.call(com.atproto.sync.getRecord, {
       did,
       collection,
       rkey,
     })
     const records = await repo.verifyRecords(
-      new Uint8Array(car.data),
+      new Uint8Array(car),
       did,
       signingKey.did(),
     )
     const claim = {
       collection,
       rkey,
-      cid: await cidForCbor(repoData[collection][rkey]),
+      cid: await cidForLex(repoData[collection][rkey]),
     }
     expect(records.length).toBe(1)
-    expect(await cidForCbor(records[0].record)).toEqual(claim.cid)
+    expect(await cidForLex(records[0].record)).toEqual(claim.cid)
     const result = await repo.verifyProofs(
-      new Uint8Array(car.data),
+      new Uint8Array(car),
       [claim],
       did,
       signingKey.did(),
@@ -185,8 +188,9 @@ describe('repo sync', () => {
 
   it('sync a proof of non-existence', async () => {
     const collection = Object.keys(repoData)[0]
+    assert(isNsidString(collection))
     const rkey = TID.nextStr() // rkey that doesn't exist
-    const car = await agent.api.com.atproto.sync.getRecord({
+    const car = await client.call(com.atproto.sync.getRecord, {
       did,
       collection,
       rkey,
@@ -197,7 +201,7 @@ describe('repo sync', () => {
       cid: null,
     }
     const result = await repo.verifyProofs(
-      new Uint8Array(car.data),
+      new Uint8Array(car),
       [claim],
       did,
       signingKey.did(),
@@ -208,7 +212,8 @@ describe('repo sync', () => {
 
   describe('repo takedown', () => {
     beforeAll(async () => {
-      await agent.api.com.atproto.admin.updateSubjectStatus(
+      await client.call(
+        com.atproto.admin.updateSubjectStatus,
         {
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
@@ -217,14 +222,14 @@ describe('repo sync', () => {
           takedown: { applied: true },
         },
         {
-          encoding: 'application/json',
           headers: network.pds.adminAuthHeaders(),
         },
       )
     })
 
     afterAll(async () => {
-      await agent.api.com.atproto.admin.updateSubjectStatus(
+      await client.call(
+        com.atproto.admin.updateSubjectStatus,
         {
           subject: {
             $type: 'com.atproto.admin.defs#repoRef',
@@ -233,15 +238,14 @@ describe('repo sync', () => {
           takedown: { applied: false },
         },
         {
-          encoding: 'application/json',
           headers: network.pds.adminAuthHeaders(),
         },
       )
     })
 
     it('returns takendown status', async () => {
-      const res = await agent.api.com.atproto.sync.getRepoStatus({ did })
-      expect(res.data).toEqual({
+      const res = await client.call(com.atproto.sync.getRepoStatus, { did })
+      expect(res).toEqual({
         did,
         active: false,
         status: 'takendown',
@@ -249,24 +253,26 @@ describe('repo sync', () => {
     })
 
     it('lists as takendown in listRepos', async () => {
-      const res = await agent.api.com.atproto.sync.listRepos()
-      const found = res.data.repos.find((r) => r.did === did)
+      const res = await client.call(com.atproto.sync.listRepos)
+      const found = res.repos.find((r) => r.did === did)
       expect(found?.active).toBe(false)
       expect(found?.status).toBe('takendown')
     })
 
     it('does not sync repo unauthed', async () => {
-      const tryGetRepo = agent.api.com.atproto.sync.getRepo({ did })
+      const tryGetRepo = client.call(com.atproto.sync.getRepo, { did })
       await expect(tryGetRepo).rejects.toThrow(/Repo has been takendown/)
     })
 
     it('syncs repo to owner or admin', async () => {
-      const tryGetRepoOwner = agent.api.com.atproto.sync.getRepo(
+      const tryGetRepoOwner = client.call(
+        com.atproto.sync.getRepo,
         { did },
         { headers: sc.getHeaders(did) },
       )
       await expect(tryGetRepoOwner).resolves.toBeDefined()
-      const tryGetRepoAdmin = agent.api.com.atproto.sync.getRepo(
+      const tryGetRepoAdmin = client.call(
+        com.atproto.sync.getRepo,
         { did },
         { headers: network.pds.adminAuthHeaders() },
       )
@@ -274,14 +280,18 @@ describe('repo sync', () => {
     })
 
     it('does not sync latest commit unauthed', async () => {
-      const tryGetLatest = agent.api.com.atproto.sync.getLatestCommit({ did })
+      const tryGetLatest = client.call(com.atproto.sync.getLatestCommit, {
+        did,
+      })
       await expect(tryGetLatest).rejects.toThrow(/Repo has been takendown/)
     })
 
     it('does not sync a record proof unauthed', async () => {
       const collection = Object.keys(repoData)[0]
+      assert(isNsidString(collection))
       const rkey = Object.keys(repoData[collection])[0]
-      const tryGetRecord = agent.api.com.atproto.sync.getRecord({
+      assert(isRecordKeyString(rkey))
+      const tryGetRecord = client.call(com.atproto.sync.getRecord, {
         did,
         collection,
         rkey,
@@ -294,13 +304,13 @@ describe('repo sync', () => {
 const makePost = async (sc: SeedClient, did: string) => {
   const res = await sc.post(did, randomStr(32, 'base32'))
   const uri = res.ref.uri
-  const record = await sc.agent.api.com.atproto.repo.getRecord({
-    repo: did,
-    collection: uri.collection,
+  const data = await sc.client.call(com.atproto.repo.getRecord, {
+    repo: did as DidString,
+    collection: uri.collection as NsidString,
     rkey: uri.rkey,
   })
   return {
     uri,
-    obj: record.data.value,
+    obj: data.value,
   }
 }

package/tests/takedown-appeal.test.ts

@@ -1,6 +1,5 @@
 import { AtpAgent, ComAtprotoModerationDefs } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { ids } from '../src/lexicon/lexicons'
 import { forSubjectStatusSnapshot } from './_util'
 
 describe('appeal account takedown', () => {
@@ -22,7 +21,7 @@ describe('appeal account takedown', () => {
     moderator = modAccount.did
     await network.ozone.addModeratorDid(moderator)
 
-    agent = network.pds.getClient()
+    agent = network.pds.getAgent()
   })
 
   afterAll(async () => {
@@ -129,8 +128,12 @@ describe('appeal account takedown', () => {
           },
         },
       ),
-    ).rejects.toThrow('Report not accepted from takendown account')
+    ).rejects.toMatchObject({
+      error: 'AccountTakedown',
+      message: 'Report not accepted from takendown account',
+    })
   })
+
   it('takendown actor is not allowed to create records.', async () => {
     const { data: auth } = await agent.com.atproto.server.createSession({
       identifier: 'jeff.test',
@@ -143,7 +146,7 @@ describe('appeal account takedown', () => {
       agent.com.atproto.repo.createRecord(
         {
           repo: auth.did,
-          collection: ids.AppBskyFeedPost,
+          collection: 'app.bsky.feed.post',
           // rkey: 'self',
           record: {
             text: 'test',