@droppii-org/chat-sdk 0.0.19 → 0.0.21

package/dist/components/message/footer/index.js

@@ -0,0 +1,25 @@
+"use client";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { LexicalComposer } from "@lexical/react/LexicalComposer";
+import { RichTextPlugin } from "@lexical/react/LexicalRichTextPlugin";
+import { ContentEditable } from "@lexical/react/LexicalContentEditable";
+import { LexicalErrorBoundary } from "@lexical/react/LexicalErrorBoundary";
+import FooterBottomSection from "./BottomSection";
+const theme = {
+// Theme styling goes here
+};
+// Catch any errors that occur during Lexical updates and log them
+// or throw them as needed. If you don't throw them, Lexical will
+// try to recover gracefully without losing user data.
+const onError = (error) => {
+    console.error(error);
+};
+const initialConfig = {
+    namespace: "ChatInput",
+    theme,
+    onError,
+};
+const MessageFooter = () => {
+    return (_jsx(LexicalComposer, { initialConfig: initialConfig, children: _jsxs("div", { className: "border-t px-4 py-3", children: [_jsx("div", { className: "relative", children: _jsx(RichTextPlugin, { contentEditable: _jsx(ContentEditable, { className: "border border-indigo-500 rounded-md bg-blue-100 min-h-[64px] px-3 py-2 text-sm" }), ErrorBoundary: LexicalErrorBoundary, "aria-placeholder": "Nh\u1EADp tin nh\u1EAFn", placeholder: _jsx("div", { className: "absolute top-2 left-3", children: _jsx("p", { className: "text-gray-500 text-sm", children: "Nh\u1EADp tin nh\u1EAFn" }) }) }) }), _jsx(FooterBottomSection, {})] }) }));
+};
+export default MessageFooter;

package/dist/constants/index.d.ts

@@ -0,0 +1,2 @@
+export declare const coreWasmPath = "https://droppiistg.blob.core.windows.net/droppii-stg-public/3315964d-11d5-4d27-8af7-d2ec2354994f.wasm";
+//# sourceMappingURL=index.d.ts.map

package/dist/constants/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,0GACgF,CAAC"}

package/dist/constants/index.js

@@ -0,0 +1 @@
+export const coreWasmPath = "https://droppiistg.blob.core.windows.net/droppii-stg-public/3315964d-11d5-4d27-8af7-d2ec2354994f.wasm";

package/dist/constants/sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/constants/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,eAAO,MAAM,QAAQ,EAAE,UAAU,CAAC,OAAO,MAAM,CAI7C,CAAC"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/constants/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAGjD,eAAO,MAAM,QAAQ,EAAE,UAAU,CAAC,OAAO,MAAM,CAI7C,CAAC"}

package/dist/constants/sdk.js

@@ -1,5 +1,7 @@
 import { getSDK } from "@openim/wasm-client-sdk";
+import { coreWasmPath } from "./index";
 export const DChatSDK = getSDK({
-    coreWasmPath: "https://pub-b11e10131a914403b2a326ec38f7e99f.r2.dev/openIM.wasm",
+    coreWasmPath,
     sqlWasmPath: "/sql-wasm.wasm",
+    debug: process.env.NODE_ENV === "development",
 });

package/dist/context/ChatContext.d.ts

@@ -1,5 +1,5 @@
 import { ChatContextType, ChatProviderProps } from "../types/chat";
 export declare const ChatContext: import("react").Context<ChatContextType>;
 export declare const useChatContext: () => ChatContextType;
-export declare const ChatProvider: ({ children, config }: ChatProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ChatProvider: ({ children, config, refetchToken, }: ChatProviderProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ChatContext.d.ts.map

package/dist/context/ChatContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatContext.d.ts","sourceRoot":"","sources":["../../src/context/ChatContext.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAInE,eAAO,MAAM,WAAW,0CAEtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAE5D,eAAO,MAAM,YAAY,GAAI,sBAAsB,iBAAiB,4CAkCnE,CAAC"}
+{"version":3,"file":"ChatContext.d.ts","sourceRoot":"","sources":["../../src/context/ChatContext.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,eAAe,EACf,iBAAiB,EAElB,MAAM,eAAe,CAAC;AAIvB,eAAO,MAAM,WAAW,0CAGtB,CAAC;AAEH,eAAO,MAAM,cAAc,uBAAgC,CAAC;AAE5D,eAAO,MAAM,YAAY,GAAI,qCAI1B,iBAAiB,4CA2EnB,CAAC"}

package/dist/context/ChatContext.js

@@ -1,14 +1,17 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext, useEffect, useState } from "react";
-import { Spin } from "antd";
+import { CbEvents } from "@openim/wasm-client-sdk";
+import { ConnectStatus, } from "../types/chat";
 import { DChatSDK } from "../constants/sdk";
+import MainLayout from "../layout";
 export const ChatContext = createContext({
     user: null,
+    connectStatus: ConnectStatus.Disconnected,
 });
 export const useChatContext = () => useContext(ChatContext);
-export const ChatProvider = ({ children, config }) => {
-    const [loading, setLoading] = useState(true);
+export const ChatProvider = ({ children, config, refetchToken, }) => {
+    const [connectStatus, setConnectStatus] = useState(ConnectStatus.Disconnected);
     const [user, setUser] = useState(null);
     const getUserInfo = () => {
         DChatSDK.getSelfUserInfo()
@@ -19,18 +22,53 @@ export const ChatProvider = ({ children, config }) => {
             console.log("getSelfUserInfo", errCode, errMsg);
         });
     };
-    const handleLogin = () => {
-        DChatSDK.login(config)
+    const handleLogin = (newToken) => {
+        DChatSDK.login(Object.assign(Object.assign({}, config), { token: newToken || config.token }))
             .then((res) => {
             getUserInfo();
-            setLoading(false);
         })
             .catch(({ errCode, errMsg }) => {
             console.log("handleLogin", errCode, errMsg);
         });
     };
     useEffect(() => {
-        handleLogin();
+        if (config) {
+            handleLogin();
+        }
     }, [config]);
-    return (_jsx(ChatContext.Provider, { value: { user }, children: loading ? _jsx(Spin, { fullscreen: true }) : children }));
+    useEffect(() => {
+        DChatSDK.on(CbEvents.OnUserTokenExpired, () => {
+            console.log("OnUserTokenExpired");
+            refetchToken().then((token) => {
+                if (!!token) {
+                    handleLogin(token);
+                }
+            });
+        });
+        DChatSDK.on(CbEvents.OnUserTokenInvalid, () => {
+            console.log("OnUserTokenInvalid");
+            refetchToken().then((token) => {
+                if (!!token) {
+                    handleLogin(token);
+                }
+            });
+        });
+        DChatSDK.on(CbEvents.OnConnectSuccess, () => {
+            setConnectStatus(ConnectStatus.Connected);
+        });
+        DChatSDK.on(CbEvents.OnConnecting, () => {
+            setConnectStatus(ConnectStatus.Connecting);
+        });
+        DChatSDK.on(CbEvents.OnConnectFailed, () => {
+            setConnectStatus(ConnectStatus.Disconnected);
+        });
+        return () => {
+            DChatSDK.off(CbEvents.OnUserTokenExpired, () => { });
+            DChatSDK.off(CbEvents.OnUserTokenInvalid, () => { });
+            DChatSDK.off(CbEvents.OnConnectSuccess, () => { });
+            DChatSDK.off(CbEvents.OnConnectFailed, () => { });
+            DChatSDK.off(CbEvents.OnConnecting, () => { });
+        };
+    }, [refetchToken]);
+    return (_jsx(ChatContext.Provider, { value: { user, connectStatus }, children: _jsx(MainLayout, { children: children }) }));
 };

package/dist/hooks/conversation/useConversation.d.ts

@@ -1,6 +1,8 @@
 import { ConversationItem, SessionType } from "@openim/wasm-client-sdk";
-export declare const useConversationList: () => {
+export declare const useConversationList: (selectedThreadId?: string) => {
     conversationList: ConversationItem[];
+    getAllConversationList: () => Promise<void>;
+    markConversationMessageAsRead: (conversationId: string) => void;
 };
 export declare const useConversationDetail: ({ sourceID, sessionType, }: {
     sourceID: string;

package/dist/hooks/conversation/useConversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useConversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAIxE,eAAO,MAAM,mBAAmB;;CAoC/B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,4BAGnC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;CAC1B;;CAwBA,CAAC"}
+{"version":3,"file":"useConversation.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useConversation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,WAAW,EAEZ,MAAM,yBAAyB,CAAC;AAIjC,eAAO,MAAM,mBAAmB,GAAI,mBAAmB,MAAM;;;oDAgBxC,MAAM;CAmC1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,4BAGnC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;CAC1B;;CAuBA,CAAC"}

package/dist/hooks/conversation/useConversation.js

@@ -1,35 +1,46 @@
+import { CbEvents, } from "@openim/wasm-client-sdk";
 import { useCallback, useEffect, useState } from "react";
 import { DChatSDK } from "../../constants/sdk";
-export const useConversationList = () => {
+export const useConversationList = (selectedThreadId) => {
     const [conversationList, setConversationList] = useState([]);
     const getAllConversationList = useCallback(async () => {
         DChatSDK.getAllConversationList()
             .then(({ data }) => {
-            console.log("getAllConversationList", data);
             setConversationList(data);
         })
             .catch((err) => {
             console.log("getAllConversationList", err);
         });
     }, []);
-    const getOneConversation = useCallback(async () => {
-        DChatSDK.getOneConversation({
-            sourceID: "3408237279",
-            sessionType: 3,
-        })
-            .then(({ data }) => {
-            console.log("getOneConversation", data);
-        })
-            .catch((err) => {
-            console.log("getOneConversation", err);
+    const markConversationMessageAsRead = useCallback((conversationId) => {
+        if (!conversationId)
+            return;
+        DChatSDK.markConversationMessageAsRead(conversationId)
+            .then()
+            .catch(({ errCode, errMsg }) => {
+            // Failed call
         });
     }, []);
     useEffect(() => {
         getAllConversationList();
-        getOneConversation();
     }, [getAllConversationList]);
+    useEffect(() => {
+        DChatSDK.on(CbEvents.OnConversationChanged, ({ data }) => {
+            setConversationList(data);
+        });
+        return () => {
+            DChatSDK.off(CbEvents.OnConversationChanged, () => { });
+        };
+    }, []);
+    useEffect(() => {
+        if (selectedThreadId) {
+            markConversationMessageAsRead(selectedThreadId);
+        }
+    }, [selectedThreadId, markConversationMessageAsRead]);
     return {
         conversationList,
+        getAllConversationList,
+        markConversationMessageAsRead,
     };
 };
 export const useConversationDetail = ({ sourceID, sessionType, }) => {
@@ -40,7 +51,6 @@ export const useConversationDetail = ({ sourceID, sessionType, }) => {
             sessionType,
         })
             .then(({ data }) => {
-            console.log("getOneConversation", data);
             setConversationDetail(data);
         })
             .catch((err) => {

package/dist/hooks/conversation/useConversationStore.d.ts

@@ -0,0 +1,11 @@
+interface ConversationStore {
+    conversationData: any;
+    setConversationData: (data: any) => void;
+    selectedThreadId: string;
+    selectedSourceId: string;
+    setSelectedThreadId: (threadId: string) => void;
+    setSelectedSourceId: (sourceId: string) => void;
+}
+declare const useConversationStore: import("zustand").UseBoundStore<import("zustand").StoreApi<ConversationStore>>;
+export default useConversationStore;
+//# sourceMappingURL=useConversationStore.d.ts.map

package/dist/hooks/conversation/useConversationStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useConversationStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useConversationStore.ts"],"names":[],"mappings":"AAEA,UAAU,iBAAiB;IACzB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IACzC,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,mBAAmB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACjD;AAED,QAAA,MAAM,oBAAoB,gFAOvB,CAAC;AAEJ,eAAe,oBAAoB,CAAC"}

package/dist/hooks/conversation/useConversationStore.js

@@ -0,0 +1,10 @@
+import { create } from "zustand";
+const useConversationStore = create((set) => ({
+    conversationData: null,
+    setConversationData: (data) => set({ conversationData: data }),
+    selectedThreadId: "",
+    setSelectedThreadId: (threadId) => set({ selectedThreadId: threadId }),
+    selectedSourceId: "",
+    setSelectedSourceId: (sourceId) => set({ selectedSourceId: sourceId }),
+}));
+export default useConversationStore;

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

@@ -0,0 +1,2 @@
+export declare const useGlobalEvent: () => void;
+//# sourceMappingURL=useGlobalEvent.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useGlobalEvent.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalEvent.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,cAAc,YAqF1B,CAAC"}

package/dist/hooks/global/useGlobalEvent.js

@@ -0,0 +1,78 @@
+import { useEffect } from "react";
+import { DChatSDK } from "../../constants/sdk";
+import { CbEvents, MessageType, SessionType, } from "@openim/wasm-client-sdk";
+import { CustomType } from "../../types/chat";
+import { pushNewMessage, updateOneMessage } from "../message/useMessage";
+import { useChatContext } from "../../context/ChatContext";
+import useConversationStore from "../conversation/useConversationStore";
+const notPushType = [MessageType.TypingMessage, MessageType.RevokeMessage];
+export const useGlobalEvent = () => {
+    const { user } = useChatContext();
+    const selectedSourceId = useConversationStore((state) => state.selectedSourceId);
+    const revokedMessageHandler = ({ data }) => {
+        updateOneMessage({
+            clientMsgID: data.clientMsgID,
+            contentType: MessageType.RevokeMessage,
+            notificationElem: {
+                detail: JSON.stringify(data),
+            },
+        });
+    };
+    const inCurrentConversation = (newServerMsg) => {
+        switch (newServerMsg.sessionType) {
+            case SessionType.Single:
+                return (newServerMsg.sendID === selectedSourceId ||
+                    ((user === null || user === void 0 ? void 0 : user.userID) && newServerMsg.recvID === selectedSourceId));
+            case SessionType.Group:
+            case SessionType.WorkingGroup:
+                return newServerMsg.groupID === selectedSourceId;
+            case SessionType.Notification:
+                return newServerMsg.sendID === selectedSourceId;
+            default:
+                return false;
+        }
+    };
+    const handleNewMessage = (newServerMsg) => {
+        if (newServerMsg.contentType === MessageType.CustomMessage) {
+            const customData = JSON.parse(newServerMsg.customElem.data);
+            if (CustomType.CallingInvite <= customData.customType &&
+                customData.customType <= CustomType.CallingHungup) {
+                return;
+            }
+        }
+        if (!inCurrentConversation(newServerMsg))
+            return;
+        if (!notPushType.includes(newServerMsg.contentType)) {
+            pushNewMessage(newServerMsg);
+        }
+    };
+    const newMessageHandler = ({ data }) => {
+        data.map((message) => handleNewMessage(message));
+    };
+    const loginCheck = async () => {
+        // check openIM token and user info
+    };
+    const setIMListener = () => {
+        // message
+        DChatSDK.on(CbEvents.OnRecvNewMessages, newMessageHandler);
+        DChatSDK.on(CbEvents.OnNewRecvMessageRevoked, revokedMessageHandler);
+    };
+    const disposeIMListener = () => {
+        // message
+        DChatSDK.off(CbEvents.OnRecvNewMessages, newMessageHandler);
+    };
+    /** LIFE CYCLE */
+    useEffect(() => {
+        loginCheck();
+        setIMListener();
+        window.addEventListener("online", () => {
+            DChatSDK.networkStatusChanged();
+        });
+        window.addEventListener("offline", () => {
+            DChatSDK.networkStatusChanged();
+        });
+        return () => {
+            disposeIMListener();
+        };
+    }, []);
+};

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

@@ -1,9 +1,21 @@
 import { MessageItem } from "@openim/wasm-client-sdk";
-export declare const useMessage: (conversationId?: string) => {
-    refetch: () => void;
-    isEnd?: boolean | undefined;
-    errCode?: number | undefined;
-    errMsg?: string | undefined;
-    messageList?: MessageItem[] | undefined;
+import { GroupMessageItem } from "../../types/chat";
+export declare const useMessage: (conversationId: string) => {
+    loadState: {
+        initLoading: boolean;
+        hasMoreOld: boolean;
+        messageList: MessageItem[];
+        groupMessageList: GroupMessageItem[];
+    };
+    latestLoadState: import("react").RefObject<{
+        initLoading: boolean;
+        hasMoreOld: boolean;
+        messageList: MessageItem[];
+        groupMessageList: GroupMessageItem[];
+    }>;
+    moreOldLoading: boolean;
+    getMoreOldMessages: (loadMore?: any) => Promise<void>;
 };
+export declare const pushNewMessage: (message: MessageItem) => void;
+export declare const updateOneMessage: (message: MessageItem) => void;
 //# sourceMappingURL=useMessage.d.ts.map

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,EAIL,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU,GAAI,iBAAiB,MAAM;;;;;;CAqDjD,CAAC"}
+{"version":3,"file":"useMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useMessage.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAqB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAOvE,eAAO,MAAM,UAAU,GAAI,gBAAgB,MAAM;;;;qBAI1B,WAAW,EAAE;0BACR,gBAAgB,EAAE;;;;;qBADvB,WAAW,EAAE;0BACR,gBAAgB,EAAE;;;;CA8I7C,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,WAAW,SACpB,CAAC;AAChC,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,SACpB,CAAC"}

package/dist/hooks/message/useMessage.js

@@ -1,46 +1,124 @@
-import { useCallback, useEffect, useState } from "react";
-import { ViewType, CbEvents, } from "@openim/wasm-client-sdk";
+import { useEffect, useState } from "react";
+import { ViewType } from "@openim/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
+import { v4 as uuidv4 } from "uuid";
+import { useLatest, useRequest } from "ahooks";
+import emitter, { emit } from "../../utils/events";
+const PAGE_SIZE = 50;
 export const useMessage = (conversationId) => {
-    const [dataMessages, setDataMessages] = useState(null);
-    const getAdvancedHistoryMessageList = useCallback(() => {
-        if (!conversationId)
-            return;
-        DChatSDK.getSelfUserInfo()
-            .then(({ data }) => {
-            console.log("getSelfUserInfo", data);
-        })
-            .catch(({ errCode, errMsg }) => {
-            console.log("getSelfUserInfo", errCode, errMsg);
-        });
-        DChatSDK.getAdvancedHistoryMessageList({
-            conversationID: conversationId,
-            count: 1000,
-            startClientMsgID: "",
+    const [loadState, setLoadState] = useState({
+        initLoading: true,
+        hasMoreOld: true,
+        messageList: [],
+        groupMessageList: [],
+    });
+    const latestLoadState = useLatest(loadState);
+    const parseGroupMessageList = (messageList) => {
+        if (!messageList)
+            return [];
+        const mGroupMessages = messageList === null || messageList === void 0 ? void 0 : messageList.reduce((acc, cur) => {
+            const extendMessageInfo = JSON.parse((cur === null || cur === void 0 ? void 0 : cur.ex) || "{}");
+            if (extendMessageInfo === null || extendMessageInfo === void 0 ? void 0 : extendMessageInfo.groupMessageID) {
+                const findGroupMessageIndex = acc.findIndex((item) => item.groupMessageID === (extendMessageInfo === null || extendMessageInfo === void 0 ? void 0 : extendMessageInfo.groupMessageID));
+                if (findGroupMessageIndex === -1) {
+                    acc.push({
+                        groupMessageID: extendMessageInfo.groupMessageID,
+                        messages: [cur],
+                        sendID: cur.sendID,
+                        sendTime: cur.sendTime,
+                    });
+                }
+                else {
+                    acc[findGroupMessageIndex].messages.push(cur);
+                }
+            }
+            else {
+                acc.push({
+                    groupMessageID: uuidv4(),
+                    messages: [cur],
+                    sendID: cur.sendID,
+                    sendTime: cur.sendTime,
+                });
+            }
+            return acc;
+        }, []);
+        return mGroupMessages;
+    };
+    const { loading: moreOldLoading, runAsync: getMoreOldMessages } = useRequest(async (loadMore = true) => {
+        var _a, _b;
+        const reqConversationID = conversationId;
+        const { data } = await DChatSDK.getAdvancedHistoryMessageList({
+            count: PAGE_SIZE,
+            startClientMsgID: loadMore
+                ? ((_b = (_a = latestLoadState.current) === null || _a === void 0 ? void 0 : _a.messageList[0]) === null || _b === void 0 ? void 0 : _b.clientMsgID) || ""
+                : "",
+            conversationID: conversationId !== null && conversationId !== void 0 ? conversationId : "",
             viewType: ViewType.History,
-        })
-            .then(({ data }) => {
-            console.log("getAdvancedHistoryMessageList", data);
-            setDataMessages(data);
-        })
-            .catch((err) => {
-            console.log("getAdvancedHistoryMessageList", err);
         });
-    }, [conversationId]);
-    const onRecvNewMessages = useCallback((data) => {
-        getAdvancedHistoryMessageList();
-    }, [getAdvancedHistoryMessageList]);
+        if (conversationId !== reqConversationID)
+            return;
+        setTimeout(() => setLoadState((preState) => {
+            const messageList = [
+                ...data.messageList,
+                ...(loadMore ? preState.messageList : []),
+            ];
+            const groupMessageList = parseGroupMessageList(messageList);
+            return Object.assign(Object.assign({}, preState), { initLoading: false, hasMoreOld: !data.isEnd, messageList,
+                groupMessageList });
+        }));
+    }, {
+        manual: true,
+    });
+    const loadHistoryMessages = () => getMoreOldMessages(false);
     useEffect(() => {
-        getAdvancedHistoryMessageList();
-    }, [getAdvancedHistoryMessageList]);
+        const pushNewMessage = (message) => {
+            var _a, _b;
+            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) => {
+                const messageList = [...preState.messageList, message];
+                const groupMessageList = parseGroupMessageList(messageList);
+                return Object.assign(Object.assign({}, preState), { messageList,
+                    groupMessageList });
+            });
+        };
+        const updateOneMessage = (message) => {
+            setLoadState((preState) => {
+                const tmpList = [...preState.messageList];
+                const idx = tmpList.findIndex((msg) => msg.clientMsgID === message.clientMsgID);
+                if (idx < 0) {
+                    return preState;
+                }
+                tmpList[idx] = Object.assign(Object.assign({}, tmpList[idx]), message);
+                const groupMessageList = parseGroupMessageList(tmpList);
+                return Object.assign(Object.assign({}, preState), { messageList: tmpList, groupMessageList });
+            });
+        };
+        emitter.on("PUSH_NEW_MSG", pushNewMessage);
+        emitter.on("UPDATE_ONE_MSG", updateOneMessage);
+        return () => {
+            emitter.off("PUSH_NEW_MSG", pushNewMessage);
+            emitter.off("UPDATE_ONE_MSG", updateOneMessage);
+        };
+    }, []);
     useEffect(() => {
-        DChatSDK.on(CbEvents.OnRecvNewMessages, ({ data }) => {
-            console.log("OnRecvNewMessages123", data);
-            onRecvNewMessages(data);
-        });
+        loadHistoryMessages();
         return () => {
-            DChatSDK.off(CbEvents.OnRecvNewMessages, () => { });
+            setLoadState(() => ({
+                initLoading: true,
+                hasMoreOld: true,
+                messageList: [],
+                groupMessageList: [],
+            }));
         };
-    }, [onRecvNewMessages]);
-    return Object.assign(Object.assign({}, dataMessages), { refetch: getAdvancedHistoryMessageList });
+    }, [conversationId]);
+    return {
+        loadState,
+        latestLoadState,
+        moreOldLoading,
+        getMoreOldMessages,
+    };
 };
+export const pushNewMessage = (message) => emit("PUSH_NEW_MSG", message);
+export const updateOneMessage = (message) => emit("UPDATE_ONE_MSG", message);

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

@@ -1,10 +1,13 @@
+import { MessageItem } from "@openim/wasm-client-sdk";
+import { ExtendMessageInfo } from "../../types/chat";
 interface SendMessageProps {
     recvID: string;
     groupID: string;
 }
-export declare const createTextMessage: (text: string) => Promise<import("@openim/wasm-client-sdk").MessageItem | null>;
+export declare const createTextMessage: (text: string) => Promise<MessageItem | null>;
 export declare const useSendMessage: (props: SendMessageProps) => {
-    sendTextMessage: (text: string) => Promise<boolean>;
+    sendTextMessage: (text: string, lastMessage?: MessageItem) => Promise<null | undefined>;
 };
+export declare const generateExtendMessageInfo: (currentUserID: string, lastMessage?: MessageItem) => ExtendMessageInfo;
 export {};
 //# sourceMappingURL=useSendMessage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAGA,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,kEAUnD,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,OAAO,gBAAgB;4BAIf,MAAM;CAsB5C,CAAC"}
+{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiB,MAAM,yBAAyB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,gCAanD,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,OAAO,gBAAgB;4BAKrC,MAAM,gBAAgB,WAAW;CAqCjD,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,eAAe,MAAM,EACrB,cAAc,WAAW,KAapB,iBACN,CAAC"}

package/dist/hooks/message/useSendMessage.js

@@ -1,41 +1,60 @@
+import { MessageStatus } from "@openim/wasm-client-sdk";
 import { DChatSDK } from "../../constants/sdk";
+import dayjs from "dayjs";
+import { v4 as uuidv4 } from "uuid";
 import { useChatContext } from "../../context/ChatContext";
+import { useCallback } from "react";
+import { pushNewMessage, updateOneMessage } from "./useMessage";
+import { emit } from "../../utils/events";
 export const createTextMessage = async (text) => {
-    let textMessage = await DChatSDK.createTextMessage(text)
+    let textMessage = await DChatSDK.createTextMessage(text, new Date().getTime().toString())
         .then(({ data }) => {
         return data;
     })
         .catch(({ errCode, errMsg }) => {
-        console.log("createTextMessage", errCode, errMsg);
+        console.error("createTextMessage", errCode, errMsg);
         return null;
     });
     return textMessage;
 };
 export const useSendMessage = (props) => {
-    const { user } = useChatContext();
     const { recvID, groupID } = props;
-    const sendTextMessage = async (text) => {
-        let result = false;
+    const { user } = useChatContext();
+    const sendTextMessage = useCallback(async (text, lastMessage) => {
+        let result = null;
         if (!recvID && !groupID)
-            return false;
+            return null;
         const textMessage = await createTextMessage(text);
-        console.log("textMessage", textMessage);
         if (!textMessage)
-            return false;
+            return null;
+        const extendMessageInfo = generateExtendMessageInfo((user === null || user === void 0 ? void 0 : user.userID) || "", lastMessage);
+        const messageItem = Object.assign(Object.assign({}, textMessage), { ex: JSON.stringify(extendMessageInfo) || "{}" });
+        //manual send text msg = auto push
+        pushNewMessage(messageItem);
+        emit("CHAT_LIST_SCROLL_TO_BOTTOM");
         try {
-            await DChatSDK.sendMessage({
+            const { data: successMessage } = await DChatSDK.sendMessage({
                 recvID,
                 groupID,
-                message: textMessage,
+                message: messageItem,
             });
-            result = true;
+            updateOneMessage(successMessage);
         }
         catch (error) {
-            console.log("sendMessage", error);
+            updateOneMessage(Object.assign(Object.assign({}, messageItem), { status: MessageStatus.Failed }));
         }
-        return result;
-    };
+    }, [recvID, groupID, user]);
     return {
         sendTextMessage,
     };
 };
+export const generateExtendMessageInfo = (currentUserID, lastMessage) => {
+    const diffSendTime = dayjs().diff(lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.sendTime, "minutes");
+    const isSameSender = (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.sendID) === currentUserID;
+    const lastMessageExtendMessageInfo = JSON.parse((lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.ex) || "{}");
+    return {
+        groupMessageID: isSameSender && diffSendTime <= 5
+            ? (lastMessageExtendMessageInfo === null || lastMessageExtendMessageInfo === void 0 ? void 0 : lastMessageExtendMessageInfo.groupMessageID) || uuidv4()
+            : uuidv4(),
+    };
+};