@paid-ai/paid-node 1.0.0 → 1.0.1-alpha0

package/dist/esm/api/resources/usage/client/Client.mjs

@@ -8,22 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { normalizeClientOptions } from "../../../../BaseClient.mjs";
-import { mergeHeaders } from "../../../../core/headers.mjs";
+import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as environments from "../../../../environments.mjs";
-import { handleNonStatusCodeError } from "../../../../errors/handleNonStatusCodeError.mjs";
 import * as errors from "../../../../errors/index.mjs";
 import * as Paid from "../../../index.mjs";
-export class UsageClient {
-    constructor(options = {}) {
-        this._options = normalizeClientOptions(options);
+export class Usage {
+    constructor(_options = {}) {
+        this._options = _options;
     }
     /**
      * DEPRECATED: Use POST /usage/v2/signals/bulk instead for cleaner field names.
      *
      * @param {Paid.UsageRecordBulkRequest} request
-     * @param {UsageClient.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {Usage.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.usage.recordBulk({
@@ -35,8 +33,8 @@ export class UsageClient {
     }
     __recordBulk() {
         return __awaiter(this, arguments, void 0, function* (request = {}, requestOptions) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PaidEnvironment.Production, "usage/signals/bulk"),
                 method: "POST",
@@ -48,8 +46,6 @@ export class UsageClient {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
-                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
-                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: undefined, rawResponse: _response.rawResponse };
@@ -61,12 +57,26 @@ export class UsageClient {
                     rawResponse: _response.rawResponse,
                 });
             }
-            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/usage/signals/bulk");
+            switch (_response.error.reason) {
+                case "non-json":
+                    throw new errors.PaidError({
+                        statusCode: _response.error.statusCode,
+                        body: _response.error.rawBody,
+                        rawResponse: _response.rawResponse,
+                    });
+                case "timeout":
+                    throw new errors.PaidTimeoutError("Timeout exceeded when calling POST /usage/signals/bulk.");
+                case "unknown":
+                    throw new errors.PaidError({
+                        message: _response.error.errorMessage,
+                        rawResponse: _response.rawResponse,
+                    });
+            }
         });
     }
     /**
      * @param {Paid.UsageRecordBulkV2Request} request
-     * @param {UsageClient.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {Usage.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Paid.BadRequestError}
      *
@@ -96,8 +106,8 @@ export class UsageClient {
     }
     __usageRecordBulkV2() {
         return __awaiter(this, arguments, void 0, function* (request = {}, requestOptions) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PaidEnvironment.Production, "usage/v2/signals/bulk"),
                 method: "POST",
@@ -109,8 +119,6 @@ export class UsageClient {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
-                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
-                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: undefined, rawResponse: _response.rawResponse };
@@ -127,12 +135,26 @@ export class UsageClient {
                         });
                 }
             }
-            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/usage/v2/signals/bulk");
+            switch (_response.error.reason) {
+                case "non-json":
+                    throw new errors.PaidError({
+                        statusCode: _response.error.statusCode,
+                        body: _response.error.rawBody,
+                        rawResponse: _response.rawResponse,
+                    });
+                case "timeout":
+                    throw new errors.PaidTimeoutError("Timeout exceeded when calling POST /usage/v2/signals/bulk.");
+                case "unknown":
+                    throw new errors.PaidError({
+                        message: _response.error.errorMessage,
+                        rawResponse: _response.rawResponse,
+                    });
+            }
         });
     }
     /**
      * @param {Paid.UsageCheckUsageRequest} request
-     * @param {UsageClient.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {Usage.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link Paid.BadRequestError}
      * @throws {@link Paid.NotFoundError}
@@ -149,8 +171,8 @@ export class UsageClient {
     }
     __checkUsage(request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_c = (_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.PaidEnvironment.Production, "usage/check-usage"),
                 method: "POST",
@@ -162,8 +184,6 @@ export class UsageClient {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
-                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
-                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -184,7 +204,30 @@ export class UsageClient {
                         });
                 }
             }
-            return handleNonStatusCodeError(_response.error, _response.rawResponse, "POST", "/usage/check-usage");
+            switch (_response.error.reason) {
+                case "non-json":
+                    throw new errors.PaidError({
+                        statusCode: _response.error.statusCode,
+                        body: _response.error.rawBody,
+                        rawResponse: _response.rawResponse,
+                    });
+                case "timeout":
+                    throw new errors.PaidTimeoutError("Timeout exceeded when calling POST /usage/check-usage.");
+                case "unknown":
+                    throw new errors.PaidError({
+                        message: _response.error.errorMessage,
+                        rawResponse: _response.rawResponse,
+                    });
+            }
+        });
+    }
+    _getAuthorizationHeader() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bearer = yield core.Supplier.get(this._options.token);
+            if (bearer != null) {
+                return `Bearer ${bearer}`;
+            }
+            return undefined;
         });
     }
 }

package/dist/esm/core/auth/AuthProvider.d.mts

@@ -1,7 +1,4 @@
-import type { EndpointMetadata } from "../fetcher/EndpointMetadata.mjs";
 import type { AuthRequest } from "./AuthRequest.mjs";
 export interface AuthProvider {
-    getAuthRequest(arg?: {
-        endpointMetadata?: EndpointMetadata;
-    }): Promise<AuthRequest>;
+    getAuthRequest(): Promise<AuthRequest>;
 }

package/dist/esm/core/auth/BearerToken.d.mts

@@ -1,7 +1,5 @@
 export type BearerToken = string;
-declare function toAuthorizationHeader(token: string | undefined): string | undefined;
 export declare const BearerToken: {
-    toAuthorizationHeader: typeof toAuthorizationHeader;
+    toAuthorizationHeader: (token: BearerToken | undefined) => string | undefined;
     fromAuthorizationHeader: (header: string) => BearerToken;
 };
-export {};

package/dist/esm/core/auth/BearerToken.mjs

@@ -1,12 +1,11 @@
 const BEARER_AUTH_HEADER_PREFIX = /^Bearer /i;
-function toAuthorizationHeader(token) {
-    if (token == null) {
-        return undefined;
-    }
-    return `Bearer ${token}`;
-}
 export const BearerToken = {
-    toAuthorizationHeader: toAuthorizationHeader,
+    toAuthorizationHeader: (token) => {
+        if (token == null) {
+            return undefined;
+        }
+        return `Bearer ${token}`;
+    },
     fromAuthorizationHeader: (header) => {
         return header.replace(BEARER_AUTH_HEADER_PREFIX, "").trim();
     },

package/dist/esm/core/auth/index.d.mts

@@ -2,4 +2,3 @@ export type { AuthProvider } from "./AuthProvider.mjs";
 export type { AuthRequest } from "./AuthRequest.mjs";
 export { BasicAuth } from "./BasicAuth.mjs";
 export { BearerToken } from "./BearerToken.mjs";
-export { NoOpAuthProvider } from "./NoOpAuthProvider.mjs";

package/dist/esm/core/auth/index.mjs

@@ -1,3 +1,2 @@
 export { BasicAuth } from "./BasicAuth.mjs";
 export { BearerToken } from "./BearerToken.mjs";
-export { NoOpAuthProvider } from "./NoOpAuthProvider.mjs";

package/dist/esm/core/fetcher/BinaryResponse.d.mts

@@ -1,19 +1,20 @@
+import type { ResponseWithBody } from "./ResponseWithBody.mjs";
 export type BinaryResponse = {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/bodyUsed) */
-    bodyUsed: Response["bodyUsed"];
+    bodyUsed: boolean;
     /**
      * Returns a ReadableStream of the response body.
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/body)
      */
-    stream: () => Response["body"];
+    stream: () => ReadableStream<Uint8Array>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/arrayBuffer) */
-    arrayBuffer: () => ReturnType<Response["arrayBuffer"]>;
+    arrayBuffer: () => Promise<ArrayBuffer>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/blob) */
-    blob: () => ReturnType<Response["blob"]>;
+    blob: () => Promise<Blob>;
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/bytes)
      * Some versions of the Fetch API may not support this method.
      */
-    bytes?(): ReturnType<Response["bytes"]>;
+    bytes?(): Promise<Uint8Array>;
 };
-export declare function getBinaryResponse(response: Response): BinaryResponse;
+export declare function getBinaryResponse(response: ResponseWithBody): BinaryResponse;

package/dist/esm/core/fetcher/EndpointSupplier.d.mts

@@ -1,12 +1,12 @@
 import type { EndpointMetadata } from "./EndpointMetadata.mjs";
 import type { Supplier } from "./Supplier.mjs";
 type EndpointSupplierFn<T> = (arg: {
-    endpointMetadata?: EndpointMetadata;
+    endpointMetadata: EndpointMetadata;
 }) => T | Promise<T>;
 export type EndpointSupplier<T> = Supplier<T> | EndpointSupplierFn<T>;
 export declare const EndpointSupplier: {
     get: <T>(supplier: EndpointSupplier<T>, arg: {
-        endpointMetadata?: EndpointMetadata;
+        endpointMetadata: EndpointMetadata;
     }) => Promise<T>;
 };
 export {};

package/dist/esm/core/fetcher/Fetcher.d.mts

@@ -1,27 +1,25 @@
-import { type LogConfig, type Logger } from "../logging/logger.mjs";
 import type { APIResponse } from "./APIResponse.mjs";
 import type { EndpointMetadata } from "./EndpointMetadata.mjs";
+import { EndpointSupplier } from "./EndpointSupplier.mjs";
 export type FetchFunction = <R = unknown>(args: Fetcher.Args) => Promise<APIResponse<R, Fetcher.Error>>;
 export declare namespace Fetcher {
     interface Args {
         url: string;
         method: string;
         contentType?: string;
-        headers?: Record<string, unknown>;
+        headers?: Record<string, string | EndpointSupplier<string | null | undefined> | null | undefined>;
         queryParameters?: Record<string, unknown>;
         body?: unknown;
         timeoutMs?: number;
         maxRetries?: number;
         withCredentials?: boolean;
         abortSignal?: AbortSignal;
-        requestType?: "json" | "file" | "bytes" | "form" | "other";
+        requestType?: "json" | "file" | "bytes";
         responseType?: "json" | "blob" | "sse" | "streaming" | "text" | "arrayBuffer" | "binary-response";
         duplex?: "half";
         endpointMetadata?: EndpointMetadata;
-        fetchFn?: typeof fetch;
-        logging?: LogConfig | Logger;
     }
-    type Error = FailedStatusCodeError | NonJsonError | BodyIsNullError | TimeoutError | UnknownError;
+    type Error = FailedStatusCodeError | NonJsonError | TimeoutError | UnknownError;
     interface FailedStatusCodeError {
         reason: "status-code";
         statusCode: number;
@@ -32,10 +30,6 @@ export declare namespace Fetcher {
         statusCode: number;
         rawBody: string;
     }
-    interface BodyIsNullError {
-        reason: "body-is-null";
-        statusCode: number;
-    }
     interface TimeoutError {
         reason: "timeout";
     }

package/dist/esm/core/fetcher/Fetcher.mjs

@@ -8,153 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { toJson } from "../json.mjs";
-import { createLogger } from "../logging/logger.mjs";
 import { createRequestUrl } from "./createRequestUrl.mjs";
 import { EndpointSupplier } from "./EndpointSupplier.mjs";
 import { getErrorResponseBody } from "./getErrorResponseBody.mjs";
 import { getFetchFn } from "./getFetchFn.mjs";
 import { getRequestBody } from "./getRequestBody.mjs";
 import { getResponseBody } from "./getResponseBody.mjs";
-import { Headers } from "./Headers.mjs";
 import { makeRequest } from "./makeRequest.mjs";
 import { abortRawResponse, toRawResponse, unknownRawResponse } from "./RawResponse.mjs";
 import { requestWithRetries } from "./requestWithRetries.mjs";
-const SENSITIVE_HEADERS = new Set([
-    "authorization",
-    "www-authenticate",
-    "x-api-key",
-    "api-key",
-    "apikey",
-    "x-api-token",
-    "x-auth-token",
-    "auth-token",
-    "cookie",
-    "set-cookie",
-    "proxy-authorization",
-    "proxy-authenticate",
-    "x-csrf-token",
-    "x-xsrf-token",
-    "x-session-token",
-    "x-access-token",
-]);
-function redactHeaders(headers) {
-    const filtered = {};
-    for (const [key, value] of headers instanceof Headers ? headers.entries() : Object.entries(headers)) {
-        if (SENSITIVE_HEADERS.has(key.toLowerCase())) {
-            filtered[key] = "[REDACTED]";
-        }
-        else {
-            filtered[key] = value;
-        }
-    }
-    return filtered;
-}
-const SENSITIVE_QUERY_PARAMS = new Set([
-    "api_key",
-    "api-key",
-    "apikey",
-    "token",
-    "access_token",
-    "access-token",
-    "auth_token",
-    "auth-token",
-    "password",
-    "passwd",
-    "secret",
-    "api_secret",
-    "api-secret",
-    "apisecret",
-    "key",
-    "session",
-    "session_id",
-    "session-id",
-]);
-function redactQueryParameters(queryParameters) {
-    if (queryParameters == null) {
-        return queryParameters;
-    }
-    const redacted = {};
-    for (const [key, value] of Object.entries(queryParameters)) {
-        if (SENSITIVE_QUERY_PARAMS.has(key.toLowerCase())) {
-            redacted[key] = "[REDACTED]";
-        }
-        else {
-            redacted[key] = value;
-        }
-    }
-    return redacted;
-}
-function redactUrl(url) {
-    const protocolIndex = url.indexOf("://");
-    if (protocolIndex === -1)
-        return url;
-    const afterProtocol = protocolIndex + 3;
-    // Find the first delimiter that marks the end of the authority section
-    const pathStart = url.indexOf("/", afterProtocol);
-    let queryStart = url.indexOf("?", afterProtocol);
-    let fragmentStart = url.indexOf("#", afterProtocol);
-    const firstDelimiter = Math.min(pathStart === -1 ? url.length : pathStart, queryStart === -1 ? url.length : queryStart, fragmentStart === -1 ? url.length : fragmentStart);
-    // Find the LAST @ before the delimiter (handles multiple @ in credentials)
-    let atIndex = -1;
-    for (let i = afterProtocol; i < firstDelimiter; i++) {
-        if (url[i] === "@") {
-            atIndex = i;
-        }
-    }
-    if (atIndex !== -1) {
-        url = `${url.slice(0, afterProtocol)}[REDACTED]@${url.slice(atIndex + 1)}`;
-    }
-    // Recalculate queryStart since url might have changed
-    queryStart = url.indexOf("?");
-    if (queryStart === -1)
-        return url;
-    fragmentStart = url.indexOf("#", queryStart);
-    const queryEnd = fragmentStart !== -1 ? fragmentStart : url.length;
-    const queryString = url.slice(queryStart + 1, queryEnd);
-    if (queryString.length === 0)
-        return url;
-    // FAST PATH: Quick check if any sensitive keywords present
-    // Using indexOf is faster than regex for simple substring matching
-    const lower = queryString.toLowerCase();
-    const hasSensitive = lower.includes("token") ||
-        lower.includes("key") ||
-        lower.includes("password") ||
-        lower.includes("passwd") ||
-        lower.includes("secret") ||
-        lower.includes("session") ||
-        lower.includes("auth");
-    if (!hasSensitive) {
-        return url;
-    }
-    // SLOW PATH: Parse and redact
-    const redactedParams = [];
-    const params = queryString.split("&");
-    for (const param of params) {
-        const equalIndex = param.indexOf("=");
-        if (equalIndex === -1) {
-            redactedParams.push(param);
-            continue;
-        }
-        const key = param.slice(0, equalIndex);
-        let shouldRedact = SENSITIVE_QUERY_PARAMS.has(key.toLowerCase());
-        if (!shouldRedact && key.includes("%")) {
-            try {
-                const decodedKey = decodeURIComponent(key);
-                shouldRedact = SENSITIVE_QUERY_PARAMS.has(decodedKey.toLowerCase());
-            }
-            catch (_a) { }
-        }
-        redactedParams.push(shouldRedact ? `${key}=[REDACTED]` : param);
-    }
-    return url.slice(0, queryStart + 1) + redactedParams.join("&") + url.slice(queryEnd);
-}
 function getHeaders(args) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const newHeaders = new Headers();
-        newHeaders.set("Accept", args.responseType === "json" ? "application/json" : args.responseType === "text" ? "text/plain" : "*/*");
+        const newHeaders = {};
         if (args.body !== undefined && args.contentType != null) {
-            newHeaders.set("Content-Type", args.contentType);
+            newHeaders["Content-Type"] = args.contentType;
         }
         if (args.headers == null) {
             return newHeaders;
@@ -162,70 +30,39 @@ function getHeaders(args) {
         for (const [key, value] of Object.entries(args.headers)) {
             const result = yield EndpointSupplier.get(value, { endpointMetadata: (_a = args.endpointMetadata) !== null && _a !== void 0 ? _a : {} });
             if (typeof result === "string") {
-                newHeaders.set(key, result);
+                newHeaders[key] = result;
                 continue;
             }
             if (result == null) {
                 continue;
             }
-            newHeaders.set(key, `${result}`);
+            newHeaders[key] = `${result}`;
         }
         return newHeaders;
     });
 }
 export function fetcherImpl(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a;
         const url = createRequestUrl(args.url, args.queryParameters);
         const requestBody = yield getRequestBody({
             body: args.body,
-            type: (_a = args.requestType) !== null && _a !== void 0 ? _a : "other",
+            type: args.requestType === "json" ? "json" : "other",
         });
-        const fetchFn = (_b = args.fetchFn) !== null && _b !== void 0 ? _b : (yield getFetchFn());
-        const headers = yield getHeaders(args);
-        const logger = createLogger(args.logging);
-        if (logger.isDebug()) {
-            const metadata = {
-                method: args.method,
-                url: redactUrl(url),
-                headers: redactHeaders(headers),
-                queryParameters: redactQueryParameters(args.queryParameters),
-                hasBody: requestBody != null,
-            };
-            logger.debug("Making HTTP request", metadata);
-        }
+        const fetchFn = yield getFetchFn();
         try {
             const response = yield requestWithRetries(() => __awaiter(this, void 0, void 0, function* () {
-                return makeRequest(fetchFn, url, args.method, headers, requestBody, args.timeoutMs, args.abortSignal, args.withCredentials, args.duplex);
+                return makeRequest(fetchFn, url, args.method, yield getHeaders(args), requestBody, args.timeoutMs, args.abortSignal, args.withCredentials, args.duplex);
             }), args.maxRetries);
             if (response.status >= 200 && response.status < 400) {
-                if (logger.isDebug()) {
-                    const metadata = {
-                        method: args.method,
-                        url: redactUrl(url),
-                        statusCode: response.status,
-                        responseHeaders: redactHeaders(response.headers),
-                    };
-                    logger.debug("HTTP request succeeded", metadata);
-                }
-                const body = yield getResponseBody(response, args.responseType);
                 return {
                     ok: true,
-                    body: body,
+                    body: (yield getResponseBody(response, args.responseType)),
                     headers: response.headers,
                     rawResponse: toRawResponse(response),
                 };
             }
             else {
-                if (logger.isError()) {
-                    const metadata = {
-                        method: args.method,
-                        url: redactUrl(url),
-                        statusCode: response.status,
-                        responseHeaders: redactHeaders(Object.fromEntries(response.headers.entries())),
-                    };
-                    logger.error("HTTP request failed with error status", metadata);
-                }
                 return {
                     ok: false,
                     error: {
@@ -238,14 +75,7 @@ export function fetcherImpl(args) {
             }
         }
         catch (error) {
-            if ((_c = args.abortSignal) === null || _c === void 0 ? void 0 : _c.aborted) {
-                if (logger.isError()) {
-                    const metadata = {
-                        method: args.method,
-                        url: redactUrl(url),
-                    };
-                    logger.error("HTTP request was aborted", metadata);
-                }
+            if ((_a = args.abortSignal) === null || _a === void 0 ? void 0 : _a.aborted) {
                 return {
                     ok: false,
                     error: {
@@ -256,14 +86,6 @@ export function fetcherImpl(args) {
                 };
             }
             else if (error instanceof Error && error.name === "AbortError") {
-                if (logger.isError()) {
-                    const metadata = {
-                        method: args.method,
-                        url: redactUrl(url),
-                        timeoutMs: args.timeoutMs,
-                    };
-                    logger.error("HTTP request timed out", metadata);
-                }
                 return {
                     ok: false,
                     error: {
@@ -273,14 +95,6 @@ export function fetcherImpl(args) {
                 };
             }
             else if (error instanceof Error) {
-                if (logger.isError()) {
-                    const metadata = {
-                        method: args.method,
-                        url: redactUrl(url),
-                        errorMessage: error.message,
-                    };
-                    logger.error("HTTP request failed with error", metadata);
-                }
                 return {
                     ok: false,
                     error: {
@@ -290,14 +104,6 @@ export function fetcherImpl(args) {
                     rawResponse: unknownRawResponse,
                 };
             }
-            if (logger.isError()) {
-                const metadata = {
-                    method: args.method,
-                    url: redactUrl(url),
-                    error: toJson(error),
-                };
-                logger.error("HTTP request failed with unknown error", metadata);
-            }
             return {
                 ok: false,
                 error: {

package/dist/esm/core/fetcher/ResponseWithBody.d.mts

@@ -0,0 +1,4 @@
+export type ResponseWithBody = Response & {
+    body: ReadableStream<Uint8Array>;
+};
+export declare function isResponseWithBody(response: Response): response is ResponseWithBody;

package/dist/esm/core/fetcher/ResponseWithBody.mjs

@@ -0,0 +1,3 @@
+export function isResponseWithBody(response) {
+    return response.body != null;
+}

package/dist/esm/core/fetcher/getRequestBody.d.mts

@@ -1,7 +1,7 @@
 export declare namespace GetRequestBody {
     interface Args {
         body: unknown;
-        type: "json" | "file" | "bytes" | "form" | "other";
+        type: "json" | "file" | "bytes" | "other";
     }
 }
 export declare function getRequestBody({ body, type }: GetRequestBody.Args): Promise<BodyInit | undefined>;

package/dist/esm/core/fetcher/getRequestBody.mjs

@@ -8,12 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { toJson } from "../json.mjs";
-import { toQueryString } from "../url/qs.mjs";
 export function getRequestBody(_a) {
     return __awaiter(this, arguments, void 0, function* ({ body, type }) {
-        if (type === "form") {
-            return toQueryString(body, { arrayFormat: "repeat", encode: true });
-        }
         if (type.includes("json")) {
             return toJson(body);
         }