triangle-utils 1.2.12 → 1.3.1

package/eslint.config.ts

@@ -0,0 +1,13 @@
+import js from "@eslint/js";
+import globals from "globals";
+import tseslint from "typescript-eslint";
+import { defineConfig } from "eslint/config";
+
+export default defineConfig([
+    { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], plugins: { js }, extends: ["js/recommended"], languageOptions: { globals: globals.browser } },
+    {
+		rules: {
+            "@typescript-eslint/explicit-function-return-type": "error"
+		},
+	},
+]);

package/jest.config.js

@@ -0,0 +1,19 @@
+import { createDefaultPreset } from "ts-jest"
+
+const tsJestTransformCfg = createDefaultPreset().transform;
+
+/** @type {import("jest").Config} **/
+export default {
+    testEnvironment: "node",
+    transform: {
+        ...tsJestTransformCfg,
+    },
+    transformIgnorePatterns: ["/node_modules/(?!@smithy|@aws-sdk).+\\.js$"],
+    globals : {
+        "ts-jest" : {
+            useESM : true
+        }
+    },
+    extensionsToTreatAsEsm : [".ts"],
+    testTimeout : 30000
+};

package/package.json

@@ -1,7 +1,13 @@
 {
     "name": "triangle-utils",
-    "version": "1.2.12",
-    "main": "Utils.js",
+    "version": "1.3.1",
+    "main": "dist/src/Utils.js",
+    "directories": {
+        "test": "test"
+    },
+    "scripts": {
+        "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+    },
     "author": "",
     "license": "ISC",
     "description": "",
@@ -13,9 +19,23 @@
         "@aws-sdk/client-s3vectors": "^3.953.0",
         "@aws-sdk/client-secrets-manager": "^3.965.0",
         "@aws-sdk/s3-request-presigner": "^3.953.0",
+        "@types/node": "^25.2.3",
+        "@types/nodemailer": "^7.0.9",
         "googleapis": "^170.0.0",
         "nodemailer": "^7.0.11",
-        "scrapingbee": "^1.7.6",
+        "scrapingbee": "^1.8.2",
         "triangle-utils": "^1.0.34"
+    },
+    "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",
+        "tsx": "^4.21.0",
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.55.0"
     }
 }

package/src/Utils.ts

@@ -0,0 +1,28 @@
+import { Utils_Misc } from "./Utils_Misc"
+import { Utils_DynamoDB } from "./Utils_DynamoDB"
+import { Utils_S3 } from "./Utils_S3"
+import { Utils_Bedrock } from "./Utils_Bedrock"
+import { Utils_Bee } from "./Utils_Bee"
+import { Utils_S3Vectors } from "./Utils_S3Vectors"
+import { Utils_Youtube } from "./Utils_Youtube"
+import { Config } from "./types/Config"
+
+export class Utils extends Utils_Misc {
+
+    readonly dynamodb : Utils_DynamoDB
+    readonly s3 : Utils_S3
+    readonly s3vectors : Utils_S3Vectors
+    readonly bedrock : Utils_Bedrock
+    readonly bee : Utils_Bee
+    readonly youtube : Utils_Youtube
+
+    constructor(config : Config) {
+        super(config)
+        this.dynamodb = new Utils_DynamoDB(config)
+        this.s3 = new Utils_S3(config)
+        this.s3vectors = new Utils_S3Vectors(config)
+        this.bedrock = new Utils_Bedrock(config)
+        this.bee = new Utils_Bee(config)
+        this.youtube = new Utils_Youtube(config)
+    }
+}

package/{utils/Utils_Bedrock.js → src/Utils_Bedrock.ts}

@@ -1,13 +1,17 @@
 import { BedrockRuntime } from "@aws-sdk/client-bedrock-runtime"
+import { Config } from "./types/Config"
 
-export default class Utils_Bedrock {
+export class Utils_Bedrock {
 
-    constructor(config) {
+    readonly bedrock : BedrockRuntime
+    readonly text_decoder : TextDecoder
+
+    constructor(config : Config) {
         this.bedrock = new BedrockRuntime({ region: config.region })
         this.text_decoder = new TextDecoder()
     }
 
-    async llama_invoke(model_id, prompt, temperature = 0.5, max_gen_len = 512, top_p = 0.9) {
+    async llama_invoke(model_id : string, prompt : string, temperature : number = 0.5, max_gen_len : number = 512, top_p : number = 0.9) : Promise<string | undefined> {
         for (let i = 0; i < 3; i++) {
             try {
                 const output = await this.bedrock.invokeModel({
@@ -30,10 +34,10 @@ export default class Utils_Bedrock {
         return undefined
     }
 
-    async gpt_converse(model_id, prompt, temperature = 0.5, max_gen_len = 512, top_p = 0.9) {
+    async gpt_converse(model_id : string, prompt : string, temperature : number = 0.5, max_gen_len : number = 512, top_p : number = 0.9) : Promise<string | undefined> {
         for (let i = 0; i < 3; i++) {
             try {
-                const output = await this.bedrock.converse({
+                const response = await this.bedrock.converse({
                     modelId : model_id,
                     messages : [
                         { role : "user", content : [ { text : prompt } ] }
@@ -44,22 +48,27 @@ export default class Utils_Bedrock {
                         maxTokens : max_gen_len
                     }
                 })
-                const response = output.output
-                for (const c of response.message.content) {
+                const output = response.output
+                if (output === undefined || output.message === undefined || output.message.content === undefined) {
+                    continue
+                }
+                for (const c of output.message.content) {
                     if (c.text !== undefined) {
                         return c.text
                     }
                 }
-            } catch (e) {
+            } catch (error) {
+                if (error instanceof Error) {
+                    console.log(error.stack)
+                }
                 console.log("Failed to get from Bedrock.")
-                console.log(e.stack)
             }
         }
         console.log("Failed to get from Bedrock, quitting.")
         return undefined
     }
 
-    async titan_invoke(text) {
+    async titan_invoke(text : string) : Promise<string | undefined> {
         for (let i = 0; i < 3; i++) {
             try {
                 const output = await this.bedrock.invokeModel({
@@ -71,9 +80,11 @@ export default class Utils_Bedrock {
                 })
                 const response = JSON.parse(this.text_decoder.decode(output.body))
                 return response.embedding
-            } catch (e) {
+            } catch (error) {
+                if (error instanceof Error) {
+                    console.log(error.stack)
+                }
                 console.log("Failed to get from Bedrock.")
-                console.log(e.stack)
             }
         }
         console.log("Failed to get from Bedrock, quitting.")

package/{utils/Utils_Bee.js → src/Utils_Bee.ts}

@@ -1,28 +1,38 @@
 import { ScrapingBeeClient } from "scrapingbee"
+import { Config } from "./types/Config"
 
-export default class Utils_Bee {
+export class Utils_Bee {
 
-    constructor(config) {
+    readonly config : Config
+    readonly bee : ScrapingBeeClient | undefined
+    readonly text_decoder : TextDecoder
+
+    constructor(config : Config) {
         this.config = config
-        this.bee = new ScrapingBeeClient(config.scraping_bee_api_key)
+        this.bee = config.scraping_bee_api_key !== undefined ? new ScrapingBeeClient(config.scraping_bee_api_key) : undefined
         this.text_decoder = new TextDecoder()
     }
 
-    async get(url, params) {
+    async get(url : string, params : Record<string, string> = {}) {
+        if (this.bee === undefined) {
+            return undefined
+        }
         for (let i = 0; i < 3; i++) {
             try {
                 const response = await this.bee.get({
                     url : url,
                     params : params
-                }).catch(response => response)
+                })
                 if (response.status !== 200) {
                     console.log("Status", response.status)
                     return undefined
                 }
                 const text = this.text_decoder.decode(response.data)
                 return text
-            } catch (e) {
-                console.log(e.stack)
+            } catch (error) {
+                if (error instanceof Error) {
+                    console.log(error.stack)
+                }
                 console.log("Failed to get from Scraping Bee.")
             }
         }
@@ -30,17 +40,23 @@ export default class Utils_Bee {
         return undefined
     }
 
-    async google_search(query, news = false) {
+    async google_search(query : string, news : boolean = false) {
+        if (this.bee === undefined) {
+            return undefined
+        }
         for (let i = 0; i < 3; i++) {
             try {
-                const bee_url = "https://app.scrapingbee.com/api/v1/store/google?api_key=" + this.config.scraping_bee_api_key + "&search=" + encodeURI(query) + (news ? "&search_type=news" : "")
-                console.log(bee_url)
-                const response = await fetch(bee_url)
-                if (!response.ok) {
+                const response = await this.bee.googleSearch({
+                    search : query,
+                    params : {
+                        search_type : news ? "news" : undefined
+                    }
+                })
+                if (response.status !== 200) {
                     console.log("Failed to Google:", response.status)
                     continue
                 }
-                const data = await response.json()
+                const data = response.data
                 const results = news ? data.news_results : data.organic_results
 
                 if (results === undefined) {
@@ -56,17 +72,21 @@ export default class Utils_Bee {
         return undefined
     }
 
-    async youtube_search(query, options = {}) {
+    async youtube_search(query : string, options = {}) {
+        if (this.bee === undefined) {
+            return undefined
+        }
         for (let i = 0; i < 3; i++) {
             try {
-                const bee_url = "https://app.scrapingbee.com/api/v1/youtube/search?api_key=" + this.config.scraping_bee_api_key + "&search=" + encodeURI(query) + Object.entries(options).filter(([key, value]) => value !== undefined).map(([key, value]) => "&" + key + "=" + value).join("")
-                console.log(bee_url)
-                const response = await fetch(bee_url)
-                if (!response.ok) {
+                const response = await this.bee.youtubeSearch({
+                    search : query,
+                    params : options
+                })
+                if (response.status !== 200) {
                     console.log("Failed to YouTube Search:", response.status)
                     continue
                 }
-                const data = await response.json()
+                const data = response.data
                 const results = data.results
 
                 if (results === undefined) {