@enegalan/request-manager 1.0.10 → 1.1.1

package/main.js

@@ -96,15 +96,14 @@ class RequestManager {
      * @returns {Promise} A Promise that resolves/rejects based on the most recent request
      * @example
      * // Request with Promise
-     * requestManager.request('/api/users', axios.get('/api/users', { cancelToken: axios.CancelToken.source().token }));
+     * requestManager.request('/api/users', axios.get('/api/users'));
      * @example
      * // Request with Function
      * requestManager.request('/api/users', ({ options }) => fetch('/api/users', { signal: options.signal, ...options }));
      * @example
      * // Request with Promise and custom cancellation grouping with requestKey
      * const options = {
-     *   requestKey: 'get-users',
-     *   cancelToken: axios.CancelToken.source().cancel
+     *   requestKey: 'get-users'
      * }
      * requestManager.request('/api/users', axios.get('/api/users', options), options);
      */
@@ -165,12 +164,12 @@ class RequestManager {
      */
     axios(url, options = {}, axiosInstance = null) {
         const axiosLib = axiosInstance || axios;
-        const cancelToken = axiosLib.CancelToken.source();
-        const requestId = this.getRequestId(url, options);
-        return this.#_request(requestId, axiosLib({ url, cancelToken: cancelToken.token, ...options }), {
-            cancelToken: cancelToken,
-            ...options,
-        });
+        this.#_checkAxiosVersion(axiosLib);
+        return this.#_request(
+            this.getRequestId(url, options),
+            ({ options: requestOptions }) => axiosLib({ url, ...requestOptions }),
+            options
+        );
     }
 
     /**
@@ -239,14 +238,13 @@ class RequestManager {
                         let response = xhr.response;
                         if (
                             options.responseType === 'json' ||
-                            (xhr.getResponseHeader('Content-Type') &&
-                                xhr.getResponseHeader('Content-Type').includes('application/json'))
+                            ((!options.responseType || options.responseType === 'text') &&
+                                xhr.getResponseHeader('Content-Type')?.includes('application/json') &&
+                                typeof response === 'string')
                         ) {
                             try {
-                                response = JSON.parse(xhr.responseText);
-                            } catch {
-                                response = xhr.responseText;
-                            }
+                                response = JSON.parse(response);
+                            } catch {}
                         }
                         resolve({
                             data: response,
@@ -338,7 +336,11 @@ class RequestManager {
         if (cleanedUrl.includes('://')) cleanedUrl = cleanedUrl.split('://')[1];
         if (cleanedUrl.includes('#')) cleanedUrl = cleanedUrl.split('#')[0];
         if (!options.includeQuery && cleanedUrl.includes('?')) cleanedUrl = cleanedUrl.split('?')[0];
-        return `${prefix}${cleanedUrl}`;
+
+        const methodPrefix =
+            options.includeMethod === false ? '' : `${(options.method || options.type || 'GET').toUpperCase()}_`;
+
+        return `${prefix}${methodPrefix}${cleanedUrl}`;
     }
 
     /**
@@ -456,6 +458,24 @@ class RequestManager {
         return requestOptions;
     }
 
+    /**
+     * Warns when the provided axios instance predates 0.22.0, the first version
+     * supporting AbortSignal cancellation. Older instances silently ignore
+     * options.signal, so duplicate requests would not be cancelled.
+     * @param {object} axiosLib - The axios instance about to be used
+     * @private
+     */
+    #_checkAxiosVersion(axiosLib) {
+        const version = typeof axiosLib?.VERSION === 'string' ? axiosLib.VERSION : null;
+        if (!version) return;
+        const [major, minor] = version.split('.').map(Number);
+        if (major === 0 && minor < 22) {
+            console.warn(
+                `[request-manager] axios >= 0.22.0 is required: axios ${version} ignores the AbortSignal used for automatic cancellation. Please upgrade axios.`
+            );
+        }
+    }
+
     /**
      * Deletes a request from the active requests map and rejects the wrapper promise
      * @param {string} requestId - The unique identifier of the request

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@enegalan/request-manager",
-    "version": "1.0.10",
+    "version": "1.1.1",
     "description": "JavaScript library for managing and regulating HTTP requests efficiently",
     "publishConfig": {
         "access": "public"
@@ -41,7 +41,9 @@
         "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage"
     },
     "devDependencies": {
+        "@babel/preset-env": "^7.29.7",
         "@eslint/js": "^10.0.1",
+        "@rollup/plugin-babel": "^6.1.0",
         "@rollup/plugin-terser": "^0.4.4",
         "eslint": "^10.8.1",
         "eslint-config-prettier": "^10.1.8",