1 files changed, 32 insertions, 4 deletions

diff --git a/src/features/messages.js b/src/features/messages.js
index ec564e8..9d03a86 100644
--- a/src/features/messages.js
+++ b/src/features/messages.js
@@ -53,7 +53,7 @@ import { animateZap, warmZapSound } from '../zap-animation.js';
 import { SIGNER_SILENT } from '../dm.js';
 import { cacheStorage, onCacheReady, cacheIsReady } from '../cache-store.js';
 import { dlog } from '../debug.js';
-import { createCalls, openCall, wrapCall, CALL_WRAP } from '../calls.js';
+import { createCalls, openCall, wrapCall, CALL_WRAP, RING_S } from '../calls.js';
 import { LIVE_KIND, LIVE_CHAT_KIND, LIVE_RELAYS, liveAddr, liveHost, liveTitle, liveSummary, liveImage, liveViewers, liveStarts, liveStream, liveRecording, liveStatus, isLiveNow, liveRelays, newestByAddr, zapLine, setZapAddr } from '../live.js';
 import { qrSvg } from '../qr.js';
 
@@ -2416,7 +2416,7 @@ export function messagesFeature(ctx) {
     // never sends what the user turned off (a suppressed-but-delivered push
     // would earn Chrome's generic "updated in background" nag instead)
     const want = (k) => s.reasons?.[k] !== false;
-    const reasons = { payment: want('payment'), zap: want('zap'), dm: want('dm'), mention: want('mention'), reaction: want('reaction') };
+    const reasons = { payment: want('payment'), zap: want('zap'), dm: want('dm'), mention: want('mention'), reaction: want('reaction'), call: want('call') };
     // Stamp the network: the same seed makes the same nostr pubkey on mainnet
     // AND staging, so without this the notifier fans a mainnet payment push
     // out to the staging PWA's subscription too — and tapping it opened
@@ -2480,6 +2480,7 @@ export function messagesFeature(ctx) {
       rowT(t('notifDm'), 'dm'),
       rowT(t('notifMention'), 'mention'),
       rowT(t('notifReaction'), 'reaction'),
+      rowT(t('notifCall'), 'call'),
       h('div', { class: 'small faint' }, t('notifChatHint')));
   }
 
@@ -2487,13 +2488,17 @@ export function messagesFeature(ctx) {
   // stranger's: our key (only if we actually hold one), who we follow, and the
   // names we already know. See dm-inbox.js for the threat model — a remote
   // signer stores no key here and simply gets unfiltered notifications.
-  let inboxAt = 0;
+  let inboxAt = 0, inboxTries = 0;
   async function syncInbox({ force = false } = {}) {
     if (!force && Date.now() - inboxAt < 5 * 60_000) return;
     inboxAt = Date.now();
     try {
       const id = await identity();
-      if (!id) return;
+      // the keys not there yet (a wallet still opening): try again shortly —
+      // this used to count as done for five minutes, and a phone woken by a
+      // push in that time had no key to open a DM or a call with
+      if (!id) { if (++inboxTries <= 10) { inboxAt = 0; setTimeout(() => { syncInbox().catch(() => {}); }, 3000); } return; }
+      inboxTries = 0;
       const evs = await queryOn([...new Set([...PROFILE_RELAYS, ...DM_RELAYS])],
         { kinds: [3], authors: [id.pubkey] }, 4000);
       const newest = evs.sort((a, b) => b.created_at - a.created_at)[0];
@@ -9106,6 +9111,18 @@ export function messagesFeature(ctx) {
       if (inner) { profileOf(inner.pubkey); await callsNow().handle(inner); return; }
     }
   }
+  // the call offer a push brought (sw-nwc.js keeps it): rung now, once
+  async function pendingCall() {
+    try {
+      if (typeof caches === 'undefined') return;
+      const cache = await caches.open('coinos-call');
+      const r = await cache.match('/__pending-call');
+      if (!r) return;
+      await cache.delete('/__pending-call');
+      const { offer, at } = await r.json();
+      if (offer && Date.now() - at < RING_S * 1000) await callsNow().handle(offer, { maxAge: RING_S });
+    } catch {}
+  }
   function startCall(peer, type) {
     if (typeof RTCPeerConnection === 'undefined' || !navigator.mediaDevices?.getUserMedia) { toast(t('callUnsupported')); return; }
     const cur = callsNow().call;
@@ -9133,6 +9150,10 @@ export function messagesFeature(ctx) {
     ringFor = want;
     clearInterval(ringTimer); ringTimer = null;
     try { navigator.vibrate && navigator.vibrate(0); } catch {}
+    // answered, declined or over: its "is calling" notification goes too
+    if (!want || want.endsWith(':offering')) {
+      try { navigator.serviceWorker?.ready.then((r) => r.getNotifications({ tag: 'call' })).then((ns) => { for (const n of ns || []) n.close(); }).catch(() => {}); } catch {}
+    }
     if (!want) return;
     const incoming = c.state === 'incoming';
     const beat = () => {
@@ -17111,8 +17132,15 @@ export function messagesFeature(ctx) {
       try {
         navigator.serviceWorker?.addEventListener('message', (ev) => {
           if (ev.data && ev.data.type === 'open' && ev.data.view === 'notifs') openNotifs();
+          // a call the worker was woken for: rung here too (an app in the
+          // background may have missed it live), or picked up from the tap
+          if (ev.data && ev.data.type === 'call-offer' && ev.data.offer) callsNow().handle(ev.data.offer, { maxAge: RING_S }).catch(() => {});
+          if (ev.data && ev.data.type === 'open' && ev.data.view === 'call') pendingCall();
         });
       } catch {}
+      // a tapped "is calling" opened the app, or brought it back: the offer the worker kept
+      setTimeout(pendingCall, 0);
+      document.addEventListener('visibilitychange', () => { if (document.visibilityState === 'visible') pendingCall(); });
       if (urlInvite && !pendingLink) {
         loadLinkInvite(urlInvite);
         setTimeout(() => { ui.chatOpen = true; ui.msgView = 'home'; render(); }, 0);