@maiyunnet/kebab 3.2.3 → 3.2.5

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "3.2.3";
+export declare const VER = "3.2.5";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 export declare const LIB_PATH: string;
@@ -159,10 +159,10 @@ export interface IConfigConst {
 }
 /** --- 虚拟机配置对象 --- */
 export interface IVhost {
-    readonly 'name': string;
+    readonly 'name'?: string;
     readonly 'domains': string[];
     readonly 'root': string;
-    readonly 'remark': string;
+    readonly 'remark'?: string;
 }
 /** --- 上传的文件信息对象 --- */
 export interface IPostFile {

package/index.js

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

package/lib/s3.d.ts

@@ -60,7 +60,7 @@ export declare class S3 {
      * @param key 对象路径
      * @param bucket bucket 名
      */
-    getObject(key: string, bucket?: string): Promise<false | (stream.Readable & import("@smithy/types").SdkStreamMixin) | (Blob & import("@smithy/types").SdkStreamMixin) | (ReadableStream<any> & import("@smithy/types").SdkStreamMixin) | undefined>;
+    getObject(key: string, bucket?: string): Promise<any>;
     /**
      * --- 删除对象 ---
      * @param key 对象路径

package/lib/ws.d.ts

@@ -1,7 +1,7 @@
 /**
  * Project: Kebab, User: JianSuoQiYue
  * Date: 2019-6-2 20:42
- * Last: 2020-4-9 22:33:11, 2022-09-13 13:32:01, 2022-12-30 19:13:07, 2024-2-6 23:53:45, 2024-12-23 01:33:16, 2025-1-28 21:05:51, 2025-9-23 12:27:48
+ * Last: 2020-4-9 22:33:11, 2022-09-13 13:32:01, 2022-12-30 19:13:07, 2024-2-6 23:53:45, 2024-12-23 01:33:16, 2025-1-28 21:05:51, 2025-9-23 12:27:48, 2025-10-4 23:20:32
  */
 import * as http from 'http';
 import * as net from 'net';
@@ -104,15 +104,14 @@ export declare class Socket {
     /** --- 绑定监听 --- */
     on(event: 'message', cb: (msg: {
         'opcode': EOpcode;
-        'buffer': Buffer;
-        'data': Buffer | string;
+        'data': Buffer;
     }) => void | Promise<void>): this;
     on(event: 'error', cb: (error: any) => void | Promise<void>): this;
     on(event: 'drain' | 'close' | 'end', cb: () => void | Promise<void>): this;
     end(): void;
     destroy(): void;
     /** --- 发送文本 --- */
-    writeText(data: string): boolean;
+    writeText(data: Buffer | string | Array<Buffer | string>): boolean;
     /** --- 发送结果对象字符串 --- */
     writeResult(data: kebab.Json): boolean;
     /** --- 发送二进制 --- */

package/lib/ws.js

@@ -20,7 +20,9 @@ export var EOpcode;
     EOpcode[EOpcode["PING"] = 9] = "PING";
     EOpcode[EOpcode["PONG"] = 10] = "PONG";
 })(EOpcode || (EOpcode = {}));
-const liwsServer = liws.createServer();
+const liwsServer = liws.createServer({
+    'frameReceiveMode': EFrameReceiveMode.SIMPLE,
+});
 export class Socket {
     constructor(request, socket, options = {}) {
         /** --- 还未开启监听时来的数据将存在这里 --- */
@@ -137,17 +139,17 @@ export class Socket {
     /** --- 创建成功后第一时间绑定事件 --- */
     _bindEvent() {
         this._ws.on('message', msg => {
-            (async () => {
-                if (msg.opcode === EOpcode.CLOSE) {
-                    return;
-                }
-                const buf = 'data' in msg ? Buffer.concat(msg.data) : await msg.toBuffer();
-                this._on.message({
-                    'opcode': msg.opcode,
-                    'buffer': buf,
-                    'data': msg.opcode === EOpcode.TEXT ? buf.toString() : buf,
-                });
-            })().catch(() => { });
+            if (msg.opcode === EOpcode.CLOSE) {
+                return;
+            }
+            if (!('data' in msg)) {
+                return;
+            }
+            const buf = Buffer.concat(msg.data);
+            this._on.message({
+                'opcode': msg.opcode,
+                'data': buf,
+            });
         }).on('drain', () => {
             this._on.drain();
         }).on('error', (e) => {
@@ -277,17 +279,16 @@ export function createServer(request, socket, options = {}) {
  * @param s2 第二个 socket
  */
 function bindPipe(s1, s2) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
         // --- 监听发送端的 ---
         s1.on('message', (msg) => {
             switch (msg.opcode) {
-                case EOpcode.TEXT:
+                case EOpcode.TEXT: {
+                    s2.writeText(msg.data.toString());
+                    break;
+                }
                 case EOpcode.BINARY: {
-                    if (typeof msg.data === 'string') {
-                        s2.writeText(msg.data);
-                        break;
-                    }
-                    s2.writeBinary(msg.buffer);
+                    s2.writeBinary(msg.data);
                     break;
                 }
                 case EOpcode.CLOSE: {
@@ -314,13 +315,12 @@ function bindPipe(s1, s2) {
         // --- 监听远程端的 ---
         s2.on('message', (msg) => {
             switch (msg.opcode) {
-                case EOpcode.TEXT:
+                case EOpcode.TEXT: {
+                    s1.writeText(msg.data.toString());
+                    break;
+                }
                 case EOpcode.BINARY: {
-                    if (typeof msg.data === 'string') {
-                        s1.writeText(msg.data);
-                        break;
-                    }
-                    s1.writeBinary(msg.buffer);
+                    s1.writeBinary(msg.data);
                     break;
                 }
                 case EOpcode.CLOSE: {
@@ -423,7 +423,7 @@ export async function rsocket(ctr, host, port) {
                 switch (msg.opcode) {
                     case EOpcode.TEXT:
                     case EOpcode.BINARY: {
-                        socket.write(msg.buffer);
+                        socket.write(msg.data);
                         break;
                     }
                     case EOpcode.CLOSE: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [
@@ -19,25 +19,25 @@
     "#kebab/*": "./*"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.894.0",
-    "@aws-sdk/lib-storage": "^3.894.0",
+    "@aws-sdk/client-s3": "^3.901.0",
+    "@aws-sdk/lib-storage": "^3.903.0",
     "@litert/http-client": "^1.1.2",
     "@litert/mime": "^0.1.3",
     "@litert/redis": "^3.0.5",
-    "@litert/websocket": "^0.2.3",
+    "@litert/websocket": "^0.2.4",
     "@types/ssh2": "^1.15.5",
     "ejs": "^3.1.10",
     "jszip": "^3.10.1",
-    "mysql2": "^3.15.0",
+    "mysql2": "^3.15.1",
     "ssh2": "^1.17.0",
     "svg-captcha": "^1.4.0",
-    "tencentcloud-sdk-nodejs": "^4.1.120"
+    "tencentcloud-sdk-nodejs": "^4.1.126"
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.3.1",
     "@types/ejs": "^3.1.5",
-    "@types/node": "^24.5.2",
+    "@types/node": "^24.7.0",
     "tsc-alias": "^1.8.16",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   }
 }

package/sys/ctr.d.ts

@@ -124,6 +124,10 @@ export declare class Ctr {
      * --- WebSocket 下连接恢复可写入状态后会调用此事件，可重写此方法 ---
      */
     onDrain(): void | Promise<void>;
+    /**
+     * --- WebSocket 下连接被 end 后会自动被调用的事件，可重写此方法 ---
+     */
+    onEnd(): void | Promise<void>;
     /**
      * --- WebSocket 下连接被终止后会自动被调用的事件，可重写此方法 ---
      */
@@ -231,7 +235,7 @@ export declare class Ctr {
      * --- 发送 socket 文本 ---
      * @param data 要发送的信息
      */
-    protected _writeText(data: string): boolean;
+    protected _writeText(data: Buffer | string | Array<Buffer | string>): boolean;
     /**
      * --- 发送结果对象文本 ---
      * @param data 要发送的结果对象，如 [0, 'Failed.']

package/sys/ctr.js

@@ -163,6 +163,12 @@ export class Ctr {
     onDrain() {
         return;
     }
+    /**
+     * --- WebSocket 下连接被 end 后会自动被调用的事件，可重写此方法 ---
+     */
+    onEnd() {
+        return;
+    }
     /**
      * --- WebSocket 下连接被终止后会自动被调用的事件，可重写此方法 ---
      */

package/sys/route.js

@@ -274,7 +274,7 @@ export async function run(data) {
                     wsSocket.on('message', async function (msg) {
                         switch (msg.opcode) {
                             case ws.EOpcode.CLOSE: {
-                                const r = await cctr['onMessage'](msg.buffer, msg.opcode);
+                                const r = await cctr['onMessage'](msg.data, msg.opcode);
                                 if (r === false) {
                                     break;
                                 }
@@ -282,7 +282,7 @@ export async function run(data) {
                                 break;
                             }
                             case ws.EOpcode.PING: {
-                                const r = await cctr['onMessage'](msg.buffer, msg.opcode);
+                                const r = await cctr['onMessage'](msg.data, msg.opcode);
                                 if (r === false) {
                                     break;
                                 }
@@ -292,11 +292,11 @@ export async function run(data) {
                             case ws.EOpcode.BINARY:
                             case ws.EOpcode.TEXT: {
                                 try {
-                                    const r = await cctr['onMessage'](msg.buffer, msg.opcode);
+                                    const r = await cctr['onMessage'](msg.data, msg.opcode);
                                     if (r === false) {
                                         break;
                                     }
-                                    const wrtn = await cctr['onData'](msg.data, msg.opcode);
+                                    const wrtn = await cctr['onData'](msg.opcode === ws.EOpcode.TEXT ? msg.data.toString() : msg.data, msg.opcode);
                                     if (wrtn === false) {
                                         wsSocket.end();
                                         return;
@@ -339,6 +339,13 @@ export async function run(data) {
                         }
                     }).on('error', (e) => {
                         lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                    }).on('end', async () => {
+                        try {
+                            await cctr['onEnd']();
+                        }
+                        catch (e) {
+                            lCore.log(cctr, lText.stringifyJson(e.stack).slice(1, -1), '-error');
+                        }
                     }).on('close', async () => {
                         try {
                             await cctr['onClose']();
@@ -476,7 +483,7 @@ export async function run(data) {
                 return true;
             }
             // --- 检测 action 是否存在，以及排除内部方法 ---
-            if (pathRight.startsWith('_') || pathRight === 'onUpgrade' || pathRight === 'onLoad' || pathRight === 'onData' || pathRight === 'onDrain' || pathRight === 'onClose' || pathRight === 'setPrototype' || pathRight === 'getPrototype' || pathRight === 'getAuthorization') {
+            if (pathRight.startsWith('_') || pathRight === 'onUpgrade' || pathRight === 'onLoad' || pathRight === 'onData' || pathRight === 'onDrain' || pathRight === 'onEnd' || pathRight === 'onClose' || pathRight === 'setPrototype' || pathRight === 'getPrototype' || pathRight === 'getAuthorization') {
                 // --- _ 开头的 action 是内部方法，不允许访问 ---
                 if (config.route['#404']) {
                     data.res.setHeader('location', lText.urlResolve(config.const.urlBase, config.route['#404']));