@midwayjs/busboy 4.0.0-alpha.1 → 4.0.0-beta.10

package/README.md

@@ -9,4 +9,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT](https://github.com/midwayjs/midway/blob/master/LICENSE)

package/dist/configuration.js

@@ -16,6 +16,8 @@ const constants_1 = require("./constants");
 const path_1 = require("path");
 const os_1 = require("os");
 let BusboyConfiguration = class BusboyConfiguration {
+    uploadConfig;
+    logger;
     async onReady() {
         const { tmpdir, cleanTimeout, mode } = this.uploadConfig;
         if (mode === 'file' && tmpdir) {

package/dist/interface.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
 import { IgnoreMatcher, IMidwayContext } from '@midwayjs/core';
 import { BusboyConfig } from 'busboy';
@@ -36,6 +35,10 @@ export interface UploadOptions extends BusboyConfig {
      * Mime type white list
      */
     mimeTypeWhiteList?: Record<string, string | string[]> | ((ctx: IMidwayContext<any>) => string | string[]);
+    /**
+     * Whether to allow fields duplication, default is `false`, only for `file` and `stream` mode
+     */
+    allowFieldsDuplication?: boolean;
 }
 export interface UploadFileInfo {
     /**

package/dist/middleware.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { IMiddleware, ILogger, IgnoreMatcher, IMidwayApplication } from '@midwayjs/core';
 import { UploadOptions, UploadMode } from './interface';
 import { BusboyConfig } from 'busboy';

package/dist/middleware.js

@@ -22,18 +22,20 @@ const busboy = require("busboy");
 const constants_1 = require("./constants");
 const { unlink, writeFile } = fs_1.promises;
 let UploadMiddleware = class UploadMiddleware {
-    constructor() {
-        /**
-         * cache global upload white list when uploadConfig.whitelist is set
-         * @private
-         */
-        this.uploadWhiteListMap = new Map();
-        /**
-         * cache global upload mime type white list when uploadConfig.mimeTypeWhiteList is set
-         * @private
-         */
-        this.uploadFileMimeTypeMap = new Map();
-    }
+    uploadConfig;
+    logger;
+    /**
+     * cache global upload white list when uploadConfig.whitelist is set
+     * @private
+     */
+    uploadWhiteListMap = new Map();
+    /**
+     * cache global upload mime type white list when uploadConfig.mimeTypeWhiteList is set
+     * @private
+     */
+    uploadFileMimeTypeMap = new Map();
+    match;
+    ignore;
     async init() {
         if (this.uploadConfig.match) {
             this.match = [].concat(this.uploadConfig.match || []);
@@ -119,7 +121,7 @@ let UploadMiddleware = class UploadMiddleware {
     }
     async processFileOrStream(req, uploadConfig, currentContextWhiteListMap, currentContextMimeTypeWhiteListMap, ctxOrReq) {
         let isStreamResolve = false;
-        const { mode, tmpdir } = uploadConfig;
+        const { mode, tmpdir, allowFieldsDuplication } = uploadConfig;
         const { files = [], fields = [] } = await new Promise((resolveP, reject) => {
             const bb = busboy({
                 headers: req.headers,
@@ -219,10 +221,27 @@ let UploadMiddleware = class UploadMiddleware {
             req.pipe(bb);
         });
         ctxOrReq.files = files;
-        ctxOrReq.fields = fields.reduce((accumulator, current) => {
-            accumulator[current.name] = current.value;
-            return accumulator;
-        }, {});
+        if (allowFieldsDuplication) {
+            // 如果重复，则使用数组
+            ctxOrReq.fields = fields.reduce((accumulator, current) => {
+                if (accumulator[current.name]) {
+                    if (!Array.isArray(accumulator[current.name])) {
+                        accumulator[current.name] = [accumulator[current.name]];
+                    }
+                    accumulator[current.name].push(current.value);
+                }
+                else {
+                    accumulator[current.name] = current.value;
+                }
+                return accumulator;
+            }, {});
+        }
+        else {
+            ctxOrReq.fields = fields.reduce((accumulator, current) => {
+                accumulator[current.name] = current.value;
+                return accumulator;
+            }, {});
+        }
     }
     async processAsyncIterator(req, uploadConfig, currentContextWhiteListMap, currentContextMimeTypeWhiteListMap, ctxOrReq) {
         const bb = busboy({

package/dist/parse.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { UploadOptions } from './interface';
 export declare const parseMultipart: (body: any, boundary: string, uploadConfig: UploadOptions) => Promise<{
     files: any[];

package/dist/parse.js

@@ -84,7 +84,9 @@ const parseHead = (headBuf) => {
         if (name === 'content-disposition') {
             const headCol = {};
             value.split(/;\s+/).forEach((kv) => {
-                const [k, v] = kv.split('=');
+                const eqIndex = kv.indexOf('=');
+                const k = eqIndex !== -1 ? kv.substring(0, eqIndex) : kv;
+                const v = eqIndex !== -1 ? kv.substring(eqIndex + 1) : undefined;
                 headCol[k] = v ? v.replace(/^"/, '').replace(/"$/, '') : v ?? true;
             });
             head[name] = headCol;

package/dist/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
 export declare const autoRemoveUploadTmpFile: (tmpDir: string, cleanTimeout: number) => Promise<void>;
 export declare const stopAutoRemoveUploadTmpFile: () => Promise<void>;

package/dist/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamToAsyncIterator = exports.formatExt = exports.ensureDir = exports.checkExists = exports.stopAutoRemoveUploadTmpFile = exports.autoRemoveUploadTmpFile = void 0;
+exports.formatExt = exports.ensureDir = exports.checkExists = exports.stopAutoRemoveUploadTmpFile = exports.autoRemoveUploadTmpFile = void 0;
+exports.streamToAsyncIterator = streamToAsyncIterator;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const { readdir, access, stat, unlink, mkdir } = fs_1.promises;
@@ -93,5 +94,4 @@ async function* streamToAsyncIterator(stream) {
         yield chunk;
     }
 }
-exports.streamToAsyncIterator = streamToAsyncIterator;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/busboy",
-  "version": "4.0.0-alpha.1",
-  "description": "Midway Component for upload",
+  "version": "4.0.0-beta.10",
+  "description": "Midway Component for Busboy (multipart form data parser)",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
@@ -18,7 +18,7 @@
     "index.d.ts"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=20"
   },
   "license": "MIT",
   "dependencies": {
@@ -27,14 +27,17 @@
     "file-type": "16.5.4"
   },
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-alpha.1",
-    "@midwayjs/express": "^4.0.0-alpha.1",
-    "@midwayjs/faas": "^4.0.0-alpha.1",
-    "@midwayjs/fc-starter": "^4.0.0-alpha.1",
-    "@midwayjs/koa": "^4.0.0-alpha.1",
-    "@midwayjs/mock": "^4.0.0-alpha.1",
-    "@midwayjs/web": "^4.0.0-alpha.1",
-    "fs-extra": "11.2.0"
+    "@midwayjs/core": "^4.0.0-beta.10",
+    "@midwayjs/express": "^4.0.0-beta.10",
+    "@midwayjs/faas": "^4.0.0-beta.10",
+    "@midwayjs/fc-starter": "^4.0.0-beta.10",
+    "@midwayjs/koa": "^4.0.0-beta.10",
+    "@midwayjs/mock": "^4.0.0-beta.10",
+    "@midwayjs/validation": "^4.0.0-beta.10",
+    "@midwayjs/validation-zod": "^4.0.0-beta.10",
+    "@midwayjs/web": "^4.0.0-beta.10",
+    "fs-extra": "11.3.3",
+    "zod": "3.25.76"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "1b1856629913703f67304155aaf611ec936a81ac"
 }