@zayne-labs/callapi 1.11.46 → 1.12.1

package/dist/index.js

@@ -1,6 +1,4 @@
-import { C as isArray, E as isFunction, O as isReadableStream, T as isBoolean, _ as handleConfigValidation, a as getBody, c as getMethod, d as splitBaseConfig, f as splitConfig, h as getCurrentRouteSchemaKeyAndMainInitURL, i as createTimeoutSignal, k as isString, l as getResolvedHeaders, m as getFullAndNormalizedURL, o as getFetchImpl, p as waitFor, r as createCombinedSignal, s as getHeaders, t as extraOptionDefaults, u as omitKeys, v as handleSchemaValidation, y as HTTPError } from "./defaults-BlLod7dh.js";
-import { a as isValidationErrorInstance, n as isHTTPErrorInstance } from "./guards-WJT9aIc_.js";
-
+import { A as getFullAndNormalizedURL, B as isFunction, H as isString, M as handleConfigValidation, N as handleSchemaValidation, P as HTTPError, R as isArray, V as isReadableStream, a as getBody, c as getMethod, d as splitBaseConfig, f as splitConfig, g as isHTTPErrorInstance, i as createTimeoutSignal, j as getCurrentRouteSchemaKeyAndMainInitURL, l as getResolvedHeaders, o as getFetchImpl, p as waitUntil, r as createCombinedSignal, s as getHeaders, t as extraOptionDefaults, u as omitKeys, y as isValidationErrorInstance, z as isBoolean } from "./defaults-B0Zvy-uW.js";
 //#region src/result.ts
 const getResponseType = (response, responseParser) => ({
 	arrayBuffer: () => response.arrayBuffer(),
@@ -109,7 +107,6 @@ const getCustomizedErrorResult = (errorResult, customErrorInfo) => {
 		}
 	};
 };
-
 //#endregion
 //#region src/hooks.ts
 const getHookRegistriesAndKeys = () => {
@@ -159,7 +156,6 @@ const executeHooksInCatchBlock = async (hookResultsOrPromise, hookInfo) => {
 		return errorResult;
 	}
 };
-
 //#endregion
 //#region src/stream.ts
 const createProgressEvent = (options) => {
@@ -263,7 +259,6 @@ const toStreamableResponse = (context) => {
 	} });
 	return new Response(stream, response);
 };
-
 //#endregion
 //#region src/dedupe.ts
 const createDedupeStrategy = async (context) => {
@@ -284,8 +279,7 @@ const createDedupeStrategy = async (context) => {
 		if (!dedupeKey) return;
 		const dedupeCacheScope = globalOptions.dedupeCacheScope ?? extraOptionDefaults.dedupeCacheScope;
 		const dedupeCacheScopeKey = getDedupeCacheScopeKey();
-		if (dedupeCacheScope === "global" && !$GlobalRequestInfoCache.has(dedupeCacheScopeKey)) $GlobalRequestInfoCache.set(dedupeCacheScopeKey, /* @__PURE__ */ new Map());
-		const $RequestInfoCache = dedupeCacheScope === "global" ? $GlobalRequestInfoCache.get(dedupeCacheScopeKey) : $LocalRequestInfoCache;
+		const $RequestInfoCache = dedupeCacheScope === "global" ? $GlobalRequestInfoCache.get(dedupeCacheScopeKey) ?? $GlobalRequestInfoCache.set(dedupeCacheScopeKey, /* @__PURE__ */ new Map()).get(dedupeCacheScopeKey) : $LocalRequestInfoCache;
 		return {
 			delete: () => $RequestInfoCache?.delete(dedupeKey),
 			get: () => $RequestInfoCache?.get(dedupeKey),
@@ -317,7 +311,7 @@ const createDedupeStrategy = async (context) => {
 	* simultaneously (same problem as microtasks). Any non-zero value (even 0.0000000001) forces
 	* proper sequential task queue scheduling, ensuring each request gets its own task slot.
 	*/
-	if (dedupeKey !== null) await waitFor(.001);
+	if (dedupeKey !== null) await waitUntil(.01);
 	const prevRequestInfo = $RequestInfoCache?.get();
 	const getAbortErrorMessage = () => {
 		if (globalOptions.dedupeKey) return `Duplicate request detected - Aborted previous request with key '${dedupeKey}'`;
@@ -360,7 +354,6 @@ const createDedupeStrategy = async (context) => {
 		resolvedDedupeStrategy
 	};
 };
-
 //#endregion
 //#region src/middlewares.ts
 const getMiddlewareRegistriesAndKeys = () => {
@@ -389,7 +382,6 @@ const composeMiddlewaresFromArray = (middlewareArray) => {
 	}
 	return composedMiddleware;
 };
-
 //#endregion
 //#region src/plugins.ts
 const getResolvedPlugins = (context) => {
@@ -397,30 +389,16 @@ const getResolvedPlugins = (context) => {
 	return isFunction(options.plugins) ? options.plugins({ basePlugins: baseConfig.plugins ?? [] }) : options.plugins ?? [];
 };
 const initializePlugins = async (setupContext) => {
-	const { baseConfig, config, initURL, options, request } = setupContext;
+	const { baseConfig, config, currentRouteSchemaKey, mainInitURL, options, request } = setupContext;
 	const { addMainHooks, addMainMiddlewares, addPluginHooks, addPluginMiddlewares, getResolvedHooks, getResolvedMiddlewares } = setupHooksAndMiddlewares({
 		baseConfig,
 		config,
 		options
 	});
-	const initURLResult = getCurrentRouteSchemaKeyAndMainInitURL({
-		baseExtraOptions: baseConfig,
-		extraOptions: config,
-		initURL
-	});
-	let resolvedCurrentRouteSchemaKey = initURLResult.currentRouteSchemaKey;
-	let resolvedInitURL = initURLResult.mainInitURL;
+	let resolvedCurrentRouteSchemaKey = currentRouteSchemaKey;
+	let resolvedInitURL = mainInitURL;
 	const resolvedOptions = options;
-	const resolvedRequest = Object.assign(request, {
-		headers: getResolvedHeaders({
-			baseHeaders: baseConfig.headers,
-			headers: config.headers
-		}),
-		method: getMethod({
-			initURL: resolvedInitURL,
-			method: request.method
-		})
-	});
+	const resolvedRequest = request;
 	const executePluginSetupFn = async (pluginSetup) => {
 		if (!pluginSetup) return;
 		const initResult = await pluginSetup(setupContext);
@@ -527,7 +505,27 @@ const setupHooksAndMiddlewares = (context) => {
 		getResolvedMiddlewares
 	};
 };
-
+//#endregion
+//#region src/refetch.ts
+const createRefetchManager = (ctx) => {
+	const { callApi, callApiArgs, options } = ctx;
+	const currentRefetchCount = options["~refetchCount"] ?? 1;
+	const refetch = async (refetchOptionOverrides) => {
+		const maxRefetchAttempts = refetchOptionOverrides?.refetchAttempts ?? options.refetchAttempts ?? extraOptionDefaults.refetchAttempts;
+		if (!(currentRefetchCount <= maxRefetchAttempts)) {
+			const message = `Maximum refetch attempts (${maxRefetchAttempts}) exceeded. This prevents infinite loops. Increase 'maxRefetchAttempts' if needed.`;
+			console.error(message);
+			return null;
+		}
+		const updatedConfig = {
+			...callApiArgs.config,
+			...refetchOptionOverrides,
+			"~refetchCount": currentRefetchCount + 1
+		};
+		return callApi(callApiArgs.initURL, updatedConfig);
+	};
+	return { refetch };
+};
 //#endregion
 //#region src/retry.ts
 const getLinearDelay = (currentAttemptCount, options) => {
@@ -556,9 +554,9 @@ const createRetryManager = (ctx) => {
 	const shouldAttemptRetry = async () => {
 		if (isBoolean(request.signal) && request.signal.aborted) return false;
 		const retryCondition = options.retryCondition ?? extraOptionDefaults.retryCondition;
-		const maximumRetryAttempts = options.retryAttempts ?? extraOptionDefaults.retryAttempts;
+		const maxRetryAttempts = options.retryAttempts ?? extraOptionDefaults.retryAttempts;
 		const customRetryCondition = await retryCondition(errorContext);
-		if (!(currentAttemptCount <= maximumRetryAttempts && customRetryCondition)) return false;
+		if (!(currentAttemptCount <= maxRetryAttempts && customRetryCondition)) return false;
 		const retryMethods = new Set(options.retryMethods ?? extraOptionDefaults.retryMethods);
 		const includesMethod = isString(request.method) && retryMethods.size > 0 ? retryMethods.has(request.method) : true;
 		const retryStatusCodes = new Set(options.retryStatusCodes ?? extraOptionDefaults.retryStatusCodes);
@@ -572,7 +570,7 @@ const createRetryManager = (ctx) => {
 		};
 		const hookError = await executeHooksInCatchBlock([options.onRetry?.(retryContext)], hookInfo);
 		if (hookError) return hookError;
-		await waitFor(getDelay());
+		await waitUntil(getDelay());
 		const updatedConfig = {
 			...callApiArgs.config,
 			"~retryAttemptCount": currentAttemptCount + 1
@@ -586,7 +584,6 @@ const createRetryManager = (ctx) => {
 	};
 	return { handleRetryOrGetErrorResult };
 };
-
 //#endregion
 //#region src/createFetchClient.ts
 const $GlobalRequestInfoCache = /* @__PURE__ */ new Map();
@@ -612,12 +609,27 @@ const createFetchClientWithContext = () => {
 				...baseFetchOptions,
 				...!shouldSkipAutoMergeForRequest && fetchOptions
 			};
+			const initURLResult = getCurrentRouteSchemaKeyAndMainInitURL({
+				baseExtraOptions: baseConfig,
+				extraOptions: config,
+				initURL: initURL.toString()
+			});
 			const { resolvedCurrentRouteSchemaKey, resolvedHooks, resolvedInitURL, resolvedMiddlewares, resolvedOptions, resolvedRequest } = await initializePlugins({
 				baseConfig,
 				config,
-				initURL: initURL.toString(),
+				...initURLResult,
 				options: mergedExtraOptions,
-				request: mergedRequestOptions
+				request: {
+					...mergedRequestOptions,
+					headers: getResolvedHeaders({
+						baseHeaders: baseConfig.headers,
+						headers: config.headers
+					}),
+					method: getMethod({
+						initURL: initURLResult.initURL,
+						method: mergedRequestOptions.method
+					})
+				}
 			});
 			const { fullURL, normalizedInitURL } = getFullAndNormalizedURL({
 				baseURL: resolvedOptions.baseURL,
@@ -625,7 +637,7 @@ const createFetchClientWithContext = () => {
 				params: resolvedOptions.params,
 				query: resolvedOptions.query
 			});
-			const options = {
+			const initOptions = {
 				...resolvedOptions,
 				...resolvedHooks,
 				...resolvedMiddlewares,
@@ -633,6 +645,18 @@ const createFetchClientWithContext = () => {
 				initURL: resolvedInitURL,
 				initURLNormalized: normalizedInitURL
 			};
+			const { refetch } = createRefetchManager({
+				callApi,
+				callApiArgs: {
+					config,
+					initURL
+				},
+				options: initOptions
+			});
+			const options = {
+				...initOptions,
+				refetch
+			};
 			const newFetchController = new AbortController();
 			const combinedSignal = createCombinedSignal(createTimeoutSignal(options.timeout), resolvedRequest.signal, newFetchController.signal);
 			const request = {
@@ -664,7 +688,7 @@ const createFetchClientWithContext = () => {
 					request
 				});
 				Object.assign(options, extraOptionsValidationResult);
-				Object.assign(request, {
+				const modifiedRequestOptionsValidationResult = {
 					body: getBody({
 						body: requestOptionsValidationResult.body,
 						bodySerializer: options.bodySerializer,
@@ -679,7 +703,8 @@ const createFetchClientWithContext = () => {
 						initURL: resolvedInitURL,
 						method: requestOptionsValidationResult.method
 					})
-				});
+				};
+				Object.assign(request, modifiedRequestOptionsValidationResult);
 				const readyRequestContext = {
 					baseConfig,
 					config,
@@ -804,7 +829,7 @@ const createFetchClientWithContext = () => {
 };
 const createFetchClient = createFetchClientWithContext();
 const callApi = createFetchClient();
-
 //#endregion
 export { callApi, createFetchClient, createFetchClientWithContext };
+
 //# sourceMappingURL=index.js.map