kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-18 16:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup

Browse Source
This commit is contained in:
Jaifroid 2024-04-21 19:46:52 +01:00
parent 2425cbb44b
commit 7e20e4c297
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service-worker.js
View File

@ -256,8 +256,6 @@ if (typeof chrome !== 'undefined' && chrome.action) {
// Process install event // Process install event
self.addEventListener('install', function (event) { self.addEventListener('install', function (event) {
console.debug('[SW] Install Event processing'); console.debug('[SW] Install Event processing');
// DEV: We can't skip waiting because too many params are loaded at an early stage from the old file before the new one can activate...
// self.skipWaiting();
// We try to circumvent the browser's cache by adding a header to the Request, and it ensures all files are explicitly versioned // We try to circumvent the browser's cache by adding a header to the Request, and it ensures all files are explicitly versioned
var requests = precacheFiles.map(function (urlPath) { var requests = precacheFiles.map(function (urlPath) {
return new Request(urlPath + '?v' + appVersion, { cache: 'no-cache' }); return new Request(urlPath + '?v' + appVersion, { cache: 'no-cache' });
@ -275,6 +273,11 @@ self.addEventListener('install', function (event) {
}); });
}) })
); );
// .then(function () {
// // DEV: We can't skip waiting because too many params are loaded at an early stage from the old file before the new one can activate...
// // console.warn('Attempting to skip waiting...');
// // self.skipWaiting();
// });
})); }));
} }
}); });
@ -352,7 +355,7 @@ self.addEventListener('fetch', function (event) {
if (/\/dist\/(www|[^/]+?\.zim)\//.test(rqUrl) && !/\/dist\//.test(self.registration.scope)) return; if (/\/dist\/(www|[^/]+?\.zim)\//.test(rqUrl) && !/\/dist\//.test(self.registration.scope)) return;
// Filter darkReader request transformed by wombat.js // Filter darkReader request transformed by wombat.js
if (/\.zim.*\/www\/(?:js\/(?:lib\/)?darkreader\.min\.js|.*-\/s\/style-dark(?:-invert)?\.css)/.test(rqUrl)) { if (/\.zim.*\/www\/(?:js\/(?:lib\/)?darkreader\.min\.js|.*-\/s\/style-dark(?:-invert)?\.css)/.test(rqUrl)) {
rqUrl = rqUrl.replace(/^([^:]+:\/\/[^\/]+(?:[^\/]|\/(?![^\/]+\.zim\/))+)(?:[^\/]|\/(?!www\/))+/, '$1'); rqUrl = rqUrl.replace(/^([^:]+:\/\/[^/]+(?:[^/]|\/(?![^/]+\.zim\/))+)(?:[^/]|\/(?!www\/))+/, '$1');
} }
var urlObject = new URL(rqUrl); var urlObject = new URL(rqUrl);
// Test the URL with parameters removed // Test the URL with parameters removed