@yumerijs/core 1.3.3 → 2.0.0

package/dist/context.d.ts

@@ -1,5 +1,5 @@
 /**
- * @time: 2025/08/14 19:10
+ * @time: 2025/10/25 01:30
  * @author: FireGuo
  * WindyPear-Team All right reserved
  **/
@@ -7,6 +7,13 @@ import { Core } from './core';
 import { Route } from './route';
 import { HookHandler } from './hook';
 import { Middleware } from './middleware';
+import { Config } from './config';
+interface Plugin {
+    apply: (ctx: Context, config: Config) => Promise<void>;
+    disable: (ctx: Context) => Promise<void>;
+    depend: Array<string>;
+    provide: Array<string>;
+}
 /**
  * 插件上下文对象
  * 每个插件一个 Context，用于管理插件注册的命令、路由、事件、组件和中间件
@@ -18,9 +25,10 @@ export declare class Context {
     private components;
     private middlewares;
     private hooks;
-    /**
-     * 插件名称
-     */
+    private childContexts;
+    private childPlugins;
+    private i18ns;
+    /** 插件名称 */
     pluginname: string;
     /**
      * 创建 Context 实例
@@ -57,25 +65,19 @@ export declare class Context {
      * 执行 Hook 钩子
      * @param name Hook 点名称
      * @param args Hook 参数
-     * @returns Promise<any[]>
      */
     executeHook(name: string, ...args: any[]): Promise<any[]>;
-    /**
-     * 获取 Core 实例
-     * @returns Core
-     */
+    /** 获取 Core 实例 */
     getCore(): Core;
     /**
      * 触发事件
      * @param event 事件名称
      * @param args 事件参数
-     * @returns Promise<void>
      */
     emit(event: string, ...args: any[]): Promise<void>;
     /**
      * 获取组件实例
      * @param name 组件名称
-     * @returns 组件实例
      */
     getComponent(name: string): any;
     /**
@@ -84,9 +86,26 @@ export declare class Context {
      * @param component 组件实例
      */
     registerComponent(name: string, component: any): void;
+    /**
+     * 注册子 Context
+     * @param name 子 Context 名称
+     */
+    fork(name?: string): Context;
+    /**
+     * 注册子插件
+     * @param plugin 插件实例
+     * @param config 插件配置
+     */
+    apply(plugin: Plugin, config: Config): Promise<void>;
+    /**
+     * 注册 i18n
+     * @param content 内容（可以是嵌套对象或单个key）
+     * @param locale 可选的语言映射
+     */
+    i18n(content: string | Record<string, any>, locale?: Record<string, string>): void;
     /**
      * 卸载插件时清理注册的所有资源
-     * 包括组件、路由、中间件和事件监听器
      */
-    dispose(): void;
+    dispose(): Promise<void>;
 }
+export {};

package/dist/context.js

@@ -1,4 +1,9 @@
 "use strict";
+/**
+ * @time: 2025/10/25 01:30
+ * @author: FireGuo
+ * WindyPear-Team All right reserved
+ **/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
 const route_1 = require("./route");
@@ -13,9 +18,10 @@ class Context {
     components = [];
     middlewares = [];
     hooks = {};
-    /**
-     * 插件名称
-     */
+    childContexts = [];
+    childPlugins = new Map();
+    i18ns = [];
+    /** 插件名称 */
     pluginname;
     /**
      * 创建 Context 实例
@@ -25,6 +31,7 @@ class Context {
     constructor(core, pluginname) {
         this.core = core;
         this.pluginname = pluginname;
+        this.childPlugins = new Map();
     }
     /**
      * 注册路由
@@ -45,9 +52,9 @@ class Context {
      * @param listener 事件监听器
      */
     on(name, listener) {
-        // 记录插件自己的事件监听器
+        if (!listener)
+            return;
         this.eventlisteners.push({ name, listener });
-        // 注册到 core 的全局事件监听器中
         this.core.on(name, listener);
     }
     /**
@@ -56,6 +63,8 @@ class Context {
      * @param callback 中间件回调函数
      */
     use(name, callback) {
+        if (!callback)
+            return;
         this.middlewares.push(name);
         this.core.use(name, callback);
     }
@@ -66,22 +75,22 @@ class Context {
      * @param callback 钩子回调函数
      */
     hook(name, hookname, callback) {
+        if (!callback || !hookname)
+            return;
         this.core.hook(name, hookname, callback);
+        if (!this.hooks[name])
+            this.hooks[name] = [];
         this.hooks[name].push(hookname);
     }
     /**
      * 执行 Hook 钩子
      * @param name Hook 点名称
      * @param args Hook 参数
-     * @returns Promise<any[]>
      */
     async executeHook(name, ...args) {
         return await this.core.hookExecute(name, ...args);
     }
-    /**
-     * 获取 Core 实例
-     * @returns Core
-     */
+    /** 获取 Core 实例 */
     getCore() {
         return this.core;
     }
@@ -89,7 +98,6 @@ class Context {
      * 触发事件
      * @param event 事件名称
      * @param args 事件参数
-     * @returns Promise<void>
      */
     async emit(event, ...args) {
         return await this.core.emit(event, ...args);
@@ -97,7 +105,6 @@ class Context {
     /**
      * 获取组件实例
      * @param name 组件名称
-     * @returns 组件实例
      */
     getComponent(name) {
         return this.core.getComponent(name);
@@ -108,6 +115,8 @@ class Context {
      * @param component 组件实例
      */
     registerComponent(name, component) {
+        if (!component)
+            return;
         if (this.core.components[name]) {
             this.core.logger.warn(`Plugin "${this.pluginname}" attempt to register component "${name}", but it has already been registered.`);
             return;
@@ -115,41 +124,107 @@ class Context {
         this.core.components[name] = component;
         this.components.push(name);
     }
+    /**
+     * 注册子 Context
+     * @param name 子 Context 名称
+     */
+    fork(name = this.pluginname) {
+        const ctx = new Context(this.core, name);
+        this.childContexts.push(ctx);
+        return ctx;
+    }
+    /**
+     * 注册子插件
+     * @param plugin 插件实例
+     * @param config 插件配置
+     */
+    async apply(plugin, config) {
+        if (!plugin || !plugin.apply)
+            return;
+        const ctx = this.fork();
+        await plugin.apply(ctx, config);
+        this.childPlugins.set(ctx, plugin);
+    }
+    /**
+     * 注册 i18n
+     * @param content 内容（可以是嵌套对象或单个key）
+     * @param locale 可选的语言映射
+     */
+    i18n(content, locale) {
+        if (!this.i18ns)
+            this.i18ns = [];
+        const isLangObject = (obj) => typeof obj === 'object' && Object.values(obj).every(v => typeof v === 'string');
+        const flatten = (obj, prefix = '') => {
+            const result = {};
+            for (const [key, value] of Object.entries(obj)) {
+                const fullKey = prefix ? `${prefix}.${key}` : key;
+                if (isLangObject(value)) {
+                    result[fullKey] = value;
+                }
+                else if (typeof value === 'object') {
+                    Object.assign(result, flatten(value, fullKey));
+                }
+            }
+            return result;
+        };
+        if (typeof content === 'string' && locale) {
+            this.core.i18n.register(content, locale);
+            this.i18ns.push(content);
+        }
+        else if (typeof content === 'object') {
+            const flat = flatten(content);
+            this.core.i18n.register(flat);
+            this.i18ns.push(...Object.keys(flat));
+        }
+    }
     /**
      * 卸载插件时清理注册的所有资源
-     * 包括组件、路由、中间件和事件监听器
      */
-    dispose() {
+    async dispose() {
         // 删除组件
-        this.components.forEach((name) => {
-            delete this.core.components[name];
-        });
+        this.components.forEach((name) => delete this.core.components[name]);
         // 删除路由
-        this.routes.forEach((route) => {
-            delete this.core.routes[route];
-        });
+        this.routes.forEach((route) => delete this.core.routes[route]);
         // 删除中间件
-        this.middlewares.forEach((middleware) => {
-            delete this.core.globalMiddlewares[middleware];
-        });
+        this.middlewares.forEach((middleware) => delete this.core.globalMiddlewares[middleware]);
         // 删除事件监听器
         this.eventlisteners.forEach(({ name, listener }) => {
-            if (this.core.eventListeners?.[name]) {
-                this.core.eventListeners[name] =
-                    this.core.eventListeners[name].filter((l) => l !== listener);
+            const listeners = this.core.eventListeners?.[name];
+            if (listeners) {
+                this.core.eventListeners[name] = listeners.filter(l => l !== listener);
             }
         });
         // 删除钩子
         for (const hook in this.hooks) {
             this.hooks[hook].forEach((hookname) => {
-                this.core.unhook(hook, hookname);
+                if (hookname)
+                    this.core.unhook(hook, hookname);
             });
         }
-        // 清空 Context 内部记录，避免内存泄漏
+        // 卸载子插件（异步即可，不必按顺序）
+        this.childPlugins.forEach(async (plugin, ctx) => {
+            if (plugin?.disable)
+                await plugin.disable(ctx);
+        });
+        // 删除子上下文
+        this.childContexts.forEach((ctx) => {
+            if (ctx?.dispose)
+                ctx.dispose();
+        });
+        // 删除i18n
+        if (this.i18ns?.length) {
+            for (const key of this.i18ns) {
+                this.core.i18n.delete(key);
+            }
+            this.i18ns.length = 0;
+        }
+        // 清空内部记录
         this.components = [];
         this.routes = [];
         this.middlewares = [];
         this.eventlisteners = [];
+        this.hooks = {};
+        this.childContexts = [];
     }
 }
 exports.Context = Context;

package/dist/core.d.ts

@@ -6,6 +6,7 @@ import { Route } from './route';
 import { Context } from './context';
 import { HookHandler, Hook } from './hook';
 import { Server as CoreServer } from './server';
+import { I18n } from './i18n';
 interface Plugin {
     apply: (ctx: Context, config: Config) => Promise<void>;
     disable: (ctx: Context) => Promise<void>;
@@ -25,6 +26,7 @@ interface CoreOptions {
     staticDir: string;
     enableCors: boolean;
     enableWs: boolean;
+    lang: string[];
 }
 /**
  * 定义插件状态枚举
@@ -56,6 +58,7 @@ export declare class Core {
     hooks: Record<string, Hook>;
     coreConfig: CoreOptions;
     server: CoreServer;
+    i18n: I18n;
     private pluginWatchers;
     private pluginModules;
     private configPath;
@@ -63,7 +66,7 @@ export declare class Core {
      * 插件名 -> Context 映射
      */
     private pluginContexts;
-    constructor(pluginLoader?: PluginLoader, coreConfig?: CoreOptions);
+    constructor(pluginLoader?: PluginLoader, coreConfig?: CoreOptions, setCore?: boolean);
     /**
      * 获取或创建插件对应 Context
      */

package/dist/core.js

@@ -49,6 +49,7 @@ const route_1 = require("./route");
 const context_1 = require("./context");
 const hook_1 = require("./hook");
 const server_1 = require("./server");
+const i18n_1 = require("./i18n");
 class Core {
     plugins = {};
     config = null;
@@ -62,6 +63,7 @@ class Core {
     hooks = {};
     coreConfig;
     server;
+    i18n;
     pluginWatchers = {};
     pluginModules = {};
     configPath = '';
@@ -69,9 +71,11 @@ class Core {
      * 插件名 -> Context 映射
      */
     pluginContexts = {};
-    constructor(pluginLoader, coreConfig) {
+    constructor(pluginLoader, coreConfig, setCore = true) {
         this.coreConfig = coreConfig;
         this.pluginLoader = pluginLoader;
+        if (setCore)
+            logger_1.Logger.setCore(this);
     }
     /**
      * 获取或创建插件对应 Context
@@ -111,6 +115,7 @@ class Core {
             this.logger.error('Failed to load config:', e);
             throw e;
         }
+        this.i18n = new i18n_1.I18n(this.coreConfig.lang || ['zh', 'en']);
     }
     /**
      * 启动应用

package/dist/hook.js

@@ -41,9 +41,9 @@ class Hook {
      * @returns 执行结果
      */
     async trigger(...args) {
-        let result;
+        let result = [];
         for (const handler of Object.values(this.handlers)) {
-            result.push(handler(...args));
+            result.push(await handler(...args));
         }
         return result;
     }

package/dist/i18n.d.ts

@@ -0,0 +1,29 @@
+/**
+ * @time: 2025/10/28 22:13
+ * @author: FireGuo
+ * WindyPear-Team All right reserved
+ **/
+type I18nData = Record<string, Record<string, string>>;
+export declare class I18n {
+    private data;
+    private fallback;
+    constructor(fallback?: string[]);
+    register(key: string | Record<string, any>, lang?: Record<string, string>): void;
+    setFallback(fallback: string[]): void;
+    private flattenAndRegister;
+    isRegistered(key: string): boolean;
+    delete(key: string): void;
+    /**
+     * 获取指定key的翻译
+     * @param key 文本点
+     * @param langs 用户的语言优先级数组
+     */
+    get(key: string, langs?: string[]): string;
+    /**
+     * 替换模板字符串中的文本点
+     * e.g. "Hello {{app.title}}" -> "Hello 世界"
+     */
+    replaceAll(input: string, langs?: string[]): string;
+    all(): I18nData;
+}
+export {};

package/dist/i18n.js

@@ -0,0 +1,79 @@
+"use strict";
+/**
+ * @time: 2025/10/28 22:13
+ * @author: FireGuo
+ * WindyPear-Team All right reserved
+ **/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.I18n = void 0;
+class I18n {
+    data = {};
+    fallback;
+    constructor(fallback = ['en']) {
+        this.fallback = fallback;
+    }
+    register(key, lang) {
+        if (typeof key === 'string' && lang) {
+            if (!this.data[key])
+                this.data[key] = {};
+            Object.assign(this.data[key], lang);
+        }
+        else if (typeof key === 'object') {
+            this.flattenAndRegister(key);
+        }
+    }
+    setFallback(fallback) {
+        this.fallback = fallback;
+    }
+    flattenAndRegister(obj, prefix = '') {
+        for (const [k, v] of Object.entries(obj)) {
+            const fullKey = prefix ? `${prefix}.${k}` : k;
+            if (typeof v === 'object' && !('zh' in v || 'en' in v)) {
+                this.flattenAndRegister(v, fullKey);
+            }
+            else if (typeof v === 'object') {
+                if (!this.data[fullKey])
+                    this.data[fullKey] = {};
+                Object.assign(this.data[fullKey], v);
+            }
+        }
+    }
+    isRegistered(key) {
+        return !!this.data[key];
+    }
+    delete(key) {
+        delete this.data[key];
+    }
+    /**
+     * 获取指定key的翻译
+     * @param key 文本点
+     * @param langs 用户的语言优先级数组
+     */
+    get(key, langs) {
+        const entry = this.data[key];
+        if (!entry)
+            return key;
+        if (langs && langs.length) {
+            for (const l of langs) {
+                if (entry[l])
+                    return entry[l];
+            }
+        }
+        for (const fb of this.fallback) {
+            if (entry[fb])
+                return entry[fb];
+        }
+        return key;
+    }
+    /**
+     * 替换模板字符串中的文本点
+     * e.g. "Hello {{app.title}}" -> "Hello 世界"
+     */
+    replaceAll(input, langs) {
+        return input.replace(/\{\{(.*?)\}\}/g, (_, key) => this.get(key.trim(), langs));
+    }
+    all() {
+        return this.data;
+    }
+}
+exports.I18n = I18n;

package/dist/index.d.ts

@@ -11,3 +11,4 @@ export * from './logger';
 export * from './context';
 export * from './hook';
 export * from './middleware';
+export * from './i18n';

package/dist/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./logger"), exports);
 __exportStar(require("./context"), exports);
 __exportStar(require("./hook"), exports);
 __exportStar(require("./middleware"), exports);
+__exportStar(require("./i18n"), exports);

package/dist/logger.d.ts

@@ -8,7 +8,11 @@ export declare class Logger {
     private title;
     private titleColor;
     static coreInstance: Core | null;
-    static logs: string[];
+    static logs: {
+        level: string;
+        message: string;
+        timestamp: string;
+    }[];
     static setCore(core: Core): void;
     constructor(title: string);
     private getRandomColor;

package/dist/logger.js

@@ -17,8 +17,7 @@ class Logger {
     static logs = [];
     static setCore(core) {
         if (Logger.coreInstance !== null) {
-            const logger = new Logger('Logger');
-            logger.warn("Logger.coreInstance is already set. Overwriting would cause confusion.");
+            return;
         }
         Logger.coreInstance = core;
     }
@@ -43,7 +42,8 @@ class Logger {
         const levelColor = level === 'E' ? picocolors_1.default.red : level === 'W' ? picocolors_1.default.yellow : picocolors_1.default.cyan;
         const timestamp = this.getTimestamp();
         console.log(`${picocolors_1.default.gray(timestamp)} [${levelColor(level)}] ${this.titleColor(this.title)}`, ...args);
-        Logger.coreInstance?.emit('log', { level, message: args.join(' ') });
+        Logger.coreInstance?.emit('log', { level, message: args.join(' '), timestamp });
+        Logger.logs.push({ level, message: args.join(' '), timestamp });
     }
     info(...args) { this.log('I', ...args); }
     warn(...args) { this.log('W', ...args); }

package/dist/route.d.ts

@@ -5,6 +5,7 @@
  **/
 import { Session } from './session';
 import { Middleware } from './middleware';
+import { WebSocketServer } from 'ws';
 export type RouteHandler = (session: Session, queryParams: URLSearchParams, ...pathParams: string[]) => Promise<void> | void;
 /**
  * Route class using segment-based matching (no fragile capture-group-index mapping).
@@ -21,6 +22,7 @@ export declare class Route {
     private handler;
     middlewares: Middleware[];
     allowedMethods: string[];
+    ws: WebSocketServer;
     /**
      * 创建路由
      * @param path 路由路径
@@ -60,4 +62,9 @@ export declare class Route {
      * @returns this
      */
     methods(...methods: string[]): Route;
+    /**
+      * 注册Ws处理器
+      * @param handler 处理器
+      */
+    wsOn(event: string, handler: (...args: any[]) => void): this;
 }