@yumerijs/core 1.2.1 → 1.3.0

package/dist/context.d.ts

@@ -4,7 +4,6 @@
  * WindyPear-Team All right reserved
  **/
 import { Core } from './core';
-import { Command } from './command';
 import { Route } from './route';
 import { HookHandler } from './hook';
 /**
@@ -28,11 +27,6 @@ export declare class Context {
      * @param pluginname 插件名称
      */
     constructor(core: Core, pluginname: string);
-    /**
-     * @deprecated Use route() instead.
-     * 尝试注册命令，如果命令已存在则警告
-     */
-    command(name: string): Command;
     /**
      * 注册路由
      * @param path 路由路径

package/dist/context.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
-const command_1 = require("./command");
 const route_1 = require("./route");
 /**
  * 插件上下文对象
@@ -27,17 +26,6 @@ class Context {
         this.core = core;
         this.pluginname = pluginname;
     }
-    /**
-     * @deprecated Use route() instead.
-     * 尝试注册命令，如果命令已存在则警告
-     */
-    command(name) {
-        if (this.core.commands[name]) {
-            this.core.logger.warn(`Plugin "${this.pluginname}" attempt to register command "${name}", but it has already been registered.`);
-            return new command_1.Command(this.core, name);
-        }
-        return this.core.command(name);
-    }
     /**
      * 注册路由
      * @param path 路由路径

package/dist/core.d.ts

@@ -1,12 +1,11 @@
 import { Config } from './config';
 import { Logger } from './logger';
-import { Command } from './command';
 import { Session } from './session';
-import { Platform } from './platform';
 import { Middleware } from './middleware';
 import { Route } from './route';
 import { Context } from './context';
 import { HookHandler, Hook } from './hook';
+import { Server as CoreServer } from './server';
 interface Plugin {
     apply: (ctx: Context, config: Config) => Promise<void>;
     disable: (ctx: Context) => Promise<void>;
@@ -20,6 +19,13 @@ interface PluginLoader {
     installPluginDependencies(pluginName: string): Promise<void>;
     logger: Logger;
 }
+interface CoreOptions {
+    port: number;
+    host: string;
+    staticDir: string;
+    enableCors: boolean;
+    enableWs: boolean;
+}
 /**
  * 定义插件状态枚举
  */
@@ -36,14 +42,12 @@ export declare class Core {
         };
     };
     config: any;
-    platforms: Platform[];
     eventListeners: {
         [event: string]: ((...args: any[]) => Promise<void>)[];
     };
     components: {
         [name: string]: any;
     };
-    commands: Record<string, Command>;
     routes: Record<string, Route>;
     pluginLoader: PluginLoader;
     logger: Logger;
@@ -53,6 +57,8 @@ export declare class Core {
     globalMiddlewares: Record<string, Middleware>;
     pluginStatus: Record<string, PluginStatus>;
     hooks: Record<string, Hook>;
+    coreConfig: CoreOptions;
+    server: CoreServer;
     private pluginWatchers;
     private pluginModules;
     private configPath;
@@ -60,7 +66,7 @@ export declare class Core {
      * 插件名 -> Context 映射
      */
     private pluginContexts;
-    constructor(pluginLoader: PluginLoader);
+    constructor(pluginLoader?: PluginLoader, coreConfig?: CoreOptions);
     /**
      * 获取或创建插件对应 Context
      */
@@ -74,6 +80,11 @@ export declare class Core {
      * @param configPath 配置文件的路径
      */
     loadConfig(configPath: string): Promise<void>;
+    /**
+     * 启动应用
+     * @returns Promise<void>
+     */
+    runCore(): Promise<void>;
     /**
      * 监听配置文件变化，实现热重载
      * @param configPath 配置文件的路径
@@ -160,10 +171,6 @@ export declare class Core {
      * @returns Core 实例
      */
     use(name: string, middleware: Middleware): Core;
-    /**
-     * @deprecated 已更改为路由
-     */
-    command(name: string): Command;
     /**
      * 注册路由
      * @param path 路由路径
@@ -188,11 +195,6 @@ export declare class Core {
      * @return Promise<any[]>
      */
     hookExecute(name: string, ...args: any[]): Promise<any[]>;
-    /**
-     * 执行命令
-     * @deprecated
-     */
-    executeCommand(name: string, session: any, ...args: any[]): Promise<Session | null>;
     /**
      * 执行路由
      * @param pathname 需要匹配的URL
@@ -201,18 +203,6 @@ export declare class Core {
      * @returns 是否匹配成功
      */
     executeRoute(pathname: string, session: Session, queryParams: URLSearchParams): Promise<boolean>;
-    /**
-     * 注册平台
-     * @param platform 平台实例
-     * @returns 平台启动结果
-     */
-    registerPlatform(platform: Platform): any;
-    /**
-     * 获取命令
-     * @param name 命令名称
-     * @returns Command 实例或 null
-     */
-    getCommand(name: string): Command | null;
     /**
      * 获取路由
      * @param path 匹配路径

package/dist/core.js

@@ -44,18 +44,16 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const config_1 = require("./config");
 const logger_1 = require("./logger");
-const command_1 = require("./command");
 const chokidar = __importStar(require("chokidar"));
 const route_1 = require("./route");
 const context_1 = require("./context");
 const hook_1 = require("./hook");
+const server_1 = require("./server");
 class Core {
     plugins = {};
     config = null;
-    platforms = [];
     eventListeners = {};
     components = {};
-    commands = {};
     routes = {};
     pluginLoader;
     logger = new logger_1.Logger('core');
@@ -63,6 +61,8 @@ class Core {
     globalMiddlewares = {};
     pluginStatus = {};
     hooks = {};
+    coreConfig;
+    server;
     pluginWatchers = {};
     pluginModules = {};
     configPath = '';
@@ -70,7 +70,8 @@ class Core {
      * 插件名 -> Context 映射
      */
     pluginContexts = {};
-    constructor(pluginLoader) {
+    constructor(pluginLoader, coreConfig) {
+        this.coreConfig = coreConfig;
         this.pluginLoader = pluginLoader;
     }
     /**
@@ -105,12 +106,28 @@ class Core {
             if (process.env.NODE_ENV === 'development') {
                 this.watchConfig(configPath);
             }
+            this.coreConfig = this.config.core || {};
         }
         catch (e) {
             this.logger.error('Failed to load config:', e);
             throw e;
         }
     }
+    /**
+     * 启动应用
+     * @returns Promise<void>
+     */
+    async runCore() {
+        this.server = new server_1.Server(this, {
+            port: this.coreConfig.port || 14510,
+            host: this.coreConfig.host || '0.0.0.0',
+            enableCors: this.coreConfig.enableCors || false,
+            enableWs: this.coreConfig.enableWs || false,
+            staticDir: this.coreConfig.staticDir || 'public',
+        });
+        await this.server.start();
+        this.logger.info(`Yumeri server started at ${this.coreConfig.host}:${this.coreConfig.port}`);
+    }
     /**
      * 监听配置文件变化，实现热重载
      * @param configPath 配置文件的路径
@@ -497,14 +514,6 @@ class Core {
         this.globalMiddlewares[name] = middleware;
         return this;
     }
-    /**
-     * @deprecated 已更改为路由
-     */
-    command(name) {
-        const command = new command_1.Command(this, name);
-        this.commands[name] = command;
-        return command;
-    }
     /**
      * 注册路由
      * @param path 路由路径
@@ -547,26 +556,6 @@ class Core {
         }
         return [];
     }
-    /**
-     * 执行命令
-     * @deprecated
-     */
-    async executeCommand(name, session, ...args) {
-        const command = this.commands[name];
-        if (command) {
-            const middlewares = [...Object.values(this.globalMiddlewares), ...(command.middlewares || [])];
-            let index = 0;
-            const runner = async () => {
-                if (index < middlewares.length)
-                    await middlewares[index++](session, runner);
-                else
-                    await command.executeHandler(session, ...args);
-            };
-            await runner();
-            return session;
-        }
-        return null;
-    }
     /**
      * 执行路由
      * @param pathname 需要匹配的URL
@@ -593,23 +582,6 @@ class Core {
         }
         return false;
     }
-    /**
-     * 注册平台
-     * @param platform 平台实例
-     * @returns 平台启动结果
-     */
-    registerPlatform(platform) {
-        this.platforms.push(platform);
-        return platform.startPlatform(this);
-    }
-    /**
-     * 获取命令
-     * @param name 命令名称
-     * @returns Command 实例或 null
-     */
-    getCommand(name) {
-        return this.commands[name] || null;
-    }
     /**
      * 获取路由
      * @param path 匹配路径

package/dist/index.d.ts

@@ -5,10 +5,8 @@
  **/
 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

@@ -21,10 +21,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 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/server.d.ts

@@ -0,0 +1,26 @@
+import { Core } from './core';
+export interface ServerConfig {
+    port: number;
+    host: string;
+    enableCors: boolean;
+    staticDir: string;
+    enableWs: boolean;
+}
+export declare class Server {
+    private core;
+    private port;
+    private host;
+    private enableCors;
+    private staticDir;
+    private enableWs;
+    private httpServer;
+    private wsServer;
+    constructor(core: Core, config?: Partial<ServerConfig>);
+    private createSession;
+    private parseCookies;
+    private getClientIP;
+    private parseRequestBody;
+    private serveStaticFile;
+    start(): Promise<void>;
+    stop(): void;
+}

package/dist/server.js

@@ -0,0 +1,231 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Server = void 0;
+const logger_1 = require("./logger");
+const session_1 = require("./session");
+const http_1 = __importDefault(require("http"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const url_1 = require("url");
+const ws_1 = __importDefault(require("ws"));
+const formidable = __importStar(require("formidable"));
+const mime = __importStar(require("mime-types"));
+const logger = new logger_1.Logger('server');
+class Server {
+    core;
+    port;
+    host;
+    enableCors;
+    staticDir;
+    enableWs;
+    httpServer = null;
+    wsServer = null;
+    constructor(core, config = {}) {
+        this.core = core;
+        this.port = config.port ?? 14510;
+        this.host = config.host ?? '0.0.0.0';
+        this.enableCors = config.enableCors ?? true;
+        this.staticDir = config.staticDir ?? 'static';
+        this.enableWs = config.enableWs ?? true;
+    }
+    createSession(ip, cookies, res, req, extra = {}) {
+        const session = new session_1.Session(ip, cookies, this, req, res);
+        Object.assign(session.properties, extra);
+        session.protocol = extra.protocol ?? 'http';
+        return session;
+    }
+    parseCookies(req) {
+        const cookieHeader = req.headers.cookie;
+        if (!cookieHeader)
+            return {};
+        const cookies = {};
+        cookieHeader.split(';').forEach(c => {
+            const [k, ...v] = c.split('=');
+            cookies[k.trim()] = v.join('=').trim();
+        });
+        return cookies;
+    }
+    getClientIP(req) {
+        const xff = req.headers['x-forwarded-for'];
+        return xff ? xff.split(',')[0].trim() : req.socket.remoteAddress || '127.0.0.1';
+    }
+    async parseRequestBody(req) {
+        return new Promise((resolve, reject) => {
+            const contentType = (req.headers['content-type'] || '').toLowerCase();
+            if (contentType.includes('application/json') || contentType.includes('application/x-www-form-urlencoded')) {
+                let body = '';
+                req.on('data', chunk => body += chunk.toString());
+                req.on('end', () => {
+                    try {
+                        if (contentType.includes('application/json'))
+                            resolve(JSON.parse(body));
+                        else {
+                            const params = new URLSearchParams(body);
+                            const parsed = {};
+                            params.forEach((v, k) => parsed[k] = v);
+                            resolve(parsed);
+                        }
+                    }
+                    catch (e) {
+                        reject(e);
+                    }
+                });
+            }
+            else if (contentType.includes('multipart/form-data')) {
+                const form = formidable.formidable({});
+                form.parse(req, (err, fields) => {
+                    if (err)
+                        return reject(err);
+                    const parsed = {};
+                    Object.keys(fields).forEach(k => {
+                        const val = fields[k];
+                        parsed[k] = Array.isArray(val) && val.length === 1 ? val[0] : val;
+                    });
+                    resolve(parsed);
+                });
+            }
+            else
+                resolve({});
+            req.on('error', reject);
+        });
+    }
+    serveStaticFile(pathname, res) {
+        const fullPath = path.join(process.cwd(), this.staticDir, pathname);
+        fs.readFile(fullPath, (err, data) => {
+            if (err) {
+                res.writeHead(404, { 'Content-Type': 'text/html' });
+                res.end(`<html><body><h1>404 Not Found</h1></body></html>`);
+            }
+            else {
+                res.writeHead(200, { 'Content-Type': mime.lookup(fullPath) || 'text/plain' });
+                res.end(data);
+            }
+        });
+    }
+    async start() {
+        this.httpServer = http_1.default.createServer(async (req, res) => {
+            if (req.method === 'OPTIONS' && this.enableCors) {
+                res.writeHead(204, {
+                    'Access-Control-Allow-Origin': '*',
+                    'Access-Control-Allow-Methods': 'GET,POST,PUT,DELETE,PATCH,HEAD,OPTIONS',
+                    'Access-Control-Allow-Headers': 'Content-Type',
+                });
+                res.end();
+                return;
+            }
+            const url = new url_1.URL(req.url || '/', `http://${req.headers.host}`);
+            const pathname = url.pathname;
+            const queryParams = url.searchParams;
+            const ip = this.getClientIP(req);
+            const cookies = this.parseCookies(req);
+            const session = this.createSession(ip, cookies, res, req, { protocol: 'http', header: req.headers });
+            if (req.method?.toLowerCase() === 'post') {
+                try {
+                    const body = await this.parseRequestBody(req);
+                    Object.entries(body).forEach(([k, v]) => {
+                        if (typeof v === 'string')
+                            queryParams.set(k, v);
+                        else if (Array.isArray(v))
+                            v.forEach(val => queryParams.append(k, val));
+                    });
+                }
+                catch (err) {
+                    res.writeHead(400, { 'Content-Type': 'text/plain' });
+                    res.end('Invalid request body');
+                    logger.error('Request body parse error:', err);
+                    return;
+                }
+            }
+            const route = this.core.getRoute(pathname);
+            if (route && route.allowedMethods.includes(req.method ?? 'GET')) {
+                const matched = await this.core.executeRoute(pathname, session, queryParams);
+                if (!matched) {
+                    this.serveStaticFile(pathname, res);
+                }
+                else {
+                    let head = session.head;
+                    head['Set-Cookie'] = Object.entries(session.newCookie).map(([k, v]) => `${k}=${v}`);
+                    if (this.enableCors) {
+                        head['Access-Control-Allow-Origin'] = '*';
+                    }
+                    res.writeHead(session.status ?? 200, head);
+                    res.end(session.body);
+                }
+            }
+            else {
+                this.serveStaticFile(pathname, res);
+            }
+        });
+        if (this.enableWs) {
+            this.wsServer = new ws_1.default.Server({ server: this.httpServer });
+            this.wsServer.on('connection', (ws, req) => {
+                const url = new url_1.URL(req.url || '/', `http://${req.headers.host}`);
+                const pathname = url.pathname;
+                const queryParams = url.searchParams;
+                const ip = this.getClientIP(req);
+                const cookies = this.parseCookies(req);
+                const session = this.createSession(ip, cookies, undefined, req, { ws, protocol: 'ws' });
+                ws.on('message', async (msg) => {
+                    try {
+                        const data = JSON.parse(msg.toString());
+                        Object.entries(data).forEach(([k, v]) => queryParams.set(k, v));
+                    }
+                    catch {
+                        queryParams.set('message', msg.toString());
+                    }
+                    await this.core.executeRoute(pathname, session, queryParams);
+                });
+                this.core.executeRoute(pathname, session, queryParams).catch(err => {
+                    logger.error(`WS initial route error for ${pathname}:`, err);
+                    ws.close(1011, 'Internal error');
+                });
+            });
+        }
+        this.httpServer.listen(this.port, this.host, () => {
+            logger.info(`Server listening on ${this.host}:${this.port}`);
+        });
+    }
+    stop() {
+        if (this.wsServer)
+            this.wsServer.close();
+        if (this.httpServer)
+            this.httpServer.close(() => logger.info('Server stopped'));
+    }
+}
+exports.Server = Server;

package/dist/session.d.ts

@@ -3,7 +3,8 @@
  * @author: FireGuo
  * WindyPear-Team All right reserved
  **/
-import { Platform } from './platform';
+import { Server } from './server';
+import { IncomingMessage, ServerResponse } from 'http';
 export declare class Session {
     ip: string;
     cookie: Record<string, string>;
@@ -14,9 +15,12 @@ export declare class Session {
     head: Record<string, any>;
     status: number;
     body: any;
-    platform: Platform;
     properties?: Record<string, any>;
-    constructor(ip: string, cookie: Record<string, string>, platform: Platform, query?: Record<string, string>);
+    res: any;
+    req: any;
+    server: Server;
+    protocol: string;
+    constructor(ip: string, cookie: Record<string, string>, server: Server, req?: IncomingMessage, res?: ServerResponse, query?: Record<string, string>);
     private generateId;
     private md5;
     setData(key: string, value: any): void;

package/dist/session.js

@@ -20,18 +20,23 @@ class Session {
     head = {};
     status = 200;
     body;
-    platform;
     properties = {};
+    res = null;
+    req = null;
+    server;
+    protocol = 'http';
     /*
      *  @ip: string，用户IP
      *  @cookie: string，会话cookie
      *  @query: string，请求字符串
      */
-    constructor(ip, cookie, platform, query) {
+    constructor(ip, cookie, server, req, res, query) {
         this.ip = ip;
         this.cookie = cookie;
         this.query = query;
-        this.platform = platform;
+        this.server = server;
+        this.req = req;
+        this.res = res;
         this.head['Content-Type'] = 'text/plain';
         if (cookie.sessionid) {
             this.sessionid = cookie.sessionid;
@@ -102,10 +107,10 @@ class Session {
         }
     }
     send(data) {
-        return this.platform.sendMessage(this, data);
+        return this.res.send(data);
     }
     endsession(message) {
-        return this.platform.terminationSession(this, message);
+        return this.res.end(message);
     }
 }
 exports.Session = Session;

package/package.json

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