@droppii-org/chat-sdk 0.1.36 → 0.1.37

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":"AAgBA,QAAA,MAAM,cAAc,+CA6EnB,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"BizMessageList.d.ts","sourceRoot":"","sources":["../../../src/components/biz-thread-detail/BizMessageList.tsx"],"names":[],"mappings":"AAiBA,QAAA,MAAM,cAAc,+CAgFnB,CAAC;AAEF,eAAe,cAAc,CAAC"}

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

@@ -9,20 +9,23 @@ import { useMessage } from "../../hooks/message/useMessage";
 import { useMessageListScroll } from "../../hooks/message/useMessageListScroll";
 import useBizConversationStore from "../../store/bizConversation";
 import useConversationStore from "../../store/conversation";
-import { ConnectStatus } from "../../types/chat";
+import useAuthStore from "../../store/auth";
+import { ConnectStatus, SyncStatus } from "../../types/chat";
 import { isBizGroupChat } from "../../utils/bizConversation";
 import emitter from "../../utils/events";
 import BizMessageItem from "./item/BizMessageItem";
 const BizMessageList = () => {
     const { t } = useTranslation("biz-inbox");
-    const { user, connectStatus } = useChatContext();
+    const { user, connectStatus, syncStatus } = useChatContext();
+    const authUserID = useAuthStore((state) => state.userID);
     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 isSdkReady = connectStatus === ConnectStatus.Connected;
+    const isSdkReady = connectStatus === ConnectStatus.Connected &&
+        syncStatus !== SyncStatus.Loading;
     const messageController = useMessage(conversationId, undefined, isSdkReady && !!conversationId);
-    const { scrollRef, loadMoreOldMessage, handleInfiniteScroll, scrollToBottomIfAtBottom, } = useMessageListScroll(Object.assign({ conversationId, userId: user === null || user === void 0 ? void 0 : user.userID }, messageController));
+    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;
     useEffect(() => {

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,4CA2DnE,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,4CA+FnE,CAAC"}

package/dist/context/ChatContext.js

@@ -23,15 +23,36 @@ export const ChatProvider = ({ children, config }) => {
     const [syncStatus, setSyncStatus] = useState(SyncStatus.Success);
     const [user, setUser] = useState(null);
     const initAuthStore = useAuthStore((state) => state.initAuthStore);
+    const setFallbackUserFromAuth = () => {
+        const { userID } = useAuthStore.getState();
+        if (!userID)
+            return;
+        setUser((current) => (current === null || current === void 0 ? void 0 : current.userID) === userID
+            ? current
+            : { userID, nickname: "", faceURL: "" });
+    };
     const getSelfUserInfo = () => {
         DChatSDK.getSelfUserInfo()
             .then(({ data }) => {
-            setUser(data);
+            if (data === null || data === void 0 ? void 0 : data.userID) {
+                setUser(data);
+                return;
+            }
+            setFallbackUserFromAuth();
         })
-            .catch(({ errCode, errMsg }) => {
-            if (errCode === 100)
+            .catch((error) => {
+            var _a;
+            const sdkError = error;
+            const errCode = sdkError === null || sdkError === void 0 ? void 0 : sdkError.errCode;
+            const errMsg = (_a = sdkError === null || sdkError === void 0 ? void 0 : sdkError.errMsg) !== null && _a !== void 0 ? _a : sdkError === null || sdkError === void 0 ? void 0 : sdkError.message;
+            setFallbackUserFromAuth();
+            if (errCode === 100 || errCode === 10004 || errCode === 10005)
+                return;
+            if (errCode != null || errMsg) {
+                console.error("getSelfUserInfo", errCode, errMsg);
                 return;
-            console.error("getSelfUserInfo", errCode, errMsg);
+            }
+            console.error("getSelfUserInfo", error);
         });
     };
     const updateConnectStatus = (status) => {
@@ -51,6 +72,11 @@ export const ChatProvider = ({ children, config }) => {
                 applicationType: config.applicationType,
                 isCrm: config.isCrm,
             });
+            setUser({
+                userID: config.userID,
+                nickname: "",
+                faceURL: "",
+            });
         }
     }, [config]);
     return (_jsx(ChatContext.Provider, { value: {

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,YAuT1B,CAAC"}
+{"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAiCA,eAAO,MAAM,cAAc,YAqT1B,CAAC"}

package/dist/hooks/global/useGlobalEvent.js

@@ -100,7 +100,6 @@ export const useGlobalEvent = () => {
                 var _a;
                 if (data) {
                     useAuthStore.getState().setChatToken((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.token);
-                    getSelfUserInfo();
                 }
             },
         });
@@ -123,6 +122,7 @@ export const useGlobalEvent = () => {
         catch (error) {
             if (error.errCode === 10102) {
                 updateConnectStatus(ConnectStatus.Connected);
+                updateSyncStatus(SyncStatus.Success);
                 getSelfUserInfo();
                 initStore();
                 return;
@@ -143,7 +143,7 @@ export const useGlobalEvent = () => {
     };
     const connectSuccessHandler = () => {
         updateConnectStatus(ConnectStatus.Connected);
-        getSelfUserInfo();
+        updateSyncStatus(SyncStatus.Loading);
     };
     const connectFailedHandler = () => {
         updateConnectStatus(ConnectStatus.Disconnected);
@@ -153,11 +153,9 @@ export const useGlobalEvent = () => {
     };
     const syncFinishHandler = () => {
         updateSyncStatus(SyncStatus.Success);
-        // getFriendListByReq();
-        // getGroupListByReq();
+        getSelfUserInfo();
         getConversationListByReq(false);
         void refreshCurrentGroupState();
-        // getUnReadCountByReq();
     };
     const syncFailedHandler = () => {
         updateSyncStatus(SyncStatus.Failed);

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

@@ -1 +1 @@
-{"version":3,"file":"useMessageListScroll.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessageListScroll.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAkC,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAKtD,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,0BAA0B;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,oBAAoB,CAAC;IAChC,eAAe,EAAE,SAAS,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACxD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,oBAAoB,GAAI,iIASlC,0BAA0B;;;;8BA6DrB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;;;CAkDpC,CAAC"}
+{"version":3,"file":"useMessageListScroll.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessageListScroll.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAkC,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAKtD,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,0BAA0B;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,oBAAoB,CAAC;IAChC,eAAe,EAAE,SAAS,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACxD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,kBAAkB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnD;AAED,eAAO,MAAM,oBAAoB,GAAI,iIASlC,0BAA0B;;;;8BAsFrB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;;;CAkDpC,CAAC"}

package/dist/hooks/message/useMessageListScroll.js

@@ -10,6 +10,33 @@ export const useMessageListScroll = ({ conversationId, userId, loadState, latest
     useEffect(() => {
         autoFillAttemptedRef.current = false;
     }, [conversationId]);
+    useEffect(() => {
+        if (!moreOldLoading) {
+            autoFillAttemptedRef.current = false;
+        }
+    }, [moreOldLoading]);
+    useEffect(() => {
+        if (moreOldLoading ||
+            loadState.initLoading ||
+            !loadState.hasMoreOld ||
+            loadState.messageList.length === 0) {
+            return;
+        }
+        const scrollEl = scrollRef.current;
+        if (!scrollEl || scrollEl.scrollHeight > scrollEl.clientHeight) {
+            return;
+        }
+        if (autoFillAttemptedRef.current)
+            return;
+        autoFillAttemptedRef.current = true;
+        getMoreOldMessages();
+    }, [
+        moreOldLoading,
+        loadState.initLoading,
+        loadState.hasMoreOld,
+        loadState.messageList.length,
+        getMoreOldMessages,
+    ]);
     const handleMarkConversationMessageAsRead = useCallback(() => {
         var _a, _b, _c, _d;
         const lastMessage = (_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList) === null || _b === void 0 ? void 0 : _b[0];
@@ -39,12 +66,6 @@ export const useMessageListScroll = ({ conversationId, userId, loadState, latest
     const loadMoreOldMessage = useCallback(() => {
         if (!loadState.hasMoreOld || moreOldLoading)
             return;
-        const scrollEl = scrollRef.current;
-        if (scrollEl && scrollEl.scrollHeight <= scrollEl.clientHeight) {
-            if (autoFillAttemptedRef.current)
-                return;
-            autoFillAttemptedRef.current = true;
-        }
         getMoreOldMessages();
     }, [loadState.hasMoreOld, moreOldLoading, getMoreOldMessages]);
     const { run: loadMoreNewMessage } = useDebounceFn(() => {