@yumerijs/core 1.3.3 → 2.0.0

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.0",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
     "typescript": "^5.8.2"
   },
   "dependencies": {
-    "@yumerijs/loader": "^1.2.0",
+    "@yumerijs/loader": "^2.0.0",
     "chokidar": "^4.0.3",
     "formidable": "^3.5.4",
     "js-yaml": "^4.1.0",