From 37c37b4f4b20bff69cfb7868e433e272d65cdbcc Mon Sep 17 00:00:00 2001
From: ayoayco <ayo@ayco.io>
Date: Wed, 14 Aug 2024 18:58:55 +0200
Subject: [PATCH] fix: use correct cache version

---
 astro.config.mjs            |  3 +++
 src/components/Footer.astro |  5 ++++-
 src/consts.ts               |  4 +++-
 src/sw.js                   | 14 ++++++++++++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/astro.config.mjs b/astro.config.mjs
index f587b1f..2fb540c 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -4,6 +4,8 @@ import mdx from '@astrojs/mdx';
 import sitemap from '@astrojs/sitemap';
 import serviceWorker from "@ayco/astro-sw";
 
+import {VERSION} from './src/consts';
+
 // https://astro.build/config
 export default defineConfig({
   output: "hybrid",
@@ -16,6 +18,7 @@ export default defineConfig({
     serviceWorker({
       path: "./src/sw.js",
       assetCachePrefix: 'cozy-reader',
+      assetCacheVersionID: VERSION
     })
   ]
 });
\ No newline at end of file
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 5cd2e77..414947d 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -1,5 +1,6 @@
 ---
 import Icon from 'astro-iconify'
+import {VERSION} from '../consts';
 ---
 
 <footer>
@@ -13,7 +14,9 @@ import Icon from 'astro-iconify'
     <br />
     <a href="/blog">Blog</a> •
     <a href="https://github.com/ayoayco/cozy">GitHub</a> •
-    <a href="https://social.ayco.io/@ayo">Mastodon</a> • Groggily2-Armband9
+    <a href="https://social.ayco.io/@ayo">Mastodon</a>
+    <br />
+    {VERSION}
   </section>
 
   <section class="disclaimer">All rights reserved to content owners.</section>
diff --git a/src/consts.ts b/src/consts.ts
index 2d641e6..b530236 100644
--- a/src/consts.ts
+++ b/src/consts.ts
@@ -2,4 +2,6 @@ export const SITE_TITLE = 'Cozy Blog';
 export const SITE_AUTHOR = 'Ayo Ayco';
 export const SITE_AUTHOR_MASTODON = 'https://social.ayco.io/@ayo';
 export const SITE_PROJECT_REPO = 'https://github.com/ayoayco/Cozy';
-export const SITE_DESCRIPTION = 'The Web is Yours.';
\ No newline at end of file
+export const SITE_DESCRIPTION = 'The Web is Yours.';
+
+export const VERSION = 'Glass5-Speakers2';
\ No newline at end of file
diff --git a/src/sw.js b/src/sw.js
index 7517aaf..d43448e 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -4,6 +4,7 @@
  * @see https://ayco.io/n/@ayco/astro-sw
  */
 const cacheName = `${__prefix ?? 'app'}-v${__version ?? '000'}`
+
 const addResourcesToCache = async (resources) => {
     const cache = await caches.open(cacheName);
     console.log('[cozy-sw]: adding resources to cache...', resources)
@@ -13,19 +14,28 @@ const addResourcesToCache = async (resources) => {
 const putInCache = async (request, response) => {
     const cache = await caches.open(cacheName);
     console.log('[cozy-sw]: adding one response to cache...', request)
+    // if exists, replace
+
+    const keys = await cache.keys();
+    if(keys.includes(request)) {
+        cache.delete(request);
+    }
+
     await cache.put(request, response);
 };
 
 const tryCache = async (request, fallbackUrl) => {
+    const cache = await caches.open(cacheName);
+
     // Try get the resource from the cache
-    const responseFromCache = await caches.match(request);
+    const responseFromCache = await cache.match(request);
     if (responseFromCache) {
         console.info('[cozy-sw]: using cached response', responseFromCache);
         return responseFromCache;
     }
 
     // Try the fallback
-    const fallbackResponse = await caches.match(fallbackUrl);
+    const fallbackResponse = await cache.match(fallbackUrl);
     if (fallbackResponse) {
         console.info('[cozy-sw]: using fallback cached response', fallbackResponse);
         return fallbackResponse;