From 6c2a12c924434bdb6ba51b3f541464502d10283d Mon Sep 17 00:00:00 2001 From: artur Date: Mon, 5 Feb 2024 16:18:20 +0300 Subject: [PATCH] Fix updateUI to ensure all action windows are notified --- src/modules/backend.ts | 6 +++++- src/modules/swic.ts | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/modules/backend.ts b/src/modules/backend.ts index 97fb777..7c69419 100644 --- a/src/modules/backend.ts +++ b/src/modules/backend.ts @@ -160,10 +160,12 @@ export class NoauthBackend { const self = this swg.addEventListener('activate', (event) => { console.log('activate') +// swg.addEventListener('activate', event => event.waitUntil(swg.clients.claim())); }) swg.addEventListener('install', (event) => { console.log('install') +// swg.addEventListener('install', event => event.waitUntil(swg.skipWaiting())); }) swg.addEventListener('push', (event) => { @@ -972,7 +974,9 @@ export class NoauthBackend { } private async updateUI() { - const clients = await this.swg.clients.matchAll() + const clients = await this.swg.clients.matchAll({ + includeUncontrolled: true + }) console.log('updateUI clients', clients.length) for (const client of clients) { client.postMessage({}) diff --git a/src/modules/swic.ts b/src/modules/swic.ts index 6b429bc..ac5d0a1 100644 --- a/src/modules/swic.ts +++ b/src/modules/swic.ts @@ -17,7 +17,17 @@ export async function swicRegister() { }, }) - navigator.serviceWorker.ready.then((r) => (swr = r)) + navigator.serviceWorker.ready.then((r) => { + console.log("sw ready") + swr = r + if (navigator.serviceWorker.controller) { + console.log( + `This page is currently controlled by: ${navigator.serviceWorker.controller}`, + ); + } else { + console.log("This page is not currently controlled by a service worker."); + } + }) navigator.serviceWorker.addEventListener('message', (event) => { onMessage((event as MessageEvent).data)