@droppii-org/chat-sdk 0.1.35 → 0.1.37

package/dist/components/biz-inbox/BizThreadCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BizThreadCard.d.ts","sourceRoot":"","sources":["../../../src/components/biz-inbox/BizThreadCard.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAavF,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,CAAC,IAAI,EAAE,uBAAuB,KAAK,IAAI,CAAC;CAClD;AAwBD,QAAA,MAAM,aAAa,GAAI,mBAAmB,kBAAkB,4CAkE3D,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"BizThreadCard.d.ts","sourceRoot":"","sources":["../../../src/components/biz-inbox/BizThreadCard.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAYvF,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,CAAC,IAAI,EAAE,uBAAuB,KAAK,IAAI,CAAC;CAClD;AAwBD,QAAA,MAAM,aAAa,GAAI,mBAAmB,kBAAkB,4CA+D3D,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/components/biz-inbox/BizThreadCard.js

@@ -3,10 +3,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import clsx from "clsx";
 import dayjs from "dayjs";
 import { useTranslation } from "react-i18next";
-import { useChatContext } from "../../context/ChatContext";
+import useAuthStore from "../../store/auth";
 import { formatTimestamp } from "../../utils/common";
 import { parseBizLatestMessage } from "../../utils/bizMessage";
-import { isBizGroupChat, resolveBizAvatarUrl, resolveBizBadgeLabel, resolveBizDisplayName, } from "../../utils/bizConversation";
+import { resolveBizAvatarUrl, resolveBizBadgeLabel, resolveBizDisplayName, } from "../../utils/bizConversation";
 import BizThreadAvatar from "./BizThreadAvatar";
 import BizThreadTitle from "./BizThreadTitle";
 const formatLatestMessageTime = (sendTime) => {
@@ -25,14 +25,11 @@ const BizThreadCard = ({ item, onClick }) => {
     var _a;
     const { t } = useTranslation("biz-inbox");
     const { t: tCommon } = useTranslation("common");
-    const { user } = useChatContext();
+    const currentUserId = useAuthStore((state) => state.userID);
     const displayName = resolveBizDisplayName(item, t);
     const avatarUrl = resolveBizAvatarUrl(item);
     const badgeLabel = resolveBizBadgeLabel(item.chatCategory, t);
-    const latestMessagePreview = parseBizLatestMessage(item.latestMsg, user === null || user === void 0 ? void 0 : user.userID, tCommon, {
-        peerFullName: item.peer.fullName,
-        isGroupChat: isBizGroupChat(item),
-    });
+    const latestMessagePreview = parseBizLatestMessage(item.latestMsg, currentUserId, tCommon, item.peer.fullName);
     const latestMessageTime = formatLatestMessageTime(item.latestMsgSendTime || null);
     const unreadCount = (_a = item.unreadCount) !== null && _a !== void 0 ? _a : 0;
     return (_jsxs("button", { type: "button", onClick: () => onClick(item), "data-testid": "biz-inbox-thread-card", className: "flex w-full shrink-0 items-start gap-2 border-b border-[#EFEFEF] bg-white p-3 text-left transition-colors hover:bg-gray-50 focus:outline-none focus-visible:ring-2 focus-visible:ring-[#1677ff]", children: [_jsx(BizThreadAvatar, { chatCategory: item.chatCategory, displayName: displayName, avatarUrl: avatarUrl, badgeLabel: badgeLabel }), _jsxs("div", { className: "flex min-w-0 flex-1 flex-col", children: [_jsxs("div", { className: "flex min-h-[25.6px] items-center justify-between gap-1", children: [_jsx("div", { className: "min-w-0 flex-1", children: _jsx(BizThreadTitle, { chatCategory: item.chatCategory, displayName: displayName, hasUnread: unreadCount > 0 }) }), latestMessageTime && (_jsx("span", { className: "shrink-0 text-[12px] font-normal leading-[160%] text-[#747B7E] [font-feature-settings:'liga'_off,'clig'_off]", children: latestMessageTime }))] }), _jsxs("div", { className: "flex items-center justify-between gap-2", children: [_jsx("p", { className: clsx("min-w-0 flex-1 truncate text-[14px] leading-[160%] [font-feature-settings:'liga'_off,'clig'_off]", unreadCount > 0

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(() => {

package/dist/hooks/message/useSendMessage.d.ts

@@ -42,8 +42,9 @@ export declare const useSendMessage: (options?: UseSendMessageOptions) => {
     }) => Promise<void>;
     resendMessage: (failedMessage: MessageItem) => Promise<void>;
 };
-export declare const generateExtendMessageInfo: ({ richText, currentSession, }: {
+export declare const generateExtendMessageInfo: ({ richText, plainText, currentSession, }: {
     richText?: string;
+    plainText?: string;
     currentSession?: ISessionResponse;
 }) => ExtendMessageInfo;
 //# sourceMappingURL=useSendMessage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,WAAW,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAUlC,OAAO,EAAgB,gBAAgB,EAAyB,MAAM,aAAa,CAAC;AAkBpF,eAAO,MAAM,iBAAiB,GAAI,SAAS;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,YAE0C,CAAC;AAE5C,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,gCAanD,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,iBAAiB,eAAe,gCAazE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,MAAM,mBAAmB,gCAatE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,gCActE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,MAAM,EACZ,eAAe,WAAW,gCAc3B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,wCAAwC,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,eAAe,CAAC;CACxE;AAED,eAAO,MAAM,cAAc,GAAI,UAAU,qBAAqB;4EA+OvD;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;KACrB,KAAG,OAAO,CAAC,OAAO,CAAC;oFA4CjB;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,UAAU,EAAE,CAAC;QACpB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;KACrB;mCApKqB,WAAW;CAqSpC,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,+BAGvC;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,gBAAgB,CAAC;CACnC,KAWM,iBACN,CAAC"}
+{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,WAAW,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAUlC,OAAO,EAAgB,gBAAgB,EAAyB,MAAM,aAAa,CAAC;AAkBpF,eAAO,MAAM,iBAAiB,GAAI,SAAS;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,YAE0C,CAAC;AAE5C,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,gCAanD,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,iBAAiB,eAAe,gCAazE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,MAAM,oBAAoB,gCAaxE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,MAAM,mBAAmB,gCAatE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,gCActE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,MAAM,EACZ,eAAe,WAAW,gCAc3B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,wCAAwC,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,eAAe,CAAC;CACxE;AAED,eAAO,MAAM,cAAc,GAAI,UAAU,qBAAqB;4EA+OvD;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;KACrB,KAAG,OAAO,CAAC,OAAO,CAAC;oFA6CjB;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,UAAU,EAAE,CAAC;QACpB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;KACrB;mCArKqB,WAAW;CA6SpC,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,0CAIvC;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,gBAAgB,CAAC;CACnC,sBA4BA,CAAC"}

package/dist/hooks/message/useSendMessage.js

@@ -292,6 +292,7 @@ export const useSendMessage = (options) => {
             return false;
         const extendMessageInfo = generateExtendMessageInfo({
             richText,
+            plainText,
             currentSession,
         });
         let messageItem = Object.assign(Object.assign({}, message), { ex: JSON.stringify(extendMessageInfo) || "{}", isInternal });
@@ -306,6 +307,7 @@ export const useSendMessage = (options) => {
         setQuotedMessage,
     ]);
     const sendMergeMessage = useCallback(async ({ richText, plainText, files, currentSession, isInternal, }) => {
+        var _a, _b;
         if (!recvID && !groupID)
             return;
         const messageList = [];
@@ -414,6 +416,12 @@ export const useSendMessage = (options) => {
         for (const message of messageList) {
             const extendMessageInfo = generateExtendMessageInfo({
                 richText: (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.TextMessage ? richText : "",
+                plainText: (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.TextMessage ||
+                    (message === null || message === void 0 ? void 0 : message.contentType) === MessageType.UrlTextMessage
+                    ? ((_a = message.textElem) === null || _a === void 0 ? void 0 : _a.content) ||
+                        ((_b = message.urlTextElem) === null || _b === void 0 ? void 0 : _b.content) ||
+                        plainText
+                    : "",
                 currentSession,
             });
             const mMessage = Object.assign(Object.assign({}, message), { ex: JSON.stringify(extendMessageInfo) || "{}", isInternal });
@@ -426,18 +434,32 @@ export const useSendMessage = (options) => {
         resendMessage,
     };
 };
-export const generateExtendMessageInfo = ({ richText, currentSession, }) => {
-    return {
-        messageInfo: {
+export const generateExtendMessageInfo = ({ richText, plainText, currentSession, }) => {
+    const extendMessageInfo = {
+        sessionId: (currentSession === null || currentSession === void 0 ? void 0 : currentSession.id) || "",
+        applicationType: useAuthStore.getState().applicationType,
+    };
+    const trimmedRichText = richText === null || richText === void 0 ? void 0 : richText.trim();
+    const trimmedPlainText = plainText === null || plainText === void 0 ? void 0 : plainText.trim();
+    if (trimmedRichText) {
+        extendMessageInfo.messageInfo = {
             type: "MESSAGE_INFO",
             data: {
                 type: "rich_text",
-                content: richText || "",
+                content: trimmedRichText,
             },
-        },
-        sessionId: (currentSession === null || currentSession === void 0 ? void 0 : currentSession.id) || "",
-        applicationType: useAuthStore.getState().applicationType,
-    };
+        };
+    }
+    else if (trimmedPlainText) {
+        extendMessageInfo.messageInfo = {
+            type: "MESSAGE_INFO",
+            data: {
+                type: "plain_text",
+                content: trimmedPlainText,
+            },
+        };
+    }
+    return extendMessageInfo;
 };
 const createPicBaseInfoFromFile = (file) => new Promise((resolve, reject) => {
     const _URL = window.URL || window.webkitURL;

package/dist/hooks/user/useUsersInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUsersInfo.d.ts","sourceRoot":"","sources":["../../../src/hooks/user/useUsersInfo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAe,MAAM,yBAAyB,CAAC;AAKxE,eAAO,MAAM,+BAA+B,GAC1C,eAAe,gBAAgB,EAAE,aAkBlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAyB5B,CAAC"}
+{"version":3,"file":"useUsersInfo.d.ts","sourceRoot":"","sources":["../../../src/hooks/user/useUsersInfo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAe,MAAM,yBAAyB,CAAC;AASxE,eAAO,MAAM,+BAA+B,GAC1C,eAAe,gBAAgB,EAAE,aAwBlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,YA4B5B,CAAC"}

package/dist/hooks/user/useUsersInfo.js

@@ -2,18 +2,27 @@ import { useCallback, useEffect } from "react";
 import useConversationStore from "../../store/conversation";
 import { SessionType } from "@openim/wasm-client-sdk";
 import useUsersInfoStore from "../../store/usersInfo";
+import useAuthStore from "../../store/auth";
 import { DChatSDK } from "../../constants/sdk";
+const isValidUserId = (userId) => !!(userId === null || userId === void 0 ? void 0 : userId.trim());
 export const extractUserIdsFromConversations = (conversations) => {
     const ids = conversations.reduce((acc, c) => {
-        var _a;
+        var _a, _b;
         if (c.conversationType === SessionType.Single) {
-            acc.push(c.userID);
+            if (isValidUserId(c.userID)) {
+                acc.push(c.userID.trim());
+            }
         }
         else if (c.conversationType === SessionType.Group) {
-            const exConversationInfo = JSON.parse(c.ex || "{}");
-            const sessionInfo = exConversationInfo === null || exConversationInfo === void 0 ? void 0 : exConversationInfo.sessionInfo;
-            if ((_a = sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.data) === null || _a === void 0 ? void 0 : _a.ownerId) {
-                acc.push(sessionInfo.data.ownerId);
+            try {
+                const exConversationInfo = JSON.parse(c.ex || "{}");
+                const ownerId = (_b = (_a = exConversationInfo === null || exConversationInfo === void 0 ? void 0 : exConversationInfo.sessionInfo) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.ownerId;
+                if (isValidUserId(ownerId)) {
+                    acc.push(ownerId.trim());
+                }
+            }
+            catch (_c) {
+                // ignore malformed conversation ex
             }
         }
         return acc;
@@ -22,23 +31,26 @@ export const extractUserIdsFromConversations = (conversations) => {
 };
 export const useSyncUsersInfo = () => {
     const conversationList = useConversationStore((state) => state.conversationList);
+    const isCrm = useAuthStore((state) => state.isCrm);
     const syncUsersInfo = useCallback(() => {
+        if (!isCrm)
+            return;
         const userIds = extractUserIdsFromConversations(conversationList);
         const { usersInfo, upsertUsers } = useUsersInfoStore.getState();
         const needFetch = userIds.filter((id) => !usersInfo[id]);
-        if (needFetch.length > 0) {
-            DChatSDK.getUsersInfo(needFetch)
-                .then(({ data }) => {
-                upsertUsers(data);
-            })
-                .catch((error) => {
-                console.error("Error fetching users info:", error);
-            });
-        }
-    }, [conversationList]);
+        if (needFetch.length === 0)
+            return;
+        DChatSDK.getUsersInfo(needFetch)
+            .then(({ data }) => {
+            upsertUsers(data);
+        })
+            .catch((error) => {
+            console.error("Error fetching users info:", error);
+        });
+    }, [conversationList, isCrm]);
     useEffect(() => {
-        if (!conversationList)
+        if (!isCrm || !conversationList.length)
             return;
         syncUsersInfo();
-    }, [conversationList]);
+    }, [conversationList, isCrm, syncUsersInfo]);
 };