@yumerijs/loader 2.0.1 → 2.0.3

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { Core, Config, Logger, Context, PluginStatus } from '@yumerijs/core';
-import 'esbuild-register';
 interface Plugin {
     apply: (ctx: Context, config: Config) => Promise<void>;
     disable: (ctx: Context) => Promise<void>;
@@ -24,17 +23,25 @@ export declare class PluginLoader {
     private pluginContexts;
     private isDev;
     constructor(core?: Core, pluginsDir?: string);
+    /**
+     * Reloads the config file from disk into memory and emits a 'config-reloaded' event.
+     * This does NOT reload any plugins.
+     */
+    reloadConfigFile(): Promise<void>;
     getCore(): Core;
     getContext(pluginName: string): Context;
     unregall(pluginName: string): void;
     loadConfig(configPath: string): Promise<void>;
-    private watchConfig;
     getPluginConfig(pluginName: string): Promise<Config>;
     loadPlugins(): Promise<void>;
     loadSinglePlugin(pluginName: string, triggerPendingCheck?: boolean, onlypending?: boolean): Promise<boolean>;
     private _loadPendingPlugins;
     unloadPlugin(pluginNameToUnload: string, ispending?: boolean): Promise<void>;
     private _unloadSinglePlugin;
+    /**
+     * Reloads a single plugin's code by clearing the require cache and then reloading it.
+     * @param pluginName The name of the plugin to reload.
+     */
     reloadPlugin(pluginName: string): Promise<void>;
     private watchPlugin;
     loadModule(pluginName: string): Promise<Plugin>;

package/dist/index.js

@@ -41,7 +41,6 @@ const util_1 = require("util");
 const child_process_1 = require("child_process");
 const yaml = __importStar(require("js-yaml"));
 const chokidar = __importStar(require("chokidar"));
-require("esbuild-register");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 class PluginLoader {
     pluginsDir;
@@ -57,9 +56,28 @@ class PluginLoader {
     isDev = false;
     constructor(core, pluginsDir = 'plugins') {
         this.pluginsDir = pluginsDir;
-        this.core = core || new core_1.Core(undefined, false);
+        this.core = core || new core_1.Core(this, undefined, false);
+        this.core.uuid = Math.random().toString(36).substring(2);
+        this.logger.info(`[DIAG] Loader created/received Core instance with UUID: ${this.core.uuid}`);
         this.isDev = process.env.NODE_ENV === 'development';
-        core_1.Logger.setCore(this.core); // Set the core instance for the logger
+        core_1.Logger.setCore(this.core);
+    }
+    /**
+     * Reloads the config file from disk into memory and emits a 'config-reloaded' event.
+     * This does NOT reload any plugins.
+     */
+    async reloadConfigFile() {
+        this.logger.info('Reloading config file...');
+        try {
+            const doc = yaml.load(fs.readFileSync(this.configPath, 'utf8'));
+            this.config = doc;
+            this.core.coreConfig = this.config.core || {};
+            this.core.emit('config-reloaded', this.config);
+            this.logger.info('Config file reloaded.');
+        }
+        catch (e) {
+            this.logger.error('Failed to reload config file:', e);
+        }
     }
     getCore() {
         return this.core;
@@ -83,9 +101,6 @@ class PluginLoader {
             const doc = yaml.load(fs.readFileSync(configPath, 'utf8'));
             this.config = doc;
             this.logger.info('Config loaded.');
-            if (this.isDev) {
-                this.watchConfig(configPath);
-            }
             this.core.coreConfig = this.config.core || {};
             this.core.i18n = new (require('@yumerijs/core').I18n)(this.core.coreConfig.lang || ['zh', 'en']);
         }
@@ -94,42 +109,8 @@ class PluginLoader {
             throw e;
         }
     }
-    watchConfig(configPath) {
-        const watcher = chokidar.watch(configPath, {
-            persistent: true,
-            ignoreInitial: true,
-            awaitWriteFinish: {
-                stabilityThreshold: 300,
-                pollInterval: 100,
-            },
-        });
-        watcher.on('change', async () => {
-            try {
-                const doc = yaml.load(fs.readFileSync(configPath, 'utf8'));
-                if (doc && doc.plugins) {
-                    this.config.plugins = doc.plugins;
-                }
-                await this.core.emit('config-changed', this.config);
-            }
-            catch (error) {
-                this.logger.error('Failed to reload config:', error);
-            }
-        });
-        this.logger.info(`Watching for config changes at ${configPath}`);
-    }
     async getPluginConfig(pluginName) {
         const actualPluginName = pluginName.startsWith('~') ? pluginName.substring(1) : pluginName;
-        if (this.configPath && this.isDev) {
-            try {
-                const doc = yaml.load(fs.readFileSync(this.configPath, 'utf8'));
-                if (doc && doc.plugins) {
-                    this.config.plugins = doc.plugins;
-                }
-            }
-            catch (error) {
-                this.logger.warn('Failed to refresh config for hot reload:', error);
-            }
-        }
         if (!this.config.plugins[actualPluginName]) {
             return new core_1.Config(actualPluginName);
         }
@@ -201,7 +182,6 @@ class PluginLoader {
             this.plugins[pluginName] = pluginInstance;
             const pluginConfig = await this.getPluginConfig(pluginName);
             const context = this.getContext(pluginName);
-            // The new API
             await this.core.plugin(pluginInstance, context, pluginConfig);
             this.pluginStatus[pluginName] = "enabled" /* PluginStatus.ENABLED */;
             if (triggerPendingCheck) {
@@ -293,7 +273,13 @@ class PluginLoader {
             this.logger.error(`Failed to unload plugin "${pluginName}":`, error);
         }
     }
+    /**
+     * Reloads a single plugin's code by clearing the require cache and then reloading it.
+     * @param pluginName The name of the plugin to reload.
+     */
     async reloadPlugin(pluginName) {
+        this.logger.info(`Reloading plugin code for "${pluginName}"...`);
+        this.clearRequireCache(pluginName, new Set());
         await this.unloadPlugin(pluginName);
         const success = await this.loadSinglePlugin(pluginName);
         if (success) {
@@ -332,9 +318,6 @@ class PluginLoader {
         this.pluginWatchers[pluginName] = watcher;
     }
     async loadModule(pluginName) {
-        if (this.isDev) {
-            this.clearRequireCache(pluginName, new Set());
-        }
         const plugin = await require(pluginName);
         return plugin.default || plugin;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/loader",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,14 +27,17 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.13.10",
+    "@yumerijs/core": "^2.0.1",
     "esbuild": "^0.25.9",
     "esbuild-register": "^3.6.0",
     "typescript": "^5.8.2"
   },
   "dependencies": {
     "@types/js-yaml": "^4.0.9",
-    "@yumerijs/core": "^2.0.1",
     "chokidar": "^4.0.3",
     "js-yaml": "^4.1.0"
+  },
+  "peerDependencies": {
+    "@yumerijs/core": "^2.0.2"
   }
 }