Merge pull request #663 from unoplatform/mergify/bp/release/stable/7.…

…0/pr-660 Adjust service worker installation (backport #660)
unoplatform · Jan 26, 2023 · 4920af8 · 4920af8
2 parents 6679763 + 2e19592
commit 4920af8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.cs b/src/Uno.Wasm.Bootstrap/ShellTask.cs
@@ -258,8 +258,8 @@ public override bool Execute()
  ExtractAdditionalCSS();
  CleanupDist();
  PrepareFinalDist();
- GenerateConfig();
  TouchServiceWorker();
+ GenerateConfig();
  MergeConfig();
  GenerateIndexHtml();
  GenerateEmbeddedJs();

diff --git a/src/Uno.Wasm.Bootstrap/WasmScripts/service-worker.js b/src/Uno.Wasm.Bootstrap/WasmScripts/service-worker.js
@@ -5,9 +5,19 @@ console.debug("[ServiceWorker] Initializing");
 self.addEventListener('install', function (e) {
  console.debug('[ServiceWorker] Installing offline worker');
  e.waitUntil(
- caches.open('$(CACHE_KEY)').then(function (cache) {
+ caches.open('$(CACHE_KEY)').then(async function (cache) {
  console.debug('[ServiceWorker] Caching app binaries and content');
- return cache.addAll(config.offline_files);
+
+ // Add files one by one to avoid failed downloads to prevent the
+ // worker to fail installing.
+ for (var i = 0; i < config.offline_files.length; i++) {
+ try {
+ await cache.add(config.offline_files[i]);
+ }
+ catch (e) {
+ console.debug(`[ServiceWorker] Failed to fetch ${config.offline_files[i]}`);
+ }
+ }
  })
  );
 });