1 files changed, 21 insertions, 3 deletions
diff --git a/src/features/nwc.js b/src/features/nwc.js
index ec79081..9c71a7f 100644
--- a/src/features/nwc.js
+++ b/src/features/nwc.js
@@ -822,6 +822,25 @@ export function nwcFeature(ctx) {
   // wrong keys — background wake-ups silently die the first time a
   // connection is recreated. Debounced; the server replaces by endpoint.
   let regTimer = null;
+  // The browser's subscription, made again when it's gone: iOS drops it after
+  // three pushes that showed no notification (and a key rotation strands an
+  // old one), and nothing else re-arms a wallet whose `background` is still on.
+  async function currentSub() {
+    const reg = await navigator.serviceWorker.ready;
+    const { publicKey } = await (await fetch(`${NOTIFIER}/vapid`)).json();
+    const want = b64ToBytes(publicKey);
+    let sub = await reg.pushManager.getSubscription();
+    if (sub) {
+      let have = [];
+      try { have = new Uint8Array(sub.options.applicationServerKey || []); } catch {}
+      if (have.length === want.length && have.every((b, i) => b === want[i])) return sub.toJSON();
+      try { await sub.unsubscribe(); } catch {}
+    }
+    if (typeof Notification === 'undefined' || Notification.permission !== 'granted') return null;
+    sub = await reg.pushManager.subscribe({ userVisibleOnly: true, applicationServerKey: want });
+    dlog('nwc: push subscription was gone, made a new one');
+    return sub.toJSON();
+  }
   function refreshRegistration() {
     if (!load().background) return;
     if (typeof navigator === 'undefined' || !('serviceWorker' in navigator)) return;
@@ -831,8 +850,7 @@ export function nwcFeature(ctx) {
         const pks = watchPks();
         if (!pks.length) return;
         const up2 = upEndpoint();
-        const sub = up2 ? { endpoint: up2, unifiedpush: true }
-          : await (await navigator.serviceWorker.ready).pushManager.getSubscription().then((x) => x && x.toJSON());
+        const sub = up2 ? { endpoint: up2, unifiedpush: true } : await currentSub();
         if (!sub) return;
         await fetch(`${NOTIFIER}/register`, {
           method: 'POST', headers: { 'content-type': 'application/json' },
@@ -949,7 +967,7 @@ export function nwcFeature(ctx) {
     if (typeof window !== 'undefined') {
       window.addEventListener('online', () => listen());
       document.addEventListener('visibilitychange', () => {
-        if (document.visibilityState === 'visible' && conns().length) listen();
+        if (document.visibilityState === 'visible' && conns().length) { listen(); refreshRegistration(); }
       });
     }
   }