@atproto/pds 0.5.7 → 0.5.9

package/src/actor-store/actor-store.ts

@@ -134,7 +134,7 @@ export class ActorStore {
         store.repo.blob.getBlobCids(),
       )
       await blobstore.deleteMany(cids).catch((err) => {
-        blobStoreLogger.error('Failed to delete blobs', { did, cids, err })
+        blobStoreLogger.error({ did, cids, err }, 'Failed to delete blobs')
       })
     }
 

package/tests/account-deactivation.test.ts

@@ -5,6 +5,7 @@ import {
   TestNetworkNoAppView,
   basicSeed,
 } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 
 describe('account deactivation', () => {
   let network: TestNetworkNoAppView
@@ -12,7 +13,7 @@ describe('account deactivation', () => {
   let sc: SeedClient
   let agent: AtpAgent
 
-  let alice: string
+  let alice: DidString
   let aliceAvatar: ImageRef
 
   beforeAll(async () => {

package/tests/blob-deletes.test.ts

@@ -1,5 +1,6 @@
 import { AtpAgent, BlobRef } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { AppContext } from '../src/index.js'
 
 describe('blob deletes', () => {
@@ -9,8 +10,8 @@ describe('blob deletes', () => {
 
   let ctx: AppContext
 
-  let alice: string
-  let bob: string
+  let alice: DidString
+  let bob: DidString
 
   beforeAll(async () => {
     network = await TestNetworkNoAppView.create({
@@ -184,7 +185,7 @@ describe('blob deletes', () => {
 
 async function updateProfile(
   sc: SeedClient,
-  did: string,
+  did: DidString,
   avatar?: BlobRef,
   banner?: BlobRef,
 ) {

package/tests/invites-admin.test.ts

@@ -1,6 +1,7 @@
 import { AtpAgent } from '@atproto/api'
 import { randomStr } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 
 describe('pds admin invite views', () => {
   let network: TestNetworkNoAppView
@@ -23,9 +24,9 @@ describe('pds admin invite views', () => {
     await network?.close()
   })
 
-  let alice: string
-  let bob: string
-  let carol: string
+  let alice: DidString
+  let bob: DidString
+  let carol: DidString
 
   beforeAll(async () => {
     const adminCode = await agent.api.com.atproto.server.createInviteCode(

package/tests/plc-operations.test.ts

@@ -6,6 +6,7 @@ import { AtpAgent } from '@atproto/api'
 import { check } from '@atproto/common'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView, basicSeed } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { AppContext } from '../src/index.js'
 
 describe('plc operations', () => {
@@ -17,7 +18,7 @@ describe('plc operations', () => {
   const mailCatcher = new EventEmitter()
   let _origSendMail
 
-  let alice: string
+  let alice: DidString
 
   let sampleKey: string
 

package/tests/proxied/admin.test.ts

@@ -1,5 +1,6 @@
 import { 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,7 +9,7 @@ describe('proxies admin requests', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let moderator: string
+  let moderator: DidString
 
   beforeAll(async () => {
     network = await TestNetwork.create({

package/tests/proxied/procedures.test.ts

@@ -1,5 +1,6 @@
 import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import basicSeed from '../seeds/basic.js'
 
 describe('proxies appview procedures', () => {
@@ -7,9 +8,9 @@ describe('proxies appview procedures', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let alice: string
-  let bob: string
-  let carol: string
+  let alice: DidString
+  let bob: DidString
+  let carol: DidString
 
   beforeAll(async () => {
     network = await TestNetwork.create({

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

@@ -8,6 +8,7 @@ import express from 'express'
 import httpTerminator from 'http-terminator'
 import { Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView, usersSeed } from '@atproto/dev-env'
+import type { DidString } from '@atproto/syntax'
 import { verifyJwt } from '@atproto/xrpc-server'
 import { parseProxyHeader } from '../../src/pipethrough.js'
 
@@ -15,7 +16,7 @@ describe('proxy header', () => {
   let network: TestNetworkNoAppView
   let sc: SeedClient
 
-  let alice: string
+  let alice: DidString
 
   let proxyServer: ProxyServer
 

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({

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({

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

@@ -64,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
@@ -48,7 +49,8 @@ describe('sequencer', () => {
     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({

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)
     }
 

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({
@@ -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

@@ -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({