@atproto/xrpc 0.6.0-rc.0 → 0.6.1

package/CHANGELOG.md

@@ -1,39 +1,585 @@
 # @atproto/xrpc
 
-## 0.6.0-rc.0
+## 0.6.1
+
+### Patch Changes
+
+- [#2714](https://github.com/bluesky-social/atproto/pull/2714) [`d9ffa3c46`](https://github.com/bluesky-social/atproto/commit/d9ffa3c460924010d7002b616cb7a0c66111cc6c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve handling of fetchHandler errors when turning them into `XrpcError`.
+
+- [#2714](https://github.com/bluesky-social/atproto/pull/2714) [`d9ffa3c46`](https://github.com/bluesky-social/atproto/commit/d9ffa3c460924010d7002b616cb7a0c66111cc6c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add ability to instantiate XrpcClient from FetchHandlerObject type
+
+- [#2714](https://github.com/bluesky-social/atproto/pull/2714) [`d9ffa3c46`](https://github.com/bluesky-social/atproto/commit/d9ffa3c460924010d7002b616cb7a0c66111cc6c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add global headers to `XrpcClient` instances
+
+## 0.6.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**:
+- [#2483](https://github.com/bluesky-social/atproto/pull/2483) [`b934b396b`](https://github.com/bluesky-social/atproto/commit/b934b396b13ba32bf2bf7e75ecdf6871e5f310dd) Thanks [@matthieusieben](https://github.com/matthieusieben)!
+
+  #### Motivation
+
+  The motivation for these changes is the need to make the `@atproto/api` package
+  compatible with OAuth session management. We don't have OAuth client support
+  "launched" and documented quite yet, so you can keep using the current app
+  password authentication system. When we do "launch" OAuth support and begin
+  encouraging its usage in the near future (see the [OAuth
+  Roadmap](https://github.com/bluesky-social/atproto/discussions/2656)), these
+  changes will make it easier to migrate.
+
+  In addition, the redesigned session management system fixes a bug that could
+  cause the session data to become invalid when Agent clones are created (e.g.
+  using `agent.withProxy()`).
+
+  #### New Features
+
+  We've restructured the `XrpcClient` HTTP fetch handler to be specified during
+  the instantiation of the XRPC client, through the constructor, instead of using
+  a default implementation (which was statically defined).
+
+  With this refactor, the XRPC client is now more modular and reusable. Session
+  management, retries, cryptographic signing, and other request-specific logic can
+  be implemented in the fetch handler itself rather than by the calling code.
 
-  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.
+  A new abstract class named `Agent`, has been added to `@atproto/api`. This class
+  will be the base class for all Bluesky agents classes in the `@atproto`
+  ecosystem. It is meant to be extended by implementations that provide session
+  management and fetch handling.
 
-  **Compatibility**:
+  As you adapt your code to these changes, make sure to use the `Agent` type
+  wherever you expect to receive an agent, and use the `AtpAgent` type (class)
+  only to instantiate your client. The reason for this is to be forward compatible
+  with the OAuth agent implementation that will also extend `Agent`, and not
+  `AtpAgent`.
+
+  ```ts
+  import { Agent, AtpAgent } from "@atproto/api";
+
+  async function setupAgent(
+    service: string,
+    username: string,
+    password: string,
+  ): Promise<Agent> {
+    const agent = new AtpAgent({
+      service,
+      persistSession: (evt, session) => {
+        // handle session update
+      },
+    });
+
+    await agent.login(username, password);
+
+    return agent;
+  }
+  ```
+
+  ```ts
+  import { Agent } from "@atproto/api";
+
+  async function doStuffWithAgent(agent: Agent, arg: string) {
+    return agent.resolveHandle(arg);
+  }
+  ```
+
+  ```ts
+  import { Agent, AtpAgent } from "@atproto/api";
+
+  class MyClass {
+    agent: Agent;
+
+    constructor() {
+      this.agent = new AtpAgent();
+    }
+  }
+  ```
+
+  #### Breaking changes
 
   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.
+  - Customizing `fetch`: The ability to customize the `fetch: FetchHandler`
+    property of `@atproto/xrpc`'s `Client` and `@atproto/api`'s `AtpAgent` classes
+    has been removed. Previously, the `fetch` property could be set to a function
+    that would be used as the fetch handler for that instance, and was initialized
+    to a default fetch handler. That property is still accessible in a read-only
+    fashion through the `fetchHandler` property and can only be set during the
+    instance creation. Attempting to set/get the `fetch` property will now result
+    in an error.
   - 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.
+    constructors, must be globally available in your environment. Use a polyfill
+    if necessary.
+  - The `AtpBaseClient` has been removed. The `AtpServiceClient` has been renamed
+    `AtpBaseClient`. Any code using either of these classes will need to be
+    updated.
+  - Instead of _wrapping_ an `XrpcClient` in its `xrpc` property, the
+    `AtpBaseClient` (formerly `AtpServiceClient`) class - created through
+    `lex-cli` - now _extends_ the `XrpcClient` class. This means that a client
+    instance now passes the `instanceof XrpcClient` check. The `xrpc` property now
+    returns the instance itself and has been deprecated.
+  - `setSessionPersistHandler` is no longer available on the `AtpAgent` or
+    `BskyAgent` classes. The session handler can only be set though the
+    `persistSession` options of the `AtpAgent` constructor.
+  - The new class hierarchy is as follows:
+    - `BskyAgent` extends `AtpAgent`: but add no functionality (hence its
+      deprecation).
+    - `AtpAgent` extends `Agent`: adds password based session management.
+    - `Agent` extends `AtpBaseClient`: this abstract class that adds syntactic sugar
+      methods `app.bsky` lexicons. It also adds abstract session management
+      methods and adds atproto specific utilities
+      (`labelers` & `proxy` headers, cloning capability)
+    - `AtpBaseClient` extends `XrpcClient`: automatically code that adds fully
+      typed lexicon defined namespaces (`instance.app.bsky.feed.getPosts()`) to
+      the `XrpcClient`.
+    - `XrpcClient` is the base class.
+
+  #### Non-breaking changes
+
+  - The `com.*` and `app.*` namespaces have been made directly available to every
+    `Agent` instances.
+
+  #### Deprecations
+
+  - The default export of the `@atproto/xrpc` package has been deprecated. Use
+    named exports instead.
+  - The `Client` and `ServiceClient` classes are now deprecated. They are replaced by a single `XrpcClient` class.
+  - The default export of the `@atproto/api` package has been deprecated. Use
+    named exports instead.
+  - The `BskyAgent` has been deprecated. Use the `AtpAgent` class instead.
+  - The `xrpc` property of the `AtpClient` instances has been deprecated. The
+    instance itself should be used as the XRPC client.
+  - The `api` property of the `AtpAgent` and `BskyAgent` instances has been
+    deprecated. Use the instance itself instead.
+
+  #### Migration
+
+  ##### The `@atproto/api` package
+
+  If you were relying on the `AtpBaseClient` solely to perform validation, use
+  this:
+
+  <table>
+  <tr>
+  <td><center>Before</center></td> <td><center>After</center></td>
+  </tr>
+  <tr>
+  <td>
+
+  ```ts
+  import { AtpBaseClient, ComAtprotoSyncSubscribeRepos } from "@atproto/api";
+
+  const baseClient = new AtpBaseClient();
+
+  baseClient.xrpc.lex.assertValidXrpcMessage("io.example.doStuff", {
+    // ...
+  });
+  ```
+
+  </td>
+  <td>
+
+  ```ts
+  import { lexicons } from "@atproto/api";
+
+  lexicons.assertValidXrpcMessage("io.example.doStuff", {
+    // ...
+  });
+  ```
+
+  </td>
+  </tr>
+  </table>
+
+  If you are extending the `BskyAgent` to perform custom `session` manipulation, define your own `Agent` subclass instead:
+
+  <table>
+  <tr>
+  <td><center>Before</center></td> <td><center>After</center></td>
+  </tr>
+  <tr>
+  <td>
+
+  ```ts
+  import { BskyAgent } from "@atproto/api";
+
+  class MyAgent extends BskyAgent {
+    private accessToken?: string;
+
+    async createOrRefreshSession(identifier: string, password: string) {
+      // custom logic here
+
+      this.accessToken = "my-access-jwt";
+    }
+
+    async doStuff() {
+      return this.call("io.example.doStuff", {
+        headers: {
+          Authorization: this.accessToken && `Bearer ${this.accessToken}`,
+        },
+      });
+    }
+  }
+  ```
+
+  </td>
+  <td>
+
+  ```ts
+  import { Agent } from "@atproto/api";
+
+  class MyAgent extends Agent {
+    private accessToken?: string;
+    public did?: string;
+
+    constructor(private readonly service: string | URL) {
+      super({
+        service,
+        headers: {
+          Authorization: () =>
+            this.accessToken ? `Bearer ${this.accessToken}` : null,
+        },
+      });
+    }
+
+    clone(): MyAgent {
+      const agent = new MyAgent(this.service);
+      agent.accessToken = this.accessToken;
+      agent.did = this.did;
+      return this.copyInto(agent);
+    }
+
+    async createOrRefreshSession(identifier: string, password: string) {
+      // custom logic here
+
+      this.did = "did:example:123";
+      this.accessToken = "my-access-jwt";
+    }
+  }
+  ```
+
+  </td>
+  </tr>
+  </table>
+
+  If you are monkey patching the `xrpc` service client to perform client-side rate limiting, you can now do this in the `FetchHandler` function:
+
+  <table>
+  <tr>
+  <td><center>Before</center></td> <td><center>After</center></td>
+  </tr>
+  <tr>
+  <td>
+
+  ```ts
+  import { BskyAgent } from "@atproto/api";
+  import { RateLimitThreshold } from "rate-limit-threshold";
+
+  const agent = new BskyAgent();
+  const limiter = new RateLimitThreshold(3000, 300_000);
+
+  const origCall = agent.api.xrpc.call;
+  agent.api.xrpc.call = async function (...args) {
+    await limiter.wait();
+    return origCall.call(this, ...args);
+  };
+  ```
+
+  </td>
+  <td>
+
+  ```ts
+  import { AtpAgent } from "@atproto/api";
+  import { RateLimitThreshold } from "rate-limit-threshold";
+
+  class LimitedAtpAgent extends AtpAgent {
+    constructor(options: AtpAgentOptions) {
+      const fetch: typeof globalThis.fetch = options.fetch ?? globalThis.fetch;
+      const limiter = new RateLimitThreshold(3000, 300_000);
+
+      super({
+        ...options,
+        fetch: async (...args) => {
+          await limiter.wait();
+          return fetch(...args);
+        },
+      });
+    }
+  }
+  ```
+
+  </td>
+  </tr>
+  </table>
+
+  If you configure a static `fetch` handler on the `BskyAgent` class - for example
+  to modify the headers of every request - you can now do this by providing your
+  own `fetch` function:
+
+  <table>
+  <tr>
+  <td><center>Before</center></td> <td><center>After</center></td>
+  </tr>
+  <tr>
+  <td>
+
+  ```ts
+  import { BskyAgent, defaultFetchHandler } from "@atproto/api";
+
+  BskyAgent.configure({
+    fetch: async (httpUri, httpMethod, httpHeaders, httpReqBody) => {
+      const ua = httpHeaders["User-Agent"];
+
+      httpHeaders["User-Agent"] = ua ? `${ua} ${userAgent}` : userAgent;
+
+      return defaultFetchHandler(httpUri, httpMethod, httpHeaders, httpReqBody);
+    },
+  });
+  ```
+
+  </td>
+  <td>
+
+  ```ts
+  import { AtpAgent } from "@atproto/api";
+
+  class MyAtpAgent extends AtpAgent {
+    constructor(options: AtpAgentOptions) {
+      const fetch = options.fetch ?? globalThis.fetch;
+
+      super({
+        ...options,
+        fetch: async (url, init) => {
+          const headers = new Headers(init.headers);
+
+          const ua = headersList.get("User-Agent");
+          headersList.set("User-Agent", ua ? `${ua} ${userAgent}` : userAgent);
+
+          return fetch(url, { ...init, headers });
+        },
+      });
+    }
+  }
+  ```
+
+  </td>
+  </tr>
+  </table>
+
+  <!-- <table>
+  <tr>
+  <td><center>Before</center></td> <td><center>After</center></td>
+  </tr>
+  <tr>
+  <td>
+
+  ```ts
+  // before
+  ```
+
+  </td>
+  <td>
+
+  ```ts
+  // after
+  ```
+
+  </td>
+  </tr>
+  </table> -->
+
+  ##### The `@atproto/xrpc` package
+
+  The `Client` and `ServiceClient` classes are now **deprecated**. If you need a
+  lexicon based client, you should update the code to use the `XrpcClient` class
+  instead.
+
+  The deprecated `ServiceClient` class now extends the new `XrpcClient` class.
+  Because of this, the `fetch` `FetchHandler` can no longer be configured on the
+  `Client` instances (including the default export of the package). If you are not
+  relying on the `fetch` `FetchHandler`, the new changes should have no impact on
+  your code. Beware that the deprecated classes will eventually be removed in a
+  future version.
+
+  Since its use has completely changed, the `FetchHandler` type has also
+  completely changed. The new `FetchHandler` type is now a function that receives
+  a `url` pathname and a `RequestInit` object and returns a `Promise<Response>`.
+  This function is responsible for making the actual request to the server.
+
+  ```ts
+  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>;
+  ```
+
+  A noticeable change that has been introduced is that the `uri` field of the
+  `ServiceClient` class has _not_ been ported to the new `XrpcClient` class. It is
+  now the responsibility of the `FetchHandler` to determine the full URL to make
+  the request to. The same goes for the `headers`, which should now be set through
+  the `FetchHandler` function.
+
+  If you _do_ rely on the legacy `Client.fetch` property to perform custom logic
+  upon request, you will need to migrate your code to use the new `XrpcClient`
+  class. The `XrpcClient` class has a similar API to the old `ServiceClient`
+  class, but with a few differences:
+
+  - The `Client` + `ServiceClient` duality was removed in favor of a single
+    `XrpcClient` class. This means that:
+
+    - There no longer exists a centralized lexicon registry. If you need a global
+      lexicon registry, you can maintain one yourself using a `new Lexicons` (from
+      `@atproto/lexicon`).
+    - The `FetchHandler` is no longer a statically defined property of the
+      `Client` class. Instead, it is passed as an argument to the `XrpcClient`
+      constructor.
+
+  - The `XrpcClient` constructor now requires a `FetchHandler` function as the
+    first argument, and an optional `Lexicon` instance as the second argument.
+  - The `setHeader` and `unsetHeader` methods were not ported to the new
+    `XrpcClient` class. If you need to set or unset headers, you should do so in
+    the `FetchHandler` function provided in the constructor arg.
+
+  <table>
+  <tr>
+  <td><center>Before</center></td> <td><center>After</center></td>
+  </tr>
+  <tr>
+  <td>
+
+  ```ts
+  import client, { defaultFetchHandler } from "@atproto/xrpc";
+
+  client.fetch = function (
+    httpUri: string,
+    httpMethod: string,
+    httpHeaders: Headers,
+    httpReqBody: unknown,
+  ) {
+    // Custom logic here
+    return defaultFetchHandler(httpUri, httpMethod, httpHeaders, httpReqBody);
+  };
+
+  client.addLexicon({
+    lexicon: 1,
+    id: "io.example.doStuff",
+    defs: {},
+  });
+
+  const instance = client.service("http://my-service.com");
+
+  instance.setHeader("my-header", "my-value");
+
+  await instance.call("io.example.doStuff");
+  ```
+
+  </td>
+  <td>
+
+  ```ts
+  import { XrpcClient } from "@atproto/xrpc";
+
+  const instance = new XrpcClient(
+    async (url, init) => {
+      const headers = new Headers(init.headers);
+
+      headers.set("my-header", "my-value");
+
+      // Custom logic here
+
+      const fullUrl = new URL(url, "http://my-service.com");
+
+      return fetch(fullUrl, { ...init, headers });
+    },
+    [
+      {
+        lexicon: 1,
+        id: "io.example.doStuff",
+        defs: {},
+      },
+    ],
+  );
+
+  await instance.call("io.example.doStuff");
+  ```
+
+  </td>
+  </tr>
+  </table>
+
+  If your fetch handler does not require any "custom logic", and all you need is
+  an `XrpcClient` that makes its HTTP requests towards a static service URL, the
+  previous example can be simplified to:
+
+  ```ts
+  import { XrpcClient } from "@atproto/xrpc";
+
+  const instance = new XrpcClient("http://my-service.com", [
+    {
+      lexicon: 1,
+      id: "io.example.doStuff",
+      defs: {},
+    },
+  ]);
+  ```
+
+  If you need to add static headers to all requests, you can instead instantiate
+  the `XrpcClient` as follows:
+
+  ```ts
+  import { XrpcClient } from "@atproto/xrpc";
+
+  const instance = new XrpcClient(
+    {
+      service: "http://my-service.com",
+      headers: {
+        "my-header": "my-value",
+      },
+    },
+    [
+      {
+        lexicon: 1,
+        id: "io.example.doStuff",
+        defs: {},
+      },
+    ],
+  );
+  ```
+
+  If you need the headers or service url to be dynamic, you can define them using
+  functions:
+
+  ```ts
+  import { XrpcClient } from "@atproto/xrpc";
+
+  const instance = new XrpcClient(
+    {
+      service: () => "http://my-service.com",
+      headers: {
+        "my-header": () => "my-value",
+        "my-ignored-header": () => null, // ignored
+      },
+    },
+    [
+      {
+        lexicon: 1,
+        id: "io.example.doStuff",
+        defs: {},
+      },
+    ],
+  );
+  ```
+
+- [#2483](https://github.com/bluesky-social/atproto/pull/2483) [`b934b396b`](https://github.com/bluesky-social/atproto/commit/b934b396b13ba32bf2bf7e75ecdf6871e5f310dd) 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
+- Updated dependencies [[`b934b396b`](https://github.com/bluesky-social/atproto/commit/b934b396b13ba32bf2bf7e75ecdf6871e5f310dd), [`2bdf75d7a`](https://github.com/bluesky-social/atproto/commit/2bdf75d7a63924c10e7a311f16cb447d595b933e)]:
+  - @atproto/lexicon@0.4.1
 
 ## 0.5.0
 

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 import { LexiconDoc, Lexicons } from '@atproto/lexicon';
-import { CallOptions, Gettable, QueryParams } from './types';
+import { CallOptions, QueryParams } from './types';
 import { XrpcClient } from './xrpc-client';
 /** @deprecated Use {@link XrpcClient} instead */
 export declare class Client {
@@ -18,9 +18,6 @@ export declare class Client {
 export declare class ServiceClient extends XrpcClient {
     baseClient: Client;
     uri: URL;
-    protected headers: Map<string, Gettable<string | null>>;
     constructor(baseClient: Client, serviceUri: string | URL);
-    setHeader(key: string, value: Gettable<null | string>): void;
-    unsetHeader(key: string): void;
 }
 //# 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,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"}
+{"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,WAAW,EAAE,MAAM,SAAS,CAAA;AAClD,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;IAIlC,UAAU,EAAE,MAAM;IAH3B,GAAG,EAAE,GAAG,CAAA;gBAGC,UAAU,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,GAAG,GAAG;CAQ3B"}

package/dist/client.js

@@ -49,7 +49,7 @@ exports.Client = Client;
 class ServiceClient extends xrpc_client_1.XrpcClient {
     constructor(baseClient, serviceUri) {
         super(async (input, init) => {
-            const headers = (0, util_1.combineHeaders)(init.headers, this.headers);
+            const headers = (0, util_1.combineHeaders)(init.headers, Object.entries(this.headers));
             return fetch(new URL(input, this.uri), { ...init, headers });
         }, baseClient.lex);
         Object.defineProperty(this, "baseClient", {
@@ -64,20 +64,8 @@ class ServiceClient extends xrpc_client_1.XrpcClient {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "headers", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: new Map()
-        });
         this.uri = typeof serviceUri === 'string' ? new URL(serviceUri) : serviceUri;
     }
-    setHeader(key, value) {
-        this.headers.set(key.toLowerCase(), value);
-    }
-    unsetHeader(key) {
-        this.headers.delete(key.toLowerCase());
-    }
 }
 exports.ServiceClient = ServiceClient;
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"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"}
+{"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;IAG3C,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,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;YAC1E,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;QAH3B;;;;;WAAQ;QAUN,IAAI,CAAC,GAAG,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9E,CAAC;CACF;AAbD,sCAaC"}

package/dist/fetch-handler.d.ts

@@ -29,5 +29,14 @@ export type BuildFetchHandlerOptions = {
      */
     fetch?: typeof globalThis.fetch;
 };
-export declare function buildFetchHandler(options: FetchHandlerOptions): FetchHandler;
+export interface FetchHandlerObject {
+    fetchHandler: (this: FetchHandlerObject, 
+    /**
+     * 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 declare function buildFetchHandler(options: FetchHandler | FetchHandlerObject | FetchHandlerOptions): FetchHandler;
 //# sourceMappingURL=fetch-handler.d.ts.map