@atproto/lex-client 0.0.4 → 0.0.6

package/dist/xrpc.js

@@ -1,25 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.asLexRpcFailure = asLexRpcFailure;
 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 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 errors_js_1 = require("./errors.js");
 const response_js_1 = require("./response.js");
-const types_js_1 = require("./types.js");
+const util_js_1 = require("./util.js");
+/**
+ * Utility method to type cast the error thrown by {@link xrpc} to an
+ * {@link LexRpcFailure} 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 asLexRpcFailure(err) {
+    if (err instanceof errors_js_1.LexRpcResponseError)
+        return err;
+    if (err instanceof errors_js_1.LexRpcUpstreamError)
+        return err;
+    return errors_js_1.LexRpcUnexpectedError.from(err);
+}
 async function xrpc(agent, ns, options = {}) {
+    try {
+        return await lexRpcRequest(agent, ns, options);
+    }
+    catch (err) {
+        throw asLexRpcFailure(err);
+    }
+}
+async function xrpcSafe(agent, ns, options = {}) {
+    return lexRpcRequest(agent, ns, options).catch((asLexRpcFailure));
+}
+async function lexRpcRequest(agent, ns, options = {}) {
+    const method = (0, lex_schema_1.getMain)(ns);
     options.signal?.throwIfAborted();
-    const method = (0, types_js_1.getMain)(ns);
     const url = xrpcRequestUrl(method, options);
     const request = xrpcRequestInit(method, options);
     const response = await agent.fetchHandler(url, request);
-    return xrpcResponseHandler(response, method, options);
+    return response_js_1.LexRpcResponse.fromFetchResponse(method, response, options);
 }
 function xrpcRequestUrl(method, options) {
     const path = `/xrpc/${method.nsid}`;
@@ -33,15 +53,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 +81,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 +91,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;
+function xrpcProcedureInput(method, options, encodingHint) {
+    const { input } = method;
+    const { body } = options;
+    if (options.validateRequest) {
+        input.schema?.check(body);
     }
-    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;
-    }
-    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

package/dist/xrpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"xrpc.js","sourceRoot":"","sources":["../src/xrpc.ts"],"names":[],"mappings":";;AAqCA,oBAWC;AAQD,wCAWC;AAED,8CASC;AASD,0CA8CC;AAED,gDAqBC;AAqBD,kDAuGC;AAED,0CAIC;AAUD,4CAsCC;AA7UD,gDAA0D;AAC1D,oDAU4B;AAE5B,yCAKmB;AACnB,+CAA8D;AAC9D,yCAAqE;AAgB9D,KAAK,UAAU,IAAI,CACxB,KAAY,EACZ,EAAgB,EAChB,UAA0B,EAAoB;IAE9C,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAA;IAChC,MAAM,MAAM,GAAG,IAAA,kBAAO,EAAC,EAAE,CAAC,CAAA;IAC1B,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC3C,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACvD,OAAO,mBAAmB,CAAI,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;AAC1D,CAAC;AAQD,SAAgB,cAAc,CAC5B,MAAS,EACT,OAAiC;IAEjC,MAAM,IAAI,GAAG,SAAS,MAAM,CAAC,IAAI,EAAE,CAAA;IAEnC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM;QAChC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/D,CAAC,CAAC,SAAS,CAAA;IAEb,OAAO,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACtD,CAAC;AAED,SAAgB,iBAAiB,CAC/B,MAAgC,EAChC,MAA0B,EAC1B,OAAoB;IAEpB,MAAM,eAAe,GAAG,MAAM,EAAE,iBAAiB,CAC/C,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,MAAc,CACjE,CAAA;IACD,OAAO,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AACvE,CAAC;AASD,SAAgB,eAAe,CAC7B,MAAS,EACT,OAAkC;IAElC,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAE3C,qBAAqB;IACrB,IAAI,OAAO,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;QAChD,IACE,OAAO,CAAC,eAAe;YACvB,MAAM,CAAC,KAAK,IAAI,IAAI;YACpB,OAAO,CAAC,IAAI,KAAK,SAAS,EAC1B,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,eAAe,MAAM,CAAC,IAAI,iCAAiC,CAC5D,CAAA;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAClD,OAAO;YACL,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,iCAAiC,EAAE,YAAY;YAC/D,IAAI,EAAE,MAAM,EAAE,YAAY;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,MAAM;YACd,OAAO;YACP,IAAI,EAAE,eAAe,CACnB,MAAM,CAAC,KAAK,EAAE,QAAQ,EACtB,OAAO,CAAC,eAAe;gBACrB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBACxC,CAAC,CAAC,OAAO,CAAC,IAAI,CACjB;SACF,CAAA;IACH,CAAC;IAED,wBAAwB;IACxB,OAAO;QACL,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,QAAQ;QAClB,cAAc,EAAE,iCAAiC,EAAE,YAAY;QAC/D,IAAI,EAAE,MAAM,EAAE,YAAY;QAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,MAAM,YAAY,kBAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;QAChD,OAAO;KACR,CAAA;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAIlC;IACC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAE5C,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/C,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CACT,yBAAyB,EACzB,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,CAAC;aAClE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,CACd,CAAA;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,eAAe,CACtB,QAA4B,EAC5B,IAA0B;IAE1B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAA;IACnD,CAAC;SAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;IAC3C,CAAC;SAAM,CAAC;QACN,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,YAAY,WAAW;YAAE,OAAO,IAAI,CAAA;IAC1E,CAAC;IAED,MAAM,IAAI,SAAS,CAAC,WAAW,OAAO,IAAI,aAAa,QAAQ,WAAW,CAAC,CAAA;AAC7E,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,QAAkB,EAClB,MAAS,EACT,OAAwC;IAExC,0EAA0E;IAC1E,2EAA2E;IAC3E,oDAAoD;IAEpD,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACtE,MAAM,IAAI,2BAAgB,CACxB,qBAAU,CAAC,eAAe,EAC1B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,SAAS,EACT,8BAA8B,EAC9B,EAAE,KAAK,EAAE,CACV,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,4EAA4E;IAC5E,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QACpD,qEAAqE;QACrE,uEAAuE;QACvE,qDAAqD;QACrD,oEAAoE;QACpE,6BAA6B;QAC7B,0EAA0E;QAC1E,sBAAsB;QACtB,IACE,IAAI,IAAI,IAAI;YACZ,QAAQ,KAAK,kBAAkB;YAC/B,8BAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EACjC,CAAC;YACD,MAAM,IAAI,4BAAiB,CACzB,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,IAAI,CACL,CAAA;QACH,CAAC;QAED,MAAM,IAAI,2BAAgB,CACxB,QAAQ,CAAC,MAAM,IAAI,GAAG;YACpB,CAAC,CAAC,qBAAU,CAAC,mBAAmB;YAChC,CAAC,CAAC,qBAAU,CAAC,eAAe,EAC9B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,IAAI,CACL,CAAA;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACxC,MAAM,IAAI,2BAAgB,CACxB,qBAAU,CAAC,eAAe,EAC1B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,IAAI,EACJ,uCAAuC,MAAM,CAAC,MAAM,CAAC,QAAQ,SAAS,QAAQ,EAAE,CACjF,CAAA;IACH,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;QACnC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,2BAAgB,CACxB,qBAAU,CAAC,eAAe,EAC1B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,IAAI,EACJ,8BAA8B,CAC/B,CAAA;QACH,CAAC;QAED,OAAO,IAAI,0BAAY,CACrB,MAAM,EACN,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,SAAgC,CACjC,CAAA;IACH,CAAC;SAAM,CAAC;QACN,gEAAgE;QAChE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,2BAAgB,CACxB,qBAAU,CAAC,eAAe,EAC1B,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,IAAI,EACJ,kCAAkC,CACnC,CAAA;QACH,CAAC;QAED,OAAO,IAAI,0BAAY,CACrB,MAAM,EACN,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,EAAE,gBAAgB,KAAK,KAAK;YACjE,CAAC,CAAE,IAA4B;YAC/B,CAAC,CAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAyB,CAC9D,CAAA;IACH,CAAC;AACH,CAAC;AAED,SAAgB,eAAe,CAAC,OAAgB;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC/C,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAA;IAClC,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;AACzC,CAAC;AAUM,KAAK,UAAU,gBAAgB,CACpC,QAAkB,EAClB,QAA4B;IAE5B,yDAAyD;IACzD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI;YAAE,OAAO,SAAS,CAAA;QAE3C,qEAAqE;QACrE,IAAI,CAAC,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,mEAAmE;YACnE,0BAA0B;YAC1B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAA;YAC3C,IAAI,MAAM,CAAC,UAAU,KAAK,CAAC;gBAAE,OAAO,SAAS,CAAA;QAC/C,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAA;YACxC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YAChC,IAAI,IAAI,CAAC,IAAI;gBAAE,OAAO,SAAS,CAAA;YAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,CAAA,CAAC,gDAAgD;QACxE,CAAC;QAED,MAAM,IAAI,WAAW,CAAC,iDAAiD,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QACpC,4EAA4E;QAC5E,wEAAwE;QACxE,kCAAkC;QAElC,+BAA+B;QAC/B,OAAO,IAAA,mBAAQ,EAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;IAED,OAAO,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAA;AACrD,CAAC","sourcesContent":["import { LexValue } from '@atproto/lex-data'\nimport { lexParse, lexStringify } from '@atproto/lex-json'\nimport {\n  DidString,\n  InferParamsSchema,\n  InferPayloadBody,\n  Params,\n  ParamsSchema,\n  Procedure,\n  Query,\n  Restricted,\n  Subscription,\n} from '@atproto/lex-schema'\nimport { Agent } from './agent.js'\nimport {\n  KnownError,\n  XrpcResponseError,\n  XrpcServiceError,\n  xrpcErrorBodySchema,\n} from './error.js'\nimport { XrpcResponse, XrpcResponseBody } from './response.js'\nimport { CallOptions, Namespace, Service, getMain } from './types.js'\n\nexport type XrpcOptions<M extends Procedure | Query = Procedure | Query> =\n  CallOptions & XrpcRequestUrlOptions<M> & XrpcRequestInitOptions<M>\n\nexport async function xrpc<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: NonNullable<unknown> extends XrpcOptions<M>\n    ? Namespace<M>\n    : Restricted<'This XRPC method requires an \"options\" argument'>,\n): Promise<XrpcResponse<M>>\nexport async function xrpc<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Namespace<M>,\n  options: XrpcOptions<M>,\n): Promise<XrpcResponse<M>>\nexport async function xrpc<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Namespace<M>,\n  options: XrpcOptions<M> = {} as XrpcOptions<M>,\n): Promise<XrpcResponse<M>> {\n  options.signal?.throwIfAborted()\n  const method = getMain(ns)\n  const url = xrpcRequestUrl(method, options)\n  const request = xrpcRequestInit(method, options)\n  const response = await agent.fetchHandler(url, request)\n  return xrpcResponseHandler<M>(response, method, options)\n}\n\nexport type XrpcRequestUrlOptions<M extends Query | Procedure | Subscription> =\n  CallOptions &\n    (undefined extends InferParamsSchema<M['parameters']>\n      ? { params?: InferParamsSchema<M['parameters']> }\n      : { params: InferParamsSchema<M['parameters']> })\n\nexport function xrpcRequestUrl<M extends Procedure | Query | Subscription>(\n  method: M,\n  options: XrpcRequestUrlOptions<M>,\n) {\n  const path = `/xrpc/${method.nsid}`\n\n  const queryString = options.params\n    ? xrpcRequestParams(method.parameters, options.params, options)\n    : undefined\n\n  return queryString ? `${path}?${queryString}` : path\n}\n\nexport function xrpcRequestParams(\n  schema: ParamsSchema | undefined,\n  params: Params | undefined,\n  options: CallOptions,\n): undefined | string {\n  const urlSearchParams = schema?.toURLSearchParams(\n    options.validateRequest ? schema.parse(params) : (params as any),\n  )\n  return urlSearchParams?.size ? urlSearchParams.toString() : undefined\n}\n\nexport type XrpcRequestInitOptions<T extends Query | Procedure> = CallOptions &\n  (T extends Procedure\n    ? never extends InferPayloadBody<T['input']>\n      ? { body?: InferPayloadBody<T['input']> }\n      : { body: InferPayloadBody<T['input']> }\n    : { body?: never })\n\nexport function xrpcRequestInit<T extends Procedure | Query>(\n  schema: T,\n  options: XrpcRequestInitOptions<T>,\n): RequestInit & { duplex?: 'half' } {\n  const headers = xrpcRequestHeaders(options)\n\n  // Requests with body\n  if ('input' in schema && schema.input?.encoding) {\n    if (\n      options.validateRequest &&\n      schema.input == null &&\n      options.body !== undefined\n    ) {\n      throw new TypeError(\n        `XRPC method ${schema.nsid} does not accept a request body`,\n      )\n    }\n\n    headers.set('content-type', schema.input.encoding)\n    return {\n      duplex: 'half',\n      redirect: 'follow',\n      referrerPolicy: 'strict-origin-when-cross-origin', // (default)\n      mode: 'cors', // (default)\n      signal: options.signal,\n      method: 'POST',\n      headers,\n      body: xrpcRequestBody(\n        schema.input?.encoding,\n        options.validateRequest\n          ? schema.input?.body.parse(options.body)\n          : options.body,\n      ),\n    }\n  }\n\n  // Requests without body\n  return {\n    duplex: 'half',\n    redirect: 'follow',\n    referrerPolicy: 'strict-origin-when-cross-origin', // (default)\n    mode: 'cors', // (default)\n    signal: options.signal,\n    method: schema instanceof Query ? 'GET' : 'POST',\n    headers,\n  }\n}\n\nexport function xrpcRequestHeaders(options: {\n  headers?: HeadersInit\n  service?: Service\n  labelers?: Iterable<DidString>\n}): Headers {\n  const headers = new Headers(options.headers)\n\n  if (options.service && !headers.has('atproto-proxy')) {\n    headers.set('atproto-proxy', options.service)\n  }\n\n  if (options.labelers) {\n    headers.set(\n      'atproto-accept-labelers',\n      [...options.labelers, headers.get('atproto-accept-labelers')?.trim()]\n        .filter(Boolean)\n        .join(', '),\n    )\n  }\n\n  return headers\n}\n\nfunction xrpcRequestBody(\n  encoding: string | undefined,\n  body: LexValue | undefined,\n): BodyInit | null {\n  if (encoding === undefined) {\n    return null\n  }\n\n  if (encoding === 'application/json') {\n    if (body !== undefined) return lexStringify(body)\n  } else if (encoding.startsWith('text/')) {\n    if (typeof body === 'string') return body\n  } else {\n    if (ArrayBuffer.isView(body) || body instanceof ArrayBuffer) return body\n  }\n\n  throw new TypeError(`Invalid ${typeof body} body for ${encoding} encoding`)\n}\n\nexport async function xrpcResponseHandler<M extends Procedure | Query>(\n  response: Response,\n  schema: M,\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 \"readXrpcResponseBody\" is\n  // called, we can safely not use a try/finally here.\n\n  const encoding = extractEncoding(response.headers)\n\n  const body = await readResponseBody(response, encoding).catch((cause) => {\n    throw new XrpcServiceError(\n      KnownError.InvalidResponse,\n      response.status,\n      response.headers,\n      undefined,\n      'Failed to read XRPC response',\n      { cause },\n    )\n  })\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    // All unsuccessful responses should follow a standard error response\n    // schema. The Content-Type should be application/json, and the payload\n    // should be a JSON object with the following fields:\n    // - error (string, required): type name of the error (generic ASCII\n    //   constant, no whitespace)\n    // - message (string, optional): description of the error, appropriate for\n    //   display to humans\n    if (\n      body != null &&\n      encoding === 'application/json' &&\n      xrpcErrorBodySchema.matches(body)\n    ) {\n      throw new XrpcResponseError(\n        response.status,\n        response.headers,\n        encoding,\n        body,\n      )\n    }\n\n    throw new XrpcServiceError(\n      response.status >= 500\n        ? KnownError.InternalServerError\n        : KnownError.InvalidResponse,\n      response.status,\n      response.headers,\n      body,\n    )\n  }\n\n  // Check response encoding\n  if (schema.output.encoding !== encoding) {\n    throw new XrpcServiceError(\n      KnownError.InvalidResponse,\n      response.status,\n      response.headers,\n      body,\n      `Expected response with content-type ${schema.output.encoding}, got ${encoding}`,\n    )\n  }\n\n  if (schema.output.encoding == null) {\n    if (body !== undefined) {\n      throw new XrpcServiceError(\n        KnownError.InvalidResponse,\n        response.status,\n        response.headers,\n        body,\n        `Expected empty response body`,\n      )\n    }\n\n    return new XrpcResponse<M>(\n      schema,\n      response.status,\n      response.headers,\n      undefined as XrpcResponseBody<M>,\n    )\n  } else {\n    // @NOTE this should already be enforced by readXrpcResponseBody\n    if (body === undefined) {\n      throw new XrpcServiceError(\n        KnownError.InvalidResponse,\n        response.status,\n        response.headers,\n        body,\n        `Expected non-empty response body`,\n      )\n    }\n\n    return new XrpcResponse<M>(\n      schema,\n      response.status,\n      response.headers,\n      schema.output.schema == null || options?.validateResponse === false\n        ? (body as XrpcResponseBody<M>)\n        : (schema.output.schema.parse(body) as XrpcResponseBody<M>),\n    )\n  }\n}\n\nexport function extractEncoding(headers: Headers): string | undefined {\n  const contentType = headers.get('content-type')\n  if (!contentType) return undefined\n  return contentType.split(';')[0].trim()\n}\n\nexport async function readResponseBody(\n  response: Response,\n  encoding: string,\n): Promise<LexValue>\nexport async function readResponseBody(\n  response: Response,\n  encoding: string | undefined,\n): Promise<LexValue | undefined>\nexport async function readResponseBody(\n  response: Response,\n  encoding: string | undefined,\n): Promise<LexValue | undefined> {\n  // When encoding is undefined or empty, we expect no body\n  if (encoding == null) {\n    if (response.body == null) return undefined\n\n    // Let's make sure the body is empty (while avoiding reading it all).\n    if (!('getReader' in response.body)) {\n      // Some environments may not support body.getReader(), fall back to\n      // reading the whole body.\n      const buffer = await response.arrayBuffer()\n      if (buffer.byteLength === 0) return undefined\n    } else {\n      const reader = response.body.getReader()\n      const next = await reader.read()\n      if (next.done) return undefined\n      await reader.cancel() // Drain the rest of the (non-empty) body stream\n    }\n\n    throw new SyntaxError('Content-type is undefined but body is not empty')\n  }\n\n  if (encoding === 'application/json') {\n    // @NOTE Using `lexParse(text)` (instead of `jsonToLex(json)`) here as using\n    // a reviver function during JSON.parse should be faster than parsing to\n    // JSON then converting to Lex (?)\n\n    // @TODO verify statement above\n    return lexParse(await response.text())\n  }\n\n  if (encoding.startsWith('text/')) {\n    return response.text()\n  }\n\n  return new Uint8Array(await response.arrayBuffer())\n}\n"]}
+{"version":3,"file":"xrpc.js","sourceRoot":"","sources":["../src/xrpc.ts"],"names":[],"mappings":"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","sourcesContent":["import { LexValue, isLexScalar, isPlainObject } from '@atproto/lex-data'\nimport { lexStringify } from '@atproto/lex-json'\nimport {\n  InferMethodInput,\n  InferMethodParams,\n  Main,\n  Params,\n  ParamsSchema,\n  Payload as LexPayload,\n  Procedure,\n  Query,\n  Restricted,\n  Subscription,\n  getMain,\n} from '@atproto/lex-schema'\nimport { Agent } from './agent.js'\nimport {\n  LexRpcResponseError,\n  LexRpcUnexpectedError,\n  LexRpcUpstreamError,\n} from './errors.js'\nimport { LexRpcResponse } from './response.js'\nimport { BinaryBodyInit, CallOptions } from './types.js'\nimport {\n  Payload,\n  buildAtprotoHeaders,\n  isAsyncIterable,\n  isBlobLike,\n  toReadableStream,\n} from './util.js'\n\n// If all params are optional, allow omitting the params object\ntype LexRpcParamsOptions<P extends Params> =\n  NonNullable<unknown> extends P ? { params?: P } : { params: P }\n\ntype LexRpcRequestPayload<M extends Procedure | Query> = InferMethodInput<\n  M,\n  BinaryBodyInit\n>\n\ntype LexRpcInputOptions<In> = In extends { body: infer B; encoding: infer E }\n  ? // encoding will be inferred from the schema at runtime if not provided\n    { body: B; encoding?: E }\n  : { body?: undefined; encoding?: undefined }\n\nexport type LexRpcOptions<M extends Procedure | Query = Procedure | Query> =\n  CallOptions &\n    LexRpcInputOptions<LexRpcRequestPayload<M>> &\n    LexRpcParamsOptions<InferMethodParams<M>>\n\nexport type LexRpcFailure<M extends Procedure | Query> =\n  // The server returned a valid XRPC error response\n  | LexRpcResponseError<M>\n  // The response was not a valid XRPC response, or it does not match the schema\n  | LexRpcUpstreamError\n  // Something went wrong (network error, etc.)\n  | LexRpcUnexpectedError\n\nexport type LexRpcResult<M extends Procedure | Query> =\n  | LexRpcResponse<M>\n  | LexRpcFailure<M>\n\n/**\n * Utility method to type cast the error thrown by {@link xrpc} to an\n * {@link LexRpcFailure} matching the provided method. Only use this function\n * inside a catch block right after calling {@link xrpc}, and use the same\n * method type parameter as used in the {@link xrpc} call.\n */\nexport function asLexRpcFailure<\n  M extends Procedure | Query = Procedure | Query,\n>(err: unknown): LexRpcFailure<M> {\n  if (err instanceof LexRpcResponseError) return err\n  if (err instanceof LexRpcUpstreamError) return err\n  return LexRpcUnexpectedError.from(err)\n}\n\n/**\n * @throws LexRpcFailure<M>\n */\nexport async function xrpc<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: NonNullable<unknown> extends LexRpcOptions<M>\n    ? Main<M>\n    : Restricted<'This XRPC method requires an \"options\" argument'>,\n): Promise<LexRpcResponse<M>>\nexport async function xrpc<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Main<M>,\n  options: LexRpcOptions<M>,\n): Promise<LexRpcResponse<M>>\nexport async function xrpc<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Main<M>,\n  options: LexRpcOptions<M> = {} as LexRpcOptions<M>,\n): Promise<LexRpcResponse<M>> {\n  try {\n    return await lexRpcRequest<M>(agent, ns, options)\n  } catch (err) {\n    throw asLexRpcFailure<M>(err)\n  }\n}\n\nexport async function xrpcSafe<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: NonNullable<unknown> extends LexRpcOptions<M>\n    ? Main<M>\n    : Restricted<'This XRPC method requires an \"options\" argument'>,\n): Promise<LexRpcResult<M>>\nexport async function xrpcSafe<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Main<M>,\n  options: LexRpcOptions<M>,\n): Promise<LexRpcResult<M>>\nexport async function xrpcSafe<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Main<M>,\n  options: LexRpcOptions<M> = {} as LexRpcOptions<M>,\n): Promise<LexRpcResult<M>> {\n  return lexRpcRequest<M>(agent, ns, options).catch(asLexRpcFailure<M>)\n}\n\nasync function lexRpcRequest<const M extends Query | Procedure>(\n  agent: Agent,\n  ns: Main<M>,\n  options: LexRpcOptions<M> = {} as LexRpcOptions<M>,\n): Promise<LexRpcResponse<M>> {\n  const method = getMain(ns)\n  options.signal?.throwIfAborted()\n  const url = xrpcRequestUrl(method, options)\n  const request = xrpcRequestInit(method, options)\n  const response = await agent.fetchHandler(url, request)\n  return LexRpcResponse.fromFetchResponse<M>(method, response, options)\n}\n\nfunction xrpcRequestUrl<M extends Procedure | Query | Subscription>(\n  method: M,\n  options: CallOptions & { params?: Params },\n) {\n  const path = `/xrpc/${method.nsid}`\n\n  const queryString = options.params\n    ? xrpcRequestParams(method.parameters, options.params, options)\n    : undefined\n\n  return queryString ? `${path}?${queryString}` : path\n}\n\nfunction xrpcRequestParams(\n  schema: ParamsSchema | undefined,\n  params: Params | undefined,\n  options: CallOptions,\n): undefined | string {\n  const urlSearchParams = schema?.toURLSearchParams(\n    options.validateRequest ? schema.parse(params) : (params as any),\n  )\n  return urlSearchParams?.size ? urlSearchParams.toString() : undefined\n}\n\nfunction xrpcRequestInit<T extends Procedure | Query>(\n  schema: T,\n  options: CallOptions & {\n    body?: LexValue | BinaryBodyInit\n    encoding?: string\n  },\n): RequestInit & { duplex?: 'half' } {\n  const headers = buildAtprotoHeaders(options)\n\n  // Tell the server what type of response we're expecting\n  if (schema.output.encoding) {\n    headers.set('accept', schema.output.encoding)\n  }\n\n  // Caller should not set content-type header\n  if (headers.has('content-type')) {\n    const contentType = headers.get('content-type')\n    throw new TypeError(`Unexpected content-type header (${contentType})`)\n  }\n\n  // Requests with body\n  if ('input' in schema) {\n    const encodingHint = options.encoding\n    const input = xrpcProcedureInput(schema, options, encodingHint)\n\n    if (input) {\n      headers.set('content-type', input.encoding)\n    } else if (encodingHint != null) {\n      throw new TypeError(`Unexpected encoding hint (${encodingHint})`)\n    }\n\n    return {\n      duplex: 'half',\n      redirect: 'follow',\n      referrerPolicy: 'strict-origin-when-cross-origin', // (default)\n      mode: 'cors', // (default)\n      signal: options.signal,\n      method: 'POST',\n      headers,\n      body: input?.body,\n    }\n  }\n\n  // Requests without body\n  return {\n    duplex: 'half',\n    redirect: 'follow',\n    referrerPolicy: 'strict-origin-when-cross-origin', // (default)\n    mode: 'cors', // (default)\n    signal: options.signal,\n    method: 'GET',\n    headers,\n  }\n}\n\nfunction xrpcProcedureInput(\n  method: Procedure,\n  options: CallOptions & { body?: LexValue | BinaryBodyInit },\n  encodingHint?: string,\n): null | Payload<BodyInit> {\n  const { input } = method\n  const { body } = options\n\n  if (options.validateRequest) {\n    input.schema?.check(body)\n  }\n\n  // Special handling for endpoints expecting application/json input\n  if (input.encoding === 'application/json') {\n    // @NOTE **NOT** using isLexValue here to avoid deep checks in order to\n    // distinguish between LexValue and BinaryBodyInit.\n    if (!isLexScalar(body) && !isPlainObject(body) && !Array.isArray(body)) {\n      throw new TypeError(`Expected LexValue body, got ${typeof body}`)\n    }\n\n    return buildPayload(input, lexStringify(body), encodingHint)\n  }\n\n  // Other encodings will be sent unaltered (ie. as binary data)\n  switch (typeof body) {\n    case 'undefined':\n    case 'string':\n      return buildPayload(input, body, encodingHint)\n    case 'object': {\n      if (body === null) break\n      if (\n        ArrayBuffer.isView(body) ||\n        body instanceof ArrayBuffer ||\n        body instanceof ReadableStream\n      ) {\n        return buildPayload(input, body, encodingHint)\n      } else if (isAsyncIterable(body)) {\n        return buildPayload(input, toReadableStream(body), encodingHint)\n      } else if (isBlobLike(body)) {\n        return buildPayload(input, body, encodingHint || body.type)\n      }\n    }\n  }\n\n  throw new TypeError(\n    `Invalid ${typeof body} body for ${input.encoding} encoding`,\n  )\n}\n\nfunction buildPayload(\n  schema: LexPayload,\n  body: undefined | BodyInit,\n  encodingHint?: string,\n): null | Payload<BodyInit> {\n  if (schema.encoding === undefined) {\n    if (body !== undefined) {\n      throw new TypeError(\n        `Cannot send a ${typeof body} body with undefined encoding`,\n      )\n    }\n\n    return null\n  }\n\n  if (body === undefined) {\n    // This error would be returned by the server, but we can catch it earlier\n    // to avoid un-necessary requests. Note that a content-length of 0 does not\n    // necessary mean that the body is \"empty\" (e.g. an empty txt file).\n    throw new TypeError(`A request body is expected but none was provided`)\n  }\n\n  const encoding = buildEncoding(schema, encodingHint)\n  return { encoding, body }\n}\n\nfunction buildEncoding(schema: LexPayload, encodingHint?: string): string {\n  // Should never happen (required for type safety)\n  if (!schema.encoding) {\n    throw new TypeError('Unexpected payload')\n  }\n\n  if (encodingHint?.length) {\n    if (!schema.matchesEncoding(encodingHint)) {\n      throw new TypeError(\n        `Cannot send a body with content-type \"${encodingHint}\" for \"${schema.encoding}\" encoding`,\n      )\n    }\n    return encodingHint\n  }\n\n  // Fallback\n\n  if (schema.encoding === '*/*') {\n    return 'application/octet-stream'\n  }\n\n  if (schema.encoding.startsWith('text/')) {\n    return schema.encoding.includes('*')\n      ? 'text/plain; charset=utf-8'\n      : `${schema.encoding}; charset=utf-8`\n  }\n\n  if (!schema.encoding.includes('*')) {\n    return schema.encoding\n  }\n\n  throw new TypeError(\n    `Unable to determine payload encoding. Please provide a 'content-type' header matching ${schema.encoding}.`,\n  )\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-client",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "license": "MIT",
   "description": "HTTP client for interacting with Lexicon based APIs",
   "keywords": [
@@ -29,26 +29,26 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "browser": "./dist/index.js",
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     }
   },
   "dependencies": {
     "tslib": "^2.8.1",
-    "@atproto/lex-data": "0.0.3",
-    "@atproto/lex-json": "0.0.3",
-    "@atproto/lex-schema": "0.0.4"
+    "@atproto/lex-data": "0.0.5",
+    "@atproto/lex-json": "0.0.5",
+    "@atproto/lex-schema": "0.0.6"
   },
   "devDependencies": {
-    "jest": "^28.1.2",
-    "@atproto/lex-cbor": "0.0.3",
-    "@atproto/lex-builder": "0.0.6"
+    "vitest": "^4.0.16",
+    "@atproto/lex-cbor": "0.0.5",
+    "@atproto/lex-builder": "0.0.8"
   },
   "scripts": {
     "prebuild": "node ./scripts/lex-build.mjs",
     "build": "tsc --build tsconfig.build.json",
-    "test": "jest"
+    "test": "vitest run"
   }
 }

package/src/agent.ts

@@ -1,18 +1,18 @@
 import { DidString } from '@atproto/lex-schema'
 
-export interface Agent {
-  did?: DidString
+export type FetchHandler = (
+  /**
+   * The URL (pathname + query parameters) to make the request to, without the
+   * origin. The origin (protocol, hostname, and port) must be added by this
+   * {@link FetchHandler}, typically based on authentication or other factors.
+   */
+  path: string,
+  init: RequestInit,
+) => Promise<Response>
 
-  fetchHandler: (
-    this: Agent,
-    /**
-     * The URL (pathname + query parameters) to make the request to, without the
-     * origin. The origin (protocol, hostname, and port) must be added by this
-     * {@link FetchHandler}, typically based on authentication or other factors.
-     */
-    path: string,
-    init: RequestInit,
-  ) => Promise<Response>
+export interface Agent {
+  readonly did?: DidString
+  fetchHandler: FetchHandler
 }
 
 export type AgentConfig = {
@@ -39,8 +39,12 @@ export type AgentConfig = {
 
 export type AgentOptions = AgentConfig | string | URL
 
-export function buildAgent(options: AgentOptions): Agent {
-  const config: AgentConfig =
+export function buildAgent(options: Agent | AgentOptions): Agent {
+  if (typeof options === 'object' && 'fetchHandler' in options) {
+    return options
+  }
+
+  const config: Agent | AgentConfig =
     typeof options === 'string' || options instanceof URL
       ? { did: undefined, service: options }
       : options