@maiyunnet/kebab 3.1.14 → 3.1.16

package/README.md

@@ -26,6 +26,10 @@ Node 22+
 
 Run `npm i @maiyunnet/kebab` to install the latest version. After installation, run `npx kebab init` to initialize, then run `npx kebab` to start the project.
 
+You can also use pm2 to start the project by running:
+
+`pm2 start npx --name "kebab" -- kebab`
+
 ## Library
 
 Buffer, Captcha, Consistent, Core, Cron, Crypto, Db (MySQL), Dns (DNSPod, Alibaba Cloud), Fs, Jwt, Kv (Redis), Lan, Net, S3, Scan, Session, Sql, Ssh (Shell, Sftp), Text, Time, Ws, Zip, Zlib.

package/index.d.ts

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

package/index.js

@@ -9,7 +9,7 @@
  * ------------------------
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.1.14';
+export const VER = '3.1.16';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/net.js

@@ -429,7 +429,10 @@ export function getFormData() {
     return new fd.FormData();
 }
 /** --- proxy 要剔除的基础头部 --- */
-const proxyContinueHeaders = ['host', 'connection', 'http-version', 'http-code', 'http-url'];
+const proxyContinueHeaders = [
+    'host', 'connection', 'http-version', 'http-code', 'http-url',
+    'transfer-encoding'
+];
 /**
  * --- 剔除不代理的 header ---
  * @param headers 剔除前的 header

package/lib/ws.d.ts

@@ -97,6 +97,7 @@ export declare class Socket {
     /** --- 绑定监听 --- */
     on(event: 'message', cb: (msg: {
         'opcode': EOpcode;
+        'buffer': Buffer;
         'data': Buffer | string;
     }) => void | Promise<void>): this;
     on(event: 'error', cb: (error: any) => void | Promise<void>): this;

package/lib/ws.js

@@ -31,6 +31,7 @@ export class Socket {
         this._close = false;
         /** --- 未绑定自定义监听事件的默认执行函数 --- */
         this._on = {
+            /** --- 消息 --- */
             message: (msg) => {
                 this._waitMsg.push(msg);
             },
@@ -135,28 +136,18 @@ export class Socket {
     }
     /** --- 创建成功后第一时间绑定事件 --- */
     _bindEvent() {
-        this._ws.on('message', (msg) => {
+        this._ws.on('message', msg => {
             (async () => {
                 if (msg.opcode === EOpcode.CLOSE) {
                     return;
                 }
-                let data = '';
-                if ('data' in msg) {
-                    data = Buffer.concat(msg.data);
-                    if (msg.opcode === EOpcode.TEXT) {
-                        data = data.toString();
-                    }
-                }
-                else {
-                    data = await (msg.opcode === EOpcode.TEXT ? msg.toString() : msg.toBuffer());
-                }
+                const buf = 'data' in msg ? Buffer.concat(msg.data) : await msg.toBuffer();
                 this._on.message({
                     'opcode': msg.opcode,
-                    'data': data
+                    'buffer': buf,
+                    'data': msg.opcode === EOpcode.TEXT ? buf.toString() : buf,
                 });
-            })().catch(() => {
-                // --- nothing ---
-            });
+            })().catch(() => { });
         }).on('drain', () => {
             this._on.drain();
         }).on('error', (e) => {
@@ -292,11 +283,7 @@ function bindPipe(s1, s2) {
             switch (msg.opcode) {
                 case EOpcode.TEXT:
                 case EOpcode.BINARY: {
-                    if (typeof msg.data === 'string') {
-                        s2.writeText(msg.data);
-                        break;
-                    }
-                    s2.writeBinary(msg.data);
+                    s2.writeBinary(msg.buffer);
                     break;
                 }
                 case EOpcode.CLOSE: {
@@ -325,11 +312,7 @@ function bindPipe(s1, s2) {
             switch (msg.opcode) {
                 case EOpcode.TEXT:
                 case EOpcode.BINARY: {
-                    if (typeof msg.data === 'string') {
-                        s1.writeText(msg.data);
-                        break;
-                    }
-                    s1.writeBinary(msg.data);
+                    s1.writeBinary(msg.buffer);
                     break;
                 }
                 case EOpcode.CLOSE: {
@@ -426,7 +409,7 @@ export async function rsocket(ctr, host, port) {
                 switch (msg.opcode) {
                     case EOpcode.TEXT:
                     case EOpcode.BINARY: {
-                        socket.write(msg.data);
+                        socket.write(msg.buffer);
                         break;
                     }
                     case EOpcode.CLOSE: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.1.14",
+  "version": "3.1.16",
   "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/child.js

@@ -586,7 +586,7 @@ function getVhostByHostname(hostname) {
             }
             else if (domain.includes('*')) {
                 // --- 通配符匹配 ---
-                domain = domain.replace(/\./g, '\\.').replace(/\*/, '.+?');
+                domain = domain.replace(/\./g, '\\.').replace(/\*/g, '.+?');
                 if (new RegExp(`^${domain}$`).test(hostname)) {
                     vSub = vhost;
                 }

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

@@ -0,0 +1,5 @@
+import * as sCtr from '#kebab/sys/ctr.js';
+export default class extends sCtr.Ctr {
+    onLoad(): boolean;
+    onClose(): void;
+}

package/www/example/ws/main.js

@@ -0,0 +1,15 @@
+import * as sCtr from '#kebab/sys/ctr.js';
+import * as lCore from '#kebab/lib/core.js';
+export default class extends sCtr.Ctr {
+    onLoad() {
+        lCore.debug('WebSocket test main onLoad.');
+        setTimeout(() => {
+            this._writeText('Hello, world!');
+            this._end();
+        }, 2_000);
+        return true;
+    }
+    onClose() {
+        lCore.debug('WebSocket test main onClose');
+    }
+}