@droppii-org/chat-sdk 0.1.15 → 0.1.17

package/dist/components/thread/ManualAssignPopover.js

@@ -11,19 +11,21 @@ import { message as antdMessage } from "antd";
 import { invalidateSessionQueries } from "../../utils/queryHelpers";
 import AssignConfirmModal from "./AssignConfirmModal";
 import { useDebounce } from "ahooks";
+import useAuthStore from "../../store/auth";
 const SEARCH_DEBOUNCE_WAIT = 300;
-const SupporterItem = ({ supporter, onClick, isCurrentAssignee, }) => {
+const SupporterItem = ({ supporter, onClick, isCurrentAssignee, isCurrentUser, }) => {
     var _a;
     const { t } = useTranslation();
     const isOnline = supporter.status === "ONLINE";
     return (_jsxs("div", { role: "option", tabIndex: 0, "aria-selected": isCurrentAssignee, className: clsx("flex items-center gap-3 px-3 py-2 rounded-md transition-colors", isCurrentAssignee
             ? "bg-blue-50 border border-blue-200 pointer-events-none"
-            : "cursor-pointer hover:bg-gray-50"), onClick: () => onClick(supporter), children: [_jsx(Badge, { dot: true, color: isOnline ? "#52c41a" : "#d9d9d9", offset: [-2, 24], children: _jsx(Avatar, { src: supporter.avatar, size: 32, children: ((_a = supporter.displayName) === null || _a === void 0 ? void 0 : _a.charAt(0)) || "A" }) }), _jsx("span", { className: "text-sm truncate flex-1", children: supporter.displayName }), isCurrentAssignee && (_jsx("span", { className: "text-xs text-blue-500 shrink-0", children: t("manual_assign_current") }))] }));
+            : "cursor-pointer hover:bg-gray-50"), onClick: () => onClick(supporter), children: [_jsx(Badge, { dot: true, color: isOnline ? "#52c41a" : "#d9d9d9", offset: [-2, 24], children: _jsx(Avatar, { src: supporter.avatar, size: 32, children: ((_a = supporter.displayName) === null || _a === void 0 ? void 0 : _a.charAt(0)) || "A" }) }), _jsxs("div", { className: "flex items-center gap-2 min-w-0 flex-1", children: [_jsx("span", { className: "text-sm truncate", children: supporter.displayName }), isCurrentUser && (_jsx("span", { className: "text-xs text-blue-500 shrink-0", children: t("current_account") }))] }), _jsx("div", { className: "flex items-center gap-2 shrink-0", children: isCurrentAssignee && (_jsx("span", { className: "text-xs text-blue-500 shrink-0", children: t("manual_assign_current") })) })] }));
 };
 const ManualAssignPopover = ({ sessionId, supporter, teamId: propTeamId, }) => {
     var _a, _b;
     const { t } = useTranslation();
     const queryClient = useQueryClient();
+    const authUserID = useAuthStore((state) => state.userID);
     const [open, setOpen] = useState(false);
     const [searchText, setSearchText] = useState("");
     const [selectedAgent, setSelectedAgent] = useState(null);
@@ -75,7 +77,18 @@ const ManualAssignPopover = ({ sessionId, supporter, teamId: propTeamId, }) => {
             setSearchText("");
         }
     };
-    const popoverContent = (_jsxs("div", { className: "w-64", children: [_jsx("div", { className: "mb-2", children: _jsx(Input, { autoFocus: true, placeholder: t("manual_assign_search_placeholder"), value: searchText, onChange: (e) => setSearchText(e.target.value), prefix: _jsx(Icon, { icon: "search-o", size: 16, className: "text-gray-400" }), className: "rounded-lg border-gray-300 focus-within:border-[#3278f7] focus-within:shadow-[0_0_0_2px_rgba(50,120,247,0.12)]", allowClear: true }) }), _jsx("div", { className: "max-h-72 overflow-y-auto", role: "listbox", children: isLoading ? (_jsx("div", { className: "flex items-center justify-center py-8", children: _jsx(Spin, {}) })) : supporters && supporters.length > 0 ? (_jsx("div", { className: clsx("flex flex-col transition-opacity duration-200", isFetching && "opacity-50 pointer-events-none"), children: supporters.map((item) => (_jsx(SupporterItem, { supporter: item, onClick: handleSelectAgent, isCurrentAssignee: item.memberId === (supporter === null || supporter === void 0 ? void 0 : supporter.id) }, item.memberId))) })) : (_jsx("div", { className: "flex items-center justify-center py-8", children: _jsx("span", { className: "text-sm text-gray-400", children: t("manual_assign_no_results") }) })) })] }));
+    const popoverContent = (_jsxs("div", { className: "w-64", children: [_jsx("div", { className: "mb-2", children: _jsx(Input, { autoFocus: true, placeholder: t("manual_assign_search_placeholder"), value: searchText, onChange: (e) => setSearchText(e.target.value), prefix: _jsx(Icon, { icon: "search-o", size: 16, className: "text-gray-400" }), className: "rounded-lg border-gray-300 focus-within:border-[#3278f7] focus-within:shadow-[0_0_0_2px_rgba(50,120,247,0.12)]", allowClear: true }) }), _jsx("div", { className: "max-h-72 overflow-y-auto", role: "listbox", children: isLoading ? (_jsx("div", { className: "flex items-center justify-center py-8", children: _jsx(Spin, {}) })) : supporters && supporters.length > 0 ? (_jsx("div", { className: clsx("flex flex-col transition-opacity duration-200", isFetching && "opacity-50 pointer-events-none"), children: [...supporters]
+                        .sort((supporterA, supporterB) => {
+                        const isSupporterACurrentUser = supporterA.memberId === authUserID;
+                        const isSupporterBCurrentUser = supporterB.memberId === authUserID;
+                        if (isSupporterACurrentUser !== isSupporterBCurrentUser) {
+                            return isSupporterACurrentUser ? -1 : 1;
+                        }
+                        return supporterA.displayName.localeCompare(supporterB.displayName, "vi", {
+                            sensitivity: "base",
+                        });
+                    })
+                        .map((item) => (_jsx(SupporterItem, { supporter: item, onClick: handleSelectAgent, isCurrentAssignee: item.memberId === (supporter === null || supporter === void 0 ? void 0 : supporter.id), isCurrentUser: item.memberId === authUserID }, item.memberId))) })) : (_jsx("div", { className: "flex items-center justify-center py-8", children: _jsx("span", { className: "text-sm text-gray-400", children: t("manual_assign_no_results") }) })) })] }));
     return (_jsxs(_Fragment, { children: [_jsx(Popover, { content: popoverContent, trigger: "click", open: open, onOpenChange: handleOpenChange, placement: "topLeft", arrow: false, children: _jsxs("div", { role: "button", tabIndex: 0, "aria-label": t("manual_assign_button_reassign"), className: clsx("flex items-center border border-gray-200 rounded-lg p-1 gap-1 transition-opacity", isAssigning
                         ? "opacity-50 pointer-events-none"
                         : "cursor-pointer hover:opacity-80"), children: [_jsx(Avatar, { src: supporter === null || supporter === void 0 ? void 0 : supporter.avatar, size: 28, children: ((_b = (_a = supporter === null || supporter === void 0 ? void 0 : supporter.fullName) === null || _a === void 0 ? void 0 : _a.charAt) === null || _b === void 0 ? void 0 : _b.call(_a, 0)) || "A" }), _jsx("span", { className: "text-purple-500", children: _jsx(Icon, { icon: "shuffle-b", size: 20 }) })] }) }), _jsx(AssignConfirmModal, { open: confirmModalOpen, agent: selectedAgent, loading: isAssigning, onCancel: handleCancelConfirm, onConfirm: handleConfirmAssign, afterClose: handleAfterClose })] }));

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

package/dist/hooks/global/useGlobalEvent.js

@@ -10,6 +10,8 @@ import { useRefetchChatToken } from "../../hooks/init/useChatToken";
 import { updateSession } from "../session/useUpdateSession";
 import { QUERY_KEYS } from "../../services/query";
 import { useQueryClient } from "@tanstack/react-query";
+import { isGroupSession } from "../../utils/imCommon";
+import { invalidateSessionQueries } from "../../utils/queryHelpers";
 const notPushType = [MessageType.TypingMessage, MessageType.RevokeMessage];
 export const useGlobalEvent = () => {
     const { user } = useChatContext();
@@ -17,12 +19,25 @@ export const useGlobalEvent = () => {
     const { updateConnectStatus, updateSyncStatus, getSelfUserInfo } = useChatContext();
     const updateConversationList = useConversationStore((state) => state.updateConversationList);
     const getConversationListByReq = useConversationStore((state) => state.getConversationListByReq);
+    const getCurrentGroupInfoByReq = useConversationStore((state) => state.getCurrentGroupInfoByReq);
+    const getCurrentMemberInGroupByReq = useConversationStore((state) => state.getCurrentMemberInGroupByReq);
     const { mutate: refetchChatToken } = useRefetchChatToken();
     const accessToken = useAuthStore((state) => state.accessToken);
     const chatToken = useAuthStore((state) => state.chatToken);
     const apiAddress = useAuthStore((state) => {
         return state.apiAddress;
     });
+    const refreshCurrentGroupState = async () => {
+        const currentConversation = useConversationStore.getState().currentConversation;
+        if (!(currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.groupID) ||
+            !isGroupSession(currentConversation.conversationType)) {
+            return;
+        }
+        await Promise.all([
+            getCurrentGroupInfoByReq(currentConversation.groupID),
+            getCurrentMemberInGroupByReq(currentConversation.groupID),
+        ]);
+    };
     const revokedMessageHandler = ({ data }) => {
         updateOneMessage({
             clientMsgID: data.clientMsgID,
@@ -67,6 +82,12 @@ export const useGlobalEvent = () => {
         if (!notPushType.includes(newServerMsg.contentType)) {
             pushNewMessage(newServerMsg);
         }
+        if (newServerMsg.sendID !== (user === null || user === void 0 ? void 0 : user.userID)) {
+            queryClient.invalidateQueries({
+                queryKey: [QUERY_KEYS.GET_LIST_SESSION_BY_CONVERSATION],
+            });
+            void invalidateSessionQueries(queryClient);
+        }
     };
     const newMessageHandler = ({ data }) => {
         var _a;
@@ -119,7 +140,6 @@ export const useGlobalEvent = () => {
     };
     const connectSuccessHandler = () => {
         updateConnectStatus(ConnectStatus.Connected);
-        getConversationListByReq(false);
     };
     const connectFailedHandler = () => {
         updateConnectStatus(ConnectStatus.Disconnected);
@@ -132,6 +152,7 @@ export const useGlobalEvent = () => {
         // getFriendListByReq();
         // getGroupListByReq();
         getConversationListByReq(false);
+        void refreshCurrentGroupState();
         // getUnReadCountByReq();
     };
     const syncFailedHandler = () => {
@@ -197,9 +218,11 @@ export const useGlobalEvent = () => {
     // conversation
     const conversationChangeHandler = ({ data }) => {
         updateConversationList(data, "filter");
+        void refreshCurrentGroupState();
     };
     const newConversationHandler = ({ data }) => {
         updateConversationList(data, "push");
+        void refreshCurrentGroupState();
     };
     /** LIFE CYCLE */
     useEffect(() => {

package/dist/hooks/group/useGroupMembers.d.ts

@@ -0,0 +1,10 @@
+import { GroupMemberItem } from "@openim/wasm-client-sdk";
+interface UseGroupMembersResult {
+    members: GroupMemberItem[];
+    isLoading: boolean;
+    error?: string;
+    refetch: () => Promise<void>;
+}
+export declare const useGroupMembers: (groupID?: string) => UseGroupMembersResult;
+export {};
+//# sourceMappingURL=useGroupMembers.d.ts.map

package/dist/hooks/group/useGroupMembers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useGroupMembers.d.ts","sourceRoot":"","sources":["../../../src/hooks/group/useGroupMembers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM1D,UAAU,qBAAqB;IAC7B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,KACf,qBA2CF,CAAC"}

package/dist/hooks/group/useGroupMembers.js

@@ -0,0 +1,44 @@
+import { useCallback, useEffect, useState } from "react";
+import { DChatSDK } from "../../constants/sdk";
+const GROUP_MEMBER_LIST_OFFSET = 0;
+const GROUP_MEMBER_LIST_COUNT = 999;
+export const useGroupMembers = (groupID) => {
+    const [members, setMembers] = useState([]);
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState(undefined);
+    const fetchMembers = useCallback(async () => {
+        if (!groupID) {
+            setMembers([]);
+            setError(undefined);
+            return;
+        }
+        setIsLoading(true);
+        setError(undefined);
+        try {
+            const { data } = await DChatSDK.getGroupMemberList({
+                groupID,
+                filter: 0,
+                offset: GROUP_MEMBER_LIST_OFFSET,
+                count: GROUP_MEMBER_LIST_COUNT,
+            });
+            setMembers(data !== null && data !== void 0 ? data : []);
+        }
+        catch (err) {
+            console.error("Error fetching group member list:", err);
+            setMembers([]);
+            setError("load_group_member_list_failed");
+        }
+        finally {
+            setIsLoading(false);
+        }
+    }, [groupID]);
+    useEffect(() => {
+        void fetchMembers();
+    }, [fetchMembers]);
+    return {
+        members,
+        isLoading,
+        error,
+        refetch: fetchMembers,
+    };
+};

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

@@ -1 +1 @@
-{"version":3,"file":"useConversationMessages.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useConversationMessages.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,UAAU,6BAA6B;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,uBAAuB,GAAI,+EAKrC,6BAA6B;;;;;;;;;;;;;;;;;CAkC/B,CAAC"}
+{"version":3,"file":"useConversationMessages.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useConversationMessages.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,UAAU,6BAA6B;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,uBAAuB,GAAI,+EAKrC,6BAA6B;;;;;;;;;;;;;;;;;CAwC/B,CAAC"}

package/dist/hooks/message/useConversationMessages.js

@@ -3,11 +3,12 @@ import { useMemo } from "react";
 import { useMessage } from "./useMessage";
 import { usePullSessionMessages } from "./usePullSessionMessages";
 export const useConversationMessages = ({ conversationId, searchClientMsgID, restrictToLastSession = false, customerUserID, }) => {
-    const sdkMessages = useMessage(conversationId, searchClientMsgID);
+    const isPreviewMessagesBeforeJoin = restrictToLastSession;
+    const sdkMessages = useMessage(conversationId, searchClientMsgID, !isPreviewMessagesBeforeJoin);
     const { data: pulledMessages, isLoading: isPullLoading, isFetching: isPullFetching, } = usePullSessionMessages({
         conversationID: conversationId,
         userID: customerUserID,
-        enabled: restrictToLastSession,
+        enabled: isPreviewMessagesBeforeJoin,
     });
     const lastSessionState = useMemo(() => ({
         initLoading: isPullLoading || isPullFetching,
@@ -15,7 +16,7 @@ export const useConversationMessages = ({ conversationId, searchClientMsgID, res
         hasMoreNew: false,
         messageList: pulledMessages !== null && pulledMessages !== void 0 ? pulledMessages : [],
     }), [isPullLoading, isPullFetching, pulledMessages]);
-    if (restrictToLastSession) {
+    if (isPreviewMessagesBeforeJoin) {
         return {
             loadState: lastSessionState,
             latestLoadState: { current: lastSessionState },

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

@@ -1,6 +1,6 @@
 import { MessageItem, MessageType } from "@openim/wasm-client-sdk";
 export declare const visibleTypeMessage: MessageType[];
-export declare const useMessage: (conversationId?: string, searchClientMsgID?: string) => {
+export declare const useMessage: (conversationId?: string, searchClientMsgID?: string, enabled?: boolean) => {
     loadState: {
         initLoading: boolean;
         hasMoreOld: boolean;

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;AAUjC,eAAO,MAAM,kBAAkB,eAgB9B,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM;;;;;qBAOL,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;CAiPnC,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;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"}

package/dist/hooks/message/useMessage.js

@@ -4,8 +4,6 @@ import { DChatSDK } from "../../constants/sdk";
 import { useLatest, useRequest } from "ahooks";
 import emitter, { emit } from "../../utils/events";
 import isEmpty from "lodash/isEmpty";
-import { useChatContext } from "../../context/ChatContext";
-import { SyncStatus } from "../../types/chat";
 const PAGE_SIZE = 50;
 export const visibleTypeMessage = [
     MessageType.TextMessage,
@@ -24,8 +22,7 @@ export const visibleTypeMessage = [
     MessageType.RevokeMessage,
     MessageType.LogTextMessage,
 ];
-export const useMessage = (conversationId, searchClientMsgID) => {
-    const { syncStatus } = useChatContext();
+export const useMessage = (conversationId, searchClientMsgID, enabled = true) => {
     const [loadState, setLoadState] = useState({
         initLoading: true,
         hasMoreOld: true,
@@ -33,6 +30,7 @@ export const useMessage = (conversationId, searchClientMsgID) => {
         messageList: [],
     });
     const latestLoadState = useLatest(loadState);
+    const enabledRef = useLatest(enabled);
     const { loading: moreOldLoading, runAsync: getMoreOldMessages } = useRequest(async (loadMore = true) => {
         var _a, _b, _c, _d, _e;
         const reqConversationID = conversationId;
@@ -129,6 +127,8 @@ export const useMessage = (conversationId, searchClientMsgID) => {
     useEffect(() => {
         const pushNewMessage = (message) => {
             var _a, _b;
+            if (!enabledRef.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,6 +138,8 @@ export const useMessage = (conversationId, searchClientMsgID) => {
             });
         };
         const updateOneMessage = (message) => {
+            if (!enabledRef.current)
+                return;
             setLoadState((preState) => {
                 var _a, _b, _c, _d;
                 const tmpList = [...preState.messageList];
@@ -165,6 +167,8 @@ export const useMessage = (conversationId, searchClientMsgID) => {
             });
         };
         const removeOneMessage = (clientMsgID) => {
+            if (!enabledRef.current)
+                return;
             setLoadState((preState) => (Object.assign(Object.assign({}, preState), { messageList: preState.messageList.filter((msg) => msg.clientMsgID !== clientMsgID) })));
         };
         emitter.on("PUSH_NEW_MSG", pushNewMessage);
@@ -177,7 +181,16 @@ export const useMessage = (conversationId, searchClientMsgID) => {
         };
     }, []);
     useEffect(() => {
-        if (!conversationId || syncStatus !== SyncStatus.Success)
+        if (!enabled) {
+            setLoadState({
+                initLoading: true,
+                hasMoreOld: true,
+                hasMoreNew: false,
+                messageList: [],
+            });
+            return;
+        }
+        if (!conversationId)
             return;
         if (!isEmpty(searchClientMsgID)) {
             searchMessages();
@@ -193,7 +206,7 @@ export const useMessage = (conversationId, searchClientMsgID) => {
                 messageList: [],
             }));
         };
-    }, [conversationId, searchClientMsgID, syncStatus]);
+    }, [conversationId, searchClientMsgID, enabled]);
     return {
         loadState,
         latestLoadState,

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,kBAAkB,CAAC;AAW1B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAQlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAenD,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,eAAO,MAAM,cAAc;4EA6KpB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;KACrB;oFAoCE;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;mCA5JqB,WAAW;CA6RpC,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,kBAAkB,CAAC;AAY1B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAUlC,OAAO,EAAgB,gBAAgB,EAAyB,MAAM,iBAAiB,CAAC;AAkBxF,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,eAAO,MAAM,cAAc;4EA0NpB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;KACrB;oFAoCE;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;mCA5JqB,WAAW;CA6RpC,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,+BAGvC;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,gBAAgB,CAAC;CACnC,KAWM,iBACN,CAAC"}

package/dist/hooks/message/useSendMessage.js

@@ -3,12 +3,18 @@ import { DChatSDK } from "../../constants/sdk";
 import { v4 as uuidv4 } from "uuid";
 import { useChatContext } from "../../context/ChatContext";
 import { useCallback } from "react";
+import { useQueryClient } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 import { pushNewMessage, removeOneMessage, updateOneMessage, } from "./useMessage";
 import { emit } from "../../utils/events";
 import useConversationStore from "../../store/conversation";
 import useAuthStore from "../../store/auth";
+import { apiInstance } from "../../services/api";
+import { ENDPOINTS } from "../../services/routes";
 import { extractLinks, generateContentBasedOnMessageType, } from "../../utils/common";
+import { SessionStatus, SessionTag } from "../../types/chat";
+import { updateSession } from "../session/useUpdateSession";
+import { invalidateSessionQueries } from "../../utils/queryHelpers";
 const messageFileStore = new Map();
 const MEDIA_CONTENT_TYPES = new Set([
     MessageType.PictureMessage,
@@ -100,11 +106,38 @@ export const createQuoteMessage = async (text, quotedMessage) => {
 export const useSendMessage = () => {
     const { user } = useChatContext();
     const { t } = useTranslation("common");
+    const queryClient = useQueryClient();
     const conversationData = useConversationStore((state) => state.conversationData);
     const quotedMessage = useConversationStore((state) => state.quotedMessage);
     const setQuotedMessage = useConversationStore((state) => state.setQuotedMessage);
     const { userID: recvID, groupID } = conversationData || {};
-    const dispatchMessage = useCallback(async (message) => {
+    const syncSessionAfterPublicMessage = useCallback(async (currentSession) => {
+        if (!(currentSession === null || currentSession === void 0 ? void 0 : currentSession.id)) {
+            return;
+        }
+        const shouldUpdateStatus = currentSession.status === SessionStatus.WAITING_PROCESS ||
+            currentSession.tag === SessionTag.AWAITING_REPLY ||
+            currentSession.tag === SessionTag.TEMPORARILY_PAUSED;
+        if (!shouldUpdateStatus) {
+            return;
+        }
+        try {
+            const response = await apiInstance.put(ENDPOINTS.chatService.updateSession(currentSession.id), {
+                status: SessionStatus.IN_PROCESS,
+                applicationType: useAuthStore.getState().applicationType,
+            });
+            const updatedSession = response.data.data;
+            if (!updatedSession) {
+                return;
+            }
+            updateSession(updatedSession);
+            await invalidateSessionQueries(queryClient);
+        }
+        catch (error) {
+            console.error("syncSessionAfterPublicMessage", error);
+        }
+    }, [queryClient]);
+    const dispatchMessage = useCallback(async (message, currentSession) => {
         var _a, _b;
         const desc = generateContentBasedOnMessageType(message.contentType, ((_a = message === null || message === void 0 ? void 0 : message.textElem) === null || _a === void 0 ? void 0 : _a.content) || "") || t("new_message");
         const { data: successMessage } = await DChatSDK.sendMessage({
@@ -125,13 +158,16 @@ export const useSendMessage = () => {
             },
         });
         updateOneMessage(Object.assign(Object.assign({}, successMessage), { ex: successMessage.ex || message.ex || "{}", isInternal: (_b = successMessage.isInternal) !== null && _b !== void 0 ? _b : message.isInternal }));
+        if (!message.isInternal) {
+            await syncSessionAfterPublicMessage(currentSession);
+        }
         messageFileStore.delete(message.clientMsgID);
-    }, [recvID, groupID]);
-    const sendMessage = useCallback(async (message) => {
+    }, [groupID, recvID, syncSessionAfterPublicMessage, t, conversationData === null || conversationData === void 0 ? void 0 : conversationData.showName, conversationData === null || conversationData === void 0 ? void 0 : conversationData.faceURL, conversationData === null || conversationData === void 0 ? void 0 : conversationData.conversationID]);
+    const sendMessage = useCallback(async (message, currentSession) => {
         pushNewMessage(message);
         emit("CHAT_LIST_SCROLL_TO_BOTTOM");
         try {
-            await dispatchMessage(message);
+            await dispatchMessage(message, currentSession);
         }
         catch (error) {
             console.error("sendMessage", error);
@@ -242,7 +278,7 @@ export const useSendMessage = () => {
             currentSession,
         });
         let messageItem = Object.assign(Object.assign({}, message), { ex: JSON.stringify(extendMessageInfo) || "{}", isInternal });
-        sendMessage(messageItem);
+        sendMessage(messageItem, currentSession);
     }, [recvID, groupID, user, sendMessage, quotedMessage, setQuotedMessage]);
     const sendMergeMessage = useCallback(async ({ richText, plainText, files, currentSession, isInternal, }) => {
         if (!recvID && !groupID)
@@ -356,7 +392,7 @@ export const useSendMessage = () => {
                 currentSession,
             });
             const mMessage = Object.assign(Object.assign({}, message), { ex: JSON.stringify(extendMessageInfo) || "{}", isInternal });
-            await sendMessage(mMessage);
+            await sendMessage(mMessage, currentSession);
         }
     }, [recvID, groupID, sendMessage, quotedMessage, setQuotedMessage]);
     return {

package/dist/hooks/session/useCloseSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCloseSession.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useCloseSession.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,eAAO,MAAM,eAAe,wGAexB,CAAC"}
+{"version":3,"file":"useCloseSession.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useCloseSession.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI/C,eAAO,MAAM,eAAe,wGAqB3B,CAAC"}

package/dist/hooks/session/useCloseSession.js

@@ -1,16 +1,23 @@
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { QUERY_KEYS } from "../../services/query";
 import { apiInstance } from "../../services/api";
 import { ENDPOINTS } from "../../services/routes";
 import useAuthStore from "../../store/auth";
-export const useCloseSession = () => useMutation({
-    mutationKey: [QUERY_KEYS.CLOSE_SESSION],
-    mutationFn: async (sessionId) => {
-        const res = await apiInstance.post(ENDPOINTS.chatService.closeSession(sessionId), null, {
-            params: {
-                applicationType: useAuthStore.getState().applicationType,
-            },
-        });
-        return res === null || res === void 0 ? void 0 : res.data;
-    },
-});
+import { invalidateSessionQueries } from "../../utils/queryHelpers";
+export const useCloseSession = () => {
+    const queryClient = useQueryClient();
+    return useMutation({
+        mutationKey: [QUERY_KEYS.CLOSE_SESSION],
+        mutationFn: async (sessionId) => {
+            const res = await apiInstance.post(ENDPOINTS.chatService.closeSession(sessionId), null, {
+                params: {
+                    applicationType: useAuthStore.getState().applicationType,
+                },
+            });
+            return res === null || res === void 0 ? void 0 : res.data;
+        },
+        onSuccess: async () => {
+            await invalidateSessionQueries(queryClient);
+        },
+    });
+};

package/dist/hooks/session/useJoinGroupFlow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useJoinGroupFlow.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useJoinGroupFlow.ts"],"names":[],"mappings":"AAQA,UAAU,sBAAsB;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,2BAA2B,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,gBAAgB,GAAI,yFAK9B,sBAAsB;;;CA6DxB,CAAC"}
+{"version":3,"file":"useJoinGroupFlow.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useJoinGroupFlow.ts"],"names":[],"mappings":"AAUA,UAAU,sBAAsB;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,2BAA2B,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,gBAAgB,GAAI,yFAK9B,sBAAsB;;;CA4ExB,CAAC"}

package/dist/hooks/session/useJoinGroupFlow.js

@@ -1,26 +1,40 @@
 "use client";
 import { message } from "antd";
-import { useCallback, useEffect, useRef } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import useConversationStore from "../../store/conversation";
 import { useJoinSession } from "./useJoinSession";
+const POST_JOIN_SYNC_DELAY = 500;
 export const useJoinGroupFlow = ({ groupId, latestConversationSessionId, refetchIsJoined, refetchConversationSessions, }) => {
     const { t } = useTranslation();
     const joinSyncTimerRef = useRef(null);
+    const [isWaitingForSync, setIsWaitingForSync] = useState(false);
     const getCurrentGroupInfoByReq = useConversationStore((state) => state.getCurrentGroupInfoByReq);
     const { mutateAsync: joinSession, isPending: isJoining } = useJoinSession();
     const syncGroupStateAfterJoin = useCallback(async () => {
-        await refetchIsJoined();
-        await refetchConversationSessions();
-        if (!groupId)
-            return;
-        await getCurrentGroupInfoByReq(groupId);
         if (joinSyncTimerRef.current) {
             clearTimeout(joinSyncTimerRef.current);
         }
-        joinSyncTimerRef.current = setTimeout(() => {
-            void getCurrentGroupInfoByReq(groupId);
-        }, 1500);
+        setIsWaitingForSync(true);
+        try {
+            await refetchIsJoined();
+            await refetchConversationSessions();
+            if (!groupId)
+                return;
+            await getCurrentGroupInfoByReq(groupId);
+            await new Promise((resolve) => {
+                joinSyncTimerRef.current = setTimeout(() => {
+                    resolve();
+                }, POST_JOIN_SYNC_DELAY);
+            });
+            await refetchIsJoined();
+            await refetchConversationSessions();
+            await getCurrentGroupInfoByReq(groupId);
+        }
+        finally {
+            setIsWaitingForSync(false);
+            joinSyncTimerRef.current = null;
+        }
     }, [
         getCurrentGroupInfoByReq,
         groupId,
@@ -33,17 +47,16 @@ export const useJoinGroupFlow = ({ groupId, latestConversationSessionId, refetch
             return;
         try {
             await joinSession(latestConversationSessionId);
-            message.success(t("join_group_success"));
         }
         catch (error) {
             const isDuplicate = (_d = (_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.includes) === null || _d === void 0 ? void 0 : _d.call(_c, "Duplicate key");
             if (!isDuplicate) {
                 message.error(t("join_group_failed"));
             }
+            return;
         }
-        finally {
-            await syncGroupStateAfterJoin();
-        }
+        await syncGroupStateAfterJoin();
+        message.success(t("join_group_success"));
     }, [joinSession, latestConversationSessionId, syncGroupStateAfterJoin, t]);
     useEffect(() => {
         return () => {
@@ -54,6 +67,6 @@ export const useJoinGroupFlow = ({ groupId, latestConversationSessionId, refetch
     }, []);
     return {
         handleJoinGroup,
-        isJoining,
+        isJoining: isJoining || isWaitingForSync,
     };
 };

package/dist/hooks/session/useUpdateSession.d.ts

@@ -4,7 +4,7 @@ interface UpdateSessionParams {
     status?: string;
     tag?: string;
 }
-export declare const useUpdateSession: () => import("@tanstack/react-query").UseMutationResult<any, Error, UpdateSessionParams, unknown>;
+export declare const useUpdateSession: () => import("@tanstack/react-query").UseMutationResult<UpdateSessionResponse, Error, UpdateSessionParams, unknown>;
 export declare const updateSession: (data: UpdateSessionResponse) => void;
 export {};
 //# sourceMappingURL=useUpdateSession.d.ts.map

package/dist/hooks/session/useUpdateSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUpdateSession.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useUpdateSession.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,gBAAgB,mGAczB,CAAC;AAEL,eAAO,MAAM,aAAa,GAAI,MAAM,qBAAqB,SAC3B,CAAC"}
+{"version":3,"file":"useUpdateSession.d.ts","sourceRoot":"","sources":["../../../src/hooks/session/useUpdateSession.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAItE,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,gBAAgB,qHAqB5B,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,MAAM,qBAAqB,SAC3B,CAAC"}

package/dist/hooks/session/useUpdateSession.js

@@ -1,19 +1,27 @@
 "use client";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { QUERY_KEYS } from "../../services/query";
 import { apiInstance } from "../../services/api";
 import { ENDPOINTS } from "../../services/routes";
 import useAuthStore from "../../store/auth";
 import { emit } from "../../utils/events";
-export const useUpdateSession = () => useMutation({
-    mutationKey: [QUERY_KEYS.UPDATE_SESSION],
-    mutationFn: async ({ sessionId, status, tag }) => {
-        const res = await apiInstance.put(ENDPOINTS.chatService.updateSession(sessionId), {
-            status,
-            tag,
-            applicationType: useAuthStore.getState().applicationType,
-        });
-        return res.data;
-    },
-});
+import { invalidateSessionQueries } from "../../utils/queryHelpers";
+export const useUpdateSession = () => {
+    const queryClient = useQueryClient();
+    return useMutation({
+        mutationKey: [QUERY_KEYS.UPDATE_SESSION],
+        mutationFn: async ({ sessionId, status, tag }) => {
+            const res = await apiInstance.put(ENDPOINTS.chatService.updateSession(sessionId), {
+                status,
+                tag,
+                applicationType: useAuthStore.getState().applicationType,
+            });
+            return res.data.data;
+        },
+        onSuccess: async (data) => {
+            updateSession(data);
+            await invalidateSessionQueries(queryClient);
+        },
+    });
+};
 export const updateSession = (data) => emit("UPDATE_SESSION", data);