@midwayjs/upload 3.6.0 → 3.6.1

package/dist/middleware.d.ts

@@ -3,11 +3,12 @@ import { UploadOptions } from '.';
 export declare class UploadMiddleware implements IMiddleware<any, any> {
     upload: UploadOptions;
     logger: IMidwayLogger;
+    private uploadWhiteListMap;
     resolve(app: any): (req: any, res: any, next: any) => Promise<any>;
     execUpload(ctx: any, req: any, res: any, next: any, isExpress: any): Promise<any>;
     getUploadBoundary(request: any): false | string;
     isReadableStream(req: any, isExpress: any): boolean;
-    checkExt(filename: any): boolean;
+    checkExt(filename: any): string | boolean;
     static getName(): string;
 }
 //# sourceMappingURL=middleware.d.ts.map

package/dist/middleware.js

@@ -19,7 +19,15 @@ const parse_1 = require("./parse");
 const getRawBody = require("raw-body");
 const { unlink, writeFile } = fs_1.promises;
 let UploadMiddleware = class UploadMiddleware {
+    constructor() {
+        this.uploadWhiteListMap = {};
+    }
     resolve(app) {
+        if (Array.isArray(this.upload.whitelist)) {
+            for (const whiteExt of this.upload.whitelist) {
+                this.uploadWhiteListMap[whiteExt] = true;
+            }
+        }
         if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
             return async (req, res, next) => {
                 return this.execUpload(req, req, res, next, true);
@@ -64,10 +72,12 @@ let UploadMiddleware = class UploadMiddleware {
         if (this.isReadableStream(req, isExpress)) {
             if (mode === 'stream') {
                 const { fields, fileInfo } = await (0, parse_1.parseFromReadableStream)(req, boundary);
-                if (!this.checkExt(fileInfo.filename)) {
+                const ext = this.checkExt(fileInfo.filename);
+                if (!ext) {
                     throw new _1.MultipartInvalidFilenameError(fileInfo.filename);
                 }
                 else {
+                    fileInfo['_ext'] = ext;
                     ctx.fields = fields;
                     ctx.files = [fileInfo];
                     return next();
@@ -93,9 +103,11 @@ let UploadMiddleware = class UploadMiddleware {
         const requireId = `upload_${Date.now()}.${Math.random()}`;
         const files = data.files;
         const notCheckFile = files.find(fileInfo => {
-            if (!this.checkExt(fileInfo.filename)) {
+            const ext = this.checkExt(fileInfo.filename);
+            if (!ext) {
                 return fileInfo;
             }
+            fileInfo['_ext'] = ext;
         });
         if (notCheckFile) {
             throw new _1.MultipartInvalidFilenameError(notCheckFile.filename);
@@ -103,7 +115,7 @@ let UploadMiddleware = class UploadMiddleware {
         ctx.files = await Promise.all(files.map(async (file, index) => {
             const { data, filename } = file;
             if (mode === 'file') {
-                const ext = (0, path_1.extname)(filename);
+                const ext = file['_ext'] || (0, path_1.extname)(filename);
                 const tmpFileName = (0, path_1.resolve)(tmpdir, `${requireId}.${index}${ext}`);
                 await writeFile(tmpFileName, data, 'binary');
                 file.data = tmpFileName;
@@ -156,12 +168,15 @@ let UploadMiddleware = class UploadMiddleware {
         return false;
     }
     checkExt(filename) {
-        const ext = (0, path_1.extname)(filename).toLowerCase();
-        const { whitelist } = this.upload;
-        if (!Array.isArray(whitelist)) {
-            return true;
+        const lowerCaseFileNameList = filename.toLowerCase().split('.');
+        while (lowerCaseFileNameList.length) {
+            lowerCaseFileNameList.shift();
+            const curExt = `.${lowerCaseFileNameList.join('.')}`;
+            if (this.uploadWhiteListMap[curExt]) {
+                return curExt;
+            }
         }
-        return whitelist.includes(ext);
+        return false;
     }
     static getName() {
         return 'upload';

package/dist/parse.js

@@ -74,10 +74,6 @@ const parseFromReadableStream = (readStream, boundary) => {
                 }
                 // 正在传输中的话
                 if (isTransformFileData) {
-                    if (lastChunk.length) {
-                        chunk = Buffer.concat([lastChunk, chunk]);
-                        lastChunk = emptyBuf;
-                    }
                     const newPreChunk = Buffer.concat([preChunk, chunk]);
                     const newBlockIndex = (0, exports.bufferIndexOf)(newPreChunk, bufferSeparator);
                     // 存在新的块则代表已经结束了
@@ -122,7 +118,7 @@ const parseFromReadableStream = (readStream, boundary) => {
                     resolve({ fileInfo, fields });
                     break;
                 }
-                callback(null, emptyBuf);
+                callback(null, lastChunk);
             },
         });
         readStream.pipe(fileInfo.data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/upload",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Midway Component for upload",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -33,5 +33,5 @@
     "@midwayjs/serverless-app": "^3.6.0",
     "@midwayjs/web": "^3.6.0"
   },
-  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
+  "gitHead": "7aa8d1d712ff5ae7e3b27eb2e154d3f7ee40889a"
 }