react-native-chatbot-ai 0.1.27 → 0.1.29

package/src/hooks/message/useSendMessage.ts

@@ -19,7 +19,7 @@ import { SearchSessionsResponse } from '../../types/dto';
 import { useChatContext } from '../../context/ChatContext';
 
 export const useSendMessage = () => {
-  const { startStream, stopStream, retryStream } = useStreamMessage();
+  const { startStream, retryStream } = useStreamMessage();
   const { mutateAsync: createSession } = useCreateSession();
   const queryClient = useQueryClient();
   const logGA = useChatContext().logGA;
@@ -117,7 +117,6 @@ export const useSendMessage = () => {
 
   return {
     onSendMessage,
-    stopStream,
     retryStream,
   };
 };

package/src/hooks/message/useStreamMessage.ts

@@ -15,7 +15,6 @@ import useSessionStore from '../../store/session';
 
 export const useStreamMessage = () => {
   const sessionId = useSessionStore((state) => state.sessionId);
-  const esRef = useRef<EventSource | null>(null);
   const sessionIdRef = useRef<string | undefined>(sessionId);
   const { apiAddress, logGA } = useChatContext();
   const setStreamMessage = useStreamMessageStore(
@@ -38,9 +37,12 @@ export const useStreamMessage = () => {
 
       if (!currentSessionId || !token) return;
 
-      if (esRef.current) {
-        esRef.current.close();
-        esRef.current = null;
+      const eventSource = useStreamMessageStore.getState().eventSource;
+      const setEventSource = useStreamMessageStore.getState().setEventSource;
+
+      if (eventSource) {
+        eventSource.close();
+        setEventSource(undefined);
       }
 
       const url = `${apiAddress}${ENDPOINTS.assistantService.getStreamMessage(currentSessionId)}`;
@@ -53,6 +55,7 @@ export const useStreamMessage = () => {
         },
         body: JSON.stringify(payload),
       });
+      setEventSource(es);
 
       es.addEventListener('open', () => {
         console.log('🔵 Stream opened');
@@ -70,7 +73,7 @@ export const useStreamMessage = () => {
           );
           setStreamMessage(buffers);
         },
-        300,
+        150,
         { leading: true, trailing: true }
       );
 
@@ -78,7 +81,7 @@ export const useStreamMessage = () => {
         isError: boolean,
         messageId?: string
       ) => {
-        await new Promise((resolve) => setTimeout(resolve, 600));
+        await new Promise((resolve) => setTimeout(resolve, 500));
         if (isError) {
           DeviceEventEmitter.emit(events.updateMessageError, [
             {
@@ -148,21 +151,10 @@ export const useStreamMessage = () => {
       es.addEventListener('close', async () => {
         console.log('✅ Stream closed');
       });
-
-      esRef.current = es;
     },
     [apiAddress, setIsStreaming, setStreamMessage, logGA, sessionId]
   );
 
-  const stopStream = useCallback(() => {
-    if (esRef.current) {
-      console.log('🛑 Closing stream');
-      esRef.current.close();
-      esRef.current = null;
-      setIsStreaming(false);
-    }
-  }, [setIsStreaming]);
-
   const retryStream = useCallback(
     (messageItem: IMessageItem) => {
       DeviceEventEmitter.emit(events.updateOneMessage, {
@@ -193,15 +185,8 @@ export const useStreamMessage = () => {
     [startStream, logGA, sessionId]
   );
 
-  useEffect(() => {
-    return () => {
-      stopStream();
-    };
-  }, [stopStream]);
-
   return {
     startStream,
-    stopStream,
     retryStream,
   };
 };

package/src/hooks/product/useSearchProduct.ts

@@ -11,19 +11,26 @@ interface IUseFetchProductProps {
 }
 export const useSearchProduct = ({ productIds }: IUseFetchProductProps) =>
   useQuery({
-    queryKey: [QUERY_KEYS.SEARCH_PRODUCT],
+    queryKey: [QUERY_KEYS.SEARCH_PRODUCT, productIds],
     queryFn: async () => {
+      const products = useProductsStore.getState().products;
+      const notExistProductIds = productIds.filter((id) => !products[id]);
+
+      if (notExistProductIds.length === 0) {
+        return [];
+      }
+
       const res = await apiInstance?.post<BaseResponse<IProductItem[]>>(
         ENDPOINTS.productService.search,
         {
           ReturnPromotionTag: true,
-          productIds,
+          productIds: notExistProductIds,
         }
       );
       return res?.data?.data;
     },
     enabled: !!apiInstance && productIds?.length > 0,
     onSuccess: (data: IProductItem[]) => {
-      useProductsStore.setState({ products: data || [] });
+      useProductsStore.getState().setProducts(data || []);
     },
   });

package/src/store/products.ts

@@ -2,8 +2,14 @@ import { ProductsStore } from '../types';
 import { create } from 'zustand';
 
 const useProductsStore = create<ProductsStore>((set) => ({
-  products: [],
-  setProducts: (products) => set({ products }),
+  products: {},
+  setProducts: (products) => {
+    const productsMap: Record<string, any> = {};
+    products.forEach((product) => {
+      productsMap[product.id] = product;
+    });
+    set((state) => ({ products: { ...state.products, ...productsMap } }));
+  },
 }));
 
 export default useProductsStore;

package/src/store/streamMessage.ts

@@ -19,6 +19,19 @@ const useStreamMessageStore = create<StreamMessageStore>((set) => ({
       return { streamMessage: updated };
     });
   },
+  setEventSource(es) {
+    set({ eventSource: es });
+  },
+  stopStream() {
+    set((state) => {
+      if (state.eventSource) {
+        console.log('🛑 Closing stream');
+        state.eventSource.close();
+        return { isStreaming: false, eventSource: undefined };
+      }
+      return {};
+    });
+  },
 }));
 
 export default useStreamMessageStore;

package/src/types/chat.ts

@@ -1,5 +1,6 @@
 import { JSX } from 'react';
 import { IMessageItem, IProductItem } from './dto';
+import EventSource from 'react-native-sse';
 
 export interface ChatContextType {
   apiAddress: string;
@@ -57,9 +58,12 @@ export interface StreamMessageStore {
   setIsStreaming: (isStreaming: boolean) => void;
   streamMessage: Record<string, IMessageItem>;
   setStreamMessage: (streamMessage: Record<string, IMessageItem>) => void;
+  eventSource?: EventSource;
+  setEventSource: (es?: EventSource) => void;
+  stopStream: () => void;
 }
 
 export interface ProductsStore {
-  products: IProductItem[];
+  products: Record<string, IProductItem | undefined>;
   setProducts: (products: IProductItem[]) => void;
 }