@yumerijs/core 1.1.3 → 1.2.1

package/dist/core.js

@@ -32,14 +32,11 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Core = void 0;
 /**
- * @time: 2025/07/12 18:14
- * @author: FireGuo & Manus
+ * @time: 2025/08/14 09:48
+ * @author: FireGuo
  * WindyPear-Team All right reserved
  **/
 const yaml = __importStar(require("js-yaml"));
@@ -48,8 +45,10 @@ const path = __importStar(require("path"));
 const config_1 = require("./config");
 const logger_1 = require("./logger");
 const command_1 = require("./command");
-const chokidar_1 = __importDefault(require("chokidar"));
+const chokidar = __importStar(require("chokidar"));
+const route_1 = require("./route");
 const context_1 = require("./context");
+const hook_1 = require("./hook");
 class Core {
     plugins = {};
     config = null;
@@ -57,21 +56,42 @@ class Core {
     eventListeners = {};
     components = {};
     commands = {};
+    routes = {};
     pluginLoader;
     logger = new logger_1.Logger('core');
     providedComponents = {};
-    pluginModules = {};
-    configPath = '';
     globalMiddlewares = {};
-    cmdtoplu = {};
-    comtoplu = {};
-    evttoplu = {};
-    mdwtoplu = {};
-    plftoplu = {};
     pluginStatus = {};
+    hooks = {};
+    pluginWatchers = {};
+    pluginModules = {};
+    configPath = '';
+    /**
+     * 插件名 -> Context 映射
+     */
+    pluginContexts = {};
     constructor(pluginLoader) {
         this.pluginLoader = pluginLoader;
     }
+    /**
+     * 获取或创建插件对应 Context
+     */
+    getContext(pluginName) {
+        if (!this.pluginContexts[pluginName]) {
+            this.pluginContexts[pluginName] = new context_1.Context(this, pluginName);
+        }
+        return this.pluginContexts[pluginName];
+    }
+    /**
+     * 清理指定插件注册的所有内容
+     */
+    unregall(pluginName) {
+        const ctx = this.pluginContexts[pluginName];
+        if (ctx) {
+            ctx.dispose();
+            delete this.pluginContexts[pluginName];
+        }
+    }
     /**
      * 加载配置文件
      * @param configPath 配置文件的路径
@@ -96,7 +116,7 @@ class Core {
      * @param configPath 配置文件的路径
      */
     watchConfig(configPath) {
-        const watcher = chokidar_1.default.watch(configPath, {
+        const watcher = chokidar.watch(configPath, {
             persistent: true,
             ignoreInitial: true,
             awaitWriteFinish: {
@@ -143,6 +163,7 @@ class Core {
     }
     /**
      * 加载所有在配置文件中启用的插件
+     * @returns Promise<void>
      */
     async loadPlugins() {
         if (!this.config || typeof this.config.plugins !== 'object' || this.config.plugins === null) {
@@ -162,6 +183,13 @@ class Core {
             }
         }
         const enabledPlugins = allPluginNames.filter(name => !name.startsWith('~'));
+        // 卸载配置中已禁用或移除的已加载插件
+        const currentlyLoaded = Object.keys(this.plugins);
+        for (const loadedName of currentlyLoaded) {
+            if (!enabledPlugins.includes(loadedName)) {
+                await this.unloadPlugin(loadedName);
+            }
+        }
         if (enabledPlugins.length === 0) {
             this.logger.info('No enabled plugins found in configuration.');
             return;
@@ -189,12 +217,9 @@ class Core {
         if (pendingPlugins.length > 0) {
             // this.logger.warn('Some plugins could not be loaded due to unresolved dependencies:', pendingPlugins);
         }
-        if (process.env.NODE_ENV === 'development') {
-            this.watchPlugins(this);
-        }
     }
     /**
-     * 导出的函数：加载单个插件
+     * 加载单个插件
      * @param pluginName 要加载的插件名
      * @param triggerPendingCheck 是否在加载后触发对其他待定插件的检查，默认为 true
      * @returns Promise<boolean> 是否加载成功
@@ -224,7 +249,7 @@ 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));
+                await pluginInstance.apply(this.getContext(pluginName), await this.getPluginConfig(pluginName));
             }
             // 注册提供的组件
             if (pluginInstance.provide) {
@@ -242,6 +267,30 @@ class Core {
             if (triggerPendingCheck) {
                 await this._loadPendingPlugins();
             }
+            // In development mode, watch the plugin for changes.
+            if (process.env.NODE_ENV === 'development') {
+                let pluginPathToWatch = null;
+                try {
+                    const pkgJsonPath = require.resolve(`${pluginName}/package.json`);
+                    pluginPathToWatch = path.dirname(pkgJsonPath);
+                }
+                catch (e) {
+                    const localPluginPath = path.resolve(process.cwd(), pluginName);
+                    const localPluginPathInPlugins = path.resolve(process.cwd(), 'plugins', pluginName);
+                    if (fs.existsSync(localPluginPath)) {
+                        pluginPathToWatch = localPluginPath;
+                    }
+                    else if (fs.existsSync(localPluginPathInPlugins)) {
+                        pluginPathToWatch = localPluginPathInPlugins;
+                    }
+                }
+                if (pluginPathToWatch) {
+                    this.watchPlugin(pluginName, pluginPathToWatch);
+                }
+                else {
+                    this.logger.warn(`Could not resolve path for plugin ${pluginName} to watch for changes.`);
+                }
+            }
             return true;
         }
         catch (err) {
@@ -251,7 +300,8 @@ class Core {
         }
     }
     /**
-     * 内部函数：尝试加载所有处于 PENDING 状态的插件
+     * 尝试加载所有处于 PENDING 状态的插件
+     * @returns Promise<void>
      */
     async _loadPendingPlugins() {
         const pendingPlugins = Object.keys(this.pluginStatus).filter(p => this.pluginStatus[p] === "pending" /* PluginStatus.PENDING */);
@@ -298,8 +348,9 @@ class Core {
         // await this._loadPendingPlugins();
     }
     /**
-     * 内部函数：执行单个插件的卸载逻辑
+     * 执行单个插件的卸载逻辑
      * @param pluginName 插件名
+     * @param ispending 是否处于 PENDING 状态
      */
     async _unloadSinglePlugin(pluginName, ispending = false) {
         if (this.pluginStatus[pluginName] !== "enabled" /* PluginStatus.ENABLED */) {
@@ -308,14 +359,18 @@ class Core {
         this.logger.info(`Unloading plugin "${pluginName}"...`);
         try {
             const plugin = this.plugins[pluginName];
-            if (plugin && plugin.disable) {
-                await plugin.disable(new context_1.Context(this, pluginName));
-            }
+            if (plugin && plugin.disable)
+                await plugin.disable(this.getContext(pluginName));
             await this.pluginLoader.unloadPlugin(pluginName);
             this.unregall(pluginName); // 清理该插件注册的所有内容
             delete this.plugins[pluginName];
             delete this.pluginModules[pluginName];
             this.pluginStatus[pluginName] = ispending ? "pending" /* PluginStatus.PENDING */ : "disabled" /* PluginStatus.DISABLED */;
+            // Stop watching the plugin directory
+            if (this.pluginWatchers[pluginName]) {
+                this.pluginWatchers[pluginName].close();
+                delete this.pluginWatchers[pluginName];
+            }
             this.emit('plugin-unloaded', pluginName);
         }
         catch (error) {
@@ -342,14 +397,17 @@ class Core {
         }
     }
     /**
-     * 监听插件文件变化，实现热更新
-     * @param core Core 实例
-     * @param pluginsDir 插件目录，默认为 'plugins'
+     * 监听插件文件变化
+     * @param pluginName 插件名称
+     * @param pluginPath 插件路径
      */
-    watchPlugins(core, pluginsDir = 'plugins') {
+    watchPlugin(pluginName, pluginPath) {
+        if (this.pluginWatchers[pluginName]) {
+            return; // Already watching
+        }
         const logger = new logger_1.Logger('hmr');
-        const watcher = chokidar_1.default.watch(pluginsDir, {
-            ignored: /(^|[/\\])\../,
+        const watcher = chokidar.watch(pluginPath, {
+            ignored: /(^|[\/])\../,
             persistent: true,
             ignoreInitial: true,
             awaitWriteFinish: {
@@ -357,34 +415,20 @@ class Core {
                 pollInterval: 100,
             },
         });
-        const getPluginNameFromPath = (changePath) => {
-            if (!changePath.endsWith('.ts') && !changePath.endsWith('.js'))
-                return null;
-            const parts = changePath.split(path.sep);
-            return parts.length > 1 ? parts[1] : null;
-        };
         watcher.on('change', async (changePath) => {
-            const pluginName = getPluginNameFromPath(changePath);
-            if (pluginName) {
-                logger.info(`Plugin file changed: ${changePath}`);
-                await core.reloadPlugin(pluginName);
-            }
+            logger.info(`Plugin file changed: ${changePath}`);
+            await this.reloadPlugin(pluginName);
         });
         watcher.on('add', async (changePath) => {
-            const pluginName = getPluginNameFromPath(changePath);
-            if (pluginName) {
-                logger.info(`New plugin file added: ${changePath}`);
-                await core.reloadPlugin(pluginName);
-            }
+            logger.info(`New file added to plugin ${pluginName}: ${changePath}`);
+            await this.reloadPlugin(pluginName);
         });
         watcher.on('unlink', async (changePath) => {
-            const pluginName = getPluginNameFromPath(changePath);
-            if (pluginName) {
-                logger.info(`Plugin file removed: ${changePath}`);
-                await core.unloadPlugin(pluginName);
-            }
+            logger.info(`File removed from plugin ${pluginName}: ${changePath}`);
+            await this.reloadPlugin(pluginName);
         });
-        logger.info(`Watching for plugin changes in ${pluginsDir}`);
+        this.pluginWatchers[pluginName] = watcher;
+        // logger.info(`Watching for changes in plugin: ${pluginName}`);
     }
     /**
      * 注册组件
@@ -414,7 +458,6 @@ class Core {
     unregisterComponent(name) {
         delete this.components[name];
         delete this.providedComponents[name];
-        delete this.comtoplu[name];
     }
     /**
      * 注册事件监听器
@@ -455,43 +498,101 @@ class Core {
         return this;
     }
     /**
-     * 注册命令
-     * @param name 命令名称
-     * @returns Command 实例
+     * @deprecated 已更改为路由
      */
     command(name) {
         const command = new command_1.Command(this, name);
         this.commands[name] = command;
         return command;
     }
+    /**
+     * 注册路由
+     * @param path 路由路径
+     * @returns Route 实例
+     */
+    route(path) {
+        const route = new route_1.Route(path);
+        this.routes[path] = route;
+        return route;
+    }
+    /**
+     * 注册 Hook 钩子
+     * @param name Hook 点名称
+     * @param hookname 钩子名称
+     * @param callback 钩子函数
+     */
+    hook(name, hookname, callback) {
+        if (!this.hooks[name]) {
+            this.hooks[name] = new hook_1.Hook(name);
+        }
+        this.hooks[name].add(hookname, callback);
+    }
+    /**
+     * 消除 Hook 钩子
+     */
+    unhook(name, hookname) {
+        if (this.hooks[name]) {
+            this.hooks[name].remove(hookname);
+        }
+    }
+    /**
+     * 执行 Hook 钩子
+     * @param name Hook 点名称
+     * @param args 参数
+     * @return Promise<any[]>
+     */
+    async hookExecute(name, ...args) {
+        if (this.hooks[name]) {
+            return await this.hooks[name].trigger(...args);
+        }
+        return [];
+    }
     /**
      * 执行命令
-     * @param name 命令名称
-     * @param session 会话对象
-     * @param args 传递给命令处理函数的参数
-     * @returns 会话对象或 null
+     * @deprecated
      */
     async executeCommand(name, session, ...args) {
         const command = this.commands[name];
         if (command) {
-            const globalMiddlewareList = Object.values(this.globalMiddlewares || {});
-            const commandMiddlewareList = command.middlewares || [];
-            const middlewares = [...globalMiddlewareList, ...commandMiddlewareList];
+            const middlewares = [...Object.values(this.globalMiddlewares), ...(command.middlewares || [])];
             let index = 0;
             const runner = async () => {
-                if (index < middlewares.length) {
-                    const middleware = middlewares[index++];
-                    await middleware(session, runner);
-                }
-                else {
+                if (index < middlewares.length)
+                    await middlewares[index++](session, runner);
+                else
                     await command.executeHandler(session, ...args);
-                }
             };
             await runner();
             return session;
         }
         return null;
     }
+    /**
+     * 执行路由
+     * @param pathname 需要匹配的URL
+     * @param session 当前会话
+     * @param queryParams URL参数
+     * @returns 是否匹配成功
+     */
+    async executeRoute(pathname, session, queryParams) {
+        for (const routePath in this.routes) {
+            const route = this.routes[routePath];
+            const result = route.match(pathname);
+            if (result) {
+                const middlewares = [...Object.values(this.globalMiddlewares), ...(route.middlewares || [])];
+                let index = 0;
+                const runner = async () => {
+                    if (index < middlewares.length)
+                        await middlewares[index++](session, runner);
+                    else
+                        await route.executeHandler(session, queryParams, result.pathParams);
+                };
+                await runner();
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * 注册平台
      * @param platform 平台实例
@@ -501,44 +602,6 @@ class Core {
         this.platforms.push(platform);
         return platform.startPlatform(this);
     }
-    /**
-     * 清理指定插件注册的所有内容
-     * @param pluginname 插件名称
-     */
-    unregall(pluginname) {
-        // 清理 commands
-        Object.keys(this.cmdtoplu)
-            .filter(cmd => this.cmdtoplu[cmd] === pluginname)
-            .forEach(cmd => {
-            delete this.cmdtoplu[cmd];
-            delete this.commands[cmd];
-        });
-        // 清理 components 和 providedComponents
-        Object.keys(this.comtoplu)
-            .filter(comp => this.comtoplu[comp] === pluginname)
-            .forEach(comp => {
-            delete this.comtoplu[comp];
-            delete this.components[comp];
-            delete this.providedComponents[comp];
-        });
-        // 清理 event listeners
-        for (const evt in this.evttoplu) {
-            if (this.evttoplu[evt][pluginname]) {
-                const pluginListeners = this.evttoplu[evt][pluginname] || [];
-                if (this.eventListeners[evt]) {
-                    this.eventListeners[evt] = this.eventListeners[evt].filter(l => !pluginListeners.includes(l));
-                }
-                delete this.evttoplu[evt][pluginname];
-            }
-        }
-        // 清理 middlewares
-        Object.keys(this.mdwtoplu)
-            .filter(mdw => this.mdwtoplu[mdw] === pluginname)
-            .forEach(mdw => {
-            delete this.mdwtoplu[mdw];
-            delete this.globalMiddlewares[mdw];
-        });
-    }
     /**
      * 获取命令
      * @param name 命令名称
@@ -547,5 +610,19 @@ class Core {
     getCommand(name) {
         return this.commands[name] || null;
     }
+    /**
+     * 获取路由
+     * @param path 匹配路径
+     * @return Route 实例或 false
+     */
+    getRoute(path) {
+        for (const routePath in this.routes) {
+            const route = this.routes[routePath];
+            if (route.match(path)) {
+                return route;
+            }
+        }
+        return false;
+    }
 }
 exports.Core = Core;

package/dist/hook.d.ts

@@ -0,0 +1,39 @@
+/**
+ * @time: 2025/08/14 18:33
+ * @author: FireGuo
+ * WindyPear-Team All right reserved
+ **/
+/**
+ * Hook 处理器
+ */
+export type HookHandler = (...args: any[]) => Promise<any>;
+/**
+ * Hook 类
+ */
+export declare class Hook {
+    name: string;
+    handlers: Record<string, HookHandler>;
+    /**
+     * 创建 Hook 实例
+     * @param name Hook 名称
+     */
+    constructor(name: string);
+    /**
+     * 添加 Hook 函数
+     * @param name Hook 函数名称
+     * @param handler Hook 函数
+     */
+    add(name: string, handler: HookHandler): void;
+    /**
+     * 删除 Hook 函数
+     * @param name Hook 函数名称
+     */
+    remove(name: string): void;
+    /**
+     * 触发 Hook 函数
+     * @param session 会话
+     * @param args 参数
+     * @returns 执行结果
+     */
+    trigger(...args: any[]): Promise<any[]>;
+}

package/dist/hook.js

@@ -0,0 +1,51 @@
+"use strict";
+/**
+ * @time: 2025/08/14 18:33
+ * @author: FireGuo
+ * WindyPear-Team All right reserved
+ **/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Hook = void 0;
+/**
+ * Hook 类
+ */
+class Hook {
+    name;
+    handlers = {};
+    /**
+     * 创建 Hook 实例
+     * @param name Hook 名称
+     */
+    constructor(name) {
+        this.name = name;
+    }
+    /**
+     * 添加 Hook 函数
+     * @param name Hook 函数名称
+     * @param handler Hook 函数
+     */
+    add(name, handler) {
+        this.handlers[name] = handler;
+    }
+    /**
+     * 删除 Hook 函数
+     * @param name Hook 函数名称
+     */
+    remove(name) {
+        delete this.handlers[name];
+    }
+    /**
+     * 触发 Hook 函数
+     * @param session 会话
+     * @param args 参数
+     * @returns 执行结果
+     */
+    async trigger(...args) {
+        let result;
+        for (const handler of Object.values(this.handlers)) {
+            result.push(handler(...args));
+        }
+        return result;
+    }
+}
+exports.Hook = Hook;

package/dist/index.d.ts

@@ -1,12 +1,14 @@
 /**
- * @time: 2025/03/24 12:26
+ * @time: 2025/08/14 09:48
  * @author: FireGuo
  * WindyPear-Team All right reserved
  **/
 export * from './core';
 export * from './session';
 export * from './command';
+export * from './route';
 export * from './config';
 export * from './logger';
 export * from './platform';
 export * from './context';
+export * from './hook';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * @time: 2025/03/24 12:26
+ * @time: 2025/08/14 09:48
  * @author: FireGuo
  * WindyPear-Team All right reserved
  **/
@@ -22,7 +22,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./core"), exports);
 __exportStar(require("./session"), exports);
 __exportStar(require("./command"), exports);
+__exportStar(require("./route"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./platform"), exports);
 __exportStar(require("./context"), exports);
+__exportStar(require("./hook"), exports);

package/dist/logger.d.ts

@@ -1,8 +1,8 @@
 /**
- * @time: 2025/03/25 18:01
+ * @time: 2025/08/14 09:48
  * @author: FireGuo
  * WindyPear-Team All right reserved
- */
+ **/
 import { Core } from './core';
 export declare class Logger {
     private title;
@@ -12,6 +12,7 @@ export declare class Logger {
     static setCore(core: Core): void;
     constructor(title: string);
     private getRandomColor;
+    private getTimestamp;
     private log;
     info(...args: any[]): void;
     warn(...args: any[]): void;