mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-01-10 20:17:32 +01:00
Code Issues Projects Releases Wiki Activity

claim clients immediately from service worker

Browse Source
This commit is contained in:
Bruno Windels 2020-10-16 14:52:34 +02:00
parent 743cdd0bea
commit 0ca926d427
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/service-worker.template.js
View File

@ -61,7 +61,12 @@ async function purgeOldCaches() {
} }
self.addEventListener('activate', (event) => { self.addEventListener('activate', (event) => {
event.waitUntil(purgeOldCaches()); event.waitUntil(Promise.all([
purgeOldCaches(),
// on a first page load/sw install,
// start using the service worker on all pages straight away
self.clients.claim()
]));
}); });
self.addEventListener('fetch', (event) => { self.addEventListener('fetch', (event) => {

24
src/ui/web/dom/ServiceWorkerHandler.js
View File

@ -25,6 +25,7 @@ export class ServiceWorkerHandler {
this._registration = null; this._registration = null;
this._navigation = navigation; this._navigation = navigation;
this._registrationPromise = null; this._registrationPromise = null;
this._currentController = null;
} }
registerAndStart(path) { registerAndStart(path) {
@ -32,6 +33,8 @@ export class ServiceWorkerHandler {
navigator.serviceWorker.addEventListener("message", this); navigator.serviceWorker.addEventListener("message", this);
navigator.serviceWorker.addEventListener("controllerchange", this); navigator.serviceWorker.addEventListener("controllerchange", this);
this._registration = await navigator.serviceWorker.register(path); this._registration = await navigator.serviceWorker.register(path);
await navigator.serviceWorker.ready;
this._currentController = navigator.serviceWorker.controller;
this._registrationPromise = null; this._registrationPromise = null;
console.log("Service Worker registered"); console.log("Service Worker registered");
this._registration.addEventListener("updatefound", this); this._registration.addEventListener("updatefound", this);
@ -76,7 +79,9 @@ export class ServiceWorkerHandler {
} }
async _tryActivateUpdate() { async _tryActivateUpdate() {
if (this._registration.waiting && this._registration.active) { // we don't do confirm when the tab is hidden because it will block the event loop and prevent
// events from the service worker to be processed (like controllerchange when the visible tab applies the update).
if (!document.hidden && this._registration.waiting && this._registration.active) {
this._registration.waiting.removeEventListener("statechange", this); this._registration.waiting.removeEventListener("statechange", this);
const version = await this._sendAndWaitForReply("version", null, this._registration.waiting); const version = await this._sendAndWaitForReply("version", null, this._registration.waiting);
if (confirm(`Version ${version.version} (${version.buildHash}) is ready to install. Apply now?`)) { if (confirm(`Version ${version.version} (${version.buildHash}) is ready to install. Apply now?`)) {
@ -98,11 +103,18 @@ export class ServiceWorkerHandler {
this._tryActivateUpdate(); this._tryActivateUpdate();
break; break;
case "controllerchange": case "controllerchange":
// active service worker changed, if (!this._currentController) {
// refresh, so we can get all assets // Clients.claim() in the SW can trigger a controllerchange event
// (and not some if we would not refresh) // if we had no SW before. This is fine,
// up to date from it // and now our requests will be served from the SW.
document.location.reload(); this._currentController = navigator.serviceWorker.controller;
} else {
// active service worker changed,
// refresh, so we can get all assets
// (and not some if we would not refresh)
// up to date from it
document.location.reload();
}
break; break;
} }
} }