Apply Bswup improvements (#12408)

.github/workflows/bit.ci.Bswup.yml

@@ -53,3 +53,11 @@ jobs:
 
     - name: dotnet build
       run: dotnet build src/Bswup/Bit.Bswup.slnx
+
+    # Runs against Bit.Bswup/wwwroot/*.js, which the build above produces, so this also covers
+    # the build step itself (e.g. the minifier re-introducing downleveled syntax).
+    - name: JS tests (service worker, page script, progress UI)
+      run: |
+        cd src/Bswup/Tests/bit-bswup-js
+        npm ci || npm install
+        npm test

src/Bswup/Bit.Bswup.Demo/Pages/HomePage.razor

@@ -3,7 +3,7 @@
 
 <PageTitle>Home</PageTitle>
 
-<h1>222</h1>
+<h1>111</h1>
 
 <h1>Hello, world!</h1>
 

src/Bswup/Bit.Bswup.Demo/wwwroot/index.html

@@ -106,17 +106,24 @@
                 case BswupMessage.activate: return console.log('new version activated:', data.version);
 
                 case BswupMessage.downloadStarted:
+                    // A background update downloads behind the running app - only a first
+                    // install owns the screen (firstInstall rides on every message).
+                    if (data?.firstInstall === false) return console.log('downloading update assets started:', data?.version);
                     appEl.style.display = 'none';
                     bswupEl.style.display = 'block';
                     return console.log('downloading assets started:', data?.version);
 
                 case BswupMessage.downloadProgress:
+                    // Built with textContent (not innerHTML) so asset names can never be
+                    // parsed as markup - the same hardening as the bundled progress script.
                     const li = document.createElement('li');
-                    li.innerHTML = `${data.index}: <b>${data.asset.url}</b>: ${data.asset.hash}`
+                    const urlEl = document.createElement('b');
+                    urlEl.textContent = data.asset.url;
+                    li.append(`${data.index}: `, urlEl, `: ${data.asset.hash}`);
                     assetsUl.prepend(li);
                     const percent = Math.round(data.percent);
                     progressBar.style.width = `${percent}%`;
-                    percentLabel.innerHTML = `${percent} %`;
+                    percentLabel.textContent = `${percent} %`;
                     return console.log('asset downloaded:', data);
 
                 case BswupMessage.downloadFinished:
@@ -137,16 +144,34 @@
                     reloadButton.style.display = 'block';
                     reloadButton.onclick = data.reload;
                     return console.log('new update ready.');
+
+                case BswupMessage.error:
+                    // This demo deliberately ships a 404ing external asset (see the dev
+                    // service-worker.js), so non-fatal errors are expected here: under the
+                    // default lax tolerance the install continues and the asset lazy-fills.
+                    console.error('installation error:', data);
+                    if (data.fatal === false) return;
+                    // A fatal failure during a background update leaves the running app
+                    // untouched - the previous worker keeps serving it.
+                    if (data.firstInstall === false) return;
+                    // Fatal first-install failure: bit-bswup.js force-starts Blazor from the
+                    // network; reveal the app instead of leaving it booted behind the splash.
+                    descriptionLabel.textContent = 'Install failed; starting without offline support...';
+                    appEl.style.display = 'block';
+                    bswupEl.style.display = 'none';
+                    return;
             }
         }
     </script>
     <script src="_framework/blazor.webassembly.js" autostart=false></script>
+    <!-- blazorScript is omitted on purpose: both default entry scripts
+         (blazor.web.js / blazor.webassembly.js) are auto-detected, fingerprints and
+         query strings included - the attribute is only needed for non-default paths. -->
     <script src="_content/Bit.Bswup/bit-bswup.js"
             scope="/"
             log="none"
             sw="service-worker.js"
-            handler="bitBswupHandler"
-            blazorScript="_framework/blazor.webassembly.js"></script>
+            handler="bitBswupHandler"></script>
 </body>
 
 </html>

src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js

@@ -2,13 +2,15 @@
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
-self.precachedAssetsInclude = [/favicon\.ico$/, /icon-512\.png$/, /bit-bw-64\.png$/];
 
 self.externalAssets = [
     {
         "url": "not-found/script.file.js"
     }
 ];
+// 'lax' is already the default; it is spelled out here because the demo intentionally
+// references a non-existent asset to exercise the progress / error reporting UI, and under
+// 'strict' that would abort the install. See README.md > errorTolerance.
 self.errorTolerance = 'lax';
 
 self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');

src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js

@@ -2,14 +2,19 @@
 
 self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
 self.caseInsensitiveUrl = true;
-self.precachedAssetsInclude = [/favicon\.ico$/, /icon-512\.png$/, /bit-bw-64\.png$/];
 
 //self.externalAssets = [
 //    {
 //        "url": "not-found/script.file.js"
 //    }
 //];
-//self.errorTolerance = 'lax';
+
+//// Resiliency knobs (see the Bswup README for details):
+//self.errorTolerance = 'strict';           // abort the install if any asset fails ('lax' = best-effort lazy-fill, the default)
+//self.maxRetries = 2;                      // extra download attempts on transient failures (408/429/5xx, dropped connections)
+//self.retryDelay = 300;                    // base backoff in ms between those retries (exponential, with jitter)
+//self.enableIntegrityCheck = true;         // attach SRI hashes so tampered assets are rejected (requires byte-identical serving)
+//self.cacheVersion = '2026.07.24-abc1234'; // pin/bump the cache bucket independently of the asset manifest
 
 self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');
 

src/Bswup/Bit.Bswup.slnx

@@ -7,12 +7,12 @@
     <File Path="README.md" />
   </Folder>
   <Folder Name="/FullDemo/">
-    <Project Path="FullDemo/Client/Bit.Bswup.Demo.Client.csproj" />
-    <Project Path="FullDemo/Server/Bit.Bswup.Demo.Server.csproj" />
+    <Project Path="FullDemo/Client/Bit.Bswup.FullDemo.Client.csproj" />
+    <Project Path="FullDemo/Server/Bit.Bswup.FullDemo.Server.csproj" />
   </Folder>
   <Folder Name="/NewDemo/">
-    <Project Path="Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj" />
-    <Project Path="Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj" />
+    <Project Path="NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj" />
+    <Project Path="NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj" />
   </Folder>
   <Project Path="Bit.Bswup.Demo/Bit.Bswup.Demo.csproj" />
   <Project Path="Bit.Bswup/Bit.Bswup.csproj" />