@realtimexsco/live-chat 1.4.8 → 1.4.9

package/dist/firebase-messaging-sw.js

@@ -4,15 +4,9 @@
  * /firebase-messaging-sw.js:
  *
  *   cp node_modules/@realtimexsco/live-chat/dist/firebase-messaging-sw.js public/
- *
- * Do NOT edit the Firebase config into this file — the chat package passes it
- * via the registration URL (?config=...), so the copy stays generic.
- *
- * If your app already has its own service worker at the root scope, merge the
- * contents of this file into it instead (two workers cannot share a scope).
  */
 
-/* global firebase, importScripts */
+/* global firebase, importScripts, BroadcastChannel */
 
 importScripts(
   "https://www.gstatic.com/firebasejs/10.14.1/firebase-app-compat.js",
@@ -21,29 +15,36 @@ importScripts(
   "https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging-compat.js",
 );
 
+var PUSH_BROADCAST_CHANNEL = "realtimex-push";
+var NOTIFICATION_CLICK_SW_TYPE = "realtimex:notification-click";
+
 var params = new URL(self.location.href).searchParams;
 var rawConfig = params.get("config");
 
 if (rawConfig) {
   try {
     var firebaseConfig = JSON.parse(rawConfig);
-
     firebase.initializeApp(firebaseConfig);
-
-    // Background messages that carry a `notification` payload are displayed
-    // by FCM automatically; initializing messaging here is what enables it.
     var messaging = firebase.messaging();
 
-    // Log full backend payload when a push arrives in the background.
-    // Check this in DevTools → Application → Service Workers → console,
-    // or Chrome → chrome://serviceworker-internals
     messaging.onBackgroundMessage(function (payload) {
       console.log("[realtimex-push] FCM background payload (raw):", payload);
       console.log("[realtimex-push] FCM background data:", payload && payload.data);
-      console.log(
-        "[realtimex-push] FCM background notification:",
-        payload && payload.notification,
-      );
+
+      var title =
+        (payload.notification && payload.notification.title) || "New message";
+      var body = (payload.notification && payload.notification.body) || "";
+      var data = payload.data || {};
+      var tag = "realtimex-" + (data.conversationId || data.messageId || "push");
+
+      // Show notification ourselves so click always carries `data` for redirect.
+      // Same tag replaces FCM auto-notification when both fire.
+      return self.registration.showNotification(title, {
+        body: body,
+        data: data,
+        tag: tag,
+        renotify: true,
+      });
     });
   } catch (error) {
     console.error("[realtimex] Invalid firebase config in SW URL:", error);
@@ -55,13 +56,22 @@ if (rawConfig) {
   );
 }
 
+function parseMaybeJson(value) {
+  if (typeof value !== "string") return value;
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return value;
+  }
+}
+
 function extractNotificationData(notification) {
   var raw = (notification && notification.data) || {};
+  var fcmMsg = parseMaybeJson(raw.FCM_MSG);
   var nested =
-    raw.FCM_MSG && raw.FCM_MSG.data && typeof raw.FCM_MSG.data === "object"
-      ? raw.FCM_MSG.data
-      : null;
+    fcmMsg && fcmMsg.data && typeof fcmMsg.data === "object" ? fcmMsg.data : null;
   var merged = {};
+
   if (nested) {
     for (var key in nested) {
       if (Object.prototype.hasOwnProperty.call(nested, key)) {
@@ -69,11 +79,13 @@ function extractNotificationData(notification) {
       }
     }
   }
+
   for (var key2 in raw) {
     if (Object.prototype.hasOwnProperty.call(raw, key2) && key2 !== "FCM_MSG") {
       merged[key2] = raw[key2];
     }
   }
+
   return merged;
 }
 
@@ -84,16 +96,14 @@ function resolveConversationId(data) {
       data.conversation_id ||
       data.conversationID ||
       "",
-  );
+  ).trim();
 }
 
 function buildTargetUrl(data, conversationId) {
   if (data && data.link) return String(data.link);
-
   if (conversationId) {
     return "/chat?conversationId=" + encodeURIComponent(conversationId);
   }
-
   return "/chat";
 }
 
@@ -106,7 +116,16 @@ function isChatClient(client) {
   }
 }
 
-// Focus (or open) the chat and tell the page which conversation to open.
+function notifyPage(message) {
+  try {
+    var bc = new BroadcastChannel(PUSH_BROADCAST_CHANNEL);
+    bc.postMessage(message);
+    bc.close();
+  } catch (e) {
+    // ignore
+  }
+}
+
 self.addEventListener("notificationclick", function (event) {
   event.notification.close();
 
@@ -119,8 +138,9 @@ self.addEventListener("notificationclick", function (event) {
   var conversationId = resolveConversationId(data);
   var targetUrl = buildTargetUrl(data, conversationId);
   var message = {
-    type: "realtimex:notification-click",
+    type: NOTIFICATION_CLICK_SW_TYPE,
     conversationId: conversationId,
+    data: data,
   };
 
   console.log("[realtimex-push] notificationclick extracted data:", data);
@@ -143,10 +163,12 @@ self.addEventListener("notificationclick", function (event) {
         var target = chatClient || anyClient;
         if (target && "focus" in target) {
           return target.focus().then(function () {
+            notifyPage(message);
             if (target.postMessage) target.postMessage(message);
           });
         }
 
+        notifyPage(message);
         if (clients.openWindow) return clients.openWindow(targetUrl);
         return undefined;
       }),

package/dist/index.cjs

@@ -4659,46 +4659,112 @@ init_store_helpers();
 init_store_helpers();
 var OPEN_CONVERSATION_EVENT = "realtimex:open-conversation";
 var NOTIFICATION_CLICK_SW_TYPE = "realtimex:notification-click";
+var PUSH_BROADCAST_CHANNEL = "realtimex-push";
 var PENDING_STORAGE_KEY = "realtimex:pending-open-conversation";
 var resolveConversationIdFromPushData = (data) => {
   if (!data || typeof data !== "object") return "";
-  const nested = data.FCM_MSG && typeof data.FCM_MSG === "object" ? data.FCM_MSG.data : void 0;
+  let fcmMsg = data.FCM_MSG;
+  if (typeof fcmMsg === "string") {
+    try {
+      fcmMsg = JSON.parse(fcmMsg);
+    } catch {
+      fcmMsg = void 0;
+    }
+  }
+  const nested = fcmMsg && typeof fcmMsg === "object" ? fcmMsg.data : void 0;
   const source = { ...nested || {}, ...data };
   return String(
     source.conversationId || source.conversation_id || source.conversationID || ""
-  );
+  ).trim();
+};
+var normalizePushMeta = (meta) => {
+  if (!meta || typeof meta !== "object") return {};
+  return {
+    senderId: String(
+      meta.senderId || meta.sender_id || ""
+    ).trim() || void 0,
+    kind: String(meta.kind || "").trim() || void 0,
+    messageId: String(
+      meta.messageId || meta.message_id || ""
+    ).trim() || void 0,
+    title: String(meta.title || "").trim() || void 0
+  };
+};
+var parsePendingRaw = (raw) => {
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed?.conversationId) {
+      return {
+        conversationId: String(parsed.conversationId).trim(),
+        ...normalizePushMeta(parsed)
+      };
+    }
+  } catch {
+  }
+  const id = String(raw).trim();
+  return id ? { conversationId: id } : null;
 };
-var peekPendingOpenConversation = () => {
+var peekPendingOpenConversation = () => peekPendingOpenRequest()?.conversationId ?? null;
+var peekPendingOpenRequest = () => {
   try {
-    return sessionStorage.getItem(PENDING_STORAGE_KEY);
+    return parsePendingRaw(sessionStorage.getItem(PENDING_STORAGE_KEY));
   } catch {
     return null;
   }
 };
-var consumePendingOpenConversation = () => {
-  const id = peekPendingOpenConversation();
+var consumePendingOpenConversation = () => consumePendingOpenRequest()?.conversationId ?? null;
+var consumePendingOpenRequest = () => {
+  const request = peekPendingOpenRequest();
   try {
     sessionStorage.removeItem(PENDING_STORAGE_KEY);
   } catch {
   }
-  return id;
+  return request;
 };
-var requestOpenConversation = (conversationId) => {
+var requestOpenConversation = (conversationId, meta) => {
   const id = String(conversationId || "").trim();
   if (!id) return;
+  const request = {
+    conversationId: id,
+    ...normalizePushMeta(meta)
+  };
+  console.log("[realtimex-push] requestOpenConversation:", request);
   try {
-    sessionStorage.setItem(PENDING_STORAGE_KEY, id);
+    sessionStorage.setItem(PENDING_STORAGE_KEY, JSON.stringify(request));
   } catch {
   }
   try {
     window.dispatchEvent(
-      new CustomEvent(OPEN_CONVERSATION_EVENT, {
-        detail: { conversationId: id }
-      })
+      new CustomEvent(OPEN_CONVERSATION_EVENT, { detail: request })
     );
   } catch {
   }
 };
+var buildChannelFromPushRequest = (request, loggedUserId, allUsers) => {
+  const conversationId = request.conversationId;
+  const isGroup = request.kind === "group";
+  const senderId = String(request.senderId || "").trim();
+  if (isGroup) {
+    const rawName2 = request.title || "Group Chat";
+    return {
+      id: conversationId,
+      conversationId,
+      name: rawName2.charAt(0).toUpperCase() + rawName2.slice(1),
+      isGroup: true
+    };
+  }
+  const senderUser = senderId ? (allUsers || []).find((user) => String(user._id) === senderId) : null;
+  const rawName = senderUser?.name || request.title || "New message";
+  return {
+    id: senderId || conversationId,
+    conversationId,
+    name: rawName.charAt(0).toUpperCase() + rawName.slice(1),
+    image: senderUser?.image || void 0,
+    email: senderUser?.email,
+    isGroup: false
+  };
+};
 var mapConversationToChannel = (conversation, loggedUserId, allUsers) => {
   const conversationId = String(conversation?._id || conversation?.id || "");
   const isGroup = isGroupConversation(conversation);
@@ -4743,34 +4809,46 @@ var readConversationIdFromLocation = () => {
   }
 };
 var consumedUrlConversationIds = /* @__PURE__ */ new Set();
+var handleNotificationOpen = (conversationId, pushData, options) => {
+  const id = String(conversationId || "").trim();
+  if (!id) {
+    console.warn("[realtimex-push] notification open ignored \u2014 no conversationId", pushData);
+    return;
+  }
+  requestOpenConversation(id, pushData);
+  const chatPath = options.chatPath || "/chat";
+  const pathWithQuery = `${chatPath}?conversationId=${encodeURIComponent(id)}`;
+  options.onNavigate?.(id, pathWithQuery);
+};
 var installNotificationClickBridge = (options = {}) => {
   if (typeof window === "undefined") return () => void 0;
-  const chatPath = options.chatPath || "/chat";
-  const handleOpen = (conversationId) => {
-    const id = String(conversationId || "").trim();
-    if (!id) return;
-    requestOpenConversation(id);
-    const pathWithQuery = `${chatPath}?conversationId=${encodeURIComponent(id)}`;
-    options.onNavigate?.(id, pathWithQuery);
-  };
   const onSwMessage = (event) => {
     const data = event.data;
     console.log("[realtimex-push] SW \u2192 page message:", data);
     if (!data || data.type !== NOTIFICATION_CLICK_SW_TYPE) return;
-    console.log(
-      "[realtimex-push] notification click conversationId:",
-      data.conversationId
-    );
-    handleOpen(String(data.conversationId || ""));
+    const pushData = data.data && typeof data.data === "object" ? data.data : void 0;
+    const conversationId = String(data.conversationId || "") || resolveConversationIdFromPushData(pushData);
+    console.log("[realtimex-push] notification click \u2192 open:", {
+      conversationId,
+      pushData
+    });
+    handleNotificationOpen(conversationId, pushData, options);
   };
   navigator.serviceWorker?.addEventListener("message", onSwMessage);
+  let broadcast = null;
+  try {
+    broadcast = new BroadcastChannel(PUSH_BROADCAST_CHANNEL);
+    broadcast.onmessage = onSwMessage;
+  } catch {
+  }
   const fromUrl = readConversationIdFromLocation();
   if (fromUrl && !consumedUrlConversationIds.has(fromUrl)) {
     consumedUrlConversationIds.add(fromUrl);
-    handleOpen(fromUrl);
+    handleNotificationOpen(fromUrl, void 0, options);
   }
   return () => {
     navigator.serviceWorker?.removeEventListener("message", onSwMessage);
+    broadcast?.close();
   };
 };
 
@@ -4850,7 +4928,7 @@ var useChatController = () => {
   const allUsers = exports.useChatStore((s) => s.allUsers);
   const isFetchingConversations = exports.useChatStore((s) => s.isFetchingConversations);
   const conversations = exports.useChatStore((s) => s.conversations);
-  const [pendingOpenConversationId, setPendingOpenConversationId] = React2.useState(() => peekPendingOpenConversation());
+  const [pendingOpenRequest, setPendingOpenRequest] = React2.useState(() => peekPendingOpenRequest());
   const conversationsLength = exports.useChatStore(
     (s) => state.activeChannel?.conversationId ? 0 : s.conversations.length
   );
@@ -4881,32 +4959,42 @@ var useChatController = () => {
   });
   React2.useEffect(() => {
     const onOpen = (event) => {
-      const id = String(
-        event.detail?.conversationId || ""
-      ).trim();
-      if (id) setPendingOpenConversationId(id);
+      const detail = event.detail;
+      if (detail?.conversationId) {
+        console.log("[realtimex-push] OPEN_CONVERSATION_EVENT:", detail);
+        setPendingOpenRequest({
+          conversationId: String(detail.conversationId),
+          senderId: detail.senderId,
+          kind: detail.kind,
+          messageId: detail.messageId,
+          title: detail.title
+        });
+      }
     };
     window.addEventListener(OPEN_CONVERSATION_EVENT, onOpen);
     return () => window.removeEventListener(OPEN_CONVERSATION_EVENT, onOpen);
   }, []);
   React2.useEffect(() => {
-    if (!pendingOpenConversationId || !loggedUserDetails) return;
+    if (!pendingOpenRequest?.conversationId || !loggedUserDetails) return;
     let cancelled = false;
     const openPending = async () => {
-      const targetId = String(pendingOpenConversationId);
+      const targetId = String(pendingOpenRequest.conversationId);
+      console.log("[realtimex-push] opening conversation:", pendingOpenRequest);
       let conversation = conversations.find(
         (c) => String(c._id || c.id) === targetId
       ) || null;
       if (!conversation) {
-        const fromInfo = conversationInfos[targetId];
-        if (fromInfo) conversation = fromInfo;
+        conversation = conversationInfos[targetId] || null;
       }
       if (!conversation) {
-        if (isFetchingConversations) return;
+        if (isFetchingConversations) {
+          console.log("[realtimex-push] waiting for conversations list\u2026");
+          return;
+        }
         try {
           await fetchConversationInfo2(targetId);
-        } catch {
-          return;
+        } catch (error) {
+          console.warn("[realtimex-push] fetchConversationInfo failed:", error);
         }
         if (cancelled) return;
         const stateNow = exports.useChatStore.getState();
@@ -4914,12 +5002,17 @@ var useChatController = () => {
           (c) => String(c._id || c.id) === targetId
         ) || stateNow.conversationInfos[targetId] || null;
       }
-      if (!conversation || cancelled) return;
-      const channel = mapConversationToChannel(
+      const channel = conversation ? mapConversationToChannel(
         conversation,
         loggedUserDetails._id,
         allUsers
+      ) : buildChannelFromPushRequest(
+        pendingOpenRequest,
+        loggedUserDetails._id,
+        allUsers
       );
+      console.log("[realtimex-push] selected channel:", channel);
+      if (cancelled) return;
       setState((prev) => {
         if (prev.activeChannel?.conversationId && String(prev.activeChannel.conversationId) === targetId) {
           return prev;
@@ -4930,15 +5023,16 @@ var useChatController = () => {
           activeConversationId: targetId
         };
       });
-      consumePendingOpenConversation();
-      setPendingOpenConversationId(null);
+      exports.useChatStore.getState().setActiveConversationId(targetId);
+      consumePendingOpenRequest();
+      setPendingOpenRequest(null);
     };
     void openPending();
     return () => {
       cancelled = true;
     };
   }, [
-    pendingOpenConversationId,
+    pendingOpenRequest,
     loggedUserDetails,
     conversations,
     conversationInfos,
@@ -17845,7 +17939,7 @@ var emitToast = (payload, onPush) => {
           type: "button",
           onClick: () => {
             toast2__default.default.dismiss(t.id);
-            requestOpenConversation(conversationId);
+            requestOpenConversation(conversationId, payload.data);
           },
           style: {
             display: "block",
@@ -18497,6 +18591,7 @@ exports.MessageItem = MessageItemView;
 exports.MessageList = ActiveChannelMessagesView_default;
 exports.NOTIFICATION_CLICK_SW_TYPE = NOTIFICATION_CLICK_SW_TYPE;
 exports.OPEN_CONVERSATION_EVENT = OPEN_CONVERSATION_EVENT;
+exports.PUSH_BROADCAST_CHANNEL = PUSH_BROADCAST_CHANNEL;
 exports.PUSH_CHANGED_EVENT = PUSH_CHANGED_EVENT;
 exports.PushNotificationToggle = PushNotificationToggle;
 exports.apiGetPushConfig = apiGetPushConfig;
@@ -18504,9 +18599,11 @@ exports.apiGetPushPreference = apiGetPushPreference;
 exports.apiRegisterPushToken = apiRegisterPushToken;
 exports.apiRemovePushToken = apiRemovePushToken;
 exports.apiUpdatePushPreference = apiUpdatePushPreference;
+exports.buildChannelFromPushRequest = buildChannelFromPushRequest;
 exports.capitalizeFirst = capitalizeFirst;
 exports.clampJumpDate = clampJumpDate;
 exports.consumePendingOpenConversation = consumePendingOpenConversation;
+exports.consumePendingOpenRequest = consumePendingOpenRequest;
 exports.default = index_default;
 exports.defaultChatClassNames = defaultChatClassNames;
 exports.defaultChatComponents = defaultChatComponents;
@@ -18527,6 +18624,7 @@ exports.mergeChatLayoutConfig = mergeChatLayoutConfig;
 exports.onForegroundPush = onForegroundPush;
 exports.packageDefaultComponents = packageDefaultComponents;
 exports.peekPendingOpenConversation = peekPendingOpenConversation;
+exports.peekPendingOpenRequest = peekPendingOpenRequest;
 exports.requestOpenConversation = requestOpenConversation;
 exports.resolveApiUrl = resolveApiUrl;
 exports.resolveChatApiKey = resolveChatApiKey;