@maiyunnet/kebab 3.1.8 → 3.1.9

package/index.d.ts

@@ -8,7 +8,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.1.8";
+export declare const VER = "3.1.9";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -9,7 +9,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.1.8';
+export const VER = '3.1.9';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/core.js

@@ -5,6 +5,7 @@
  */
 import * as cp from 'child_process';
 import * as stream from 'stream';
+import * as os from 'os';
 import * as kebab from '#kebab/index.js';
 import * as lTime from '#kebab/lib/time.js';
 import * as lFs from '#kebab/lib/fs.js';
@@ -624,7 +625,7 @@ export function log(opt, msg, fend = '') {
         }
         path += h + '.csv';
         if (!await lFs.isFile(path)) {
-            if (!await lFs.putContent(path, 'TIME,UNIX,URL,COOKIE,SESSION,JWT,USER_AGENT,REALIP,CLIENTIP,MESSAGE\n', {
+            if (!await lFs.putContent(path, 'TIME,UNIX,URL,COOKIE,SESSION,JWT,USER_AGENT,REALIP,CLIENTIP,OS,PROCESS,MESSAGE\n', {
                 'encoding': 'utf8',
                 'mode': 0o777
             })) {
@@ -641,6 +642,8 @@ export function log(opt, msg, fend = '') {
             (headers['user-agent']?.replace(/"/g, '""') ?? 'No HTTP_USER_AGENT') + '","' +
             realIp.replace(/"/g, '""') + '","' +
             clientIp.replace(/"/g, '""') + '","' +
+            lText.sizeFormat(os.totalmem() - os.freemem(), '') + '","' +
+            lText.sizeFormat(process.memoryUsage().rss, '') + '","' +
             JSON.stringify(msg).slice(1, -1).replace(/"/g, '""') + '"\n', {
             'encoding': 'utf8',
             'mode': 0o777,

package/lib/lang.js

@@ -1,11 +1,11 @@
 /** --- 支持的语言缩写列表 --- */
 export const codes = [
-    'sc', 'tc', 'ja', 'ko', 'en', 'es', 'th', 'vi',
-    'de', 'fr', 'pt', 'ru', 'ar', 'id', 'it', 'tr',
+    'sc', 'tc', 'ja', 'ko', 'th', 'vi', 'ar', 'id',
+    'en', 'es', 'de', 'fr', 'pt', 'ru', 'it', 'tr',
 ];
 export const names = [
-    '简体中文', '繁體中文', '日本語', '한국어', 'English', 'Español', 'ไทย', 'Tiếng việt',
-    'Deutsch', 'Français', 'Português', 'Русский', 'العربية', 'Bahasa Indonesia', 'Italiano', 'Türkçe',
+    '简体中文', '繁體中文', '日本語', '한국어', 'ไทย', 'Tiếng việt', 'العربية', 'Bahasa Indonesia',
+    'English', 'Español', 'Deutsch', 'Français', 'Português', 'Русский', 'Italiano', 'Türkçe',
 ];
 /** --- 浏览器常用映射为本语言 --- */
 export const map = {
@@ -13,16 +13,16 @@ export const map = {
     'zh': 'tc',
     'ja': 'ja',
     'ko': 'ko',
-    'en': 'en',
-    'es': 'es',
     'th': 'th',
     'vi': 'vi',
+    'ar': 'ar',
+    'id': 'id',
+    'en': 'en',
+    'es': 'es',
     'de': 'de',
     'fr': 'fr',
     'pt': 'pt',
     'ru': 'ru',
-    'ar': 'ar',
-    'id': 'id',
     'it': 'it',
     'tr': 'tr',
 };

package/lib/net.js

@@ -468,6 +468,9 @@ export async function mproxy(ctr, auth, opt = {}) {
     const res = ctr.getPrototype('_res');
     /** --- 客户端请求中的 get 的数据 --- */
     const get = ctr.getPrototype('_get');
+    if (req.readableEnded) {
+        return -3;
+    }
     if (get['auth'] !== auth) {
         return 0;
     }
@@ -519,6 +522,9 @@ export async function rproxy(ctr, route, opt = {}) {
     const res = ctr.getPrototype('_res');
     const config = ctr.getPrototype('_config');
     const path = config.const.path + (config.const.qs ? '?' + config.const.qs : '');
+    if (req.readableEnded) {
+        return false;
+    }
     for (const key in route) {
         if (!path.startsWith(key)) {
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.1.8",
+  "version": "3.1.9",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [