@pedi/chika-sdk 1.0.7 → 1.0.9

package/dist/index.js

@@ -445,8 +445,7 @@ async function createChatSession(config, channelId, profile, callbacks, networkM
           body: JSON.stringify({
             participant_id: profile.id,
             message_id: messageId
-          }),
-          signal: sessionAbort.signal
+          })
         });
         if (!res.ok) {
           await throwHttpError(res);
@@ -454,7 +453,7 @@ async function createChatSession(config, channelId, profile, callbacks, networkM
       };
       if (retryConfig) {
         try {
-          await withRetry(readFn, MARK_READ_RETRY_CONFIG, sessionAbort.signal);
+          await withRetry(readFn, MARK_READ_RETRY_CONFIG);
         } catch (err) {
           if (err instanceof HttpError) {
             callbacks.onError(err);
@@ -770,6 +769,7 @@ var MessageQueue = class {
           entry.status = "failed";
           entry.error = err instanceof Error ? err : new Error(String(err));
           entry.retryCount++;
+          entry.reject(entry.error);
           this.config.onStatusChange?.();
           this.persist();
         }
@@ -826,7 +826,9 @@ function useChat({ config, channelId, profile, onMessage }) {
   onMessageRef.current = onMessage;
   const startingRef = (0, import_react.useRef)(false);
   const pendingOptimisticIds = (0, import_react.useRef)(/* @__PURE__ */ new Set());
+  const markReadTimerRef = (0, import_react.useRef)(null);
   const [monitor, setMonitor] = (0, import_react.useState)(null);
+  const [monitorReady, setMonitorReady] = (0, import_react.useState)(false);
   const monitorRef = (0, import_react.useRef)(null);
   monitorRef.current = monitor;
   const queueRef = (0, import_react.useRef)(null);
@@ -839,19 +841,50 @@ function useChat({ config, channelId, profile, onMessage }) {
   (0, import_react.useEffect)(() => {
     if (!resilienceEnabled) {
       setMonitor(null);
+      setMonitorReady(true);
       return;
     }
     if (injectedMonitor) {
       setMonitor(injectedMonitor);
+      setMonitorReady(true);
       return;
     }
-    const m = createNetworkMonitor();
-    setMonitor(m);
-    return () => {
-      m.dispose();
+    try {
+      const m = createNetworkMonitor();
+      setMonitor(m);
+      setMonitorReady(true);
+      return () => {
+        m.dispose();
+        setMonitor(null);
+      };
+    } catch {
       setMonitor(null);
-    };
+      setMonitorReady(true);
+    }
   }, [resilienceEnabled, injectedMonitor]);
+  function scheduleMarkAsRead(messageId) {
+    if (markReadTimerRef.current) clearTimeout(markReadTimerRef.current);
+    markReadTimerRef.current = setTimeout(() => {
+      markReadTimerRef.current = null;
+      sessionRef.current?.markAsRead(messageId).catch(() => {
+      });
+    }, 500);
+  }
+  function flushMarkReadAndDisconnect() {
+    if (markReadTimerRef.current) {
+      clearTimeout(markReadTimerRef.current);
+      markReadTimerRef.current = null;
+    }
+    if (sessionRef.current) {
+      const lastMsg = messagesRef.current[messagesRef.current.length - 1];
+      if (lastMsg) {
+        sessionRef.current.markAsRead(lastMsg.id).catch(() => {
+        });
+      }
+    }
+    sessionRef.current?.disconnect();
+    sessionRef.current = null;
+  }
   const callbacks = {
     onMessage: (message) => {
       if (disposedRef.current) return;
@@ -878,6 +911,9 @@ function useChat({ config, channelId, profile, onMessage }) {
           queueRef.current?.cancel(matchedOptimisticId);
         }
       }
+      if (message.sender_id !== profileRef.current.id) {
+        scheduleMarkAsRead(message.id);
+      }
       onMessageRef.current?.(message);
     },
     onStatusChange: (nextStatus) => {
@@ -928,6 +964,10 @@ function useChat({ config, channelId, profile, onMessage }) {
       } else {
         setMessages(session.initialMessages);
       }
+      const lastInitMsg = session.initialMessages[session.initialMessages.length - 1];
+      if (lastInitMsg) {
+        scheduleMarkAsRead(lastInitMsg.id);
+      }
     } catch (err) {
       if (disposedRef.current) return;
       if (err instanceof ChannelClosedError) {
@@ -943,25 +983,17 @@ function useChat({ config, channelId, profile, onMessage }) {
   }
   (0, import_react.useEffect)(() => {
     disposedRef.current = false;
-    if (resilienceEnabled && !monitor) return;
+    if (!monitorReady) return;
     startSession();
     return () => {
       disposedRef.current = true;
-      if (statusRef.current === "connected" && sessionRef.current) {
-        const lastMsg = messagesRef.current[messagesRef.current.length - 1];
-        if (lastMsg) {
-          sessionRef.current.markAsRead(lastMsg.id).catch(() => {
-          });
-        }
-      }
+      flushMarkReadAndDisconnect();
       if (backgroundTimerRef.current) {
         clearTimeout(backgroundTimerRef.current);
         backgroundTimerRef.current = null;
       }
-      sessionRef.current?.disconnect();
-      sessionRef.current = null;
     };
-  }, [channelId, monitor]);
+  }, [channelId, monitorReady]);
   (0, import_react.useEffect)(() => {
     if (!queueEnabled || !monitor || !retryConfig) return;
     let entry = queueRegistry.get(channelId);
@@ -1009,8 +1041,7 @@ function useChat({ config, channelId, profile, onMessage }) {
   }, [channelId, resilienceEnabled, monitor]);
   (0, import_react.useEffect)(() => {
     function teardownSession() {
-      sessionRef.current?.disconnect();
-      sessionRef.current = null;
+      flushMarkReadAndDisconnect();
       setStatus("disconnected");
     }
     const subscription = import_react_native.AppState.addEventListener("change", (nextAppState) => {
@@ -1137,8 +1168,7 @@ function useChat({ config, channelId, profile, onMessage }) {
     []
   );
   const disconnect = (0, import_react.useCallback)(() => {
-    sessionRef.current?.disconnect();
-    sessionRef.current = null;
+    flushMarkReadAndDisconnect();
     setStatus("disconnected");
   }, []);
   return {
@@ -1170,24 +1200,33 @@ function useUnread(options) {
   const appStateRef = (0, import_react2.useRef)(import_react_native2.AppState.currentState);
   const backgroundTimerRef = (0, import_react2.useRef)(null);
   const backgroundGraceMs = config.backgroundGraceMs ?? (import_react_native2.Platform.OS === "android" ? DEFAULT_BACKGROUND_GRACE_MS2 : 0);
-  const [monitor, setMonitor] = (0, import_react2.useState)(null);
+  const [monitorReady, setMonitorReady] = (0, import_react2.useState)(false);
+  const monitorRef = (0, import_react2.useRef)(null);
   const resilienceEnabled = config.resilience !== false;
   const injectedMonitor = typeof config.resilience === "object" ? config.resilience.networkMonitor : void 0;
   (0, import_react2.useEffect)(() => {
     if (!resilienceEnabled) {
-      setMonitor(null);
+      monitorRef.current = null;
+      setMonitorReady(true);
       return;
     }
     if (injectedMonitor) {
-      setMonitor(injectedMonitor);
+      monitorRef.current = injectedMonitor;
+      setMonitorReady(true);
       return;
     }
-    const m = createNetworkMonitor();
-    setMonitor(m);
-    return () => {
-      m.dispose();
-      setMonitor(null);
-    };
+    try {
+      const m = createNetworkMonitor();
+      monitorRef.current = m;
+      setMonitorReady(true);
+      return () => {
+        m.dispose();
+        monitorRef.current = null;
+      };
+    } catch {
+      monitorRef.current = null;
+      setMonitorReady(true);
+    }
   }, [resilienceEnabled, injectedMonitor]);
   const connect = (0, import_react2.useCallback)(() => {
     connRef.current?.close();
@@ -1201,7 +1240,7 @@ function useUnread(options) {
         headers: customHeaders,
         reconnectDelayMs: configRef.current.reconnectDelayMs,
         customEvents: UNREAD_CUSTOM_EVENTS,
-        networkMonitor: monitor ?? void 0
+        networkMonitor: monitorRef.current ?? void 0
       },
       {
         onOpen: () => {
@@ -1233,7 +1272,7 @@ function useUnread(options) {
         }
       }
     );
-  }, [channelId, participantId, monitor]);
+  }, [channelId, participantId]);
   const disconnect = (0, import_react2.useCallback)(() => {
     connRef.current?.close();
     connRef.current = null;
@@ -1246,7 +1285,7 @@ function useUnread(options) {
       disconnect();
       return;
     }
-    if (resilienceEnabled && !monitor) return;
+    if (!monitorReady) return;
     connect();
     return () => {
       disconnect();
@@ -1255,7 +1294,7 @@ function useUnread(options) {
         backgroundTimerRef.current = null;
       }
     };
-  }, [channelId, participantId, enabled, connect, disconnect]);
+  }, [channelId, participantId, enabled, monitorReady, connect, disconnect]);
   (0, import_react2.useEffect)(() => {
     if (!enabled) return;
     const subscription = import_react_native2.AppState.addEventListener("change", (nextAppState) => {