@tolt/api 0.7.0 → 1.1.0

package/dist/api/resources/transactions/client/Client.js

@@ -27,73 +27,86 @@ export class TransactionsClient {
      * @example
      *     await client.transactions.list()
      */
-    list(request = {}, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__list(request, requestOptions));
-    }
-    async __list(request = {}, requestOptions) {
-        const { limit, order, sort, starting_after: startingAfter, ending_before: endingBefore, created_after: createdAfter, created_before: createdBefore, updated_after: updatedAfter, updated_before: updatedBefore, program_id: programId, partner_id: partnerId, customer_id: customerId, status, search, } = request;
-        const _queryParams = {
-            limit,
-            order: order != null ? order : undefined,
-            sort: sort != null ? sort : undefined,
-            starting_after: startingAfter,
-            ending_before: endingBefore,
-            created_after: createdAfter != null ? createdAfter : undefined,
-            created_before: createdBefore != null ? createdBefore : undefined,
-            updated_after: updatedAfter != null ? updatedAfter : undefined,
-            updated_before: updatedBefore != null ? updatedBefore : undefined,
-            program_id: programId,
-            partner_id: partnerId,
-            customer_id: customerId,
-            status,
-            search,
-        };
-        const _authRequest = await this._options.authProvider.getAuthRequest();
-        const _headers = mergeHeaders(_authRequest.headers, this._options?.headers, requestOptions?.headers);
-        const _response = await core.fetcher({
-            url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
-                (await core.Supplier.get(this._options.environment)) ??
-                environments.ToltApiEnvironment.Default, "v2/transactions"),
-            method: "GET",
-            headers: _headers,
-            queryString: core.url
-                .queryBuilder()
-                .addMany(_queryParams)
-                .mergeAdditional(requestOptions?.queryParams)
-                .build(),
-            timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
-            maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
-            abortSignal: requestOptions?.abortSignal,
-            fetchFn: this._options?.fetch,
-            logging: this._options.logging,
-        });
-        if (_response.ok) {
-            return { data: _response.body, rawResponse: _response.rawResponse };
-        }
-        if (_response.error.reason === "status-code") {
-            switch (_response.error.statusCode) {
-                case 400:
-                    throw new ToltApi.BadRequestError(_response.error.body, _response.rawResponse);
-                case 401:
-                    throw new ToltApi.UnauthorizedError(_response.error.body, _response.rawResponse);
-                case 413:
-                    throw new ToltApi.ContentTooLargeError(_response.error.body, _response.rawResponse);
-                case 429:
-                    throw new ToltApi.TooManyRequestsError(_response.error.body, _response.rawResponse);
-                default:
-                    throw new errors.ToltApiError({
-                        statusCode: _response.error.statusCode,
-                        body: _response.error.body,
-                        rawResponse: _response.rawResponse,
-                    });
+    async list(request = {}, requestOptions) {
+        const list = core.HttpResponsePromise.interceptFunction(async (request) => {
+            const { limit, order, sort, starting_after: startingAfter, ending_before: endingBefore, created_after: createdAfter, created_before: createdBefore, updated_after: updatedAfter, updated_before: updatedBefore, program_id: programId, partner_id: partnerId, customer_id: customerId, status, search, } = request;
+            const _queryParams = {
+                limit,
+                order: order != null ? order : undefined,
+                sort: sort != null ? sort : undefined,
+                starting_after: startingAfter,
+                ending_before: endingBefore,
+                created_after: createdAfter != null ? createdAfter : undefined,
+                created_before: createdBefore != null ? createdBefore : undefined,
+                updated_after: updatedAfter != null ? updatedAfter : undefined,
+                updated_before: updatedBefore != null ? updatedBefore : undefined,
+                program_id: programId,
+                partner_id: partnerId,
+                customer_id: customerId,
+                status,
+                search,
+            };
+            const _authRequest = await this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, this._options?.headers, requestOptions?.headers);
+            const _response = await core.fetcher({
+                url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
+                    (await core.Supplier.get(this._options.environment)) ??
+                    environments.ToltApiEnvironment.Default, "v2/transactions"),
+                method: "GET",
+                headers: _headers,
+                queryString: core.url
+                    .queryBuilder()
+                    .addMany(_queryParams)
+                    .mergeAdditional(requestOptions?.queryParams)
+                    .build(),
+                timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
+                maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
+                abortSignal: requestOptions?.abortSignal,
+                fetchFn: this._options?.fetch,
+                logging: this._options.logging,
+            });
+            if (_response.ok) {
+                return {
+                    data: _response.body,
+                    rawResponse: _response.rawResponse,
+                };
             }
-        }
-        return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/v2/transactions");
+            if (_response.error.reason === "status-code") {
+                switch (_response.error.statusCode) {
+                    case 400:
+                        throw new ToltApi.BadRequestError(_response.error.body, _response.rawResponse);
+                    case 401:
+                        throw new ToltApi.UnauthorizedError(_response.error.body, _response.rawResponse);
+                    case 413:
+                        throw new ToltApi.ContentTooLargeError(_response.error.body, _response.rawResponse);
+                    case 429:
+                        throw new ToltApi.TooManyRequestsError(_response.error.body, _response.rawResponse);
+                    default:
+                        throw new errors.ToltApiError({
+                            statusCode: _response.error.statusCode,
+                            body: _response.error.body,
+                            rawResponse: _response.rawResponse,
+                        });
+                }
+            }
+            return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/v2/transactions");
+        });
+        const dataWithRawResponse = await list(request).withRawResponse();
+        return new core.Page({
+            response: dataWithRawResponse.data,
+            rawResponse: dataWithRawResponse.rawResponse,
+            hasNextPage: (response) => response?.next_cursor != null &&
+                !(typeof response?.next_cursor === "string" && response?.next_cursor === ""),
+            getItems: (response) => response?.data ?? [],
+            loadPage: (response) => {
+                return list(core.setObjectProperty(request, "starting_after", response?.next_cursor));
+            },
+        });
     }
     /**
      * Supports historical created_at values. product_id and product_name are stored and returned in product_ids and product_names arrays.
      *
-     * @param {ToltApi.CreateTransactionsRequest} request
+     * @param {ToltApi.CreateTransactionRequest} request
      * @param {TransactionsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link ToltApi.BadRequestError}
@@ -132,7 +145,7 @@ export class TransactionsClient {
             requestType: "json",
             body: mergeAdditionalBodyParameters(request, requestOptions?.additionalBodyParameters),
             timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
-            maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
+            maxRetries: 0,
             abortSignal: requestOptions?.abortSignal,
             fetchFn: this._options?.fetch,
             logging: this._options.logging,
@@ -165,7 +178,7 @@ export class TransactionsClient {
     /**
      * Gets a transaction by ID, with its amount, status, billing details, products and the customer it belongs to.
      *
-     * @param {ToltApi.GetTransactionsRequest} request
+     * @param {ToltApi.GetTransactionRequest} request
      * @param {TransactionsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link ToltApi.UnauthorizedError}
@@ -190,7 +203,7 @@ export class TransactionsClient {
         const _response = await core.fetcher({
             url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
                 (await core.Supplier.get(this._options.environment)) ??
-                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id)}`),
+                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id, errors.ToltApiError)}`),
             method: "GET",
             headers: _headers,
             queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
@@ -226,7 +239,7 @@ export class TransactionsClient {
     /**
      * Updates a transaction's amount, status, billing or product details. Refunded transactions cannot be modified.
      *
-     * @param {ToltApi.UpdateTransactionsRequest} request
+     * @param {ToltApi.UpdateTransactionRequest} request
      * @param {TransactionsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link ToltApi.BadRequestError}
@@ -255,7 +268,7 @@ export class TransactionsClient {
         const _response = await core.fetcher({
             url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
                 (await core.Supplier.get(this._options.environment)) ??
-                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id)}`),
+                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id, errors.ToltApiError)}`),
             method: "PUT",
             headers: _headers,
             contentType: "application/json",
@@ -298,7 +311,7 @@ export class TransactionsClient {
     /**
      * Deletes a transaction. Refunded transactions and transactions that already have commissions cannot be deleted.
      *
-     * @param {ToltApi.DeleteTransactionsRequest} request
+     * @param {ToltApi.DeleteTransactionRequest} request
      * @param {TransactionsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link ToltApi.UnauthorizedError}
@@ -324,7 +337,7 @@ export class TransactionsClient {
         const _response = await core.fetcher({
             url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
                 (await core.Supplier.get(this._options.environment)) ??
-                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id)}`),
+                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id, errors.ToltApiError)}`),
             method: "DELETE",
             headers: _headers,
             queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
@@ -362,7 +375,7 @@ export class TransactionsClient {
     /**
      * Unpaid commissions are zeroed while preserving their original deducted commission amount, and affected draft invoices are recalculated. Paid commissions and commissions linked to legacy autopayout invoices receive a negative reversal.
      *
-     * @param {ToltApi.RefundTransactionsRequest} request
+     * @param {ToltApi.RefundTransactionRequest} request
      * @param {TransactionsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link ToltApi.UnauthorizedError}
@@ -388,7 +401,7 @@ export class TransactionsClient {
         const _response = await core.fetcher({
             url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
                 (await core.Supplier.get(this._options.environment)) ??
-                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id)}/refund`),
+                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id, errors.ToltApiError)}/refund`),
             method: "POST",
             headers: _headers,
             queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
@@ -426,7 +439,7 @@ export class TransactionsClient {
     /**
      * Re-queues the transaction for asynchronous flow processing. Only transactions without an existing commission are eligible, so a rerun cannot create a duplicate commission.
      *
-     * @param {ToltApi.RerunFlowsTransactionsRequest} request
+     * @param {ToltApi.RerunTransactionFlowsRequest} request
      * @param {TransactionsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link ToltApi.UnauthorizedError}
@@ -452,12 +465,12 @@ export class TransactionsClient {
         const _response = await core.fetcher({
             url: core.url.join((await core.Supplier.get(this._options.baseUrl)) ??
                 (await core.Supplier.get(this._options.environment)) ??
-                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id)}/rerun-flows`),
+                environments.ToltApiEnvironment.Default, `v2/transactions/${core.url.encodePathParam(id, errors.ToltApiError)}/rerun-flows`),
             method: "POST",
             headers: _headers,
             queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
             timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,
-            maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,
+            maxRetries: 0,
             abortSignal: requestOptions?.abortSignal,
             fetchFn: this._options?.fetch,
             logging: this._options.logging,

package/dist/api/resources/transactions/client/requests/{CreateTransactionsRequest.d.ts → CreateTransactionRequest.d.ts}

@@ -10,7 +10,7 @@
  *         source: "api"
  *     }
  */
-export interface CreateTransactionsRequest {
+export interface CreateTransactionRequest {
     /** When the payment happened, as a timestamp with a time zone, for example 2026-03-01T12:00:00Z. Reports and date filters place the transaction on this date. Defaults to now. */
     created_at?: string;
     /** Id of the purchased product in your billing system. Commission flows can match on it. */

package/dist/api/resources/transactions/client/requests/{DeleteTransactionsRequest.d.ts → DeleteTransactionRequest.d.ts}

@@ -4,6 +4,6 @@
  *         id: "txn_fB3egT1sKNVNu3ZYuU1ypYDA"
  *     }
  */
-export interface DeleteTransactionsRequest {
+export interface DeleteTransactionRequest {
     id: string;
 }

package/dist/api/resources/transactions/client/requests/{GetTransactionsRequest.d.ts → GetTransactionRequest.d.ts}

@@ -4,6 +4,6 @@
  *         id: "txn_fB3egT1sKNVNu3ZYuU1ypYDA"
  *     }
  */
-export interface GetTransactionsRequest {
+export interface GetTransactionRequest {
     id: string;
 }

package/dist/api/resources/transactions/client/requests/{RefundTransactionsRequest.d.ts → RefundTransactionRequest.d.ts}

@@ -4,6 +4,6 @@
  *         id: "txn_fB3egT1sKNVNu3ZYuU1ypYDA"
  *     }
  */
-export interface RefundTransactionsRequest {
+export interface RefundTransactionRequest {
     id: string;
 }

package/dist/api/resources/transactions/client/requests/{RerunFlowsTransactionsRequest.d.ts → RerunTransactionFlowsRequest.d.ts}

@@ -4,6 +4,6 @@
  *         id: "txn_fB3egT1sKNVNu3ZYuU1ypYDA"
  *     }
  */
-export interface RerunFlowsTransactionsRequest {
+export interface RerunTransactionFlowsRequest {
     id: string;
 }

package/dist/api/resources/transactions/client/requests/{UpdateTransactionsRequest.d.ts → UpdateTransactionRequest.d.ts}

@@ -6,7 +6,7 @@
  *         product_name: "Pro plan"
  *     }
  */
-export interface UpdateTransactionsRequest {
+export interface UpdateTransactionRequest {
     id: string;
     /** The payment amount in the smallest unit of the program currency (cents for USD); percentage commissions are calculated from it. */
     amount?: number;

package/dist/api/resources/transactions/client/requests/index.d.ts

@@ -1,7 +1,7 @@
-export type { CreateTransactionsRequest } from "./CreateTransactionsRequest.js";
-export type { DeleteTransactionsRequest } from "./DeleteTransactionsRequest.js";
-export type { GetTransactionsRequest } from "./GetTransactionsRequest.js";
+export type { CreateTransactionRequest } from "./CreateTransactionRequest.js";
+export type { DeleteTransactionRequest } from "./DeleteTransactionRequest.js";
+export type { GetTransactionRequest } from "./GetTransactionRequest.js";
 export type { ListTransactionsRequest } from "./ListTransactionsRequest.js";
-export type { RefundTransactionsRequest } from "./RefundTransactionsRequest.js";
-export type { RerunFlowsTransactionsRequest } from "./RerunFlowsTransactionsRequest.js";
-export type { UpdateTransactionsRequest } from "./UpdateTransactionsRequest.js";
+export type { RefundTransactionRequest } from "./RefundTransactionRequest.js";
+export type { RerunTransactionFlowsRequest } from "./RerunTransactionFlowsRequest.js";
+export type { UpdateTransactionRequest } from "./UpdateTransactionRequest.js";

package/dist/api/resources/transactions/types/{CreateTransactionsResponse.d.ts → CreateTransactionResponse.d.ts}

@@ -1,5 +1,5 @@
 import type * as ToltApi from "../../../index.js";
-export interface CreateTransactionsResponse {
+export interface CreateTransactionResponse {
     success: boolean;
     message: string;
     data: ToltApi.Transaction;

package/dist/api/resources/transactions/types/{DeleteTransactionsResponse.d.ts → DeleteTransactionResponse.d.ts}

@@ -1,5 +1,5 @@
 import type * as ToltApi from "../../../index.js";
-export interface DeleteTransactionsResponse {
+export interface DeleteTransactionResponse {
     success: boolean;
     message: string;
     data: ToltApi.Transaction;

package/dist/api/resources/transactions/types/{GetTransactionsResponse.d.ts → GetTransactionResponse.d.ts}

@@ -1,5 +1,5 @@
 import type * as ToltApi from "../../../index.js";
-export interface GetTransactionsResponse {
+export interface GetTransactionResponse {
     success: boolean;
     message: string;
     data: ToltApi.Transaction;

package/dist/api/resources/transactions/types/{RefundTransactionsResponse.d.ts → RefundTransactionResponse.d.ts}

@@ -1,5 +1,5 @@
 import type * as ToltApi from "../../../index.js";
-export interface RefundTransactionsResponse {
+export interface RefundTransactionResponse {
     success: boolean;
     message: string;
     data: ToltApi.Transaction;

package/dist/api/resources/transactions/types/{RerunFlowsTransactionsResponse.d.ts → RerunTransactionFlowsResponse.d.ts}

@@ -1,5 +1,5 @@
 import type * as ToltApi from "../../../index.js";
-export interface RerunFlowsTransactionsResponse {
+export interface RerunTransactionFlowsResponse {
     success: boolean;
     message: string;
     data: ToltApi.RerunFlowsResult;

package/dist/api/resources/transactions/types/UpdateTransactionResponse.d.ts

@@ -0,0 +1,6 @@
+import type * as ToltApi from "../../../index.js";
+export interface UpdateTransactionResponse {
+    success: boolean;
+    message: string;
+    data: ToltApi.Transaction;
+}

package/dist/api/resources/transactions/types/index.d.ts

@@ -1,9 +1,9 @@
-export * from "./CreateTransactionsResponse.js";
-export * from "./DeleteTransactionsResponse.js";
-export * from "./GetTransactionsResponse.js";
+export * from "./CreateTransactionResponse.js";
+export * from "./DeleteTransactionResponse.js";
+export * from "./GetTransactionResponse.js";
 export * from "./ListTransactionsRequestOrder.js";
 export * from "./ListTransactionsRequestSort.js";
 export * from "./ListTransactionsResponse.js";
-export * from "./RefundTransactionsResponse.js";
-export * from "./RerunFlowsTransactionsResponse.js";
-export * from "./UpdateTransactionsResponse.js";
+export * from "./RefundTransactionResponse.js";
+export * from "./RerunTransactionFlowsResponse.js";
+export * from "./UpdateTransactionResponse.js";

package/dist/api/resources/transactions/types/index.js

@@ -1,9 +1,9 @@
-export * from "./CreateTransactionsResponse.js";
-export * from "./DeleteTransactionsResponse.js";
-export * from "./GetTransactionsResponse.js";
+export * from "./CreateTransactionResponse.js";
+export * from "./DeleteTransactionResponse.js";
+export * from "./GetTransactionResponse.js";
 export * from "./ListTransactionsRequestOrder.js";
 export * from "./ListTransactionsRequestSort.js";
 export * from "./ListTransactionsResponse.js";
-export * from "./RefundTransactionsResponse.js";
-export * from "./RerunFlowsTransactionsResponse.js";
-export * from "./UpdateTransactionsResponse.js";
+export * from "./RefundTransactionResponse.js";
+export * from "./RerunTransactionFlowsResponse.js";
+export * from "./UpdateTransactionResponse.js";

package/dist/api/types/{Error_.d.ts → ErrorResponse.d.ts}

@@ -1,14 +1,14 @@
-export interface Error_ {
+export interface ErrorResponse {
     success: boolean;
     /** Human-readable explanation. May change; branch on code instead. */
     message: string;
     /** Stable machine-readable error code. */
-    code: Error_.Code;
+    code: ErrorResponse.Code;
     doc_url: string;
     /** One entry per offending field. Present on validation_error and invalid_reference. */
-    errors?: Error_.Errors.Item[] | undefined;
+    errors?: ErrorResponse.Errors.Item[] | undefined;
 }
-export declare namespace Error_ {
+export declare namespace ErrorResponse {
     /** Stable machine-readable error code. */
     const Code: {
         readonly BadRequest: "bad_request";

package/dist/api/types/{Error_.js → ErrorResponse.js}

@@ -1,8 +1,8 @@
 // This file was auto-generated by Fern from our API Definition.
-export var Error_;
-(function (Error_) {
+export var ErrorResponse;
+(function (ErrorResponse) {
     /** Stable machine-readable error code. */
-    Error_.Code = {
+    ErrorResponse.Code = {
         BadRequest: "bad_request",
         ValidationError: "validation_error",
         InvalidReference: "invalid_reference",
@@ -20,4 +20,4 @@ export var Error_;
         PayloadTooLarge: "payload_too_large",
         InternalError: "internal_error",
     };
-})(Error_ || (Error_ = {}));
+})(ErrorResponse || (ErrorResponse = {}));

package/dist/api/types/index.d.ts

@@ -4,7 +4,7 @@ export * from "./Commission.js";
 export * from "./CreatedPartner.js";
 export * from "./Customer.js";
 export * from "./EmbedToken.js";
-export * from "./Error_.js";
+export * from "./ErrorResponse.js";
 export * from "./Flow.js";
 export * from "./Group.js";
 export * from "./Link.js";

package/dist/api/types/index.js

@@ -4,7 +4,7 @@ export * from "./Commission.js";
 export * from "./CreatedPartner.js";
 export * from "./Customer.js";
 export * from "./EmbedToken.js";
-export * from "./Error_.js";
+export * from "./ErrorResponse.js";
 export * from "./Flow.js";
 export * from "./Group.js";
 export * from "./Link.js";

package/dist/core/exports.d.ts

@@ -1 +1,2 @@
 export * from "./logging/exports.js";
+export * from "./pagination/exports.js";

package/dist/core/exports.js

@@ -1 +1,2 @@
 export * from "./logging/exports.js";
+export * from "./pagination/exports.js";

package/dist/core/fetcher/Fetcher.js

@@ -5,12 +5,13 @@ import { EndpointSupplier } from "./EndpointSupplier.js";
 import { getErrorResponseBody } from "./getErrorResponseBody.js";
 import { getFetchFn } from "./getFetchFn.js";
 import { getRequestBody } from "./getRequestBody.js";
-import { getResponseBody } from "./getResponseBody.js";
+import { getResponseBody, isResponseBodyError } from "./getResponseBody.js";
 import { Headers } from "./Headers.js";
-import { makeRequest } from "./makeRequest.js";
+import { clearResponseTimeout, makeRequest } from "./makeRequest.js";
 import { abortRawResponse, toRawResponse, unknownRawResponse } from "./RawResponse.js";
 import { redactUrl, SENSITIVE_QUERY_PARAMS } from "./redactUrl.js";
 import { requestWithRetries } from "./requestWithRetries.js";
+import { TIMEOUT } from "./signals.js";
 const SENSITIVE_HEADERS = new Set([
     "authorization",
     "www-authenticate",
@@ -79,6 +80,10 @@ async function getHeaders(args) {
     }
     return newHeaders;
 }
+function isJsonContentType(contentType) {
+    const mediaType = contentType?.split(";")[0]?.trim().toLowerCase() ?? "";
+    return mediaType === "application/json" || mediaType === "text/json" || mediaType.endsWith("+json");
+}
 export async function fetcherImpl(args) {
     let url = args.url;
     if (args.queryString != null && args.queryString.length > 0) {
@@ -104,8 +109,19 @@ export async function fetcherImpl(args) {
         };
         logger.debug("Making HTTP request", metadata);
     }
+    // Bodies that are read in full here stay covered by the timeout; streamed bodies are read by the caller.
+    const keepTimeoutUntilBodyRead = args.responseType !== "streaming" && args.responseType !== "sse" && args.responseType !== "binary-response";
+    const attemptResponses = [];
     try {
-        const response = await requestWithRetries(async () => makeRequest(fetchFn, url, args.method, headers, requestBody, args.timeoutMs, args.abortSignal, args.withCredentials, args.duplex, args.responseType === "streaming" || args.responseType === "sse"), args.maxRetries);
+        const response = await requestWithRetries(async () => {
+            // A retry means the previous attempt is over; stop its timer now rather than at the end.
+            for (const previousResponse of attemptResponses) {
+                clearResponseTimeout(previousResponse);
+            }
+            const attemptResponse = await makeRequest(fetchFn, url, args.method, headers, requestBody, args.timeoutMs, args.abortSignal, args.withCredentials, args.duplex, args.responseType === "streaming" || args.responseType === "sse", keepTimeoutUntilBodyRead);
+            attemptResponses.push(attemptResponse);
+            return attemptResponse;
+        }, args.maxRetries, args.abortSignal);
         if (response.status >= 200 && response.status < 400) {
             if (logger.isDebug()) {
                 const metadata = {
@@ -117,6 +133,16 @@ export async function fetcherImpl(args) {
                 logger.debug("HTTP request succeeded", metadata);
             }
             const body = await getResponseBody(response, args.responseType);
+            // Only a body the server labelled as JSON is an error here; void endpoints may return plain text.
+            if (isResponseBodyError(body) &&
+                body.error.reason === "non-json" &&
+                isJsonContentType(response.headers.get("Content-Type"))) {
+                return {
+                    ok: false,
+                    error: body.error,
+                    rawResponse: toRawResponse(response),
+                };
+            }
             return {
                 ok: true,
                 body: body,
@@ -164,7 +190,7 @@ export async function fetcherImpl(args) {
                 rawResponse: abortRawResponse,
             };
         }
-        else if (error instanceof Error && error.name === "AbortError") {
+        else if (error === TIMEOUT || (error instanceof Error && error.name === "AbortError")) {
             if (logger.isError()) {
                 const metadata = {
                     method: args.method,
@@ -219,5 +245,10 @@ export async function fetcherImpl(args) {
             rawResponse: unknownRawResponse,
         };
     }
+    finally {
+        for (const attemptResponse of attemptResponses) {
+            clearResponseTimeout(attemptResponse);
+        }
+    }
 }
 export const fetcher = fetcherImpl;

package/dist/core/fetcher/getErrorResponseBody.js

@@ -1,9 +1,25 @@
 import { fromJson } from "../json.js";
-import { getResponseBody } from "./getResponseBody.js";
+import { getResponseBody, isResponseBodyError } from "./getResponseBody.js";
+/** Parses a JSON error body, falling back to the raw text so the status and body are never lost. */
+function parseJsonErrorBody(text) {
+    if (text.length === 0) {
+        return undefined;
+    }
+    try {
+        return fromJson(text);
+    }
+    catch {
+        return text;
+    }
+}
 export async function getErrorResponseBody(response) {
     let contentType = response.headers.get("Content-Type")?.toLowerCase();
     if (contentType == null || contentType.length === 0) {
-        return getResponseBody(response);
+        const body = await getResponseBody(response);
+        if (isResponseBodyError(body)) {
+            return body.error.reason === "non-json" ? body.error.rawBody : undefined;
+        }
+        return body;
     }
     if (contentType.indexOf(";") !== -1) {
         contentType = contentType.split(";")[0]?.trim() ?? "";
@@ -14,14 +30,11 @@ export async function getErrorResponseBody(response) {
         case "application/ld+json":
         case "application/problem+json":
         case "application/vnd.api+json":
-        case "text/json": {
-            const text = await response.text();
-            return text.length > 0 ? fromJson(text) : undefined;
-        }
+        case "text/json":
+            return parseJsonErrorBody(await response.text());
         default:
             if (contentType.startsWith("application/vnd.") && contentType.endsWith("+json")) {
-                const text = await response.text();
-                return text.length > 0 ? fromJson(text) : undefined;
+                return parseJsonErrorBody(await response.text());
             }
             // Fallback to plain text if content type is not recognized
             // Even if no body is present, the response will be an empty string

package/dist/core/fetcher/getResponseBody.d.ts

@@ -1 +1,17 @@
+export type ResponseBodyError = {
+    ok: false;
+    error: {
+        reason: "non-json";
+        statusCode: number;
+        rawBody: string;
+    } | {
+        reason: "body-is-null";
+        statusCode: number;
+    };
+};
+/**
+ * Returns true when `value` is a failure record created by `getResponseBody` (for example malformed JSON),
+ * as opposed to a parsed JSON body that happens to have the same shape.
+ */
+export declare function isResponseBodyError(value: unknown): value is ResponseBodyError;
 export declare function getResponseBody(response: Response, responseType?: string): Promise<unknown>;