Concat plugin to app (#1799)

2025-07-22 12:20:34 +00:00 · 2024-06-19 14:38:21 +08:00
parent b17d14bb7d
commit 565bfc8486
220 changed files with 5018 additions and 4667 deletions
--- a/packages/service/core/app/plugin/controller.ts
+++ b/packages/service/core/app/plugin/controller.ts
@@ -1,13 +1,13 @@
-import { MongoPlugin } from './schema';
 import { FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/index.d';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import { FlowNodeTypeEnum, defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
 import { pluginData2FlowNodeIO } from '@fastgpt/global/core/workflow/utils';
 import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
 import type { PluginRuntimeType, PluginTemplateType } from '@fastgpt/global/core/plugin/type.d';
 import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
-import { getHandleConfig } from '../../../global/core/workflow/template/utils';
+import { getHandleConfig } from '@fastgpt/global/core/workflow/template/utils';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { cloneDeep } from 'lodash';
+import { MongoApp } from '../schema';

 /* 
  plugin id rule:
@@ -19,6 +19,7 @@ import { cloneDeep } from 'lodash';
 export async function splitCombinePluginId(id: string) {
  const splitRes = id.split('-');
  if (splitRes.length === 1) {
+    // app id
    return {
      source: PluginSourceEnum.personal,
      pluginId: id
@@ -33,6 +34,7 @@ export async function splitCombinePluginId(id: string) {

 const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> => {
  const { source, pluginId } = await splitCombinePluginId(id);
+
  if (source === PluginSourceEnum.community) {
    const item = global.communityPlugins?.find((plugin) => plugin.id === pluginId);
    if (!item) return Promise.reject('plugin not found');
@@ -40,8 +42,9 @@ const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> =>
    return cloneDeep(item);
  }
  if (source === PluginSourceEnum.personal) {
-    const item = await MongoPlugin.findById(id).lean();
+    const item = await MongoApp.findById(id).lean();
    if (!item) return Promise.reject('plugin not found');
+
    return {
      id: String(item._id),
      teamId: String(item.teamId),
@@ -54,7 +57,7 @@ const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> =>
      edges: item.edges,
      templateType: FlowNodeTemplateTypeEnum.personalPlugin,
      isTool: true,
-      nodeVersion: item?.nodeVersion || ''
+      version: item?.pluginData?.nodeVersion || defaultNodeVersion
    };
  }
  return Promise.reject('plugin not found');
@@ -74,8 +77,7 @@ export async function getPluginPreviewNode({ id }: { id: string }): Promise<Flow
    intro: plugin.intro,
    showStatus: plugin.showStatus,
    isTool: plugin.isTool,
-    nodeVersion: plugin.nodeVersion,
-    version: '481',
+    version: plugin.version,
    sourceHandle: getHandleConfig(true, true, true, true),
    targetHandle: getHandleConfig(true, true, true, true),
    ...pluginData2FlowNodeIO(plugin.nodes)
--- a/packages/service/core/app/schema.ts
+++ b/packages/service/core/app/schema.ts
@@ -1,8 +1,7 @@
-import { AppTypeEnum, AppTypeMap } from '@fastgpt/global/core/app/constants';
+import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
 import { connectionMongo, type Model } from '../../common/mongo';
 const { Schema, model, models } = connectionMongo;
 import type { AppSchema as AppType } from '@fastgpt/global/core/app/type.d';
-import { PermissionTypeEnum, PermissionTypeMap } from '@fastgpt/global/support/permission/constant';
 import {
  TeamCollectionName,
  TeamMemberCollectionName
@@ -43,7 +42,7 @@ const AppSchema = new Schema({
  },
  type: {
    type: String,
-    default: AppTypeEnum.advanced,
+    default: AppTypeEnum.workflow,
    enum: Object.values(AppTypeEnum)
  },
  version: {
@@ -64,16 +63,11 @@ const AppSchema = new Schema({
  },

  // role and auth
-  permission: {
-    type: String,
-    enum: Object.keys(PermissionTypeMap),
-    default: PermissionTypeEnum.private
-  },
  teamTags: {
    type: [String]
  },

-  // tmp store
+  // save app(Not publish)
  modules: {
    type: Array,
    default: []
@@ -83,8 +77,16 @@ const AppSchema = new Schema({
    default: []
  },
  chatConfig: {
-    type: chatConfigType,
-    default: {}
+    type: chatConfigType
+  },
+  // plugin config
+  pluginData: {
+    type: {
+      nodeVersion: String,
+      pluginUniId: String,
+      apiSchemaStr: String, // http plugin
+      customHeaders: String // http plugin
+    }
  },

  scheduledTriggerConfig: {
--- a/packages/service/core/app/version/schema.ts
+++ b/packages/service/core/app/version/schema.ts
@@ -24,8 +24,7 @@ const AppVersionSchema = new Schema({
    default: []
  },
  chatConfig: {
-    type: chatConfigType,
-    default: {}
+    type: chatConfigType
  }
 });

--- a/packages/service/core/plugin/schema.ts
+++ b/packages/service/core/plugin/schema.ts
@@ -68,10 +68,13 @@ const PluginSchema = new Schema({
  nodeVersion: {
    type: String,
    default: ''
-  }
+  },
+
+  inited: Boolean
 });

 try {
+  PluginSchema.index({ type: 1, init: 1 });
  PluginSchema.index({ teamId: 1, parentId: 1 });
  PluginSchema.index({ teamId: 1, name: 1, intro: 1 });
 } catch (error) {
--- a/packages/service/core/plugin/store/schema.ts
+++ b/packages/service/core/plugin/store/schema.ts
@@ -1,31 +0,0 @@
-import { connectionMongo, type Model } from '../../../common/mongo';
-const { Schema, model, models } = connectionMongo;
-import type { PluginItemSchema } from '@fastgpt/global/core/plugin/type.d';
-
-import { PluginCollectionName } from '../schema';
-
-export const ModuleCollectionName = 'plugins';
-
-const PluginStoreSchema = new Schema({
-  pluginId: {
-    type: Schema.Types.ObjectId,
-    ref: PluginCollectionName,
-    required: true
-  },
-  price: {
-    type: Number,
-    default: 0
-  },
-  updateTime: {
-    type: Date,
-    default: () => new Date()
-  },
-  modules: {
-    type: Array,
-    default: []
-  }
-});
-
-export const MongoPluginStore: Model<PluginItemSchema> =
-  models[ModuleCollectionName] || model(ModuleCollectionName, PluginStoreSchema);
-MongoPluginStore.syncIndexes();
--- a/packages/service/core/workflow/dispatch/plugin/run.ts
+++ b/packages/service/core/workflow/dispatch/plugin/run.ts
@@ -3,8 +3,7 @@ import { dispatchWorkFlow } from '../index';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import { getPluginRuntimeById } from '../../../plugin/controller';
-import { authPluginCanUse } from '../../../../support/permission/auth/plugin';
+import { getPluginRuntimeById, splitCombinePluginId } from '../../../app/plugin/controller';
 import {
  getDefaultEntryNodeIds,
  initWorkflowEdgeStatus,
@@ -13,6 +12,9 @@ import {
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import { updateToolInputValue } from '../agent/runTool/utils';
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
+import { authAppByTmbId } from '../../../../support/permission/app/auth';
+import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
+import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';

 type RunPluginProps = ModuleDispatchProps<{
  [key: string]: any;
@@ -22,9 +24,9 @@ type RunPluginResponse = DispatchNodeResultType<{}>;
 export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPluginResponse> => {
  const {
    node: { pluginId },
+    app: workflowApp,
    mode,
    teamId,
-    tmbId,
    params: data
  } = props;

@@ -32,7 +34,16 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
    return Promise.reject('pluginId can not find');
  }

-  await authPluginCanUse({ id: pluginId, teamId, tmbId });
+  // auth plugin
+  const { source } = await splitCombinePluginId(pluginId);
+  if (source === PluginSourceEnum.personal) {
+    await authAppByTmbId({
+      appId: pluginId,
+      teamId: workflowApp.teamId,
+      tmbId: workflowApp.tmbId,
+      per: ReadPermissionVal
+    });
+  }
  const plugin = await getPluginRuntimeById(pluginId);

  // concat dynamic inputs
--- a/packages/service/core/workflow/dispatchV1/plugin/run.ts
+++ b/packages/service/core/workflow/dispatchV1/plugin/run.ts
@@ -8,8 +8,7 @@ import {
  NodeInputKeyEnum
 } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
-import { splitCombinePluginId } from '../../../plugin/controller';
-import { authPluginCanUse } from '../../../../support/permission/auth/plugin';
+import { splitCombinePluginId } from '../../../app/plugin/controller';
 import { setEntryEntries, DYNAMIC_INPUT_KEY } from '../utils';
 import { DispatchNodeResultType } from '@fastgpt/global/core/workflow/runtime/type';
 import { PluginRuntimeType, PluginTemplateType } from '@fastgpt/global/core/plugin/type';
@@ -73,8 +72,10 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
    return Promise.reject('pluginId can not find');
  }

-  await authPluginCanUse({ id: pluginId, teamId, tmbId });
  const plugin = await getPluginRuntimeById(pluginId);
+  if (plugin.teamId && plugin.teamId !== teamId) {
+    return Promise.reject('plugin not found');
+  }

  // concat dynamic inputs
  const inputModule = plugin.modules.find((item) => item.flowType === FlowNodeTypeEnum.pluginInput);