@lobehub/chat 0.66.0 → 0.67.0

package/CHANGELOG.md

@@ -2,6 +2,49 @@
 
 # Changelog
 
+## [Version 0.67.0](https://github.com/lobehub/lobe-chat/compare/v0.66.0...v0.67.0)
+
+<sup>Released on **2023-09-02**</sup>
+
+#### ♻ Code Refactoring
+
+- **plugin**: 重构 plugin Store 组织结构，便于开发与迭代维护.
+
+#### ✨ Features
+
+- **plugin-dev**: 优化 manifest 报错原因提示，并支持 id 从 manifest 自动获取.
+
+#### 🐛 Bug Fixes
+
+- **plugin-dev**: 修正编辑模式下预览展示问题和 id 重复校验问题.
+- **plugin**: 修正开启插件后会话无效的问题.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **plugin**: 重构 plugin Store 组织结构，便于开发与迭代维护 ([ec527cb](https://github.com/lobehub/lobe-chat/commit/ec527cb))
+
+#### What's improved
+
+- **plugin-dev**: 优化 manifest 报错原因提示，并支持 id 从 manifest 自动获取 ([7f0787d](https://github.com/lobehub/lobe-chat/commit/7f0787d))
+
+#### What's fixed
+
+- **plugin-dev**: 修正编辑模式下预览展示问题和 id 重复校验问题 ([17c39ef](https://github.com/lobehub/lobe-chat/commit/17c39ef))
+- **plugin**: 修正开启插件后会话无效的问题 ([82e3beb](https://github.com/lobehub/lobe-chat/commit/82e3beb))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.66.0](https://github.com/lobehub/lobe-chat/compare/v0.65.1...v0.66.0)
 
 <sup>Released on **2023-09-02**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.66.0",
+  "version": "0.67.0",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",

package/src/features/AgentSetting/AgentPlugin/LocalPluginItem.tsx

@@ -17,11 +17,13 @@ const MarketList = memo<{ id: string }>(({ id }) => {
   const updateConfig = useStore((s) => s.toggleAgentPlugin);
   const [plugins, hasPlugin] = useStore((s) => [s.config.plugins || [], !!s.config.plugins]);
 
-  const [useFetchPluginList, fetchPluginManifest, dispatchDevPluginList] = usePluginStore((s) => [
-    s.useFetchPluginList,
-    s.fetchPluginManifest,
-    s.dispatchDevPluginList,
-  ]);
+  const [useFetchPluginList, fetchPluginManifest, deleteCustomPlugin, updateCustomPlugin] =
+    usePluginStore((s) => [
+      s.useFetchPluginList,
+      s.fetchPluginManifest,
+      s.deleteCustomPlugin,
+      s.updateCustomPlugin,
+    ]);
 
   const pluginManifestLoading = usePluginStore((s) => s.pluginManifestLoading, isEqual);
   const devPlugin = usePluginStore(pluginSelectors.getDevPluginById(id), isEqual);
@@ -31,15 +33,15 @@ const MarketList = memo<{ id: string }>(({ id }) => {
   return (
     <>
       <DevModal
+        mode={'edit'}
         onDelete={() => {
-          dispatchDevPluginList({ id, type: 'deleteItem' });
+          deleteCustomPlugin(id);
         }}
         onOpenChange={setModal}
         onSave={(value) => {
-          dispatchDevPluginList({ id, plugin: value, type: 'updateItem' });
+          updateCustomPlugin(id, value);
         }}
         open={showModal}
-        showDelete
         value={devPlugin}
       />
 

package/src/features/AgentSetting/AgentPlugin/MarketList.tsx

@@ -41,22 +41,33 @@ const MarketList = memo(() => {
   //   setModal(true);
   // }, []);
 
-  const updateConfig = useStore((s) => s.toggleAgentPlugin);
-  const [plugins, hasPlugin] = useStore((s) => [s.config.plugins || [], !!s.config.plugins]);
+  const [plugins, hasPlugin, toggleAgentPlugin] = useStore((s) => [
+    s.config.plugins || [],
+    !!s.config.plugins,
+    s.toggleAgentPlugin,
+  ]);
 
   const [useFetchPluginList, fetchPluginManifest, saveToDevList, updateNewDevPlugin] =
     usePluginStore((s) => [
       s.useFetchPluginList,
       s.fetchPluginManifest,
-      s.saveToDevList,
-      s.updateNewDevPlugin,
+      s.saveToCustomPluginList,
+      s.updateNewCustomPlugin,
     ]);
   const pluginManifestLoading = usePluginStore((s) => s.pluginManifestLoading, isEqual);
   const pluginList = usePluginStore((s) => s.pluginList, isEqual);
-  const devPluginList = usePluginStore((s) => s.devPluginList, isEqual);
+  const customPluginList = usePluginStore((s) => s.customPluginList, isEqual);
 
   useFetchPluginList();
 
+  const togglePlugin = async (pluginId: string, fetchManifest?: boolean) => {
+    toggleAgentPlugin(pluginId);
+    if (fetchManifest) {
+      await fetchPluginManifest(pluginId);
+    }
+  };
+
+  //  =========== Skeleton Loading =========== //
   const loadingItem = {
     avatar: (
       <Skeleton
@@ -77,11 +88,12 @@ const MarketList = memo(() => {
       />
     ),
   };
-
   const loadingList = [loadingItem, loadingItem, loadingItem];
 
   const isEmpty = pluginList.length === 0;
 
+  //  =========== Plugin List =========== //
+
   const list = pluginList.map(({ identifier, meta }) => ({
     avatar: <Avatar avatar={meta.avatar} />,
     children: (
@@ -92,10 +104,7 @@ const MarketList = memo(() => {
         }
         loading={pluginManifestLoading[identifier]}
         onChange={(checked) => {
-          updateConfig(identifier);
-          if (checked) {
-            fetchPluginManifest(identifier);
-          }
+          togglePlugin(identifier, checked);
         }}
       />
     ),
@@ -105,7 +114,9 @@ const MarketList = memo(() => {
     tag: identifier,
   }));
 
-  const devList = devPluginList.map(({ identifier, meta }) => ({
+  //  =========== Custom Plugin List =========== //
+
+  const customList = customPluginList.map(({ identifier, meta }) => ({
     avatar: <Avatar avatar={pluginHelpers.getPluginAvatar(meta) || '🧩'} />,
     children: <LocalPluginItem id={identifier} />,
     desc: pluginHelpers.getPluginDesc(meta),
@@ -125,14 +136,19 @@ const MarketList = memo(() => {
     <>
       <DevModal
         onOpenChange={setModal}
-        onSave={saveToDevList}
+        onSave={async (devPlugin) => {
+          // 先保存
+          saveToDevList(devPlugin);
+          // 再开启插件
+          await togglePlugin(devPlugin.identifier, true);
+        }}
         onValueChange={updateNewDevPlugin}
         open={showModal}
       />
       <Form
         items={[
           {
-            children: isEmpty ? loadingList : [...devList, ...list],
+            children: isEmpty ? loadingList : [...customList, ...list],
             extra: (
               <Tooltip title={t('settingPlugin.addTooltip')}>
                 <Button

package/src/features/PluginDevModal/ManifestForm.tsx

@@ -1,96 +1,160 @@
-import { pluginManifestSchema } from '@lobehub/chat-plugin-sdk';
-import { Form, FormItemProps, Input, Tooltip } from '@lobehub/ui';
-import { FormInstance, Radio } from 'antd';
-import { memo } from 'react';
+import { LobeChatPluginManifest, pluginManifestSchema } from '@lobehub/chat-plugin-sdk';
+import { ActionIcon, Form, FormItemProps, Highlighter, Input, Tooltip } from '@lobehub/ui';
+import { FormInstance, Popover, Radio } from 'antd';
+import { FileCode, RotateCwIcon } from 'lucide-react';
+import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
 
-const ManifestForm = memo<{ form: FormInstance; mode: 'url' | 'local' }>(({ form, mode }) => {
-  const { t } = useTranslation('plugin');
+const ManifestForm = memo<{ form: FormInstance; mode?: 'url' | 'local' }>(
+  ({ form, mode = 'url' }) => {
+    const { t } = useTranslation('plugin');
 
-  const isUrl = mode === 'url';
+    const [manifest, setManifest] = useState<LobeChatPluginManifest>();
 
-  const configItem: FormItemProps[] = isUrl
-    ? [
-        {
-          children: <Input placeholder={'http://localhost/manifest.json'} />,
-          desc: t('dev.meta.manifest.desc'),
-          hasFeedback: true,
-          label: t('dev.meta.manifest.label'),
-          name: 'manifest',
-          required: true,
-          rules: [
-            { required: true },
-            {
-              message: t('dev.meta.manifest.urlError'),
-              pattern: /^https?:\/\/.*/,
-            },
-            {
-              message: t('dev.meta.manifest.invalid'),
-              validator: async (_, value) => {
-                const res = await fetch(value);
-                if (!res.ok) return true;
+    const isUrl = mode === 'url';
 
-                const json = await res.json();
-                pluginManifestSchema.parse(json);
+    const configItem: FormItemProps[] = isUrl
+      ? [
+          {
+            children: (
+              <Input
+                placeholder={'http://localhost:3400/manifest-dev.json'}
+                suffix={
+                  manifest && (
+                    <ActionIcon
+                      icon={RotateCwIcon}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        form.validateFields(['manifest']);
+                      }}
+                      size={'small'}
+                      title={t('dev.meta.manifest.refresh')}
+                    />
+                  )
+                }
+              />
+            ),
+            extra: (
+              <Flexbox horizontal justify={'space-between'} style={{ marginTop: 8 }}>
+                {t('dev.meta.manifest.desc')}
+                {manifest && (
+                  <Popover
+                    arrow={false}
+                    content={
+                      <Highlighter language={'json'}>
+                        {JSON.stringify(manifest, null, 2)}
+                      </Highlighter>
+                    }
+                    placement={'right'}
+                    style={{ width: 400 }}
+                    title={'Manifest JSON'}
+                    trigger={'click'}
+                  >
+                    <ActionIcon
+                      icon={FileCode}
+                      size={'small'}
+                      title={t('dev.meta.manifest.preview')}
+                    />
+                  </Popover>
+                )}
+              </Flexbox>
+            ),
+            // extra: <div>123</div>,
+            hasFeedback: true,
+            label: t('dev.meta.manifest.label'),
+            name: 'manifest',
+            required: true,
+            rules: [
+              { required: true },
+              {
+                message: t('dev.meta.manifest.urlError'),
+                pattern: /^https?:\/\/.*/,
               },
-            },
-          ],
-        },
-      ]
-    : // TODO: 后续做成本地配置模式
-      [
-        {
-          children: <Input placeholder={'searchEngine'} />,
-          desc: t('dev.meta.identifier.desc'),
-          label: t('dev.meta.identifier.label'),
-          name: 'name',
-          required: true,
-        },
+              {
+                // message: t('dev.meta.manifest.invalid'),
+                validator: async (_, value) => {
+                  if (!value) return true;
 
-        {
-          children: <Input placeholder={t('dev.meta.description.placeholder')} />,
-          desc: t('dev.meta.description.desc'),
-          label: t('dev.meta.description.label'),
-          name: 'description',
-          required: true,
-        },
-        {
-          children: <Input placeholder={'searchEngine'} />,
-          desc: t('dev.meta.identifier.desc'),
-          label: t('dev.meta.identifier.label'),
-          name: 'identifier',
-          required: true,
-        },
-      ];
+                  let res: Response;
 
-  return (
-    <Form
-      form={form}
-      items={[
-        {
-          children: configItem,
-          extra: (
-            <Radio.Group
-              onChange={(v) => {
-                form.setFieldValue('manifestMode', v.target.value);
-              }}
-              size={'small'}
-              value={mode}
-            >
-              <Radio.Button value={'url'}>{t('dev.manifest.mode.url')}</Radio.Button>
-              <Tooltip title={t('dev.manifest.mode.local-tooltip')}>
-                <Radio.Button disabled value={'local'}>
-                  {t('dev.manifest.mode.local')}
-                </Radio.Button>
-              </Tooltip>
-            </Radio.Group>
-          ),
-          title: t('dev.tabs.manifest'),
-        },
-      ]}
-      layout={isUrl ? 'vertical' : undefined}
-    />
-  );
-});
+                  try {
+                    res = await fetch(value);
+                  } catch {
+                    throw t('dev.meta.manifest.requestError');
+                  }
+
+                  const json = await res.json().catch(() => {
+                    throw t('dev.meta.manifest.urlError');
+                  });
+
+                  const valid = pluginManifestSchema.safeParse(json);
+                  if (!valid.success) {
+                    throw t('dev.meta.manifest.jsonInvalid', { error: valid.error });
+                  }
+
+                  setManifest(json);
+                  form.setFieldValue('identifier', valid.data.identifier);
+                },
+              },
+            ],
+          },
+        ]
+      : // TODO: 后续做成本地配置模式
+        [
+          {
+            children: <Input placeholder={'searchEngine'} />,
+            desc: t('dev.meta.identifier.desc'),
+            label: t('dev.meta.identifier.label'),
+            name: 'name',
+            required: true,
+          },
+
+          {
+            children: <Input placeholder={t('dev.meta.description.placeholder')} />,
+            desc: t('dev.meta.description.desc'),
+            label: t('dev.meta.description.label'),
+            name: 'description',
+            required: true,
+          },
+          {
+            children: <Input placeholder={'searchEngine'} />,
+            desc: t('dev.meta.identifier.desc'),
+            label: t('dev.meta.identifier.label'),
+            name: 'identifier',
+            required: true,
+          },
+        ];
+
+    return (
+      <Form
+        form={form}
+        items={[
+          {
+            children: configItem,
+            extra: (
+              <Radio.Group
+                onChange={(v) => {
+                  form.setFieldValue('manifestMode', v.target.value);
+                }}
+                size={'small'}
+                value={mode}
+              >
+                <Radio.Button value={'url'}>{t('dev.manifest.mode.url')}</Radio.Button>
+                <Tooltip title={t('dev.manifest.mode.local-tooltip')}>
+                  <Radio.Button disabled value={'local'}>
+                    {t('dev.manifest.mode.local')}
+                  </Radio.Button>
+                </Tooltip>
+              </Radio.Group>
+            ),
+            title: t('dev.tabs.manifest'),
+          },
+        ]}
+        layout={isUrl ? 'vertical' : undefined}
+      />
+    );
+  },
+);
 
 export default ManifestForm;

package/src/features/PluginDevModal/MetaForm.tsx

@@ -1,24 +1,20 @@
 import { Form, FormItemProps, Input } from '@lobehub/ui';
 import { FormInstance } from 'antd';
-import { memo, useEffect } from 'react';
+import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import EmojiPicker from '@/components/EmojiPicker';
 import { pluginSelectors, usePluginStore } from '@/store/plugin';
 
-const MetaForm = memo<{ form: FormInstance }>(({ form }) => {
+const MetaForm = memo<{ form: FormInstance; mode?: 'edit' | 'create' }>(({ form, mode }) => {
+  const isEditMode = mode === 'edit';
+
   const { t } = useTranslation('plugin');
   const [plugins] = usePluginStore((s) => [pluginSelectors.pluginList(s).map((i) => i.identifier)]);
 
-  useEffect(() => {
-    if (usePluginStore.getState().newDevPlugin) {
-      form.setFieldsValue(usePluginStore.getState().newDevPlugin);
-    }
-  }, []);
-
   const configItem: FormItemProps[] = [
     {
-      children: <Input placeholder={'searchEngine'} />,
+      children: <Input disabled placeholder={'searchEngine'} />,
       desc: t('dev.meta.identifier.desc'),
       label: t('dev.meta.identifier.label'),
       name: 'identifier',
@@ -28,14 +24,17 @@ const MetaForm = memo<{ form: FormInstance }>(({ form }) => {
           message: t('dev.meta.identifier.pattenErrorMessage'),
           pattern: /^[\w-]+$/,
         },
-        {
-          message: t('dev.meta.identifier.errorDuplicate'),
-          validator: async (_, value) => {
-            if (plugins.includes(value)) {
-              throw new Error('Duplicate');
-            }
-          },
-        },
+        // 编辑模式下，不进行重复校验
+        isEditMode
+          ? {}
+          : {
+              message: t('dev.meta.identifier.errorDuplicate'),
+              validator: async (_, value) => {
+                if (plugins.includes(value)) {
+                  throw new Error('Duplicate');
+                }
+              },
+            },
       ],
     },
     {

package/src/features/PluginDevModal/PluginPreview.tsx

@@ -1,29 +1,30 @@
 import { Avatar, Form } from '@lobehub/ui';
-import { Card, Switch, Tag } from 'antd';
+import { Form as AForm, Card, FormInstance, Switch, Tag } from 'antd';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { pluginHelpers, usePluginStore } from '@/store/plugin';
+import { pluginHelpers } from '@/store/plugin';
+import { CustomPlugin } from '@/types/plugin';
 
-const PluginPreview = memo(() => {
+const PluginPreview = memo<{ form: FormInstance }>(({ form }) => {
   const { t } = useTranslation('plugin');
-  const meta = usePluginStore((s) => s.newDevPlugin);
+  const plugin: CustomPlugin = AForm.useWatch([], form);
 
   const items = {
-    avatar: <Avatar avatar={pluginHelpers.getPluginAvatar(meta?.meta) || '🧩'} />,
+    avatar: <Avatar avatar={pluginHelpers.getPluginAvatar(plugin?.meta) || '🧩'} />,
     children: <Switch disabled />,
-    desc: pluginHelpers.getPluginDesc(meta?.meta),
+    desc: pluginHelpers.getPluginDesc(plugin?.meta),
     label: (
       <Flexbox align={'center'} gap={8} horizontal>
-        {pluginHelpers.getPluginTitle(meta?.meta) ?? t('dev.preview.title')}
+        {pluginHelpers.getPluginTitle(plugin?.meta) ?? t('dev.preview.title')}
         <Tag bordered={false} color={'gold'}>
           {t('list.item.local.title', { ns: 'plugin' })}
         </Tag>
       </Flexbox>
     ),
     minWidth: undefined,
-    tag: !!meta?.identifier ? meta?.identifier : 'id',
+    tag: !!plugin?.identifier ? plugin?.identifier : 'id',
   };
 
   return (

package/src/features/PluginDevModal/index.tsx

@@ -1,13 +1,13 @@
 import { Icon } from '@lobehub/ui';
 import { App, Button, ConfigProvider, Form, Modal, Popconfirm } from 'antd';
-import { createStyles, useTheme } from 'antd-style';
+import { createStyles } from 'antd-style';
 import { LucideBlocks } from 'lucide-react';
 import { lighten } from 'polished';
-import { memo, useEffect } from 'react';
+import { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { DevPlugin } from '@/store/plugin/initialState';
+import { CustomPlugin } from '@/types/plugin';
 
 import ManifestForm from './ManifestForm';
 import MetaForm from './MetaForm';
@@ -26,33 +26,31 @@ const useStyles = createStyles(({ css, token, prefixCls }) => ({
 }));
 
 interface DevModalProps {
+  mode?: 'edit' | 'create';
   onDelete?: () => void;
   onOpenChange: (open: boolean) => void;
-  onSave?: (value: DevPlugin) => void;
-  onValueChange?: (value: Partial<DevPlugin>) => void;
+  onSave?: (value: CustomPlugin) => Promise<void> | void;
+  onValueChange?: (value: Partial<CustomPlugin>) => void;
   open?: boolean;
-  showDelete?: boolean;
-  value?: DevPlugin;
+  value?: CustomPlugin;
 }
 
 const DevModal = memo<DevModalProps>(
-  ({ open, showDelete, value, onValueChange, onSave, onOpenChange, onDelete }) => {
+  ({ open, mode = 'create', value, onValueChange, onSave, onOpenChange, onDelete }) => {
+    const isEditMode = mode === 'edit';
     const { t } = useTranslation('plugin');
-
-    const [form] = Form.useForm();
-    const theme = useTheme();
-
-    const { styles } = useStyles();
-
+    const { styles, theme } = useStyles();
     const { message } = App.useApp();
 
+    const [submitting, setSubmitting] = useState(false);
+    const [form] = Form.useForm();
     useEffect(() => {
       form.setFieldsValue(value);
     }, []);
 
     const footer = (
       <Flexbox horizontal justify={'space-between'} style={{ marginTop: 24 }}>
-        {showDelete ? (
+        {isEditMode ? (
           <Popconfirm
             okButtonProps={{
               danger: true,
@@ -80,24 +78,30 @@ const DevModal = memo<DevModalProps>(
             {t('cancel', { ns: 'common' })}
           </Button>
           <Button
+            loading={submitting}
             onClick={() => {
               form.submit();
             }}
             type={'primary'}
           >
-            {t('dev.save')}
+            {t(isEditMode ? 'dev.update' : 'dev.save')}
           </Button>
         </Flexbox>
       </Flexbox>
     );
+
     return (
       <Form.Provider
         onFormChange={() => {
           onValueChange?.(form.getFieldsValue());
         }}
-        onFormFinish={(_, info) => {
-          onSave?.(info.values as DevPlugin);
-          message.success(t('dev.saveSuccess'));
+        onFormFinish={async (_, info) => {
+          if (onSave) {
+            setSubmitting(true);
+            await onSave?.(info.values as CustomPlugin);
+            setSubmitting(false);
+          }
+          message.success(t(isEditMode ? 'dev.updateSuccess' : 'dev.saveSuccess'));
           onOpenChange(false);
         }}
       >
@@ -121,7 +125,6 @@ const DevModal = memo<DevModalProps>(
               form.submit();
             }}
             open={open}
-            style={{ height: 750 }}
             title={
               <Flexbox gap={8} horizontal>
                 <Icon icon={LucideBlocks} />
@@ -139,9 +142,9 @@ const DevModal = memo<DevModalProps>(
               {/*    { children: <ManifestForm />, key: 'manifest', label: t('dev.tabs.manifest') },*/}
               {/*  ]}*/}
               {/*/>*/}
-              <PluginPreview />
-              <ManifestForm form={form} mode={'url'} />
-              <MetaForm form={form} />
+              <PluginPreview form={form} />
+              <ManifestForm form={form} />
+              <MetaForm form={form} mode={mode} />
             </Flexbox>
           </Modal>
         </ConfigProvider>

package/src/locales/default/plugin.ts

@@ -43,16 +43,19 @@ export default {
         label: '首页',
       },
       identifier: {
-        desc: '插件的唯一标识，仅支持英文字符、数字、破折号 - 、下划线 _',
+        desc: '插件的唯一标识，将从 manifest 中自动识别',
         errorDuplicate: '标识符和已有插件重复，请修改标识符',
         label: '标识符',
         pattenErrorMessage: '只能输入英文字符、数字 、- 和_ 这两个符号',
       },
       manifest: {
         desc: 'LobeChat 将会通过该链接安装插件',
-        invalid: '输入的 manifest 链接无效，或 manifest 不符合规范',
+        jsonInvalid: ' manifest 不符合规范，校验结果: \n\n {{error}}',
         label: '插件描述文件 Url 地址',
-        urlError: '请输入一个有效的网址',
+        preview: '预览 Manifest',
+        refresh: '刷新',
+        requestError: '请求该链接失败，请输入一个有效的链接，并检查链接是否允许跨域访问',
+        urlError: '该链接没有返回 JSON 格式的内容, 请输入一个有效的链接',
       },
       title: {
         desc: '插件标题',
@@ -73,13 +76,14 @@ export default {
       manifest: '功能描述清单 (Manifest)',
       meta: '插件元信息',
     },
-
     title: '添加自定义插件',
+    update: '更新',
+    updateSuccess: '插件设置更新成功',
   },
   list: {
     item: {
       'local.config': '配置',
-      'local.title': '本地',
+      'local.title': '自定义',
     },
   },
 

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';
+}