akanjs 3.0.0-alpha.74 → 3.0.0-alpha.75

package/fetch/client/fetchClient.ts

@@ -98,7 +98,7 @@ export class FetchClient {
     private ErrorCls?: ErrorConstructor,
   ) {
     this.origin = origin;
-    this.http = new HttpClient(origin, ErrorCls);
+    this.http = new HttpClient(origin, { ErrorCls });
     this.ws = new WsClient(FetchClient.#makeWsUri(origin), ErrorCls);
     Object.assign(this.#handlerStore, handler);
     this.handler = this.#makeHandlerProxy();

package/fetch/client/httpClient.ts

@@ -22,11 +22,15 @@ export interface ErrorConstructor {
   fromJSON: (payload: ErrorResponsePayload) => RestoredError;
 }
 
-interface FetchOptions {
+export interface HttpClientOptions {
   headers?: Record<string, string>;
-  baseUrl?: string;
   /** Milliseconds before the request is abandoned; `false` waits as long as the browser will. */
   timeout?: number | false;
+  ErrorCls?: ErrorConstructor;
+}
+
+interface FetchOptions extends Pick<HttpClientOptions, "headers" | "timeout"> {
+  baseUrl?: string;
 }
 
 const jsonContentType = /^application\/(?:[\w.+-]+\+)?json\b/i;
@@ -53,11 +57,14 @@ const DEFAULT_TIMEOUT_MS = 30_000;
 
 export class HttpClient {
   readonly baseUrl: string;
-  constructor(
-    baseUrl: string,
-    private ErrorCls?: ErrorConstructor,
-  ) {
+  #headers: Record<string, string>;
+  #timeout?: number | false;
+  private ErrorCls?: ErrorConstructor;
+  constructor(baseUrl: string, options: HttpClientOptions = {}) {
     this.baseUrl = baseUrl;
+    this.#headers = options.headers ?? {};
+    this.#timeout = options.timeout;
+    this.ErrorCls = options.ErrorCls;
   }
 
   setErrorConstructor(ErrorCls?: ErrorConstructor) {
@@ -70,13 +77,13 @@ export class HttpClient {
     return `${this.#resolveBaseUrl(options.baseUrl)}${url}`;
   }
 
-  static #makeHeaders(headers: Record<string, string>, options: FetchOptions) {
-    return { Accept: "application/json", ...headers, ...options.headers };
+  #makeHeaders(headers: Record<string, string>, options: FetchOptions) {
+    return { Accept: "application/json", ...this.#headers, ...headers, ...options.headers };
   }
   async get<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
     return await this.#request<Returns>(
       this.#resolveUrl(url, options),
-      { headers: HttpClient.#makeHeaders({ "Content-Type": "application/json" }, options) },
+      { headers: this.#makeHeaders({ "Content-Type": "application/json" }, options) },
       options,
     );
   }
@@ -94,7 +101,7 @@ export class HttpClient {
     const { body, headers } = this.#makeReqContent(data);
     return await this.#request<Returns>(
       this.#resolveUrl(url, options),
-      { method, body, headers: HttpClient.#makeHeaders(headers, options) },
+      { method, body, headers: this.#makeHeaders(headers, options) },
       options,
     );
   }
@@ -115,13 +122,13 @@ export class HttpClient {
   async delete<Returns = unknown>(url: string, options: FetchOptions = {}): Promise<Returns> {
     return await this.#request<Returns>(
       this.#resolveUrl(url, options),
-      { method: "DELETE", headers: HttpClient.#makeHeaders({ "Content-Type": "application/json" }, options) },
+      { method: "DELETE", headers: this.#makeHeaders({ "Content-Type": "application/json" }, options) },
       options,
     );
   }
 
   async #request<Returns>(url: string, init: RequestInit, options: FetchOptions = {}): Promise<Returns> {
-    const res = await this.#fetch(url, HttpClient.#withTimeout(init, options));
+    const res = await this.#fetch(url, this.#withTimeout(init, options));
     return await this.#readJsonResponse<Returns>(res);
   }
 
@@ -130,8 +137,8 @@ export class HttpClient {
    * the request body is the only thing this side can tell that from. Everything else takes the default unless
    * the caller named one.
    */
-  static #withTimeout(init: RequestInit, options: FetchOptions): RequestInit {
-    const timeout = options.timeout ?? (init.body instanceof FormData ? false : DEFAULT_TIMEOUT_MS);
+  #withTimeout(init: RequestInit, options: FetchOptions): RequestInit {
+    const timeout = options.timeout ?? (init.body instanceof FormData ? false : (this.#timeout ?? DEFAULT_TIMEOUT_MS));
     if (timeout === false || !Number.isFinite(timeout) || timeout <= 0) return init;
     return { ...init, signal: AbortSignal.timeout(timeout) };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.0.0-alpha.74",
+  "version": "3.0.0-alpha.75",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/fetch/client/httpClient.d.ts

@@ -18,17 +18,20 @@ export interface RestoredError extends Error {
 export interface ErrorConstructor {
     fromJSON: (payload: ErrorResponsePayload) => RestoredError;
 }
-interface FetchOptions {
+export interface HttpClientOptions {
     headers?: Record<string, string>;
-    baseUrl?: string;
     /** Milliseconds before the request is abandoned; `false` waits as long as the browser will. */
     timeout?: number | false;
+    ErrorCls?: ErrorConstructor;
+}
+interface FetchOptions extends Pick<HttpClientOptions, "headers" | "timeout"> {
+    baseUrl?: string;
 }
 export declare class HttpClient {
     #private;
-    private ErrorCls?;
     readonly baseUrl: string;
-    constructor(baseUrl: string, ErrorCls?: ErrorConstructor | undefined);
+    private ErrorCls?;
+    constructor(baseUrl: string, options?: HttpClientOptions);
     setErrorConstructor(ErrorCls?: ErrorConstructor): void;
     get<Returns = unknown>(url: string, options?: FetchOptions): Promise<Returns>;
     send<Returns = unknown>(method: HttpMutationMethod, url: string, data: FormData | Record<string, unknown>, options?: FetchOptions): Promise<Returns>;