try pipeline

Enterprise-CMCS · Nov 14, 2023 · b5d37aa · b5d37aa
1 parent e03432c
commit b5d37aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/services/uploads/src/antivirus.js b/services/uploads/src/antivirus.js
@@ -14,6 +14,7 @@ const clamav = require("./clamav");
 const s3 = new S3Client();
 const utils = require("./utils");
 const constants = require("./constants");
+const { pipeline } = require("stream/promises");
 
 /**
  * Retrieve the file size of S3 object without downloading.
@@ -72,10 +73,8 @@ async function downloadFileFromS3(s3ObjectKey, s3ObjectBucket) {
 
   try {
     const response = await s3.send(getObject);
-    await response.Body.transformToWebStream().pipeTo(writeStream);
-    utils.generateSystemMessage(
-      `Finished downloading new object ${s3ObjectKey}`
-    );
+    const readStream = response.Body.transformToWebStream();
+    return await pipeline(readStream, writeStream);
   } catch (err) {
     utils.generateSystemMessage(`Error downloading new object ${s3ObjectKey}`);
     throw err;

diff --git a/services/uploads/src/clamav.js b/services/uploads/src/clamav.js
@@ -12,6 +12,7 @@ const child_process = require("child_process");
 const path = require("path");
 const constants = require("./constants");
 const utils = require("./utils");
+const { pipeline } = require("stream/promises");
 
 const S3 = new S3Client();
 
@@ -96,12 +97,8 @@ async function downloadAVDefinitions() {
 
         try {
           const response = await S3.send(getObject);
-          await response.Body.transformToWebStream().pipeTo(
-            localFileWriteStream
-          );
-          utils.generateSystemMessage(
-            `Finished download ${filenameToDownload}`
-          );
+          const readStream = response.Body.transformToWebStream();
+          return await pipeline(readStream, localFileWriteStream);
         } catch (err) {
           utils.generateSystemMessage(
             `Error downloading definition file ${filenameToDownload}`