@lobehub/chat 0.65.1 → 0.67.0

package/src/store/plugin/initialState.ts

@@ -1,38 +1,9 @@
-import { LobeChatPluginManifest, LobeChatPluginMeta } from '@lobehub/chat-plugin-sdk';
+import { CustomPluginState, initialCustomPluginState } from './slices/customPlugin';
+import { PluginState, initialPluginState } from './slices/plugin';
 
-import { PluginManifestMap } from '@/types/plugin';
-
-export type PluginManifestLoadingState = Record<string, boolean>;
-export type PluginsSettings = Record<string, any>;
-
-export interface DevPlugin extends LobeChatPluginMeta {
-  apiMode: 'openapi' | 'simple';
-  enableSettings: boolean;
-  manifestConfig?: LobeChatPluginManifest;
-  manifestMode: 'local' | 'url';
-}
-
-export interface PluginStoreState {
-  devPluginList: DevPlugin[];
-  manifestPrepared: boolean;
-  newDevPlugin: Partial<DevPlugin>;
-  pluginList: LobeChatPluginMeta[];
-  pluginManifestLoading: PluginManifestLoadingState;
-  pluginManifestMap: PluginManifestMap;
-  pluginsSettings: PluginsSettings;
-}
-export const defaultDevPlugin: Partial<DevPlugin> = {
-  apiMode: 'simple',
-  enableSettings: false,
-  manifestMode: 'url',
-};
+export type PluginStoreState = PluginState & CustomPluginState;
 
 export const initialState: PluginStoreState = {
-  devPluginList: [],
-  manifestPrepared: false,
-  newDevPlugin: defaultDevPlugin,
-  pluginList: [],
-  pluginManifestLoading: {},
-  pluginManifestMap: {},
-  pluginsSettings: {},
+  ...initialPluginState,
+  ...initialCustomPluginState,
 };

package/src/store/plugin/selectors.ts

@@ -23,13 +23,13 @@ const enabledSchema =
       );
   };
 
-const pluginList = (s: PluginStoreState) => [...s.pluginList, ...s.devPluginList];
+const pluginList = (s: PluginStoreState) => [...s.pluginList, ...s.customPluginList];
 
 const getPluginMetaById = (id: string) => (s: PluginStoreState) =>
   pluginHelpers.getPluginFormList(pluginList(s), id);
 
 const getDevPluginById = (id: string) => (s: PluginStoreState) =>
-  s.devPluginList.find((i) => i.identifier === id);
+  s.customPluginList.find((i) => i.identifier === id);
 
 const getPluginManifestById = (id: string) => (s: PluginStoreState) => s.pluginManifestMap[id];
 const getPluginSettingsById = (id: string) => (s: PluginStoreState) => s.pluginsSettings[id];

package/src/store/plugin/slices/customPlugin/action.ts

@@ -0,0 +1,64 @@
+import { merge } from 'lodash-es';
+import { StateCreator } from 'zustand/vanilla';
+
+import { CustomPlugin } from '@/types/plugin';
+import { setNamespace } from '@/utils/storeDebug';
+
+import { PluginStore } from '../../store';
+import { defaultCustomPlugin } from './initialState';
+import { CustomPluginListDispatch, devPluginListReducer } from './reducers/customPluginList';
+
+const t = setNamespace('customPlugin');
+
+/**
+ * 代理行为接口
+ */
+export interface CustomPluginAction {
+  deleteCustomPlugin: (id: string) => void;
+  dispatchCustomPluginList: (payload: CustomPluginListDispatch) => void;
+  saveToCustomPluginList: (value: CustomPlugin) => void;
+  updateCustomPlugin: (id: string, value: CustomPlugin) => void;
+  updateNewCustomPlugin: (value: Partial<CustomPlugin>) => void;
+}
+
+export const createCustomPluginSlice: StateCreator<
+  PluginStore,
+  [['zustand/devtools', never]],
+  [],
+  CustomPluginAction
+> = (set, get) => ({
+  deleteCustomPlugin: (id) => {
+    const { dispatchCustomPluginList, dispatchPluginManifest, deletePluginSettings } = get();
+    // 1.删除插件项
+    dispatchCustomPluginList({ id, type: 'deleteItem' });
+    // 2.删除本地 manifest 记录
+    dispatchPluginManifest({ id, type: 'deleteManifest' });
+    // 3.删除插件配置
+    deletePluginSettings(id);
+  },
+  dispatchCustomPluginList: (payload) => {
+    const { customPluginList } = get();
+
+    const nextList = devPluginListReducer(customPluginList, payload);
+    set({ customPluginList: nextList }, false, t('dispatchCustomPluginList', payload));
+  },
+  saveToCustomPluginList: (value) => {
+    get().dispatchCustomPluginList({ plugin: value, type: 'addItem' });
+    set({ newCustomPlugin: defaultCustomPlugin }, false, t('saveToCustomPluginList'));
+  },
+  updateCustomPlugin: (id, value) => {
+    const { dispatchCustomPluginList, fetchPluginManifest } = get();
+    // 1. 更新 list 项信息
+    dispatchCustomPluginList({ id, plugin: value, type: 'updateItem' });
+    // 2. 更新 重新拉取 manifest
+    fetchPluginManifest(id);
+  },
+
+  updateNewCustomPlugin: (newCustomPlugin) => {
+    set(
+      { newCustomPlugin: merge({}, get().newCustomPlugin, newCustomPlugin) },
+      false,
+      t('updateNewDevPlugin'),
+    );
+  },
+});

package/src/store/plugin/slices/customPlugin/index.ts

@@ -0,0 +1,3 @@
+export * from './action';
+export * from './initialState';
+// export * from './selectors';

package/src/store/plugin/slices/customPlugin/initialState.ts

@@ -0,0 +1,16 @@
+import { CustomPlugin } from '@/types/plugin';
+
+export interface CustomPluginState {
+  customPluginList: CustomPlugin[];
+  newCustomPlugin: Partial<CustomPlugin>;
+}
+export const defaultCustomPlugin: Partial<CustomPlugin> = {
+  apiMode: 'simple',
+  enableSettings: false,
+  manifestMode: 'url',
+};
+
+export const initialCustomPluginState: CustomPluginState = {
+  customPluginList: [],
+  newCustomPlugin: defaultCustomPlugin,
+};

package/src/store/plugin/{reducers/devPluginList.ts → slices/customPlugin/reducers/customPluginList.ts}

@@ -1,11 +1,11 @@
 import { produce } from 'immer';
 
-import { DevPlugin } from '../initialState';
+import { CustomPlugin } from '@/types/plugin';
 
-export type DevListState = DevPlugin[];
+export type DevListState = CustomPlugin[];
 
 export type AddPluginAction = {
-  plugin: DevPlugin;
+  plugin: CustomPlugin;
   type: 'addItem';
 };
 
@@ -16,15 +16,15 @@ export type DeletePluginAction = {
 
 export type UpdatePluginAction = {
   id: string;
-  plugin: DevPlugin;
+  plugin: CustomPlugin;
   type: 'updateItem';
 };
 
-export type DevListDispatch = AddPluginAction | DeletePluginAction | UpdatePluginAction;
+export type CustomPluginListDispatch = AddPluginAction | DeletePluginAction | UpdatePluginAction;
 
 export const devPluginListReducer = (
   state: DevListState,
-  payload: DevListDispatch,
+  payload: CustomPluginListDispatch,
 ): DevListState => {
   switch (payload.type) {
     case 'addItem': {

package/src/store/plugin/{action.ts → slices/plugin/action.ts}

@@ -14,10 +14,8 @@ import { pluginSelectors } from '@/store/plugin/selectors';
 import { LobeSessions } from '@/types/session';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { DevPlugin, defaultDevPlugin } from './initialState';
-import { DevListDispatch, devPluginListReducer } from './reducers/devPluginList';
+import { PluginStore } from '../../store';
 import { PluginDispatch, pluginManifestReducer } from './reducers/manifest';
-import { PluginStore } from './store';
 
 const t = setNamespace('plugin');
 
@@ -26,12 +24,10 @@ const t = setNamespace('plugin');
  */
 export interface PluginAction {
   checkLocalEnabledPlugins: (sessions: LobeSessions) => void;
-  dispatchDevPluginList: (payload: DevListDispatch) => void;
+  deletePluginSettings: (id: string) => void;
   dispatchPluginManifest: (payload: PluginDispatch) => void;
-  fetchPluginManifest: (name: string) => Promise<void>;
-  saveToDevList: (value: DevPlugin) => void;
+  fetchPluginManifest: (identifier: string) => Promise<void>;
   updateManifestLoadingState: (key: string, value: boolean | undefined) => void;
-  updateNewDevPlugin: (value: Partial<DevPlugin>) => void;
   updatePluginSettings: <T>(id: string, settings: Partial<T>) => void;
   useFetchPluginList: () => SWRResponse<LobeChatPluginsMarketIndex>;
 }
@@ -56,15 +52,18 @@ export const createPluginSlice: StateCreator<
 
     const plugins = uniq(enabledPlugins);
 
-    await Promise.all(plugins.map((name) => fetchPluginManifest(name)));
+    await Promise.all(plugins.map((identifier) => fetchPluginManifest(identifier)));
 
     set({ manifestPrepared: true }, false, t('checkLocalEnabledPlugins'));
   },
-  dispatchDevPluginList: (payload) => {
-    const { devPluginList } = get();
-
-    const nextList = devPluginListReducer(devPluginList, payload);
-    set({ devPluginList: nextList }, false, t('dispatchDevList', payload));
+  deletePluginSettings: (id) => {
+    set(
+      produce((draft) => {
+        draft.pluginsSettings[id] = undefined;
+      }),
+      false,
+      t('deletePluginSettings'),
+    );
   },
   dispatchPluginManifest: (payload) => {
     const { pluginManifestMap } = get();
@@ -72,6 +71,7 @@ export const createPluginSlice: StateCreator<
 
     set({ pluginManifestMap: nextManifest }, false, t('dispatchPluginManifest', payload));
   },
+
   fetchPluginManifest: async (name) => {
     const plugin = pluginSelectors.getPluginMetaById(name)(get());
     // 1. 校验文件
@@ -113,11 +113,6 @@ export const createPluginSlice: StateCreator<
     // 4. 存储 manifest 信息
     get().dispatchPluginManifest({ id: plugin.identifier, plugin: data, type: 'addManifest' });
   },
-  saveToDevList: (value) => {
-    get().dispatchDevPluginList({ plugin: value, type: 'addItem' });
-    set({ newDevPlugin: defaultDevPlugin }, false, t('saveToDevList'));
-  },
-
   updateManifestLoadingState: (key, value) => {
     set(
       produce((draft) => {
@@ -127,13 +122,6 @@ export const createPluginSlice: StateCreator<
       t('updateManifestLoadingState'),
     );
   },
-  updateNewDevPlugin: (newDevPlugin) => {
-    set(
-      { newDevPlugin: merge({}, get().newDevPlugin, newDevPlugin) },
-      false,
-      t('updateNewDevPlugin'),
-    );
-  },
   updatePluginSettings: (id, settings) => {
     set(
       produce((draft) => {

package/src/store/plugin/slices/plugin/index.ts

@@ -0,0 +1,3 @@
+export * from './action';
+export * from './initialState';
+// export * from './selectors';

package/src/store/plugin/slices/plugin/initialState.ts

@@ -0,0 +1,22 @@
+import { LobeChatPluginMeta } from '@lobehub/chat-plugin-sdk';
+
+import { PluginManifestMap } from '@/types/plugin';
+
+export type PluginManifestLoadingState = Record<string, boolean>;
+export type PluginsSettings = Record<string, any>;
+
+export interface PluginState {
+  manifestPrepared: boolean;
+  pluginList: LobeChatPluginMeta[];
+  pluginManifestLoading: PluginManifestLoadingState;
+  pluginManifestMap: PluginManifestMap;
+  pluginsSettings: PluginsSettings;
+}
+
+export const initialPluginState: PluginState = {
+  manifestPrepared: false,
+  pluginList: [],
+  pluginManifestLoading: {},
+  pluginManifestMap: {},
+  pluginsSettings: {},
+};

package/src/store/plugin/store.ts

@@ -5,23 +5,25 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { isDev } from '@/utils/env';
 
-import { PluginAction, createPluginSlice } from './action';
 import { PluginStoreState, initialState } from './initialState';
+import { CustomPluginAction, createCustomPluginSlice } from './slices/customPlugin';
+import { PluginAction, createPluginSlice } from './slices/plugin';
 
 //  ===============  聚合 createStoreFn ============ //
 
-export type PluginStore = PluginStoreState & PluginAction;
+export type PluginStore = PluginStoreState & CustomPluginAction & PluginAction;
 
 const createStore: StateCreator<PluginStore, [['zustand/devtools', never]]> = (...parameters) => ({
   ...initialState,
   ...createPluginSlice(...parameters),
+  ...createCustomPluginSlice(...parameters),
 });
 
 //  ===============  persist 本地缓存中间件配置 ============ //
 
 type SessionPersist = Pick<
   PluginStore,
-  'pluginList' | 'pluginManifestMap' | 'pluginsSettings' | 'devPluginList'
+  'pluginList' | 'pluginManifestMap' | 'pluginsSettings' | 'customPluginList'
 >;
 
 const storeName = 'LOBE_PLUGIN';
@@ -30,7 +32,7 @@ const persistOptions: PersistOptions<PluginStore, SessionPersist> = {
   name: storeName,
 
   partialize: (s) => ({
-    devPluginList: s.devPluginList,
+    customPluginList: s.customPluginList,
     pluginList: s.pluginList,
     pluginManifestMap: s.pluginManifestMap,
     pluginsSettings: s.pluginsSettings,

package/src/types/plugin.ts

@@ -1,3 +1,10 @@
-import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
+import { LobeChatPluginManifest, LobeChatPluginMeta } from '@lobehub/chat-plugin-sdk';
 
 export type PluginManifestMap = Record<string, LobeChatPluginManifest>;
+
+export interface CustomPlugin extends LobeChatPluginMeta {
+  apiMode: 'openapi' | 'simple';
+  enableSettings: boolean;
+  manifestConfig?: LobeChatPluginManifest;
+  manifestMode: 'local' | 'url';
+}