fix(callapi,callapi-legacy): update version and improve request cance…

…llation messaging
zayne-labs · Nov 15, 2024 · 5fb5d44 · 5fb5d44
1 parent 4caa717
commit 5fb5d44
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/callapi-legacy/package.json b/packages/callapi-legacy/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@zayne-labs/callapi-legacy",
 	"type": "module",
-	"version": "1.0.0-rc.11",
+	"version": "1.0.0-rc.12",
 	"description": "A lightweight wrapper over fetch with quality of life improvements like built-in request cancellation, retries, interceptors and more",
 	"author": "Ryan Zayne",
 	"license": "MIT",

diff --git a/packages/callapi-legacy/src/createFetchClient.ts b/packages/callapi-legacy/src/createFetchClient.ts
@@ -182,9 +182,9 @@ export const createFetchClient = <
 		const prevRequestInfo = requestInfoCacheOrNull?.get(requestKey);
 
 		if (prevRequestInfo && options.dedupeStrategy === "cancel") {
-			const message = requestKey
+			const message = options.requestKey
 				? `Request aborted as another request with the same request key: '${requestKey}' was initiated while the current request was in progress.`
-				: `Request aborted as another request to the endpoint: '${url}', with the same request options was initiated while the current request was in progress.`;
+				: `Request aborted as another request to the endpoint: '${fullUrl}', with the same request options was initiated while the current request was in progress.`;
 
 			const reason = new DOMException(message, "AbortError");
 

diff --git a/packages/callapi/package.json b/packages/callapi/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@zayne-labs/callapi",
 	"type": "module",
-	"version": "1.0.0-rc.27",
+	"version": "1.0.0-rc.28",
 	"description": "A lightweight wrapper over fetch with quality of life improvements like built-in request cancellation, retries, interceptors and more",
 	"author": "Ryan Zayne",
 	"license": "MIT",

diff --git a/packages/callapi/src/createFetchClient.ts b/packages/callapi/src/createFetchClient.ts
@@ -182,9 +182,9 @@ export const createFetchClient = <
 		const prevRequestInfo = requestInfoCacheOrNull?.get(requestKey);
 
 		if (prevRequestInfo && options.dedupeStrategy === "cancel") {
-			const message = requestKey
+			const message = options.requestKey
 				? `Request aborted as another request with the same request key: '${requestKey}' was initiated while the current request was in progress.`
-				: `Request aborted as another request to the endpoint: '${url}', with the same request options was initiated while the current request was in progress.`;
+				: `Request aborted as another request to the endpoint: '${fullUrl}', with the same request options was initiated while the current request was in progress.`;
 
 			const reason = new DOMException(message, "AbortError");