Polish on entryway blob uploads and gets (#1814)

* fix account creation to work between entryway and non-entryway

* stream blob uploads

* serve redirect to new pds on getBlob

* tidy did doc session tests

packages/api/tests/agent.test.ts

@@ -1,4 +1,3 @@
-import assert from 'assert'
 import { defaultFetchHandler } from '@atproto/xrpc'
 import {
   AtpAgent,
@@ -7,17 +6,13 @@ import {
   AtpSessionData,
 } from '..'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
-import { getPdsEndpoint, isValidDidDoc } from '@atproto/common-web'
 
 describe('agent', () => {
   let network: TestNetworkNoAppView
 
   beforeAll(async () => {
     network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'api_agent',
-      pds: {
-        enableDidDocWithSession: true,
-      },
     })
   })
 
@@ -48,19 +43,16 @@ describe('agent', () => {
     expect(agent.session?.did).toEqual(res.data.did)
     expect(agent.session?.email).toEqual('[email protected]')
     expect(agent.session?.emailConfirmed).toEqual(false)
-    assert(isValidDidDoc(res.data.didDoc))
-    expect(agent.api.xrpc.uri.origin).toEqual(getPdsEndpoint(res.data.didDoc))
 
     const { data: sessionInfo } = await agent.api.com.atproto.server.getSession(
       {},
     )
-    expect(sessionInfo).toMatchObject({
+    expect(sessionInfo).toEqual({
       did: res.data.did,
       handle: res.data.handle,
       email: '[email protected]',
       emailConfirmed: false,
     })
-    expect(isValidDidDoc(sessionInfo.didDoc)).toBe(true)
 
     expect(events.length).toEqual(1)
     expect(events[0]).toEqual('create')
@@ -98,18 +90,15 @@ describe('agent', () => {
     expect(agent2.session?.did).toEqual(res1.data.did)
     expect(agent2.session?.email).toEqual('[email protected]')
     expect(agent2.session?.emailConfirmed).toEqual(false)
-    assert(isValidDidDoc(res1.data.didDoc))
-    expect(agent2.api.xrpc.uri.origin).toEqual(getPdsEndpoint(res1.data.didDoc))
 
     const { data: sessionInfo } =
       await agent2.api.com.atproto.server.getSession({})
-    expect(sessionInfo).toMatchObject({
+    expect(sessionInfo).toEqual({
       did: res1.data.did,
       handle: res1.data.handle,
       email,
       emailConfirmed: false,
     })
-    expect(isValidDidDoc(sessionInfo.didDoc)).toBe(true)
 
     expect(events.length).toEqual(2)
     expect(events[0]).toEqual('create')
@@ -144,18 +133,15 @@ describe('agent', () => {
     expect(agent2.hasSession).toEqual(true)
     expect(agent2.session?.handle).toEqual(res1.data.handle)
     expect(agent2.session?.did).toEqual(res1.data.did)
-    assert(isValidDidDoc(res1.data.didDoc))
-    expect(agent2.api.xrpc.uri.origin).toEqual(getPdsEndpoint(res1.data.didDoc))
 
     const { data: sessionInfo } =
       await agent2.api.com.atproto.server.getSession({})
-    expect(sessionInfo).toMatchObject({
+    expect(sessionInfo).toEqual({
       did: res1.data.did,
       handle: res1.data.handle,
       email: res1.data.email,
       emailConfirmed: false,
     })
-    expect(isValidDidDoc(sessionInfo.didDoc)).toBe(true)
 
     expect(events.length).toEqual(2)
     expect(events[0]).toEqual('create')

packages/pds/src/api/com/atproto/repo/uploadBlob.ts

@@ -1,11 +1,10 @@
-import { streamToBytes } from '@atproto/common'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 import {
   authPassthru,
   ensureThisPds,
+  getStreamingRequestInit,
   proxy,
-  resultPassthru,
 } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
@@ -16,14 +15,18 @@ export default function (server: Server, ctx: AppContext) {
         ctx,
         auth.credentials.audience,
         async (agent) => {
-          const result = await agent.api.com.atproto.repo.uploadBlob(
-            await streamToBytes(input.body), // @TODO proxy streaming
-            {
-              ...authPassthru(req),
-              encoding: input.encoding,
-            },
-          )
-          return resultPassthru(result)
+          const reqInit = getStreamingRequestInit(input.body)
+          reqInit.method = req.method
+          reqInit.headers = {
+            ...authPassthru(req)?.headers,
+            'content-type':
+              req.headers['content-type'] || 'application/octet-stream',
+          }
+          const res = await fetch(`${agent.service.origin}${req.path}`, reqInit)
+          return {
+            encoding: 'application/json' as const,
+            body: await res.json(),
+          }
         },
       )
       if (proxied !== null) {