Merge pull request #213 from RomanBurunkov/master

Destroy file stream in case of upload timeout.

Author: RomanBurunkov

lib/processMultipart.js

@@ -59,8 +59,8 @@ module.exports = (options, req, res, next) => {
       : memHandler(options, field, filename);     // Upload into RAM.
     // Define upload timer.
     const uploadTimer = new UploadTimer(options.uploadTimeout, () => {
-      debugLog(options, `Upload timeout ${field}->${filename}, bytes:${getFileSize()}`);
-      cleanup();
+      // After destroy an error event will be emitted and file clean up will be done.
+      file.destroy(new Error(`Upload timeout ${field}->${filename}, bytes:${getFileSize()}`));
     });
 
     file.on('limit', () => {
@@ -109,9 +109,8 @@ module.exports = (options, req, res, next) => {
     });
 
     file.on('error', (err) => {
-      // Reset upload timer in case of errors.
-      uploadTimer.clear();
-      debugLog(options, `Error ${field}->${filename}, bytes:${getFileSize()}, error:${err}`);
+      uploadTimer.clear(); // Reset upload timer in case of errors.
+      debugLog(options, err);
       cleanup();
       next();
     });

lib/tempFileHandler.js

@@ -23,6 +23,7 @@ module.exports = (options, fieldname, filename) => {
   let writePromise = Promise.resolve();
 
   const createWriteStream = () => {
+    debugLog(options, `Opening write stream for ${fieldname}->${filename}...`);
     writeStream = fs.createWriteStream(tempFilePath);
     writePromise = new Promise((resolve, reject) => {
       writeStream.on('finish', () => {
@@ -62,7 +63,10 @@ module.exports = (options, fieldname, filename) => {
       if (writeStream !== false) {
         debugLog(options, `Cleaning up temporary file ${tempFilePath}...`);
         writeStream.end();
-        deleteFile(tempFilePath, (err) => { if (err) throw err; });
+        deleteFile(tempFilePath, err => (err 
+          ? debugLog(options, `Cleaning up temporary file ${tempFilePath} failed: ${err}`)
+          : debugLog(options, `Cleaning up temporary file ${tempFilePath} done.`)
+        ));
       }
     },
     getWritePromise: () => writePromise