@diffsome/react 1.2.10 → 1.2.11

package/dist/index.js

@@ -2823,49 +2823,80 @@ var ChatBubble = ({
 }) => {
   const [isOpen, setIsOpen] = (0, import_react24.useState)(false);
   const [messages, setMessages] = (0, import_react24.useState)([]);
-  const [conversationId, setConversationId] = (0, import_react24.useState)(null);
+  const [conversationId, setConversationId] = (0, import_react24.useState)(() => {
+    if (typeof localStorage !== "undefined") {
+      const saved = localStorage.getItem("diffsome_conversation_id");
+      return saved ? parseInt(saved, 10) : null;
+    }
+    return null;
+  });
   const [connection, setConnection] = (0, import_react24.useState)(null);
   const [loading, setLoading] = (0, import_react24.useState)(false);
   const [typing, setTyping] = (0, import_react24.useState)(false);
   const [unreadCount, setUnreadCount] = (0, import_react24.useState)(0);
   const seenMessageIds = (0, import_react24.useRef)(/* @__PURE__ */ new Set());
+  const isRestoringRef = (0, import_react24.useRef)(false);
+  const connectToConversation = (0, import_react24.useCallback)((convId) => {
+    const conn = client.chat.connect(convId);
+    setConnection(conn);
+    conn.onMessage((msg) => {
+      if (seenMessageIds.current.has(msg.id)) {
+        return;
+      }
+      seenMessageIds.current.add(msg.id);
+      setMessages((prev) => [...prev, msg]);
+      if (!isOpen && msg.sender_type !== "visitor") {
+        setUnreadCount((c) => c + 1);
+      }
+    });
+    conn.onTyping((senderType) => {
+      if (senderType === "agent") {
+        setTyping(true);
+        setTimeout(() => setTyping(false), 3e3);
+      }
+    });
+    return conn;
+  }, [client.chat, isOpen]);
   const initChat = (0, import_react24.useCallback)(async () => {
-    if (conversationId) return;
+    if (connection) return;
     setLoading(true);
     try {
+      let convId = conversationId;
+      if (convId && !isRestoringRef.current) {
+        isRestoringRef.current = true;
+        try {
+          const conn2 = connectToConversation(convId);
+          const existingMessages2 = await conn2.getMessages();
+          existingMessages2.forEach((m) => seenMessageIds.current.add(m.id));
+          setMessages(existingMessages2);
+          return;
+        } catch (error) {
+          console.log("Could not restore conversation, starting new one");
+          convId = null;
+          setConversationId(null);
+          localStorage.removeItem("diffsome_conversation_id");
+        }
+      }
       const result = await client.chat.start({
         visitor_name: visitorName,
         visitor_email: visitorEmail,
         initial_message: greeting
       });
-      setConversationId(result.conversation_id);
-      const conn = client.chat.connect(result.conversation_id);
-      setConnection(conn);
+      convId = result.conversation_id;
+      setConversationId(convId);
+      if (typeof localStorage !== "undefined") {
+        localStorage.setItem("diffsome_conversation_id", convId.toString());
+      }
+      const conn = connectToConversation(convId);
       const existingMessages = await conn.getMessages();
       existingMessages.forEach((m) => seenMessageIds.current.add(m.id));
       setMessages(existingMessages);
-      conn.onMessage((msg) => {
-        if (seenMessageIds.current.has(msg.id)) {
-          return;
-        }
-        seenMessageIds.current.add(msg.id);
-        setMessages((prev) => [...prev, msg]);
-        if (!isOpen && msg.sender_type !== "visitor") {
-          setUnreadCount((c) => c + 1);
-        }
-      });
-      conn.onTyping((senderType) => {
-        if (senderType === "agent") {
-          setTyping(true);
-          setTimeout(() => setTyping(false), 3e3);
-        }
-      });
     } catch (error) {
       console.error("Failed to initialize chat:", error);
     } finally {
       setLoading(false);
     }
-  }, [client.chat, conversationId, visitorName, visitorEmail, greeting, isOpen]);
+  }, [client.chat, connection, conversationId, connectToConversation, visitorName, visitorEmail, greeting]);
   const handleOpen = () => {
     setIsOpen(true);
     setUnreadCount(0);

package/dist/index.mjs

@@ -2731,49 +2731,80 @@ var ChatBubble = ({
 }) => {
   const [isOpen, setIsOpen] = useState22(false);
   const [messages, setMessages] = useState22([]);
-  const [conversationId, setConversationId] = useState22(null);
+  const [conversationId, setConversationId] = useState22(() => {
+    if (typeof localStorage !== "undefined") {
+      const saved = localStorage.getItem("diffsome_conversation_id");
+      return saved ? parseInt(saved, 10) : null;
+    }
+    return null;
+  });
   const [connection, setConnection] = useState22(null);
   const [loading, setLoading] = useState22(false);
   const [typing, setTyping] = useState22(false);
   const [unreadCount, setUnreadCount] = useState22(0);
   const seenMessageIds = useRef3(/* @__PURE__ */ new Set());
+  const isRestoringRef = useRef3(false);
+  const connectToConversation = useCallback22((convId) => {
+    const conn = client.chat.connect(convId);
+    setConnection(conn);
+    conn.onMessage((msg) => {
+      if (seenMessageIds.current.has(msg.id)) {
+        return;
+      }
+      seenMessageIds.current.add(msg.id);
+      setMessages((prev) => [...prev, msg]);
+      if (!isOpen && msg.sender_type !== "visitor") {
+        setUnreadCount((c) => c + 1);
+      }
+    });
+    conn.onTyping((senderType) => {
+      if (senderType === "agent") {
+        setTyping(true);
+        setTimeout(() => setTyping(false), 3e3);
+      }
+    });
+    return conn;
+  }, [client.chat, isOpen]);
   const initChat = useCallback22(async () => {
-    if (conversationId) return;
+    if (connection) return;
     setLoading(true);
     try {
+      let convId = conversationId;
+      if (convId && !isRestoringRef.current) {
+        isRestoringRef.current = true;
+        try {
+          const conn2 = connectToConversation(convId);
+          const existingMessages2 = await conn2.getMessages();
+          existingMessages2.forEach((m) => seenMessageIds.current.add(m.id));
+          setMessages(existingMessages2);
+          return;
+        } catch (error) {
+          console.log("Could not restore conversation, starting new one");
+          convId = null;
+          setConversationId(null);
+          localStorage.removeItem("diffsome_conversation_id");
+        }
+      }
       const result = await client.chat.start({
         visitor_name: visitorName,
         visitor_email: visitorEmail,
         initial_message: greeting
       });
-      setConversationId(result.conversation_id);
-      const conn = client.chat.connect(result.conversation_id);
-      setConnection(conn);
+      convId = result.conversation_id;
+      setConversationId(convId);
+      if (typeof localStorage !== "undefined") {
+        localStorage.setItem("diffsome_conversation_id", convId.toString());
+      }
+      const conn = connectToConversation(convId);
       const existingMessages = await conn.getMessages();
       existingMessages.forEach((m) => seenMessageIds.current.add(m.id));
       setMessages(existingMessages);
-      conn.onMessage((msg) => {
-        if (seenMessageIds.current.has(msg.id)) {
-          return;
-        }
-        seenMessageIds.current.add(msg.id);
-        setMessages((prev) => [...prev, msg]);
-        if (!isOpen && msg.sender_type !== "visitor") {
-          setUnreadCount((c) => c + 1);
-        }
-      });
-      conn.onTyping((senderType) => {
-        if (senderType === "agent") {
-          setTyping(true);
-          setTimeout(() => setTyping(false), 3e3);
-        }
-      });
     } catch (error) {
       console.error("Failed to initialize chat:", error);
     } finally {
       setLoading(false);
     }
-  }, [client.chat, conversationId, visitorName, visitorEmail, greeting, isOpen]);
+  }, [client.chat, connection, conversationId, connectToConversation, visitorName, visitorEmail, greeting]);
   const handleOpen = () => {
     setIsOpen(true);
     setUnreadCount(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diffsome/react",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "React hooks and providers for Diffsome SDK - Headless e-commerce & CMS",
   "main": "dist/index.js",
   "module": "dist/index.mjs",