@atproto/lex-client 0.0.4 → 0.0.5

package/dist/xrpc-response.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XrpcResponse = void 0;
+const lex_json_1 = require("@atproto/lex-json");
+const xrpc_error_js_1 = require("./xrpc-error.js");
+/**
+ * Small container for XRPC response data.
+ *
+ * @implements {ResultSuccess<XrpcResponse<M>>} for convenience in result handling contexts.
+ */
+class XrpcResponse {
+    method;
+    status;
+    headers;
+    payload;
+    /** @see {@link ResultSuccess.success} */
+    success = true;
+    /** @see {@link ResultSuccess.value} */
+    get value() {
+        return this;
+    }
+    constructor(method, status, headers, payload) {
+        this.method = method;
+        this.status = status;
+        this.headers = headers;
+        this.payload = payload;
+    }
+    /**
+     * Whether the response payload was parsed as {@link LexValue} (`true`) or is
+     * in binary form {@link Uint8Array} (`false`).
+     */
+    get isParsed() {
+        return this.encoding === 'application/json' && shouldParse(this.method);
+    }
+    get encoding() {
+        return this.payload?.encoding;
+    }
+    get body() {
+        return this.payload?.body;
+    }
+    /**
+     * @throws {XrpcInvalidResponseError} when the response is invalid according
+     * to the method schema.
+     */
+    static async fromFetchResponse(method, response, options) {
+        // @NOTE The body MUST either be read or canceled to avoid resource leaks.
+        // Since nothing should cause an exception before "readPayload" is
+        // called, we can safely not use a try/finally here.
+        // @NOTE redirect is set to 'follow', so we shouldn't get 3xx responses here
+        if (response.status < 200 || response.status >= 300) {
+            // Always parse json for error responses
+            const payload = await readPayload(response, { parse: true });
+            if (response.status >= 400 && (0, xrpc_error_js_1.isXrpcErrorPayload)(payload)) {
+                throw new xrpc_error_js_1.XrpcResponseError(method, response.status, response.headers, payload);
+            }
+            throw new xrpc_error_js_1.XrpcInvalidResponseError(response.status >= 500
+                ? `Upstream server encountered an error`
+                : response.status >= 400
+                    ? `Upstream server returned an invalid response payload`
+                    : `Upstream server returned an invalid status code`, response, payload);
+        }
+        // Only parse json if the schema expects it
+        const payload = await readPayload(response, {
+            parse: shouldParse(method),
+        });
+        // Response is successful (2xx). Validate payload (data and encoding) against schema.
+        if (method.output.encoding == null) {
+            // Schema expects no payload
+            if (payload) {
+                throw new xrpc_error_js_1.XrpcInvalidResponseError(`Expected response with no body, got ${payload.encoding}`, response, payload);
+            }
+        }
+        else {
+            // Schema expects a payload
+            if (!payload || !method.output.matchesEncoding(payload.encoding)) {
+                throw new xrpc_error_js_1.XrpcInvalidResponseError(payload
+                    ? `Expected ${method.output.encoding} response, got ${payload.encoding}`
+                    : `Expected non-empty response with content-type ${method.output.encoding}`, response, payload);
+            }
+            // Assert valid response body.
+            if (method.output.schema && options?.validateResponse !== false) {
+                const result = method.output.schema.safeParse(payload.body, {
+                    allowTransform: false,
+                });
+                if (!result.success) {
+                    throw new xrpc_error_js_1.XrpcInvalidResponseError(`Response validation failed: ${result.reason.message}`, response, payload, { cause: result.reason });
+                }
+            }
+        }
+        return new XrpcResponse(method, response.status, response.headers, payload);
+    }
+}
+exports.XrpcResponse = XrpcResponse;
+function shouldParse(method) {
+    return method.output.encoding === 'application/json';
+}
+/**
+ * @note this function always consumes the response body
+ */
+async function readPayload(response, options) {
+    // @TODO Should we limit the maximum response size here (this could also be
+    // done by the FetchHandler)?
+    const encoding = response.headers
+        .get('content-type')
+        ?.split(';')[0]
+        .trim()
+        .toLowerCase();
+    // Response content-type is undefined
+    if (!encoding) {
+        // If the body is empty, return null (= no payload)
+        const body = await response.arrayBuffer();
+        if (body.byteLength === 0)
+            return null;
+        // If we got data despite no content-type, treat it as binary
+        return {
+            encoding: 'application/octet-stream',
+            body: new Uint8Array(body),
+        };
+    }
+    if (options?.parse && encoding === 'application/json') {
+        // @NOTE It might be worth returning the raw bytes here (Uint8Array) and
+        // perform the lex parsing using cborg/json, allowing to do
+        // bytes->LexValue in one step instead of bytes->text->JSON->LexValue.
+        // This would require adding encode/decode utilities to lex-json (similar
+        // to @ipld/dag-json)
+        const text = await response.text();
+        try {
+            // @NOTE Using `lexParse(text)` (instead of `jsonToLex(json)`) here as
+            // using a reviver function during JSON.parse should be faster than
+            // parsing to JSON then converting to Lex (?)
+            // @TODO verify statement above
+            return { encoding, body: (0, lex_json_1.lexParse)(text) };
+        }
+        catch (cause) {
+            throw new xrpc_error_js_1.XrpcInvalidResponseError('Invalid JSON response body', response, null, { cause });
+        }
+    }
+    return { encoding, body: new Uint8Array(await response.arrayBuffer()) };
+}
+//# sourceMappingURL=xrpc-response.js.map

package/dist/xrpc-response.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xrpc-response.js","sourceRoot":"","sources":["../src/xrpc-response.ts"],"names":[],"mappings":"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","sourcesContent":["import { lexParse } from '@atproto/lex-json'\nimport {\n  InferMethodOutputBody,\n  InferMethodOutputEncoding,\n  Procedure,\n  Query,\n  ResultSuccess,\n} from '@atproto/lex-schema'\nimport { Payload } from './util.js'\nimport {\n  XrpcInvalidResponseError,\n  XrpcResponseError,\n  isXrpcErrorPayload,\n} from './xrpc-error.js'\n\nexport type XrpcResponseBody<M extends Procedure | Query> =\n  InferMethodOutputBody<M, Uint8Array>\n\nexport type XrpcResponsePayload<M extends Procedure | Query> =\n  InferMethodOutputEncoding<M> extends infer E extends string\n    ? Payload<XrpcResponseBody<M>, E>\n    : null\n\n/**\n * Small container for XRPC response data.\n *\n * @implements {ResultSuccess<XrpcResponse<M>>} for convenience in result handling contexts.\n */\nexport class XrpcResponse<const M extends Procedure | Query>\n  implements ResultSuccess<XrpcResponse<M>>\n{\n  /** @see {@link ResultSuccess.success} */\n  readonly success = true as const\n\n  /** @see {@link ResultSuccess.value} */\n  get value(): this {\n    return this\n  }\n\n  constructor(\n    readonly method: M,\n    readonly status: number,\n    readonly headers: Headers,\n    readonly payload: XrpcResponsePayload<M>,\n  ) {}\n\n  /**\n   * Whether the response payload was parsed as {@link LexValue} (`true`) or is\n   * in binary form {@link Uint8Array} (`false`).\n   */\n  get isParsed() {\n    return this.encoding === 'application/json' && shouldParse(this.method)\n  }\n\n  get encoding() {\n    return this.payload?.encoding as InferMethodOutputEncoding<M>\n  }\n\n  get body() {\n    return this.payload?.body as XrpcResponseBody<M>\n  }\n\n  /**\n   * @throws {XrpcInvalidResponseError} when the response is invalid according\n   * to the method schema.\n   */\n  static async fromFetchResponse<const M extends Procedure | Query>(\n    method: M,\n    response: Response,\n    options?: { validateResponse?: boolean },\n  ): Promise<XrpcResponse<M>> {\n    // @NOTE The body MUST either be read or canceled to avoid resource leaks.\n    // Since nothing should cause an exception before \"readPayload\" is\n    // called, we can safely not use a try/finally here.\n\n    // @NOTE redirect is set to 'follow', so we shouldn't get 3xx responses here\n    if (response.status < 200 || response.status >= 300) {\n      // Always parse json for error responses\n      const payload = await readPayload(response, { parse: true })\n\n      if (response.status >= 400 && isXrpcErrorPayload(payload)) {\n        throw new XrpcResponseError(\n          method,\n          response.status,\n          response.headers,\n          payload,\n        )\n      }\n\n      throw new XrpcInvalidResponseError(\n        response.status >= 500\n          ? `Upstream server encountered an error`\n          : response.status >= 400\n            ? `Upstream server returned an invalid response payload`\n            : `Upstream server returned an invalid status code`,\n        response,\n        payload,\n      )\n    }\n\n    // Only parse json if the schema expects it\n    const payload = await readPayload(response, {\n      parse: shouldParse(method),\n    })\n\n    // Response is successful (2xx). Validate payload (data and encoding) against schema.\n    if (method.output.encoding == null) {\n      // Schema expects no payload\n      if (payload) {\n        throw new XrpcInvalidResponseError(\n          `Expected response with no body, got ${payload.encoding}`,\n          response,\n          payload,\n        )\n      }\n    } else {\n      // Schema expects a payload\n      if (!payload || !method.output.matchesEncoding(payload.encoding)) {\n        throw new XrpcInvalidResponseError(\n          payload\n            ? `Expected ${method.output.encoding} response, got ${payload.encoding}`\n            : `Expected non-empty response with content-type ${method.output.encoding}`,\n          response,\n          payload,\n        )\n      }\n\n      // Assert valid response body.\n      if (method.output.schema && options?.validateResponse !== false) {\n        const result = method.output.schema.safeParse(payload.body, {\n          allowTransform: false,\n        })\n\n        if (!result.success) {\n          throw new XrpcInvalidResponseError(\n            `Response validation failed: ${result.reason.message}`,\n            response,\n            payload,\n            { cause: result.reason },\n          )\n        }\n      }\n    }\n\n    return new XrpcResponse<M>(\n      method,\n      response.status,\n      response.headers,\n      payload as XrpcResponsePayload<M>,\n    )\n  }\n}\n\nfunction shouldParse(method: Procedure | Query) {\n  return method.output.encoding === 'application/json'\n}\n\n/**\n * @note this function always consumes the response body\n */\nasync function readPayload(\n  response: Response,\n  options?: { parse?: boolean },\n): Promise<Payload | null> {\n  // @TODO Should we limit the maximum response size here (this could also be\n  // done by the FetchHandler)?\n\n  const encoding = response.headers\n    .get('content-type')\n    ?.split(';')[0]\n    .trim()\n    .toLowerCase()\n\n  // Response content-type is undefined\n  if (!encoding) {\n    // If the body is empty, return null (= no payload)\n    const body = await response.arrayBuffer()\n    if (body.byteLength === 0) return null\n\n    // If we got data despite no content-type, treat it as binary\n    return {\n      encoding: 'application/octet-stream',\n      body: new Uint8Array(body),\n    }\n  }\n\n  if (options?.parse && encoding === 'application/json') {\n    // @NOTE It might be worth returning the raw bytes here (Uint8Array) and\n    // perform the lex parsing using cborg/json, allowing to do\n    // bytes->LexValue in one step instead of bytes->text->JSON->LexValue.\n    // This would require adding encode/decode utilities to lex-json (similar\n    // to @ipld/dag-json)\n    const text = await response.text()\n\n    try {\n      // @NOTE Using `lexParse(text)` (instead of `jsonToLex(json)`) here as\n      // using a reviver function during JSON.parse should be faster than\n      // parsing to JSON then converting to Lex (?)\n\n      // @TODO verify statement above\n      return { encoding, body: lexParse(text) }\n    } catch (cause) {\n      throw new XrpcInvalidResponseError(\n        'Invalid JSON response body',\n        response,\n        null,\n        { cause },\n      )\n    }\n  }\n\n  return { encoding, body: new Uint8Array(await response.arrayBuffer()) }\n}\n"]}

package/dist/xrpc.d.ts

@@ -1,37 +1,34 @@
-import { LexValue } from '@atproto/lex-data';
-import { DidString, InferParamsSchema, InferPayloadBody, Params, ParamsSchema, Procedure, Query, Restricted, Subscription } from '@atproto/lex-schema';
+import { InferMethodInput, InferMethodParams, Params, Procedure, Query, Restricted } from '@atproto/lex-schema';
 import { Agent } from './agent.js';
-import { XrpcResponse } from './response.js';
-import { CallOptions, Namespace, Service } from './types.js';
-export type XrpcOptions<M extends Procedure | Query = Procedure | Query> = CallOptions & XrpcRequestUrlOptions<M> & XrpcRequestInitOptions<M>;
-export declare function xrpc<const M extends Query | Procedure>(agent: Agent, ns: NonNullable<unknown> extends XrpcOptions<M> ? Namespace<M> : Restricted<'This XRPC method requires an "options" argument'>): Promise<XrpcResponse<M>>;
-export declare function xrpc<const M extends Query | Procedure>(agent: Agent, ns: Namespace<M>, options: XrpcOptions<M>): Promise<XrpcResponse<M>>;
-export type XrpcRequestUrlOptions<M extends Query | Procedure | Subscription> = CallOptions & (undefined extends InferParamsSchema<M['parameters']> ? {
-    params?: InferParamsSchema<M['parameters']>;
-} : {
-    params: InferParamsSchema<M['parameters']>;
-});
-export declare function xrpcRequestUrl<M extends Procedure | Query | Subscription>(method: M, options: XrpcRequestUrlOptions<M>): string;
-export declare function xrpcRequestParams(schema: ParamsSchema | undefined, params: Params | undefined, options: CallOptions): undefined | string;
-export type XrpcRequestInitOptions<T extends Query | Procedure> = CallOptions & (T extends Procedure ? never extends InferPayloadBody<T['input']> ? {
-    body?: InferPayloadBody<T['input']>;
+import { BinaryBodyInit, CallOptions, Namespace } from './types.js';
+import { XrpcInvalidResponseError, XrpcResponseError, XrpcUnexpectedError } from './xrpc-error.js';
+import { XrpcResponse } from './xrpc-response.js';
+export * from './xrpc-error.js';
+export * from './xrpc-response.js';
+type XrpcParamsOptions<P extends Params> = NonNullable<unknown> extends P ? {
+    params?: P;
 } : {
-    body: InferPayloadBody<T['input']>;
+    params: P;
+};
+type XrpcRequestPayload<M extends Procedure | Query> = InferMethodInput<M, BinaryBodyInit>;
+type XrpcInputOptions<In> = In extends {
+    body: infer B;
+    encoding: infer E;
+} ? {
+    body: B;
+    encoding?: E;
 } : {
-    body?: never;
-});
-export declare function xrpcRequestInit<T extends Procedure | Query>(schema: T, options: XrpcRequestInitOptions<T>): RequestInit & {
-    duplex?: 'half';
+    body?: undefined;
+    encoding?: undefined;
 };
-export declare function xrpcRequestHeaders(options: {
-    headers?: HeadersInit;
-    service?: Service;
-    labelers?: Iterable<DidString>;
-}): Headers;
-export declare function xrpcResponseHandler<M extends Procedure | Query>(response: Response, schema: M, options?: {
-    validateResponse?: boolean;
-}): Promise<XrpcResponse<M>>;
-export declare function extractEncoding(headers: Headers): string | undefined;
-export declare function readResponseBody(response: Response, encoding: string): Promise<LexValue>;
-export declare function readResponseBody(response: Response, encoding: string | undefined): Promise<LexValue | undefined>;
+export type XrpcOptions<M extends Procedure | Query = Procedure | Query> = CallOptions & XrpcInputOptions<XrpcRequestPayload<M>> & XrpcParamsOptions<InferMethodParams<M>>;
+export type XrpcFailure<M extends Procedure | Query> = XrpcResponseError<M> | XrpcInvalidResponseError | XrpcUnexpectedError;
+export type XrpcResult<M extends Procedure | Query> = XrpcResponse<M> | XrpcFailure<M>;
+/**
+ * @throws XrpcFailure<M>
+ */
+export declare function xrpc<const M extends Query | Procedure>(agent: Agent, ns: NonNullable<unknown> extends XrpcOptions<M> ? Namespace<M> : Restricted<'This XRPC method requires an "options" argument'>): Promise<XrpcResponse<M>>;
+export declare function xrpc<const M extends Query | Procedure>(agent: Agent, ns: Namespace<M>, options: XrpcOptions<M>): Promise<XrpcResponse<M>>;
+export declare function xrpcSafe<const M extends Query | Procedure>(agent: Agent, ns: NonNullable<unknown> extends XrpcOptions<M> ? Namespace<M> : Restricted<'This XRPC method requires an "options" argument'>): Promise<XrpcResult<M>>;
+export declare function xrpcSafe<const M extends Query | Procedure>(agent: Agent, ns: Namespace<M>, options: XrpcOptions<M>): Promise<XrpcResult<M>>;
 //# sourceMappingURL=xrpc.d.ts.map

package/dist/xrpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xrpc.d.ts","sourceRoot":"","sources":["../src/xrpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xrpc.d.ts","sourceRoot":"","sources":["../src/xrpc.ts"],"names":[],"mappings":"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"}

package/dist/xrpc.js

@@ -1,25 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.xrpc = xrpc;
-exports.xrpcRequestUrl = xrpcRequestUrl;
-exports.xrpcRequestParams = xrpcRequestParams;
-exports.xrpcRequestInit = xrpcRequestInit;
-exports.xrpcRequestHeaders = xrpcRequestHeaders;
-exports.xrpcResponseHandler = xrpcResponseHandler;
-exports.extractEncoding = extractEncoding;
-exports.readResponseBody = readResponseBody;
+exports.xrpcSafe = xrpcSafe;
+const tslib_1 = require("tslib");
+const lex_data_1 = require("@atproto/lex-data");
 const lex_json_1 = require("@atproto/lex-json");
-const lex_schema_1 = require("@atproto/lex-schema");
-const error_js_1 = require("./error.js");
-const response_js_1 = require("./response.js");
 const types_js_1 = require("./types.js");
+const util_js_1 = require("./util.js");
+const xrpc_error_js_1 = require("./xrpc-error.js");
+const xrpc_response_js_1 = require("./xrpc-response.js");
+tslib_1.__exportStar(require("./xrpc-error.js"), exports);
+tslib_1.__exportStar(require("./xrpc-response.js"), exports);
+/**
+ * Utility method to type cast the error thrown by {@link xrpc} to an
+ * {@link XrpcFailure} matching the provided method. Only use this function
+ * inside a catch block right after calling {@link xrpc}, and use the same
+ * method type parameter as used in the {@link xrpc} call.
+ */
+function asXrpcFailure(err) {
+    if (err instanceof xrpc_error_js_1.XrpcResponseError)
+        return err;
+    if (err instanceof xrpc_error_js_1.XrpcInvalidResponseError)
+        return err;
+    return xrpc_error_js_1.XrpcUnexpectedError.from(err);
+}
 async function xrpc(agent, ns, options = {}) {
-    options.signal?.throwIfAborted();
+    try {
+        return await xrpcRequest(agent, ns, options);
+    }
+    catch (err) {
+        throw asXrpcFailure(err);
+    }
+}
+async function xrpcSafe(agent, ns, options = {}) {
+    return xrpcRequest(agent, ns, options).catch((asXrpcFailure));
+}
+async function xrpcRequest(agent, ns, options = {}) {
     const method = (0, types_js_1.getMain)(ns);
+    options.signal?.throwIfAborted();
     const url = xrpcRequestUrl(method, options);
     const request = xrpcRequestInit(method, options);
     const response = await agent.fetchHandler(url, request);
-    return xrpcResponseHandler(response, method, options);
+    return xrpc_response_js_1.XrpcResponse.fromFetchResponse(method, response, options);
 }
 function xrpcRequestUrl(method, options) {
     const path = `/xrpc/${method.nsid}`;
@@ -33,15 +55,26 @@ function xrpcRequestParams(schema, params, options) {
     return urlSearchParams?.size ? urlSearchParams.toString() : undefined;
 }
 function xrpcRequestInit(schema, options) {
-    const headers = xrpcRequestHeaders(options);
+    const headers = (0, util_js_1.buildAtprotoHeaders)(options);
+    // Tell the server what type of response we're expecting
+    if (schema.output.encoding) {
+        headers.set('accept', schema.output.encoding);
+    }
+    // Caller should not set content-type header
+    if (headers.has('content-type')) {
+        const contentType = headers.get('content-type');
+        throw new TypeError(`Unexpected content-type header (${contentType})`);
+    }
     // Requests with body
-    if ('input' in schema && schema.input?.encoding) {
-        if (options.validateRequest &&
-            schema.input == null &&
-            options.body !== undefined) {
-            throw new TypeError(`XRPC method ${schema.nsid} does not accept a request body`);
+    if ('input' in schema) {
+        const encodingHint = options.encoding;
+        const input = xrpcProcedureInput(schema, options, encodingHint);
+        if (input) {
+            headers.set('content-type', input.encoding);
+        }
+        else if (encodingHint != null) {
+            throw new TypeError(`Unexpected encoding hint (${encodingHint})`);
         }
-        headers.set('content-type', schema.input.encoding);
         return {
             duplex: 'half',
             redirect: 'follow',
@@ -50,9 +83,7 @@ function xrpcRequestInit(schema, options) {
             signal: options.signal,
             method: 'POST',
             headers,
-            body: xrpcRequestBody(schema.input?.encoding, options.validateRequest
-                ? schema.input?.body.parse(options.body)
-                : options.body),
+            body: input?.body,
         };
     }
     // Requests without body
@@ -62,124 +93,87 @@ function xrpcRequestInit(schema, options) {
         referrerPolicy: 'strict-origin-when-cross-origin', // (default)
         mode: 'cors', // (default)
         signal: options.signal,
-        method: schema instanceof lex_schema_1.Query ? 'GET' : 'POST',
+        method: 'GET',
         headers,
     };
 }
-function xrpcRequestHeaders(options) {
-    const headers = new Headers(options.headers);
-    if (options.service && !headers.has('atproto-proxy')) {
-        headers.set('atproto-proxy', options.service);
-    }
-    if (options.labelers) {
-        headers.set('atproto-accept-labelers', [...options.labelers, headers.get('atproto-accept-labelers')?.trim()]
-            .filter(Boolean)
-            .join(', '));
-    }
-    return headers;
-}
-function xrpcRequestBody(encoding, body) {
-    if (encoding === undefined) {
-        return null;
-    }
-    if (encoding === 'application/json') {
-        if (body !== undefined)
-            return (0, lex_json_1.lexStringify)(body);
-    }
-    else if (encoding.startsWith('text/')) {
-        if (typeof body === 'string')
-            return body;
-    }
-    else {
-        if (ArrayBuffer.isView(body) || body instanceof ArrayBuffer)
-            return body;
+function xrpcProcedureInput(method, options, encodingHint) {
+    const { input } = method;
+    const { body } = options;
+    if (options.validateRequest) {
+        input.schema?.check(body);
     }
-    throw new TypeError(`Invalid ${typeof body} body for ${encoding} encoding`);
-}
-async function xrpcResponseHandler(response, schema, options) {
-    // @NOTE The body MUST either be read or canceled to avoid resource leaks.
-    // Since nothing should cause an exception before "readXrpcResponseBody" is
-    // called, we can safely not use a try/finally here.
-    const encoding = extractEncoding(response.headers);
-    const body = await readResponseBody(response, encoding).catch((cause) => {
-        throw new error_js_1.XrpcServiceError(error_js_1.KnownError.InvalidResponse, response.status, response.headers, undefined, 'Failed to read XRPC response', { cause });
-    });
-    // @NOTE redirect is set to 'follow', so we shouldn't get 3xx responses here
-    if (response.status < 200 || response.status >= 300) {
-        // All unsuccessful responses should follow a standard error response
-        // schema. The Content-Type should be application/json, and the payload
-        // should be a JSON object with the following fields:
-        // - error (string, required): type name of the error (generic ASCII
-        //   constant, no whitespace)
-        // - message (string, optional): description of the error, appropriate for
-        //   display to humans
-        if (body != null &&
-            encoding === 'application/json' &&
-            error_js_1.xrpcErrorBodySchema.matches(body)) {
-            throw new error_js_1.XrpcResponseError(response.status, response.headers, encoding, body);
+    // Special handling for endpoints expecting application/json input
+    if (input.encoding === 'application/json') {
+        // @NOTE **NOT** using isLexValue here to avoid deep checks in order to
+        // distinguish between LexValue and BinaryBodyInit.
+        if (!(0, lex_data_1.isLexScalar)(body) && !(0, lex_data_1.isPlainObject)(body) && !Array.isArray(body)) {
+            throw new TypeError(`Expected LexValue body, got ${typeof body}`);
         }
-        throw new error_js_1.XrpcServiceError(response.status >= 500
-            ? error_js_1.KnownError.InternalServerError
-            : error_js_1.KnownError.InvalidResponse, response.status, response.headers, body);
+        return buildPayload(input, (0, lex_json_1.lexStringify)(body), encodingHint);
     }
-    // Check response encoding
-    if (schema.output.encoding !== encoding) {
-        throw new error_js_1.XrpcServiceError(error_js_1.KnownError.InvalidResponse, response.status, response.headers, body, `Expected response with content-type ${schema.output.encoding}, got ${encoding}`);
+    // Other encodings will be sent unaltered (ie. as binary data)
+    switch (typeof body) {
+        case 'undefined':
+        case 'string':
+            return buildPayload(input, body, encodingHint);
+        case 'object': {
+            if (body === null)
+                break;
+            if (ArrayBuffer.isView(body) ||
+                body instanceof ArrayBuffer ||
+                body instanceof ReadableStream) {
+                return buildPayload(input, body, encodingHint);
+            }
+            else if ((0, util_js_1.isAsyncIterable)(body)) {
+                return buildPayload(input, (0, util_js_1.toReadableStream)(body), encodingHint);
+            }
+            else if ((0, util_js_1.isBlobLike)(body)) {
+                return buildPayload(input, body, encodingHint || body.type);
+            }
+        }
     }
-    if (schema.output.encoding == null) {
+    throw new TypeError(`Invalid ${typeof body} body for ${input.encoding} encoding`);
+}
+function buildPayload(schema, body, encodingHint) {
+    if (schema.encoding === undefined) {
         if (body !== undefined) {
-            throw new error_js_1.XrpcServiceError(error_js_1.KnownError.InvalidResponse, response.status, response.headers, body, `Expected empty response body`);
+            throw new TypeError(`Cannot send a ${typeof body} body with undefined encoding`);
         }
-        return new response_js_1.XrpcResponse(schema, response.status, response.headers, undefined);
+        return null;
     }
-    else {
-        // @NOTE this should already be enforced by readXrpcResponseBody
-        if (body === undefined) {
-            throw new error_js_1.XrpcServiceError(error_js_1.KnownError.InvalidResponse, response.status, response.headers, body, `Expected non-empty response body`);
-        }
-        return new response_js_1.XrpcResponse(schema, response.status, response.headers, schema.output.schema == null || options?.validateResponse === false
-            ? body
-            : schema.output.schema.parse(body));
+    if (body === undefined) {
+        // This error would be returned by the server, but we can catch it earlier
+        // to avoid un-necessary requests. Note that a content-length of 0 does not
+        // necessary mean that the body is "empty" (e.g. an empty txt file).
+        throw new TypeError(`A request body is expected but none was provided`);
     }
+    const encoding = buildEncoding(schema, encodingHint);
+    return { encoding, body };
 }
-function extractEncoding(headers) {
-    const contentType = headers.get('content-type');
-    if (!contentType)
-        return undefined;
-    return contentType.split(';')[0].trim();
-}
-async function readResponseBody(response, encoding) {
-    // When encoding is undefined or empty, we expect no body
-    if (encoding == null) {
-        if (response.body == null)
-            return undefined;
-        // Let's make sure the body is empty (while avoiding reading it all).
-        if (!('getReader' in response.body)) {
-            // Some environments may not support body.getReader(), fall back to
-            // reading the whole body.
-            const buffer = await response.arrayBuffer();
-            if (buffer.byteLength === 0)
-                return undefined;
-        }
-        else {
-            const reader = response.body.getReader();
-            const next = await reader.read();
-            if (next.done)
-                return undefined;
-            await reader.cancel(); // Drain the rest of the (non-empty) body stream
+function buildEncoding(schema, encodingHint) {
+    // Should never happen (required for type safety)
+    if (!schema.encoding) {
+        throw new TypeError('Unexpected payload');
+    }
+    if (encodingHint?.length) {
+        if (!schema.matchesEncoding(encodingHint)) {
+            throw new TypeError(`Cannot send a body with content-type "${encodingHint}" for "${schema.encoding}" encoding`);
         }
-        throw new SyntaxError('Content-type is undefined but body is not empty');
+        return encodingHint;
+    }
+    // Fallback
+    if (schema.encoding === '*/*') {
+        return 'application/octet-stream';
     }
-    if (encoding === 'application/json') {
-        // @NOTE Using `lexParse(text)` (instead of `jsonToLex(json)`) here as using
-        // a reviver function during JSON.parse should be faster than parsing to
-        // JSON then converting to Lex (?)
-        // @TODO verify statement above
-        return (0, lex_json_1.lexParse)(await response.text());
+    if (schema.encoding.startsWith('text/')) {
+        return schema.encoding.includes('*')
+            ? 'text/plain; charset=utf-8'
+            : `${schema.encoding}; charset=utf-8`;
     }
-    if (encoding.startsWith('text/')) {
-        return response.text();
+    if (!schema.encoding.includes('*')) {
+        return schema.encoding;
     }
-    return new Uint8Array(await response.arrayBuffer());
+    throw new TypeError(`Unable to determine payload encoding. Please provide a 'content-type' header matching ${schema.encoding}.`);
 }
 //# sourceMappingURL=xrpc.js.map