@atproto/xrpc 0.5.0 → 0.6.0-rc.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @atproto/xrpc
 
+## 0.6.0-rc.0
+
+### Minor Changes
+
+- [#2483](https://github.com/bluesky-social/atproto/pull/2483) [`2ded0156b`](https://github.com/bluesky-social/atproto/commit/2ded0156b9adf33b9cce66583a375bff922d383b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - **New Features**:
+
+  1. Improved Separation of Concerns: We've restructured the XRPC HTTP call
+     dispatcher into a distinct class. This means cleaner code organization and
+     better clarity on responsibilities.
+  2. Enhanced Evolutivity: With this refactor, the XRPC client is now more
+     adaptable to various use cases. You can easily extend and customize the
+     dispatcher perform session management, retries, and more.
+
+  **Compatibility**:
+
+  Most of the changes introduced in this version are backward-compatible. However,
+  there are a couple of breaking changes you should be aware of:
+
+  - Customizing `fetchHandler`: The ability to customize the fetchHandler on the
+    XRPC Client and AtpAgent classes has been modified. Please review your code if
+    you rely on custom fetch handlers.
+  - Managing Sessions: Previously, you had the ability to manage sessions directly
+    through AtpAgent instances. Now, session management must be handled through a
+    dedicated `SessionManager` instance. If you were making authenticated
+    requests, you'll need to update your code to use explicit session management.
+  - The `fetch()` method, as well as WhatWG compliant `Request` and `Headers`
+    constructors, must be globally available in your environment.
+
+- [#2483](https://github.com/bluesky-social/atproto/pull/2483) [`2ded0156b`](https://github.com/bluesky-social/atproto/commit/2ded0156b9adf33b9cce66583a375bff922d383b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add the ability to use `fetch()` compatible `BodyInit` body when making XRPC calls.
+
+### Patch Changes
+
+- Updated dependencies [[`2ded0156b`](https://github.com/bluesky-social/atproto/commit/2ded0156b9adf33b9cce66583a375bff922d383b), [`2ded0156b`](https://github.com/bluesky-social/atproto/commit/2ded0156b9adf33b9cce66583a375bff922d383b)]:
+  - @atproto/lexicon@0.4.1-rc.0
+
 ## 0.5.0
 
 ### Minor Changes

package/README.md

@@ -9,9 +9,9 @@ TypeScript client library for talking to [atproto](https://atproto.com) services
 
 ```typescript
 import { LexiconDoc } from '@atproto/lexicon'
-import xrpc from '@atproto/xrpc'
+import { XrpcClient } from '@atproto/xrpc'
 
-const pingLexicon: LexiconDoc = {
+const pingLexicon = {
   lexicon: 1,
   id: 'io.example.ping',
   defs: {
@@ -32,44 +32,69 @@ const pingLexicon: LexiconDoc = {
       },
     },
   },
-}
-xrpc.addLexicon(pingLexicon)
+} satisfies LexiconDoc
+
+const xrpc = new XrpcClient('https://ping.example.com', [
+  // Any number of lexicon here
+  pingLexicon,
+])
 
-const res1 = await xrpc.call('https://example.com', 'io.example.ping', {
+const res1 = await xrpc.call('io.example.ping', {
   message: 'hello world',
 })
 res1.encoding // => 'application/json'
 res1.body // => {message: 'hello world'}
-const res2 = await xrpc
-  .service('https://example.com')
-  .call('io.example.ping', { message: 'hello world' })
-res2.encoding // => 'application/json'
-res2.body // => {message: 'hello world'}
+```
 
-const writeJsonLexicon: LexiconDoc = {
-  lexicon: 1,
-  id: 'io.example.writeJsonFile',
-  defs: {
-    main: {
-      type: 'procedure',
-      description: 'Write a JSON file',
-      parameters: {
-        type: 'params',
-        properties: { fileName: { type: 'string' } },
-      },
-      input: {
-        encoding: 'application/json',
-      },
-    },
+### With a custom fetch handler
+
+```typescript
+import { XrpcClient } from '@atproto/xrpc'
+
+const session = {
+  serviceUrl: 'https://ping.example.com',
+  token: '<my-token>',
+  async refreshToken() {
+    const { token } = await fetch('https://auth.example.com/refresh', {
+      method: 'POST',
+      headers: { Authorization: `Bearer ${this.token}` },
+    }).then((res) => res.json())
+
+    this.token = token
+
+    return token
   },
 }
-xrpc.addLexicon(writeJsonLexicon)
 
-const res3 = await xrpc.service('https://example.com').call(
-  'io.example.writeJsonFile',
-  { fileName: 'foo.json' }, // query parameters
-  { hello: 'world', thisIs: 'the file to write' }, // input body
-)
+const sessionBasedFetch: FetchHandler = async (
+  url: string,
+  init: RequestInit,
+) => {
+  const headers = new Headers(init.headers)
+
+  headers.set('Authorization', `Bearer ${session.token}`)
+
+  const response = await fetch(new URL(url, session.serviceUrl), {
+    ...init,
+    headers,
+  })
+
+  if (response.status === 401) {
+    // Refresh token, then try again.
+    const newToken = await session.refreshToken()
+    headers.set('Authorization', `Bearer ${newToken}`)
+    return fetch(new URL(url, session.serviceUrl), { ...init, headers })
+  }
+
+  return response
+}
+
+const xrpc = new XrpcClient(sessionBasedFetch, [
+  // Any number of lexicon here
+  pingLexicon,
+])
+
+//
 ```
 
 ## License

package/dist/client.d.ts

@@ -1,22 +1,26 @@
 import { LexiconDoc, Lexicons } from '@atproto/lexicon';
-import { FetchHandler, FetchHandlerResponse, Headers, CallOptions, QueryParams, XRPCResponse } from './types';
+import { CallOptions, Gettable, QueryParams } from './types';
+import { XrpcClient } from './xrpc-client';
+/** @deprecated Use {@link XrpcClient} instead */
 export declare class Client {
-    fetch: FetchHandler;
+    /** @deprecated */
+    get fetch(): never;
+    /** @deprecated */
+    set fetch(_: never);
     lex: Lexicons;
-    call(serviceUri: string | URL, methodNsid: string, params?: QueryParams, data?: unknown, opts?: CallOptions): Promise<XRPCResponse>;
+    call(serviceUri: string | URL, methodNsid: string, params?: QueryParams, data?: BodyInit | null, opts?: CallOptions): Promise<import("./types").XRPCResponse>;
     service(serviceUri: string | URL): ServiceClient;
     addLexicon(doc: LexiconDoc): void;
     addLexicons(docs: LexiconDoc[]): void;
     removeLexicon(uri: string): void;
 }
-export declare class ServiceClient {
+/** @deprecated Use {@link XrpcClient} instead */
+export declare class ServiceClient extends XrpcClient {
     baseClient: Client;
     uri: URL;
-    headers: Record<string, string>;
+    protected headers: Map<string, Gettable<string | null>>;
     constructor(baseClient: Client, serviceUri: string | URL);
-    setHeader(key: string, value: string): void;
+    setHeader(key: string, value: Gettable<null | string>): void;
     unsetHeader(key: string): void;
-    call(methodNsid: string, params?: QueryParams, data?: unknown, opts?: CallOptions): Promise<XRPCResponse>;
 }
-export declare function defaultFetchHandler(httpUri: string, httpMethod: string, httpHeaders: Headers, httpReqBody: unknown): Promise<FetchHandlerResponse>;
 //# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAmB,MAAM,kBAAkB,CAAA;AAUxE,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,OAAO,EACP,WAAW,EACX,WAAW,EAIX,YAAY,EAGb,MAAM,SAAS,CAAA;AAEhB,qBAAa,MAAM;IACjB,KAAK,EAAE,YAAY,CAAsB;IACzC,GAAG,WAAiB;IAKd,IAAI,CACR,UAAU,EAAE,MAAM,GAAG,GAAG,EACxB,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,WAAW;IAKpB,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IAOhC,UAAU,CAAC,GAAG,EAAE,UAAU;IAI1B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE;IAM9B,aAAa,CAAC,GAAG,EAAE,MAAM;CAG1B;AAED,qBAAa,aAAa;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;gBAExB,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG;IAKxD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI3C,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,WAAW;CAmDrB;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,EACpB,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAqB/B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG1C,iDAAiD;AACjD,qBAAa,MAAM;IACjB,kBAAkB;IAClB,IAAI,KAAK,IAAI,KAAK,CAIjB;IAED,kBAAkB;IAClB,IAAI,KAAK,CAAC,CAAC,EAAE,KAAK,EAIjB;IAED,GAAG,WAAiB;IAKd,IAAI,CACR,UAAU,EAAE,MAAM,GAAG,GAAG,EACxB,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,EACtB,IAAI,CAAC,EAAE,WAAW;IAKpB,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IAOhC,UAAU,CAAC,GAAG,EAAE,UAAU;IAI1B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE;IAM9B,aAAa,CAAC,GAAG,EAAE,MAAM;CAG1B;AAED,iDAAiD;AACjD,qBAAa,aAAc,SAAQ,UAAU;IAKlC,UAAU,EAAE,MAAM;IAJ3B,GAAG,EAAE,GAAG,CAAA;IACR,SAAS,CAAC,OAAO,uCAA6C;gBAGrD,UAAU,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,GAAG,GAAG;IAS1B,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,IAAI;IAI5D,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAG/B"}

package/dist/client.js

@@ -1,17 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultFetchHandler = exports.ServiceClient = exports.Client = void 0;
+exports.ServiceClient = exports.Client = void 0;
 const lexicon_1 = require("@atproto/lexicon");
+const xrpc_client_1 = require("./xrpc-client");
 const util_1 = require("./util");
-const types_1 = require("./types");
+/** @deprecated Use {@link XrpcClient} instead */
 class Client {
     constructor() {
-        Object.defineProperty(this, "fetch", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: defaultFetchHandler
-        });
         Object.defineProperty(this, "lex", {
             enumerable: true,
             configurable: true,
@@ -19,6 +14,14 @@ class Client {
             value: new lexicon_1.Lexicons()
         });
     }
+    /** @deprecated */
+    get fetch() {
+        throw new Error('Client.fetch is no longer supported. Use an XrpcClient instead.');
+    }
+    /** @deprecated */
+    set fetch(_) {
+        throw new Error('Client.fetch is no longer supported. Use an XrpcClient instead.');
+    }
     // method calls
     //
     async call(serviceUri, methodNsid, params, data, opts) {
@@ -42,13 +45,18 @@ class Client {
     }
 }
 exports.Client = Client;
-class ServiceClient {
+/** @deprecated Use {@link XrpcClient} instead */
+class ServiceClient extends xrpc_client_1.XrpcClient {
     constructor(baseClient, serviceUri) {
+        super(async (input, init) => {
+            const headers = (0, util_1.combineHeaders)(init.headers, this.headers);
+            return fetch(new URL(input, this.uri), { ...init, headers });
+        }, baseClient.lex);
         Object.defineProperty(this, "baseClient", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: baseClient
         });
         Object.defineProperty(this, "uri", {
             enumerable: true,
@@ -60,83 +68,16 @@ class ServiceClient {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: {}
+            value: new Map()
         });
-        this.baseClient = baseClient;
         this.uri = typeof serviceUri === 'string' ? new URL(serviceUri) : serviceUri;
     }
     setHeader(key, value) {
-        this.headers[key] = value;
+        this.headers.set(key.toLowerCase(), value);
     }
     unsetHeader(key) {
-        delete this.headers[key];
-    }
-    async call(methodNsid, params, data, opts) {
-        const def = this.baseClient.lex.getDefOrThrow(methodNsid);
-        if (!def || (def.type !== 'query' && def.type !== 'procedure')) {
-            throw new Error(`Invalid lexicon: ${methodNsid}. Must be a query or procedure.`);
-        }
-        const httpMethod = (0, util_1.getMethodSchemaHTTPMethod)(def);
-        const httpUri = (0, util_1.constructMethodCallUri)(methodNsid, def, this.uri, params);
-        const httpHeaders = (0, util_1.constructMethodCallHeaders)(def, data, {
-            headers: {
-                ...this.headers,
-                ...opts?.headers,
-            },
-            encoding: opts?.encoding,
-        });
-        const res = await this.baseClient.fetch(httpUri, httpMethod, httpHeaders, data);
-        const resCode = (0, util_1.httpResponseCodeToEnum)(res.status);
-        if (resCode === types_1.ResponseType.Success) {
-            try {
-                this.baseClient.lex.assertValidXrpcOutput(methodNsid, res.body);
-            }
-            catch (e) {
-                if (e instanceof lexicon_1.ValidationError) {
-                    throw new types_1.XRPCInvalidResponseError(methodNsid, e, res.body);
-                }
-                else {
-                    throw e;
-                }
-            }
-            return new types_1.XRPCResponse(res.body, res.headers);
-        }
-        else {
-            if (res.body && isErrorResponseBody(res.body)) {
-                throw new types_1.XRPCError(resCode, res.body.error, res.body.message, res.headers);
-            }
-            else {
-                throw new types_1.XRPCError(resCode);
-            }
-        }
+        this.headers.delete(key.toLowerCase());
     }
 }
 exports.ServiceClient = ServiceClient;
-async function defaultFetchHandler(httpUri, httpMethod, httpHeaders, httpReqBody) {
-    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 = (0, util_1.normalizeHeaders)(httpHeaders);
-        const reqInit = {
-            method: httpMethod,
-            headers,
-            body: (0, util_1.encodeMethodCallBody)(headers, httpReqBody),
-            duplex: 'half',
-        };
-        const res = await fetch(httpUri, reqInit);
-        const resBody = await res.arrayBuffer();
-        return {
-            status: res.status,
-            headers: Object.fromEntries(res.headers.entries()),
-            body: (0, util_1.httpResponseBodyParse)(res.headers.get('content-type'), resBody),
-        };
-    }
-    catch (e) {
-        throw new types_1.XRPCError(types_1.ResponseType.Unknown, String(e));
-    }
-}
-exports.defaultFetchHandler = defaultFetchHandler;
-function isErrorResponseBody(v) {
-    return types_1.errorResponseBody.safeParse(v).success;
-}
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;AAAA,8CAAuD;AAEvD,+CAA0C;AAC1C,iCAAuC;AAEvC,iDAAiD;AACjD,MAAa,MAAM;IAAnB;QAeE;;;;mBAAM,IAAI,kBAAQ,EAAE;WAAA;IAmCtB,CAAC;IAjDC,kBAAkB;IAClB,IAAI,KAAK;QACP,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAA;IACH,CAAC;IAED,kBAAkB;IAClB,IAAI,KAAK,CAAC,CAAQ;QAChB,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAA;IACH,CAAC;IAID,eAAe;IACf,EAAE;IAEF,KAAK,CAAC,IAAI,CACR,UAAwB,EACxB,UAAkB,EAClB,MAAoB,EACpB,IAAsB,EACtB,IAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IACtE,CAAC;IAED,OAAO,CAAC,UAAwB;QAC9B,OAAO,IAAI,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED,UAAU;IACV,IAAI;IAEJ,UAAU,CAAC,GAAe;QACxB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnB,CAAC;IAED,WAAW,CAAC,IAAkB;QAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IAED,aAAa,CAAC,GAAW;QACvB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;CACF;AAlDD,wBAkDC;AAED,iDAAiD;AACjD,MAAa,aAAc,SAAQ,wBAAU;IAI3C,YACS,UAAkB,EACzB,UAAwB;QAExB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC1B,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1D,OAAO,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9D,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAA;QANlB;;;;mBAAO,UAAU;WAAQ;QAJ3B;;;;;WAAQ;QACE;;;;mBAAU,IAAI,GAAG,EAAmC;WAAA;QAU5D,IAAI,CAAC,GAAG,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9E,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,KAA8B;QACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA;IACxC,CAAC;CACF;AAtBD,sCAsBC"}

package/dist/fetch-handler.d.ts

@@ -0,0 +1,33 @@
+import { Gettable } from './types';
+export type FetchHandler = (this: void, 
+/**
+ * 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.
+ */
+url: string, init: RequestInit) => Promise<Response>;
+export type FetchHandlerOptions = BuildFetchHandlerOptions | string | URL;
+export type BuildFetchHandlerOptions = {
+    /**
+     * The service URL to make requests to. This can be a string, URL, or a
+     * function that returns a string or URL. This is useful for dynamic URLs,
+     * such as a service URL that changes based on authentication.
+     */
+    service: Gettable<string | URL>;
+    /**
+     * Headers to be added to every request. If a function is provided, it will be
+     * called on each request to get the headers. This is useful for dynamic
+     * headers, such as authentication tokens that may expire.
+     */
+    headers?: {
+        [_ in string]?: Gettable<null | string>;
+    };
+    /**
+     * Bring your own fetch implementation. Typically useful for testing, logging,
+     * mocking, or adding retries, session management, signatures, proof of
+     * possession (DPoP), etc. Defaults to the global `fetch` function.
+     */
+    fetch?: typeof globalThis.fetch;
+};
+export declare function buildFetchHandler(options: FetchHandlerOptions): FetchHandler;
+//# sourceMappingURL=fetch-handler.d.ts.map

package/dist/fetch-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-handler.d.ts","sourceRoot":"","sources":["../src/fetch-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGlC,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,IAAI;AACV;;;;GAIG;AACH,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,KACd,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEtB,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,GAAG,MAAM,GAAG,GAAG,CAAA;AAEzE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;;;OAIG;IACH,OAAO,EAAE,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,CAAA;IAE/B;;;;OAIG;IACH,OAAO,CAAC,EAAE;SACP,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;KACxC,CAAA;IAED;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;CAChC,CAAA;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CA0B5E"}

package/dist/fetch-handler.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildFetchHandler = void 0;
+const util_1 = require("./util");
+function buildFetchHandler(options) {
+    const { service, headers: defaultHeaders = undefined, fetch = globalThis.fetch, } = typeof options === 'string' || options instanceof URL
+        ? { service: options }
+        : options;
+    if (typeof fetch !== 'function') {
+        throw new TypeError('XrpcDispatcher requires fetch() to be available in your environment.');
+    }
+    const defaultHeadersEntries = defaultHeaders != null ? Object.entries(defaultHeaders) : undefined;
+    return async function (url, init) {
+        const base = typeof service === 'function' ? service() : service;
+        const fullUrl = new URL(url, base);
+        const headers = (0, util_1.combineHeaders)(init.headers, defaultHeadersEntries);
+        return fetch(fullUrl, { ...init, headers });
+    };
+}
+exports.buildFetchHandler = buildFetchHandler;
+//# sourceMappingURL=fetch-handler.js.map

package/dist/fetch-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-handler.js","sourceRoot":"","sources":["../src/fetch-handler.ts"],"names":[],"mappings":";;;AACA,iCAAuC;AAwCvC,SAAgB,iBAAiB,CAAC,OAA4B;IAC5D,MAAM,EACJ,OAAO,EACP,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,KAAK,GAAG,UAAU,CAAC,KAAK,GACzB,GAAG,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,YAAY,GAAG;QACvD,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;QACtB,CAAC,CAAC,OAAO,CAAA;IAEX,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CACjB,sEAAsE,CACvE,CAAA;IACH,CAAC;IAED,MAAM,qBAAqB,GACzB,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAErE,OAAO,KAAK,WAAW,GAAG,EAAE,IAAI;QAC9B,MAAM,IAAI,GAAG,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;QAChE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAElC,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAA;QAEnE,OAAO,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7C,CAAC,CAAA;AACH,CAAC;AA1BD,8CA0BC"}

package/dist/index.d.ts

@@ -1,6 +1,10 @@
-export * from './types';
 export * from './client';
+export * from './fetch-handler';
+export * from './types';
+export * from './util';
+export * from './xrpc-client';
 import { Client } from './client';
+/** @deprecated create a local {@link XrpcClient} instance instead */
 declare const defaultInst: Client;
 export default defaultInst;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,QAAA,MAAM,WAAW,QAAe,CAAA;AAChC,eAAe,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,qEAAqE;AACrE,QAAA,MAAM,WAAW,QAAe,CAAA;AAChC,eAAe,WAAW,CAAA"}

package/dist/index.js

@@ -14,9 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
 __exportStar(require("./client"), exports);
+__exportStar(require("./fetch-handler"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./util"), exports);
+__exportStar(require("./xrpc-client"), exports);
 const client_1 = require("./client");
+/** @deprecated create a local {@link XrpcClient} instance instead */
 const defaultInst = new client_1.Client();
 exports.default = defaultInst;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,2CAAwB;AAExB,qCAAiC;AACjC,MAAM,WAAW,GAAG,IAAI,eAAM,EAAE,CAAA;AAChC,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,kDAA+B;AAC/B,0CAAuB;AACvB,yCAAsB;AACtB,gDAA6B;AAE7B,qCAAiC;AACjC,qEAAqE;AACrE,MAAM,WAAW,GAAG,IAAI,eAAM,EAAE,CAAA;AAChC,kBAAe,WAAW,CAAA"}

package/dist/types.d.ts

@@ -1,17 +1,15 @@
 import { z } from 'zod';
 import { ValidationError } from '@atproto/lexicon';
 export type QueryParams = Record<string, any>;
-export type Headers = Record<string, string>;
+export type HeadersMap = Record<string, string>;
+/** @deprecated not to be confused with the WHATWG Headers constructor */
+export type Headers = HeadersMap;
+export type Gettable<T> = T | (() => T);
 export interface CallOptions {
     encoding?: string;
-    headers?: Headers;
+    signal?: AbortSignal;
+    headers?: HeadersMap;
 }
-export interface FetchHandlerResponse {
-    status: number;
-    headers: Headers;
-    body: ArrayBuffer | undefined;
-}
-export type FetchHandler = (httpUri: string, httpMethod: string, httpHeaders: Headers, httpReqBody: any) => Promise<FetchHandlerResponse>;
 export declare const errorResponseBody: z.ZodObject<{
     error: z.ZodOptional<z.ZodString>;
     message: z.ZodOptional<z.ZodString>;
@@ -39,7 +37,9 @@ export declare enum ResponseType {
     NotEnoughResources = 503,
     UpstreamTimeout = 504
 }
+export declare function httpResponseCodeToEnum(status: number): ResponseType;
 export declare const ResponseTypeNames: {
+    1: string;
     2: string;
     200: string;
     400: string;
@@ -54,7 +54,9 @@ export declare const ResponseTypeNames: {
     503: string;
     504: string;
 };
+export declare function httpResponseCodeToName(status: number): string;
 export declare const ResponseTypeStrings: {
+    1: string;
     2: string;
     200: string;
     400: string;
@@ -69,6 +71,7 @@ export declare const ResponseTypeStrings: {
     503: string;
     504: string;
 };
+export declare function httpResponseCodeToString(status: number): string;
 export declare class XRPCResponse {
     data: any;
     headers: Headers;
@@ -76,11 +79,12 @@ export declare class XRPCResponse {
     constructor(data: any, headers: Headers);
 }
 export declare class XRPCError extends Error {
-    status: ResponseType;
-    error?: string | undefined;
+    error: string;
+    headers?: HeadersMap | undefined;
     success: boolean;
-    headers?: Headers;
-    constructor(status: ResponseType, error?: string | undefined, message?: string, headers?: Headers);
+    status: ResponseType;
+    constructor(statusCode: number, error?: string, message?: string, headers?: HeadersMap | undefined, options?: ErrorOptions);
+    static from(cause: unknown, fallbackStatus?: ResponseType): XRPCError;
 }
 export declare class XRPCInvalidResponseError extends XRPCError {
     lexiconNsid: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC7C,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAE5C,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAA;CAC9B;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,EACpB,WAAW,EAAE,GAAG,KACb,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAElC,eAAO,MAAM,iBAAiB;;;;;;;;;EAG5B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAEjE,oBAAY,YAAY;IACtB,OAAO,IAAI;IACX,eAAe,IAAI;IACnB,OAAO,MAAM;IACb,cAAc,MAAM;IACpB,YAAY,MAAM;IAClB,SAAS,MAAM;IACf,gBAAgB,MAAM;IACtB,eAAe,MAAM;IACrB,iBAAiB,MAAM;IACvB,mBAAmB,MAAM;IACzB,oBAAoB,MAAM;IAC1B,eAAe,MAAM;IACrB,kBAAkB,MAAM;IACxB,eAAe,MAAM;CACtB;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;CAc7B,CAAA;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;CAc/B,CAAA;AAED,qBAAa,YAAY;IAGJ,IAAI,EAAE,GAAG;IAAS,OAAO,EAAE,OAAO;IAFrD,OAAO,UAAO;gBAEK,IAAI,EAAE,GAAG,EAAS,OAAO,EAAE,OAAO;CACtD;AAED,qBAAa,SAAU,SAAQ,KAAK;IAKzB,MAAM,EAAE,YAAY;IACpB,KAAK,CAAC;IALf,OAAO,UAAQ;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;gBAGR,MAAM,EAAE,YAAY,EACpB,KAAK,CAAC,oBAAQ,EACrB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,OAAO;CAQpB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;IAE5C,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,eAAe;IAChC,YAAY,EAAE,OAAO;gBAFrB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,OAAO;CAQ/B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAC7C,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAE/C,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,UAAU,CAAA;AAEhC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;AAEvC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,UAAU,CAAA;CACrB;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;EAG5B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAEjE,oBAAY,YAAY;IACtB,OAAO,IAAI;IACX,eAAe,IAAI;IACnB,OAAO,MAAM;IACb,cAAc,MAAM;IACpB,YAAY,MAAM;IAClB,SAAS,MAAM;IACf,gBAAgB,MAAM;IACtB,eAAe,MAAM;IACrB,iBAAiB,MAAM;IACvB,mBAAmB,MAAM;IACzB,oBAAoB,MAAM;IAC1B,eAAe,MAAM;IACrB,kBAAkB,MAAM;IACxB,eAAe,MAAM;CACtB;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAcnE;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;CAe7B,CAAA;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;CAe/B,CAAA;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED,qBAAa,YAAY;IAId,IAAI,EAAE,GAAG;IACT,OAAO,EAAE,OAAO;IAJzB,OAAO,UAAO;gBAGL,IAAI,EAAE,GAAG,EACT,OAAO,EAAE,OAAO;CAE1B;AAED,qBAAa,SAAU,SAAQ,KAAK;IAOzB,KAAK,EAAE,MAAM;IAEb,OAAO,CAAC;IARjB,OAAO,UAAQ;IAER,MAAM,EAAE,YAAY,CAAA;gBAGzB,UAAU,EAAE,MAAM,EACX,KAAK,GAAE,MAA2C,EACzD,OAAO,CAAC,EAAE,MAAM,EACT,OAAO,CAAC,wBAAS,EACxB,OAAO,CAAC,EAAE,YAAY;IAaxB,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,YAAY,GAAG,SAAS;CAsBtE;AAED,qBAAa,wBAAyB,SAAQ,SAAS;IAE5C,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,eAAe;IAChC,YAAY,EAAE,OAAO;gBAFrB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,OAAO;CAU/B"}