@maiyunnet/kebab 9.13.5 → 9.13.7

package/index.d.ts

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

package/index.js

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

package/lib/net.d.ts

@@ -48,6 +48,14 @@ export declare function postJson(u: string, data: kebab.Json[] | Record<string,
  * @returns JSON 数据，失败时返回 null
  */
 export declare function postJsonResponseJson(u: string, data: kebab.Json[] | Record<string, kebab.Json>, opt?: IRequestOptions): Promise<kebab.Json | null>;
+/**
+ * --- 发起 POST 请求并解析 JSON 响应 ---
+ * @param u 网址
+ * @param data 数据
+ * @param opt 选项
+ * @returns JSON 数据，失败时返回 null
+ */
+export declare function postResponseJson(u: string, data: Record<string, kebab.Json>, opt?: IRequestOptions): Promise<kebab.Json | null>;
 /**
  * --- 发起 GET 请求并解析 JSON 响应 ---
  * @param u 网址

package/lib/net.js

@@ -97,6 +97,26 @@ export async function postJsonResponseJson(u, data, opt = {}) {
     }
     return json;
 }
+/**
+ * --- 发起 POST 请求并解析 JSON 响应 ---
+ * @param u 网址
+ * @param data 数据
+ * @param opt 选项
+ * @returns JSON 数据，失败时返回 null
+ */
+export async function postResponseJson(u, data, opt = {}) {
+    opt.method = 'POST';
+    const res = await request(u, data, opt);
+    const rtn = await res.getContent();
+    if (!rtn) {
+        return null;
+    }
+    const json = lText.parseJson(rtn.toString());
+    if (!json) {
+        return null;
+    }
+    return json;
+}
 /**
  * --- 发起 GET 请求并解析 JSON 响应 ---
  * @param u 网址

package/lib/undici.d.ts

@@ -42,6 +42,14 @@ export declare function postJson(u: string, data: kebab.Json[] | Record<string,
  * @param opt 选项
  */
 export declare function postJsonResponseJson(u: string, data: kebab.Json[] | Record<string, kebab.Json>, opt?: IRequestOptions): Promise<kebab.Json | null>;
+/**
+ * --- 发起 POST 请求并解析 JSON 响应 ---
+ * @param u 网址
+ * @param data 数据
+ * @param opt 选项
+ * @returns JSON 数据，失败时返回 null
+ */
+export declare function postResponseJson(u: string, data: Record<string, kebab.Json>, opt?: IRequestOptions): Promise<kebab.Json | null>;
 /**
  * --- 发起 GET 请求并解析 JSON 响应 ---
  * @param u 网址

package/lib/undici.js

@@ -115,6 +115,26 @@ export async function postJsonResponseJson(u, data, opt = {}) {
     }
     return json;
 }
+/**
+ * --- 发起 POST 请求并解析 JSON 响应 ---
+ * @param u 网址
+ * @param data 数据
+ * @param opt 选项
+ * @returns JSON 数据，失败时返回 null
+ */
+export async function postResponseJson(u, data, opt = {}) {
+    opt.method = 'POST';
+    const res = await request(u, data, opt);
+    const rtn = await res.getContent();
+    if (!rtn) {
+        return null;
+    }
+    const json = lText.parseJson(rtn.toString());
+    if (!json) {
+        return null;
+    }
+    return json;
+}
 /**
  * --- 发起 GET 请求并解析 JSON 响应 ---
  * @param u 网址

package/package.json

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

@@ -902,7 +902,7 @@ export function getPost(req) {
  * @param limits 文件上传限制
  */
 export function getFormData(req, events = {}, limits = {}) {
-    return new Promise(function (resolve) {
+    return new Promise(resolve => {
         if (req.readableEnded) {
             resolve({ 'post': {}, 'files': {} });
             return;
@@ -954,6 +954,38 @@ export function getFormData(req, events = {}, limits = {}) {
         let writeFileLength = 0;
         /** --- 当前读取是否已经完全结束 --- */
         let readEnd = false;
+        /** --- 是否有文件被限制拒绝（整体返回 false） --- */
+        let rejected = false;
+        /** --- 清理 rtn.files 中所有已写入的临时文件 --- */
+        function cleanupFiles() {
+            for (const key in rtn.files) {
+                let files = rtn.files[key];
+                if (!Array.isArray(files)) {
+                    files = [files];
+                }
+                for (const file of files) {
+                    lFs.unlink(file.path).catch(() => { });
+                }
+            }
+        }
+        /** --- 拒绝当前文件：销毁流、删临时文件、标记 rejected --- */
+        function rejectFile() {
+            rejected = true;
+            ftmpStream.destroy();
+            lFs.unlink(kebab.FTMP_CWD + ftmpName).catch(() => { });
+            ftmpName = '';
+            --writeFileLength;
+        }
+        /** --- 最终输出 --- */
+        function finalize() {
+            if (rejected) {
+                cleanupFiles();
+                resolve(false);
+            }
+            else {
+                resolve(rtn);
+            }
+        }
         // --- 开始读取 ---
         req.on('data', function (chunk) {
             buffer = Buffer.concat([buffer, chunk], buffer.length + chunk.length);
@@ -983,12 +1015,18 @@ export function getFormData(req, events = {}, limits = {}) {
                             ++writeFileLength;
                             state = EState.FILE;
                             fileName = match[1];
+                            // --- 已被拒绝则不创建文件流，仅丢弃数据 ---
+                            if (rejected) {
+                                ftmpName = '';
+                                break;
+                            }
                             // --- 检查文件扩展名限制 ---
                             if (limits.allowedExts?.length) {
                                 const extIo = fileName.lastIndexOf('.');
                                 const ext = extIo !== -1 ? fileName.slice(extIo).toLowerCase() : '';
                                 if (!limits.allowedExts.includes(ext)) {
-                                    // --- 扩展名不允许，跳过该文件 ---
+                                    // --- 扩展名不允许，拒绝整体上传 ---
+                                    rejected = true;
                                     ftmpName = '';
                                     break;
                                 }
@@ -1003,6 +1041,7 @@ export function getFormData(req, events = {}, limits = {}) {
                                     date.getUTCHours().toString().padStart(2, '0') +
                                     date.getUTCMinutes().toString().padStart(2, '0') + '_' + lCore.random() + '.ftmp';
                                 ftmpStream = lFs.createWriteStream(kebab.FTMP_CWD + ftmpName);
+                                ftmpStream.on('error', () => { });
                                 ftmpSize = 0;
                             }
                             else {
@@ -1042,22 +1081,23 @@ export function getFormData(req, events = {}, limits = {}) {
                             // --- 没找到结束标语，将预留 boundary 长度之前的写入到文件 ---
                             const writeBuffer = buffer.subarray(0, -boundary.length - 4);
                             if (ftmpName) {
-                                // --- 检查文件大小限制 ---
-                                if (limits.maxFileSize &&
-                                    (ftmpSize + Buffer.byteLength(writeBuffer) > limits.maxFileSize)) {
-                                    ftmpStream.destroy();
-                                    lFs.unlink(kebab.FTMP_CWD + ftmpName).catch(() => { });
-                                    ftmpName = '';
-                                    --writeFileLength;
-                                }
-                                else {
-                                    ftmpStream.write(writeBuffer);
-                                    ftmpSize += Buffer.byteLength(writeBuffer);
+                                if (writeBuffer.length > 0) {
+                                    // --- 检查文件大小限制 ---
+                                    if (limits.maxFileSize &&
+                                        (ftmpSize + Buffer.byteLength(writeBuffer) > limits.maxFileSize)) {
+                                        rejectFile();
+                                    }
+                                    else {
+                                        ftmpStream.write(writeBuffer);
+                                        ftmpSize += Buffer.byteLength(writeBuffer);
+                                    }
                                 }
                             }
                             else {
                                 // --- 跳过该文件 ---
-                                events.onfiledata?.(writeBuffer);
+                                if (writeBuffer.length > 0) {
+                                    events.onfiledata?.(writeBuffer);
+                                }
                             }
                             buffer = buffer.subarray(-boundary.length - 4);
                             return;
@@ -1065,44 +1105,51 @@ export function getFormData(req, events = {}, limits = {}) {
                         // --- 找到结束标语，结束标语之前的写入文件，之后的重新放回 buffer ---
                         const writeBuffer = buffer.subarray(0, io);
                         if (ftmpName) {
-                            ftmpStream.write(writeBuffer);
-                            ftmpSize += Buffer.byteLength(writeBuffer);
-                            ftmpStream.end(() => {
-                                --writeFileLength;
-                                if (!readEnd) {
-                                    // --- request 没读完，不管 ---
-                                    return;
-                                }
-                                if (writeFileLength) {
-                                    // --- req 读完了但文件还没写完，不管 ---
-                                    return;
-                                }
-                                // --- 文件也写完了 ---
-                                resolve(rtn);
-                            });
-                            // --- POST 部分 ---
-                            let fname = fileName.replace(/\\/g, '/');
-                            const nlio = fname.lastIndexOf('/');
-                            if (nlio !== -1) {
-                                fname = fname.slice(nlio + 1);
+                            // --- 检查文件大小限制（最后一个分片） ---
+                            if (limits.maxFileSize &&
+                                (ftmpSize + Buffer.byteLength(writeBuffer) > limits.maxFileSize)) {
+                                rejectFile();
                             }
-                            const val = {
-                                'name': fname,
-                                'origin': fileName,
-                                'size': ftmpSize,
-                                'path': kebab.FTMP_CWD + ftmpName
-                            };
-                            if (rtn.files[name]) {
-                                if (Array.isArray(rtn.files[name])) {
-                                    rtn.files[name].push(val);
+                            else {
+                                ftmpStream.write(writeBuffer);
+                                ftmpSize += Buffer.byteLength(writeBuffer);
+                                ftmpStream.end(() => {
+                                    --writeFileLength;
+                                    if (!readEnd) {
+                                        // --- request 没读完，不管 ---
+                                        return;
+                                    }
+                                    if (writeFileLength) {
+                                        // --- req 读完了但文件还没写完，不管 ---
+                                        return;
+                                    }
+                                    // --- 文件也写完了 ---
+                                    finalize();
+                                });
+                                // --- POST 部分 ---
+                                let fname = fileName.replace(/\\/g, '/');
+                                const nlio = fname.lastIndexOf('/');
+                                if (nlio !== -1) {
+                                    fname = fname.slice(nlio + 1);
+                                }
+                                const val = {
+                                    'name': fname,
+                                    'origin': fileName,
+                                    'size': ftmpSize,
+                                    'path': kebab.FTMP_CWD + ftmpName
+                                };
+                                if (rtn.files[name]) {
+                                    if (Array.isArray(rtn.files[name])) {
+                                        rtn.files[name].push(val);
+                                    }
+                                    else {
+                                        rtn.files[name] = [rtn.files[name], val];
+                                    }
                                 }
                                 else {
-                                    rtn.files[name] = [rtn.files[name], val];
+                                    rtn.files[name] = val;
                                 }
                             }
-                            else {
-                                rtn.files[name] = val;
-                            }
                         }
                         else {
                             // --- 跳过该文件 ---
@@ -1114,6 +1161,10 @@ export function getFormData(req, events = {}, limits = {}) {
                         break;
                     }
                 }
+                // --- 被拒绝则丢弃剩余数据，等待 'end' 事件后 resolve ---
+                if (rejected) {
+                    return;
+                }
             }
         });
         req.on('error', function (e) {
@@ -1122,17 +1173,23 @@ export function getFormData(req, events = {}, limits = {}) {
             }
             lCore.debug('[ROUTE][GETFORMDATA] request error before getFormData: ' + e.message);
             lCore.log({}, '[ROUTE][GETFORMDATA] request error before getFormData: ' + (e.stack ?? ''), '-error');
+            cleanupFiles();
             resolve(false);
         });
         req.on('end', function () {
             readEnd = true;
+            // --- 被拒绝则清理文件并 resolve(false) ---
+            if (rejected) {
+                finalize();
+                return;
+            }
             if (state === EState.FILE) {
                 if (ftmpName) {
                     ftmpStream.end(() => {
                         --writeFileLength;
                         if (!writeFileLength) {
                             // --- 文件也写完了 ---
-                            resolve(rtn);
+                            finalize();
                         }
                     });
                     return;
@@ -1146,7 +1203,7 @@ export function getFormData(req, events = {}, limits = {}) {
                 return;
             }
             // --- 文件写完了 ----
-            resolve(rtn);
+            finalize();
         });
     });
 }

package/www/example/ctr/test.d.ts

@@ -64,33 +64,6 @@ export default class extends sCtr.Ctr {
     private _dbTable;
     vector(): Promise<any>;
     kv(): Promise<kebab.Json>;
-    net(): Promise<string>;
-    netPipe(): Promise<kebab.Json>;
-    netPost(): Promise<kebab.Json>;
-    netPost1(): string;
-    netPostString(): Promise<string>;
-    netPostString1(): kebab.Json[];
-    netOpen(): Promise<kebab.Json>;
-    netFormTest(): Promise<string>;
-    netUpload(): Promise<string>;
-    netUpload1(): Promise<string>;
-    netCookie(): Promise<string>;
-    netCookie1(): string;
-    netCookie2(): string;
-    netSave(): Promise<string>;
-    netFollow(): Promise<string>;
-    netFollow1(): void;
-    netFollow2(): kebab.Json;
-    netReuse(): Promise<string>;
-    netError(): Promise<string>;
-    netHosts(): Promise<string>;
-    netMproxy(): Promise<string | boolean>;
-    netMproxy1(): Promise<string | boolean>;
-    netMproxy2(): any[];
-    netFilterheaders(): string;
-    netFetch(): Promise<string | boolean>;
-    netFetch1(): any[];
-    netGetResponseJson(): Promise<string>;
     getResponseJson1(): any[];
     getResponseJson2(): any[];
     undici(): Promise<string>;
@@ -192,6 +165,14 @@ export default class extends sCtr.Ctr {
      * --- CORS 精细化配置测试 ---
      */
     ctrCrossFine(): string;
+    /**
+     * --- 文件上传限制演示页面 ---
+     */
+    ctrUploadLimits(): string;
+    /**
+     * --- 文件上传限制演示接口 ---
+     */
+    ctrUploadLimits1(): Promise<kebab.Json[]>;
     /**
      * --- END ---
      */