triangle-utils 1.4.159 → 1.4.161

package/dist/src/UtilsBedrock.js

@@ -134,7 +134,7 @@ export class UtilsBedrock {
             if (verbosity > 1) {
                 console.log(JSON.stringify(body.content, undefined, 4));
             }
-            const text = body.content.filter((content) => content.type === "text")[0].text;
+            const text = body.content.filter((content) => content.type === "text")[0]?.text;
             return text;
         }
         catch (error) {

package/dist/src/UtilsRDS.d.ts

@@ -2,13 +2,11 @@ export declare class UtilsRDS {
     private readonly rds_host;
     private readonly rds_username;
     private readonly rds_password;
-    private postgres?;
+    private readonly rds_pool;
     private readonly rds_data;
     private readonly rds_cluster_arn;
     private readonly rds_secret_arn;
     constructor(region: string, rds_cluster_arn: string, rds_secret_arn: string, rds_host: string, rds_username: string, rds_password: string);
-    connect(): Promise<void>;
-    disconnect(): Promise<void>;
     query(sql: string, options?: {
         is_verbose?: boolean;
     }): Promise<any[]>;

package/dist/src/UtilsRDS.js

@@ -1,5 +1,5 @@
 import { RDSData } from "@aws-sdk/client-rds-data";
-import { Client } from "pg";
+import { Pool } from "pg";
 function convert_rds_input(input) {
     if (input === undefined) {
         return "NULL";
@@ -53,7 +53,7 @@ export class UtilsRDS {
     rds_host;
     rds_username;
     rds_password;
-    postgres;
+    rds_pool;
     rds_data;
     rds_cluster_arn;
     rds_secret_arn;
@@ -61,15 +61,7 @@ export class UtilsRDS {
         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({
+        this.rds_pool = new Pool({
             host: this.rds_host,
             user: this.rds_username,
             password: this.rds_password,
@@ -79,27 +71,16 @@ export class UtilsRDS {
                 rejectUnauthorized: false
             }
         });
-        await this.postgres.connect();
-    }
-    async disconnect() {
-        if (this.postgres === undefined) {
-            return;
-        }
-        await this.postgres.end();
-        this.postgres = undefined;
+        this.rds_data = new RDSData({ region: region });
+        this.rds_cluster_arn = rds_cluster_arn,
+            this.rds_secret_arn = rds_secret_arn;
     }
     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();
+        const response = await this.rds_pool.query(sql);
         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

@@ -83,5 +83,3 @@ const utils = new TriangleUtils(config);
 //     .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

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

package/src/UtilsBedrock.ts

@@ -166,7 +166,7 @@ export class UtilsBedrock {
             if (verbosity > 1) {
                 console.log(JSON.stringify(body.content, undefined, 4))
             }
-            const text = body.content.filter((content : any) => content.type === "text")[0].text
+            const text = body.content.filter((content : any) => content.type === "text")[0]?.text
             return text
         } catch (error) {
             if (error instanceof Error) {

package/src/UtilsRDS.ts

@@ -1,5 +1,5 @@
 import { Field, RDSData } from "@aws-sdk/client-rds-data"
-import { Client } from "pg"
+import { Client, Pool } from "pg"
 
 function convert_rds_input(input : string | boolean | number | any[] | Record<string, any> | undefined) : string {
     if (input === undefined) {
@@ -47,7 +47,7 @@ export class UtilsRDS {
     private readonly rds_host : string
     private readonly rds_username : string
     private readonly rds_password : string
-    private postgres? : Client
+    private readonly rds_pool : Pool
     private readonly rds_data : RDSData
     private readonly rds_cluster_arn : string
     private readonly rds_secret_arn : string
@@ -63,16 +63,7 @@ export class UtilsRDS {
         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({
+        this.rds_pool = new Pool({
             host : this.rds_host,
             user : this.rds_username,
             password : this.rds_password,
@@ -82,15 +73,9 @@ export class UtilsRDS {
                 rejectUnauthorized: false
             }
         })
-        await this.postgres.connect()
-    }
-
-    async disconnect() {
-        if (this.postgres === undefined) {
-            return
-        }
-        await this.postgres.end()
-        this.postgres = undefined
+        this.rds_data = new RDSData({ region : region })
+        this.rds_cluster_arn = rds_cluster_arn,
+        this.rds_secret_arn = rds_secret_arn
     }
 
     async query(
@@ -100,16 +85,10 @@ 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()
+        const response = await this.rds_pool.query(sql)
         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

@@ -105,6 +105,3 @@ const utils = new TriangleUtils(config)
 
 // 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)