@realtimexsco/live-chat 1.5.4 → 1.5.6

package/dist/firebase-messaging-sw.js

@@ -17,12 +17,28 @@ importScripts(
 
 var PUSH_BROADCAST_CHANNEL = "realtimex-push";
 var NOTIFICATION_CLICK_SW_TYPE = "realtimex:notification-click";
+var CHAT_HEARTBEAT_SW_TYPE = "realtimex:chat-heartbeat";
 var PUSH_DATA_CACHE = "realtimex-push-data-v1";
 var TAG_PREFIX = "realtimex-";
 
 /** In-memory fallback when Cache API or FCM click data is empty. */
 var pendingPushDataStore = {};
 
+// Last time any tab told us its ForegroundPushBridge is mounted and can
+// show its own in-app toast (see CHAT_HEARTBEAT_SW_TYPE above). A visible
+// tab is not the same thing as a tab with the chat UI actually mounted —
+// the host app can be open and focused on a completely unrelated route —
+// so "tab visible" alone isn't safe grounds to suppress the OS
+// notification for a background push.
+var lastChatHeartbeatAt = 0;
+var CHAT_HEARTBEAT_STALE_MS = 30000;
+
+self.addEventListener("message", function (event) {
+  if (event.data && event.data.type === CHAT_HEARTBEAT_SW_TYPE) {
+    lastChatHeartbeatAt = Date.now();
+  }
+});
+
 var params = new URL(self.location.href).searchParams;
 var rawConfig = params.get("config");
 
@@ -93,15 +109,6 @@ function cachePendingOpen(data) {
   });
 }
 
-function isChatClient(client) {
-  try {
-    var pathname = new URL(client.url).pathname || "";
-    return pathname === "/chat" || pathname.indexOf("/chat/") === 0;
-  } catch (e) {
-    return false;
-  }
-}
-
 function notifyPage(message) {
   try {
     var bc = new BroadcastChannel(PUSH_BROADCAST_CHANNEL);
@@ -309,14 +316,21 @@ if (rawConfig) {
           var hasVisibleClient = windowClients.some(function (client) {
             return client.visibilityState === "visible";
           });
-          // Regular messages: a visible tab is assumed to show its own in-app
-          // toast, so skip the OS notification. Calls skip that assumption —
-          // the in-app ringing dialog only exists while the user is actually
-          // on the chat screen (ChatMain mounted), so a visible-but-elsewhere
-          // tab still needs the OS notification or the call goes unnoticed.
-          if (hasVisibleClient && !isCall) {
+          var chatBridgeActive =
+            Date.now() - lastChatHeartbeatAt < CHAT_HEARTBEAT_STALE_MS;
+          // Regular messages: only skip the OS notification when a tab is
+          // both visible AND actually has the chat UI mounted (recent
+          // heartbeat) — that's what makes the in-app toast path real. A
+          // visible tab elsewhere in the host app (chat widget not mounted,
+          // e.g. a different route) can't render that toast, so it still
+          // needs the OS notification for DMs and group messages alike, same
+          // as a backgrounded/closed tab. Calls skip this assumption
+          // entirely — the in-app ringing dialog only exists while the user
+          // is actually on the chat screen, so a visible-but-elsewhere tab
+          // still needs the OS notification or the call goes unnoticed.
+          if (hasVisibleClient && chatBridgeActive && !isCall) {
             console.log(
-              "[realtimex-push] app visible — skip OS notification (use in-app toast)",
+              "[realtimex-push] chat UI active in a visible tab — skip OS notification (use in-app toast)",
             );
             return;
           }
@@ -373,27 +387,18 @@ function deliverNotificationClick(data) {
   return clients
     .matchAll({ type: "window", includeUncontrolled: true })
     .then(function (windowClients) {
-      var chatClient = null;
-      var anyClient = null;
-
-      for (var i = 0; i < windowClients.length; i++) {
-        var client = windowClients[i];
-        if (!anyClient) anyClient = client;
-        if (!chatClient && isChatClient(client)) chatClient = client;
-      }
-
-      var target = chatClient || anyClient;
+      // Any open tab of this app already gets `message` via
+      // notifyPage()'s BroadcastChannel below, regardless of which route
+      // it's on — the chat widget can be mounted anywhere in a host app,
+      // there's no fixed "/chat" page to require a match against. Focus
+      // whichever tab is already open instead of guessing its route; only
+      // open a brand new window when there's genuinely no tab open at all.
+      var target = windowClients[0];
 
       if (target && "focus" in target) {
         return target.focus().then(function () {
           notifyPage(message);
           if (target.postMessage) target.postMessage(message);
-
-          if (conversationId && !isChatClient(target) && clients.openWindow) {
-            return cachePendingOpen(data).then(function () {
-              return clients.openWindow(targetUrl);
-            });
-          }
           return undefined;
         });
       }