@yumerijs/core 1.3.3 → 2.0.1

package/dist/server.js

@@ -43,8 +43,6 @@ 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 {
@@ -53,19 +51,16 @@ class Server {
     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);
+    createSession(ip, cookies, res, req, pathname, extra = {}) {
+        const session = new session_1.Session(ip, cookies, this, req, res, pathname);
         Object.assign(session.properties, extra);
         session.protocol = extra.protocol ?? 'http';
         return session;
@@ -85,46 +80,6 @@ class Server {
         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) => {
@@ -154,25 +109,9 @@ class Server {
             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 session = this.createSession(ip, cookies, res, req, pathname, { protocol: 'http', header: req.headers });
             const route = this.core.getRoute(pathname);
+            const rootroute = this.core.getRoute('root');
             if (route && route.allowedMethods.includes(req.method ?? 'GET')) {
                 const matched = await this.core.executeRoute(pathname, session, queryParams);
                 if (!matched) {
@@ -188,42 +127,59 @@ class Server {
                     res.end(session.body);
                 }
             }
+            else if (rootroute && rootroute.allowedMethods.includes(req.method ?? 'GET')) {
+                const matched = await this.core.executeRoute('root', 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.on('upgrade', async (req, socket, head) => {
+            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, null, req, pathname, { protocol: 'http', header: req.headers });
+            const route = this.core.getRoute(pathname);
+            if (route && route.ws != null) {
+                const matched = await this.core.executeRoute(pathname, session, queryParams);
+                if (!matched) {
+                    socket.write('HTTP/1.1 400 Bad Request\r\n' +
+                        'Content-Type: text/plain\r\n' +
+                        'Connection: close\r\n');
+                    socket.destroy();
+                }
+                else {
+                    route.ws.handleUpgrade(req, socket, head, (ws) => {
+                        route.ws.emit('connection', ws, req, session);
+                    });
+                }
+            }
+            else {
+                socket.write('HTTP/1.1 400 Bad Request\r\n' +
+                    'Content-Type: text/plain\r\n' +
+                    'Connection: close\r\n');
+                socket.destroy();
+            }
+        });
         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'));
     }

package/dist/session.d.ts

@@ -5,6 +5,12 @@
  **/
 import { Server } from './server';
 import { IncomingMessage, ServerResponse } from 'http';
+type ParsedParams = Record<string, string | string[] | undefined>;
+export interface Client {
+    req: IncomingMessage;
+    res: ServerResponse;
+    headers?: Record<string, string>;
+}
 export declare class Session {
     ip: string;
     cookie: Record<string, string>;
@@ -16,12 +22,42 @@ export declare class Session {
     status: number;
     body: any;
     properties?: Record<string, any>;
-    res: any;
-    req: any;
+    client: Client;
     server: Server;
     protocol: string;
-    constructor(ip: string, cookie: Record<string, string>, server: Server, req?: IncomingMessage, res?: ServerResponse, query?: Record<string, string>);
+    pathname: string;
+    languages: string[];
+    /**
+     * @constructor
+     * @param ip 用户IP
+     * @param cookie 会话cookie
+     * @param query 请求字符串
+     */
+    constructor(ip: string, cookie: Record<string, string>, server: Server, req?: IncomingMessage, res?: ServerResponse, pathname?: string, query?: Record<string, string>);
+    /**
+     * 解析 Accept-Language 字符串为排序后的语言数组
+     * @param header Accept-Language 头，比如 "zh-CN,zh-TW;q=0.8,en-US;q=0.6"
+     * @returns 按优先级排序的语言数组，自动补上父语言
+     */
+    parseAcceptLanguages(header: string): any[];
+    /**
+     * 生成 sessionid
+     * @param ip 用户IP
+     * @param option 选项
+     */
     private generateId;
+    /**
+     * 解析请求体
+     * @param client 客户端
+     * @returns Promise<ParsedParams>
+     */
+    parseRequestBody(client?: Client): Promise<ParsedParams>;
+    /**
+     * 获取请求体
+     * @param req 请求对象
+     * @returns Promise<string>
+     */
+    getReqBody(req: IncomingMessage): Promise<string>;
     private md5;
     setData(key: string, value: any): void;
     deleteData(key: string): void;
@@ -30,4 +66,10 @@ export declare class Session {
     setMime(mimeType: 'png' | 'jpg' | 'jpeg' | 'pdf' | 'plain' | 'html' | 'json' | 'xml' | string): void;
     send(data: any): any;
     endsession(message: any): any;
+    /**
+     * 获取I18n文本
+     * @param name 文本点名称
+     */
+    text(name: string): any;
 }
+export {};

package/dist/session.js

@@ -4,12 +4,46 @@
  * @author: FireGuo
  * WindyPear-Team All right reserved
  **/
+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.Session = void 0;
 const crypto_1 = __importDefault(require("crypto"));
+const formidable = __importStar(require("formidable"));
 class Session {
     ip;
     cookie;
@@ -21,22 +55,27 @@ class Session {
     status = 200;
     body;
     properties = {};
-    res = null;
-    req = null;
+    client = null;
     server;
     protocol = 'http';
-    /*
-     *  @ip: string，用户IP
-     *  @cookie: string，会话cookie
-     *  @query: string，请求字符串
+    pathname;
+    languages;
+    /**
+     * @constructor
+     * @param ip 用户IP
+     * @param cookie 会话cookie
+     * @param query 请求字符串
      */
-    constructor(ip, cookie, server, req, res, query) {
+    constructor(ip, cookie, server, req, res, pathname, query) {
         this.ip = ip;
         this.cookie = cookie;
         this.query = query;
         this.server = server;
-        this.req = req;
-        this.res = res;
+        this.pathname = pathname;
+        this.client = {
+            req: req,
+            res: res
+        };
         this.head['Content-Type'] = 'text/plain';
         if (cookie.sessionid) {
             this.sessionid = cookie.sessionid;
@@ -45,16 +84,122 @@ class Session {
             this.sessionid = this.generateId(this.ip);
             this.newCookie.sessionid = this.sessionid;
         }
+        if (cookie.lang) {
+            this.languages = cookie.lang.split(',');
+        }
+        else if (req.headers['accept-language']) {
+            this.languages = this.parseAcceptLanguages(req.headers['accept-language']);
+            this.newCookie.lang = this.languages.join(',');
+        }
+    }
+    /**
+     * 解析 Accept-Language 字符串为排序后的语言数组
+     * @param header Accept-Language 头，比如 "zh-CN,zh-TW;q=0.8,en-US;q=0.6"
+     * @returns 按优先级排序的语言数组，自动补上父语言
+     */
+    parseAcceptLanguages(header) {
+        if (!header)
+            return [];
+        const langs = header
+            .split(',')
+            .map(item => {
+            const [lang, qStr] = item.trim().split(';');
+            const q = qStr ? parseFloat(qStr.split('=')[1]) || 1 : 1;
+            return { lang: lang.toLowerCase(), q };
+        })
+            .sort((a, b) => b.q - a.q);
+        const result = [];
+        const seen = new Set();
+        for (const { lang } of langs) {
+            if (!seen.has(lang)) {
+                result.push(lang);
+                seen.add(lang);
+            }
+            const parts = lang.split('-');
+            if (parts.length > 1) {
+                const base = parts[0];
+                if (!seen.has(base)) {
+                    let insertIndex = -1;
+                    for (let i = result.length - 1; i >= 0; i--) {
+                        if (result[i].startsWith(base + '-')) {
+                            insertIndex = i + 1;
+                            break;
+                        }
+                    }
+                    if (insertIndex === -1)
+                        insertIndex = result.length;
+                    result.splice(insertIndex, 0, base);
+                    seen.add(base);
+                }
+            }
+        }
+        return result;
     }
-    // 生成 sessionid
-    /*
-     *  @ip: string，用户IP
-     *  @option: string，选项
+    /**
+     * 生成 sessionid
+     * @param ip 用户IP
+     * @param option 选项
      */
     generateId(ip, option) {
         const sessionId = this.md5(ip + Date.now().toString() + Math.random().toString()); // 添加随机性
         return sessionId;
     }
+    /**
+     * 解析请求体
+     * @param client 客户端
+     * @returns Promise<ParsedParams>
+     */
+    async parseRequestBody(client = this.client) {
+        const req = client.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);
+        });
+    }
+    /**
+     * 获取请求体
+     * @param req 请求对象
+     * @returns Promise<string>
+     */
+    async getReqBody(req) {
+        let body = "";
+        req.on('data', chunk => body += chunk.toString());
+        return body;
+    }
     // MD5 加密
     md5(str) {
         const hash = crypto_1.default.createHash('md5');
@@ -107,10 +252,17 @@ class Session {
         }
     }
     send(data) {
-        return this.res.send(data);
+        return this.client.res.write(data);
     }
     endsession(message) {
-        return this.res.end(message);
+        return this.client.res.end(message);
+    }
+    /**
+     * 获取I18n文本
+     * @param name 文本点名称
+     */
+    text(name) {
+        return this.server.core.i18n.get(name, this.languages);
     }
 }
 exports.Session = Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/core",
-  "version": "1.3.3",
+  "version": "2.0.1",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,6 @@
     "typescript": "^5.8.2"
   },
   "dependencies": {
-    "@yumerijs/loader": "^1.2.0",
     "chokidar": "^4.0.3",
     "formidable": "^3.5.4",
     "js-yaml": "^4.1.0",