@maiyunnet/kebab 3.2.11 → 3.2.13

package/index.d.ts

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

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '3.2.11';
+export const VER = '3.2.13';
 // --- 服务端用的路径 ---
 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/s3.d.ts

@@ -60,7 +60,7 @@ export declare class S3 {
      * @param key 对象路径
      * @param bucket bucket 名
      */
-    getObject(key: string, bucket?: string): Promise<any>;
+    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>;
     /**
      * --- 删除对象 ---
      * @param key 对象路径

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "3.2.11",
+  "version": "3.2.13",
   "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/mod.d.ts

@@ -19,7 +19,7 @@ declare class Rows<T extends Mod> implements CRows<T> {
     get length(): number;
     /** --- 通过索引获取一个对象 --- */
     item(index: number): T;
-    /** --- 转换为数组对象 --- */
+    /** --- 转换为数组对象，获取的是新创建的数组 --- */
     toArray(): Array<Record<string, any>>;
     /** --- 根据规则筛掉项，predicate 返回 true 代表保留 --- */
     filter(predicate: (value: T, index: number) => boolean): Rows<T>;
@@ -272,7 +272,7 @@ export default class Mod {
         'index'?: string;
     }): Promise<any[] | false>;
     /**
-     * --- 将 key val 组成的数据列表转换为原生对象模式 ---
+     * --- 将 key val 组成的数据列表转换为原生对象模式，获取的是新创建的数组 ---
      * @param obj 要转换的 kv 数据列表
      */
     static toArrayByRecord<T extends Mod>(obj: Record<string, T>): Record<string, Record<string, any>>;
@@ -453,7 +453,7 @@ export default class Mod {
      */
     format(sql?: string, data?: any[]): string;
     /**
-     * --- 获取值对象 ---
+     * --- 获取值对象，获取的是新创建的数组 ---
      */
     toArray<TC extends abstract new (...args: any) => any>(): TOnlyProperties<InstanceType<TC>> & Record<string, any>;
     /**
@@ -481,7 +481,7 @@ export declare class CRows<T> implements Iterable<T> {
     get length(): number;
     /** --- 通过索引获取一个对象 --- */
     item(index: number): T;
-    /** --- 转换为数组对象 --- */
+    /** --- 转换为数组对象，获取的是新创建的数组 --- */
     toArray(): Array<Record<string, kebab.DbValue>>;
     [Symbol.iterator](): Iterator<T>;
 }

package/sys/mod.js

@@ -22,7 +22,7 @@ class Rows {
     item(index) {
         return this._items[index];
     }
-    /** --- 转换为数组对象 --- */
+    /** --- 转换为数组对象，获取的是新创建的数组 --- */
     toArray() {
         const arr = [];
         for (const item of this._items) {
@@ -544,7 +544,7 @@ class Mod {
         return primarys;
     }
     /**
-     * --- 将 key val 组成的数据列表转换为原生对象模式 ---
+     * --- 将 key val 组成的数据列表转换为原生对象模式，获取的是新创建的数组 ---
      * @param obj 要转换的 kv 数据列表
      */
     static toArrayByRecord(obj) {
@@ -1393,10 +1393,10 @@ class Mod {
         return this._sql.format(sql, data);
     }
     /**
-     * --- 获取值对象 ---
+     * --- 获取值对象，获取的是新创建的数组 ---
      */
     toArray() {
-        return this._data;
+        return { ...this._data };
     }
     /**
      * --- 获取当前设置要提交的数据 ---

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) {