@varlet/axle 1.1.0 → 1.1.1

package/dist/use.mjs

@@ -42,7 +42,7 @@ function createUseAxle(options) {
 		};
 		let controller = new AbortController();
 		let latestRunId = 0;
-		let cachedRequest;
+		let pendingCaches = [];
 		let pollingTimer = null;
 		let running = false;
 		let deactivated = false;
@@ -50,27 +50,24 @@ function createUseAxle(options) {
 		let unmounted = false;
 		const run = Object.assign(async (options = {}) => {
 			if (!runnable() || abortOnUnmount && unmounted) return;
-			if (abortPrevious && !isCachedRequestPending()) controller.abort();
-			if (abortPrevious) cachedRequest = void 0;
-			if (abortPrevious || controller.signal.aborted) controller = new AbortController();
+			if (abortPrevious && getPendingCaches().length === 0) controller.abort();
+			if (controller.signal.aborted) controller = new AbortController();
 			const runId = ++latestRunId;
 			const runController = controller;
 			running = true;
 			pollingCanceled.value = false;
-			if ((options.resetValue ?? initialResetValue ?? false) === true) resetValue(options);
-			uploadProgress.value = 0;
-			downloadProgress.value = 0;
-			const url = options.url ?? normalizeValueGetter(initialUrlOrGetter);
-			const params = options.params ?? normalizeValueGetter(initialParamsOrGetter);
-			const config = options.config ?? normalizeValueGetter(initialConfigOrGetter);
-			const normalizedCacheKey = cacheKey ? normalizeValueGetter(cacheKey) : void 0;
-			onBefore(refs);
-			loading.value = !options.silent;
+			clearPolling();
 			try {
+				if ((options.resetValue ?? initialResetValue ?? false) === true) resetValue(options);
+				uploadProgress.value = 0;
+				downloadProgress.value = 0;
+				const request = createRequest();
+				onBefore(refs);
+				if (!options.silent) loading.value = true;
 				cleanupCacheBuffer();
-				const response = await getResponse();
-				if (shouldSetCacheResponse(normalizedCacheKey)) {
-					const cache = cacheBuffer.get(normalizedCacheKey);
+				const response = await getResponse(request);
+				if (shouldSetCacheResponse(request.cacheKey)) {
+					const cache = cacheBuffer.get(request.cacheKey);
 					cache.response = response;
 					cache.expiredTime = Date.now() + cacheTime;
 				}
@@ -100,20 +97,29 @@ function createUseAxle(options) {
 			function isLatestRun() {
 				return !abortPrevious || runId === latestRunId;
 			}
-			function getResponse() {
+			function createRequest() {
+				return {
+					url: options.url ?? normalizeValueGetter(initialUrlOrGetter),
+					params: options.params ?? normalizeValueGetter(initialParamsOrGetter),
+					config: options.config ?? normalizeValueGetter(initialConfigOrGetter),
+					cacheKey: cacheKey ? normalizeValueGetter(cacheKey) : void 0
+				};
+			}
+			function getResponse(request) {
+				const { cacheKey: normalizedCacheKey } = request;
 				if (shouldUseCache(normalizedCacheKey)) return JSON.parse(JSON.stringify(cacheBuffer.get(normalizedCacheKey).response));
 				if (shouldAwaitCachePromise(normalizedCacheKey)) return cacheBuffer.get(normalizedCacheKey).promise;
-				const promise = fetchResponse();
+				const promise = fetchResponse(request);
 				if (shouldSetCachePromise(normalizedCacheKey)) {
 					cacheBuffer.set(normalizedCacheKey, { promise });
-					cachedRequest = {
+					pendingCaches = [...getPendingCaches(), {
 						key: normalizedCacheKey,
 						promise
-					};
+					}];
 				}
 				return promise;
 			}
-			function fetchResponse() {
+			function fetchResponse({ url, params, config }) {
 				return axle[method](url, params, {
 					signal: runController.signal,
 					onUploadProgress(event) {
@@ -209,13 +215,14 @@ function createUseAxle(options) {
 		}
 		function abort() {
 			controller.abort();
-			if (isCachedRequestPending()) cacheBuffer.delete(cachedRequest.key);
-			cachedRequest = void 0;
+			getPendingCaches().forEach(({ key }) => cacheBuffer.delete(key));
+			pendingCaches = [];
 		}
-		function isCachedRequestPending() {
-			if (!cachedRequest) return false;
-			const buffer = cacheBuffer.get(cachedRequest.key);
-			return buffer?.promise === cachedRequest.promise && buffer.response == null;
+		function getPendingCaches() {
+			return pendingCaches.filter(({ key, promise }) => {
+				const buffer = cacheBuffer.get(key);
+				return buffer?.promise === promise && buffer.response == null;
+			});
 		}
 		function addWindowFocusListener() {
 			if (typeof window !== "undefined") window.addEventListener("focus", handleWindowFocus);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/axle",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Progressive request tool based on axios",
   "keywords": [
     "axios",