triangle-utils 1.4.33 → 1.4.35

package/dist/src/UtilsBee.d.ts

@@ -2,8 +2,8 @@ export declare class UtilsBee {
     private readonly bee;
     private readonly text_decoder;
     constructor(scraping_bee_api_key: string | undefined);
-    get_buffer(url: string, params?: Record<string, string | number | boolean>): Promise<Buffer<any> | undefined>;
-    get(url: string, params?: Record<string, string | number | boolean>): Promise<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>;
     youtube_search(query: string, options?: {}): Promise<Record<string, any>[] | undefined>;
 }

package/dist/src/UtilsBee.js

@@ -22,9 +22,10 @@ export class UtilsBee {
         }
         catch (error) {
             if (error instanceof Error) {
-                console.log(error.stack);
+                if ((error.stack || "").includes("Request failed with status code 404")) {
+                    return new Error("404");
+                }
             }
-            console.log("Failed to get from Scraping Bee.");
         }
         return undefined;
     }
@@ -33,6 +34,9 @@ export class UtilsBee {
         if (buffer === undefined) {
             return undefined;
         }
+        if (buffer instanceof Error) {
+            return buffer;
+        }
         return this.text_decoder.decode(buffer);
     }
     async google_search(query, news = false) {

package/dist/src/UtilsDynamoDB.d.ts

@@ -10,7 +10,7 @@ export declare class UtilsDynamoDB {
         concurrency?: number;
     }): Promise<Record<string, any>[]>;
     get(table: string, key: Record<string, any>, consistent?: boolean): Promise<Record<string, any> | undefined>;
-    get_max(table_index_name: string, primary_key: Record<string, any>): Promise<Record<string, any> | undefined>;
+    get_max(table_index_name: string, primary_key: Record<string, string | number>): Promise<Record<string, any> | undefined>;
     query(table_index_name: string, primary_key: Record<string, any>, options?: {
         reverse?: boolean;
         compile?: boolean;

package/dist/src/UtilsDynamoDB.js

@@ -158,24 +158,18 @@ export class UtilsDynamoDB {
     async get_max(table_index_name, primary_key) {
         const table_name = table_index_name.split(":")[0];
         const index_name = table_index_name.split(":")[1];
-        if (Object.keys(primary_key).length !== 1) {
-            return undefined;
-        }
-        const key = Object.keys(primary_key)[0];
-        const value = convert_input(Object.values(primary_key)[0]);
-        if (value === undefined) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
+            index_name !== undefined && Object.keys(primary_key).length !== index_name.split("-").length) {
             return undefined;
         }
         const request = {
             TableName: table_name,
             IndexName: index_name,
-            ExpressionAttributeNames: {
-                "#a": key
-            },
-            ExpressionAttributeValues: {
-                ":a": value
-            },
-            KeyConditionExpression: "#a = :a",
+            ExpressionAttributeNames: Object.fromEntries(Object.keys(primary_key).map(key => ["#" + key, key])),
+            ExpressionAttributeValues: Object.fromEntries(Object.entries(primary_key)
+                .map(([key, value]) => [":" + key, convert_input(value)])
+                .filter(([key, value]) => value !== undefined)),
+            KeyConditionExpression: Object.keys(primary_key).map(key => ["#" + key, ":" + key]).join(", "),
             Limit: 1,
             ScanIndexForward: false
         };

package/dist/src/UtilsNitter.js

@@ -109,13 +109,13 @@ export class UtilsNitter extends UtilsBee {
             let nitter_html = undefined;
             for (let i = 0; i < 10; i++) {
                 nitter_html = await this.get(nitter_url, { render_js: false });
-                if (nitter_html !== undefined && nitter_html !== "") {
+                if (nitter_html !== undefined && nitter_html !== "" && !(nitter_html instanceof Error)) {
                     break;
                 }
                 console.log("Failed to query Nitter, trying again.");
                 await UtilsMisc.wait((2 + 2 * i) * 1000);
             }
-            if (nitter_html === undefined || nitter_html === "") {
+            if (nitter_html === undefined || nitter_html === "" || nitter_html instanceof Error) {
                 console.log("Nitter failed for url", nitter_url);
                 return [];
             }
@@ -145,14 +145,14 @@ export class UtilsNitter extends UtilsBee {
             let nitter_html = undefined;
             for (let i = 0; i < 10; i++) {
                 nitter_html = await this.get(nitter_url, { render_js: false });
-                if (nitter_html !== undefined && nitter_html !== "") {
+                if (nitter_html !== undefined && nitter_html !== "" && !(nitter_html instanceof Error)) {
                     break;
                 }
                 console.log("Failed to query Nitter, trying again.");
                 await UtilsMisc.wait((2 + 2 * i) * 1000);
             }
-            if (nitter_html === undefined || nitter_html === "") {
-                console.log("Nitter failed for query", query);
+            if (nitter_html === undefined || nitter_html === "" || nitter_html instanceof Error) {
+                console.log("Nitter failed for url", nitter_url);
                 return [];
             }
             const nitter_data = parse_nitter_html(nitter_html);

package/package.json

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

package/src/UtilsBee.ts

@@ -25,9 +25,10 @@ export class UtilsBee {
             return undefined
         } catch (error) {
             if (error instanceof Error) {
-                console.log(error.stack)
+                if ((error.stack || "").includes("Request failed with status code 404")) {
+                    return new Error("404")
+                }
             }
-            console.log("Failed to get from Scraping Bee.")
         }
         return undefined
     
@@ -38,6 +39,9 @@ export class UtilsBee {
         if (buffer === undefined) {
             return undefined
         }
+        if (buffer instanceof Error) {
+            return buffer
+        }
         return this.text_decoder.decode(buffer)
     }
 

package/src/UtilsDynamoDB.ts

@@ -183,28 +183,25 @@ export class UtilsDynamoDB {
 
     async get_max(
         table_index_name : string,
-        primary_key : Record<string, any>
+        primary_key : Record<string, string | number>
     ) : Promise<Record<string, any> | undefined> {
         const table_name : string = table_index_name.split(":")[0]
         const index_name : string | undefined = table_index_name.split(":")[1]
-        if (Object.keys(primary_key).length !== 1) {
-            return undefined
-        }
-        const key = Object.keys(primary_key)[0]
-        const value = convert_input(Object.values(primary_key)[0])
-        if (value === undefined) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
+            index_name !== undefined && Object.keys(primary_key).length !== index_name.split("-").length
+        ) {
             return undefined
         }
         const request : QueryCommandInput = {
             TableName : table_name,
             IndexName : index_name,
-            ExpressionAttributeNames: {
-                "#a": key
-            },
-            ExpressionAttributeValues: {
-                ":a": value
-            },
-            KeyConditionExpression: "#a = :a",
+            ExpressionAttributeNames: Object.fromEntries(Object.keys(primary_key).map(key => ["#" + key, key])),
+            ExpressionAttributeValues: Object.fromEntries(
+                Object.entries(primary_key)
+                    .map(([key, value]) => [":" + key, convert_input(value)])
+                    .filter(([key, value]) => value !== undefined)
+            ),
+            KeyConditionExpression: Object.keys(primary_key).map(key => ["#" + key, ":" + key]).join(", "),
             Limit : 1,
             ScanIndexForward : false
         }

package/src/UtilsNitter.ts

@@ -121,13 +121,13 @@ export class UtilsNitter extends UtilsBee {
             let nitter_html = undefined
             for (let i = 0; i < 10; i++) {
                 nitter_html = await this.get(nitter_url, { render_js : false })
-                if (nitter_html !== undefined && nitter_html !== "") {
+                if (nitter_html !== undefined && nitter_html !== "" && !(nitter_html instanceof Error)) {
                     break
                 }
                 console.log("Failed to query Nitter, trying again.")
                 await UtilsMisc.wait((2 + 2 * i) * 1000)
             }
-            if (nitter_html === undefined || nitter_html === "") {
+            if (nitter_html === undefined || nitter_html === "" || nitter_html instanceof Error) {
                 console.log("Nitter failed for url", nitter_url)
                 return []
             }
@@ -159,14 +159,14 @@ export class UtilsNitter extends UtilsBee {
             let nitter_html = undefined
             for (let i = 0; i < 10; i++) {
                 nitter_html = await this.get(nitter_url, { render_js : false })
-                if (nitter_html !== undefined && nitter_html !== "") {
+                if (nitter_html !== undefined && nitter_html !== "" && !(nitter_html instanceof Error)) {
                     break
                 }
                 console.log("Failed to query Nitter, trying again.")
                 await UtilsMisc.wait((2 + 2 * i) * 1000)
             }
-            if (nitter_html === undefined || nitter_html === "") {
-                console.log("Nitter failed for query", query)
+            if (nitter_html === undefined || nitter_html === "" || nitter_html instanceof Error) {
+                console.log("Nitter failed for url", nitter_url)
                 return []
             }
             const nitter_data = parse_nitter_html(nitter_html)