npm - triangle-utils - Versions diffs - 1.4.157 → 1.4.158 - Mend

triangle-utils 1.4.157 → 1.4.158

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/src/UtilsRDS.d.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 export declare class UtilsRDS {
-    private readonly postgres;
+    private readonly rds_host;
+    private readonly rds_username;
+    private readonly rds_password;
+    private postgres?;
     private readonly rds_data;
     private readonly rds_cluster_arn;
     private readonly rds_secret_arn;
@@ -8,7 +11,7 @@ export declare class UtilsRDS {
     disconnect(): Promise<void>;
     query(sql: string, options?: {
         is_verbose?: boolean;
-    }): Promise<any[]>;
+    }): Promise<any[] | undefined>;
     exec(sql: string, options?: {
         is_verbose?: boolean;
         is_forced?: boolean;

package/dist/src/UtilsRDS.js CHANGED Viewed

@@ -50,37 +50,56 @@ function convert_rds_output(input) {
     return undefined;
 }
 export class UtilsRDS {
+    rds_host;
+    rds_username;
+    rds_password;
     postgres;
     rds_data;
     rds_cluster_arn;
     rds_secret_arn;
     constructor(region, rds_cluster_arn, rds_secret_arn, rds_host, rds_username, rds_password) {
+        this.rds_host = rds_host;
+        this.rds_username = rds_username;
+        this.rds_password = rds_password;
+        this.rds_data = new RDSData({ region: region });
+        this.rds_cluster_arn = rds_cluster_arn,
+            this.rds_secret_arn = rds_secret_arn;
+    }
+    async connect() {
+        if (this.postgres !== undefined) {
+            await this.disconnect();
+        }
         this.postgres = new Client({
-            host: rds_host,
-            user: rds_username,
-            password: rds_password,
+            host: this.rds_host,
+            user: this.rds_username,
+            password: this.rds_password,
             database: "triangle",
             port: 5432,
             ssl: {
                 rejectUnauthorized: false
             }
         });
-        this.rds_data = new RDSData({ region: region });
-        this.rds_cluster_arn = rds_cluster_arn,
-            this.rds_secret_arn = rds_secret_arn;
-    }
-    async connect() {
         await this.postgres.connect();
     }
     async disconnect() {
+        if (this.postgres === undefined) {
+            return;
+        }
         await this.postgres.end();
+        this.postgres = undefined;
     }
     async query(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
+        await this.connect();
         if (is_verbose) {
             console.log(sql);
         }
+        if (this.postgres === undefined) {
+            console.log("Failed to connect to Postgres.");
+            return;
+        }
         const response = await this.postgres.query(sql);
+        await this.disconnect();
         return response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
             .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)));
     }

package/dist/src/f.js CHANGED Viewed

@@ -81,5 +81,7 @@ const utils = new TriangleUtils(config);
 //     .then(user => console.log(user))
 // await utils.bedrock.cohere_invoke("cohere.embed-v4", "yyyyyuuuuuurrrrr")
 //     .then(response => console.log(response))
-await utils.s3.get_download_url("s3://triangle-675045717295-us-east-1-an/tenant_documents/a3a9627f-a94d-4d47-a110-307a6f5563af/a146d789-da40-4e3c-a132-8b7110f3f7df.pdf", { name: "hye.pdf" })
-    .then(response => console.log(response));
+// await utils.s3.get_download_url("s3://triangle-675045717295-us-east-1-an/tenant_documents/a3a9627f-a94d-4d47-a110-307a6f5563af/a146d789-da40-4e3c-a132-8b7110f3f7df.pdf", { name : "hye.pdf" })
+//     .then(response => console.log(response))
+const scouts = await utils.rds.batch_get("scouts", [], { is_verbose: true })
+    .then(console.log);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.157",
+    "version": "1.4.158",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsRDS.ts CHANGED Viewed

@@ -44,7 +44,10 @@ function convert_rds_output(input : Field) {
 export class UtilsRDS {
-    private readonly postgres : Client
+    private readonly rds_host : string
+    private readonly rds_username : string
+    private readonly rds_password : string
+    private postgres? : Client
     private readonly rds_data : RDSData
     private readonly rds_cluster_arn : string
     private readonly rds_secret_arn : string
@@ -57,27 +60,37 @@ export class UtilsRDS {
         rds_username : string,
         rds_password : string
     ) {
+        this.rds_host = rds_host
+        this.rds_username = rds_username
+        this.rds_password = rds_password
+        this.rds_data = new RDSData({ region : region })
+        this.rds_cluster_arn = rds_cluster_arn,
+        this.rds_secret_arn = rds_secret_arn
+    }
+    async connect() {
+        if (this.postgres !== undefined) {
+            await this.disconnect()
+        }
         this.postgres = new Client({
-            host : rds_host,
-            user : rds_username,
-            password : rds_password,
+            host : this.rds_host,
+            user : this.rds_username,
+            password : this.rds_password,
             database : "triangle",
             port : 5432,
             ssl : {
                 rejectUnauthorized: false
             }
         })
-        this.rds_data = new RDSData({ region : region })
-        this.rds_cluster_arn = rds_cluster_arn,
-        this.rds_secret_arn = rds_secret_arn
-    }
-    async connect() {
         await this.postgres.connect()
     }
     async disconnect() {
+        if (this.postgres === undefined) {
+            return
+        }
         await this.postgres.end()
+        this.postgres = undefined
     }
     async query(
@@ -87,10 +100,16 @@ export class UtilsRDS {
         } = {}
     ) {
         const is_verbose = Boolean(options.is_verbose)
+        await this.connect()
         if (is_verbose) {
             console.log(sql)
         }
+        if (this.postgres === undefined) {
+            console.log("Failed to connect to Postgres.")
+            return
+        }
         const response = await this.postgres.query(sql)
+        await this.disconnect()
         return response.rows.map(item => Object.fromEntries(
             response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
                 .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)

package/src/f.ts CHANGED Viewed

@@ -103,5 +103,8 @@ const utils = new TriangleUtils(config)
 // await utils.bedrock.cohere_invoke("cohere.embed-v4", "yyyyyuuuuuurrrrr")
 //     .then(response => console.log(response))
-await utils.s3.get_download_url("s3://triangle-675045717295-us-east-1-an/tenant_documents/a3a9627f-a94d-4d47-a110-307a6f5563af/a146d789-da40-4e3c-a132-8b7110f3f7df.pdf", { name : "hye.pdf" })
-    .then(response => console.log(response))
+// await utils.s3.get_download_url("s3://triangle-675045717295-us-east-1-an/tenant_documents/a3a9627f-a94d-4d47-a110-307a6f5563af/a146d789-da40-4e3c-a132-8b7110f3f7df.pdf", { name : "hye.pdf" })
+//     .then(response => console.log(response))
+    const scouts = await utils.rds.batch_get("scouts", [], { is_verbose : true })
+        .then(console.log)