@maiyunnet/kebab 3.2.7 → 3.2.9

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.7";
+export declare const VER = "3.2.9";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.2.7';
+export const VER = '3.2.9';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/crypto.d.ts

@@ -58,9 +58,13 @@ export declare function publicDecrypt(key: crypto.RsaPublicKey | crypto.RsaPriva
  * @param buffer 数据
  */
 export declare function privateDecrypt(key: crypto.RsaPrivateKey | crypto.KeyLike, buffer: NodeJS.ArrayBufferView | string): Buffer;
+/** --- 勿使用，无 iv 默认，但勿使用 --- */
 export declare const AES_256_ECB = "aes-256-ecb";
+/** --- 一般不用，兼容性场景下用 --- */
 export declare const AES_256_CBC = "aes-256-cbc";
-export declare const AES_256_CFB = "aes-256-cfb";
+/** --- 设置 iv 会自动切换为 CTR，流式下使用，非流直接使用 GCM --- */
+export declare const AES_256_CTR = "aes-256-ctr";
+/** --- 非流直接使用 GCM --- */
 export declare const AES_256_GCM = "aes-256-gcm";
 export declare const SM4_ECB = "sm4-ecb";
 export declare const SM4_CBC = "sm4-cbc";
@@ -69,7 +73,7 @@ export declare const SM4_CFB = "sm4-cfb";
  * --- cipher 加密，强烈不建议使用 AES_256_ECB ---
  * @param original 原始字符串
  * @param key 密钥 32 个英文字母和数字
- * @param iv 向量 16(CFB) 或 12(GCM) 个英文字母和数字
+ * @param iv 向量 16(CTR) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
 export declare function cipherEncrypt(original: string | Buffer, key: crypto.CipherKey, iv?: string, method?: string, output?: 'base64' | 'buffer'): string | Buffer | false;
@@ -83,7 +87,7 @@ export declare function sm4Encrypt(original: string | Buffer, key: crypto.Cipher
  * --- cipher 解密 ---
  * @param encrypt 需解密的字符串
  * @param key 密钥 32 个英文字母和数字
- * @param iv 向量 16(CFB) 或 12(GCM) 个英文字母和数字
+ * @param iv 向量 16(CTR) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
 export declare function cipherDecrypt(encrypt: string | Buffer, key: crypto.CipherKey, iv?: string, method?: string, output?: 'binary' | 'buffer'): string | Buffer | false;

package/lib/crypto.js

@@ -96,10 +96,14 @@ export function privateDecrypt(key, buffer) {
     return crypto.privateDecrypt(key, buffer);
 }
 // --- Cipher (AES/SM4...) 加/解密 ---
-export const AES_256_ECB = 'aes-256-ecb'; // --- 如果未设置 iv，则默认这个，但强烈不建议 ---
+/** --- 勿使用，无 iv 默认，但勿使用 --- */
+export const AES_256_ECB = 'aes-256-ecb';
+/** --- 一般不用，兼容性场景下用 --- */
 export const AES_256_CBC = 'aes-256-cbc';
-export const AES_256_CFB = 'aes-256-cfb'; // --- 设置 iv，自动就切换成了这个 ---
-export const AES_256_GCM = 'aes-256-gcm'; // --- 强烈建议使用这个 ---
+/** --- 设置 iv 会自动切换为 CTR，流式下使用，非流直接使用 GCM --- */
+export const AES_256_CTR = 'aes-256-ctr';
+/** --- 非流直接使用 GCM --- */
+export const AES_256_GCM = 'aes-256-gcm';
 export const SM4_ECB = 'sm4-ecb'; // --- SM4 如果未设置 iv，则默认这个 ---
 export const SM4_CBC = 'sm4-cbc';
 export const SM4_CFB = 'sm4-cfb'; // --- SM4 一般用这个，设置 iv，自动就切换成了这个 ---
@@ -107,7 +111,7 @@ export const SM4_CFB = 'sm4-cfb'; // --- SM4 一般用这个，设置 iv，自
  * --- cipher 加密，强烈不建议使用 AES_256_ECB ---
  * @param original 原始字符串
  * @param key 密钥 32 个英文字母和数字
- * @param iv 向量 16(CFB) 或 12(GCM) 个英文字母和数字
+ * @param iv 向量 16(CTR) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
 export function cipherEncrypt(original, key, iv = '', method = AES_256_ECB, output = 'base64') {
@@ -116,7 +120,7 @@ export function cipherEncrypt(original, key, iv = '', method = AES_256_ECB, outp
             key = hashHmac('md5', key, 'MaiyunSalt');
         }
         if (iv) {
-            if (method === AES_256_CFB) {
+            if (method === AES_256_CTR) {
                 if (iv.length !== 16) {
                     return false;
                 }
@@ -165,13 +169,13 @@ export function cipherEncrypt(original, key, iv = '', method = AES_256_ECB, outp
  * --- AES 加密 ---
  * @param original 原始字符串
  * @param key 密钥尽量 32 个英文字母和数字，不是 32 个系统会自动处理
- * @param iv 向量 16 个英文字母和数字
+ * @param iv 向量 16(CTR) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  * @param output 输出类型
  */
 export function aesEncrypt(original, key, iv = '', method = AES_256_ECB, output = 'base64') {
     if (iv !== '') {
-        method = method === AES_256_ECB ? AES_256_CFB : method;
+        method = method === AES_256_ECB ? AES_256_CTR : method;
     }
     return cipherEncrypt(original, key, iv, method, output);
 }
@@ -206,7 +210,7 @@ export function sm4Encrypt(original, key, iv = '', method = SM4_ECB, output = 'b
  * --- cipher 解密 ---
  * @param encrypt 需解密的字符串
  * @param key 密钥 32 个英文字母和数字
- * @param iv 向量 16(CFB) 或 12(GCM) 个英文字母和数字
+ * @param iv 向量 16(CTR) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
 export function cipherDecrypt(encrypt, key, iv = '', method = AES_256_ECB, output = 'binary') {
@@ -215,7 +219,7 @@ export function cipherDecrypt(encrypt, key, iv = '', method = AES_256_ECB, outpu
             key = hashHmac('md5', key, 'MaiyunSalt');
         }
         if (iv) {
-            if (method === AES_256_CFB) {
+            if (method === AES_256_CTR) {
                 if (iv.length !== 16) {
                     return false;
                 }
@@ -268,12 +272,12 @@ export function cipherDecrypt(encrypt, key, iv = '', method = AES_256_ECB, outpu
  * --- AES 解密 ---
  * @param encrypt 需解密的字符串
  * @param key 密钥 32 个英文字母和数字
- * @param iv 向量 16 个英文字母和数字
+ * @param iv 向量 16(CTR) 或 12(GCM) 个英文字母和数字
  * @param method 加密方法
  */
 export function aesDecrypt(encrypt, key, iv = '', method = AES_256_ECB, output = 'binary') {
     if (iv !== '') {
-        method = method === AES_256_ECB ? AES_256_CFB : method;
+        method = method === AES_256_ECB ? AES_256_CTR : method;
     }
     return cipherDecrypt(encrypt, key, iv, method, output);
 }

package/lib/db.js

@@ -9,7 +9,6 @@ import * as mysql2 from 'mysql2/promise';
 import * as lTime from '#kebab/lib/time.js';
 import * as lSql from '#kebab/lib/sql.js';
 import * as lCore from '#kebab/lib/core.js';
-import * as lText from '#kebab/lib/text.js';
 import * as sCtr from '#kebab/sys/ctr.js';
 /** --- 连接列表池 --- */
 const connections = [];
@@ -170,7 +169,7 @@ export class Pool {
                 link.on('error', function (err) {
                     c.setLost();
                     if (err.code !== 'PROTOCOL_CONNECTION_LOST') {
-                        lCore.debug('[DB][_getConnection][error]', err);
+                        lCore.debug('[DB][_getConnection][error]', err.message);
                     }
                 }).on('end', () => {
                     // lCore.debug('[DB][_getConnection] connection end.');
@@ -182,7 +181,7 @@ export class Pool {
                 connections.push(conn);
             }
             catch (e) {
-                const msg = '[DB][_getConnection] ' + lText.stringifyJson(e.stack).slice(1, -1);
+                const msg = '[DB][_getConnection] ' + e.message;
                 lCore.debug(msg);
                 lCore.log({}, msg, '-error');
             }

package/lib/kv.js

@@ -618,7 +618,7 @@ export class Pool {
             link.on('error', function (err) {
                 conn.setLost();
                 // console.log(`--- redis [${conn._etc.host}:${conn._etc.port}] error ---`);
-                lCore.debug('[KV][ERROR]', err);
+                lCore.debug('[KV][ERROR]', err.message);
             }).on('end', () => {
                 conn.setLost();
             }).on('close', () => {

package/lib/socket.js

@@ -4,6 +4,7 @@
  * Last: 2025-9-25 16:49:48
  */
 import net from 'net';
+import * as lTime from '#kebab/lib/time.js';
 import * as lWs from '#kebab/lib/ws.js';
 import * as lCore from '#kebab/lib/core.js';
 /**
@@ -17,7 +18,7 @@ export function rwebsocket(port, url, opt = {}) {
     const server = net.createServer(socket => {
         (async () => {
             // --- 每次进一个新连接都反代到一个新 WebSocket ---
-            lCore.display('New client: ' + socket.remoteAddress + ':' + socket.remotePort);
+            lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] New client: ' + socket.remoteAddress + ':' + socket.remotePort);
             /** --- 远程端的双向 websocket --- */
             const rws = await lWs.connect(url, opt);
             if (!rws) {
@@ -52,13 +53,13 @@ export function rwebsocket(port, url, opt = {}) {
                 rws.writeBinary(data);
             }).on('end', () => {
                 rws.end();
-                lCore.display('Client disconnected: ' + socket.remoteAddress + ':' + socket.remotePort);
+                lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] Client disconnected: ' + socket.remoteAddress + ':' + socket.remotePort);
             }).on('error', err => {
-                lCore.display('Client error: ' + socket.remoteAddress + ':' + socket.remotePort + ', ' + err.message);
+                lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] Client error: ' + socket.remoteAddress + ':' + socket.remotePort + ', ' + err.message);
             });
         })().catch(() => { });
     }).listen(port, () => {
-        lCore.display('Listening:' + port);
+        lCore.display('[' + lTime.format(null, 'Y-m-d H:i:s') + '] Listening: ' + port);
     });
     return server;
 }

package/package.json

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

package/sys/ctr.d.ts

@@ -253,12 +253,12 @@ export declare class Ctr {
      * --- 发送 socket ping ---
      * @param data 要发送的信息
      */
-    protected _ping(): boolean;
+    protected _ping(data?: Buffer | string): boolean;
     /**
      * --- 发送 socket pong ---
      * @param data 要发送的信息
      */
-    protected _pong(): boolean;
+    protected _pong(data?: Buffer | string): boolean;
     /**
      * --- 主动关闭当前 socket 连接 ---
      */

package/sys/ctr.js

@@ -725,15 +725,15 @@ export class Ctr {
      * --- 发送 socket ping ---
      * @param data 要发送的信息
      */
-    _ping() {
-        return this._socket.ping();
+    _ping(data) {
+        return this._socket.ping(data);
     }
     /**
      * --- 发送 socket pong ---
      * @param data 要发送的信息
      */
-    _pong() {
-        return this._socket.pong();
+    _pong(data) {
+        return this._socket.pong(data);
     }
     /**
      * --- 主动关闭当前 socket 连接 ---

package/sys/route.js

@@ -235,7 +235,7 @@ export async function run(data) {
         // --- 先处理 web socket 的情况 ---
         let wsSocket;
         try {
-            const options = await cctr.onUpgrade();
+            const options = cctr.onUpgrade();
             // --- 默认无消息发送 3 分钟 ---
             options.timeout ??= 60_000 * 3;
             wsSocket = lWs.createServer(data.req, data.socket, options);

package/www/example/ctr/test.js

@@ -31,7 +31,7 @@ export default class extends sCtr.Ctr {
     }
     onLoad() {
         if (this._config.const.hostname !== '127.0.0.1' && this._config.const.hostname !== '172.17.0.1' &&
-            this._config.const.hostname !== 'localhost' && this._config.const.hostname !== 'local-test.brc-app.com' &&
+            this._config.const.hostname !== 'localhost' && !this._config.const.hostname.endsWith('.local.brc-app.com') &&
             !this._config.const.hostname.startsWith('192.168.')) {
             return [0, 'Please use 127.0.0.1 or local to access the file (' + this._config.const.host + ').'];
         }