|
1 | 1 | import { Env } from '@stencil/core'; |
2 | | -import { ServiceFacade } from "@smartcompanion/services"; |
| 2 | +import { ServiceFacade } from '@smartcompanion/services'; |
3 | 3 |
|
4 | | -const isServiceWorkerActive = () => new Promise<void>(resolve => { |
5 | | - navigator.serviceWorker.getRegistration().then(registration => { |
6 | | - if (registration && registration.active) { |
| 4 | +const isServiceWorkerReady = () => |
| 5 | + new Promise<void>((resolve) => { |
| 6 | + if (!('serviceWorker' in navigator)) { |
7 | 7 | resolve(); |
8 | | - } else if (!registration) { |
9 | | - console.warn("No service worker registration found."); |
10 | | - resolve(); |
11 | | - } else { |
12 | | - setTimeout(() => { |
13 | | - isServiceWorkerActive().then(resolve); |
14 | | - }, 500); |
| 8 | + return; |
15 | 9 | } |
| 10 | + |
| 11 | + navigator.serviceWorker |
| 12 | + .getRegistration() |
| 13 | + .then((registration) => { |
| 14 | + if (!registration) { |
| 15 | + console.warn('No service worker registration found.'); |
| 16 | + resolve(); |
| 17 | + return; |
| 18 | + } |
| 19 | + |
| 20 | + if (navigator.serviceWorker.controller) { |
| 21 | + resolve(); |
| 22 | + return; |
| 23 | + } |
| 24 | + |
| 25 | + // Fallback timeout to avoid hanging indefinitely |
| 26 | + const timerId = setTimeout(() => { |
| 27 | + console.warn('Service worker controller timed out, proceeding anyway.'); |
| 28 | + resolve(); |
| 29 | + }, 10000); |
| 30 | + |
| 31 | + // Wait for the SW to take control (fires after activate + clients.claim()) |
| 32 | + navigator.serviceWorker.addEventListener( |
| 33 | + 'controllerchange', |
| 34 | + () => { |
| 35 | + clearTimeout(timerId); |
| 36 | + resolve(); |
| 37 | + }, |
| 38 | + { once: true }, |
| 39 | + ); |
| 40 | + }) |
| 41 | + .catch(() => { |
| 42 | + console.warn('Service worker registration check failed, proceeding anyway.'); |
| 43 | + resolve(); |
| 44 | + }); |
16 | 45 | }); |
17 | | -}); |
18 | 46 |
|
19 | 47 | const serviceFacade = new ServiceFacade(); |
20 | 48 |
|
21 | 49 | serviceFacade.registerDefaultServices(); |
22 | 50 | serviceFacade.registerCollectibleAudioPlayerService(Env.TITLE); |
23 | 51 |
|
24 | | - |
25 | | -if (Env.OFFLINE_SUPPORT === "enabled") { |
| 52 | +if (Env.OFFLINE_SUPPORT === 'enabled') { |
26 | 53 | serviceFacade.registerOfflineLoadService( |
27 | | - () => fetch(Env.DATA_URL, { |
28 | | - cache: "no-store", |
29 | | - }).then(response => response.json()), |
30 | | - (url: string) => isServiceWorkerActive().then(() => fetch(url).then(response => response.text())), |
| 54 | + () => |
| 55 | + fetch(Env.DATA_URL) |
| 56 | + .then((response) => { |
| 57 | + if (!response.ok) throw new Error(`Data fetch failed: ${response.status}`); |
| 58 | + return response.json(); |
| 59 | + }) |
| 60 | + .catch((error) => { |
| 61 | + console.error('Failed to load data:', error); |
| 62 | + throw error; |
| 63 | + }), |
| 64 | + (url: string) => |
| 65 | + isServiceWorkerReady().then(() => |
| 66 | + fetch(url).then((response) => { |
| 67 | + if (!response.ok) throw new Error(`Asset fetch failed: ${response.status}`); |
| 68 | + return response.text(); |
| 69 | + }), |
| 70 | + ), |
31 | 71 | (_: string) => Promise.resolve(), |
32 | 72 | (_1: string, _2: string) => Promise.resolve(), |
33 | 73 | () => Promise.resolve([]), |
34 | | - ) |
| 74 | + ); |
35 | 75 | } else { |
36 | | - serviceFacade.registerOnlineLoadService(() => |
| 76 | + serviceFacade.registerOnlineLoadService(() => |
37 | 77 | fetch(Env.DATA_URL, { |
38 | | - cache: "no-store", |
39 | | - }).then(response => response.json()) |
| 78 | + cache: 'no-store', |
| 79 | + }).then((response) => response.json()), |
40 | 80 | ); |
41 | 81 | } |
42 | 82 |
|
|
0 commit comments