fetchache 0.0.4 → 0.1.2

package/index.d.ts

@@ -1,15 +1,26 @@
-export declare function fetchache(request: Request, cache: KeyValueCache): Promise<Response>;
-export * from 'cross-fetch';
-export default fetchache;
-export interface KeyValueCacheSetOptions {
-    /**
-     * Specified in **seconds**, the time-to-live (TTL) value limits the lifespan
-     * of the data being stored in the cache.
-     */
-    ttl?: number | null;
-}
-export interface KeyValueCache<V = string> {
-    get(key: string): Promise<V | undefined>;
-    set(key: string, value: V, options?: KeyValueCacheSetOptions): Promise<void>;
-    delete(key: string): Promise<boolean | void>;
-}
+import CachePolicy from 'http-cache-semantics';
+export interface FetchacheCacheEntry {
+    policy: CachePolicy.CachePolicyObject;
+    body: string;
+}
+declare type FetchFn = WindowOrWorkerGlobalScope['fetch'];
+export interface FetchacheOptions {
+    fetch: FetchFn;
+    Request: typeof Request;
+    Response: typeof Response;
+    cache: KeyValueCache<FetchacheCacheEntry>;
+}
+export declare function fetchFactory({ fetch, Request, Response, cache }: FetchacheOptions): FetchFn;
+export interface KeyValueCacheSetOptions {
+    /**
+     * Specified in **seconds**, the time-to-live (TTL) value limits the lifespan
+     * of the data being stored in the cache.
+     */
+    ttl?: number | null;
+}
+export interface KeyValueCache<V = any> {
+    get(key: string): Promise<V | undefined>;
+    set(key: string, value: V, options?: KeyValueCacheSetOptions): Promise<void>;
+    delete(key: string): Promise<boolean | void>;
+}
+export {};

package/index.js

@@ -0,0 +1,108 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+const CachePolicy = _interopDefault(require('http-cache-semantics'));
+
+function fetchFactory({ fetch, Request, Response, cache }) {
+    return async (input, init) => {
+        let request;
+        if (input instanceof Request) {
+            request = input;
+        }
+        else {
+            request = new Request(input, init);
+        }
+        const cacheKey = request.url;
+        const entry = await cache.get(cacheKey);
+        if (!entry) {
+            const response = await fetch(request);
+            const policy = new CachePolicy(policyRequestFrom(request), policyResponseFrom(response));
+            return storeResponseAndReturnClone(cache, response, policy, cacheKey);
+        }
+        const { policy: policyRaw, bytes } = typeof entry === 'string' ? JSON.parse(entry) : entry;
+        const policy = CachePolicy.fromObject(policyRaw);
+        // Remove url from the policy, because otherwise it would never match a request with a custom cache key
+        policy._url = undefined;
+        const bodyInit = new Uint8Array(bytes);
+        if (policy.satisfiesWithoutRevalidation(policyRequestFrom(request))) {
+            const headers = policy.responseHeaders();
+            return new Response(bodyInit, {
+                url: policy._url,
+                status: policy._status,
+                headers,
+            });
+        }
+        else {
+            const revalidationHeaders = policy.revalidationHeaders(policyRequestFrom(request));
+            const revalidationRequest = new Request(request, {
+                headers: revalidationHeaders,
+            });
+            const revalidationResponse = await fetch(revalidationRequest);
+            const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(policyRequestFrom(revalidationRequest), policyResponseFrom(revalidationResponse));
+            const newArrayBuffer = await revalidationResponse.arrayBuffer();
+            const newBody = modified ? newArrayBuffer : bodyInit;
+            return storeResponseAndReturnClone(cache, new Response(newBody, {
+                url: revalidatedPolicy._url,
+                status: revalidatedPolicy._status,
+                headers: revalidatedPolicy.responseHeaders(),
+            }), revalidatedPolicy, cacheKey);
+        }
+    };
+    async function storeResponseAndReturnClone(cache, response, policy, cacheKey) {
+        let ttl = Math.round(policy.timeToLive() / 1000);
+        if (ttl <= 0)
+            return response;
+        // If a response can be revalidated, we don't want to remove it from the cache right after it expires.
+        // We may be able to use better heuristics here, but for now we'll take the max-age times 2.
+        if (canBeRevalidated(response)) {
+            ttl *= 2;
+        }
+        const arrayBuffer = await response.arrayBuffer();
+        const uint8array = new Uint8Array(arrayBuffer);
+        const entry = {
+            policy: policy.toObject(),
+            bytes: [...uint8array],
+        };
+        await cache.set(cacheKey, entry, {
+            ttl,
+        });
+        // We have to clone the response before returning it because the
+        // body can only be used once.
+        // To avoid https://github.com/bitinn/node-fetch/issues/151, we don't use
+        // response.clone() but create a new response from the consumed body
+        return new Response(uint8array, {
+            url: response.url,
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+        });
+    }
+}
+function canBeRevalidated(response) {
+    return response.headers.has('ETag');
+}
+function policyRequestFrom(request) {
+    return {
+        url: request.url,
+        method: request.method,
+        headers: headersToObject(request.headers),
+    };
+}
+function policyResponseFrom(response) {
+    return {
+        status: response.status,
+        headers: headersToObject(response.headers),
+    };
+}
+function headersToObject(headers) {
+    const object = Object.create(null);
+    headers === null || headers === void 0 ? void 0 : headers.forEach((val, key) => {
+        object[key] = val;
+    });
+    return object;
+}
+
+exports.fetchFactory = fetchFactory;

package/index.mjs

@@ -0,0 +1,102 @@
+import CachePolicy from 'http-cache-semantics';
+
+function fetchFactory({ fetch, Request, Response, cache }) {
+    return async (input, init) => {
+        let request;
+        if (input instanceof Request) {
+            request = input;
+        }
+        else {
+            request = new Request(input, init);
+        }
+        const cacheKey = request.url;
+        const entry = await cache.get(cacheKey);
+        if (!entry) {
+            const response = await fetch(request);
+            const policy = new CachePolicy(policyRequestFrom(request), policyResponseFrom(response));
+            return storeResponseAndReturnClone(cache, response, policy, cacheKey);
+        }
+        const { policy: policyRaw, bytes } = typeof entry === 'string' ? JSON.parse(entry) : entry;
+        const policy = CachePolicy.fromObject(policyRaw);
+        // Remove url from the policy, because otherwise it would never match a request with a custom cache key
+        policy._url = undefined;
+        const bodyInit = new Uint8Array(bytes);
+        if (policy.satisfiesWithoutRevalidation(policyRequestFrom(request))) {
+            const headers = policy.responseHeaders();
+            return new Response(bodyInit, {
+                url: policy._url,
+                status: policy._status,
+                headers,
+            });
+        }
+        else {
+            const revalidationHeaders = policy.revalidationHeaders(policyRequestFrom(request));
+            const revalidationRequest = new Request(request, {
+                headers: revalidationHeaders,
+            });
+            const revalidationResponse = await fetch(revalidationRequest);
+            const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(policyRequestFrom(revalidationRequest), policyResponseFrom(revalidationResponse));
+            const newArrayBuffer = await revalidationResponse.arrayBuffer();
+            const newBody = modified ? newArrayBuffer : bodyInit;
+            return storeResponseAndReturnClone(cache, new Response(newBody, {
+                url: revalidatedPolicy._url,
+                status: revalidatedPolicy._status,
+                headers: revalidatedPolicy.responseHeaders(),
+            }), revalidatedPolicy, cacheKey);
+        }
+    };
+    async function storeResponseAndReturnClone(cache, response, policy, cacheKey) {
+        let ttl = Math.round(policy.timeToLive() / 1000);
+        if (ttl <= 0)
+            return response;
+        // If a response can be revalidated, we don't want to remove it from the cache right after it expires.
+        // We may be able to use better heuristics here, but for now we'll take the max-age times 2.
+        if (canBeRevalidated(response)) {
+            ttl *= 2;
+        }
+        const arrayBuffer = await response.arrayBuffer();
+        const uint8array = new Uint8Array(arrayBuffer);
+        const entry = {
+            policy: policy.toObject(),
+            bytes: [...uint8array],
+        };
+        await cache.set(cacheKey, entry, {
+            ttl,
+        });
+        // We have to clone the response before returning it because the
+        // body can only be used once.
+        // To avoid https://github.com/bitinn/node-fetch/issues/151, we don't use
+        // response.clone() but create a new response from the consumed body
+        return new Response(uint8array, {
+            url: response.url,
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+        });
+    }
+}
+function canBeRevalidated(response) {
+    return response.headers.has('ETag');
+}
+function policyRequestFrom(request) {
+    return {
+        url: request.url,
+        method: request.method,
+        headers: headersToObject(request.headers),
+    };
+}
+function policyResponseFrom(response) {
+    return {
+        status: response.status,
+        headers: headersToObject(response.headers),
+    };
+}
+function headersToObject(headers) {
+    const object = Object.create(null);
+    headers === null || headers === void 0 ? void 0 : headers.forEach((val, key) => {
+        object[key] = val;
+    });
+    return object;
+}
+
+export { fetchFactory };

package/package.json

@@ -1,22 +1,34 @@
 {
   "name": "fetchache",
-  "version": "0.0.4",
-  "description": "Cross Platform Fetch with Key Value Cache support",
+  "version": "0.1.2",
+  "description": "Cross Platform Fetch Wrapper with Key Value Cache support",
   "sideEffects": false,
   "dependencies": {
-    "http-cache-semantics": "4.1.0",
-    "cross-fetch": "3.0.6"
+    "http-cache-semantics": "^4.1.0",
+    "tslib": "^2.3.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "ardatan/whatwg-node",
+    "directory": "packages/fetchache"
   },
-  "repository": "git@github.com:ardatan/fetch-with-cache.git",
   "author": "Arda TANRIKULU <ardatanrikulu@gmail.com>",
   "license": "MIT",
-  "engines": {
-    "node": ">=10"
-  },
-  "main": "index.cjs.js",
-  "module": "index.esm.js",
+  "main": "index.js",
+  "module": "index.mjs",
   "typings": "index.d.ts",
   "typescript": {
     "definition": "index.d.ts"
+  },
+  "exports": {
+    ".": {
+      "require": "./index.js",
+      "import": "./index.mjs"
+    },
+    "./*": {
+      "require": "./*.js",
+      "import": "./*.mjs"
+    },
+    "./package.json": "./package.json"
   }
-}
+}

package/index.cjs.js

@@ -1,106 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-const CachePolicy = _interopDefault(require('http-cache-semantics'));
-const crossFetch = require('cross-fetch');
-
-async function fetchache(request, cache) {
-    const cacheKey = request.url;
-    const entry = await cache.get(cacheKey);
-    if (!entry) {
-        const response = await crossFetch.fetch(request);
-        const policy = new CachePolicy(policyRequestFrom(request), policyResponseFrom(response));
-        return storeResponseAndReturnClone(cache, response, policy, cacheKey);
-    }
-    const { policy: policyRaw, body } = JSON.parse(entry);
-    const policy = CachePolicy.fromObject(policyRaw);
-    // Remove url from the policy, because otherwise it would never match a request with a custom cache key
-    policy._url = undefined;
-    if (policy.satisfiesWithoutRevalidation(policyRequestFrom(request))) {
-        const headers = policy.responseHeaders();
-        return new crossFetch.Response(body, {
-            url: policy._url,
-            status: policy._status,
-            headers,
-        });
-    }
-    else {
-        const revalidationHeaders = policy.revalidationHeaders(policyRequestFrom(request));
-        const revalidationRequest = new crossFetch.Request(request, {
-            headers: revalidationHeaders,
-        });
-        const revalidationResponse = await crossFetch.fetch(revalidationRequest);
-        const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(policyRequestFrom(revalidationRequest), policyResponseFrom(revalidationResponse));
-        return storeResponseAndReturnClone(cache, new crossFetch.Response(modified ? await revalidationResponse.text() : body, {
-            url: revalidatedPolicy._url,
-            status: revalidatedPolicy._status,
-            headers: revalidatedPolicy.responseHeaders(),
-        }), revalidatedPolicy, cacheKey);
-    }
-}
-async function storeResponseAndReturnClone(cache, response, policy, cacheKey) {
-    let ttl = Math.round(policy.timeToLive() / 1000);
-    if (ttl <= 0)
-        return response;
-    // If a response can be revalidated, we don't want to remove it from the cache right after it expires.
-    // We may be able to use better heuristics here, but for now we'll take the max-age times 2.
-    if (canBeRevalidated(response)) {
-        ttl *= 2;
-    }
-    const body = await response.text();
-    const entry = JSON.stringify({
-        policy: policy.toObject(),
-        body,
-    });
-    await cache.set(cacheKey, entry, {
-        ttl,
-    });
-    // We have to clone the response before returning it because the
-    // body can only be used once.
-    // To avoid https://github.com/bitinn/node-fetch/issues/151, we don't use
-    // response.clone() but create a new response from the consumed body
-    return new crossFetch.Response(body, {
-        url: response.url,
-        status: response.status,
-        statusText: response.statusText,
-        headers: response.headers,
-    });
-}
-function canBeRevalidated(response) {
-    return response.headers.has('ETag');
-}
-function policyRequestFrom(request) {
-    return {
-        url: request.url,
-        method: request.method,
-        headers: headersToObject(request.headers),
-    };
-}
-function policyResponseFrom(response) {
-    return {
-        status: response.status,
-        headers: headersToObject(response.headers),
-    };
-}
-function headersToObject(headers) {
-    const object = Object.create(null);
-    headers.forEach((val, key) => {
-        object[key] = val;
-    });
-    return object;
-}
-
-Object.keys(crossFetch).forEach(function (k) {
-    if (k !== 'default') Object.defineProperty(exports, k, {
-        enumerable: true,
-        get: function () {
-            return crossFetch[k];
-        }
-    });
-});
-exports.default = fetchache;
-exports.fetchache = fetchache;
-//# sourceMappingURL=index.cjs.js.map

package/index.cjs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.cjs.js","sources":["../src/index.ts"],"sourcesContent":["import CachePolicy from 'http-cache-semantics';\r\nimport { fetch, Request, Response } from 'cross-fetch';\r\n\r\nexport async function fetchache(request: Request, cache: KeyValueCache) {\r\n    const cacheKey = request.url;\r\n    const entry = await cache.get(cacheKey);\r\n    if (!entry) {\r\n        const response = await fetch(request);\r\n\r\n        const policy = new CachePolicy(\r\n            policyRequestFrom(request),\r\n            policyResponseFrom(response),\r\n        );\r\n\r\n        return storeResponseAndReturnClone(\r\n            cache,\r\n            response,\r\n            policy,\r\n            cacheKey,\r\n        );\r\n    }\r\n\r\n    const { policy: policyRaw, body } = JSON.parse(entry);\r\n\r\n    const policy = CachePolicy.fromObject(policyRaw);\r\n    // Remove url from the policy, because otherwise it would never match a request with a custom cache key\r\n    (policy as any)._url = undefined;\r\n\r\n    if (policy.satisfiesWithoutRevalidation(policyRequestFrom(request))) {\r\n        const headers = policy.responseHeaders() as HeadersInit;\r\n        return new Response(body, {\r\n            url: (policy as any)._url,\r\n            status: (policy as any)._status,\r\n            headers,\r\n        } as ResponseInit);\r\n    } else {\r\n        const revalidationHeaders = policy.revalidationHeaders(\r\n            policyRequestFrom(request),\r\n        );\r\n        const revalidationRequest = new Request(request, {\r\n            headers: revalidationHeaders as HeadersInit,\r\n        });\r\n        const revalidationResponse = await fetch(revalidationRequest);\r\n\r\n        const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(\r\n            policyRequestFrom(revalidationRequest),\r\n            policyResponseFrom(revalidationResponse),\r\n        );\r\n\r\n        return storeResponseAndReturnClone(\r\n            cache,\r\n            new Response(modified ? await revalidationResponse.text() : body, {\r\n                url: (revalidatedPolicy as any)._url,\r\n                status: (revalidatedPolicy as any)._status,\r\n                headers: (revalidatedPolicy as any).responseHeaders(),\r\n            } as ResponseInit),\r\n            revalidatedPolicy,\r\n            cacheKey,\r\n        );\r\n    }\r\n}\r\n\r\nexport * from 'cross-fetch';\r\n\r\nexport default fetchache;\r\n\r\nasync function storeResponseAndReturnClone(\r\n    cache: KeyValueCache,\r\n    response: Response,\r\n    policy: CachePolicy,\r\n    cacheKey: string,\r\n): Promise<Response> {\r\n\r\n    let ttl = Math.round(policy.timeToLive() / 1000);\r\n    if (ttl <= 0) return response;\r\n\r\n    // If a response can be revalidated, we don't want to remove it from the cache right after it expires.\r\n    // We may be able to use better heuristics here, but for now we'll take the max-age times 2.\r\n    if (canBeRevalidated(response)) {\r\n        ttl *= 2;\r\n    }\r\n\r\n    const body = await response.text();\r\n    const entry = JSON.stringify({\r\n        policy: policy.toObject(),\r\n        body,\r\n    });\r\n\r\n    await cache.set(cacheKey, entry, {\r\n        ttl,\r\n    });\r\n\r\n    // We have to clone the response before returning it because the\r\n    // body can only be used once.\r\n    // To avoid https://github.com/bitinn/node-fetch/issues/151, we don't use\r\n    // response.clone() but create a new response from the consumed body\r\n    return new Response(body, {\r\n        url: response.url,\r\n        status: response.status,\r\n        statusText: response.statusText,\r\n        headers: response.headers,\r\n    } as ResponseInit);\r\n}\r\n\r\nfunction canBeRevalidated(response: Response): boolean {\r\n    return response.headers.has('ETag');\r\n}\r\n\r\nfunction policyRequestFrom(request: Request) {\r\n    return {\r\n        url: request.url,\r\n        method: request.method,\r\n        headers: headersToObject(request.headers),\r\n    };\r\n}\r\n\r\nfunction policyResponseFrom(response: Response) {\r\n    return {\r\n        status: response.status,\r\n        headers: headersToObject(response.headers),\r\n    };\r\n}\r\n\r\nfunction headersToObject(headers: Headers) {\r\n    const object = Object.create(null);\r\n    headers.forEach((val, key) => {\r\n        object[key] = val;\r\n    });\r\n    return object;\r\n}\r\n\r\nexport interface KeyValueCacheSetOptions {\r\n    /**\r\n     * Specified in **seconds**, the time-to-live (TTL) value limits the lifespan\r\n     * of the data being stored in the cache.\r\n     */\r\n    ttl?: number | null\r\n};\r\n\r\nexport interface KeyValueCache<V = string> {\r\n    get(key: string): Promise<V | undefined>;\r\n    set(key: string, value: V, options?: KeyValueCacheSetOptions): Promise<void>;\r\n    delete(key: string): Promise<boolean | void>;\r\n}\r\n"],"names":["fetch","Response","Request"],"mappings":"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"}

package/index.esm.js

@@ -1,93 +0,0 @@
-import CachePolicy from 'http-cache-semantics';
-import { fetch, Response, Request } from 'cross-fetch';
-export * from 'cross-fetch';
-
-async function fetchache(request, cache) {
-    const cacheKey = request.url;
-    const entry = await cache.get(cacheKey);
-    if (!entry) {
-        const response = await fetch(request);
-        const policy = new CachePolicy(policyRequestFrom(request), policyResponseFrom(response));
-        return storeResponseAndReturnClone(cache, response, policy, cacheKey);
-    }
-    const { policy: policyRaw, body } = JSON.parse(entry);
-    const policy = CachePolicy.fromObject(policyRaw);
-    // Remove url from the policy, because otherwise it would never match a request with a custom cache key
-    policy._url = undefined;
-    if (policy.satisfiesWithoutRevalidation(policyRequestFrom(request))) {
-        const headers = policy.responseHeaders();
-        return new Response(body, {
-            url: policy._url,
-            status: policy._status,
-            headers,
-        });
-    }
-    else {
-        const revalidationHeaders = policy.revalidationHeaders(policyRequestFrom(request));
-        const revalidationRequest = new Request(request, {
-            headers: revalidationHeaders,
-        });
-        const revalidationResponse = await fetch(revalidationRequest);
-        const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(policyRequestFrom(revalidationRequest), policyResponseFrom(revalidationResponse));
-        return storeResponseAndReturnClone(cache, new Response(modified ? await revalidationResponse.text() : body, {
-            url: revalidatedPolicy._url,
-            status: revalidatedPolicy._status,
-            headers: revalidatedPolicy.responseHeaders(),
-        }), revalidatedPolicy, cacheKey);
-    }
-}
-async function storeResponseAndReturnClone(cache, response, policy, cacheKey) {
-    let ttl = Math.round(policy.timeToLive() / 1000);
-    if (ttl <= 0)
-        return response;
-    // If a response can be revalidated, we don't want to remove it from the cache right after it expires.
-    // We may be able to use better heuristics here, but for now we'll take the max-age times 2.
-    if (canBeRevalidated(response)) {
-        ttl *= 2;
-    }
-    const body = await response.text();
-    const entry = JSON.stringify({
-        policy: policy.toObject(),
-        body,
-    });
-    await cache.set(cacheKey, entry, {
-        ttl,
-    });
-    // We have to clone the response before returning it because the
-    // body can only be used once.
-    // To avoid https://github.com/bitinn/node-fetch/issues/151, we don't use
-    // response.clone() but create a new response from the consumed body
-    return new Response(body, {
-        url: response.url,
-        status: response.status,
-        statusText: response.statusText,
-        headers: response.headers,
-    });
-}
-function canBeRevalidated(response) {
-    return response.headers.has('ETag');
-}
-function policyRequestFrom(request) {
-    return {
-        url: request.url,
-        method: request.method,
-        headers: headersToObject(request.headers),
-    };
-}
-function policyResponseFrom(response) {
-    return {
-        status: response.status,
-        headers: headersToObject(response.headers),
-    };
-}
-function headersToObject(headers) {
-    const object = Object.create(null);
-    headers.forEach((val, key) => {
-        object[key] = val;
-    });
-    return object;
-}
-
-export default fetchache;
-export { fetchache };
-//# sourceMappingURL=index.esm.js.map

package/index.esm.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.esm.js","sources":["../src/index.ts"],"sourcesContent":["import CachePolicy from 'http-cache-semantics';\r\nimport { fetch, Request, Response } from 'cross-fetch';\r\n\r\nexport async function fetchache(request: Request, cache: KeyValueCache) {\r\n    const cacheKey = request.url;\r\n    const entry = await cache.get(cacheKey);\r\n    if (!entry) {\r\n        const response = await fetch(request);\r\n\r\n        const policy = new CachePolicy(\r\n            policyRequestFrom(request),\r\n            policyResponseFrom(response),\r\n        );\r\n\r\n        return storeResponseAndReturnClone(\r\n            cache,\r\n            response,\r\n            policy,\r\n            cacheKey,\r\n        );\r\n    }\r\n\r\n    const { policy: policyRaw, body } = JSON.parse(entry);\r\n\r\n    const policy = CachePolicy.fromObject(policyRaw);\r\n    // Remove url from the policy, because otherwise it would never match a request with a custom cache key\r\n    (policy as any)._url = undefined;\r\n\r\n    if (policy.satisfiesWithoutRevalidation(policyRequestFrom(request))) {\r\n        const headers = policy.responseHeaders() as HeadersInit;\r\n        return new Response(body, {\r\n            url: (policy as any)._url,\r\n            status: (policy as any)._status,\r\n            headers,\r\n        } as ResponseInit);\r\n    } else {\r\n        const revalidationHeaders = policy.revalidationHeaders(\r\n            policyRequestFrom(request),\r\n        );\r\n        const revalidationRequest = new Request(request, {\r\n            headers: revalidationHeaders as HeadersInit,\r\n        });\r\n        const revalidationResponse = await fetch(revalidationRequest);\r\n\r\n        const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(\r\n            policyRequestFrom(revalidationRequest),\r\n            policyResponseFrom(revalidationResponse),\r\n        );\r\n\r\n        return storeResponseAndReturnClone(\r\n            cache,\r\n            new Response(modified ? await revalidationResponse.text() : body, {\r\n                url: (revalidatedPolicy as any)._url,\r\n                status: (revalidatedPolicy as any)._status,\r\n                headers: (revalidatedPolicy as any).responseHeaders(),\r\n            } as ResponseInit),\r\n            revalidatedPolicy,\r\n            cacheKey,\r\n        );\r\n    }\r\n}\r\n\r\nexport * from 'cross-fetch';\r\n\r\nexport default fetchache;\r\n\r\nasync function storeResponseAndReturnClone(\r\n    cache: KeyValueCache,\r\n    response: Response,\r\n    policy: CachePolicy,\r\n    cacheKey: string,\r\n): Promise<Response> {\r\n\r\n    let ttl = Math.round(policy.timeToLive() / 1000);\r\n    if (ttl <= 0) return response;\r\n\r\n    // If a response can be revalidated, we don't want to remove it from the cache right after it expires.\r\n    // We may be able to use better heuristics here, but for now we'll take the max-age times 2.\r\n    if (canBeRevalidated(response)) {\r\n        ttl *= 2;\r\n    }\r\n\r\n    const body = await response.text();\r\n    const entry = JSON.stringify({\r\n        policy: policy.toObject(),\r\n        body,\r\n    });\r\n\r\n    await cache.set(cacheKey, entry, {\r\n        ttl,\r\n    });\r\n\r\n    // We have to clone the response before returning it because the\r\n    // body can only be used once.\r\n    // To avoid https://github.com/bitinn/node-fetch/issues/151, we don't use\r\n    // response.clone() but create a new response from the consumed body\r\n    return new Response(body, {\r\n        url: response.url,\r\n        status: response.status,\r\n        statusText: response.statusText,\r\n        headers: response.headers,\r\n    } as ResponseInit);\r\n}\r\n\r\nfunction canBeRevalidated(response: Response): boolean {\r\n    return response.headers.has('ETag');\r\n}\r\n\r\nfunction policyRequestFrom(request: Request) {\r\n    return {\r\n        url: request.url,\r\n        method: request.method,\r\n        headers: headersToObject(request.headers),\r\n    };\r\n}\r\n\r\nfunction policyResponseFrom(response: Response) {\r\n    return {\r\n        status: response.status,\r\n        headers: headersToObject(response.headers),\r\n    };\r\n}\r\n\r\nfunction headersToObject(headers: Headers) {\r\n    const object = Object.create(null);\r\n    headers.forEach((val, key) => {\r\n        object[key] = val;\r\n    });\r\n    return object;\r\n}\r\n\r\nexport interface KeyValueCacheSetOptions {\r\n    /**\r\n     * Specified in **seconds**, the time-to-live (TTL) value limits the lifespan\r\n     * of the data being stored in the cache.\r\n     */\r\n    ttl?: number | null\r\n};\r\n\r\nexport interface KeyValueCache<V = string> {\r\n    get(key: string): Promise<V | undefined>;\r\n    set(key: string, value: V, options?: KeyValueCacheSetOptions): Promise<void>;\r\n    delete(key: string): Promise<boolean | void>;\r\n}\r\n"],"names":[],"mappings":";;;;AAGO,eAAe,SAAS,CAAC,OAAgB,EAAE,KAAoB;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAC7B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,IAAI,WAAW,CAC1B,iBAAiB,CAAC,OAAO,CAAC,EAC1B,kBAAkB,CAAC,QAAQ,CAAC,CAC/B,CAAC;QAEF,OAAO,2BAA2B,CAC9B,KAAK,EACL,QAAQ,EACR,MAAM,EACN,QAAQ,CACX,CAAC;KACL;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;;IAEhD,MAAc,CAAC,IAAI,GAAG,SAAS,CAAC;IAEjC,IAAI,MAAM,CAAC,4BAA4B,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE;QACjE,MAAM,OAAO,GAAG,MAAM,CAAC,eAAe,EAAiB,CAAC;QACxD,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;YACtB,GAAG,EAAG,MAAc,CAAC,IAAI;YACzB,MAAM,EAAG,MAAc,CAAC,OAAO;YAC/B,OAAO;SACM,CAAC,CAAC;KACtB;SAAM;QACH,MAAM,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAClD,iBAAiB,CAAC,OAAO,CAAC,CAC7B,CAAC;QACF,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;YAC7C,OAAO,EAAE,mBAAkC;SAC9C,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAE9D,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,iBAAiB,CACpE,iBAAiB,CAAC,mBAAmB,CAAC,EACtC,kBAAkB,CAAC,oBAAoB,CAAC,CAC3C,CAAC;QAEF,OAAO,2BAA2B,CAC9B,KAAK,EACL,IAAI,QAAQ,CAAC,QAAQ,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE;YAC9D,GAAG,EAAG,iBAAyB,CAAC,IAAI;YACpC,MAAM,EAAG,iBAAyB,CAAC,OAAO;YAC1C,OAAO,EAAG,iBAAyB,CAAC,eAAe,EAAE;SACxC,CAAC,EAClB,iBAAiB,EACjB,QAAQ,CACX,CAAC;KACL;AACL,CAAC;AAMD,eAAe,2BAA2B,CACtC,KAAoB,EACpB,QAAkB,EAClB,MAAmB,EACnB,QAAgB;IAGhB,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;IACjD,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;;;IAI9B,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE;QAC5B,GAAG,IAAI,CAAC,CAAC;KACZ;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;QACzB,IAAI;KACP,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE;QAC7B,GAAG;KACN,CAAC,CAAC;;;;;IAMH,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACtB,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;KACZ,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAkB;IACxC,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IACvC,OAAO;QACH,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC;KAC5C,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAkB;IAC1C,OAAO;QACH,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC;KAC7C,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,OAAgB;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG;QACrB,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;KACrB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB;;;;;"}