@realtimexsco/live-chat 1.4.4 → 1.4.6

package/dist/index.d.mts

@@ -1648,18 +1648,6 @@ interface ForegroundPushBridgeProps {
      */
     onPush?: (payload: ForegroundPushPayload) => void | boolean;
 }
-/**
- * Slack-style routing for pushes that arrive while the tab is FOCUSED
- * (unfocused tabs / other apps are handled by the service worker, which shows
- * the OS notification):
- *
- *   - message belongs to the conversation currently open → suppressed
- *     entirely (the user is already reading it)
- *   - any other conversation → in-app toast
- *
- * Mounted automatically by ChatMain; does nothing until this device has
- * opted in to push (no firebase import, no listeners).
- */
-declare const ForegroundPushBridge: ({ onPush }: ForegroundPushBridgeProps) => null;
+declare const ForegroundPushBridge: ({ onPush }: ForegroundPushBridgeProps) => React.JSX.Element;
 
 export { type ActiveChannelMessagesSlotProps, type AdminsDrawerSlotProps, type AttachmentsDrawerSlotProps, type AvatarSlotProps, CHAT_API_KEYS, CHAT_GET_API_KEYS, Calendar, CalendarDayButton, Channel, type ChannelDetailsDrawerSlotProps, ChannelHeaderView as ChannelHeader, type ChannelHeaderSlotProps, ChannelListView as ChannelList, ChannelListItem, type ChannelListItemSlotProps, type ChannelListSlotProps, type ChannelMessageBoxSlotProps, Chat, type ChatActionModalSlotProps, ChatAlertsProvider, type ChatApiKey, ChatAvatar, type ChatCallContext, type ChatClassNames, type ChatColorMode, type ChatComponents, type ChatCustomizationConfig, ChatCustomizationProvider, ChatDateJumpMenu, type ChatDateTimePreferences, type ChatFeatures, type ChatGetApiKey, ChatLayout, type ChatLayoutConfig, type ChatLayoutSlotProps, ChatLocaleProvider, ChatMain, type ChatPanelAlertsSlotProps, type ChatQueryParams, type ChatQueryParamsByApi, ChatThemeProvider, ChatViewport, type ChatViewportHeight, DefaultChannelListItem, DefaultChatAvatar, DefaultChatLayout, ForegroundPushBridge, type ForegroundPushBridgeProps, type ForegroundPushPayload, ForwardModalView as ForwardModal, type ForwardModalSlotProps, HeaderCallActions, type HeaderCallActionsSlotProps, type HeaderLeftSideSlotProps, type HeaderRightSideSlotProps, type HeaderSearchOverlaySlotProps, type IAttachment, type IChannel, type IDMDelete, type IDMEditMessage, type IDMForward, type IDMMessage, type IDMPin, type IDMReaction, type IDMRead, type IDMStar, type IDMTyping, type IDMUnstar, type IMessage, type ISocketConfig, type JumpToPreset, LoggedUserDetails, type LoggedUserDetailsSlotProps, type MembersDrawerSlotProps, type MessageAttachmentsSlotProps, ChannelMessageBoxView as MessageInput, MessageItemView as MessageItem, type MessageItemSlotProps, ActiveChannelMessagesView as MessageList, type MessageReactionsSlotProps, type MessageReplySnippetSlotProps, type MessageStatusSlotProps, type MessageToolbarSlotProps, PUSH_CHANGED_EVENT, type PendingJump, type PermissionDrawerSlotProps, type PhoneCallButtonSlotProps, type PinnedMessagesDrawerSlotProps, type PushConfig, PushNotificationToggle, type PushNotificationToggleProps, type PushNotificationsState, type PushPreference, type StarredMessagesDrawerSlotProps, type UIConfig, type UsePushNotifications, type VideoCallButtonSlotProps, apiGetPushConfig, apiGetPushPreference, apiRegisterPushToken, apiRemovePushToken, apiUpdatePushPreference, capitalizeFirst, clampJumpDate, ChatMain as default, defaultChatClassNames, defaultChatComponents, defaultChatFeatures, defaultChatLayoutConfig, disablePushOnThisDevice, downloadFile, enablePushOnThisDevice, getChatBaseUrl, getChatQueryParamApis, getChatQueryParams, getChatQueryParamsByApi, getChatSocketUrl, getFirstAndLastNameOneCharacter, getResponsiveWidth, getSocketConfig, getStoredPushToken, isEmpty, isPushSupported, mergeChatCustomization, mergeChatLayoutConfig, onForegroundPush, packageDefaultComponents, resolveApiUrl, resolveChatApiKey, resolveJumpDateBounds, resolveJumpPreset, resolveJumpStep, resolveSocketUrl, setChatAccessToken, setChatBaseURL, setChatClientId, setChatQueryParamApis, setChatQueryParams, setChatQueryParamsByApi, setChatSocketUrl, showNotification, smoothScrollToMessage, socketService, startOfLocalDay, toDateInputValue, uniqueList, useChatAlerts, useChatContext, useChatController, useChatCustomization, useChatCustomizationOptional, useChatFeatures, useChatFeaturesOptional, useChatLocale, useStore as useChatStore, useChatTheme, usePushNotifications };

package/dist/index.d.ts

@@ -1648,18 +1648,6 @@ interface ForegroundPushBridgeProps {
      */
     onPush?: (payload: ForegroundPushPayload) => void | boolean;
 }
-/**
- * Slack-style routing for pushes that arrive while the tab is FOCUSED
- * (unfocused tabs / other apps are handled by the service worker, which shows
- * the OS notification):
- *
- *   - message belongs to the conversation currently open → suppressed
- *     entirely (the user is already reading it)
- *   - any other conversation → in-app toast
- *
- * Mounted automatically by ChatMain; does nothing until this device has
- * opted in to push (no firebase import, no listeners).
- */
-declare const ForegroundPushBridge: ({ onPush }: ForegroundPushBridgeProps) => null;
+declare const ForegroundPushBridge: ({ onPush }: ForegroundPushBridgeProps) => React.JSX.Element;
 
 export { type ActiveChannelMessagesSlotProps, type AdminsDrawerSlotProps, type AttachmentsDrawerSlotProps, type AvatarSlotProps, CHAT_API_KEYS, CHAT_GET_API_KEYS, Calendar, CalendarDayButton, Channel, type ChannelDetailsDrawerSlotProps, ChannelHeaderView as ChannelHeader, type ChannelHeaderSlotProps, ChannelListView as ChannelList, ChannelListItem, type ChannelListItemSlotProps, type ChannelListSlotProps, type ChannelMessageBoxSlotProps, Chat, type ChatActionModalSlotProps, ChatAlertsProvider, type ChatApiKey, ChatAvatar, type ChatCallContext, type ChatClassNames, type ChatColorMode, type ChatComponents, type ChatCustomizationConfig, ChatCustomizationProvider, ChatDateJumpMenu, type ChatDateTimePreferences, type ChatFeatures, type ChatGetApiKey, ChatLayout, type ChatLayoutConfig, type ChatLayoutSlotProps, ChatLocaleProvider, ChatMain, type ChatPanelAlertsSlotProps, type ChatQueryParams, type ChatQueryParamsByApi, ChatThemeProvider, ChatViewport, type ChatViewportHeight, DefaultChannelListItem, DefaultChatAvatar, DefaultChatLayout, ForegroundPushBridge, type ForegroundPushBridgeProps, type ForegroundPushPayload, ForwardModalView as ForwardModal, type ForwardModalSlotProps, HeaderCallActions, type HeaderCallActionsSlotProps, type HeaderLeftSideSlotProps, type HeaderRightSideSlotProps, type HeaderSearchOverlaySlotProps, type IAttachment, type IChannel, type IDMDelete, type IDMEditMessage, type IDMForward, type IDMMessage, type IDMPin, type IDMReaction, type IDMRead, type IDMStar, type IDMTyping, type IDMUnstar, type IMessage, type ISocketConfig, type JumpToPreset, LoggedUserDetails, type LoggedUserDetailsSlotProps, type MembersDrawerSlotProps, type MessageAttachmentsSlotProps, ChannelMessageBoxView as MessageInput, MessageItemView as MessageItem, type MessageItemSlotProps, ActiveChannelMessagesView as MessageList, type MessageReactionsSlotProps, type MessageReplySnippetSlotProps, type MessageStatusSlotProps, type MessageToolbarSlotProps, PUSH_CHANGED_EVENT, type PendingJump, type PermissionDrawerSlotProps, type PhoneCallButtonSlotProps, type PinnedMessagesDrawerSlotProps, type PushConfig, PushNotificationToggle, type PushNotificationToggleProps, type PushNotificationsState, type PushPreference, type StarredMessagesDrawerSlotProps, type UIConfig, type UsePushNotifications, type VideoCallButtonSlotProps, apiGetPushConfig, apiGetPushPreference, apiRegisterPushToken, apiRemovePushToken, apiUpdatePushPreference, capitalizeFirst, clampJumpDate, ChatMain as default, defaultChatClassNames, defaultChatComponents, defaultChatFeatures, defaultChatLayoutConfig, disablePushOnThisDevice, downloadFile, enablePushOnThisDevice, getChatBaseUrl, getChatQueryParamApis, getChatQueryParams, getChatQueryParamsByApi, getChatSocketUrl, getFirstAndLastNameOneCharacter, getResponsiveWidth, getSocketConfig, getStoredPushToken, isEmpty, isPushSupported, mergeChatCustomization, mergeChatLayoutConfig, onForegroundPush, packageDefaultComponents, resolveApiUrl, resolveChatApiKey, resolveJumpDateBounds, resolveJumpPreset, resolveJumpStep, resolveSocketUrl, setChatAccessToken, setChatBaseURL, setChatClientId, setChatQueryParamApis, setChatQueryParams, setChatQueryParamsByApi, setChatSocketUrl, showNotification, smoothScrollToMessage, socketService, startOfLocalDay, toDateInputValue, uniqueList, useChatAlerts, useChatContext, useChatController, useChatCustomization, useChatCustomizationOptional, useChatFeatures, useChatFeaturesOptional, useChatLocale, useStore as useChatStore, useChatTheme, usePushNotifications };

package/dist/index.mjs

@@ -13,7 +13,7 @@ import { Sun, Moon, Search, X, Loader2, UserPlus, ChevronDown, ArrowLeft, Users,
 import { cva } from 'class-variance-authority';
 import EmojiPicker, { Theme } from 'emoji-picker-react';
 import { getDefaultClassNames, DayPicker } from 'react-day-picker';
-import { toast } from 'react-hot-toast';
+import { toast, Toaster } from 'react-hot-toast';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -17431,6 +17431,7 @@ var getFirstAndLastNameOneCharacter = (name) => {
 };
 
 // src/notifications/ForegroundPushBridge.tsx
+init_normalize_helpers();
 init_useStore();
 
 // src/notifications/push.service.ts
@@ -17577,7 +17578,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({
@@ -17587,27 +17590,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 = useStore((s) => s.lastDM);
+  const onPushRef = useRef(onPush);
+  onPushRef.current = onPush;
+  useEffect(() => {
+    if (!lastDM) return;
+    if (typeof document !== "undefined" && document.visibilityState !== "visible") {
+      return;
+    }
+    const state = useStore.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]);
   useEffect(() => {
     let unsubscribe = null;
+    let retryTimer = null;
     let cancelled = false;
     const handlePayload = (payload) => {
-      const incoming = payload.data?.conversationId;
-      const activeId = useStore.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(
+        useStore.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();
@@ -17622,11 +17725,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__ */ jsx(
+    Toaster,
+    {
+      position: "top-right",
+      toastOptions: { duration: 4e3 },
+      containerStyle: { zIndex: 99999 }
+    }
+  );
 };
 var ChatMain = ({
   clientId,