ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Service Worker: Fix "disabled" error (#3289)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-06-14 13:25:48 +02:00
parent 5c275d16f4
commit d2a7996ea1
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/serviceWorker.ts
View File

@ -1,3 +1,4 @@
import { DEBUG } from './config';
import { respondForProgressive } from './serviceWorker/progressive'; import { respondForProgressive } from './serviceWorker/progressive';
import { respondForDownload } from './serviceWorker/download'; import { respondForDownload } from './serviceWorker/download';
import { respondWithCache, clearAssetCache, respondWithCacheNetworkFirst } from './serviceWorker/assetCache'; import { respondWithCache, clearAssetCache, respondWithCacheNetworkFirst } from './serviceWorker/assetCache';
@ -16,10 +17,8 @@ const RE_NETWORK_FIRST_ASSETS = /\.(wasm|html)$/;
const RE_CACHE_FIRST_ASSETS = /[\da-f]{20}.*\.(js|css|woff2?|svg|png|jpg|jpeg|tgs|json|wasm)$/; const RE_CACHE_FIRST_ASSETS = /[\da-f]{20}.*\.(js|css|woff2?|svg|png|jpg|jpeg|tgs|json|wasm)$/;
const ACTIVATE_TIMEOUT = 3000; const ACTIVATE_TIMEOUT = 3000;
const TEMP_DEBUG = true;
self.addEventListener('install', (e) => { self.addEventListener('install', (e) => {
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('ServiceWorker installed'); console.log('ServiceWorker installed');
} }
@ -29,7 +28,7 @@ self.addEventListener('install', (e) => {
}); });
self.addEventListener('activate', (e) => { self.addEventListener('activate', (e) => {
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('ServiceWorker activated'); console.log('ServiceWorker activated');
} }

22
src/util/setupServiceWorker.ts
View File

@ -1,4 +1,4 @@
import { DEBUG_MORE, IS_TEST } from '../config'; import { DEBUG, DEBUG_MORE, IS_TEST } from '../config';
import { getActions } from '../global'; import { getActions } from '../global';
import { formatShareText } from './deeplink'; import { formatShareText } from './deeplink';
import { IS_ANDROID, IS_IOS, IS_SERVICE_WORKER_SUPPORTED } from './windowEnvironment'; import { IS_ANDROID, IS_IOS, IS_SERVICE_WORKER_SUPPORTED } from './windowEnvironment';
@ -12,8 +12,6 @@ type WorkerAction = {
const IGNORE_WORKER_PATH = '/k/'; const IGNORE_WORKER_PATH = '/k/';
const TEMP_DEBUG = true;
function handleWorkerMessage(e: MessageEvent) { function handleWorkerMessage(e: MessageEvent) {
const action: WorkerAction = e.data; const action: WorkerAction = e.data;
if (DEBUG_MORE) { if (DEBUG_MORE) {
@ -54,7 +52,7 @@ if (IS_SERVICE_WORKER_SUPPORTED) {
const registrations = await navigator.serviceWorker.getRegistrations(); const registrations = await navigator.serviceWorker.getRegistrations();
const ourRegistrations = registrations.filter((r) => !r.scope.includes(IGNORE_WORKER_PATH)); const ourRegistrations = registrations.filter((r) => !r.scope.includes(IGNORE_WORKER_PATH));
if (ourRegistrations.length) { if (ourRegistrations.length) {
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('[SW] Hard reload detected, re-enabling Service Worker'); console.log('[SW] Hard reload detected, re-enabling Service Worker');
} }
@ -64,30 +62,26 @@ if (IS_SERVICE_WORKER_SUPPORTED) {
await navigator.serviceWorker.register(new URL('../serviceWorker.ts', import.meta.url)); await navigator.serviceWorker.register(new URL('../serviceWorker.ts', import.meta.url));
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('[SW] ServiceWorker registered'); console.log('[SW] ServiceWorker registered');
} }
await navigator.serviceWorker.ready; await navigator.serviceWorker.ready;
// eslint-disable-next-line no-console // Wait for registration to be available
console.log('Service Worker', navigator.serviceWorker?.controller?.scriptURL); await navigator.serviceWorker.getRegistration();
if (navigator.serviceWorker.controller) { if (navigator.serviceWorker.controller) {
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('[SW] ServiceWorker ready'); console.log('[SW] ServiceWorker ready');
} }
subscribeToWorker(); subscribeToWorker();
} else { } else {
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.error('[SW] ServiceWorker not available'); console.error('[SW] ServiceWorker not available');
// eslint-disable-next-line no-console
console.warn('Assigned registration', await navigator.serviceWorker.getRegistration());
// eslint-disable-next-line no-console
console.warn('Ready promise', navigator.serviceWorker?.ready);
} }
if (!IS_IOS && !IS_ANDROID && !IS_TEST) { if (!IS_IOS && !IS_ANDROID && !IS_TEST) {
@ -95,7 +89,7 @@ if (IS_SERVICE_WORKER_SUPPORTED) {
} }
} }
} catch (err) { } catch (err) {
if (TEMP_DEBUG) { if (DEBUG) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.error('[SW] ServiceWorker registration failed: ', err); console.error('[SW] ServiceWorker registration failed: ', err);
} }