@droppii-org/chat-sdk 0.8.1 → 0.8.3

package/dist/hooks/global/useGlobalEvent.js

@@ -1,8 +1,8 @@
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { useLatest } from "ahooks";
 import { DChatSDK } from "../../constants/sdk";
 import { CbEvents, GroupVisibility, MessageType, SessionType, } from "@droppii-org/wasm-client-sdk";
-import { BusinessNotificationType, ConnectStatus, CustomType, SyncStatus, } from "../../types/chat";
+import { BusinessNotificationType, ConnectStatus, CustomType, SessionStatus, SyncStatus, } from "../../types/chat";
 import { pushNewMessage, updateOneMessage } from "../../hooks/message/useMessage";
 import { fetchPinnedMessages } from "../../hooks/message/usePinnedMessages";
 import { applyRevokedMessage } from "../../hooks/message/useRevokeMessage";
@@ -22,11 +22,17 @@ import { ignoreInternalLatestMessage } from "../../utils/common";
 import { invalidateSessionQueries } from "../../utils/queryHelpers";
 import { refreshPublicGroupLists } from "../../hooks/group/useJoinPublicGroup";
 import emitter from "../../utils/events";
+import { withSdkTimeout } from "../../utils/withSdkTimeout";
+import { isCoreLoggedIn, useLoginHealthProbe } from "./useLoginHealth";
 const notPushType = [MessageType.TypingMessage, MessageType.RevokeMessage];
+const LOGIN_TIMEOUT_MS = 30000;
 export const useGlobalEvent = () => {
     const { user } = useChatContext();
     const onNavigate = useChatNavigate();
     const userRef = useLatest(user);
+    // One login at a time: boot, token refresh, the health probe and relogin all share it.
+    // Keyed by credential: the same user and token share a flight, a new one chains after it.
+    const loginInFlight = useRef(null);
     const queryClient = useQueryClient();
     const { updateConnectStatus, updateSyncStatus, getSelfUserInfo } = useChatContext();
     const updateConversationList = useConversationStore((state) => state.updateConversationList);
@@ -164,7 +170,20 @@ export const useGlobalEvent = () => {
     const inputStatusChangedHandler = ({ data, }) => {
         handleInputStatusChanged(data);
     };
+    // Token rotation (refresh timer, storage sync) must not lift a kick: re-logging in would
+    // kick the other session back. Only a different user, a logout or a reload starts over.
+    const isKickedForCurrentCredentials = () => {
+        const { isKicked, kickedUserID } = useBootStore.getState();
+        if (!isKicked)
+            return false;
+        if (!kickedUserID)
+            return true;
+        return kickedUserID === useAuthStore.getState().userID;
+    };
     const userTokenHandler = () => {
+        // A kicked account's token is dead; refreshing it would re-login and restart the kick loop.
+        if (isKickedForCurrentCredentials())
+            return;
         refetchChatToken(undefined, {
             onSettled(data) {
                 var _a;
@@ -183,42 +202,129 @@ export const useGlobalEvent = () => {
     const initStore = () => {
         loadConversationList();
     };
-    const tryLogin = async () => {
+    // Resolves true when this run ended with a usable core session.
+    const runLoginOnce = (run) => {
+        const { userID, chatToken } = useAuthStore.getState();
+        const key = `${userID}:${chatToken}`;
+        const running = loginInFlight.current;
+        if ((running === null || running === void 0 ? void 0 : running.key) === key)
+            return running.promise;
+        const start = running
+            ? // A different credential must not be dropped, but the running flight may already
+                // have logged core in: logging in again would only hit "repeated login".
+                running.promise
+                    .catch(() => false)
+                    .then((prevOk) => runChained(run, running.userID, prevOk))
+            : run();
+        const flight = { key, userID, promise: start };
+        flight.promise = start.finally(() => {
+            if (loginInFlight.current === flight)
+                loginInFlight.current = null;
+        });
+        loginInFlight.current = flight;
+        return flight.promise;
+    };
+    const runChained = async (run, prevUserID, prevOk) => {
+        if (isKickedForCurrentCredentials())
+            return false;
+        const { userID } = useAuthStore.getState();
+        if (!(await isCoreLoggedIn()))
+            return run();
+        // Same user already logged in by the previous flight: nothing to redo.
+        if (prevUserID === userID && prevOk)
+            return true;
+        // Another user, or the previous login failed with the old token: start over with the new one.
+        return reloginUnguarded();
+    };
+    const getCoreUserID = async () => {
+        try {
+            return (await withSdkTimeout(DChatSDK.getLoginUserID(), "getLoginUserID")).data;
+        }
+        catch (_a) {
+            return undefined;
+        }
+    };
+    const tryLogin = async (isRetry = false) => {
+        var _a;
+        if (isKickedForCurrentCredentials())
+            return false;
         const { userID, chatToken, platformID, wsAddress } = useAuthStore.getState();
         try {
-            await DChatSDK.login({
+            await withSdkTimeout(DChatSDK.login({
                 userID,
                 token: chatToken,
                 platformID,
                 apiAddr: `${apiAddress}/chat-service`,
                 wsAddr: `${wsAddress}/chat-service/ws`,
-            });
+            }), "login", LOGIN_TIMEOUT_MS);
             initStore();
+            return true;
         }
         catch (error) {
-            if (error.errCode === 10102) {
-                updateConnectStatus(ConnectStatus.Connected);
-                updateSyncStatus(SyncStatus.Success);
-                // Already logged in (e.g. ChatProvider remounted): sync events may have fired while
-                // nobody listened, so stop waiting for them rather than risk a boot screen that never ends.
-                useBootStore.getState().markConnected();
-                useBootStore.getState().markFirstSyncDone();
+            const errCode = (_a = error.errCode) !== null && _a !== void 0 ? _a : error.code;
+            if (errCode === 10102) {
+                // "Already logged in" is only true if core agrees; a stale tab can hold a dead session.
+                if (!isRetry && !(await isCoreLoggedIn())) {
+                    return reloginUnguarded();
+                }
+                // Core may hold another user's session (shared storage); only trust it for this user.
+                if (!isRetry && (await getCoreUserID()) !== userID) {
+                    return reloginUnguarded();
+                }
+                // Sync events may have fired while nobody listened (e.g. ChatProvider remounted); trust
+                // only what the boot store itself saw: connect, and the first sync finishing.
+                const boot = useBootStore.getState();
+                if (boot.hasConnected) {
+                    updateConnectStatus(ConnectStatus.Connected);
+                    if (boot.isFirstSyncDone)
+                        updateSyncStatus(SyncStatus.Success);
+                }
                 getSelfUserInfo();
                 initStore();
-                return;
+                return true;
             }
             useBootStore.getState().markFailed("engine");
             console.error(error);
+            return false;
+        }
+    };
+    // Drops a dead core session and logs in again with the current chat token; an
+    // expired token comes back through OnUserTokenExpired and is refreshed there.
+    const reloginUnguarded = async () => {
+        if (isKickedForCurrentCredentials())
+            return false;
+        try {
+            await withSdkTimeout(DChatSDK.logout(), "logout");
         }
+        catch (error) {
+            console.warn("logout before relogin", error);
+        }
+        return tryLogin(true);
+    };
+    const relogin = async () => {
+        await runLoginOnce(reloginUnguarded);
+    };
+    // The account signed in elsewhere and the token is now dead. Core logs itself
+    // out on a kick, so do not log out here or log back in: that would kick the
+    // other session in turn and loop. A reload starts a fresh sign-in.
+    const kickedOfflineHandler = () => {
+        updateConnectStatus(ConnectStatus.Disconnected);
+        useBootStore.getState().markKicked(useAuthStore.getState().userID);
     };
+    useLoginHealthProbe(relogin);
     const loginCheck = async () => {
         const chatToken = useAuthStore.getState().chatToken;
         const userID = useAuthStore.getState().userID;
         if (!chatToken || !userID) {
             return;
         }
+        // A kicked user stays blocked; only a different user starts a fresh boot.
+        if (isKickedForCurrentCredentials())
+            return;
+        if (useBootStore.getState().isKicked)
+            useBootStore.getState().reset();
         useBootStore.getState().startBoot(userID);
-        tryLogin();
+        void runLoginOnce(() => tryLogin());
     };
     const connectingHandler = () => {
         useBootStore.getState().markConnecting();
@@ -282,12 +388,36 @@ export const useGlobalEvent = () => {
             queryKey: [QUERY_KEYS.GET_BOT_DETAIL, botId],
         });
     };
+    // A closed session resets the bot flow server-side, so the open thread's
+    // cached step and menu are stale until refetched.
+    const handleSessionClosed = (conversationId) => {
+        const conversation = useConversationStore.getState().conversationData;
+        if (!conversation)
+            return;
+        const openId = conversation.conversationID;
+        if (conversationId && conversationId !== openId)
+            return;
+        // Keep the in-flight refetch an action started; cancelling it would
+        // leave that action waiting on a result that never comes.
+        void queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.GET_CONVERSATION_DETAIL, openId] }, { cancelRefetch: false });
+        void queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.GET_BOT_MAIN_MENU, openId] }, { cancelRefetch: false });
+    };
     const businessNotificationHandler = ({ data, }) => {
         console.log(data.key, "business notification");
         switch (data.key) {
-            case BusinessNotificationType.SESSION_STATE_UPDATED:
-                updateSession(JSON.parse(data.data || "{}"));
+            case BusinessNotificationType.SESSION_STATE_UPDATED: {
+                const session = JSON.parse(data.data || "{}");
+                updateSession(session);
+                if (session.status === SessionStatus.COMPLETED) {
+                    handleSessionClosed(session.conversationId);
+                }
+                break;
+            }
+            case BusinessNotificationType.SESSION_CLOSED: {
+                const closed = JSON.parse(data.data || "{}");
+                handleSessionClosed(closed.conversationId);
                 break;
+            }
             case BusinessNotificationType.SESSION_CREATED:
                 updateSession(JSON.parse(data.data || "{}"));
                 queryClient.invalidateQueries({
@@ -446,6 +576,7 @@ export const useGlobalEvent = () => {
         //account
         DChatSDK.on(CbEvents.OnUserTokenExpired, userTokenHandler);
         DChatSDK.on(CbEvents.OnUserTokenInvalid, userTokenHandler);
+        DChatSDK.on(CbEvents.OnKickedOffline, kickedOfflineHandler);
         DChatSDK.on(CbEvents.OnConnecting, connectingHandler);
         DChatSDK.on(CbEvents.OnConnectSuccess, connectSuccessHandler);
         DChatSDK.on(CbEvents.OnConnectFailed, connectFailedHandler);
@@ -481,6 +612,7 @@ export const useGlobalEvent = () => {
         //account
         DChatSDK.off(CbEvents.OnUserTokenExpired, userTokenHandler);
         DChatSDK.off(CbEvents.OnUserTokenInvalid, userTokenHandler);
+        DChatSDK.off(CbEvents.OnKickedOffline, kickedOfflineHandler);
         DChatSDK.off(CbEvents.OnConnecting, connectingHandler);
         DChatSDK.off(CbEvents.OnConnectSuccess, connectSuccessHandler);
         DChatSDK.off(CbEvents.OnConnectFailed, connectFailedHandler);

package/dist/hooks/global/useLoginHealth.d.ts

@@ -0,0 +1,3 @@
+export declare const isCoreLoggedIn: () => Promise<boolean>;
+export declare const useLoginHealthProbe: (relogin: () => Promise<void>) => void;
+//# sourceMappingURL=useLoginHealth.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useLoginHealth.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useLoginHealth.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,OAAO,CAQtD,CAAC;AAKF,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,OAAO,CAAC,IAAI,CAAC,SA6B/D,CAAC"}

package/dist/hooks/global/useLoginHealth.js

@@ -0,0 +1,55 @@
+import { useEffect } from "react";
+import { useLatest } from "ahooks";
+import { LoginStatus } from "@droppii-org/wasm-client-sdk";
+import { DChatSDK } from "../../constants/sdk";
+import useAuthStore from "../../store/auth";
+import useBootStore from "../../store/boot";
+import { withSdkTimeout } from "../../utils/withSdkTimeout";
+// A failed or hung status read counts as not logged in: either way the tab cannot talk to core.
+export const isCoreLoggedIn = async () => {
+    try {
+        const { data } = await withSdkTimeout(DChatSDK.getLoginStatus(), "getLoginStatus");
+        return data === LoginStatus.Logged || data === LoginStatus.Logging;
+    }
+    catch (error) {
+        console.warn("getLoginStatus", error);
+        return false;
+    }
+};
+// A desk tab left open for hours can come back with core logged out while the UI still
+// shows "connected". Checking when the tab is shown again or the network returns repairs
+// it without a reload.
+export const useLoginHealthProbe = (relogin) => {
+    const reloginRef = useLatest(relogin);
+    useEffect(() => {
+        let probing = false;
+        const probe = async () => {
+            var _a;
+            if (probing || document.visibilityState === "hidden")
+                return;
+            const { userID, apiAddress, chatToken } = useAuthStore.getState();
+            if (!userID || !apiAddress || !chatToken || !DChatSDK)
+                return;
+            // Boot owns the first login; after a kick the token is dead and a relogin
+            // would only kick the other session again.
+            const boot = useBootStore.getState();
+            const isBooting = !boot.isFirstSyncDone && !boot.failedStep;
+            if (boot.isKicked || isBooting)
+                return;
+            probing = true;
+            try {
+                if (!(await isCoreLoggedIn()))
+                    await ((_a = reloginRef.current) === null || _a === void 0 ? void 0 : _a.call(reloginRef));
+            }
+            finally {
+                probing = false;
+            }
+        };
+        document.addEventListener("visibilitychange", probe);
+        window.addEventListener("online", probe);
+        return () => {
+            document.removeEventListener("visibilitychange", probe);
+            window.removeEventListener("online", probe);
+        };
+    }, [reloginRef]);
+};

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

@@ -1 +1 @@
-{"version":3,"file":"useCreateGroup.d.ts","sourceRoot":"","sources":["../../../src/hooks/group/useCreateGroup.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAqCD,eAAO,MAAM,cAAc;6DAQ2B,iBAAiB;CA2DtE,CAAC"}
+{"version":3,"file":"useCreateGroup.d.ts","sourceRoot":"","sources":["../../../src/hooks/group/useCreateGroup.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAyGD,eAAO,MAAM,cAAc;6DAS2B,iBAAiB;CAkFtE,CAAC"}

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"}