triangle-utils 1.4.5 → 1.4.7

package/dist/src/UtilsBee.js

@@ -10,25 +10,22 @@ export class UtilsBee {
         if (this.bee === undefined) {
             return undefined;
         }
-        for (let i = 0; i < 3; i++) {
-            try {
-                const response = await this.bee.htmlApi({
-                    url: url,
-                    params: params
-                });
-                if (response.data instanceof Buffer) {
-                    return response.data;
-                }
-                return undefined;
+        try {
+            const response = await this.bee.htmlApi({
+                url: url,
+                params: params
+            });
+            if (response.data instanceof Buffer) {
+                return response.data;
             }
-            catch (error) {
-                if (error instanceof Error) {
-                    console.log(error.stack);
-                }
-                console.log("Failed to get from Scraping Bee.");
+            return undefined;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                console.log(error.stack);
             }
+            console.log("Failed to get from Scraping Bee.");
         }
-        console.log("Failed to get from Scraping Bee, quitting.");
         return undefined;
     }
     async get(url, params = {}) {

package/dist/src/UtilsMisc.d.ts

@@ -11,7 +11,7 @@ export declare class UtilsMisc {
     send_email(recipient: string, subject: string, text: string): Promise<boolean>;
     admin_alert(text: string): Promise<boolean>;
     safe_run(f: () => Promise<any>): Promise<void>;
-    iterate<T>(inputs: T[], f: (input: T) => Promise<any>, concurrency?: number, print_indices?: boolean): Promise<void>;
+    iterate<T>(inputs: T[], f: (input: T, index: number) => Promise<any>, num_iterators?: number, print_indices?: boolean): Promise<void>;
     static wait(duration: number): Promise<unknown>;
     static get_current_time(): string;
     static get_current_milliseconds(): number;

package/dist/src/UtilsMisc.js

@@ -58,17 +58,17 @@ export class UtilsMisc {
             }
         }
     }
-    async iterate(inputs, f, concurrency = 1, print_indices = false) {
+    async iterate(inputs, f, num_iterators = 1, print_indices = false) {
         let index = 0;
         let iterators = [];
-        for (let i = 0; i < concurrency; i++) {
+        for (let i = 0; i < num_iterators; i++) {
             iterators.push((async () => {
                 while (index < inputs.length) {
                     index += 1;
                     if (print_indices) {
                         console.log(i + ":" + (index - 1) + "/" + inputs.length);
                     }
-                    await this.safe_run(() => f(inputs[index - 1]));
+                    await this.safe_run(() => f(inputs[index - 1], index));
                 }
             })());
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.5",
+    "version": "1.4.7",
     "main": "dist/src/index.js",
     "directories": {
         "test": "vitest"

package/src/UtilsBee.ts

@@ -14,24 +14,21 @@ export class UtilsBee {
         if (this.bee === undefined) {
             return undefined
         }
-        for (let i = 0; i < 3; i++) {
-            try {
-                const response = await this.bee.htmlApi({
-                    url : url,
-                    params : params
-                })
-                if (response.data instanceof Buffer) {
-                    return response.data
-                }
-                return undefined
-            } catch (error) {
-                if (error instanceof Error) {
-                    console.log(error.stack)
-                }
-                console.log("Failed to get from Scraping Bee.")
+        try {
+            const response = await this.bee.htmlApi({
+                url : url,
+                params : params
+            })
+            if (response.data instanceof Buffer) {
+                return response.data
+            }
+            return undefined
+        } catch (error) {
+            if (error instanceof Error) {
+                console.log(error.stack)
             }
+            console.log("Failed to get from Scraping Bee.")
         }
-        console.log("Failed to get from Scraping Bee, quitting.")
         return undefined
     
     }

package/src/UtilsMisc.ts

@@ -69,17 +69,17 @@ export class UtilsMisc {
         }
     }
 
-    async iterate<T>(inputs : T[], f : (input : T) => Promise<any>, concurrency : number = 1, print_indices : boolean = false) {
+    async iterate<T>(inputs : T[], f : (input : T, index : number) => Promise<any>, num_iterators : number = 1, print_indices : boolean = false) {
         let index = 0
         let iterators = []
-        for (let i = 0; i < concurrency; i++) {
+        for (let i = 0; i < num_iterators; i++) {
             iterators.push((async () => {
                 while (index < inputs.length) {
                     index += 1
                     if (print_indices) {
                         console.log(i + ":" + (index - 1) + "/" + inputs.length)
                     }
-                    await this.safe_run(() => f(inputs[index - 1]))
+                    await this.safe_run(() => f(inputs[index - 1], index))
                 }
             })())
         }