fix: harden hosted update fallback checks

Just-Insane · Just-Insane · commit 4f4dc2300190 · 2026-06-24T09:31:26.000-04:00
diff --git a/src/app/hooks/useSwUpdateAvailable.test.tsx b/src/app/hooks/useSwUpdateAvailable.test.tsx
@@ -141,6 +141,19 @@ describe('useSwUpdateAvailable', () => {
     vi.useRealTimers();
   });
 
+  it('still performs automatic hosted update checks when service workers are unavailable', async () => {
+    Object.defineProperty(window, 'navigator', {
+      configurable: true,
+      value: {},
+    });
+
+    renderHook(() => useSwUpdateAvailable());
+
+    await waitFor(() => {
+      expect(appUpdatesMocks.checkForAppUpdates).toHaveBeenCalledTimes(1);
+    });
+  });
+
   it('skips hidden checks and retries once the app becomes visible again', async () => {
     setVisibility('hidden');
 
diff --git a/src/app/hooks/useSwUpdateAvailable.ts b/src/app/hooks/useSwUpdateAvailable.ts
@@ -34,7 +34,6 @@ export function useSwUpdateAvailable(): boolean {
 
     const requestAutomaticUpdateCheck = () => {
       if (disposed) return;
-      if (!('serviceWorker' in navigator)) return;
       if (document.visibilityState === 'hidden' || updateCheckInFlight) return;
 
       updateCheckInFlight = true;
diff --git a/src/app/utils/appUpdates.test.ts b/src/app/utils/appUpdates.test.ts
@@ -386,7 +386,52 @@ describe('appUpdates', () => {
     expect((result as Error).message).toBe(
       'Failed to check for updates. Reload the app and try again.'
     );
-    expect(fetchMock).not.toHaveBeenCalled();
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('falls back to the hosted shell check when one service worker probe fails', async () => {
+    const currentRegistration = createRegistration('/current');
+    const secondaryRegistration = createRegistration('/secondary');
+    secondaryRegistration.update.mockRejectedValueOnce(new TypeError('network failed'));
+    fetchMock.mockResolvedValueOnce(
+      new Response(
+        `
+          <!doctype html>
+          <html>
+            <head>
+              <link rel="stylesheet" href="/assets/index-next.css" />
+            </head>
+            <body>
+              <script type="module" src="/assets/index-next.js"></script>
+            </body>
+          </html>
+        `,
+        { status: 200, headers: { 'Content-Type': 'text/html' } }
+      )
+    );
+
+    Object.defineProperty(window, 'navigator', {
+      configurable: true,
+      value: {
+        serviceWorker: {
+          controller: { postMessage: vi.fn() },
+          getRegistration: vi.fn().mockResolvedValue(currentRegistration),
+          getRegistrations: vi.fn().mockResolvedValue([currentRegistration, secondaryRegistration]),
+          ready: Promise.resolve(currentRegistration),
+          addEventListener: vi.fn(),
+          removeEventListener: vi.fn(),
+        },
+      },
+    });
+
+    const resultPromise = checkForAppUpdates();
+    await vi.runAllTimersAsync();
+
+    await expect(resultPromise).resolves.toEqual({
+      kind: 'update-available',
+      message: 'A newer hosted app version is ready to apply.',
+      canApply: true,
+    });
   });
 
   it('returns once any registration confirms an update', async () => {
@@ -771,6 +816,64 @@ describe('appUpdates', () => {
     expect(mockReloadWithTelemetry).toHaveBeenCalledWith('apply_pending_app_update');
   });
 
+  it('clears a stale hosted shell update detection after a later up-to-date check', async () => {
+    fetchMock
+      .mockResolvedValueOnce(
+        new Response(
+          `
+            <!doctype html>
+            <html>
+              <head>
+                <link rel="stylesheet" href="/assets/index-next.css" />
+              </head>
+              <body>
+                <script type="module" src="/assets/index-next.js"></script>
+              </body>
+            </html>
+          `,
+          { status: 200, headers: { 'Content-Type': 'text/html' } }
+        )
+      )
+      .mockResolvedValueOnce(
+        new Response(
+          `
+            <!doctype html>
+            <html>
+              <head>
+                <link rel="stylesheet" href="/assets/index-current.css" />
+              </head>
+              <body>
+                <script type="module" src="/assets/index-current.js"></script>
+              </body>
+            </html>
+          `,
+          { status: 200, headers: { 'Content-Type': 'text/html' } }
+        )
+      )
+      .mockRejectedValueOnce(new TypeError('network failed'));
+
+    const firstCheckPromise = checkForAppUpdates();
+    await vi.runAllTimersAsync();
+    await expect(firstCheckPromise).resolves.toEqual({
+      kind: 'update-available',
+      message: 'A newer hosted app version is ready to apply.',
+      canApply: true,
+    });
+
+    const secondCheckPromise = checkForAppUpdates();
+    await vi.runAllTimersAsync();
+    await expect(secondCheckPromise).resolves.toEqual({
+      kind: 'up-to-date',
+      message: 'You are already on the latest available web app version.',
+      canApply: false,
+    });
+
+    await applyPendingAppUpdate();
+
+    expect(mockClearClientCachesAndServiceWorkers).not.toHaveBeenCalled();
+    expect(mockReloadWithTelemetry).not.toHaveBeenCalled();
+  });
+
   it('reports hosted updates even when service workers are unavailable', async () => {
     mockHasServiceWorker.mockReturnValue(false);
     fetchMock.mockResolvedValueOnce(
diff --git a/src/app/utils/appUpdates.ts b/src/app/utils/appUpdates.ts
@@ -402,7 +402,7 @@ export async function checkForAppUpdates(): Promise<AppUpdateCheckResult> {
     };
   }
 
-  if (registrations.length > 0 && (successfulUpdates.length === 0 || rejectedUpdates.length > 0)) {
+  if (registrations.length > 0 && successfulUpdates.length === 0) {
     const firstError = rejectedUpdates[0]?.reason;
     throw firstError instanceof Error
       ? new Error(UPDATE_CHECK_FAILURE_MESSAGE, { cause: firstError })
@@ -419,6 +419,17 @@ export async function checkForAppUpdates(): Promise<AppUpdateCheckResult> {
     };
   }
 
+  if (hostedAppShellUpdateStatus === 'up-to-date') {
+    hostedAppShellUpdateDetected = false;
+  }
+
+  if (rejectedUpdates.length > 0) {
+    const firstError = rejectedUpdates[0]?.reason;
+    throw firstError instanceof Error
+      ? new Error(UPDATE_CHECK_FAILURE_MESSAGE, { cause: firstError })
+      : new Error(UPDATE_CHECK_FAILURE_MESSAGE);
+  }
+
   if (registrations.length === 0) {
     if (hostedAppShellUpdateStatus === 'up-to-date') {
       return {
