@maiyunnet/kebab 3.2.10 → 3.2.12

package/index.d.ts

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

package/index.js

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

package/lib/core.js

@@ -360,6 +360,9 @@ export async function passThroughAppend(passThrough, data, end = true) {
     for (const item of data) {
         if (item instanceof stream.Readable || item instanceof lResponse.Response) {
             const stm = item instanceof stream.Readable ? item : item.getStream();
+            if (!stm) {
+                continue;
+            }
             // --- 读取流、Net 库 Response 对象 ---
             stm.pipe(passThrough, {
                 'end': false

package/lib/net/response.d.ts

@@ -27,9 +27,9 @@ export declare class Response {
     /**
      * --- 获取响应读取流对象 ---
      */
-    getStream(): stream.Readable;
+    getStream(): stream.Readable | null;
     /**
      * --- 获取原生响应读取流对象 ---
      */
-    getRawStream(): stream.Readable;
+    getRawStream(): stream.Readable | null;
 }

package/lib/net/response.js

@@ -29,12 +29,12 @@ export class Response {
      * --- 获取响应读取流对象 ---
      */
     getStream() {
-        return this._req.getStream();
+        return this._req ? this._req.getStream() : null;
     }
     /**
      * --- 获取原生响应读取流对象 ---
      */
     getRawStream() {
-        return this._req.getRawStream();
+        return this._req ? this._req.getRawStream() : null;
     }
 }

package/lib/net.js

@@ -494,6 +494,10 @@ export async function mproxy(ctr, auth, opt = {}) {
         ...opt,
         headers
     });
+    const stream = rres.getRawStream();
+    if (!stream) {
+        return -3;
+    }
     if (rres.error) {
         return -2;
     }
@@ -502,7 +506,7 @@ export async function mproxy(ctr, auth, opt = {}) {
     }
     res.writeHead(rres.headers?.['http-code'] ?? 200);
     await new Promise((resolve) => {
-        rres.getRawStream().pipe(res).on('finish', () => {
+        stream.pipe(res).on('finish', () => {
             resolve();
         });
     });
@@ -554,6 +558,10 @@ export async function rproxy(ctr, route, opt = {}) {
             ...opt,
             headers
         });
+        const stream = rres.getRawStream();
+        if (!stream) {
+            return false;
+        }
         if (rres.error) {
             return false;
         }
@@ -562,7 +570,7 @@ export async function rproxy(ctr, route, opt = {}) {
         }
         res.writeHead(rres.headers?.['http-code'] ?? 200);
         await new Promise((resolve) => {
-            rres.getRawStream().pipe(res).on('finish', () => {
+            stream.pipe(res).on('finish', () => {
                 resolve();
             });
         });

package/lib/ws.js

@@ -107,7 +107,7 @@ export class Socket {
                 'auth': opt.mproxy?.auth ?? ''
             }) : uri.path;
             const cli = ca ?
-                await liws.wssConnect({
+                liws.createSecureClient({
                     'hostname': (typeof hosts === 'string' ? hosts : hosts[host]) || host,
                     'port': port,
                     'path': path,
@@ -116,20 +116,21 @@ export class Socket {
                     'connectTimeout': timeout * 1000,
                     'frameReceiveMode': mode,
                     'localAddress': local,
-                    'ca': ca
+                    'ca': ca,
                 }) :
-                await liws.wsConnect({
+                liws.createClient({
                     'hostname': (typeof hosts === 'string' ? hosts : hosts[host]) || host,
                     'port': port,
                     'path': path,
                     'headers': headers,
                     'connectTimeout': timeout * 1000,
                     'frameReceiveMode': mode,
-                    'localAddress': local
+                    'localAddress': local,
                 });
             cli.setMasking(masking);
             this._ws = cli;
             this._bindEvent();
+            await cli.connect();
             return this;
         }
         catch {

package/package.json

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

package/sys/mod.d.ts

@@ -198,6 +198,7 @@ export default class Mod {
         'raw'?: boolean;
         'pre'?: string;
         'index'?: string | string[];
+        'alias'?: string;
         'contain'?: {
             'key': string;
             'list': string[];

package/sys/mod.js

@@ -115,11 +115,9 @@ class Mod {
         }
         /** --- 是否有 select --- */
         const select = opt.select ?? (opt.where ? '*' : '');
-        if (select) {
-            this._sql.select(select, this.constructor._$table +
-                (this._index !== null ? ('_' + this._index[0]) : '') +
-                (opt.alias ? ' ' + opt.alias : ''));
-        }
+        this._sql.select(select, this.constructor._$table +
+            (this._index !== null ? ('_' + this._index[0]) : '') +
+            (opt.alias ? ' ' + opt.alias : ''));
         if (opt.where !== undefined) {
             if (this.constructor._soft && !opt.raw) {
                 if (typeof opt.where === 'string') {
@@ -417,7 +415,8 @@ class Mod {
             'where': s,
             'raw': opt.raw,
             'index': opt.index,
-            'contain': opt.contain
+            'contain': opt.contain,
+            'alias': opt.alias,
         });
     }
     /**

package/sys/route.js

@@ -579,12 +579,7 @@ export async function run(data) {
             // --- 已经自行输出过 writeHead，可能自行处理了内容，如 pipe，则不再 writeHead ---
         }
         else {
-            if (data.res.getHeader('location')) {
-                data.res.writeHead(302);
-            }
-            else {
-                data.res.writeHead(httpCode);
-            }
+            data.res.writeHead(data.res.getHeader('location') ? 302 : httpCode);
         }
         if (!data.res.writableEnded) {
             // --- 如果当前还没结束，则强制关闭连接，一切 pipe 请自行在方法中 await，否则会被中断 ---
@@ -623,6 +618,11 @@ export async function run(data) {
     else if (rtn instanceof stream.Readable || rtn instanceof lResponse.Response) {
         // --- 返回的是流，那就以管道的形式输出 ---
         const stm = rtn instanceof stream.Readable ? rtn : rtn.getStream();
+        if (!stm) {
+            data.res.end('');
+            await waitCtr(cctr ?? middle);
+            return true;
+        }
         /** --- 当前的压缩对象 --- */
         let compress = null;
         if (!data.res.headersSent) {