From bc7512003eee6dd4ceef2a9c10d4032b9e8ecb45 Mon Sep 17 00:00:00 2001
From: elpatron <m.busche@gmail.com>
Date: Tue, 2 Jun 2026 20:26:04 +0200
Subject: [PATCH] fix: retrieve Service Worker registration directly via
 getRegistration() to avoid ready promise hangs

---
 client/src/services/pushNotifications.ts | 37 ++++++++++++++++--------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/client/src/services/pushNotifications.ts b/client/src/services/pushNotifications.ts
index 4ce5fdf..b16fa71 100644
--- a/client/src/services/pushNotifications.ts
+++ b/client/src/services/pushNotifications.ts
@@ -30,6 +30,27 @@ export function getNotificationPermission(): NotificationPermission | 'unsupport
 let cachedVapidKey: string | null = null
 let cachedRegistration: ServiceWorkerRegistration | null = null
 
+async function getRegistrationCompat(timeoutMs = 8000): Promise<ServiceWorkerRegistration> {
+  if (!('serviceWorker' in navigator)) {
+    throw new Error('Service Worker is not supported by your browser')
+  }
+
+  try {
+    const reg = await navigator.serviceWorker.getRegistration()
+    if (reg) return reg
+  } catch (e) {
+    console.warn('Failed to get service worker registration directly:', e)
+  }
+
+  // Fallback to waiting for ready state with a timeout
+  const readyPromise = navigator.serviceWorker.ready
+  const timeoutPromise = new Promise<never>((_, reject) =>
+    setTimeout(() => reject(new Error('Timeout waiting for Service Worker ready state')), timeoutMs)
+  )
+
+  return Promise.race([readyPromise, timeoutPromise])
+}
+
 export async function preloadPushService(): Promise<void> {
   if (!isPushSupported()) return
   try {
@@ -37,7 +58,7 @@ export async function preloadPushService(): Promise<void> {
       await fetchVapidPublicKey()
     }
     if (!cachedRegistration) {
-      cachedRegistration = await navigator.serviceWorker.ready
+      cachedRegistration = await getRegistrationCompat()
     }
   } catch (err) {
     console.warn('Failed to preload push service:', err)
@@ -172,14 +193,10 @@ export async function subscribeToPush(): Promise<void> {
     throw new Error('Push notifications are not supported on this device')
   }
 
-  // Pre-resolve registration with timeout to prevent silent hangs
+  // Pre-resolve registration using getRegistrationCompat to prevent ready state hangs
   let registration = cachedRegistration
   if (!registration) {
-    const readyPromise = navigator.serviceWorker.ready
-    const readyTimeout = new Promise<never>((_, reject) =>
-      setTimeout(() => reject(new Error('Timeout waiting for Service Worker ready state')), 8000)
-    )
-    registration = await Promise.race([readyPromise, readyTimeout])
+    registration = await getRegistrationCompat()
     cachedRegistration = registration
   }
 
@@ -214,11 +231,7 @@ export async function unsubscribeFromPush(): Promise<void> {
 
   let registration = cachedRegistration
   if (!registration) {
-    const readyPromise = navigator.serviceWorker.ready
-    const readyTimeout = new Promise<never>((_, reject) =>
-      setTimeout(() => reject(new Error('Timeout waiting for Service Worker ready state')), 8000)
-    )
-    registration = await Promise.race([readyPromise, readyTimeout])
+    registration = await getRegistrationCompat()
     cachedRegistration = registration
   }