@droppii-org/chat-sdk 0.8.1 → 0.8.2

package/dist/hooks/group/useCreateGroup.js

@@ -6,11 +6,58 @@ import { useTranslation } from "react-i18next";
 import { GroupType, GroupVerificationType, GroupVisibility, SessionType } from "@droppii-org/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
 import useAuthStore from "../../store/auth";
+import { useChatContext } from "../../context/ChatContext";
 import { useDeskThreadNavigation } from "../../hooks/conversation/useDeskThreadNavigation";
 import { generateDefaultGroupName } from "../../utils/groupName";
+import { SdkTimeoutError, withSdkTimeout } from "../../utils/withSdkTimeout";
 import { QUERY_KEYS } from "../../services/query";
 const GET_CONVERSATION_RETRY_COUNT = 4;
 const GET_CONVERSATION_RETRY_DELAY_MS = 500;
+// A create that timed out may still have gone through. Only a group that did not exist
+// before the call and was created since it started (minus clock skew) can be the result.
+const CREATE_TIME_SKEW_MS = 5000;
+const listJoinedGroups = async () => {
+    const { data } = await withSdkTimeout(DChatSDK.getJoinedGroupList(), "getJoinedGroupList");
+    return data !== null && data !== void 0 ? data : [];
+};
+// Full member IDs when core can list them; null means unknown, so the head count decides.
+const hasExpectedMembers = async (groupID, expectedUserIDs) => {
+    try {
+        const { data } = await withSdkTimeout(DChatSDK.getGroupMemberList({
+            groupID,
+            filter: 0,
+            offset: 0,
+            count: expectedUserIDs.length + 1,
+        }), "getGroupMemberList");
+        if (!data)
+            return null;
+        const actual = new Set(data.map((member) => member.userID));
+        return (actual.size === expectedUserIDs.length &&
+            expectedUserIDs.every((userID) => actual.has(userID)));
+    }
+    catch (_a) {
+        return null;
+    }
+};
+const findRecentlyCreatedGroup = async ({ name, ownerUserID, memberUserIDs, since, knownGroupIDs, }) => {
+    try {
+        const expectedUserIDs = [...new Set([ownerUserID, ...memberUserIDs])];
+        const candidates = (await listJoinedGroups()).filter((group) => !knownGroupIDs.has(group.groupID) &&
+            group.groupName === name &&
+            group.ownerUserID === ownerUserID &&
+            group.memberCount === expectedUserIDs.length &&
+            group.createTime >= since - CREATE_TIME_SKEW_MS);
+        for (const group of candidates) {
+            if ((await hasExpectedMembers(group.groupID, expectedUserIDs)) !== false)
+                return group;
+        }
+        return undefined;
+    }
+    catch (error) {
+        console.warn("find recently created group", error);
+        return undefined;
+    }
+};
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 // createGroup()'s own response succeeding doesn't mean the local WASM store
 // has the new conversation yet — the WS event that inserts it locally can
@@ -21,10 +68,10 @@ const getOneConversationWithRetry = async (groupID) => {
     let lastError;
     for (let attempt = 0; attempt < GET_CONVERSATION_RETRY_COUNT; attempt++) {
         try {
-            return await DChatSDK.getOneConversation({
+            return await withSdkTimeout(DChatSDK.getOneConversation({
                 sourceID: groupID,
                 sessionType: SessionType.Group,
-            });
+            }), "getOneConversation");
         }
         catch (error) {
             lastError = error;
@@ -46,13 +93,14 @@ export const useCreateGroup = () => {
     const { openThread } = useDeskThreadNavigation();
     const queryClient = useQueryClient();
     const userID = useAuthStore((state) => state.userID);
+    const { user } = useChatContext();
     const createGroup = useCallback(async ({ groupName, isPublic, members, faceURL }) => {
         var _a, _b;
         const trimmedName = groupName.trim();
         const [firstMember, ...restMembers] = members;
         const resolvedName = trimmedName ||
             generateDefaultGroupName({
-                creatorName: tCommon("you"),
+                creatorName: (user === null || user === void 0 ? void 0 : user.nickname) || tCommon("you"),
                 firstMemberName: firstMember === null || firstMember === void 0 ? void 0 : firstMember.displayName,
                 remainingCount: restMembers.length,
             });
@@ -60,7 +108,13 @@ export const useCreateGroup = () => {
         // group image (DROPPII-30928).
         const resolvedFaceURL = faceURL || "";
         try {
-            const { data: group } = await DChatSDK.createGroup({
+            // Without a snapshot a pre-existing twin cannot be told apart, so the fallback stays off.
+            const knownGroupIDs = await listJoinedGroups()
+                .then((groups) => new Set(groups.map((group) => group.groupID)))
+                .catch(() => null);
+            const startedAt = Date.now();
+            // A stalled core call must end in the error toast, not a dialog stuck on "loading".
+            const { groupID } = await withSdkTimeout(DChatSDK.createGroup({
                 memberUserIDs: members.map((member) => member.userID),
                 ownerUserID: userID,
                 groupInfo: {
@@ -71,8 +125,23 @@ export const useCreateGroup = () => {
                     ex: JSON.stringify({ isPublic }),
                     visibility: isPublic ? GroupVisibility.Public : GroupVisibility.Private,
                 },
+            }), "createGroup").then(({ data }) => data, async (error) => {
+                if (!(error instanceof SdkTimeoutError))
+                    throw error;
+                const created = knownGroupIDs
+                    ? await findRecentlyCreatedGroup({
+                        name: resolvedName,
+                        ownerUserID: userID,
+                        memberUserIDs: members.map((member) => member.userID),
+                        since: startedAt,
+                        knownGroupIDs,
+                    })
+                    : undefined;
+                if (!created)
+                    throw error;
+                return created;
             });
-            const { data: conversation } = await getOneConversationWithRetry(group.groupID);
+            const { data: conversation } = await getOneConversationWithRetry(groupID);
             message.success(t("create_group.create_group_success"));
             void queryClient.invalidateQueries({
                 queryKey: [QUERY_KEYS.GET_CONVERSATION_GROUPS],
@@ -87,6 +156,6 @@ export const useCreateGroup = () => {
             message.error(errorMessage);
             throw error;
         }
-    }, [openThread, t, tCommon, userID, queryClient]);
+    }, [openThread, t, tCommon, userID, user === null || user === void 0 ? void 0 : user.nickname, queryClient]);
     return { createGroup };
 };

package/dist/hooks/init/useChatBootPhase.d.ts

@@ -5,6 +5,8 @@ export interface ChatBootState {
     phase: ChatBootPhase;
     /** Step that failed when `phase` is "error". */
     failedStep: ChatBootFailedStep | null;
+    /** The failure is a sign-in from another device, not a network problem. */
+    isKicked: boolean;
     /** 0-100, meaningful in the "sync" phase. */
     syncProgress: number;
     /** The current step has run longer than the caller's `slowAfterMs`. */

package/dist/hooks/init/useChatBootPhase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChatBootPhase.d.ts","sourceRoot":"","sources":["../../../src/hooks/init/useChatBootPhase.ts"],"names":[],"mappings":"AAIA,OAAqB,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AAE9E,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,aAAa,CAAC;IACrB,gDAAgD;IAChD,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACtC,6CAA6C;IAC7C,YAAY,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,MAAM,EAAE,OAAO,CAAC;IAChB,oFAAoF;IACpF,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,oFAAoF;AACpF,eAAO,MAAM,aAAa,QAAS,CAAC;AAEpC,UAAU,qBAAqB;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACvC;AAED,eAAO,MAAM,oBAAoB,GAAI,+DAKlC,qBAAqB,KAAG,aAO1B,CAAC;AAEF,iGAAiG;AACjG,eAAO,MAAM,gBAAgB,GAAI,kBAE9B;IACD,WAAW,EAAE,MAAM,CAAC;CACrB,KAAG,aAwDH,CAAC"}
+{"version":3,"file":"useChatBootPhase.d.ts","sourceRoot":"","sources":["../../../src/hooks/init/useChatBootPhase.ts"],"names":[],"mappings":"AAIA,OAAqB,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AAE9E,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,aAAa,CAAC;IACrB,gDAAgD;IAChD,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACtC,2EAA2E;IAC3E,QAAQ,EAAE,OAAO,CAAC;IAClB,6CAA6C;IAC7C,YAAY,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,MAAM,EAAE,OAAO,CAAC;IAChB,oFAAoF;IACpF,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,oFAAoF;AACpF,eAAO,MAAM,aAAa,QAAS,CAAC;AAEpC,UAAU,qBAAqB;IAC7B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,UAAU,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACvC;AAED,eAAO,MAAM,oBAAoB,GAAI,+DAKlC,qBAAqB,KAAG,aAO1B,CAAC;AAEF,iGAAiG;AACjG,eAAO,MAAM,gBAAgB,GAAI,kBAE9B;IACD,WAAW,EAAE,MAAM,CAAC;CACrB,KAAG,aA6DH,CAAC"}

package/dist/hooks/init/useChatBootPhase.js

@@ -22,13 +22,17 @@ export const useChatBootPhase = ({ slowAfterMs, }) => {
     const hasConnected = useBootStore((state) => state.hasConnected);
     const isFirstSyncDone = useBootStore((state) => state.isFirstSyncDone);
     const failedStep = useBootStore((state) => state.failedStep);
+    const isKicked = useBootStore((state) => state.isKicked);
     const syncProgress = useBootStore((state) => state.syncProgress);
-    const basePhase = resolveChatBootPhase({
-        connectStatus,
-        hasConnected,
-        isFirstSyncDone,
-        failedStep,
-    });
+    // A kick is final even if a later connect event flips the connect status back.
+    const basePhase = isKicked
+        ? "error"
+        : resolveChatBootPhase({
+            connectStatus,
+            hasConnected,
+            isFirstSyncDone,
+            failedStep,
+        });
     // Sync progress restarts the slow/stall timers: a moving sync is not stuck.
     const stepKey = basePhase === "sync" ? `sync:${syncProgress}` : basePhase;
     const [isDelayOver, setIsDelayOver] = useState(false);
@@ -65,6 +69,7 @@ export const useChatBootPhase = ({ slowAfterMs, }) => {
     return {
         phase,
         failedStep: isStalled ? "connect" : phase === "error" ? failedStep : null,
+        isKicked: phase === "error" && isKicked,
         syncProgress,
         isSlow: slowStepKey === stepKey,
         isStatusVisible: isDelayOver || phase === "error",

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,8BAA8B,CAAC;AAkBtC,eAAO,MAAM,kBAAkB,eAkB9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,SAAS,WAAW,EACpB,OAAO,OAAO,EACd,eAAe;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5E,eAAe,MAAM,KACpB,OA4BF,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM,EAC1B,iBAAc,EACd,uBAAqB,EAGrB,yBAAyB,MAAM,IAAI;;;;;qBAed,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;;uCAwBlB,MAAM;CAmYvB,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,EAC1B,YAAY,CAAC,SAAS,EAAE,WAAW,KAAK,OAAO,KAC9C,WAAW,GAAG,SAqBhB,CAAC;AAMF,eAAO,MAAM,oBAAoB,GAC/B,aAAa,WAAW,EAAE,EAC1B,SAAS,WAAW,EACpB,WAAW,MAAM,GAAG,MAAM,KACzB,WAAW,GAAG,SAQhB,CAAC;AAmBF,eAAO,MAAM,mBAAmB,GAC9B,SAAS,WAAW,EAAE,EACtB,SAAS,WAAW,EAAE,kBAgBvB,CAAC"}
+{"version":3,"file":"useMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EAEX,WAAW,EAEZ,MAAM,8BAA8B,CAAC;AAkBtC,eAAO,MAAM,kBAAkB,eAkB9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,SAAS,WAAW,EACpB,OAAO,OAAO,EACd,eAAe;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5E,eAAe,MAAM,KACpB,OA4BF,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,iBAAiB,MAAM,EACvB,oBAAoB,MAAM,EAC1B,iBAAc,EACd,uBAAqB,EAGrB,yBAAyB,MAAM,IAAI;;;;;qBAed,WAAW,EAAE;;;;;;qBAAb,WAAW,EAAE;;;;;;;uCA6BlB,MAAM;CAscvB,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,EAC1B,YAAY,CAAC,SAAS,EAAE,WAAW,KAAK,OAAO,KAC9C,WAAW,GAAG,SAqBhB,CAAC;AAMF,eAAO,MAAM,oBAAoB,GAC/B,aAAa,WAAW,EAAE,EAC1B,SAAS,WAAW,EACpB,WAAW,MAAM,GAAG,MAAM,KACzB,WAAW,GAAG,SAQhB,CAAC;AAkCF,eAAO,MAAM,mBAAmB,GAC9B,SAAS,WAAW,EAAE,EACtB,SAAS,WAAW,EAAE,kBAgBvB,CAAC"}

package/dist/hooks/message/useMessage.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { ViewType, MessageType, } from "@droppii-org/wasm-client-sdk";
+import { ViewType, MessageStatus, MessageType, } from "@droppii-org/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
 import { PAGE_SIZE } from "../../constants";
 import { message as antdMessage } from "antd";
@@ -74,6 +74,10 @@ onSearchMessageRevoked) => {
     });
     const latestLoadState = useLatest(loadState);
     const canLoadRef = useLatest(canLoad);
+    // Set once this thread's first load has started; local pushes are accepted
+    // from then on even while disconnected.
+    const loadedTargetRef = useRef(null);
+    const canApplyLocalChanges = () => canLoadRef.current || loadedTargetRef.current !== null;
     const conversationIdRef = useLatest(conversationId);
     const useAppHistoryRef = useLatest(useAppHistory);
     // The load effect resets the list when the conversation or history mode
@@ -269,6 +273,7 @@ onSearchMessageRevoked) => {
         const fetched = [];
         let bridged = shown.size === 0;
         let startClientMsgID = "";
+        let reachedEnd = false;
         for (let page = 0; page < MAX_REFRESH_PAGES; page++) {
             const params = {
                 count: PAGE_SIZE.large,
@@ -283,6 +288,7 @@ onSearchMessageRevoked) => {
                 return;
             const newestFirst = data.messageList.toReversed();
             fetched.push(...newestFirst);
+            reachedEnd = Boolean(data.isEnd);
             if (newestFirst.some((msg) => shown.has(msg.clientMsgID))) {
                 bridged = true;
                 break;
@@ -299,23 +305,75 @@ onSearchMessageRevoked) => {
             if (!bridged) {
                 if (pageLoadingRef.current)
                     return preState;
-                return Object.assign(Object.assign({}, preState), { hasMoreOld: true, messageList: fetched });
+                return Object.assign(Object.assign({}, preState), { hasMoreOld: true, messageList: withLocalUnsent(fetched, preState.messageList) });
             }
             const messageList = mergeLatestMessages(preState.messageList, fetched);
-            return messageList === preState.messageList
+            // An empty list had no older-page cursor yet; take it from the walk.
+            const hasMoreOld = shown.size === 0 ? !reachedEnd : preState.hasMoreOld;
+            return messageList === preState.messageList &&
+                hasMoreOld === preState.hasMoreOld
                 ? preState
-                : Object.assign(Object.assign({}, preState), { messageList });
+                : Object.assign(Object.assign({}, preState), { hasMoreOld, messageList });
         });
     };
+    // Used when the connection is regained. A jumped-to window cannot be topped
+    // up in place, so swap in the newest page while keeping unsent local bubbles.
+    const reloadNewestKeepingLocal = async () => {
+        const reqConversationID = conversationId;
+        const reqUseAppHistory = useAppHistory;
+        if (!reqConversationID)
+            return;
+        const params = {
+            count: PAGE_SIZE.large,
+            startClientMsgID: "",
+            conversationID: reqConversationID,
+            viewType: ViewType.History,
+        };
+        const { data } = reqUseAppHistory
+            ? await DChatSDK.getAdvancedHistoryMessageListApp(params)
+            : await DChatSDK.getAdvancedHistoryMessageList(params);
+        if (isStaleResponse(reqConversationID, reqUseAppHistory))
+            return;
+        setLoadState((preState) => (Object.assign(Object.assign({}, preState), { initLoading: false, hasMoreOld: !data.isEnd, hasMoreNew: false, messageList: withLocalUnsent(data.messageList.toReversed(), preState.messageList) })));
+    };
+    // A regain that lands while the first load or a page load is in flight
+    // cannot refresh yet; remember it and retry once the load settles.
+    const needsCatchUpRef = useRef(false);
+    const catchUpAfterReconnect = async () => {
+        const state = latestLoadState.current;
+        if (!state || !canLoadRef.current)
+            return;
+        if (state.initLoading || pageLoadingRef.current) {
+            needsCatchUpRef.current = true;
+            return;
+        }
+        try {
+            if (state.hasMoreNew)
+                await reloadNewestKeepingLocal();
+            else
+                await refreshLatestMessages();
+        }
+        catch (_a) {
+            // Next reconnect or poll tries again.
+        }
+    };
+    useEffect(() => {
+        if (!needsCatchUpRef.current)
+            return;
+        if (loadState.initLoading || moreOldLoading || moreNewLoading)
+            return;
+        needsCatchUpRef.current = false;
+        void catchUpAfterReconnect();
+    }, [loadState.initLoading, moreOldLoading, moreNewLoading]);
     useEffect(() => {
         const pushNewMessage = (message) => {
-            var _a, _b;
-            if (!canLoadRef.current)
+            if (!canApplyLocalChanges())
                 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;
-            }
             setLoadState((preState) => {
+                // Checked on the queued state: two pushes can land before a render.
+                if (preState.messageList.some((item) => item.clientMsgID === message.clientMsgID)) {
+                    return preState;
+                }
                 // sendTime is assigned once at creation (optimistic or server) and
                 // never changes afterwards, so sorting by it keeps messages in the
                 // right order regardless of network delay or how late seq comes back.
@@ -324,7 +382,7 @@ onSearchMessageRevoked) => {
             });
         };
         const updateOneMessage = (message) => {
-            if (!canLoadRef.current)
+            if (!canApplyLocalChanges())
                 return;
             setLoadState((preState) => {
                 var _a, _b, _c, _d;
@@ -353,7 +411,7 @@ onSearchMessageRevoked) => {
             });
         };
         const removeOneMessage = (clientMsgID) => {
-            if (!canLoadRef.current)
+            if (!canApplyLocalChanges())
                 return;
             setLoadState((preState) => (Object.assign(Object.assign({}, preState), { messageList: preState.messageList.filter((msg) => msg.clientMsgID !== clientMsgID) })));
         };
@@ -366,32 +424,33 @@ onSearchMessageRevoked) => {
             emitter.off("REMOVE_ONE_MSG", removeOneMessage);
         };
     }, []);
+    // Reset only when the thread itself changes. Losing the connection must not
+    // empty the list, or optimistic Sending/Failed bubbles vanish while offline.
     useEffect(() => {
-        if (!canLoad) {
-            setLoadState({
-                initLoading: true,
-                hasMoreOld: true,
-                hasMoreNew: false,
-                messageList: [],
-            });
+        loadedTargetRef.current = null;
+        setLoadState({
+            initLoading: true,
+            hasMoreOld: true,
+            hasMoreNew: false,
+            messageList: [],
+        });
+    }, [conversationId, searchClientMsgID, userID, useAppHistory, enabled]);
+    useEffect(() => {
+        if (!canLoad || !conversationId)
             return;
-        }
-        if (!conversationId)
+        const targetKey = `${conversationId}:${searchClientMsgID !== null && searchClientMsgID !== void 0 ? searchClientMsgID : ""}`;
+        if (loadedTargetRef.current === targetKey) {
+            // Back online after a drop: pull whatever arrived meanwhile.
+            void catchUpAfterReconnect();
             return;
+        }
+        loadedTargetRef.current = targetKey;
         if (!isEmpty(searchClientMsgID)) {
             searchMessages();
         }
         else {
             getMoreOldMessages(false);
         }
-        return () => {
-            setLoadState(() => ({
-                initLoading: true,
-                hasMoreOld: true,
-                hasMoreNew: false,
-                messageList: [],
-            }));
-        };
     }, [conversationId, searchClientMsgID, canLoad, userID, useAppHistory]);
     return {
         loadState,
@@ -444,6 +503,16 @@ const removeDuplicateMessages = (messages) => {
         return true;
     });
 };
+// Keeps local Sending/Failed bubbles the server page does not know yet.
+const withLocalUnsent = (fetchedNewestFirst, local) => {
+    const known = new Set(fetchedNewestFirst.map((msg) => msg.clientMsgID));
+    const unsent = local.filter((msg) => !known.has(msg.clientMsgID) &&
+        (msg.status === MessageStatus.Sending ||
+            msg.status === MessageStatus.Failed));
+    if (unsent.length === 0)
+        return fetchedNewestFirst;
+    return [...unsent, ...fetchedNewestFirst].sort((a, b) => (b.sendTime || 0) - (a.sendTime || 0));
+};
 // How far refreshLatestMessages walks back to meet the shown list.
 const MAX_REFRESH_PAGES = 3;
 // Server copies replace shown ones whose type changed (a revoke becomes its

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

@@ -1 +1 @@
-{"version":3,"file":"usePinnedMessages.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/usePinnedMessages.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,GAAU,gBAAgB,MAAM,kBA2B/D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,gBAAgB,MAAM;;;;CAqBvD,CAAC"}
+{"version":3,"file":"usePinnedMessages.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/usePinnedMessages.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,GAAU,gBAAgB,MAAM,kBAqC/D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,gBAAgB,MAAM;;;;CAqBvD,CAAC"}

package/dist/hooks/message/usePinnedMessages.js

@@ -2,6 +2,7 @@ import { useEffect } from "react";
 import { DChatSDK } from "../../constants/sdk";
 import { PAGE_SIZE } from "../../constants";
 import useConversationStore from "../../store/conversation";
+import useAuthStore from "../../store/auth";
 export const fetchPinnedMessages = async (conversationID) => {
     var _a, _b;
     const { setPinnedMessageData } = useConversationStore.getState();
@@ -17,8 +18,18 @@ export const fetchPinnedMessages = async (conversationID) => {
         const activeConversationId = selectedConversationId || (conversationData === null || conversationData === void 0 ? void 0 : conversationData.conversationID);
         if (activeConversationId !== conversationID)
             return;
-        const sortedMessageList = [...(data.messageList || [])].sort((first, second) => (second.pinnedTime || 0) - (first.pinnedTime || 0));
-        setPinnedMessageData(sortedMessageList, data.totalCount || 0, (_a = data.remainingPinCount) !== null && _a !== void 0 ? _a : 0, (_b = data.isEnd) !== null && _b !== void 0 ? _b : true);
+        // Only CRM may see internal notes; hide pinned ones from everyone else
+        // and take them out of the bar total only; the limit uses backend counts.
+        const allPinned = data.messageList || [];
+        const visiblePinned = useAuthStore.getState().isCrm
+            ? allPinned
+            : allPinned.filter((message) => !message.isInternal);
+        const hiddenCount = allPinned.length - visiblePinned.length;
+        const backendTotal = data.totalCount || 0;
+        const sortedMessageList = [...visiblePinned].sort((first, second) => (second.pinnedTime || 0) - (first.pinnedTime || 0));
+        setPinnedMessageData(sortedMessageList, Math.max(backendTotal - hiddenCount, 0), 
+        // Hidden pins still occupy backend slots, so keep the real remaining.
+        (_a = data.remainingPinCount) !== null && _a !== void 0 ? _a : 0, (_b = data.isEnd) !== null && _b !== void 0 ? _b : true, backendTotal);
     }
     catch (error) {
         console.error("fetchPinnedMessages failed", error);

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

@@ -1 +1 @@
-{"version":3,"file":"useRevokeMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useRevokeMessage.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,mBAAmB,GAC9B,aAAa,MAAM,EACnB,iBAAiB,MAAM,SAoBxB,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;CAkB5B,CAAC"}
+{"version":3,"file":"useRevokeMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useRevokeMessage.ts"],"names":[],"mappings":"AAwCA,eAAO,MAAM,mBAAmB,GAC9B,aAAa,MAAM,EACnB,iBAAiB,MAAM,SAqBxB,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;CAkB5B,CAAC"}

package/dist/hooks/message/useRevokeMessage.js

@@ -4,6 +4,30 @@ import { useRequest } from "ahooks";
 import { updateOneMessage } from "../../hooks/message/useMessage";
 import { fetchPinnedMessages } from "../../hooks/message/usePinnedMessages";
 import useConversationStore from "../../store/conversation";
+// The thread card previews conversation.latestMsg (a JSON string); without this
+// it keeps showing the recalled text until the next conversation refresh.
+const patchRevokedLatestMsg = (clientMsgID) => {
+    const { conversationList } = useConversationStore.getState();
+    let changed = false;
+    const next = conversationList.map((conversation) => {
+        if (!conversation.latestMsg)
+            return conversation;
+        try {
+            const latest = JSON.parse(conversation.latestMsg);
+            if (latest.clientMsgID !== clientMsgID ||
+                latest.contentType === MessageType.RevokeMessage) {
+                return conversation;
+            }
+            changed = true;
+            return Object.assign(Object.assign({}, conversation), { latestMsg: JSON.stringify(Object.assign(Object.assign({}, latest), { contentType: MessageType.RevokeMessage })) });
+        }
+        catch (_a) {
+            return conversation;
+        }
+    });
+    if (changed)
+        useConversationStore.setState({ conversationList: next });
+};
 // Shared by the actor's own revoke call (conversationID known upfront) and by
 // the OnNewRecvMessageRevoked socket handler (conversationID unknown, so we
 // infer it from whichever conversation currently has this message pinned).
@@ -14,6 +38,7 @@ export const applyRevokedMessage = (clientMsgID, conversationID) => {
     };
     updateOneMessage(revokedPatch);
     useConversationStore.getState().updatePinnedMessage(revokedPatch);
+    patchRevokedLatestMsg(clientMsgID);
     const { selectedConversationId, conversationData, pinnedMessageList } = useConversationStore.getState();
     const targetConversationId = conversationID || selectedConversationId || (conversationData === null || conversationData === void 0 ? void 0 : conversationData.conversationID);
     const isRevokedMessagePinned = pinnedMessageList.some((pinnedMessage) => pinnedMessage.clientMsgID === clientMsgID);

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

@@ -8,24 +8,25 @@ export declare const isMediaResendable: (message: {
     clientMsgID: string;
     contentType: number;
 }) => boolean;
-export declare const createTextMessage: (text: string) => Promise<MessageItem | null>;
-export declare const createImageMessageByFile: (file: ImageMsgParamsByFile) => Promise<MessageItem | null>;
-export declare const createMergerMessage: (mergerMsgParams: MergerMsgParams) => Promise<MessageItem | null>;
-export declare const createVideoMessageByFile: (file: VideoMsgParamsByFile) => Promise<MessageItem | null>;
-export declare const createFileMessageByFile: (file: FileMsgParamsByFile) => Promise<MessageItem | null>;
+export declare const isSendPending: (clientMsgID: string) => boolean;
+export declare const createTextMessage: (text: string) => Promise<MessageItem>;
+export declare const createImageMessageByFile: (file: ImageMsgParamsByFile) => Promise<MessageItem>;
+export declare const createMergerMessage: (mergerMsgParams: MergerMsgParams) => Promise<MessageItem>;
+export declare const createVideoMessageByFile: (file: VideoMsgParamsByFile) => Promise<MessageItem>;
+export declare const createFileMessageByFile: (file: FileMsgParamsByFile) => Promise<MessageItem>;
 export declare const AT_ALL_TAG = "AtAllTag";
-export declare const createAtTextMessage: (params: AtMsgParams) => Promise<MessageItem | null>;
-export declare const createUrlTextMessage: (text: string, urls: string[]) => Promise<MessageItem | null>;
-export declare const createStickerMessage: (stickerUrl: string) => Promise<MessageItem | null>;
-export declare const createCustomMessageByParams: (params: CustomMsgParams) => Promise<MessageItem | null>;
-export declare const createCustomMessage: (payload: CustomMessagePayload) => Promise<MessageItem | null>;
-export declare const createQuoteMessage: (text: string, quotedMessage: MessageItem, urls?: string[]) => Promise<MessageItem | null>;
+export declare const createAtTextMessage: (params: AtMsgParams) => Promise<MessageItem>;
+export declare const createUrlTextMessage: (text: string, urls: string[]) => Promise<MessageItem>;
+export declare const createStickerMessage: (stickerUrl: string) => Promise<MessageItem>;
+export declare const createCustomMessageByParams: (params: CustomMsgParams) => Promise<MessageItem>;
+export declare const createCustomMessage: (payload: CustomMessagePayload) => Promise<MessageItem>;
+export declare const createQuoteMessage: (text: string, quotedMessage: MessageItem, urls?: string[]) => Promise<MessageItem>;
 export type SendMessageScrollEvent = "CHAT_LIST_SCROLL_TO_BOTTOM" | "CONVERSATION_CHAT_SCROLL_TO_BOTTOM_IF_AT_BOTTOM";
 export interface UseSendMessageOptions {
     scrollEvent?: SendMessageScrollEvent;
 }
 export declare const useSendMessage: (options?: UseSendMessageOptions) => {
-    sendMergeMessage: ({ richText, plainText, files, currentSession, isInternal, urlMetadata, flow, customMessage, mentions, }: {
+    sendMergeMessage: ({ richText, plainText, files, currentSession, isInternal, urlMetadata, flow, customMessage, mentions, onBuilt, }: {
         richText: string;
         plainText: string;
         files?: UploadFile[];
@@ -35,6 +36,8 @@ export declare const useSendMessage: (options?: UseSendMessageOptions) => {
         flow?: BotFlowMeta;
         customMessage?: CustomMessagePayload;
         mentions?: MentionSendPayload;
+        /** Called once the bubbles are shown (true) or building them failed (false). */
+        onBuilt?: (shown: boolean) => void;
     }) => Promise<boolean>;
     sendCustomMessage: (payload: CustomMessagePayload, sendOptions?: {
         currentSession?: ISessionResponse;

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,WAAW,EACX,eAAe,EACf,eAAe,EACf,WAAW,EAIZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAQlC,OAAO,EAEL,gBAAgB,EAEjB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,WAAW,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;AAGF,eAAO,MAAM,UAAU,aAAa,CAAC;AAErC,eAAO,MAAM,mBAAmB,GAAU,QAAQ,WAAW,gCAa5D,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,gCActE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,YAAY,MAAM,gCAa5D,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAU,QAAQ,eAAe,gCAaxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,SAAS,oBAAoB,gCAOtE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,MAAM,EACZ,eAAe,WAAW,EAC1B,OAAO,MAAM,EAAE,gCAehB,CAAC;AAoIF,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,iDAAiD,CAAC;AAEtD,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,EAAE,sBAAsB,CAAC;CACtC;AAED,eAAO,MAAM,cAAc,GAAI,UAAU,qBAAqB;gIAsRvD;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;QACrB,cAAc,CAAC,EAAE,gBAAgB,CAAC;QAClC,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,IAAI,CAAC,EAAE,WAAW,CAAC;QACnB,aAAa,CAAC,EAAE,oBAAoB,CAAC;QACrC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;KAC/B,KAAG,OAAO,CAAC,OAAO,CAAC;iCAvFT,oBAAoB,gBACf;QAAE,cAAc,CAAC,EAAE,gBAAgB,CAAA;KAAE,KAClD,OAAO,CAAC,OAAO,CAAC;kCA2BR,WAAW,gBACN;QAAE,cAAc,CAAC,EAAE,gBAAgB,CAAA;KAAE,KAClD,OAAO,CAAC,OAAO,CAAC;mCAxDH,WAAW;CA4U9B,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,6EAOvC;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,sBAsCA,CAAC"}
+{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"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"}