fix(xrpc): support BodyInit as request body

bluesky-social · May 15, 2024 · ad66160 · ad66160
1 parent 7575c17
commit ad66160
Show file tree

Hide file tree

Showing 12 changed files with 274 additions and 40 deletions.
diff --git a/packages/api/src/client/types/com/atproto/repo/importRepo.ts b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
@@ -9,7 +9,7 @@ import { CID } from 'multiformats/cid'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface CallOptions {
   headers?: Headers

diff --git a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
@@ -9,7 +9,7 @@ import { CID } from 'multiformats/cid'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef

diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -11,7 +11,7 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface HandlerInput {
   encoding: 'application/vnd.ipld.car'

diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -11,7 +11,7 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef

diff --git a/packages/lex-cli/src/codegen/lex-gen.ts b/packages/lex-cli/src/codegen/lex-gen.ts
@@ -335,11 +335,11 @@ export function genXrpcInput(
       )
     }
   } else if (def.type === 'procedure' && def.input?.encoding) {
-    //= export type InputSchema = string | Uint8Array
+    //= export type InputSchema = string | Uint8Array | Blob
     file.addTypeAlias({
       isExported: true,
       name: 'InputSchema',
-      type: 'string | Uint8Array',
+      type: 'string | Uint8Array | Blob',
     })
   } else {
     //= export type InputSchema = undefined

diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -11,7 +11,7 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface HandlerInput {
   encoding: 'application/vnd.ipld.car'

diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -11,7 +11,7 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef

diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -11,7 +11,7 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface HandlerInput {
   encoding: 'application/vnd.ipld.car'

diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -11,7 +11,7 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = string | Uint8Array
+export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef

diff --git a/packages/pds/tests/crud.test.ts b/packages/pds/tests/crud.test.ts
@@ -1077,7 +1077,7 @@ describe('crud operations', () => {
       const result = await defaultFetchHandler(
         aliceAgent.service.origin + `/xrpc/com.atproto.repo.createRecord`,
         'post',
-        { ...aliceAgent.api.xrpc.headers, 'Content-Type': 'application/json' },
+        { ...aliceAgent.api.xrpc.headers, 'content-type': 'application/json' },
         passthroughBody({
           repo: alice.did,
           collection: 'app.bsky.feed.post',

diff --git a/packages/xrpc/src/client.ts b/packages/xrpc/src/client.ts
@@ -6,7 +6,6 @@ import {
   encodeMethodCallBody,
   httpResponseCodeToEnum,
   httpResponseBodyParse,
-  normalizeHeaders,
 } from './util'
 import {
   FetchHandler,
@@ -72,11 +71,11 @@ export class ServiceClient {
   }
 
   setHeader(key: string, value: string): void {
-    this.headers[key] = value
+    this.headers[key.toLowerCase()] = value
   }
 
   unsetHeader(key: string): void {
-    delete this.headers[key]
+    delete this.headers[key.toLowerCase()]
   }
 
   async call(
@@ -94,13 +93,13 @@ export class ServiceClient {
 
     const httpMethod = getMethodSchemaHTTPMethod(def)
     const httpUri = constructMethodCallUri(methodNsid, def, this.uri, params)
-    const httpHeaders = constructMethodCallHeaders(def, data, {
-      headers: {
-        ...this.headers,
-        ...opts?.headers,
-      },
-      encoding: opts?.encoding,
-    })
+    const httpHeaders = constructMethodCallHeaders(def, data, opts)
+
+    for (const [k, v] of Object.entries(this.headers)) {
+      if (v != null && !Object.hasOwn(httpHeaders, k)) {
+        httpHeaders[k] = v
+      }
+    }
 
     const res = await this.baseClient.fetch(
       httpUri,
@@ -145,11 +144,10 @@ export async function defaultFetchHandler(
   try {
     // The duplex field is now required for streaming bodies, but not yet reflected
     // anywhere in docs or types. See whatwg/fetch#1438, nodejs/node#46221.
-    const headers = normalizeHeaders(httpHeaders)
     const reqInit: RequestInit & { duplex: string } = {
       method: httpMethod,
-      headers,
-      body: encodeMethodCallBody(headers, httpReqBody),
+      headers: httpHeaders,
+      body: encodeMethodCallBody(httpHeaders, httpReqBody),
       duplex: 'half',
     }
     const res = await fetch(httpUri, reqInit)
@@ -160,7 +158,10 @@ export async function defaultFetchHandler(
       body: httpResponseBodyParse(res.headers.get('content-type'), resBody),
     }
   } catch (e) {
-    throw new XRPCError(ResponseType.Unknown, String(e))
+    if (e instanceof XRPCError) throw e
+    const err = new XRPCError(ResponseType.Unknown, String(e))
+    err.cause = e
+    throw err
   }
 }