@maiyunnet/kebab 7.0.1 → 7.1.0

package/lib/ws.js

@@ -24,35 +24,9 @@ const liwsServer = liws.createServer({
     'frameReceiveMode': EFrameReceiveMode.SIMPLE,
 });
 export class Socket {
+    /** --- 当前的 ws 对象 --- */
+    _ws;
     constructor(request, socket, head, options = {}) {
-        /** --- 还未开启监听时来的数据将存在这里 --- */
-        this._waitMsg = [];
-        /** --- 还未开启 error 监听时产生的 error 错误对象 --- */
-        this._error = null;
-        /** --- 还未开启 close 监听时是不是就已经 close --- */
-        this._close = false;
-        /** --- 未绑定自定义监听事件的默认执行函数 --- */
-        this._on = {
-            /** --- 消息 --- */
-            message: (msg) => {
-                this._waitMsg.push(msg);
-            },
-            drain: () => {
-                // --- nothing ---
-            },
-            error: (e) => {
-                this._error = e;
-            },
-            close: () => {
-                this._close = true;
-            },
-            end: () => {
-                // --- nothing ---
-            },
-            timeout: () => {
-                // --- nothing ---
-            }
-        };
         if (!request || !socket) {
             return;
         }
@@ -167,6 +141,34 @@ export class Socket {
             this._on.timeout();
         });
     }
+    /** --- 还未开启监听时来的数据将存在这里 --- */
+    _waitMsg = [];
+    /** --- 还未开启 error 监听时产生的 error 错误对象 --- */
+    _error = null;
+    /** --- 还未开启 close 监听时是不是就已经 close --- */
+    _close = false;
+    /** --- 未绑定自定义监听事件的默认执行函数 --- */
+    _on = {
+        /** --- 消息 --- */
+        message: (msg) => {
+            this._waitMsg.push(msg);
+        },
+        drain: () => {
+            // --- nothing ---
+        },
+        error: (e) => {
+            this._error = e;
+        },
+        close: () => {
+            this._close = true;
+        },
+        end: () => {
+            // --- nothing ---
+        },
+        timeout: () => {
+            // --- nothing ---
+        }
+    };
     on(event, cb) {
         this._on[event] = cb;
         switch (event) {

package/lib/zip.js

@@ -5,11 +5,11 @@ import * as lText from '#kebab/lib/text.js';
  * --- 本库主要用于读取 zip，请尽量不要用来写入 zip，尤其是大文件 zip ---
  */
 export class Zip {
+    /** --- zip 对象 --- */
+    _zip;
+    /** --- 当前路径，以 / 开头以 / 结尾 --- */
+    _path = '/';
     constructor(zip) {
-        /** --- 当前路径，以 / 开头以 / 结尾 --- */
-        this._path = '/';
-        /** --- 目录列表缓存 --- */
-        this._list = {};
         this._zip = zip;
         this._refreshList();
     }
@@ -250,6 +250,8 @@ export class Zip {
             return list;
         }
     }
+    /** --- 目录列表缓存 --- */
+    _list = {};
     /**
      * --- 重建目录列表缓存 ---
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -22,8 +22,8 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.940.0",
-    "@aws-sdk/lib-storage": "^3.940.0",
+    "@aws-sdk/client-s3": "^3.943.0",
+    "@aws-sdk/lib-storage": "^3.943.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.1.0",
@@ -45,8 +45,8 @@
     "@types/ejs": "^3.1.5",
     "@types/node": "^24.10.1",
     "@types/pg": "^8.15.6",
+    "@typescript/native-preview": "^7.0.0-dev.20251203.1",
     "typedoc": "^0.28.15",
-    "typedoc-plugin-markdown": "^4.9.0",
-    "typescript": "^5.9.3"
+    "typedoc-plugin-markdown": "^4.9.0"
   }
 }

package/sys/child.js

@@ -39,6 +39,23 @@ let httpServer;
 let http2Server;
 /** --- 当前使用中的连接 --- */
 const linkCount = {};
+/**
+ * --- 包装请求处理函数，统一管理 linkCount 计数和错误处理 ---
+ * @param key 连接标识
+ * @param handler 实际处理函数
+ * @param errorPrefix 错误日志前缀
+ */
+function wrapWithLinkCount(key, handler, errorPrefix) {
+    linkCount[key] = (linkCount[key] ?? 0) + 1;
+    handler().catch((e) => {
+        lCore.log({}, `${errorPrefix} ${lText.stringifyJson(e.stack).slice(1, -1)}`, '-error');
+    }).finally(() => {
+        --linkCount[key];
+        if (!linkCount[key]) {
+            delete linkCount[key];
+        }
+    });
+}
 /**
  * --- 最终调用执行的函数块，创建 http 服务器等 ---
  */
@@ -93,24 +110,7 @@ async function run() {
             res.end('403 Forbidden');
             return;
         }
-        const key = host + req.url;
-        (async function () {
-            if (!linkCount[key]) {
-                linkCount[key] = 0;
-            }
-            ++linkCount[key];
-            await requestHandler(req, res, true);
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        })().catch(function (e) {
-            lCore.log({}, '[CHILD][http2][request] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        });
+        wrapWithLinkCount(host + req.url, () => requestHandler(req, res, true), '[CHILD][http2][request]');
     }).on('tlsClientError', (err, socket) => {
         socket.destroy();
     }).on('upgrade', function (req, socket, head) {
@@ -119,24 +119,7 @@ async function run() {
             socket.destroy();
             return;
         }
-        const key = host + (req.url ?? '');
-        (async function () {
-            if (!linkCount[key]) {
-                linkCount[key] = 0;
-            }
-            ++linkCount[key];
-            await upgradeHandler(req, socket, true, head);
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        })().catch(function (e) {
-            lCore.log({}, '[CHILD][http2][upgrade] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        });
+        wrapWithLinkCount(host + (req.url ?? ''), () => upgradeHandler(req, socket, true, head), '[CHILD][http2][upgrade]');
     }).listen(lCore.globalConfig.httpsPort);
     httpServer = http.createServer(function (req, res) {
         const host = (req.headers['host'] ?? '');
@@ -146,24 +129,7 @@ async function run() {
             res.end();
             return;
         }
-        const key = host + (req.url ?? '');
-        (async function () {
-            if (!linkCount[key]) {
-                linkCount[key] = 0;
-            }
-            ++linkCount[key];
-            await requestHandler(req, res, false);
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        })().catch(function (e) {
-            lCore.log({}, '[CHILD][http][request] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        });
+        wrapWithLinkCount(host + (req.url ?? ''), () => requestHandler(req, res, false), '[CHILD][http][request]');
     }).on('clientError', (err, socket) => {
         socket.destroy();
     }).on('upgrade', function (req, socket, head) {
@@ -172,24 +138,7 @@ async function run() {
             socket.destroy();
             return;
         }
-        const key = host + (req.url ?? '');
-        (async function () {
-            if (!linkCount[key]) {
-                linkCount[key] = 0;
-            }
-            ++linkCount[key];
-            await upgradeHandler(req, socket, false, head);
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        })().catch(function (e) {
-            lCore.log({}, '[CHILD][http][upgrade] ' + lText.stringifyJson(e.stack).slice(1, -1), '-error');
-            --linkCount[key];
-            if (!linkCount[key]) {
-                delete linkCount[key];
-            }
-        });
+        wrapWithLinkCount(host + (req.url ?? ''), () => upgradeHandler(req, socket, false, head), '[CHILD][http][upgrade]');
     }).listen(lCore.globalConfig.httpPort);
 }
 /**

package/sys/ctr.d.ts

@@ -150,6 +150,13 @@ export declare class Ctr {
      * @param data
      */
     protected _loadView(path: string, data?: kebab.Json): Promise<string>;
+    /**
+     * --- 设置校验错误返回值 ---
+     * @param rtn 返回值数组
+     * @param lastVal 规则最后一项
+     * @param msgSuffix 可选的消息后缀
+     */
+    private _setCheckError;
     /**
      * --- 检测提交的数据类型 ---
      * @param input 要校验的输入项