triangle-utils 1.3.3 → 1.4.0

package/dist/src/index.d.ts

@@ -0,0 +1,28 @@
+import { TriangleUtilsConfig } from "./types/TriangleUtilsConfig.js";
+import { UtilsDynamoDB } from "./UtilsDynamoDB.js";
+import { UtilsS3 } from "./UtilsS3.js";
+import { UtilsBedrock } from "./UtilsBedrock.js";
+import { UtilsBee } from "./UtilsBee.js";
+import { UtilsS3Vectors } from "./UtilsS3Vectors.js";
+import { UtilsCognito } from "./UtilsCognito.js";
+import { UtilsMisc } from "./UtilsMisc.js";
+import { UtilsYoutube } from "./UtilsYoutube.js";
+export declare class TriangleUtils extends UtilsMisc {
+    readonly dynamodb: UtilsDynamoDB;
+    readonly s3: UtilsS3;
+    readonly s3vectors: UtilsS3Vectors;
+    readonly bedrock: UtilsBedrock;
+    readonly cognito: UtilsCognito;
+    readonly bee: UtilsBee;
+    readonly youtube: UtilsYoutube;
+    constructor(config: TriangleUtilsConfig);
+}
+export * from "./types/TriangleUtilsConfig.js";
+export * from "./UtilsMisc.js";
+export * from "./UtilsDynamoDB.js";
+export * from "./UtilsS3.js";
+export * from "./UtilsBedrock.js";
+export * from "./UtilsBee.js";
+export * from "./UtilsS3Vectors.js";
+export * from "./UtilsCognito.js";
+export * from "./UtilsYoutube.js";

package/dist/src/index.js

@@ -0,0 +1,36 @@
+import { UtilsDynamoDB } from "./UtilsDynamoDB.js";
+import { UtilsS3 } from "./UtilsS3.js";
+import { UtilsBedrock } from "./UtilsBedrock.js";
+import { UtilsBee } from "./UtilsBee.js";
+import { UtilsS3Vectors } from "./UtilsS3Vectors.js";
+import { UtilsCognito } from "./UtilsCognito.js";
+import { UtilsMisc } from "./UtilsMisc.js";
+import { UtilsYoutube } from "./UtilsYoutube.js";
+export class TriangleUtils extends UtilsMisc {
+    dynamodb;
+    s3;
+    s3vectors;
+    bedrock;
+    cognito;
+    bee;
+    youtube;
+    constructor(config) {
+        super(config);
+        this.dynamodb = new UtilsDynamoDB(config.region);
+        this.s3 = new UtilsS3(config.region);
+        this.s3vectors = new UtilsS3Vectors(config.region);
+        this.bedrock = new UtilsBedrock(config.region);
+        this.cognito = new UtilsCognito(config.region);
+        this.bee = new UtilsBee(config.scraping_bee_api_key);
+        this.youtube = new UtilsYoutube(config.youtube_api_key);
+    }
+}
+export * from "./types/TriangleUtilsConfig.js";
+export * from "./UtilsMisc.js";
+export * from "./UtilsDynamoDB.js";
+export * from "./UtilsS3.js";
+export * from "./UtilsBedrock.js";
+export * from "./UtilsBee.js";
+export * from "./UtilsS3Vectors.js";
+export * from "./UtilsCognito.js";
+export * from "./UtilsYoutube.js";

package/dist/src/types/{Config.d.ts → TriangleUtilsConfig.d.ts}

@@ -1,8 +1,6 @@
-export interface Config {
+export interface TriangleUtilsConfig {
     region: string;
-    google_app_password?: string;
     scraping_bee_api_key?: string;
     youtube_api_key?: string;
-    citizenportal_api_key?: string;
     [key: string]: any;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "triangle-utils",
-    "version": "1.3.3",
+    "version": "1.4.0",
     "main": "dist/src/Utils.js",
     "directories": {
-        "test": "test"
+        "test": "vitest"
     },
     "scripts": {
-        "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+        "test": "vitest",
         "build": "tsc && tsc-alias"
     },
     "author": "",
@@ -15,6 +15,7 @@
     "type": "module",
     "dependencies": {
         "@aws-sdk/client-bedrock-runtime": "^3.953.0",
+        "@aws-sdk/client-cognito-identity-provider": "^3.1004.0",
         "@aws-sdk/client-dynamodb": "^3.953.0",
         "@aws-sdk/client-s3": "^3.953.0",
         "@aws-sdk/client-s3vectors": "^3.953.0",
@@ -24,20 +25,19 @@
         "@types/nodemailer": "^7.0.9",
         "googleapis": "^170.0.0",
         "nodemailer": "^7.0.11",
-        "scrapingbee": "^1.8.2",
-        "triangle-utils": "^1.0.34",
-        "tsc-alias": "^1.8.16"
+        "scrapingbee": "^1.8.2"
     },
     "devDependencies": {
         "@eslint/js": "^9.39.2",
         "@types/jest": "^30.0.0",
         "eslint": "^9.39.2",
         "globals": "^17.3.0",
-        "jest": "^30.2.0",
         "jiti": "^2.6.1",
         "ts-jest": "^29.4.6",
+        "tsc-alias": "^1.8.16",
         "tsx": "^4.21.0",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.55.0"
+        "typescript-eslint": "^8.55.0",
+        "vitest": "^4.0.18"
     }
 }

package/src/{Utils_Bedrock.ts → UtilsBedrock.ts}

@@ -1,13 +1,12 @@
 import { BedrockRuntime } from "@aws-sdk/client-bedrock-runtime"
-import { Config } from "./types/Config"
 
-export class Utils_Bedrock {
+export class UtilsBedrock {
 
-    readonly bedrock : BedrockRuntime
-    readonly text_decoder : TextDecoder
+    private readonly bedrock : BedrockRuntime
+    private readonly text_decoder : TextDecoder
 
-    constructor(config : Config) {
-        this.bedrock = new BedrockRuntime({ region: config.region })
+    constructor(region : string) {
+        this.bedrock = new BedrockRuntime({ region: region })
         this.text_decoder = new TextDecoder()
     }
 
@@ -68,7 +67,7 @@ export class Utils_Bedrock {
         return undefined
     }
 
-    async titan_invoke(text : string) : Promise<string | undefined> {
+    async titan_invoke(text : string) : Promise<number[] | undefined> {
         for (let i = 0; i < 3; i++) {
             try {
                 const output = await this.bedrock.invokeModel({
@@ -79,7 +78,10 @@ export class Utils_Bedrock {
                     contentType : "application/json"
                 })
                 const response = JSON.parse(this.text_decoder.decode(output.body))
-                return response.embedding
+                if (response.embedding !== undefined && Array.isArray(response.embedding) && response.embedding.every((i : any) => typeof i === "number")) {
+                    const embedding : number[] = response.embedding
+                    return embedding
+                }
             } catch (error) {
                 if (error instanceof Error) {
                     console.log(error.stack)

package/src/{Utils_Bee.ts → UtilsBee.ts}

@@ -1,25 +1,22 @@
 import { ScrapingBeeClient } from "scrapingbee"
-import { Config } from "./types/Config"
 
-export class Utils_Bee {
+export class UtilsBee {
 
-    readonly config : Config
-    readonly bee : ScrapingBeeClient | undefined
-    readonly text_decoder : TextDecoder
+    private readonly bee : ScrapingBeeClient | undefined
+    private readonly text_decoder : TextDecoder
 
-    constructor(config : Config) {
-        this.config = config
-        this.bee = config.scraping_bee_api_key !== undefined ? new ScrapingBeeClient(config.scraping_bee_api_key) : undefined
+    constructor(scraping_bee_api_key : string | undefined) {
+        this.bee = scraping_bee_api_key !== undefined ? new ScrapingBeeClient(scraping_bee_api_key) : undefined
         this.text_decoder = new TextDecoder()
     }
 
-    async get(url : string, params : Record<string, string> = {}) {
+    async get(url : string, params : Record<string, string | number | boolean> = {}) {
         if (this.bee === undefined) {
             return undefined
         }
         for (let i = 0; i < 3; i++) {
             try {
-                const response = await this.bee.get({
+                const response = await this.bee.htmlApi({
                     url : url,
                     params : params
                 })
@@ -40,7 +37,7 @@ export class Utils_Bee {
         return undefined
     }
 
-    async google_search(query : string, news : boolean = false) {
+    async google_search(query : string, news : boolean = false) : Promise<Record<string, any>[] | undefined> {
         if (this.bee === undefined) {
             return undefined
         }
@@ -56,13 +53,22 @@ export class Utils_Bee {
                     console.log("Failed to Google:", response.status)
                     continue
                 }
-                const data = response.data
-                const results = news ? data.news_results : data.organic_results
+                const data : Record<string, any> = JSON.parse(response.data.toString("utf-8"))
+                
+                if (data.news_results === undefined || data.organic_results === undefined) {
+                    continue
+                }
+                const results : Record<string, any>[] | undefined = news ? data.news_results : data.organic_results
+
 
                 if (results === undefined) {
                     console.log("Failed to Google.")
                     continue
                 }
+                if (!Array.isArray(results)) {
+                    console.log("Results are not an array.")
+                    return
+                }
                 return results
             } catch {
                 console.log("Failed to Google.")
@@ -72,7 +78,7 @@ export class Utils_Bee {
         return undefined
     }
 
-    async youtube_search(query : string, options = {}) {
+    async youtube_search(query : string, options = {}) : Promise<Record<string, any>[] | undefined> {
         if (this.bee === undefined) {
             return undefined
         }
@@ -86,7 +92,7 @@ export class Utils_Bee {
                     console.log("Failed to YouTube Search:", response.status)
                     continue
                 }
-                const data = response.data
+                const data : Record<string, any> = JSON.parse(response.data.toString("utf-8"))
                 const results = data.results
 
                 if (results === undefined) {

package/src/UtilsCognito.ts

@@ -0,0 +1,116 @@
+import { CognitoIdentityProvider, NotAuthorizedException } from "@aws-sdk/client-cognito-identity-provider"
+
+export class UtilsCognito {
+
+    private readonly cognito : CognitoIdentityProvider
+
+    constructor(region : string) {
+        this.cognito = new CognitoIdentityProvider({ region : region })
+    }
+
+    async admin_get_user(user_pool_id : string, username : string) {
+        try {
+            return await this.cognito.adminGetUser({
+                UserPoolId : user_pool_id,
+                Username : username
+            })
+        } catch (error) {
+            return undefined
+        }
+    }
+
+    async admin_create_user(user_pool_id : string, username : string, user_id : string) {
+        try {
+            return await this.cognito.adminCreateUser({
+                UserPoolId : user_pool_id,
+                Username : username,
+                UserAttributes : [
+                    { Name : "preferred_username", Value : user_id },
+                    { Name : "email_verified", Value : "true" }
+                ]
+            })
+        } catch (error) {
+            if (error instanceof Error) {
+                return new Error(error.toString().replace("Exception: ", ""))
+            }
+            return new Error()
+        }
+    }
+
+    async admin_reset_password(user_pool_id : string, username : string) {
+        const user = await this.admin_get_user(user_pool_id, username)
+        if (user === undefined) {
+            return new Error("User does not exist.")
+        }
+        try {
+            return await this.cognito.adminCreateUser({
+                UserPoolId : user_pool_id,
+                Username : username,
+                MessageAction : "RESEND"
+            })
+        } catch (error) {
+            if (error instanceof Error) {
+                return new Error(error.toString().replace("Exception: ", ""))
+            }
+            return new Error()
+        }
+    }
+
+    async get_user_id(token : string) : Promise<string | undefined> {
+        try {
+            const user_info = await this.cognito.getUser({
+                AccessToken : token
+            })
+            const user_attributes = user_info.UserAttributes
+            if (user_attributes === undefined) {
+                return undefined
+            }
+            const user_attribute = user_attributes.filter(attribute => attribute.Name === "preferred_username")[0]
+            const user_id = user_attribute.Value
+            return user_id
+        } catch (error) {
+            if (error instanceof NotAuthorizedException) {
+                return undefined
+            }
+            throw error
+        }
+    }
+
+    async get_new_token(client_id : string, client_secret : string, refresh_token : string) : Promise<string | undefined> {
+        try {
+            const response = await this.cognito.getTokensFromRefreshToken({
+                ClientId : client_id,
+                ClientSecret : client_secret,
+                RefreshToken : refresh_token
+            })
+            const new_auth_result = response.AuthenticationResult
+            if (new_auth_result === undefined) {
+                return undefined
+            }
+            const new_token = new_auth_result.AccessToken
+            return new_token
+        } catch (error) {
+            return undefined
+        }
+    }
+
+    async sign_out(token : string) {
+        await this.cognito.globalSignOut({
+            AccessToken : token
+        })
+    }
+
+    async admin_disable_user(user_pool_id : string, username : string) : Promise<void> {
+        await this.cognito.adminDisableUser({
+            UserPoolId : user_pool_id,
+            Username : username,
+        })
+    }
+
+    async admin_delete_user(user_pool_id : string, username : string) : Promise<void> {
+        await this.cognito.adminDeleteUser({
+            UserPoolId : user_pool_id,
+            Username : username,
+        })
+    }
+}

package/src/{Utils_DynamoDB.ts → UtilsDynamoDB.ts}

@@ -1,19 +1,18 @@
 import { AttributeValue, DynamoDB, QueryCommandInput, QueryCommandOutput, ScanCommandInput, ScanCommandOutput, UpdateItemCommandInput } from "@aws-sdk/client-dynamodb"
-import { Config } from "./types/Config"
 
-function convert_output(dynamoobject : AttributeValue) : string | boolean | number | any[] | Set<any> | Record<string, any> | undefined {
-    if (dynamoobject.S !== undefined) {
-        return dynamoobject.S
-    } else if (dynamoobject.N !== undefined) {
-        return Number(dynamoobject.N)
-    } else if (dynamoobject.L !== undefined) {
-        return dynamoobject.L.map((a : AttributeValue) => convert_output(a))
-    } else if (dynamoobject.SS !== undefined) {
-        return new Set(dynamoobject.SS)
-    } else if (dynamoobject.M !== undefined) {
-        return Object.fromEntries(Object.entries(dynamoobject.M).map(([key, value]) => [key, convert_output(value)]))
-    } else if (dynamoobject.BOOL !== undefined) {
-        return dynamoobject.BOOL
+function convert_output(dynamodb_output : AttributeValue) : string | boolean | number | any[] | Set<any> | Record<string, any> | undefined {
+    if (dynamodb_output.S !== undefined) {
+        return dynamodb_output.S
+    } else if (dynamodb_output.N !== undefined) {
+        return Number(dynamodb_output.N)
+    } else if (dynamodb_output.L !== undefined) {
+        return dynamodb_output.L.map((a : AttributeValue) => convert_output(a))
+    } else if (dynamodb_output.SS !== undefined) {
+        return new Set(dynamodb_output.SS)
+    } else if (dynamodb_output.M !== undefined) {
+        return Object.fromEntries(Object.entries(dynamodb_output.M).map(([key, value]) => [key, convert_output(value)]))
+    } else if (dynamodb_output.BOOL !== undefined) {
+        return dynamodb_output.BOOL
     }
     return undefined
 }
@@ -84,12 +83,12 @@ async function compile_pages(
     }
 }
 
-export class Utils_DynamoDB {
+export class UtilsDynamoDB {
 
-    readonly dynamodb : DynamoDB
+    private readonly dynamodb : DynamoDB
 
-    constructor(config : Config) {
-        this.dynamodb = new DynamoDB({ region : config.region })
+    constructor(region : string) {
+        this.dynamodb = new DynamoDB({ region : region })
     }
 
     async scan(
@@ -165,7 +164,10 @@ export class Utils_DynamoDB {
         return converted_output
     }
 
-    async get_max(table : string, primary_key : Record<string, any>) : Promise<Record<string, any> | undefined> {
+    async get_max(
+        table : string,
+        primary_key : Record<string, any>
+    ) : Promise<Record<string, any> | undefined> {
         if (Object.keys(primary_key).length !== 1) {
             return undefined
         }
@@ -205,16 +207,16 @@ export class Utils_DynamoDB {
             reverse? : boolean,
             compile? : boolean
         } = {}
-    ) : Promise<Record<string, any>[] | undefined>{
+    ) : Promise<Record<string, any>[]>{
         const reverse = options.reverse !== undefined ? options.reverse : false
         const compile = options.compile !== undefined ? options.compile : true
         if (Object.keys(primary_key).length !== 1) {
-            return undefined
+            return []
         }
         const key = Object.keys(primary_key)[0]
         const value = convert_input(Object.values(primary_key)[0])
         if (value === undefined) {
-            return undefined
+            return []
         }
         const request : QueryCommandInput = {
             TableName : table,
@@ -238,16 +240,16 @@ export class Utils_DynamoDB {
             reverse? : boolean,
             compile? : boolean
         } = {}
-    ) : Promise<Record<string, any>[] | undefined>{
+    ) : Promise<Record<string, any>[]>{
         const reverse = options.reverse !== undefined ? options.reverse : false
         const compile = options.compile !== undefined ? options.compile : true
         if (Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_prefix).length !== 1) {
-            return undefined
+            return []
         }
         const converted_primary_value = convert_input(Object.values(primary_key)[0])
         const converted_secondary_prefix_value = convert_input(Object.values(secondary_key_prefix)[0])
         if (converted_primary_value === undefined || converted_secondary_prefix_value === undefined) {
-            return undefined
+            return []
         }
         const request : QueryCommandInput = {
             TableName : table,
@@ -268,22 +270,22 @@ export class Utils_DynamoDB {
     async query_range(
         table : string,
         primary_key : Record<string, any>,
-        secondary_key_range : Record<string, string|number[]>,
+        secondary_key_range : Record<string, (string|number)[]>,
         options : {
             reverse? : boolean,
             compile? : boolean
         } = {}
-    ) : Promise<Record<string, any>[] | undefined>{
+    ) : Promise<Record<string, any>[]>{
         const reverse = options.reverse !== undefined ? options.reverse : false
         const compile = options.compile !== undefined ? options.compile : true
         if (Object.keys(primary_key).length !== 1 || Object.keys(secondary_key_range).length !== 1 || Object.values(secondary_key_range)[0].length !== 2) {
-            return undefined
+            return []
         }
         const converted_primary_value = convert_input(Object.values(primary_key)[0])
         const converted_secondary_range_start_value = convert_input(Object.values(secondary_key_range)[0][0])
         const converted_secondary_range_end_value = convert_input(Object.values(secondary_key_range)[0][1])
         if (converted_primary_value === undefined || converted_secondary_range_start_value === undefined || converted_secondary_range_end_value === undefined) {
-            return undefined
+            return []
         }
         const request : QueryCommandInput = {
             TableName : table,
@@ -385,7 +387,7 @@ export class Utils_DynamoDB {
         await this.dynamodb.updateItem(request)
     }
 
-    async create(table : string, key : Record<string, any>, attributes : Record<string, any[]> = {}) : Promise<void> {
+    async create(table : string, key : Record<string, any>, attributes : Record<string, any> = {}) : Promise<void> {
         const item = await this.get(table, key, true)
         if (item !== undefined) {
             return