diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2026-06-18 14:22:18 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2026-06-18 14:22:18 +0300 |
| commit | f0b78f6562d109c1f1c76d8bd864ef9a7b1d8852 (patch) | |
| tree | ee546ca0e3aec2914d42e6b862ead5a7ea6e4627 | |
| parent | e8be5163b76ef7c4f735f1b9807062d94a3c9b8a (diff) | |
| download | the-epube-f0b78f6562d109c1f1c76d8bd864ef9a7b1d8852.tar.gz the-epube-f0b78f6562d109c1f1c76d8bd864ef9a7b1d8852.tar.xz | |
ensure getActiveCacheVersion() wouldn't get stuck
| -rw-r--r-- | src/app.js | 44 | ||||
| -rw-r--r-- | src/reader.js | 6 | ||||
| -rw-r--r-- | src/worker.js | 1 |
3 files changed, 34 insertions, 17 deletions
diff --git a/src/app.js b/src/app.js index 24f5b8d..e72da4f 100644 --- a/src/app.js +++ b/src/app.js @@ -60,40 +60,58 @@ class AppCommon { return navigator.onLine; } - async getActiveCacheName() { + async getActiveCacheName(timeoutMs = 1000) { const registration = await navigator.serviceWorker.ready; const worker = registration.active; + // Fast exit if no worker is active if (!worker) return null; - return new Promise((resolve) => { + return new Promise((resolve, reject) => { const channel = new MessageChannel(); + let timeoutId = null; - // Listen for the service worker's response channel.port1.onmessage = (event) => { - resolve(event.data.cacheName); + clearTimeout(timeoutId); // Clean up the timeout + resolve(event.data?.cacheName || null); }; - // Dispatch message to the service worker along with the response port + // 1. Set a timeout so it never gets stuck forever + timeoutId = setTimeout(() => { + channel.port1.onmessage = null; // Clean up listener + console.warn('Service worker did not respond to GET_CACHE_NAME'); + resolve(null); + }, timeoutMs); + + // 2. Send the message and transfer the port worker.postMessage({ type: 'GET_CACHE_NAME' }, [channel.port2]); }); } - async getActiveCacheVersion() { + async getActiveCacheVersion(timeoutMs = 1000) { const registration = await navigator.serviceWorker.ready; const worker = registration.active; + // Fast exit if no worker is active if (!worker) return null; - return new Promise((resolve) => { + return new Promise((resolve, reject) => { const channel = new MessageChannel(); + let timeoutId = null; - // Listen for the service worker's response channel.port1.onmessage = (event) => { - resolve(event.data.cacheName); + clearTimeout(timeoutId); // Clean up the timeout + resolve(event.data?.cacheName || null); }; - // Dispatch message to the service worker along with the response port + // 1. Set a timeout so it never gets stuck forever + timeoutId = setTimeout(() => { + channel.port1.onmessage = null; // Clean up listener + console.warn('Service worker did not respond to GET_CACHE_VERSION'); + resolve(null); + }, timeoutMs); + + // 2. Send the message and transfer the port worker.postMessage({ type: 'GET_CACHE_VERSION' }, [channel.port2]); }); } @@ -140,7 +158,7 @@ class AppClass extends AppCommon { cached_urls = []; /** @type{string} */ - version = BUILD_CACHE_VERSION; + cacheVersion = BUILD_CACHE_VERSION; /** @type{string} */ cosmeticVersion = BUILD_VERSION; @@ -149,7 +167,7 @@ class AppClass extends AppCommon { csrf_token = ""; async init() { - console.log('version', this.version, 'current, worker', await this.getActiveCacheVersion()); + console.log('cache version, current:', this.cacheVersion, 'worker:', await this.getActiveCacheVersion()); // Read URL params for mode/query/offset this.index_mode = this.urlParam("mode") || ""; @@ -389,7 +407,7 @@ class AppClass extends AppCommon { } async offlineInit() { - console.log('version', this.version, 'current, worker', await this.getActiveCacheVersion()); + console.log('cache version, current:', this.cacheVersion, 'worker:', await this.getActiveCacheVersion()); if (typeof EpubeApp != "undefined") { $(".navbar").hide(); diff --git a/src/reader.js b/src/reader.js index f436810..8f8e784 100644 --- a/src/reader.js +++ b/src/reader.js @@ -26,7 +26,7 @@ class ReaderClass extends AppCommon { _prevent_lastread; - version = BUILD_CACHE_VERSION; + cacheVersion = BUILD_CACHE_VERSION; cosmeticVersion = BUILD_VERSION; @@ -110,7 +110,7 @@ class ReaderClass extends AppCommon { } async init() { - console.log('version', this.version, 'current, worker', await this.getActiveCacheVersion()); + console.log('cache version, current:', this.cacheVersion, 'worker:', await this.getActiveCacheVersion()); this.csrf_token = Cookie.get('epube_csrf_token'); @@ -706,7 +706,7 @@ class ReaderClass extends AppCommon { }); } - $(".last-mod-timestamp").html(`${this.cosmeticVersion} — ${this.version} + $(".last-mod-timestamp").html(`${this.cosmeticVersion} — ${this.cacheVersion} (${this.isOnline() ? `<span class='text-success'>Online</span>` : `<span class='text-danger'>Offline</span>`}) `); diff --git a/src/worker.js b/src/worker.js index 6ca94b5..44ea5b1 100644 --- a/src/worker.js +++ b/src/worker.js @@ -67,7 +67,6 @@ sw.addEventListener('message', (event) => { // Respond directly to the specific frontend window/tab that asked event.ports[0].postMessage({ cacheName: CACHE_VERSION }); } - }); // Activate: clean up old caches and take control of all pages |
