fix: prevent race condition

QwikDev · Jan 14, 2024 · 2ab1af2 · 2ab1af2
1 parent 67c85a6
commit 2ab1af2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/qwik/src/prefetch-service-worker/direct-fetch.ts b/packages/qwik/src/prefetch-service-worker/direct-fetch.ts
@@ -37,7 +37,7 @@ async function getResponse(swState: SWState, url: URL): Promise<Response> {
   const currentRequestTask = swState.$queue$.find((task) => task.$url$.pathname === url.pathname)!;
   if (!currentRequestTask) {
     swState.$log$('CACHE HIT', url.pathname);
-    return swState.$cache$!.match(url) as Promise<Response>;
+    return (await swState.$cache$).match(url) as Promise<Response>;
   } else {
     return currentRequestTask.$response$;
   }
@@ -55,7 +55,7 @@ async function enqueueFetchIfNeeded(swState: SWState, url: URL, priority: number
       swState.$log$('already in queue', mode, state, url.pathname);
     }
   } else {
-    const cacheEntry = await swState.$cache$!.match(url);
+    const cacheEntry = await (await swState.$cache$).match(url);
     if (!cacheEntry) {
       swState.$log$('enqueue', mode, url.pathname);
       task = {
@@ -91,7 +91,7 @@ function taskTick(swState: SWState) {
         .then(async (response) => {
           if (response.status === 200) {
             swState.$log$('CACHED', task.$url$.pathname);
-            await swState.$cache$!.put(task.$url$, response.clone());
+            await (await swState.$cache$).put(task.$url$, response.clone());
           }
           task.$resolveResponse$(response);
         })

diff --git a/packages/qwik/src/prefetch-service-worker/process-message.ts b/packages/qwik/src/prefetch-service-worker/process-message.ts
@@ -99,12 +99,12 @@ async function processBundleGraph(
   });
   if (cleanup) {
     const bundles = new Set<string>(graph.filter((item) => typeof item === 'string') as string[]);
-    for (const request of await swState.$cache$!.keys()) {
+    for (const request of await (await swState.$cache$).keys()) {
       const [cacheBase, filename] = parseBaseFilename(new URL(request.url));
       const promises: Promise<boolean>[] = [];
       if (cacheBase === base && !bundles.has(filename)) {
         swState.$log$('deleting', request.url);
-        promises.push(swState.$cache$!.delete(request));
+        promises.push((await swState.$cache$).delete(request));
       }
       await Promise.all(promises);
     }

diff --git a/packages/qwik/src/prefetch-service-worker/setup.ts b/packages/qwik/src/prefetch-service-worker/setup.ts
@@ -20,6 +20,6 @@ export const setupServiceWorker = (swScope: ServiceWorkerGlobalScope) => {
   swScope.addEventListener('install', () => swScope.skipWaiting());
   swScope.addEventListener('activate', async (event) => {
     event.waitUntil(swScope.clients.claim());
-    swState.$cache$ = await swScope.caches.open('QwikBundles');
+    swState.$cache$ = swScope.caches.open('QwikBundles');
   });
 };
diff --git a/packages/qwik/src/prefetch-service-worker/state.ts b/packages/qwik/src/prefetch-service-worker/state.ts
@@ -18,7 +18,7 @@ export interface SWState {
   /** List of Base paths */
   $bases$: SWStateBase[];
   // Browser Cache
-  $cache$: Cache | null;
+  $cache$: Promise<Cache>;
   // Maximum number of prefetch requests. (Direct requests are not limited.)
   $maxPrefetchRequests$: number;
   // Log function
@@ -54,7 +54,7 @@ export const createState = (fetch: ServiceWorkerGlobalScope['fetch'], url: URL):
     $fetch$: fetch,
     $queue$: [],
     $bases$: [],
-    $cache$: null,
+    $cache$: null!,
     $msgQueue$: [],
     $msgQueuePromise$: null,
     $maxPrefetchRequests$: 10,