fix(pwa): generate icons, network-first HTML, bust stale cache
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
+36
-50
@@ -1,58 +1,52 @@
|
|||||||
const CACHE_NAME = 'dumpster-v1';
|
// ponytail: bump CACHE_NAME on each deploy, or stale HTML breaks assets.
|
||||||
const STATIC_ASSETS = [
|
// Network-first for navigation (index.html) keeps hashed asset refs fresh.
|
||||||
'/',
|
const CACHE_NAME = 'dumpster-v2';
|
||||||
'/index.html',
|
|
||||||
'/manifest.json',
|
|
||||||
];
|
|
||||||
|
|
||||||
self.addEventListener('install', (event) => {
|
self.addEventListener('install', () => {
|
||||||
event.waitUntil(
|
|
||||||
caches.open(CACHE_NAME).then((cache) => {
|
|
||||||
return cache.addAll(STATIC_ASSETS);
|
|
||||||
})
|
|
||||||
);
|
|
||||||
self.skipWaiting();
|
self.skipWaiting();
|
||||||
});
|
});
|
||||||
|
|
||||||
self.addEventListener('activate', (event) => {
|
self.addEventListener('activate', (event) => {
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
caches.keys().then((cacheNames) => {
|
caches.keys().then((names) =>
|
||||||
return Promise.all(
|
Promise.all(names.filter((n) => n !== CACHE_NAME).map((n) => caches.delete(n)))
|
||||||
cacheNames
|
)
|
||||||
.filter((name) => name !== CACHE_NAME)
|
|
||||||
.map((name) => caches.delete(name))
|
|
||||||
);
|
|
||||||
})
|
|
||||||
);
|
);
|
||||||
self.clients.claim();
|
self.clients.claim();
|
||||||
});
|
});
|
||||||
|
|
||||||
self.addEventListener('fetch', (event) => {
|
self.addEventListener('fetch', (event) => {
|
||||||
// Skip non-GET requests
|
|
||||||
if (event.request.method !== 'GET') return;
|
if (event.request.method !== 'GET') return;
|
||||||
|
const url = new URL(event.request.url);
|
||||||
|
|
||||||
// Skip API requests
|
// Skip API + WS
|
||||||
if (event.request.url.includes('/api/')) return;
|
if (url.pathname.startsWith('/api/') || url.pathname.startsWith('/ws')) return;
|
||||||
|
|
||||||
// Skip WebSocket
|
// Network-first for navigation requests (index.html) — always fetch fresh HTML
|
||||||
if (event.request.url.includes('/ws')) return;
|
// so hashed asset references stay current after deploys.
|
||||||
|
if (event.request.mode === 'navigate') {
|
||||||
|
event.respondWith(
|
||||||
|
fetch(event.request)
|
||||||
|
.then((response) => {
|
||||||
|
const clone = response.clone();
|
||||||
|
caches.open(CACHE_NAME).then((c) => c.put(event.request, clone));
|
||||||
|
return response;
|
||||||
|
})
|
||||||
|
.catch(() => caches.match('/index.html'))
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cache-first for static assets (JS, CSS, images, fonts)
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
caches.match(event.request).then((cached) => {
|
caches.match(event.request).then((cached) => {
|
||||||
// Return cached version, fetch new one in background
|
|
||||||
const fetchPromise = fetch(event.request).then((response) => {
|
const fetchPromise = fetch(event.request).then((response) => {
|
||||||
// Only cache successful responses
|
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const clone = response.clone();
|
const clone = response.clone();
|
||||||
caches.open(CACHE_NAME).then((cache) => {
|
caches.open(CACHE_NAME).then((c) => c.put(event.request, clone));
|
||||||
cache.put(event.request, clone);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
return response;
|
return response;
|
||||||
}).catch(() => {
|
}).catch(() => cached);
|
||||||
// Return cached if fetch fails
|
|
||||||
return cached;
|
|
||||||
});
|
|
||||||
|
|
||||||
return cached || fetchPromise;
|
return cached || fetchPromise;
|
||||||
})
|
})
|
||||||
@@ -61,35 +55,27 @@ self.addEventListener('fetch', (event) => {
|
|||||||
|
|
||||||
self.addEventListener('push', (event) => {
|
self.addEventListener('push', (event) => {
|
||||||
if (!event.data) return;
|
if (!event.data) return;
|
||||||
|
|
||||||
const data = event.data.json();
|
const data = event.data.json();
|
||||||
const options = {
|
|
||||||
body: data.body,
|
|
||||||
icon: '/icons/icon-192.png',
|
|
||||||
badge: '/icons/badge.png',
|
|
||||||
vibrate: [100, 50, 100],
|
|
||||||
data: {
|
|
||||||
url: data.url || '/',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
self.registration.showNotification(data.title || 'Dumpster', options)
|
self.registration.showNotification(data.title || 'Dumpster', {
|
||||||
|
body: data.body,
|
||||||
|
icon: '/icons/icon-192.png',
|
||||||
|
badge: '/icons/icon-192.png',
|
||||||
|
vibrate: [100, 50, 100],
|
||||||
|
data: { url: data.url || '/' },
|
||||||
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
self.addEventListener('notificationclick', (event) => {
|
self.addEventListener('notificationclick', (event) => {
|
||||||
event.notification.close();
|
event.notification.close();
|
||||||
|
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((clientList) => {
|
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((list) => {
|
||||||
// Focus existing window if available
|
for (const client of list) {
|
||||||
for (const client of clientList) {
|
|
||||||
if (client.url.includes(event.notification.data.url) && 'focus' in client) {
|
if (client.url.includes(event.notification.data.url) && 'focus' in client) {
|
||||||
return client.focus();
|
return client.focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Otherwise open new window
|
|
||||||
return clients.openWindow(event.notification.data.url);
|
return clients.openWindow(event.notification.data.url);
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user