rework promise

Enterprise-CMCS · Nov 14, 2023 · 045e74e · 045e74e
1 parent 7e79fe3
commit 045e74e
Showing 1 changed file with 30 additions and 26 deletions.
diff --git a/services/uploads/src/clamav.js b/services/uploads/src/clamav.js
@@ -77,37 +77,41 @@ async function downloadAVDefinitions() {
     .map((fullPath) => path.basename(fullPath));
 
   // download each file in the bucket.
-  const downloadPromises = definitionFileKeys.map((filenameToDownload) => {
-    return async () => {
-      let destinationFile = path.join("/tmp/", filenameToDownload);
+  const downloadPromises = await definitionFileKeys.map(
+    (filenameToDownload) => {
+      return async () => {
+        let destinationFile = path.join("/tmp/", filenameToDownload);
 
-      utils.generateSystemMessage(
-        `Downloading ${filenameToDownload} from S3 to ${destinationFile}`
-      );
+        utils.generateSystemMessage(
+          `Downloading ${filenameToDownload} from S3 to ${destinationFile}`
+        );
 
-      let localFileWriteStream = fs.createWriteStream(destinationFile);
+        let localFileWriteStream = fs.createWriteStream(destinationFile);
 
-      let options = {
-        Bucket: constants.CLAMAV_BUCKET_NAME,
-        Key: `${constants.PATH_TO_AV_DEFINITIONS}/${filenameToDownload}`,
-      };
-      const getObject = new GetObjectCommand(options);
+        let options = {
+          Bucket: constants.CLAMAV_BUCKET_NAME,
+          Key: `${constants.PATH_TO_AV_DEFINITIONS}/${filenameToDownload}`,
+        };
+        const getObject = new GetObjectCommand(options);
 
-      try {
-        const response = await S3.send(getObject);
-        await response.Body.transformToWebStream().pipe(localFileWriteStream);
-        utils.generateSystemMessage(`Finished download ${filenameToDownload}`);
-      } catch (err) {
-        utils.generateSystemMessage(
-          `Error downloading definition file ${filenameToDownload}`
-        );
-        console.log(err);
-        throw err;
-      }
-    };
-  });
+        try {
+          const response = await S3.send(getObject);
+          await response.Body.transformToWebStream().pipe(localFileWriteStream);
+          utils.generateSystemMessage(
+            `Finished download ${filenameToDownload}`
+          );
+        } catch (err) {
+          utils.generateSystemMessage(
+            `Error downloading definition file ${filenameToDownload}`
+          );
+          console.log(err);
+          throw err;
+        }
+      };
+    }
+  );
 
-  return await downloadPromises();
+  return downloadPromises;
 }
 
 /**