correct cache source

virtualstate · Dec 3, 2023 · 347b701 · 347b701
1 parent cdd4ff1
commit 347b701
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/worker/service-worker/router.ts b/src/worker/service-worker/router.ts
@@ -471,15 +471,8 @@ export async function createRouter(serviceWorkers?: DurableServiceWorkerRegistra
             }
             if (isRouterSourceType(ruleSource, "cache")) {
                 if (isRouterCacheSource(ruleSource)) {
-                    if (ruleSource.request) {
-                        // TODO, should this match the actual request properties
-                        // or should it only match the exact reference of this request
-                        if (ruleSource.request !== input) {
-                            return undefined;
-                        }
-                    }
                     const cache = await caches.open(ruleSource.cacheName || "default");
-                    return cache.match(cacheKey());
+                    return cache.match(cacheKey(ruleSource.request));
                 } else {
                     const cache = await caches.open("default");
                     return cache.match(cacheKey())
@@ -488,7 +481,14 @@ export async function createRouter(serviceWorkers?: DurableServiceWorkerRegistra
             throw new Error("Unknown source type");
         }
 
-        function cacheKey() {
+        function cacheKey(request?: RequestInfo) {
+            if (request) {
+                if (request instanceof Request) {
+                    return request.clone();
+                } else {
+                    return new Request(request);
+                }
+            }
             if (!init) {
                 return clone();
             } else {