@maiyunnet/kebab 2.0.14 → 2.0.16

package/lib/sql.js

@@ -2,7 +2,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-5-27 20:18:50
- * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28
+ * Last: 2020-3-29 19:37:25, 2022-07-24 22:38:11, 2023-5-24 18:49:18, 2023-6-13 22:20:21, 2023-12-11 13:58:54, 2023-12-14 13:14:40, 2023-12-21 00:04:40, 2024-4-11 19:29:29, 2024-9-2 17:15:28, 2025-8-3 21:28:18
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -43,12 +43,12 @@ exports.get = get;
 exports.format = format;
 exports.aoMix = aoMix;
 exports.column = column;
-const lText = __importStar(require("../lib/text"));
-const lCore = __importStar(require("../lib/core"));
+const lText = __importStar(require("~/lib/text"));
+const lCore = __importStar(require("~/lib/core"));
 // --- 第三方 ---
 const mysql2 = __importStar(require("mysql2/promise"));
 // --- 库和定义 ---
-const ctr = __importStar(require("../sys/ctr"));
+const ctr = __importStar(require("~/sys/ctr"));
 /** --- filed 用 token --- */
 let columnToken = '';
 class Sql {
@@ -116,17 +116,7 @@ class Sql {
                     // --- v1 是项目值，如 {'x': 1, 'y': 2}, 'string', 0 ---
                     if (v1 === undefined || Number.isNaN(v1)) {
                         // --- 异常情况 ---
-                        lCore.log({
-                            'path': '',
-                            'urlFull': '',
-                            'hostname': '',
-                            'req': null,
-                            'get': {},
-                            'cookie': {},
-                            'headers': {}
-                        }, '(sql.values) value error', '-error').catch(() => {
-                            //
-                        });
+                        lCore.log({}, '[SQL][values] value error', '-error');
                         sql += `'', `;
                     }
                     else if (v1 === null) {
@@ -200,17 +190,7 @@ class Sql {
                 sql += this.field(k) + ', ';
                 if (v === undefined || Number.isNaN(v)) {
                     // --- 异常情况 ---
-                    lCore.log({
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '(sql.values) value error', '-error').catch(() => {
-                        //
-                    });
+                    lCore.log({}, '[SQL][values] value error', '-error');
                     values += `'', `;
                 }
                 else if (v === null) {
@@ -413,17 +393,7 @@ class Sql {
                 sql += this.field(k) + ' = ';
                 if (v === undefined || Number.isNaN(v)) {
                     // --- 异常情况 ---
-                    lCore.log({
-                        'path': '',
-                        'urlFull': '',
-                        'hostname': '',
-                        'req': null,
-                        'get': {},
-                        'cookie': {},
-                        'headers': {}
-                    }, '(sql._updateSub) value error, key: ' + k, '-error').catch(() => {
-                        //
-                    });
+                    lCore.log({}, '[SQL][_updateSub] value error, key: ' + k, '-error');
                     sql += '"", ';
                 }
                 else if (v === null) {

package/lib/ssh/sftp.js

@@ -35,8 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Connection = void 0;
 // --- 库和定义 ---
-const core = __importStar(require("../../lib/core"));
-const text = __importStar(require("../../lib/text"));
+const core = __importStar(require("~/lib/core"));
+const text = __importStar(require("~/lib/text"));
 class Connection {
     constructor(sftp, path) {
         this._client = sftp;

package/lib/ssh/shell.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Connection = void 0;
-const lCore = __importStar(require("../../lib/core"));
+const lCore = __importStar(require("~/lib/core"));
 class Connection {
     constructor(stream) {
         this._client = stream;

package/lib/text.d.ts

@@ -1,4 +1,4 @@
-import * as types from '../types';
+import * as types from '~/types';
 /**
  * --- 将文件大小格式化为带单位的字符串 ---
  * @param size 文件大小
@@ -139,6 +139,11 @@ type TFalsy = false | '' | 0 | null | undefined | typeof NaN;
  * @param val 要判断的值
  */
 export declare function isFalsy(val: any): val is TFalsy;
+/**
+ * --- 判断一个值是否是真实的（不为 null/undefined/空字符串/false/0） ---
+ * @param val 要判断的值
+ */
+export declare function isTruthy(val: any): val is Exclude<typeof val, TFalsy>;
 /**
  * --- 类似 || 运算符的效果 ---
  * @param v1 比对值

package/lib/text.js

@@ -58,6 +58,7 @@ exports.parseJson = parseJson;
 exports.stringifyJson = stringifyJson;
 exports.stringifyBuffer = stringifyBuffer;
 exports.isFalsy = isFalsy;
+exports.isTruthy = isTruthy;
 exports.logicalOr = logicalOr;
 exports.str2int = str2int;
 exports.int2str = int2str;
@@ -66,7 +67,7 @@ exports.int2str = int2str;
  * Date: 2019-5-15 16:49:39
  * Last: 2020-04-06 20:51:06, 2022-9-29 15:18:16, 2022-12-29 00:01:30, 2024-3-6 17:53:14, 2024-5-31 17:29:52, 2025-6-13 15:47:02
  */
-const kebab = __importStar(require("../index"));
+const kebab = __importStar(require("~/index"));
 const fs = __importStar(require("./fs"));
 /**
  * --- 将文件大小格式化为带单位的字符串 ---
@@ -587,6 +588,13 @@ function stringifyBuffer(buf) {
 function isFalsy(val) {
     return (val === null) || (val === undefined) || (val === '') || (val === false) || (val === 0);
 }
+/**
+ * --- 判断一个值是否是真实的（不为 null/undefined/空字符串/false/0） ---
+ * @param val 要判断的值
+ */
+function isTruthy(val) {
+    return !isFalsy(val);
+}
 /**
  * --- 类似 || 运算符的效果 ---
  * @param v1 比对值

package/lib/time.d.ts

@@ -3,7 +3,7 @@
  * Date: 2019-6-6 12:04:15
  * Last: 2020-3-29 23:41:21, 2024-1-18 17:16:50, 2024-8-5 10:55:21
  */
-import * as sCtr from '../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 export interface IOptions {
     /** --- 时区 --- */
     'zone'?: number;

package/lib/time.js

@@ -43,7 +43,7 @@ exports.format = format;
  * Date: 2019-6-6 12:04:15
  * Last: 2020-3-29 23:41:21, 2024-1-18 17:16:50, 2024-8-5 10:55:21
  */
-const sCtr = __importStar(require("../sys/ctr"));
+const sCtr = __importStar(require("~/sys/ctr"));
 /** --- 一小时的秒数 --- */
 exports.HOUR = 3600;
 /** --- 一天的秒数 --- */

package/lib/turnstile.d.ts

@@ -1,4 +1,4 @@
-import * as sCtr from '../sys/ctr';
+import * as sCtr from '~/sys/ctr';
 /**
  * 0. CloudFlare：https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
  * 1. 腾讯云：https://cloud.tencent.com/document/product/1110/36926

package/lib/turnstile.js

@@ -42,8 +42,8 @@ exports.verify = verify;
  */
 const tc = __importStar(require("tencentcloud-sdk-nodejs"));
 // --- 库和定义 ---
-const lNet = __importStar(require("../lib/net"));
-const lText = __importStar(require("../lib/text"));
+const lNet = __importStar(require("~/lib/net"));
+const lText = __importStar(require("~/lib/text"));
 /**
  * 0. CloudFlare：https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
  * 1. 腾讯云：https://cloud.tencent.com/document/product/1110/36926

package/lib/ws.d.ts

@@ -5,8 +5,8 @@
  */
 import * as http from 'http';
 import * as net from 'net';
-import * as types from '../types';
-import * as sCtr from '../sys/ctr';
+import * as types from '~/types';
+import * as sCtr from '~/sys/ctr';
 /** --- 一般用 SIMPLE --- */
 export declare enum EFrameReceiveMode {
     STANDARD = 0,
@@ -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,11 +38,13 @@ 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"));
 // --- 库 ---
-const lText = __importStar(require("../lib/text"));
-const lNet = __importStar(require("../lib/net"));
+const lText = __importStar(require("~/lib/text"));
+const lNet = __importStar(require("~/lib/net"));
 /** --- 一般用 SIMPLE --- */
 var EFrameReceiveMode;
 (function (EFrameReceiveMode) {
@@ -95,7 +97,7 @@ class Socket {
             'request': request,
             'socket': socket,
             'headers': options.headers,
-            'timeout': options.timeout
+            'timeout': options.timeout,
         });
         this._bindEvent();
     }
@@ -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.d.ts

@@ -1,5 +1,5 @@
 import jszip from 'jszip';
-import * as types from '../types';
+import * as types from '~/types';
 /**
  * --- 本库主要用于读取 zip，请尽量不要用来写入 zip，尤其是大文件 zip ---
  */

package/lib/zip.js

@@ -40,7 +40,7 @@ exports.Zip = void 0;
 exports.get = get;
 const jszip_1 = __importDefault(require("jszip"));
 const mime = __importStar(require("@litert/mime"));
-const lText = __importStar(require("../lib/text"));
+const lText = __importStar(require("~/lib/text"));
 /**
  * --- 本库主要用于读取 zip，请尽量不要用来写入 zip，尤其是大文件 zip ---
  */
@@ -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.14",
+  "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",
@@ -14,8 +14,8 @@
     "kebab": "./bin/kebab.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.826.0",
-    "@aws-sdk/lib-storage": "^3.826.0",
+    "@aws-sdk/client-s3": "^3.844.0",
+    "@aws-sdk/lib-storage": "^3.844.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
@@ -26,12 +26,13 @@
     "mysql2": "^3.14.1",
     "ssh2": "^1.16.0",
     "svg-captcha": "^1.4.0",
+    "tencentcloud-sdk-nodejs": "^4.1.74",
     "ts-alias-loader": "^0.1.5"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^24.0.0",
+    "@types/node": "^24.0.12",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.8.3"
   }