@lobehub/chat 0.94.5 → 0.95.0

package/src/store/session/slices/chat/reducers/message.ts

@@ -1,8 +1,10 @@
+import isEqual from 'fast-deep-equal';
 import { produce } from 'immer';
 
 import { ChatMessage, ChatMessageMap } from '@/types/chatMessage';
 import { LLMRoleType } from '@/types/llm';
 import { MetaData } from '@/types/meta';
+import { merge } from '@/utils/merge';
 import { nanoid } from '@/utils/uuid';
 
 interface AddMessage {
@@ -38,12 +40,20 @@ interface UpdateMessageExtra {
   value: any;
 }
 
+interface UpdatePluginState {
+  id: string;
+  key: string;
+  type: 'updatePluginState';
+  value: any;
+}
+
 export type MessageDispatch =
   | AddMessage
   | DeleteMessage
   | ResetMessages
   | UpdateMessage
-  | UpdateMessageExtra;
+  | UpdateMessageExtra
+  | UpdatePluginState;
 
 export const messagesReducer = (
   state: ChatMessageMap,
@@ -101,6 +111,26 @@ export const messagesReducer = (
       });
     }
 
+    case 'updatePluginState': {
+      return produce(state, (draftState) => {
+        const { id, key, value } = payload;
+        const message = draftState[id];
+        if (!message) return;
+
+        let newState;
+        if (!message.pluginState) {
+          newState = { [key]: value } as any;
+        } else {
+          newState = merge(message.pluginState, { [key]: value });
+        }
+
+        if (isEqual(message.pluginState, newState)) return;
+
+        message.pluginState = newState;
+        message.updateAt = Date.now();
+      });
+    }
+
     case 'resetMessages': {
       return produce(state, (draftState) => {
         const { topicId } = payload;

package/src/store/session/slices/chat/selectors/chat.ts

@@ -1,6 +1,6 @@
+import { LobePluginType } from '@lobehub/chat-plugin-sdk';
 import { t } from 'i18next';
 
-import { FunctionCallProps } from '@/app/chat/features/Conversation/ChatList/Plugins/FunctionCall';
 import { DEFAULT_INBOX_AVATAR, DEFAULT_USER_AVATAR } from '@/const/meta';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { useGlobalStore } from '@/store/global';
@@ -92,22 +92,19 @@ export const chatsMessageString = (s: SessionStore): string => {
   return chats.map((m) => m.content).join('');
 };
 
-export const getFunctionMessageParams =
-  (
-    s: SessionStore,
-  ): ((
-    props: Pick<ChatMessage, 'plugin' | 'function_call' | 'content' | 'id'>,
-  ) => FunctionCallProps) =>
-  ({ plugin, function_call, content, id }) => {
-    const itemId = plugin?.identifier || function_call?.name;
-    const command = plugin ?? function_call;
-    const args = command?.arguments;
-
-    return {
-      arguments: args,
-      command,
-      content,
-      id: itemId,
-      loading: id === s.chatLoadingId,
-    };
-  };
+export const getFunctionMessageProps =
+  ({ plugin, content, id }: Pick<ChatMessage, 'plugin' | 'content' | 'id'>) =>
+  (s: SessionStore) => ({
+    arguments: plugin?.arguments,
+    command: plugin,
+    content,
+    id: plugin?.identifier,
+    loading: id === s.chatLoadingId,
+    type: plugin?.type as LobePluginType,
+  });
+
+export const getMessageById = (id: string) => (s: SessionStore) => {
+  for (const e of Object.values(s.sessions)) {
+    if (e.chats[id]) return e.chats[id];
+  }
+};

package/src/store/session/slices/chat/selectors/index.ts

@@ -4,7 +4,8 @@ import {
   currentChatsWithGuideMessage,
   currentChatsWithHistoryConfig,
   getChatsById,
-  getFunctionMessageParams,
+  getFunctionMessageProps,
+  getMessageById,
 } from './chat';
 import { currentTopics, getTopicMessages } from './topic';
 
@@ -14,7 +15,8 @@ export const chatSelectors = {
   currentChatsWithGuideMessage,
   currentChatsWithHistoryConfig,
   getChatsById,
-  getFunctionMessageParams,
+  getFunctionMessageProps,
+  getMessageById,
 };
 
 export const topicSelectors = {

package/src/types/chatMessage.ts

@@ -46,6 +46,7 @@ export interface ChatMessage extends BaseDataModel {
   parentId?: string;
 
   plugin?: PluginRequestPayload;
+  pluginState?: any;
 
   // 引用
   quotaId?: string;

package/src/utils/message.ts

@@ -1,9 +1,16 @@
 import { FUNCTION_MESSAGE_FLAG } from '@/const/message';
 
-export const isFunctionMessage = (content: string) => {
+export const isFunctionMessageAtStart = (content: string) => {
   return content.startsWith(FUNCTION_MESSAGE_FLAG);
 };
 
+export const testFunctionMessageAtEnd = (content: string) => {
+  const regExp = /{"function_call":.*?}}/;
+  const match = content.match(regExp);
+
+  return { content: match ? match[0] : '', valid: match };
+};
+
 // export const createFunctionCallMessage = () => {
 //   return [
 //     {

package/src/app/chat/features/Conversation/ChatList/Plugins/IFrameRender/hooks.ts

@@ -1,29 +0,0 @@
-import { useEffect } from 'react';
-
-import { onPluginFetchMessage, onPluginReady } from './utils';
-
-export const useOnPluginReady = (onReady: () => void) => {
-  useEffect(() => {
-    const fn = (e: MessageEvent) => {
-      onPluginReady(e, onReady);
-    };
-
-    window.addEventListener('message', fn);
-    return () => {
-      window.removeEventListener('message', fn);
-    };
-  }, []);
-};
-
-export const useOnPluginFetchMessage = (onRequest: (data: any) => void, deps: any[] = []) => {
-  useEffect(() => {
-    const fn = (e: MessageEvent) => {
-      onPluginFetchMessage(e, onRequest);
-    };
-
-    window.addEventListener('message', fn);
-    return () => {
-      window.removeEventListener('message', fn);
-    };
-  }, deps);
-};

package/src/app/chat/features/Conversation/ChatList/Plugins/IFrameRender/utils.ts

@@ -1,17 +0,0 @@
-import { PluginChannel } from '@lobehub/chat-plugin-sdk/client';
-
-export const onPluginReady = (e: MessageEvent, onReady: () => void) => {
-  if (e.data.type === PluginChannel.pluginReadyForRender) {
-    onReady();
-  }
-};
-
-export const onPluginFetchMessage = (e: MessageEvent, onRequest: (data: any) => void) => {
-  if (e.data.type === PluginChannel.fetchPluginMessage) {
-    onRequest(e.data);
-  }
-};
-
-export const sendMessageToPlugin = (window: Window, props: any) => {
-  window.postMessage({ props, type: PluginChannel.renderPlugin }, '*');
-};