Add empty files support for tempFileHandler

richardgirges · Jul 16, 2020 · d8c00c5 · d8c00c5
1 parent b24233d
commit d8c00c5
Showing 1 changed file with 14 additions and 24 deletions.
diff --git a/lib/tempFileHandler.js b/lib/tempFileHandler.js
@@ -18,31 +18,23 @@ module.exports = (options, fieldname, filename) => {
   const hash = crypto.createHash('md5');
   let fileSize = 0;
   let completed = false;
-
-  let writeStream = false;
-  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', () => {
-        resolve();
-      });
-      writeStream.on('error', (err) => {
-        debugLog(options, `Error write temp file: ${err}`);
-        reject(err);
-      });
+  debugLog(options, `Opening write stream for ${fieldname}->${filename}...`);
+  const writeStream = fs.createWriteStream(tempFilePath);
+  const writePromise = new Promise((resolve, reject) => {
+    writeStream.on('finish', () => resolve());
+    writeStream.on('error', (err) => {
+      debugLog(options, `Error write temp file: ${err}`);
+      reject(err);
     });
-  };
+  });
 
   return {
     dataHandler: (data) => {
       if (completed === true) {
         debugLog(options, `Error: got ${fieldname}->${filename} data chunk for completed upload!`);
         return;
       }
-      if (writeStream === false) createWriteStream();
       writeStream.write(data);
       hash.update(data);
       fileSize += data.length;
@@ -60,14 +52,12 @@ module.exports = (options, fieldname, filename) => {
     },
     cleanup: () => {
       completed = true;
-      if (writeStream !== false) {
-        debugLog(options, `Cleaning up temporary file ${tempFilePath}...`);
-        writeStream.end();
-        deleteFile(tempFilePath, err => (err 
-          ? debugLog(options, `Cleaning up temporary file ${tempFilePath} failed: ${err}`)
-          : debugLog(options, `Cleaning up temporary file ${tempFilePath} done.`)
-        ));
-      }
+      debugLog(options, `Cleaning up temporary file ${tempFilePath}...`);
+      writeStream.end();
+      deleteFile(tempFilePath, err => (err 
+        ? debugLog(options, `Cleaning up temporary file ${tempFilePath} failed: ${err}`)
+        : debugLog(options, `Cleaning up temporary file ${tempFilePath} done.`)
+      ));
     },
     getWritePromise: () => writePromise
   };