admin/flowgram.ai
1
0
Fork 0
mirror of https://gitee.com/ByteDance/flowgram.ai.git synced 2025-07-07 17:43:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): deduplication before singleton plugin init (#142)

Browse Source
This commit is contained in:
Louis Young 2025-04-15 15:41:32 +08:00 committed by GitHub
parent e75c2f8607
commit f43d70ee88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/canvas-engine/core/src/plugin/plugin.ts
View File

@ -65,6 +65,7 @@ export const Plugin = Symbol('Plugin');
export type Plugin<Options = any> = {
options: Options;
pluginId: string;
singleton: boolean;
initPlugin: () => void;
contributionKeys?: interfaces.ServiceIdentifier[];
containerModules?: interfaces.ContainerModule[];
@ -78,22 +79,31 @@ export type PluginCreator<Options> = (opts: Options) => Plugin<Options>;
export function loadPlugins(plugins: Plugin[], container: interfaces.Container): void {
const pluginInitSet = new Set<string>();
const modules: interfaces.ContainerModule[] = plugins.reduce((res, plugin) => {
if (!pluginInitSet.has(plugin.pluginId)) {
plugin.initPlugin();
pluginInitSet.add(plugin.pluginId);
}
if (plugin.containerModules && plugin.containerModules.length > 0) {
for (let module of plugin.containerModules) {
// 去重
if (!res.includes(module)) {
res.push(module);
const singletonPluginIds = new Set<string>();
const modules: interfaces.ContainerModule[] = plugins
.reduceRight((result: Plugin[], plugin: Plugin) => {
const shouldSkip = plugin.singleton && singletonPluginIds.has(plugin.pluginId);
if (plugin.singleton) {
singletonPluginIds.add(plugin.pluginId);
}
return shouldSkip ? result : [plugin, ...result];
}, [])
.reduce((res, plugin) => {
if (!pluginInitSet.has(plugin.pluginId)) {
plugin.initPlugin();
pluginInitSet.add(plugin.pluginId);
}
if (plugin.containerModules && plugin.containerModules.length > 0) {
for (let module of plugin.containerModules) {
// 去重
if (!res.includes(module)) {
res.push(module);
}
}
return res;
}
return res;
}
return res;
}, [] as interfaces.ContainerModule[]);
}, [] as interfaces.ContainerModule[]);
modules.forEach((module) => container.load(module));
plugins.forEach((plugin) => {
if (plugin.contributionKeys) {
@ -139,9 +149,10 @@ export function definePluginCreator<Options, CTX extends PluginContext = PluginC
config: {
containerModules?: interfaces.ContainerModule[];
contributionKeys?: interfaces.ServiceIdentifier[];
singleton?: boolean;
} & PluginConfig<Options, CTX>
): PluginCreator<Options> {
const { contributionKeys } = config;
const { contributionKeys, singleton = false } = config;
pluginIndex += 1;
const pluginId = `Playground_${pluginIndex}`;
return (opts: Options) => {
@ -150,6 +161,7 @@ export function definePluginCreator<Options, CTX extends PluginContext = PluginC
return {
pluginId,
singleton,
initPlugin: () => {
// 防止 plugin 被上层业务多次 init
if (isInit) {

1
packages/plugins/free-lines-plugin/src/create-free-lines-plugin.ts
View File

@ -6,6 +6,7 @@ import { WorkflowLinesLayer } from './layer';
import { WorkflowBezierLineContribution, WorkflowFoldLineContribution } from './contributions';
export const createFreeLinesPlugin = definePluginCreator({
singleton: true,
onInit: (ctx: PluginContext, opts: FreeLinesPluginOptions) => {
ctx.playground.registerLayer(WorkflowLinesLayer, {
...opts,