feat:修复文件上传的大小缺失bug

Author: pedro

lib/extend.ts

@@ -9,9 +9,8 @@ import {
 } from './exception';
 import { toLine, unsets } from './util';
 import { config } from './config';
-import { get, set, cloneDeep } from 'lodash';
-import parse from 'co-busboy';
-import sendToWormhole from 'stream-wormhole';
+import { get, set } from 'lodash';
+import asyncBusboy from 'async-busboy';
 import { extname } from 'path';
 
 import { Logger } from 'egg-logger';
@@ -125,7 +124,6 @@ export const logging = (app: Application) => {
 };
 
 export interface MulOpts {
-  autoFields?: boolean;
   singleLimit?: number;
   totalLimit?: number;
   fileNums?: number;
@@ -143,51 +141,62 @@ export const multipart = (app: Application) => {
     if (!this.is('multipart')) {
       throw new Error('Content-Type must be multipart/*');
     }
-    // field指表单中的非文件
-    const parts = parse(this, { autoFields: opts && opts.autoFields });
-    let part;
+    let filePromises: Promise<any>[] = [];
+    const { fields } = await asyncBusboy(this.req, {
+      onFile: async function(fieldname, file, filename, encoding, mimetype) {
+        const filePromise = new Promise((resolve, reject) => {
+          let bufs = [];
+          file
+            .on('error', err => {
+              file.resume();
+              reject(err);
+            })
+            .on('data', (d: never) => {
+              bufs.push(d);
+            })
+            .on('end', () => {
+              const buf = Buffer.concat(bufs);
+              resolve({
+                size: buf.length,
+                encoding: encoding,
+                fieldname: fieldname,
+                filename: filename,
+                mimeType: mimetype,
+                data: buf
+              });
+            });
+        });
+        filePromises.push(filePromise);
+      }
+    });
+    let files: any[] = [];
     let totalSize = 0;
-    const files: any[] = [];
-    // tslint:disable-next-line:no-conditional-assignment
-    while ((part = await parts()) != null) {
-      if (part.length) {
-        // arrays are busboy fields
-      } else {
-        if (!part.filename) {
-          // user click `upload` before choose a file,
-          // `part` will be file stream, but `part.filename` is empty
-          // must handler this, such as log error.
-          await sendToWormhole(part);
-          continue;
-        }
-        // otherwise, it's a stream
-        // part.fieldname, part.filename, part.encoding, part.mime
-        // _readableState.length
-        // part.readableLength 31492 检查单个文件的大小
-        // 超过长度，报错
-        // 检查extension，报错
-        const ext = extname(part.filename);
-        if (
-          !checkFileExtension(ext, opts && opts.include, opts && opts.exclude)
-        ) {
-          throw new FileExtensionException({ msg: `不支持类型为${ext}的文件` });
-        }
-        const { valid, conf } = checkSingleFileSize(
-          part._readableState.length,
-          opts && opts.singleLimit
-        );
-        if (!valid) {
-          throw new FileTooLargeException({
-            msg: `文件单个大小不能超过${conf}b`
-          });
-        }
-        // 计算总大小
-        totalSize += part._readableState.length;
-        const tmp = cloneDeep(part);
-        files.push(tmp);
-        // 恢复再次接受data
-        part.resume();
+
+    for (const filePromise of filePromises) {
+      let file;
+      try {
+        file = await filePromise;
+      } catch (error) {
+        throw new HttpException({ msg: '文件体损坏，无法读取' });
+      }
+      const ext = extname(file.filename);
+      if (
+        !checkFileExtension(ext, opts && opts.include, opts && opts.exclude)
+      ) {
+        throw new FileExtensionException({ msg: `不支持类型为${ext}的文件` });
+      }
+      const { valid, conf } = checkSingleFileSize(
+        file.size,
+        opts && opts.singleLimit
+      );
+      if (!valid) {
+        throw new FileTooLargeException({
+          msg: `${file.filename}大小不能超过${conf}字节`
+        });
       }
+      // 计算总大小
+      totalSize += file.size;
+      files.push(file);
     }
     const { valid, conf } = checkFileNums(files.length, opts && opts.fileNums);
     if (!valid) {
@@ -200,6 +209,7 @@ export const multipart = (app: Application) => {
     if (!valid1) {
       throw new FileTooLargeException({ msg: `总文件体积不能超过${conf1}` });
     }
+    this.request.fields = fields;
     return files;
   };
 };

lib/file.ts

@@ -20,7 +20,8 @@ export class Uploader {
     this.storeDir = storeDir;
   }
   /**
-   * 处理文件流Stream
+   * 处理文件对象
+   * { size, encoding, fieldname, filename, mimeType, data }
    */
   public async upload(files: any[]) {
     throw new Error('you must overload this method');
@@ -79,8 +80,8 @@ export class Uploader {
   /**
    * 生成图片的md5
    */
-  public generateMd5(data: any) {
-    const buf = data._readableState.buffer.head.data;
+  public generateMd5(item: any) {
+    const buf = item.data;
     const md5 = crypto.createHash('md5');
     return md5.update(buf).digest('hex');
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lin-mizar",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.3",
   "description": "The core library of Lin CMS",
   "main": "lin/index.js",
   "scripts": {
@@ -16,8 +16,8 @@
   "author": "pedrogao",
   "license": "MIT",
   "dependencies": {
+    "async-busboy": "^0.7.0",
     "class-validator": "^0.9.1",
-    "co-busboy": "^1.4.0",
     "consola": "^2.5.6",
     "dayjs": "^1.8.9",
     "egg-logger": "^2.4.1",