@maiyunnet/kebab 7.4.0 → 7.4.2

package/index.d.ts

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

package/index.js

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

package/package.json

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

@@ -84,6 +84,11 @@ export class Ctr {
         if (!this._timer) {
             return;
         }
+        if (this._res.headersSent) {
+            // --- 已经开始输出的，不能设置 timeout ---
+            lCore.debug('[CTR][TIMEOUT][SET] headersSent is true, can not set timeout');
+            return;
+        }
         this._timer.timeout = num;
         clearTimeout(this._timer.timer);
         this._timer.timer = setTimeout(this._timer.callback, num);

package/sys/route.d.ts

@@ -63,8 +63,13 @@ export declare function getPost(req: http2.Http2ServerRequest | http.IncomingMes
  * @param events 文件处理情况
  */
 export declare function getFormData(req: http2.Http2ServerRequest | http.IncomingMessage, events?: {
+    /**
+     * --- 文件开始上传时触发，返回 true 则跳过该文件的保存 ---
+     */
     onfilestart?: (name: string) => boolean | undefined;
+    /** --- 文件上传时触发，仅 start 返回 true 时触发 --- */
     onfiledata?: (chunk: Buffer) => void;
+    /** --- 文件上传结束时触发，仅 start 返回 true 时触发 --- */
     onfileend?: () => void;
 }): Promise<{
     'post': Record<string, kebab.Json>;

package/sys/route.js

@@ -867,6 +867,10 @@ export function getPost(req) {
  */
 export function getFormData(req, events = {}) {
     return new Promise(function (resolve) {
+        if (req.readableEnded) {
+            resolve({ 'post': {}, 'files': {} });
+            return;
+        }
         const ct = req.headers['content-type'] ?? '';
         if (!ct) {
             resolve({ 'post': {}, 'files': {} });
@@ -991,22 +995,20 @@ export function getFormData(req, events = {}) {
                         if (io === -1) {
                             // --- 没找到结束标语，将预留 boundary 长度之前的写入到文件 ---
                             const writeBuffer = buffer.subarray(0, -boundary.length - 4);
-                            if (ftmpName === '') {
-                                events.onfiledata?.(writeBuffer);
-                            }
-                            else {
+                            if (ftmpName) {
                                 ftmpStream.write(writeBuffer);
                                 ftmpSize += Buffer.byteLength(writeBuffer);
                             }
+                            else {
+                                // --- 跳过该文件 ---
+                                events.onfiledata?.(writeBuffer);
+                            }
                             buffer = buffer.subarray(-boundary.length - 4);
                             return;
                         }
                         // --- 找到结束标语，结束标语之前的写入文件，之后的重新放回 buffer ---
                         const writeBuffer = buffer.subarray(0, io);
-                        if (ftmpName === '') {
-                            events.onfileend?.();
-                        }
-                        else {
+                        if (ftmpName) {
                             ftmpStream.write(writeBuffer);
                             ftmpSize += Buffer.byteLength(writeBuffer);
                             ftmpStream.end(() => {
@@ -1046,6 +1048,10 @@ export function getFormData(req, events = {}) {
                                 rtn.files[name] = val;
                             }
                         }
+                        else {
+                            // --- 跳过该文件 ---
+                            events.onfileend?.();
+                        }
                         // --- 重置状态机 ---
                         state = EState.WAIT;
                         buffer = buffer.subarray(io + 4 + boundary.length);
@@ -1054,11 +1060,31 @@ export function getFormData(req, events = {}) {
                 }
             }
         });
-        req.on('error', function () {
+        req.on('error', function (e) {
+            if ((state === EState.FILE) && ftmpName) {
+                ftmpStream.destroy();
+            }
+            lCore.debug('[ROUTE][GETFORMDATA] request error before getFormData: ' + e.message);
+            lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + (e.stack ?? ''), '-error');
             resolve(false);
         });
         req.on('end', function () {
             readEnd = true;
+            if (state === EState.FILE) {
+                if (ftmpName) {
+                    ftmpStream.end(() => {
+                        --writeFileLength;
+                        if (!writeFileLength) {
+                            // --- 文件也写完了 ---
+                            resolve(rtn);
+                        }
+                    });
+                    return;
+                }
+                // --- 跳过该文件 ---
+                events.onfileend?.();
+                --writeFileLength;
+            }
             if (writeFileLength) {
                 // --- 文件没写完 ---
                 return;