triangle-utils 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.0.18",
+    "version": "1.0.20",
     "main": "index.js",
     "author": "",
     "license": "ISC",

package/utils/Utils_Misc.js

@@ -25,7 +25,7 @@ export default class Utils_Misc {
         return new Promise(resolve => setTimeout(resolve, duration))
     }
 
-    get_current_time( milliseconds = false) {
+    get_current_time(milliseconds = false) {
         if (milliseconds) {
             return (new Date()).getTime()
         }
@@ -36,7 +36,7 @@ export default class Utils_Misc {
         for (let i = 0; i < 3; i++) {
             try {
                 await this.transporter.sendMail({
-                    from: clients.config.alerts_email,
+                    from: this.config.alerts_email,
                     to: recipient,
                     subject: subject,
                     text: text

package/utils/Utils_S3.js

@@ -1,29 +1,44 @@
 import { S3, NoSuchKey } from "@aws-sdk/client-s3"
 
+function parse_s3_filename(s3_filename) {
+    if (s3_filename.substring(0, 5) !== "s3://") {
+        return undefined
+    }
+    const bucket_filename = s3_filename.substring(5)
+    const bucket = bucket_filename.split("/")[0]
+    const filename = bucket_filename.split("/").slice(1).join("/")
+    return { Bucket : bucket, Key : filename }
+}
+
 export default class Utils_S3 {
 
     constructor(config) {
         this.s3 = new S3({ region : config.region })
     }
 
-    async file_exists(bucket, filename) {
+
+    async file_exists(s3_filename) {
+        const s3_key = parse_s3_filename(s3_filename)
+        if (s3_key === undefined) {
+            return undefined
+        }
         try {
-            const head = await s3.headObject({
-                Bucket : bucket,
-                Key : filename
-            })
+            const head = await s3.headObject(s3_key)
             return true
         } catch (error) {
             return false
         }
     }
 
-    async get_file(bucket, filename, json=false) {
+
+    async get_file(s3_filename, json=false) {
+        const s3_key = parse_s3_filename(s3_filename)
+        if (s3_key === undefined) {
+            return undefined
+        }
         try {
-            return await s3.getObject({
-                Bucket : bucket,
-                Key : filename
-            }).then(response => response.Body.transformToString("utf-8"))
+            return await s3.getObject(s3_key)
+                .then(response => response.Body.transformToString("utf-8"))
                 .then(text => json ? JSON.parse(text) : text)
         } catch (error) {
             if (error instanceof NoSuchKey) {
@@ -33,23 +48,27 @@ export default class Utils_S3 {
         }
     }
 
-    async create_file(bucket, filename, content) {
-        const exists = await file_exists(bucket, filename)
+    async create_file(s3_filename, content) {
+        const exists = await file_exists(s3_filename)
         if (exists) {
-            return
+            return undefined
+        }
+        const s3_key = parse_s3_filename(s3_filename)
+        if (s3_key === undefined) {
+            return undefined
         }
         return await s3.putObject({
-            Bucket : bucket,
-            Key : filename,
+            ...s3_key,
             Body : content
         })
     }
 
-    async delete_file(bucket, filename) {
-        return await s3.deleteObject({
-            Bucket : bucket,
-            Key : filename
-        })
+    async delete_file(s3_filename) {
+        const s3_key = parse_s3_filename(s3_filename)
+        if (s3_key === undefined) {
+            return undefined
+        }
+        return await s3.deleteObject(s3_key)
     }
 
 }