@supabase/postgrest-js 2.118.0 → 2.119.0-canary.1

package/dist/index.cjs

@@ -3637,6 +3637,36 @@ function toTransportFailure(cause, status, statusText) {
 	};
 }
 /**
+* Bounds every call of `fetch` to `timeout` milliseconds by aborting it through
+* an `AbortController`. A signal already present on the request keeps working:
+* its abort also aborts the timed request. A missing or non-positive timeout
+* returns `fetch` unchanged.
+*/
+function withTimeout(fetch$1, timeout) {
+	if (timeout === void 0 || timeout <= 0) return fetch$1;
+	return (input, init) => {
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), timeout);
+		const existingSignal = init === null || init === void 0 ? void 0 : init.signal;
+		if (existingSignal) {
+			if (existingSignal.aborted) {
+				clearTimeout(timeoutId);
+				return fetch$1(input, init);
+			}
+			const abortHandler = () => {
+				clearTimeout(timeoutId);
+				controller.abort();
+			};
+			existingSignal.addEventListener("abort", abortHandler, { once: true });
+			return fetch$1(input, _objectSpread2(_objectSpread2({}, init), {}, { signal: controller.signal })).finally(() => {
+				clearTimeout(timeoutId);
+				existingSignal.removeEventListener("abort", abortHandler);
+			});
+		}
+		return fetch$1(input, _objectSpread2(_objectSpread2({}, init), {}, { signal: controller.signal })).finally(() => clearTimeout(timeoutId));
+	};
+}
+/**
 * PostgREST client.
 *
 * @typeParam Database - Types for the schema from the [type
@@ -3661,6 +3691,10 @@ var PostgrestClient = class PostgrestClient {
 	*   When enabled, idempotent requests (GET, HEAD, OPTIONS) that fail with network
 	*   errors or HTTP 503/520 responses will be automatically retried up to 3 times
 	*   with exponential backoff (1s, 2s, 4s). Defaults to `true`.
+	* @param options.wrapFetch - Wraps every fetch this client uses, including a per-request
+	*   `fetch` passed to `from()`, and is carried over to clients returned by `schema()`.
+	*   Use it for headers or instrumentation that must reach every request regardless of
+	*   which fetch performs it.
 	* @example Using supabase-js (recommended)
 	* ```ts
 	* import { createClient } from '@supabase/supabase-js'
@@ -3686,44 +3720,35 @@ var PostgrestClient = class PostgrestClient {
 	* })
 	* ```
 	*/
-	constructor(url, { headers = {}, schema, fetch: fetch$1, timeout, urlLengthLimit = 8e3, retry } = {}) {
+	constructor(url, { headers = {}, schema, fetch: fetch$1, timeout, urlLengthLimit = 8e3, retry, wrapFetch } = {}) {
 		this.url = url;
 		this.headers = new Headers(headers);
 		this.schemaName = schema;
 		this.urlLengthLimit = urlLengthLimit;
-		const originalFetch = fetch$1 !== null && fetch$1 !== void 0 ? fetch$1 : globalThis.fetch;
-		if (timeout !== void 0 && timeout > 0) this.fetch = (input, init) => {
-			const controller = new AbortController();
-			const timeoutId = setTimeout(() => controller.abort(), timeout);
-			const existingSignal = init === null || init === void 0 ? void 0 : init.signal;
-			if (existingSignal) {
-				if (existingSignal.aborted) {
-					clearTimeout(timeoutId);
-					return originalFetch(input, init);
-				}
-				const abortHandler = () => {
-					clearTimeout(timeoutId);
-					controller.abort();
-				};
-				existingSignal.addEventListener("abort", abortHandler, { once: true });
-				return originalFetch(input, _objectSpread2(_objectSpread2({}, init), {}, { signal: controller.signal })).finally(() => {
-					clearTimeout(timeoutId);
-					existingSignal.removeEventListener("abort", abortHandler);
-				});
-			}
-			return originalFetch(input, _objectSpread2(_objectSpread2({}, init), {}, { signal: controller.signal })).finally(() => clearTimeout(timeoutId));
-		};
-		else this.fetch = originalFetch;
+		this.timeout = timeout;
+		this.wrapFetch = wrapFetch;
+		this.baseFetch = fetch$1 !== null && fetch$1 !== void 0 ? fetch$1 : globalThis.fetch;
+		this.fetch = this.baseFetch ? this.decorateFetch(this.baseFetch) : void 0;
 		this.retry = retry;
 	}
-	from(relation) {
+	/**
+	* Applies the client's decorations to a fetch implementation: `wrapFetch`
+	* first, then the timeout guard, so the timeout bounds the whole wrapped call.
+	* The client-level fetch and every per-request `fetch` passed to `from()` go
+	* through this.
+	*/
+	decorateFetch(fetch$1) {
+		return withTimeout(this.wrapFetch ? this.wrapFetch(fetch$1) : fetch$1, this.timeout);
+	}
+	from(relation, options) {
+		var _options$urlLengthLim, _options$retry;
 		if (!relation || typeof relation !== "string" || relation.trim() === "") throw new Error("Invalid relation name: relation must be a non-empty string.");
 		return new PostgrestQueryBuilder(new URL(`${this.url}/${relation}`), {
 			headers: new Headers(this.headers),
 			schema: this.schemaName,
-			fetch: this.fetch,
-			urlLengthLimit: this.urlLengthLimit,
-			retry: this.retry
+			fetch: (options === null || options === void 0 ? void 0 : options.fetch) ? this.decorateFetch(options.fetch) : this.fetch,
+			urlLengthLimit: (_options$urlLengthLim = options === null || options === void 0 ? void 0 : options.urlLengthLimit) !== null && _options$urlLengthLim !== void 0 ? _options$urlLengthLim : this.urlLengthLimit,
+			retry: (_options$retry = options === null || options === void 0 ? void 0 : options.retry) !== null && _options$retry !== void 0 ? _options$retry : this.retry
 		});
 	}
 	/**
@@ -3739,7 +3764,9 @@ var PostgrestClient = class PostgrestClient {
 		return new PostgrestClient(this.url, {
 			headers: this.headers,
 			schema,
-			fetch: this.fetch,
+			fetch: this.baseFetch,
+			timeout: this.timeout,
+			wrapFetch: this.wrapFetch,
 			urlLengthLimit: this.urlLengthLimit,
 			retry: this.retry
 		});