@atproto/pds 0.4.11 → 0.4.12

package/src/read-after-write/util.ts

@@ -52,8 +52,7 @@ export const readAfterWriteInternal = async <T>(
     if (local.count === 0) {
       return res
     }
-    const keypair = await ctx.actorStore.keypair(requester)
-    const localViewer = ctx.localViewer(store, keypair)
+    const localViewer = ctx.localViewer(store)
     const parsedRes = parseRes<T>(nsid, res)
     const data = await munge(localViewer, parsedRes, local, requester)
     return formatMungedResponse(data, getLocalLag(local))

package/src/read-after-write/viewer.ts

@@ -3,7 +3,6 @@ import { CID } from 'multiformats/cid'
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
 import { cborToLexRecord } from '@atproto/repo'
 import { AtpAgent } from '@atproto/api'
-import { Keypair } from '@atproto/crypto'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
@@ -43,10 +42,11 @@ import { AccountManager } from '../account-manager'
 
 type CommonSignedUris = 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize'
 
+export type LocalViewerCreator = (actorStore: ActorStoreReader) => LocalViewer
+
 export class LocalViewer {
   did: string
   actorStore: ActorStoreReader
-  actorKey: Keypair
   accountManager: AccountManager
   pdsHostname: string
   appViewAgent?: AtpAgent
@@ -55,7 +55,6 @@ export class LocalViewer {
 
   constructor(params: {
     actorStore: ActorStoreReader
-    actorKey: Keypair
     accountManager: AccountManager
     pdsHostname: string
     appViewAgent?: AtpAgent
@@ -64,7 +63,6 @@ export class LocalViewer {
   }) {
     this.did = params.actorStore.did
     this.actorStore = params.actorStore
-    this.actorKey = params.actorKey
     this.accountManager = params.accountManager
     this.pdsHostname = params.pdsHostname
     this.appViewAgent = params.appViewAgent
@@ -78,9 +76,9 @@ export class LocalViewer {
     appViewAgent?: AtpAgent
     appviewDid?: string
     appviewCdnUrlPattern?: string
-  }) {
-    return (actorStore: ActorStoreReader, actorKey: Keypair) => {
-      return new LocalViewer({ ...params, actorStore, actorKey })
+  }): LocalViewerCreator {
+    return (actorStore) => {
+      return new LocalViewer({ ...params, actorStore })
     }
   }
 
@@ -95,10 +93,12 @@ export class LocalViewer {
     if (!this.appviewDid) {
       throw new Error('Could not find bsky appview did')
     }
+    const keypair = await this.actorStore.keypair()
+
     return createServiceAuthHeaders({
       iss: did,
       aud: this.appviewDid,
-      keypair: this.actorKey,
+      keypair,
     })
   }
 

package/src/sequencer/outbox.ts

@@ -13,7 +13,10 @@ export class Outbox {
   cutoverBuffer: SeqEvt[]
   outBuffer: AsyncBuffer<SeqEvt>
 
-  constructor(public sequencer: Sequencer, opts: Partial<OutboxOpts> = {}) {
+  constructor(
+    public sequencer: Sequencer,
+    opts: Partial<OutboxOpts> = {},
+  ) {
     const { maxBufferSize = 500 } = opts
     this.cutoverBuffer = []
     this.outBuffer = new AsyncBuffer<SeqEvt>(maxBufferSize)

package/tests/account-deletion.test.ts

@@ -185,6 +185,13 @@ describe('account deletion', () => {
     await expect(attempt2).rejects.toThrow(BlobNotFoundError)
   })
 
+  it('maintains blobs from other actors', async () => {
+    const bobBlobstore = network.pds.ctx.blobstore(sc.dids.bob)
+    const [img] = sc.replies[sc.dids.bob][0].images
+    const attempt = bobBlobstore.getBytes(img.image.ref)
+    await expect(attempt).resolves.toBeDefined()
+  })
+
   it('can delete an empty user', async () => {
     const eve = await sc.createAccount('eve', {
       handle: 'eve.test',

package/tests/entryway.test.ts

@@ -120,9 +120,8 @@ describe('entryway', () => {
       },
     )
     const doc = await entryway.ctx.idResolver.did.resolve(alice)
-    const handleToDid = await entryway.ctx.idResolver.handle.resolve(
-      'alice3.test',
-    )
+    const handleToDid =
+      await entryway.ctx.idResolver.handle.resolve('alice3.test')
     const accountFromPds = await pds.ctx.accountManager.getAccount(alice)
     const accountFromEntryway = await entryway.ctx.services
       .account(entryway.ctx.db)