@yumerijs/core 1.1.2 → 1.1.3

package/dist/core.d.ts

@@ -81,7 +81,7 @@ export declare class Core {
      * @param triggerPendingCheck 是否在加载后触发对其他待定插件的检查，默认为 true
      * @returns Promise<boolean> 是否加载成功
      */
-    loadSinglePlugin(pluginName: string, triggerPendingCheck?: boolean): Promise<boolean>;
+    loadSinglePlugin(pluginName: string, triggerPendingCheck?: boolean, onlypending?: boolean): Promise<boolean>;
     /**
      * 内部函数：尝试加载所有处于 PENDING 状态的插件
      */
@@ -90,7 +90,7 @@ export declare class Core {
      * 卸载插件，并递归卸载依赖于它的其他插件
      * @param pluginNameToUnload 要卸载的插件名
      */
-    unloadPlugin(pluginNameToUnload: string): Promise<void>;
+    unloadPlugin(pluginNameToUnload: string, ispending?: boolean): Promise<void>;
     /**
      * 内部函数：执行单个插件的卸载逻辑
      * @param pluginName 插件名

package/dist/core.js

@@ -199,13 +199,13 @@ class Core {
      * @param triggerPendingCheck 是否在加载后触发对其他待定插件的检查，默认为 true
      * @returns Promise<boolean> 是否加载成功
      */
-    async loadSinglePlugin(pluginName, triggerPendingCheck = true) {
+    async loadSinglePlugin(pluginName, triggerPendingCheck = true, onlypending = false) {
         // 如果插件不存在于状态记录中（例如，动态添加），则设为 PENDING
         if (!this.pluginStatus[pluginName]) {
             this.pluginStatus[pluginName] = "pending" /* PluginStatus.PENDING */;
         }
         // 只有 PENDING 状态的插件才能被加载
-        if (this.pluginStatus[pluginName] !== "pending" /* PluginStatus.PENDING */) {
+        if (this.pluginStatus[pluginName] !== "pending" /* PluginStatus.PENDING */ && onlypending) {
             // this.logger.info(`Plugin "${pluginName}" is not in a pending state (current: ${this.pluginStatus[pluginName]}). Skipping load.`);
             return false;
         }
@@ -223,8 +223,8 @@ class Core {
             // 依赖满足，开始加载
             this.plugins[pluginName] = pluginInstance;
             if (pluginInstance.apply) {
+                this.pluginLoader.logger.info(`Apply plugin "${pluginName}"`);
                 await pluginInstance.apply(new context_1.Context(this, pluginName), await this.getPluginConfig(pluginName));
-                this.pluginLoader.logger.info(`Applied plugin "${pluginName}"`);
             }
             // 注册提供的组件
             if (pluginInstance.provide) {
@@ -238,7 +238,6 @@ class Core {
                 }
             }
             this.pluginStatus[pluginName] = "enabled" /* PluginStatus.ENABLED */; // 更新状态为已启用
-            // this.logger.info(`Plugin "${pluginName}" loaded successfully.`);
             // 加载成功后，检查是否可以加载其他等待中的插件
             if (triggerPendingCheck) {
                 await this._loadPendingPlugins();
@@ -267,7 +266,7 @@ class Core {
      * 卸载插件，并递归卸载依赖于它的其他插件
      * @param pluginNameToUnload 要卸载的插件名
      */
-    async unloadPlugin(pluginNameToUnload) {
+    async unloadPlugin(pluginNameToUnload, ispending = false) {
         // 1. 找出所有直接或间接依赖于此插件的插件
         const dependents = [];
         const pluginsToCheck = [pluginNameToUnload];
@@ -291,10 +290,10 @@ class Core {
         }
         // 2. 卸载所有依赖者
         for (const dependentName of dependents) {
-            await this._unloadSinglePlugin(dependentName);
+            await this.unloadPlugin(dependentName, true);
         }
         // 3. 最后卸载目标插件
-        await this._unloadSinglePlugin(pluginNameToUnload);
+        await this._unloadSinglePlugin(pluginNameToUnload, ispending);
         // 4. 卸载完成后，尝试重新加载处于 PENDING 状态的插件
         // await this._loadPendingPlugins();
     }
@@ -302,7 +301,7 @@ class Core {
      * 内部函数：执行单个插件的卸载逻辑
      * @param pluginName 插件名
      */
-    async _unloadSinglePlugin(pluginName) {
+    async _unloadSinglePlugin(pluginName, ispending = false) {
         if (this.pluginStatus[pluginName] !== "enabled" /* PluginStatus.ENABLED */) {
             return; // 只卸载已启用的插件
         }
@@ -316,11 +315,8 @@ class Core {
             this.unregall(pluginName); // 清理该插件注册的所有内容
             delete this.plugins[pluginName];
             delete this.pluginModules[pluginName];
-            // 更新状态为 PENDING，因为它的配置仍然是启用的
-            // 如果它被其他插件依赖，当那个插件被卸载时，它也会被重新评估
-            this.pluginStatus[pluginName] = "pending" /* PluginStatus.PENDING */;
+            this.pluginStatus[pluginName] = ispending ? "pending" /* PluginStatus.PENDING */ : "disabled" /* PluginStatus.DISABLED */;
             this.emit('plugin-unloaded', pluginName);
-            // this.logger.info(`Plugin "${pluginName}" unloaded.`);
         }
         catch (error) {
             this.logger.error(`Failed to unload plugin "${pluginName}":`, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/core",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",