triangle-utils 1.4.110 → 1.4.112

package/dist/src/UtilsBee.d.ts

@@ -4,7 +4,9 @@ export declare class UtilsBee {
     constructor(scraping_bee_api_key: string | undefined);
     get_buffer(url: string, params?: Record<string, string | number | boolean>): Promise<Error | Buffer<any> | undefined>;
     get(url: string, params?: Record<string, string | number | boolean>): Promise<string | Error | undefined>;
-    google_search(query: string, news?: boolean): Promise<Record<string, any>[] | undefined>;
+    google_search(query: string, options?: {
+        search_type_id?: string;
+    }): Promise<Record<string, any>[] | undefined>;
     youtube_search(query: string, options?: {}): Promise<Record<string, any>[] | undefined>;
     youtube_get_subtitles(video_id: string): Promise<Record<string, any> | undefined>;
 }

package/dist/src/UtilsBee.js

@@ -39,42 +39,39 @@ export class UtilsBee {
         }
         return this.text_decoder.decode(buffer);
     }
-    async google_search(query, news = false) {
+    async google_search(query, options = {}) {
         if (this.bee === undefined) {
             return undefined;
         }
-        for (let i = 0; i < 3; i++) {
-            try {
-                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 = JSON.parse(response.data.toString("utf-8"));
-                if (data.news_results === undefined || data.organic_results === undefined) {
-                    continue;
-                }
-                const results = 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;
+        try {
+            const response = await this.bee.googleSearch({
+                search: query,
+                params: {
+                    search_type: options.search_type_id
                 }
-                return results;
+            });
+            if (response.status !== 200) {
+                console.log("Failed to Google:", response.status);
+                return;
             }
-            catch {
+            const data = JSON.parse(response.data.toString("utf-8"));
+            if (data.news_results === undefined || data.organic_results === undefined) {
+                return;
+            }
+            const results = options.search_type_id === "news" ? data.news_results : data.organic_results;
+            if (results === undefined) {
                 console.log("Failed to Google.");
+                return;
+            }
+            if (!Array.isArray(results)) {
+                console.log("Results are not an array.");
+                return;
             }
+            return results;
+        }
+        catch (error) {
+            console.log("Failed to Google:", error.stack);
         }
-        console.log("Failed to Google thrice, quitting.");
         return undefined;
     }
     async youtube_search(query, options = {}) {

package/dist/src/types/GlobalConfig.d.ts

@@ -3,6 +3,7 @@ export declare class GlobalConfig {
     readonly cognito_user_pool_id: string;
     readonly secret_key: string;
     readonly auth_url: string;
+    readonly s3_triangle: string;
     readonly s3_elections: string;
     readonly s3_prism: string;
     readonly s3_scout: string;

package/dist/src/types/GlobalConfig.js

@@ -3,6 +3,7 @@ export class GlobalConfig {
     cognito_user_pool_id;
     secret_key;
     auth_url;
+    s3_triangle;
     s3_elections;
     s3_prism;
     s3_scout;
@@ -22,6 +23,7 @@ export class GlobalConfig {
         this.cognito_user_pool_id = global_config.cognito_user_pool_id;
         this.secret_key = global_config.secret_key;
         this.auth_url = global_config.auth_url;
+        this.s3_triangle = global_config.s3_triangle;
         this.s3_elections = global_config.s3_elections;
         this.s3_prism = global_config.s3_prism;
         this.s3_scout = global_config.s3_scout;
@@ -40,6 +42,7 @@ export class GlobalConfig {
             typeof global_config.cognito_user_pool_id === "string" &&
             typeof global_config.secret_key === "string" &&
             typeof global_config.auth_url === "string" &&
+            typeof global_config.s3_triangle === "string" &&
             typeof global_config.s3_elections === "string" &&
             typeof global_config.s3_prism === "string" &&
             typeof global_config.s3_scout === "string" &&

package/package.json

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

package/src/UtilsBee.ts

@@ -45,44 +45,41 @@ export class UtilsBee {
         return this.text_decoder.decode(buffer)
     }
 
-    async google_search(query : string, news : boolean = false) : Promise<Record<string, any>[] | undefined> {
+    async google_search(query : string, options : { search_type_id? : string } = {}) : Promise<Record<string, any>[] | undefined> {
         if (this.bee === undefined) {
             return undefined
         }
-        for (let i = 0; i < 3; i++) {
-            try {
-                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 : Record<string, any> = JSON.parse(response.data.toString("utf-8"))
-                
-                if (data.news_results === undefined || data.organic_results === undefined) {
-                    continue
+        try {
+            const response = await this.bee.googleSearch({
+                search : query,
+                params : {
+                    search_type : options.search_type_id
                 }
-                const results : Record<string, any>[] | undefined = news ? data.news_results : data.organic_results
+            })
+            if (response.status !== 200) {
+                console.log("Failed to Google:", response.status)
+                return
+            }
+            const data : Record<string, any> = JSON.parse(response.data.toString("utf-8"))
+            
+            if (data.news_results === undefined || data.organic_results === undefined) {
+                return
+            }
+            const results : Record<string, any>[] | undefined = options.search_type_id === "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 {
+            if (results === undefined) {
                 console.log("Failed to Google.")
+                return
+            }
+            if (!Array.isArray(results)) {
+                console.log("Results are not an array.")
+                return
             }
+            return results
+        } catch (error : any) {
+            console.log("Failed to Google:", error.stack)
         }
-        console.log("Failed to Google thrice, quitting.")
         return undefined
     }
 

package/src/types/GlobalConfig.ts

@@ -3,6 +3,7 @@ export class GlobalConfig {
     readonly cognito_user_pool_id : string
     readonly secret_key : string
     readonly auth_url : string
+    readonly s3_triangle : string
     readonly s3_elections : string
     readonly s3_prism : string
     readonly s3_scout : string
@@ -24,6 +25,7 @@ export class GlobalConfig {
         this.cognito_user_pool_id = global_config.cognito_user_pool_id
         this.secret_key = global_config.secret_key
         this.auth_url = global_config.auth_url
+        this.s3_triangle = global_config.s3_triangle
         this.s3_elections = global_config.s3_elections
         this.s3_prism = global_config.s3_prism
         this.s3_scout = global_config.s3_scout
@@ -44,6 +46,7 @@ export class GlobalConfig {
             typeof global_config.cognito_user_pool_id === "string" &&
             typeof global_config.secret_key === "string" &&
             typeof global_config.auth_url === "string" &&
+            typeof global_config.s3_triangle === "string" &&
             typeof global_config.s3_elections === "string" &&
             typeof global_config.s3_prism === "string" &&
             typeof global_config.s3_scout === "string" &&