@chatbi-v/core 2.1.2 → 2.1.4

package/dist/index.d.mts

@@ -1073,6 +1073,8 @@ declare class PluginManager {
     private sharedContext;
     /** 收集到的插件工具函数集合 */
     private utils;
+    /** 是否正在初始化插件中，防止重入导致多次加载 */
+    private isInitializing;
     /**
      * 构造函数
      * @param storage - 底层存储适配器
@@ -1220,8 +1222,9 @@ declare class PluginManager {
      * 加载插件列表
      * @param configs 插件配置
      * @param registry 插件注册表 (动态导入函数)
+     * @param notify 是否在加载完成后触发通知，默认为 true
      */
-    loadPlugins(configs: Record<string, any>, registry: Record<string, () => Promise<any>>): Promise<void>;
+    loadPlugins(configs: Record<string, any>, registry: Record<string, () => Promise<any>>, notify?: boolean): Promise<void>;
     /**
      * 加载远程插件
      * @param pluginId 插件 ID

package/dist/index.d.ts

@@ -1073,6 +1073,8 @@ declare class PluginManager {
     private sharedContext;
     /** 收集到的插件工具函数集合 */
     private utils;
+    /** 是否正在初始化插件中，防止重入导致多次加载 */
+    private isInitializing;
     /**
      * 构造函数
      * @param storage - 底层存储适配器
@@ -1220,8 +1222,9 @@ declare class PluginManager {
      * 加载插件列表
      * @param configs 插件配置
      * @param registry 插件注册表 (动态导入函数)
+     * @param notify 是否在加载完成后触发通知，默认为 true
      */
-    loadPlugins(configs: Record<string, any>, registry: Record<string, () => Promise<any>>): Promise<void>;
+    loadPlugins(configs: Record<string, any>, registry: Record<string, () => Promise<any>>, notify?: boolean): Promise<void>;
     /**
      * 加载远程插件
      * @param pluginId 插件 ID

package/dist/index.js

@@ -1382,6 +1382,8 @@ var PluginManager = class {
   sharedContext = null;
   /** 收集到的插件工具函数集合 */
   utils = {};
+  /** 是否正在初始化插件中，防止重入导致多次加载 */
+  isInitializing = false;
   /**
    * 构造函数
    * @param storage - 底层存储适配器
@@ -1784,58 +1786,69 @@ var PluginManager = class {
    * @param sharedContext 共享上下文
    */
   async initPlugins(sharedContext = {}) {
-    this.sharedContext = {
-      ...sharedContext,
-      events: this.eventBus
-    };
-    this.plugins.forEach((plugin) => {
-      if (!this.isPluginEnabled(plugin.id)) return;
-      if (!this.runtimes.has(plugin.id)) {
-        const runtime = new PluginRuntime(plugin, this.sharedContext, this.storageManager);
-        this.runtimes.set(plugin.id, runtime);
-      }
-    });
-    const sortedPluginIds = this.getSortedPluginIds();
-    const missingDeps = /* @__PURE__ */ new Map();
-    const idsToLoad = new Set(sortedPluginIds);
-    for (const id of sortedPluginIds) {
-      const plugin = this.plugins.get(id);
-      if (plugin?.metadata.dependencies) {
-        const missing = plugin.metadata.dependencies.filter((depId) => !this.runtimes.has(depId));
-        if (missing.length > 0) {
-          missingDeps.set(id, missing);
-          idsToLoad.delete(id);
-          this.runtimes.delete(id);
-        }
-      }
+    if (this.isInitializing) {
+      logger6.warn("PluginManager is already initializing, skipping...");
+      return;
     }
-    if (missingDeps.size > 0) {
-      missingDeps.forEach((deps, id) => {
-        logger6.error(`\u63D2\u4EF6 ${id} \u65E0\u6CD5\u52A0\u8F7D\uFF0C\u7F3A\u5931\u4F9D\u8D56: ${deps.join(", ")}`);
+    this.isInitializing = true;
+    try {
+      this.sharedContext = {
+        ...sharedContext,
+        events: this.eventBus
+      };
+      this.plugins.forEach((plugin) => {
+        if (!this.isPluginEnabled(plugin.id)) return;
+        if (!this.runtimes.has(plugin.id)) {
+          const runtime = new PluginRuntime(plugin, this.sharedContext, this.storageManager);
+          this.runtimes.set(plugin.id, runtime);
+        }
       });
-    }
-    for (const id of sortedPluginIds) {
-      if (!idsToLoad.has(id)) continue;
-      const runtime = this.runtimes.get(id);
-      if (runtime) {
-        try {
-          logger6.info(`[PluginManager] invoking onLoad for ${id}`);
-          await runtime.load();
-          logger6.info(`[PluginManager] onLoad completed for ${id}`);
-        } catch (e) {
-          logger6.error(`\u63D2\u4EF6 ${id} \u52A0\u8F7D\u5931\u8D25:`, e);
+      const sortedPluginIds = this.getSortedPluginIds();
+      const missingDeps = /* @__PURE__ */ new Map();
+      const idsToLoad = new Set(sortedPluginIds);
+      for (const id of sortedPluginIds) {
+        const plugin = this.plugins.get(id);
+        if (plugin?.metadata.dependencies) {
+          const missing = plugin.metadata.dependencies.filter((depId) => !this.runtimes.has(depId));
+          if (missing.length > 0) {
+            missingDeps.set(id, missing);
+            idsToLoad.delete(id);
+            this.runtimes.delete(id);
+          }
         }
       }
-    }
-    for (const id of sortedPluginIds) {
-      const runtime = this.runtimes.get(id);
-      if (runtime) {
-        try {
-          await runtime.mount();
-        } catch (e) {
-          logger6.error(`\u63D2\u4EF6 ${id} \u6302\u8F7D\u5931\u8D25:`, e);
+      if (missingDeps.size > 0) {
+        missingDeps.forEach((deps, id) => {
+          logger6.error(`\u63D2\u4EF6 ${id} \u65E0\u6CD5\u52A0\u8F7D\uFF0C\u7F3A\u5931\u4F9D\u8D56: ${deps.join(", ")}`);
+        });
+      }
+      for (const id of sortedPluginIds) {
+        if (!idsToLoad.has(id)) continue;
+        const runtime = this.runtimes.get(id);
+        if (runtime && runtime.status === "initial") {
+          try {
+            logger6.info(`[PluginManager] invoking onLoad for ${id}`);
+            await runtime.load();
+            logger6.info(`[PluginManager] onLoad completed for ${id}`);
+          } catch (e) {
+            logger6.error(`\u63D2\u4EF6 ${id} \u52A0\u8F7D\u5931\u8D25:`, e);
+          }
+        }
+      }
+      for (const id of sortedPluginIds) {
+        if (!idsToLoad.has(id)) continue;
+        const runtime = this.runtimes.get(id);
+        if (runtime && (runtime.status === "loaded" || runtime.status === "initial")) {
+          try {
+            await runtime.mount();
+          } catch (e) {
+            logger6.error(`\u63D2\u4EF6 ${id} \u6302\u8F7D\u5931\u8D25:`, e);
+          }
         }
       }
+    } finally {
+      this.isInitializing = false;
+      this.notify();
     }
   }
   /**
@@ -1882,8 +1895,9 @@ var PluginManager = class {
    * 加载插件列表
    * @param configs 插件配置
    * @param registry 插件注册表 (动态导入函数)
+   * @param notify 是否在加载完成后触发通知，默认为 true
    */
-  async loadPlugins(configs, registry) {
+  async loadPlugins(configs, registry, notify = true) {
     logger6.info("\u5F00\u59CB\u52A0\u8F7D\u63D2\u4EF6...");
     const localLoadPromises = Object.entries(registry).map(async ([registryId, importFn]) => {
       try {
@@ -1917,7 +1931,9 @@ var PluginManager = class {
         this.register(plugin, false);
       }
     });
-    this.notify();
+    if (notify) {
+      this.notify();
+    }
     logger6.info(`\u63D2\u4EF6\u52A0\u8F7D\u5B8C\u6210\uFF0C\u5171\u52A0\u8F7D ${this.plugins.size} \u4E2A\u63D2\u4EF6`);
   }
   /**
@@ -2762,7 +2778,7 @@ var usePluginLoader = (options) => {
           const { configManager: configManager2 } = await Promise.resolve().then(() => (init_config_manager(), config_manager_exports));
           configManager2.set("system", options.systemConfig);
         }
-        await pluginManager.loadPlugins(pluginConfigs, finalRegistry);
+        await pluginManager.loadPlugins(pluginConfigs, finalRegistry, false);
         await pluginManager.initPlugins(sharedContext);
         setPluginsLoaded(true);
         logger10.info("Plugins loaded successfully");