@droppii-org/chat-sdk 0.1.38 → 0.1.39

package/dist/components/biz-thread-detail/BizMessageList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BizMessageList.d.ts","sourceRoot":"","sources":["../../../src/components/biz-thread-detail/BizMessageList.tsx"],"names":[],"mappings":"AAiBA,QAAA,MAAM,cAAc,+CA8EnB,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"BizMessageList.d.ts","sourceRoot":"","sources":["../../../src/components/biz-thread-detail/BizMessageList.tsx"],"names":[],"mappings":"AAgBA,QAAA,MAAM,cAAc,+CAwEnB,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/components/biz-thread-detail/BizMessageList.js

@@ -10,7 +10,6 @@ import { useMessageListScroll } from "../../hooks/message/useMessageListScroll";
 import useBizConversationStore from "../../store/bizConversation";
 import useConversationStore from "../../store/conversation";
 import useAuthStore from "../../store/auth";
-import { useIsSdkMessageReady } from "../../hooks/common/useIsSdkMessageReady";
 import { isBizGroupChat } from "../../utils/bizConversation";
 import emitter from "../../utils/events";
 import BizMessageItem from "./item/BizMessageItem";
@@ -18,15 +17,14 @@ const BizMessageList = () => {
     const { t } = useTranslation("biz-inbox");
     const { user } = useChatContext();
     const authUserID = useAuthStore((state) => state.userID);
-    const isSdkReady = useIsSdkMessageReady();
     const conversation = useBizConversationStore((state) => state.conversationData);
     const selectedConversationId = useConversationStore((state) => state.selectedConversationId);
     const conversationId = selectedConversationId || (conversation === null || conversation === void 0 ? void 0 : conversation.conversationId) || "";
     const isGroupChat = conversation ? isBizGroupChat(conversation) : false;
-    const messageController = useMessage(conversationId, undefined, isSdkReady && !!conversationId);
+    const messageController = useMessage(conversationId);
     const { scrollRef, loadMoreOldMessage, handleInfiniteScroll, scrollToBottomIfAtBottom, } = useMessageListScroll(Object.assign({ conversationId, userId: (user === null || user === void 0 ? void 0 : user.userID) || authUserID }, messageController));
     const { loadState, moreOldLoading } = messageController;
-    const isMessageLoading = !conversationId || !isSdkReady || loadState.initLoading;
+    const isMessageLoading = !conversationId || loadState.initLoading;
     useEffect(() => {
         emitter.on("BIZ_CHAT_SCROLL_TO_BOTTOM_IF_AT_BOTTOM", scrollToBottomIfAtBottom);
         return () => {

package/dist/context/ChatContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatContext.d.ts","sourceRoot":"","sources":["../../src/context/ChatContext.tsx"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,CAAC;AAG9B,OAAO,EACL,eAAe,EACf,iBAAiB,EAGlB,MAAM,cAAc,CAAC;AAStB,eAAO,MAAM,WAAW,0CAOtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAE5D,eAAO,MAAM,YAAY,GAAI,sBAAsB,iBAAiB,4CAgGnE,CAAC"}
+{"version":3,"file":"ChatContext.d.ts","sourceRoot":"","sources":["../../src/context/ChatContext.tsx"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,CAAC;AAG9B,OAAO,EACL,eAAe,EACf,iBAAiB,EAGlB,MAAM,cAAc,CAAC;AAStB,eAAO,MAAM,WAAW,0CAOtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAE5D,eAAO,MAAM,YAAY,GAAI,sBAAsB,iBAAiB,4CAqGnE,CAAC"}

package/dist/context/ChatContext.js

@@ -1,7 +1,7 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
 import "../styles/global.css";
-import { createContext, useContext, useEffect, useState } from "react";
+import { createContext, useContext, useEffect, useRef, useState } from "react";
 import { ConnectStatus, SyncStatus, } from "../types/chat";
 import { DChatSDK } from "../constants/sdk";
 import MainLayout from "../layout";
@@ -12,7 +12,7 @@ const queryClient = new QueryClient();
 export const ChatContext = createContext({
     user: null,
     connectStatus: ConnectStatus.Disconnected,
-    syncStatus: SyncStatus.Loading,
+    syncStatus: SyncStatus.Success,
     getSelfUserInfo: () => { },
     updateConnectStatus: () => { },
     updateSyncStatus: () => { },
@@ -20,9 +20,10 @@ export const ChatContext = createContext({
 export const useChatContext = () => useContext(ChatContext);
 export const ChatProvider = ({ children, config }) => {
     const [connectStatus, setConnectStatus] = useState(ConnectStatus.Disconnected);
-    const [syncStatus, setSyncStatus] = useState(SyncStatus.Loading);
+    const [syncStatus, setSyncStatus] = useState(SyncStatus.Success);
     const [user, setUser] = useState(null);
     const initAuthStore = useAuthStore((state) => state.initAuthStore);
+    const lastUserIdRef = useRef();
     const setFallbackUserFromAuth = () => {
         const { userID } = useAuthStore.getState();
         if (!userID)
@@ -62,24 +63,27 @@ export const ChatProvider = ({ children, config }) => {
         setSyncStatus(status);
     };
     useEffect(() => {
-        if (config) {
-            initAuthStore({
-                accessToken: config.accessToken,
-                apiAddress: config.apiAddr,
-                platformID: config.platformID,
-                userID: config.userID,
-                wsAddress: config.wsAddr,
-                applicationType: config.applicationType,
-                isCrm: config.isCrm,
-            });
-            setUser({
-                userID: config.userID,
-                nickname: "",
-                faceURL: "",
-            });
-            setSyncStatus(SyncStatus.Loading);
+        if (!config)
+            return;
+        initAuthStore({
+            accessToken: config.accessToken,
+            apiAddress: config.apiAddr,
+            platformID: config.platformID,
+            userID: config.userID,
+            wsAddress: config.wsAddr,
+            applicationType: config.applicationType,
+            isCrm: config.isCrm,
+        });
+        setUser({
+            userID: config.userID,
+            nickname: "",
+            faceURL: "",
+        });
+        if (lastUserIdRef.current !== config.userID) {
+            lastUserIdRef.current = config.userID;
+            setConnectStatus(ConnectStatus.Disconnected);
         }
-    }, [config]);
+    }, [config, initAuthStore]);
     return (_jsx(ChatContext.Provider, { value: {
             user,
             connectStatus,

package/dist/hooks/global/useGlobalEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,cAAc,YAoT1B,CAAC"}
+{"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,cAAc,YAuT1B,CAAC"}

package/dist/hooks/global/useGlobalEvent.js

@@ -25,6 +25,7 @@ export const useGlobalEvent = () => {
     const { mutate: refetchChatToken } = useRefetchChatToken();
     const accessToken = useAuthStore((state) => state.accessToken);
     const chatToken = useAuthStore((state) => state.chatToken);
+    const userID = useAuthStore((state) => state.userID);
     const apiAddress = useAuthStore((state) => {
         return state.apiAddress;
     });
@@ -254,8 +255,9 @@ export const useGlobalEvent = () => {
         }
     }, [accessToken, apiAddress]);
     useEffect(() => {
-        if (!!chatToken && apiAddress) {
-            loginCheck();
+        if (!chatToken || !apiAddress || !userID) {
+            return;
         }
-    }, [chatToken, apiAddress]);
+        loginCheck();
+    }, [chatToken, apiAddress, userID]);
 };

package/dist/hooks/message/useMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAEZ,MAAM,yBAAyB,CAAC;AAOjC,eAAO,MAAM,kBAAkB,eAgB9B,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM,EAC1B,iBAAc;;;;;qBAMO,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;CA8PnC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,WAAW,SACpB,CAAC;AAChC,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,SACpB,CAAC;AAClC,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SACf,CAAC;AAEtC,eAAO,MAAM,kBAAkB,GAC7B,aAAa,WAAW,EAAE,EAC1B,SAAS,WAAW,EACpB,WAAW,MAAM,GAAG,MAAM,KACzB,WAAW,GAAG,SAkBhB,CAAC"}
+{"version":3,"file":"useMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAEZ,MAAM,yBAAyB,CAAC;AAUjC,eAAO,MAAM,kBAAkB,eAgB9B,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM,EAC1B,iBAAc;;;;;qBAcO,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;CA2QnC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,WAAW,SACpB,CAAC;AAChC,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,SACpB,CAAC;AAClC,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SACf,CAAC;AAEtC,eAAO,MAAM,kBAAkB,GAC7B,aAAa,WAAW,EAAE,EAC1B,SAAS,WAAW,EACpB,WAAW,MAAM,GAAG,MAAM,KACzB,WAAW,GAAG,SAkBhB,CAAC"}

package/dist/hooks/message/useMessage.js

@@ -5,6 +5,9 @@ import { PAGE_SIZE } from "../../constants";
 import { useLatest, useRequest } from "ahooks";
 import emitter, { emit } from "../../utils/events";
 import isEmpty from "lodash/isEmpty";
+import { useChatContext } from "../../context/ChatContext";
+import useAuthStore from "../../store/auth";
+import { ConnectStatus } from "../../types/chat";
 export const visibleTypeMessage = [
     MessageType.TextMessage,
     MessageType.PictureMessage,
@@ -23,6 +26,12 @@ export const visibleTypeMessage = [
     MessageType.LogTextMessage,
 ];
 export const useMessage = (conversationId, searchClientMsgID, enabled = true) => {
+    const { connectStatus } = useChatContext();
+    const userID = useAuthStore((state) => state.userID);
+    const canLoad = enabled &&
+        connectStatus === ConnectStatus.Connected &&
+        !!conversationId &&
+        !!userID;
     const [loadState, setLoadState] = useState({
         initLoading: true,
         hasMoreOld: true,
@@ -30,7 +39,8 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
         messageList: [],
     });
     const latestLoadState = useLatest(loadState);
-    const enabledRef = useLatest(enabled);
+    const canLoadRef = useLatest(canLoad);
+    const conversationIdRef = useLatest(conversationId);
     const { loading: moreOldLoading, runAsync: getMoreOldMessages } = useRequest(async (loadMore = true) => {
         var _a, _b, _c, _d, _e;
         const reqConversationID = conversationId;
@@ -42,41 +52,63 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
             conversationID: conversationId !== null && conversationId !== void 0 ? conversationId : "",
             viewType: ViewType.History,
         };
-        const { data } = await DChatSDK.getAdvancedHistoryMessageList(params);
-        if (conversationId !== reqConversationID)
-            return;
-        setTimeout(() => setLoadState((preState) => {
-            let messageList = [
-                ...(loadMore ? preState.messageList : []),
-                ...data.messageList.toReversed(),
-            ];
-            messageList = removeDuplicateMessages(messageList);
-            return Object.assign(Object.assign({}, preState), { initLoading: false, hasMoreOld: !data.isEnd, messageList });
-        }));
+        try {
+            const { data } = await DChatSDK.getAdvancedHistoryMessageList(params);
+            if (conversationIdRef.current !== reqConversationID)
+                return;
+            setTimeout(() => {
+                if (conversationIdRef.current !== reqConversationID)
+                    return;
+                setLoadState((preState) => {
+                    let messageList = [
+                        ...(loadMore ? preState.messageList : []),
+                        ...data.messageList.toReversed(),
+                    ];
+                    messageList = removeDuplicateMessages(messageList);
+                    return Object.assign(Object.assign({}, preState), { initLoading: false, hasMoreOld: !data.isEnd, messageList });
+                });
+            });
+        }
+        catch (_f) {
+            if (conversationIdRef.current !== reqConversationID)
+                return;
+            setLoadState((preState) => (Object.assign(Object.assign({}, preState), { initLoading: false })));
+        }
     }, {
         manual: true,
     });
     const { loading: moreNewLoading, runAsync: getMoreNewMessages } = useRequest(async (loadMore = true) => {
         var _a, _b;
         const reqConversationID = conversationId;
-        const { data } = await DChatSDK.getAdvancedHistoryMessageListReverse({
-            count: PAGE_SIZE.large,
-            startClientMsgID: loadMore
-                ? ((_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList[0]) === null || _b === void 0 ? void 0 : _b.clientMsgID) || ""
-                : "",
-            conversationID: conversationId !== null && conversationId !== void 0 ? conversationId : "",
-            viewType: ViewType.Search,
-        });
-        if (conversationId !== reqConversationID)
-            return;
-        setTimeout(() => setLoadState((preState) => {
-            let messageList = [
-                ...data.messageList.toReversed(),
-                ...(loadMore ? preState.messageList : []),
-            ];
-            messageList = removeDuplicateMessages(messageList);
-            return Object.assign(Object.assign({}, preState), { initLoading: false, hasMoreNew: !data.isEnd, messageList });
-        }));
+        try {
+            const { data } = await DChatSDK.getAdvancedHistoryMessageListReverse({
+                count: PAGE_SIZE.large,
+                startClientMsgID: loadMore
+                    ? ((_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList[0]) === null || _b === void 0 ? void 0 : _b.clientMsgID) || ""
+                    : "",
+                conversationID: conversationId !== null && conversationId !== void 0 ? conversationId : "",
+                viewType: ViewType.Search,
+            });
+            if (conversationIdRef.current !== reqConversationID)
+                return;
+            setTimeout(() => {
+                if (conversationIdRef.current !== reqConversationID)
+                    return;
+                setLoadState((preState) => {
+                    let messageList = [
+                        ...data.messageList.toReversed(),
+                        ...(loadMore ? preState.messageList : []),
+                    ];
+                    messageList = removeDuplicateMessages(messageList);
+                    return Object.assign(Object.assign({}, preState), { initLoading: false, hasMoreNew: !data.isEnd, messageList });
+                });
+            });
+        }
+        catch (_c) {
+            if (conversationIdRef.current !== reqConversationID)
+                return;
+            setLoadState((preState) => (Object.assign(Object.assign({}, preState), { initLoading: false })));
+        }
     }, {
         manual: true,
     });
@@ -127,7 +159,7 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
     useEffect(() => {
         const pushNewMessage = (message) => {
             var _a, _b;
-            if (!enabledRef.current)
+            if (!canLoadRef.current)
                 return;
             if ((_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList) === null || _b === void 0 ? void 0 : _b.find((item) => item.clientMsgID === message.clientMsgID)) {
                 return;
@@ -138,7 +170,7 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
             });
         };
         const updateOneMessage = (message) => {
-            if (!enabledRef.current)
+            if (!canLoadRef.current)
                 return;
             setLoadState((preState) => {
                 var _a, _b, _c, _d;
@@ -167,7 +199,7 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
             });
         };
         const removeOneMessage = (clientMsgID) => {
-            if (!enabledRef.current)
+            if (!canLoadRef.current)
                 return;
             setLoadState((preState) => (Object.assign(Object.assign({}, preState), { messageList: preState.messageList.filter((msg) => msg.clientMsgID !== clientMsgID) })));
         };
@@ -181,7 +213,7 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
         };
     }, []);
     useEffect(() => {
-        if (!enabled) {
+        if (!canLoad) {
             setLoadState({
                 initLoading: true,
                 hasMoreOld: true,
@@ -206,7 +238,7 @@ export const useMessage = (conversationId, searchClientMsgID, enabled = true) =>
                 messageList: [],
             }));
         };
-    }, [conversationId, searchClientMsgID, enabled]);
+    }, [conversationId, searchClientMsgID, canLoad, userID]);
     return {
         loadState,
         latestLoadState,

package/dist/screens/desk-message/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/screens/desk-message/index.tsx"],"names":[],"mappings":"AAWA,UAAU,qBAAqB;IAC7B,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAC;CACpC;AAED,QAAA,MAAM,gBAAgB,GAAI,2BAA2B,qBAAqB,4CA+BzE,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/screens/desk-message/index.tsx"],"names":[],"mappings":"AAWA,UAAU,qBAAqB;IAC7B,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAC;CACpC;AAED,QAAA,MAAM,gBAAgB,GAAI,2BAA2B,qBAAqB,4CA6BzE,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/screens/desk-message/index.js

@@ -4,14 +4,14 @@ import MessageList from "../../components/message/MessageList";
 import DeskConversationList from "../../components/conversation/DeskConversationList";
 import { useChatContext } from "../../context/ChatContext";
 import { Spin } from "antd";
-import { ConnectStatus, SyncStatus } from "../../types/chat";
+import { ConnectStatus } from "../../types/chat";
 import useConversationStore from "../../store/conversation";
 import DeskAssignedSession from "../../components/session/DeskAssignedSession";
 import ThreadInfo from "../../components/thread/ThreadInfo";
 const DChatDeskMessage = ({ openCreateCannedModal }) => {
     const selectedConversationId = useConversationStore((state) => state.selectedConversationId);
     const searchClientMsgID = useConversationStore((state) => state.searchClientMsgID);
-    const { connectStatus, syncStatus } = useChatContext();
-    return (_jsx(_Fragment, { children: connectStatus === ConnectStatus.Connected ? (_jsx(Spin, { spinning: syncStatus === SyncStatus.Loading, children: _jsxs("div", { className: "flex flex-1 flex-row h-screen bg-gray-50", children: [_jsx(DeskAssignedSession, {}), _jsx(DeskConversationList, {}), _jsx(MessageList, { conversationId: selectedConversationId, searchClientMsgID: searchClientMsgID, openCreateCannedModal: openCreateCannedModal }), _jsx(ThreadInfo, {})] }) })) : (_jsx("div", { className: "flex flex-1 flex-row h-screen bg-gray-50", children: connectStatus === ConnectStatus.Connecting && _jsx(Spin, { fullscreen: true }) })) }));
+    const { connectStatus } = useChatContext();
+    return (_jsx(_Fragment, { children: connectStatus === ConnectStatus.Connected ? (_jsxs("div", { className: "flex flex-1 flex-row h-screen bg-gray-50", children: [_jsx(DeskAssignedSession, {}), _jsx(DeskConversationList, {}), _jsx(MessageList, { conversationId: selectedConversationId, searchClientMsgID: searchClientMsgID, openCreateCannedModal: openCreateCannedModal }), _jsx(ThreadInfo, {})] })) : (_jsx("div", { className: "flex flex-1 flex-row h-screen bg-gray-50", children: connectStatus === ConnectStatus.Connecting && _jsx(Spin, { fullscreen: true }) })) }));
 };
 export default DChatDeskMessage;