create-request 0.0.1-beta.5 → 0.0.1-beta.7

package/dist/library/index.js

@@ -127,73 +127,440 @@
      */
     class ResponseWrapper {
         constructor(response) {
+            this.bodyUsed = false;
             this.response = response;
-            this.ok = response.status >= 200 && response.status < 300; // Standard Fetch API behavior
         }
-        /**
-         * Get the raw Response object
-         */
-        get raw() {
-            return this.response;
-        }
-        /**
-         * Get the HTTP status code
-         */
+        // Wrapper properties
         get status() {
             return this.response.status;
         }
-        /**
-         * Get the HTTP status text
-         */
         get statusText() {
             return this.response.statusText;
         }
-        /**
-         * Get response headers
-         */
         get headers() {
             return this.response.headers;
         }
+        get ok() {
+            return this.response.ok;
+        }
+        get raw() {
+            return this.response;
+        }
+        // Response body methods with caching
+        async getJson() {
+            if (this.jsonCache !== undefined) {
+                return this.jsonCache;
+            }
+            if (this.bodyUsed) {
+                // If we already have text, try to parse it as JSON
+                if (this.textCache !== undefined) {
+                    try {
+                        // Fix unsafe assignment by explicitly casting to unknown first
+                        this.jsonCache = JSON.parse(this.textCache);
+                        return this.jsonCache;
+                    }
+                    catch (e) {
+                        throw new Error("Cannot parse cached text as JSON");
+                    }
+                }
+                throw new Error("Response body has already been consumed in a different format");
+            }
+            this.bodyUsed = true;
+            this.jsonCache = (await this.response.json());
+            return this.jsonCache;
+        }
+        async getText() {
+            if (this.textCache !== undefined) {
+                return this.textCache;
+            }
+            if (this.bodyUsed) {
+                // If we already have JSON, convert it to text
+                if (this.jsonCache !== undefined) {
+                    this.textCache = JSON.stringify(this.jsonCache);
+                    return this.textCache;
+                }
+                // If we have blob, convert to text
+                if (this.blobCache !== undefined) {
+                    this.textCache = await this.blobCache.text();
+                    return this.textCache;
+                }
+                throw new Error("Response body has already been consumed in a format that cannot be converted to text");
+            }
+            this.bodyUsed = true;
+            this.textCache = await this.response.text();
+            return this.textCache;
+        }
+        async getBlob() {
+            if (this.blobCache !== undefined) {
+                return this.blobCache;
+            }
+            if (this.bodyUsed) {
+                // If we have text, convert to Blob
+                if (this.textCache !== undefined) {
+                    this.blobCache = new Blob([this.textCache], { type: "text/plain" });
+                    return this.blobCache;
+                }
+                throw new Error("Response body has already been consumed in a format that cannot be converted to Blob");
+            }
+            this.bodyUsed = true;
+            this.blobCache = await this.response.blob();
+            return this.blobCache;
+        }
+        async getArrayBuffer() {
+            if (this.arrayBufferCache !== undefined) {
+                return this.arrayBufferCache;
+            }
+            if (this.bodyUsed) {
+                // If we have text, convert to ArrayBuffer
+                if (this.textCache !== undefined) {
+                    const encoder = new TextEncoder();
+                    // Fix ArrayBufferLike by explicitly casting to ArrayBuffer
+                    const uint8Array = encoder.encode(this.textCache);
+                    this.arrayBufferCache = uint8Array.buffer;
+                    return this.arrayBufferCache;
+                }
+                // If we have blob, convert to ArrayBuffer
+                if (this.blobCache !== undefined) {
+                    this.arrayBufferCache = await this.blobCache.arrayBuffer();
+                    return this.arrayBufferCache;
+                }
+                throw new Error("Response body has already been consumed in a format that cannot be converted to ArrayBuffer");
+            }
+            this.bodyUsed = true;
+            this.arrayBufferCache = await this.response.arrayBuffer();
+            return this.arrayBufferCache;
+        }
+        getBody() {
+            if (this.bodyUsed) {
+                throw new Error("Response body has already been consumed");
+            }
+            this.bodyUsed = true;
+            return this.response.body;
+        }
+    }
+
+    /**
+     * Parse size strings like "10MB" into bytes
+     * @param size Size as number or string with units
+     */
+    function parseSize(size) {
+        var _a;
+        if (typeof size === "number")
+            return size;
+        const match = size.match(/^(\d+(?:\.\d+)?)\s*(KB|MB|GB)?$/i);
+        if (!match)
+            return 0;
+        const num = parseFloat(match[1]);
+        const unit = (_a = match[2]) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+        switch (unit) {
+            case "KB":
+                return num * 1024;
+            case "MB":
+                return num * 1024 * 1024;
+            case "GB":
+                return num * 1024 * 1024 * 1024;
+            default:
+                return num;
+        }
+    }
+    /**
+     * Create a memory storage provider using Map
+     */
+    function createMemoryStorage() {
+        const store = new Map();
+        return {
+            get(key) {
+                return store.get(key) || null;
+            },
+            set(key, value) {
+                store.set(key, value);
+            },
+            has(key) {
+                return store.has(key);
+            },
+            delete(key) {
+                store.delete(key);
+            },
+            clear() {
+                store.clear();
+            },
+        };
+    }
+    /**
+     * Create a localStorage-based storage provider
+     */
+    function createLocalStorageStorage() {
+        return {
+            get(key) {
+                if (typeof localStorage === "undefined")
+                    return null;
+                return localStorage.getItem(key);
+            },
+            set(key, value) {
+                if (typeof localStorage === "undefined")
+                    return;
+                try {
+                    localStorage.setItem(key, value);
+                }
+                catch (e) {
+                    // Handle quota exceeded errors
+                    console.warn("Cache storage quota exceeded, clearing cache");
+                    void this.clear();
+                    try {
+                        localStorage.setItem(key, value);
+                    }
+                    catch (e) {
+                        console.error("Failed to set cache item even after clearing cache");
+                    }
+                }
+            },
+            has(key) {
+                if (typeof localStorage === "undefined")
+                    return false;
+                return localStorage.getItem(key) !== null;
+            },
+            delete(key) {
+                if (typeof localStorage === "undefined")
+                    return;
+                localStorage.removeItem(key);
+            },
+            clear() {
+                if (typeof localStorage === "undefined")
+                    return;
+                localStorage.clear();
+            },
+        };
+    }
+    /**
+     * Create a sessionStorage-based storage provider
+     */
+    function createSessionStorageStorage() {
+        return {
+            get(key) {
+                if (typeof sessionStorage === "undefined")
+                    return null;
+                return sessionStorage.getItem(key);
+            },
+            set(key, value) {
+                if (typeof sessionStorage === "undefined")
+                    return;
+                try {
+                    sessionStorage.setItem(key, value);
+                }
+                catch (e) {
+                    // Handle quota exceeded errors
+                    console.warn("Cache storage quota exceeded, clearing cache");
+                    void this.clear();
+                    try {
+                        sessionStorage.setItem(key, value);
+                    }
+                    catch (e) {
+                        console.error("Failed to set cache item even after clearing cache");
+                    }
+                }
+            },
+            has(key) {
+                if (typeof sessionStorage === "undefined")
+                    return false;
+                return sessionStorage.getItem(key) !== null;
+            },
+            delete(key) {
+                if (typeof sessionStorage === "undefined")
+                    return;
+                sessionStorage.removeItem(key);
+            },
+            clear() {
+                if (typeof sessionStorage === "undefined")
+                    return;
+                sessionStorage.clear();
+            },
+        };
+    }
+    /**
+     * Create a storage provider from a cache options object
+     */
+    function createStorageProvider(options) {
+        const { storage } = options || {};
+        if (!storage) {
+            // Default to memory storage
+            return createMemoryStorage();
+        }
+        // Check if storage is already a StorageProvider
+        if (typeof storage.get === "function" && typeof storage.set === "function") {
+            return storage;
+        }
+        // Check if it's localStorage or sessionStorage
+        if (storage === localStorage) {
+            return createLocalStorageStorage();
+        }
+        if (storage === sessionStorage) {
+            return createSessionStorageStorage();
+        }
+        // Check if it's a Map
+        if (storage instanceof Map) {
+            return {
+                get(key) {
+                    return storage.get(key) || null;
+                },
+                set(key, value, _ttl) {
+                    storage.set(key, value);
+                },
+                has(key) {
+                    return storage.has(key);
+                },
+                delete(key) {
+                    storage.delete(key);
+                },
+                clear() {
+                    storage.clear();
+                },
+            };
+        }
+        // Default to memory storage
+        console.warn("Unsupported storage type, falling back to memory storage");
+        return createMemoryStorage();
+    }
+
+    /**
+     * Cache manager that handles storage operations
+     */
+    class CacheManager {
+        constructor(options = {}) {
+            this.entryCount = 0;
+            this.totalSize = 0;
+            this.options = options;
+            this.storage = createStorageProvider(options);
+        }
         /**
-         * Parse response as JSON
+         * Generate a cache key based on request details
          */
-        async getJson() {
-            return this.response.json();
+        generateKey(url, method, headers, body) {
+            // Use custom key generator if provided
+            if (this.options.keyGenerator) {
+                const customKey = this.options.keyGenerator(url, method, headers, body);
+                return this.options.keyPrefix ? `${this.options.keyPrefix}:${customKey}` : customKey;
+            }
+            // Default key generation
+            let key = `${method}:${url}`;
+            // Add vary headers to key if specified
+            if (this.options.varyByHeaders && headers) {
+                const varyHeaders = {};
+                this.options.varyByHeaders.forEach(header => {
+                    const normalizedHeader = header.toLowerCase();
+                    // Find the header in case-insensitive way
+                    Object.keys(headers).forEach(h => {
+                        if (h.toLowerCase() === normalizedHeader) {
+                            varyHeaders[normalizedHeader] = headers[h];
+                        }
+                    });
+                });
+                if (Object.keys(varyHeaders).length > 0) {
+                    key += `:${JSON.stringify(varyHeaders)}`;
+                }
+            }
+            // Include body in cache key for non-GET requests if it's a simple value
+            if (method !== "GET" && body !== undefined && body !== null) {
+                try {
+                    if (typeof body === "string" || typeof body === "number" || typeof body === "boolean") {
+                        key += `:${String(body)}`;
+                    }
+                    else if (typeof body === "object") {
+                        key += `:${JSON.stringify(body)}`;
+                    }
+                }
+                catch (e) {
+                    console.warn("Failed to stringify request body for cache key");
+                }
+            }
+            // Add prefix if specified
+            return this.options.keyPrefix ? `${this.options.keyPrefix}:${key}` : key;
         }
         /**
-         * Get response as text
+         * Get a value from cache
          */
-        async getText() {
-            return this.response.text();
+        async get(key) {
+            const value = await Promise.resolve(this.storage.get(key));
+            if (!value)
+                return null;
+            try {
+                const entry = JSON.parse(value);
+                // Check if the entry has expired
+                if (entry.expiry && entry.expiry < Date.now()) {
+                    await Promise.resolve(this.storage.delete(key));
+                    return null;
+                }
+                return entry;
+            }
+            catch (e) {
+                // If we can't parse the cached value, remove it
+                await Promise.resolve(this.storage.delete(key));
+                return null;
+            }
         }
         /**
-         * Get response as Blob
+         * Set a value in cache
          */
-        async getBlob() {
-            return this.response.blob();
+        async set(key, value, headers) {
+            const now = Date.now();
+            const ttl = this.options.ttl;
+            const entry = {
+                value,
+                timestamp: now,
+                expiry: ttl ? now + ttl : null,
+                headers,
+            };
+            const serialized = JSON.stringify(entry);
+            // Check size constraints if applicable
+            if (this.options.maxSize) {
+                const maxBytes = parseSize(this.options.maxSize);
+                const entrySize = new TextEncoder().encode(serialized).length;
+                // If a single entry exceeds the max size, reject it without clearing the cache
+                if (entrySize > maxBytes) {
+                    console.warn(`Cache entry size (${entrySize} bytes) exceeds maximum cache size (${maxBytes} bytes)`);
+                    return;
+                }
+                // Only clear if adding this entry would exceed the total limit
+                if (this.totalSize + entrySize > maxBytes) {
+                    // Simple strategy: clear everything
+                    // A more sophisticated strategy would remove oldest entries first
+                    await Promise.resolve(this.storage.clear());
+                    this.totalSize = 0;
+                    this.entryCount = 0;
+                }
+                this.totalSize += entrySize;
+            }
+            // Check max entries constraint
+            if (this.options.maxEntries) {
+                this.entryCount++;
+                if (this.entryCount > this.options.maxEntries) {
+                    // Simple strategy: clear everything
+                    // A more sophisticated strategy would use LRU cache
+                    await Promise.resolve(this.storage.clear());
+                    this.entryCount = 1;
+                }
+            }
+            // Pass ttl to storage provider if available
+            await Promise.resolve(this.storage.set(key, serialized, ttl));
         }
         /**
-         * Get response as ArrayBuffer
+         * Check if a key exists in the cache
          */
-        async getArrayBuffer() {
-            return this.response.arrayBuffer();
-        }
-        /**
-         * Get response as ReadableStream for true streaming consumption.
-         * This allows you to process data incrementally as it arrives.
-         *
-         * @example
-         * const stream = await request.sendTo('https://example.com/large-file').getBody();
-         * const reader = stream.getReader();
-         *
-         * while (true) {
-         *   const { done, value } = await reader.read();
-         *   if (done) break;
-         *   // Process chunk of data in 'value'
-         * }
+        async has(key) {
+            return Promise.resolve(this.storage.has(key));
+        }
+        /**
+         * Delete a key from the cache
          */
-        getBody() {
-            return this.response.body;
+        async delete(key) {
+            return Promise.resolve(this.storage.delete(key));
+        }
+        /**
+         * Clear the entire cache
+         */
+        async clear() {
+            this.entryCount = 0;
+            this.totalSize = 0;
+            return Promise.resolve(this.storage.clear());
         }
     }
 
@@ -298,15 +665,15 @@
             return this.enableAntiCsrf;
         }
         /**
-         * Reset configuration to defaults
+         * Reset all configuration options to their defaults
          */
         reset() {
             this.csrfToken = null;
             this.csrfHeaderName = "X-CSRF-Token";
+            this.enableAntiCsrf = true;
             this.xsrfCookieName = "XSRF-TOKEN";
             this.xsrfHeaderName = "X-XSRF-TOKEN";
             this.enableAutoXsrf = true;
-            this.enableAntiCsrf = true;
             return this;
         }
     }
@@ -371,12 +738,34 @@
         }
         /**
          * Validates if the provided string is a potential CSRF token
-         * Checks if the token meets minimum security requirements (non-empty, not too short)
+         * Checks if the token meets security requirements
          * @param token The token to validate
-         * @returns Whether the token is potentially valid
+         * @returns Whether the token is valid
          */
         static isValidToken(token) {
-            return typeof token === "string" && token.length >= 8;
+            // Basic checks for null/undefined and type
+            if (typeof token !== "string") {
+                return false;
+            }
+            if (token.length < 8)
+                return false;
+            // If token is longer than 10 chars, perform additional security checks
+            if (token.length > 10) {
+                // Check for valid character set (alphanumeric & common token symbols)
+                const validTokenRegex = /^[A-Za-z0-9\-_=+/.]+$/;
+                if (!validTokenRegex.test(token)) {
+                    return false;
+                }
+                // For longer tokens, check for sufficient entropy (at least 2 character types)
+                const hasUpperCase = /[A-Z]/.test(token);
+                const hasLowerCase = /[a-z]/.test(token);
+                const hasNumbers = /[0-9]/.test(token);
+                const hasSpecials = /[-_=+/.]/.test(token);
+                const characterTypesCount = [hasUpperCase, hasLowerCase, hasNumbers, hasSpecials].filter(Boolean).length;
+                return characterTypesCount >= 2;
+            }
+            // For shorter tokens (8-10 chars), just return true if we reached here
+            return true;
         }
     }
 
@@ -388,6 +777,7 @@
             };
             this.queryParams = new URLSearchParams();
             this.autoApplyCsrfProtection = true;
+            this.cacheEnabled = false;
         }
         withHeaders(headers) {
             this.requestOptions.headers = {
@@ -397,10 +787,14 @@
             return this;
         }
         withTimeout(timeout) {
+            if (!Number.isFinite(timeout) || timeout <= 0)
+                throw new Error("Timeout must be a positive number");
             this.requestOptions.timeout = timeout;
             return this;
         }
         withRetries(retries) {
+            if (!Number.isInteger(retries) || retries < 0)
+                throw new Error("Retry count must be a non-negative integer");
             this.requestOptions.retries = retries;
             return this;
         }
@@ -485,13 +879,16 @@
         /**
          * Adds a single query parameter
          * @param key - The parameter name
-         * @param value - The parameter value
+         * @param value - The parameter value, can be a single value or array of values
          * @returns The instance for chaining
          */
         withQueryParam(key, value) {
-            if (value !== null && value !== undefined) {
+            if (value === null || value === undefined)
+                return this;
+            if (Array.isArray(value))
+                value.forEach(v => this.queryParams.append(key, String(v)));
+            else
                 this.queryParams.append(key, String(value));
-            }
             return this;
         }
         /**
@@ -530,9 +927,23 @@
          * @returns The instance for chaining
          */
         withBasicAuth(username, password) {
-            const credentials = btoa(`${username}:${password}`);
+            const credentials = this.encodeBase64(`${username}:${password}`);
             return this.withAuthorization(`Basic ${credentials}`);
         }
+        /**
+         * Cross-environment base64 encoding
+         * Works in both browser and Node.js environments
+         */
+        encodeBase64(str) {
+            // Browser environment
+            if (typeof btoa === "function")
+                return btoa(str);
+            // Node.js environment
+            if (typeof Buffer !== "undefined")
+                return Buffer.from(str).toString("base64");
+            // Fallback (should never happen in modern environments)
+            throw new Error("Base64 encoding is not supported in this environment");
+        }
         /**
          * Sets the bearer token for authentication
          * @param token - The bearer token
@@ -541,6 +952,15 @@
         withBearerToken(token) {
             return this.withAuthorization(`Bearer ${token}`);
         }
+        /**
+         * Helper function to check for header presence in a case-insensitive way
+         * @param headers Headers object
+         * @param headerName Header name to check
+         * @returns Boolean indicating if the header exists (case-insensitive)
+         */
+        hasHeader(headers, headerName) {
+            return Object.keys(headers).some(key => key.toLowerCase() === headerName.toLowerCase());
+        }
         /**
          * Sets cookies for the request
          * @param cookies Object containing cookie name-value pairs or cookie options
@@ -553,19 +973,34 @@
             }
             // Get current headers or initialize empty object
             const currentHeaders = this.requestOptions.headers || {};
-            // Get the existing cookie header in a case-insensitive way
-            let existingCookies = "";
-            const cookieHeaderName = Object.keys(currentHeaders).find(header => header.toLowerCase() === "cookie");
-            if (cookieHeaderName)
-                existingCookies = currentHeaders[cookieHeaderName];
+            // Get all existing cookie headers with different cases
+            const cookieValues = [];
+            const cookieHeaderKeys = [];
+            Object.keys(currentHeaders).forEach(key => {
+                if (key.toLowerCase() === "cookie") {
+                    // Don't add empty cookie values
+                    if (currentHeaders[key])
+                        cookieValues.push(currentHeaders[key]);
+                    cookieHeaderKeys.push(key);
+                }
+            });
+            // Format the new cookies
             const cookieString = CookieUtils.formatRequestCookies(cookies);
-            // Combine with existing cookies if present
-            const newCookieValue = existingCookies ? `${existingCookies}; ${cookieString}` : cookieString;
-            // Set the Cookie header, preserving original case if it exists
-            const headerName = cookieHeaderName || "Cookie";
-            return this.withHeaders({
-                [headerName]: newCookieValue,
+            // Choose which header name to use - preserve existing case if possible
+            const headerName = cookieHeaderKeys.length > 0 ? cookieHeaderKeys[0] : "Cookie";
+            // Combine all existing cookie values with the new ones
+            const combinedCookieValue = [...cookieValues, cookieString].filter(Boolean).join("; ");
+            // Create a new headers object without any cookie headers
+            const newHeaders = { ...currentHeaders };
+            cookieHeaderKeys.forEach(key => {
+                delete newHeaders[key];
             });
+            // Set the new combined cookie header
+            this.requestOptions.headers = {
+                ...newHeaders,
+                [headerName]: combinedCookieValue,
+            };
+            return this;
         }
         /**
          * Set a single cookie
@@ -605,6 +1040,16 @@
                 "X-Requested-With": "XMLHttpRequest",
             });
         }
+        /**
+         * Enables caching for the request with the specified options
+         * @param options The cache configuration options
+         * @returns The instance for chaining
+         */
+        withCache(options = {}) {
+            this.cacheEnabled = true;
+            this.cacheManager = new CacheManager(options);
+            return this;
+        }
         /**
          * Send the request to the specified URL
          * @param url The URL to send the request to
@@ -624,12 +1069,13 @@
                 // Apply global CSRF token if set
                 const globalToken = config.getCsrfToken();
                 if (globalToken) {
-                    // Check if local token exists
+                    // Check if local token exists using case-insensitive comparison
                     const headers = this.requestOptions.headers;
-                    const hasLocalToken = Object.keys(headers).some(key => key === "X-CSRF-Token" || key === config.getCsrfHeaderName());
+                    const csrfHeaderName = config.getCsrfHeaderName();
+                    const hasLocalToken = this.hasHeader(headers, "X-CSRF-Token") || this.hasHeader(headers, csrfHeaderName);
                     if (!hasLocalToken) {
                         this.withHeaders({
-                            [config.getCsrfHeaderName()]: globalToken,
+                            [csrfHeaderName]: globalToken,
                         });
                     }
                 }
@@ -638,10 +1084,11 @@
                     const xsrfToken = CsrfUtils.getTokenFromCookie(config.getXsrfCookieName());
                     if (xsrfToken && CsrfUtils.isValidToken(xsrfToken)) {
                         const headers = this.requestOptions.headers;
-                        const hasLocalToken = Object.keys(headers).some(key => key === "X-XSRF-TOKEN" || key === config.getXsrfHeaderName());
+                        const xsrfHeaderName = config.getXsrfHeaderName();
+                        const hasLocalToken = this.hasHeader(headers, "X-XSRF-TOKEN") || this.hasHeader(headers, xsrfHeaderName);
                         if (!hasLocalToken) {
                             this.withHeaders({
-                                [config.getXsrfHeaderName()]: xsrfToken,
+                                [xsrfHeaderName]: xsrfToken,
                             });
                         }
                     }
@@ -652,10 +1099,15 @@
                 ...this.requestOptions,
                 method: this.method,
             };
-            // Create the base promise
-            const basePromise = !this.requestOptions.retries
-                ? this.executeRequest(url, fetchOptions)
-                : this.executeWithRetries(url, fetchOptions);
+            // Create the base promise - handle caching if enabled
+            let basePromise;
+            if (this.cacheEnabled && this.cacheManager) {
+                const cacheKey = this.cacheManager.generateKey(url, this.method, this.requestOptions.headers, this.requestOptions.body);
+                basePromise = this.executeWithCache(url, fetchOptions, cacheKey);
+            }
+            else {
+                basePromise = !this.requestOptions.retries ? this.executeRequest(url, fetchOptions) : this.executeWithRetries(url, fetchOptions);
+            }
             const responsePromise = basePromise;
             // Attach convenience methods that begin processing immediately
             responsePromise.getJson = async () => {
@@ -684,12 +1136,21 @@
             if (!this.queryParams.toString()) {
                 return url;
             }
-            const urlObj = new URL(url);
-            // Merge our query params with any that might be in the URL already
-            this.queryParams.forEach((value, key) => {
-                urlObj.searchParams.append(key, value);
-            });
-            return urlObj.toString();
+            try {
+                // Try to use the URL constructor (works for absolute URLs)
+                const urlObj = new URL(url);
+                // Merge our query params with any that might be in the URL already
+                this.queryParams.forEach((value, key) => {
+                    urlObj.searchParams.append(key, value);
+                });
+                return urlObj.toString();
+            }
+            catch (error) {
+                // Handle relative URLs
+                const hasExistingParams = url.includes("?");
+                const separator = hasExistingParams ? "&" : "?";
+                return `${url}${separator}${this.queryParams.toString()}`;
+            }
         }
         /**
          * Executes a request with configured retry logic
@@ -700,38 +1161,65 @@
         async executeWithRetries(url, fetchOptions) {
             let attempt = 0;
             const maxRetries = this.requestOptions.retries || 0;
-            // eslint-disable-next-line no-constant-condition
-            while (true) {
+            do {
                 try {
                     return await this.executeRequest(url, fetchOptions);
                 }
                 catch (error) {
-                    const requestError = error instanceof RequestError
-                        ? error
-                        : RequestError.networkError(url, fetchOptions.method, error);
-                    if (attempt >= maxRetries || requestError.timeoutError) {
+                    const requestError = error instanceof RequestError ? error : RequestError.networkError(url, fetchOptions.method, error);
+                    // Don't retry on timeout errors or if we've reached the max retries
+                    if (attempt >= maxRetries || requestError.timeoutError)
                         throw requestError;
-                    }
                     attempt++;
                     if (this.requestOptions.onRetry) {
                         await this.requestOptions.onRetry({ attempt, error: requestError });
                     }
                 }
-            }
+            } while (attempt <= maxRetries);
+            // If we somehow get here, we throw an error to avoid undefined behavior
+            throw new RequestError(`Max retries reached (${maxRetries}) but request still failed`, url, fetchOptions.method);
         }
         async executeRequest(url, fetchOptions) {
             // Create a request controller for timeout if needed, or use the provided one
             const controller = this.abortController || new AbortController();
             const { signal } = controller;
             // Use the controller signal for the fetch request, but don't overwrite an existing signal
-            // that might have been set in requestOptions if it exists
             fetchOptions.signal = fetchOptions.signal || signal;
             let timeoutId;
-            // If we have a timeout and we're using our own controller (not provided externally)
-            if (this.requestOptions.timeout && !this.abortController) {
-                timeoutId = setTimeout(() => {
-                    controller.abort();
-                }, this.requestOptions.timeout);
+            // Flag to track if abort was caused by our timeout
+            let abortedByTimeout = false;
+            // Handle timeout regardless of whether an external controller is provided
+            if (this.requestOptions.timeout) {
+                if (this.abortController) {
+                    // If we have an external controller, create a separate timeout controller
+                    // that won't interfere with the external one
+                    // Use AbortSignal.timeout if available (modern browsers)
+                    if (typeof AbortSignal.timeout === "function") {
+                        const timeoutSignal = AbortSignal.timeout(this.requestOptions.timeout);
+                        // Add event listener to propagate the abort to the main controller
+                        timeoutSignal.addEventListener("abort", () => {
+                            if (!controller.signal.aborted) {
+                                abortedByTimeout = true;
+                                controller.abort();
+                            }
+                        });
+                    }
+                    else {
+                        // Fallback for browsers without AbortSignal.timeout
+                        timeoutId = setTimeout(() => {
+                            if (!controller.signal.aborted) {
+                                abortedByTimeout = true;
+                                controller.abort();
+                            }
+                        }, this.requestOptions.timeout);
+                    }
+                }
+                else {
+                    timeoutId = setTimeout(() => {
+                        abortedByTimeout = true;
+                        controller.abort();
+                    }, this.requestOptions.timeout);
+                }
             }
             try {
                 let response;
@@ -739,11 +1227,11 @@
                     response = await fetch(url, fetchOptions);
                 }
                 catch (error) {
-                    // Check if this is an abort error from our timeout
-                    if (error instanceof DOMException && error.name === "AbortError" && timeoutId) {
+                    // Check if this is an abort error that was specifically caused by our timeout
+                    if (error instanceof DOMException && error.name === "AbortError" && abortedByTimeout) {
                         throw RequestError.timeout(url, fetchOptions.method, this.requestOptions.timeout);
                     }
-                    // Otherwise it's a network error
+                    // Otherwise it's either a user-triggered abort or another network error
                     throw RequestError.networkError(url, fetchOptions.method, error);
                 }
                 if (!response.ok) {
@@ -758,23 +1246,60 @@
                 }
             }
         }
+        /**
+         * Executes a request using cache when possible
+         * @param url The formatted URL to send the request to
+         * @param fetchOptions The fetch options to use
+         * @param cacheKey The cache key for this request
+         */
+        async executeWithCache(url, fetchOptions, cacheKey) {
+            // Try to get from cache first
+            if (this.cacheManager) {
+                const cachedEntry = await this.cacheManager.get(cacheKey);
+                if (cachedEntry) {
+                    // Create a synthetic Response object from cached data
+                    const cachedResponse = new Response(JSON.stringify(cachedEntry.value), {
+                        status: 200,
+                        headers: new Headers(cachedEntry.headers || {}),
+                    });
+                    return new ResponseWrapper(cachedResponse);
+                }
+            }
+            // Not in cache, make the actual request
+            const response = await (!this.requestOptions.retries ? this.executeRequest(url, fetchOptions) : this.executeWithRetries(url, fetchOptions));
+            // Cache the successful response if caching is enabled
+            // Only cache successful responses
+            if (response.ok && this.cacheManager) {
+                // Clone the response so we don't consume it
+                try {
+                    const responseData = await response.getJson();
+                    // Extract headers to store in cache
+                    const headers = {};
+                    response.headers.forEach((value, key) => {
+                        headers[key] = value;
+                    });
+                    // Store in cache
+                    await this.cacheManager.set(cacheKey, responseData, headers);
+                }
+                catch (error) {
+                    // Failed to cache, but we can still return the response
+                    console.warn("Failed to cache response:", error);
+                }
+            }
+            return response;
+        }
     }
 
     /**
      * Base class for requests that can have a body (POST, PUT, PATCH)
      */
     class BodyRequest extends BaseRequest {
-        constructor() {
-            super(...arguments);
-            this.bodyProcessed = false;
-        }
         /**
          * Sets the body of the request
          * @param body - The request body
          */
         withBody(body) {
             this.body = body;
-            this.bodyProcessed = false;
             // Set body type and validate
             if (typeof body === "string") {
                 this.bodyType = BodyType.STRING;
@@ -782,11 +1307,7 @@
             }
             else if (body !== null &&
                 typeof body === "object" &&
-                !(body instanceof FormData ||
-                    body instanceof Blob ||
-                    body instanceof ArrayBuffer ||
-                    body instanceof URLSearchParams ||
-                    body instanceof ReadableStream)) {
+                !(body instanceof FormData || body instanceof Blob || body instanceof ArrayBuffer || body instanceof URLSearchParams || body instanceof ReadableStream)) {
                 this.bodyType = BodyType.JSON;
                 this.setContentTypeIfNeeded("application/json");
                 // Validate JSON is stringifiable early
@@ -814,15 +1335,17 @@
          * Overrides the base implementation to add body handling
          */
         sendTo(url) {
-            // Process body only once
-            if (!this.bodyProcessed && this.body !== undefined && !this.requestOptions.body) {
+            if (this.body !== undefined) {
+                // Remove previous body if it exists
+                if (this.requestOptions.body)
+                    delete this.requestOptions.body;
+                // Process the body based on its type
                 if (this.bodyType === BodyType.JSON) {
                     this.requestOptions.body = JSON.stringify(this.body);
                 }
                 else {
                     this.requestOptions.body = this.body;
                 }
-                this.bodyProcessed = true;
             }
             return super.sendTo(url);
         }
@@ -930,6 +1453,7 @@
         config: Config.getInstance(),
     };
 
+    exports.CacheManager = CacheManager;
     exports.CookieUtils = CookieUtils;
     exports.DeleteRequest = DeleteRequest;
     exports.GetRequest = GetRequest;
@@ -940,6 +1464,9 @@
     exports.PutRequest = PutRequest;
     exports.RequestError = RequestError;
     exports.ResponseWrapper = ResponseWrapper;
+    exports.createLocalStorageStorage = createLocalStorageStorage;
+    exports.createMemoryStorage = createMemoryStorage;
+    exports.createSessionStorageStorage = createSessionStorageStorage;
     exports["default"] = create;
 
     Object.defineProperty(exports, '__esModule', { value: true });