vtlab-generic-functions 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vtlab-generic-functions",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "scripts": {
     "test": "jest"
   },

package/s3bucket/index.js

@@ -4,6 +4,7 @@ const config = require('../config');
 const multer = require('multer');
 const multerS3 = require('multer-s3');
 const { promisesCollector } = require('../utils');
+const stream = require("stream");
 
 /**
  * Uploads a file to an S3 bucket.
@@ -106,8 +107,25 @@ const downloadFileFromS3 = async (path) => {
       Key: path
     });
 
-    const data = await s3Client.send(command);
-    return data;
+    try {
+      let response = await s3Client.send(command);
+      let Body = response.Body;
+
+      if (Body && Body instanceof stream.Readable) {
+        // Handling the stream
+        const chunks = [];
+        for await (const chunk of Body) {
+          chunks.push(chunk);
+        }
+        response.Body = Buffer.concat(chunks);
+        return response;
+      } else {
+        // If Body is not a stream, return as is
+        return response;
+      }
+    } catch (error) {
+      throw new Error(error.message);
+    }
   } catch (error) {
     throw error;
   }
@@ -157,7 +175,14 @@ const generatePresignedUrl = async (bucket, key, expirationInSeconds = 604000) =
     if(expirationInSeconds > 604000){ //7 days is the max expiration time for a presigned url v4
       expirationInSeconds = 604000;
     }
-    const s3Client = new S3Client();
+    const allConfig = await config.get();
+    const s3Client = new S3Client({
+      credentials: {
+        accessKeyId: allConfig.awsCredentials.accessKeyId,
+        secretAccessKey: allConfig.awsCredentials.secretAccessKey,
+      },
+      region: allConfig.awsCredentials.region
+    });
 
     const command = new GetObjectCommand({
       Bucket: bucket,