@maiyunnet/kebab 2.0.15 → 2.0.16

package/index.d.ts

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

package/index.js

@@ -11,7 +11,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOD_CWD = exports.FTMP_CWD = exports.IND_CWD = exports.WWW_CWD = exports.LOG_CWD = exports.LIB_CWD = exports.VHOST_CWD = exports.CERT_CWD = exports.CONF_CWD = exports.ROOT_CWD = exports.SYS_PATH = exports.LIB_PATH = exports.ROOT_PATH = exports.VER = void 0;
 /** --- 当前系统版本号 --- */
-exports.VER = '2.0.15';
+exports.VER = '2.0.16';
 // --- 服务端用的路径 ---
 /** --- /xxx/xxx --- */
 const dirname = __dirname.replace(/\\/g, '/');

package/lib/buffer.js

@@ -30,9 +30,7 @@ class Reader {
     }
     /** --- 读取一个 BCD 编码的字符串（每个字节表示两个数字）--- */
     readBCDString(length) {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
+        length ??= this._buffer.length - this._offset;
         let str = '';
         for (let i = 0; i < length; i++) {
             const byte = this._buffer.readUInt8(this._offset + i);
@@ -44,9 +42,7 @@ class Reader {
     }
     /** --- 读取普通 string --- */
     readString(length, encoding = 'utf8') {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
+        length ??= this._buffer.length - this._offset;
         const buf = [];
         for (let i = 0; i < length; i++) {
             const byte = this._buffer.readUInt8(this._offset + i);
@@ -60,9 +56,7 @@ class Reader {
     }
     /** --- 读取 Buffer --- */
     readBuffer(length) {
-        if (length === undefined) {
-            length = this._buffer.length - this._offset;
-        }
+        length ??= this._buffer.length - this._offset;
         return this._buffer.subarray(this._offset, this._offset += length);
     }
     /** --- 获取完整的 buffer 长度 --- */

package/lib/s3.js

@@ -136,7 +136,7 @@ class S3 {
             return (res.Location && res.Bucket && res.Key) ? res : false;
         }
         catch (e) {
-            await lCore.log(this._ctr, '[putObject, s3] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr, '[S3][putObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
     }
@@ -196,7 +196,7 @@ class S3 {
             return true;
         }
         catch (e) {
-            await lCore.log(this._ctr, '[deleteObjects, s3] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr, '[S3][deleteObjects] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
     }
@@ -215,7 +215,7 @@ class S3 {
         }
         catch (e) {
             if (e.$metadata?.httpStatusCode !== 404) {
-                await lCore.log(this._ctr, '[headObject, s3] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(this._ctr, '[S3][headObject] ' + lText.stringifyJson(e.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             }
             return false;
         }

package/lib/ws.d.ts

@@ -153,3 +153,11 @@ export declare function mproxy(ctr: sCtr.Ctr, auth: string, opt?: IMproxyOptions
  * @param opt 参数
  */
 export declare function rproxy(ctr: sCtr.Ctr, url: string, opt?: IRproxyOptions): Promise<boolean>;
+/**
+ * --- 反向代理，将本 websocket 连接反代到其他真正的 socket，在 ws 的 onLoad 事件中使用 ---
+ * @param ctr 当前控制器
+ * @param host 反代真实请求地址
+ * @param port 反代真实请求端口
+ * @param opt 参数
+ */
+export declare function rsocket(ctr: sCtr.Ctr, host: string, port: number): Promise<boolean>;

package/lib/ws.js

@@ -38,6 +38,8 @@ exports.connect = connect;
 exports.createServer = createServer;
 exports.mproxy = mproxy;
 exports.rproxy = rproxy;
+exports.rsocket = rsocket;
+const net = __importStar(require("net"));
 // --- 第三方 ---
 const liws = __importStar(require("@litert/websocket"));
 // --- 库 ---
@@ -358,6 +360,7 @@ function bindPipe(s1, s2) {
                 }
             }
         }).on('close', () => {
+            s2.end();
             resolve();
         });
         // --- 监听远程端的 ---
@@ -390,6 +393,7 @@ function bindPipe(s1, s2) {
                 }
             }
         }).on('close', () => {
+            s1.end();
             resolve();
         });
     });
@@ -445,3 +449,58 @@ async function rproxy(ctr, url, opt = {}) {
     await bindPipe(socket, rsocket);
     return true;
 }
+/**
+ * --- 反向代理，将本 websocket 连接反代到其他真正的 socket，在 ws 的 onLoad 事件中使用 ---
+ * @param ctr 当前控制器
+ * @param host 反代真实请求地址
+ * @param port 反代真实请求端口
+ * @param opt 参数
+ */
+async function rsocket(ctr, host, port) {
+    return new Promise(resolve => {
+        /** --- 请求端产生的双向 ws --- */
+        const ws = ctr.getPrototype('_socket');
+        /** --- 对端真实 tcp socket --- */
+        const socket = new net.Socket();
+        socket.connect(port, host, () => {
+            // --- 连接成功 ---
+            // --- 监听发送端的 ---
+            ws.on('message', msg => {
+                switch (msg.opcode) {
+                    case EOpcode.TEXT:
+                    case EOpcode.BINARY: {
+                        socket.write(msg.data);
+                        break;
+                    }
+                    case EOpcode.CLOSE: {
+                        socket.end();
+                        resolve(true);
+                        break;
+                    }
+                    case EOpcode.PING: {
+                        ws.pong();
+                        break;
+                    }
+                    case EOpcode.PONG: {
+                        break;
+                    }
+                    default: {
+                        // --- EOpcode.CONTINUATION ---
+                    }
+                }
+            }).on('close', () => {
+                socket.end();
+                resolve(true);
+            });
+            // --- 监听远程端的 ---
+            socket.on('data', data => {
+                ws.writeBinary(data);
+            }).on('close', () => {
+                ws.end();
+                resolve(true);
+            });
+        }).on('error', () => {
+            resolve(false);
+        });
+    });
+}

package/lib/zip.js

@@ -182,15 +182,9 @@ class Zip {
      * @param opt 选项
      */
     readDir(path, opt = {}) {
-        if (opt.hasChildren === undefined) {
-            opt.hasChildren = false;
-        }
-        if (opt.hasDir === undefined) {
-            opt.hasDir = true;
-        }
-        if (opt.pathAsKey === undefined) {
-            opt.pathAsKey = false;
-        }
+        opt.hasChildren ??= false;
+        opt.hasDir ??= true;
+        opt.pathAsKey ??= false;
         if (!path) {
             path = this._path;
         }
@@ -302,7 +296,7 @@ class Zip {
      */
     _refreshList() {
         const list = {};
-        // eslint-disable-next-line @litert/rules/disable-for-each-method
+        // eslint-disable-next-line @litert/disable-for-each-method
         this._zip.forEach(function (relativePath, item) {
             if (relativePath.startsWith('/')) {
                 relativePath = relativePath.slice(1);

package/lib/zlib.js

@@ -60,9 +60,7 @@ const zlib = __importStar(require("zlib"));
  * @param options 选项
  */
 function createGzip(options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     return zlib.createGzip(options);
 }
 /**
@@ -76,9 +74,7 @@ function createGunzip() {
  * @param options 选项
  */
 function createDeflate(options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     return zlib.createDeflate(options);
 }
 /**
@@ -92,9 +88,7 @@ function createInflate() {
  * @param options 选项
  */
 function createBrotliCompress(options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     return zlib.createBrotliCompress(options);
 }
 /**
@@ -109,9 +103,7 @@ function createBrotliDecompress() {
  * @param options 选项
  */
 function createCompress(types, options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     const type = getTypeByTypes(types);
     if (!type) {
         return null;
@@ -176,9 +168,7 @@ function createDecompress(types) {
  * @param options 选项
  */
 function gzip(buffer, options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     return new Promise(function (resolve) {
         zlib.gzip(buffer, options, function (error, result) {
             if (error) {
@@ -212,9 +202,7 @@ function gunzip(buffer) {
  * @param options 选项
  */
 function deflate(buffer, options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     return new Promise(function (resolve) {
         zlib.deflate(buffer, options, function (error, result) {
             if (error) {
@@ -248,9 +236,7 @@ function inflate(buffer) {
  * @param options 选项
  */
 function brotliCompress(buffer, options = {}) {
-    if (!options.level) {
-        options.level = 7;
-    }
+    options.level ??= 7;
     return new Promise(function (resolve) {
         zlib.brotliCompress(buffer, options, function (error, result) {
             if (error) {

package/package.json

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

package/sys/ctr.js

@@ -147,9 +147,9 @@ class Ctr {
                 if (!this._waitInfo.asyncTask.count) {
                     this._waitInfo.asyncTask.resolve();
                 }
-            })().catch(async (e) => {
+            })().catch(e => {
                 lCore.display('[ERROR][CTR][ASYNCTASK]', e);
-                await lCore.log(this, '(ctr.asyncTask)' + text.stringifyJson(e.stack).slice(1, -1), '-error');
+                lCore.log(this, '[CTR][_asyncTask] ' + text.stringifyJson(e.stack).slice(1, -1), '-error');
                 --this._waitInfo.asyncTask.count;
                 if (!this._waitInfo.asyncTask.count) {
                     this._waitInfo.asyncTask.resolve();

package/sys/mod.js

@@ -189,15 +189,7 @@ class Mod {
         sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(cs, vs);
         const r = await db.execute(sq.getSql(), sq.getData());
         if (r.packet === null) {
-            await lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[insert, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
+            lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insert, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1), '-error');
             return false;
         }
         if (r.packet.affectedRows > 0) {
@@ -230,15 +222,7 @@ class Mod {
         sq.insert(this._$table + (opt.index ? ('_' + opt.index) : '')).values(data).duplicate(update);
         const r = await db.execute(sq.getSql(), sq.getData());
         if (r.packet === null) {
-            await lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[insertDuplicate, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[insertDuplicate, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.packet.affectedRows > 0) {
@@ -287,15 +271,7 @@ class Mod {
         }
         const r = await db.execute(sq.getSql(), sq.getData());
         if (r.packet === null) {
-            await lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[removeByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[removeByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.packet.affectedRows > 0) {
@@ -382,15 +358,7 @@ class Mod {
             }
             const r = await db.execute(sq.getSql(), sq.getData());
             if (r.packet === null) {
-                await lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {
-                    'path': '',
-                    'urlFull': '',
-                    'hostname': '',
-                    'req': null,
-                    'get': {},
-                    'cookie': {},
-                    'headers': {}
-                }, '[updateByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(opt.pre instanceof sCtr.Ctr ? opt.pre : {}, '[updateByWhere, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
             if (r.packet.affectedRows > 0) {
@@ -579,15 +547,7 @@ class Mod {
         sq.select(this._$primary, this._$table + (opt.index ? ('_' + opt.index) : '')).where(where);
         const r = await db.query(sq.getSql(), sq.getData());
         if (r.rows === null) {
-            await lCore.log(opt.ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[primarys, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(opt.ctr ?? {}, '[primarys, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         const primarys = [];
@@ -693,15 +653,7 @@ class Mod {
                     }
                 }
                 // --- 未处理的错误 ---
-                await lCore.log(this._ctr ?? {
-                    'path': '',
-                    'urlFull': '',
-                    'hostname': '',
-                    'req': null,
-                    'get': {},
-                    'cookie': {},
-                    'headers': {}
-                }, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                lCore.log(this._ctr ?? {}, '[create0, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 return false;
             }
         }
@@ -716,15 +668,7 @@ class Mod {
             r = await this._db.execute(this._sql.getSql(), this._sql.getData());
             if (r.error) {
                 if (r.error.errno !== 1062) {
-                    await lCore.log(this._ctr ?? {
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '[create1, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[create1, mod] [' + table + '] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                 }
                 return false;
             }
@@ -751,15 +695,7 @@ class Mod {
         this._sql.replace(cstr._$table + (this._index ? ('_' + this._index[0]) : '')).values(updates);
         const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
         if (r.packet === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[replace, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[replace, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.packet.affectedRows > 0) {
@@ -786,15 +722,7 @@ class Mod {
         }
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[refresh, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[refresh, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.rows.length === 0) {
@@ -824,15 +752,7 @@ class Mod {
             }]);
         const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
         if (r.packet === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[save, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[save, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.packet.affectedRows > 0) {
@@ -865,15 +785,7 @@ class Mod {
         }
         const r = await this._db.execute(this._sql.getSql(), this._sql.getData());
         if (r.packet === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[remove, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[remove, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.packet.affectedRows > 0) {
@@ -895,15 +807,7 @@ class Mod {
         }
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[first, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[first, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (r.rows.length === 0) {
@@ -1034,15 +938,7 @@ class Mod {
                 const lsql = sql.replace(/ LIMIT [0-9 ,]/g, ` LIMIT ${cz}, ${remain}`);
                 const r = await this._db.query(lsql, this._sql.getData());
                 if (r.rows === null) {
-                    await lCore.log(this._ctr ?? {
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '[all, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[all, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                     return false;
                 }
                 if (key) {
@@ -1078,15 +974,7 @@ class Mod {
         const contain = this._contain ? lCore.clone(this._contain.list) : null;
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[all, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[all, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         // --- 检查没被查到的必包含项 ---
@@ -1211,15 +1099,7 @@ class Mod {
                 const lsql = sql.replace(/ LIMIT [0-9 ,]+/g, ` LIMIT ${cz}, ${remain}`);
                 const r = await this._db.query(lsql, this._sql.getData());
                 if (r.rows === null) {
-                    await lCore.log(this._ctr ?? {
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '[allArray, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+                    lCore.log(this._ctr ?? {}, '[allArray, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
                     return false;
                 }
                 if (key) {
@@ -1241,15 +1121,7 @@ class Mod {
         const contain = this._contain ? lCore.clone(this._contain.list) : null;
         const r = await this._db.query(this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[allArray, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[allArray, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         // --- 检查没被查到的必包含项 ---
@@ -1298,15 +1170,7 @@ class Mod {
     async explain(all = false) {
         const r = await this._db.query('EXPLAIN ' + this._sql.getSql(), this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[explain, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[explain, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return false;
         }
         if (!r.rows[0]) {
@@ -1341,15 +1205,7 @@ class Mod {
         const sql = this._formatTotal(this._sql.getSql(), f);
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[total, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[total, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return 0;
         }
         let count = 0;
@@ -1365,15 +1221,7 @@ class Mod {
         const sql = this._sql.getSql().replace(/SELECT .+? FROM/, 'SELECT COUNT(*) AS `count` FROM');
         const r = await this._db.query(sql, this._sql.getData());
         if (r.rows === null) {
-            await lCore.log(this._ctr ?? {
-                'path': '',
-                'urlFull': '',
-                'hostname': '',
-                'req': null,
-                'get': {},
-                'cookie': {},
-                'headers': {}
-            }, '[count, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
+            lCore.log(this._ctr ?? {}, '[count, mod] ' + lText.stringifyJson(r.error?.message ?? '').slice(1, -1).replace(/"/g, '""'), '-error');
             return 0;
         }
         let count = 0;

package/sys/route.js

@@ -299,6 +299,8 @@ async function run(data) {
         let wsSocket;
         try {
             const options = await cctr.onUpgrade();
+            // --- 默认无消息发送 3 分钟 ---
+            options.timeout ??= 60_000 * 3;
             wsSocket = lWs.createServer(data.req, data.socket, options);
             cctr.setPrototype('_socket', wsSocket);
         }

package/www/example/ws/rsocket.d.ts

@@ -0,0 +1,4 @@
+import * as sCtr from '~/sys/ctr';
+export default class extends sCtr.Ctr {
+    onLoad(): Promise<boolean>;
+}

package/www/example/ws/rsocket.js

@@ -0,0 +1,47 @@
+"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;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const sCtr = __importStar(require("~/sys/ctr"));
+const lWs = __importStar(require("~/lib/ws"));
+class default_1 extends sCtr.Ctr {
+    async onLoad() {
+        console.log('WebSocket rsocket test onLoad.');
+        if (await lWs.rsocket(this, '192.168.31.99', 5900)) {
+            return false;
+        }
+        return true;
+    }
+}
+exports.default = default_1;

package/www/example/ws/test.d.ts

@@ -1,6 +1,11 @@
 import * as sCtr from '~/sys/ctr';
+import * as http from 'http';
 export default class extends sCtr.Ctr {
     private _nick;
+    onUpgrade(): {
+        'headers'?: http.OutgoingHttpHeaders;
+        'timeout'?: number;
+    };
     onLoad(): boolean;
     onData(data: Buffer | string): string;
     onClose(): void;

package/www/example/ws/test.js

@@ -40,6 +40,11 @@ class default_1 extends sCtr.Ctr {
         super(...arguments);
         this._nick = '';
     }
+    onUpgrade() {
+        return {
+            'timeout': 60_000 * 2,
+        };
+    }
     onLoad() {
         console.log('WebSocket test onLoad.');
         setTimeout(() => {
@@ -59,7 +64,8 @@ class default_1 extends sCtr.Ctr {
             return 'Base64: ' + lCrypto.base64Encode(data);
         }
         // --- 用户消息 ---
-        console.log('[' + Date.now() + '] WebSocket test onData, data: ' + data);
+        const date = new Date();
+        console.log('[' + date.getHours().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0') + ':' + date.getSeconds().toString().padStart(2, '0') + '] WebSocket test onData, data: ' + data);
         return '<b>' + this._nick + ':</b> ' + data;
     }
     onClose() {