fix(page): use qualified url for service worker

podlove · Jul 15, 2024 · c5f760d · c5f760d
1 parent 3803877
commit c5f760d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 55 deletions.
diff --git a/apps/page/package.json b/apps/page/package.json
@@ -36,7 +36,8 @@
     "multimatch": "7.0.0",
     "@m31coding/fuzzy-search": "1.0.1",
     "color.js": "1.2.0",
-    "farbraum": "0.2.1"
+    "farbraum": "0.2.1",
+    "object-code": "1.3.3"
   },
   "devDependencies": {
     "tailwindcss": "3.0.24",

diff --git a/apps/page/src/features/LoadingOverlay.vue b/apps/page/src/features/LoadingOverlay.vue
diff --git a/apps/page/src/layouts/Layout.astro b/apps/page/src/layouts/Layout.astro
@@ -7,7 +7,6 @@ import PageFooter from '../features/PageFooter.vue';
 import LoadingBar from '../features/LoadingBar.vue';
 import Subscribe from '../features/subscribe/Subscribe.vue';
 import Colors from '../features/Colors.vue';
-import LoadingOverlay from '../features/LoadingOverlay.vue';
 import { store } from '../logic';
 import { getLanguage } from '../i18n';
 
@@ -32,7 +31,6 @@ const lang = getLanguage();
 	</head>
 	<body>
     <Colors client:only="vue" />
-    <LoadingOverlay client:load />
     <LoadingBar client:only="vue" />
     <PageHeader client:idle transition:persist="header" />
     <main transition:animate="fade">

diff --git a/apps/page/src/lib/caching.ts b/apps/page/src/lib/caching.ts
@@ -1,15 +1,5 @@
+import { hash } from 'object-code';
 
-export const etag = async (input: any): Promise<string> => {
-  const entity = JSON.stringify(input);
-
-  const textAsBuffer = new TextEncoder().encode(entity);
-  const hashBuffer = await crypto.subtle.digest("SHA-1", textAsBuffer);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hash = hashArray
-    .map((item) => item.toString(16).padStart(2, "0"))
-    .join("");
-
-  const len = Buffer.byteLength(entity, 'utf8');
-
-  return len.toString(16) + '-' + Buffer.from(hash).toString('base64').substring(0, 27);
+export const etag = async (input: { data: any, version: string }): Promise<string> => {
+  return `${input.version}-${hash(input.data)}`;
 }
diff --git a/apps/page/src/logic/sagas/serviceworker.sagas.ts b/apps/page/src/logic/sagas/serviceworker.sagas.ts
@@ -17,10 +17,13 @@ export default ({
 
     const feed: string = yield select(selectFeed);
     const cacheKey: string = yield select(selectCacheKey);
+    const baseUrl = new URL(document.location.href);
+
+    const serviceWorkerUrl = `${baseUrl.origin}${serviceWorker}?feed=${feed}&cacheKey=${cacheKey}`;
 
     try {
       const registration: ServiceWorkerRegistration = yield navigator.serviceWorker.register(
-        `${serviceWorker}?feed=${feed}&cacheKey=${cacheKey}`,
+        serviceWorkerUrl,
         {
           scope: '/'
         }
@@ -35,7 +38,7 @@ export default ({
 
   return function* () {
     if(import.meta.env.MODE === 'production') {
-      yield registerServiceWorker();
+    yield registerServiceWorker();
     }
   };
 };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml