@realtimexsco/live-chat 1.4.4 → 1.4.6

package/dist/index.cjs

@@ -17458,6 +17458,7 @@ var getFirstAndLastNameOneCharacter = (name) => {
 };
 
 // src/notifications/ForegroundPushBridge.tsx
+init_normalize_helpers();
 init_useStore();
 
 // src/notifications/push.service.ts
@@ -17604,7 +17605,9 @@ var disablePushOnThisDevice = async () => {
 };
 var onForegroundPush = async (callback) => {
   const config = await apiGetPushConfig();
-  if (!config?.configured || !config.firebaseConfig) return () => void 0;
+  if (!config?.configured || !config.firebaseConfig) {
+    throw new Error("Push config unavailable (not configured or API not ready)");
+  }
   const { fb, messaging } = await getFirebaseMessaging(config.firebaseConfig);
   return fb.onMessage(messaging, (payload) => {
     callback({
@@ -17614,27 +17617,127 @@ var onForegroundPush = async (callback) => {
     });
   });
 };
-
-// src/notifications/ForegroundPushBridge.tsx
+var RETRY_DELAYS_MS = [1e3, 3e3, 8e3, 2e4];
+var recentToastIds = /* @__PURE__ */ new Set();
+var rememberToastId = (id) => {
+  if (!id) return true;
+  if (recentToastIds.has(id)) return false;
+  recentToastIds.add(id);
+  if (recentToastIds.size > 100) {
+    const keep = [...recentToastIds].slice(-50);
+    recentToastIds.clear();
+    keep.forEach((value) => recentToastIds.add(value));
+  }
+  return true;
+};
+var resolveIncomingConversationId = (data) => String(
+  data?.conversationId || data?.conversation_id || data?.conversationID || ""
+);
+var resolveToastText = (title, body) => {
+  if (title && body) return `${title}: ${body}`;
+  return title || body || "";
+};
+var emitToast = (payload, onPush) => {
+  if (onPush && onPush(payload) !== false) return;
+  const title = payload.title || payload.data?.title;
+  const body = payload.body || payload.data?.body || payload.data?.message;
+  const text = resolveToastText(title, body);
+  if (text) showNotification(text, "info");
+};
 var ForegroundPushBridge = ({ onPush }) => {
+  const lastDM = exports.useChatStore((s) => s.lastDM);
+  const onPushRef = React2.useRef(onPush);
+  onPushRef.current = onPush;
+  React2.useEffect(() => {
+    if (!lastDM) return;
+    if (typeof document !== "undefined" && document.visibilityState !== "visible") {
+      return;
+    }
+    const state = exports.useChatStore.getState();
+    const loggedUserId = String(state.loggedUserDetails?._id || "");
+    const conversationId = String(
+      resolveConversationIdForIncomingMessage(
+        lastDM,
+        state.conversations,
+        loggedUserId
+      ) || lastDM.conversationId || ""
+    );
+    const messageId2 = String(lastDM._id || lastDM.id || "");
+    const activeId = String(state.activeConversationId || "");
+    const senderId = String(
+      lastDM.sender?._id || lastDM.sender || lastDM.fromUserId || ""
+    );
+    if (!conversationId) return;
+    if (loggedUserId && senderId && senderId === loggedUserId) return;
+    if (activeId && conversationId === activeId) return;
+    if (!rememberToastId(messageId2)) return;
+    const isGroup = !!(lastDM.isGroup || lastDM.groupName || lastDM.conversationType === "group");
+    const title = isGroup ? lastDM.groupName || lastDM.name || "Group" : lastDM.sender?.name || "New message";
+    const body = typeof lastDM.content === "string" ? lastDM.content : lastDM.message?.content || (lastDM.attachments?.length ? "Sent an attachment" : "");
+    console.debug("[realtimex-push] socket \u2192 toast:", {
+      title,
+      conversationId,
+      activeConversationId: activeId
+    });
+    emitToast(
+      {
+        title,
+        body,
+        data: { conversationId, messageId: messageId2 }
+      },
+      onPushRef.current
+    );
+  }, [lastDM]);
   React2.useEffect(() => {
     let unsubscribe = null;
+    let retryTimer = null;
     let cancelled = false;
     const handlePayload = (payload) => {
-      const incoming = payload.data?.conversationId;
-      const activeId = exports.useChatStore.getState().activeConversationId;
-      if (incoming && activeId && incoming === activeId) return;
-      if (onPush && onPush(payload) !== false) return;
-      const text = payload.title ? payload.body ? `${payload.title}: ${payload.body}` : payload.title : payload.body;
-      if (text) showNotification(text, "info");
+      const incoming = resolveIncomingConversationId(payload.data);
+      const activeId = String(
+        exports.useChatStore.getState().activeConversationId || ""
+      );
+      const messageId2 = String(
+        payload.data?.messageId || payload.data?.message_id || payload.data?.messageID || ""
+      );
+      if (incoming && activeId && incoming === activeId) {
+        console.debug(
+          "[realtimex-push] foreground push suppressed (conversation open):",
+          incoming
+        );
+        return;
+      }
+      if (!rememberToastId(messageId2)) return;
+      console.debug("[realtimex-push] foreground push \u2192 toast:", {
+        title: payload.title,
+        conversationId: incoming,
+        activeConversationId: activeId
+      });
+      emitToast(payload, onPushRef.current);
     };
-    const start = async () => {
+    const start = async (attempt = 0) => {
       if (cancelled || unsubscribe || !getStoredPushToken()) return;
       try {
         const stop = await onForegroundPush(handlePayload);
         if (cancelled) stop();
-        else unsubscribe = stop;
-      } catch {
+        else {
+          unsubscribe = stop;
+          console.debug(
+            "[realtimex-push] foreground listener active"
+          );
+        }
+      } catch (error) {
+        if (cancelled || attempt >= RETRY_DELAYS_MS.length) {
+          console.debug(
+            "[realtimex-push] foreground listener NOT started:",
+            error instanceof Error ? error.message : error
+          );
+          return;
+        }
+        retryTimer = setTimeout(
+          () => void start(attempt + 1),
+          RETRY_DELAYS_MS[attempt]
+        );
       }
     };
     void start();
@@ -17649,11 +17752,19 @@ var ForegroundPushBridge = ({ onPush }) => {
     window.addEventListener(PUSH_CHANGED_EVENT, onPushChanged);
     return () => {
       cancelled = true;
+      if (retryTimer) clearTimeout(retryTimer);
       unsubscribe?.();
       window.removeEventListener(PUSH_CHANGED_EVENT, onPushChanged);
     };
-  }, [onPush]);
-  return null;
+  }, []);
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    reactHotToast.Toaster,
+    {
+      position: "top-right",
+      toastOptions: { duration: 4e3 },
+      containerStyle: { zIndex: 99999 }
+    }
+  );
 };
 var ChatMain = ({
   clientId,