triangle-utils 1.4.3 → 1.4.5

package/dist/src/UtilsBee.d.ts

@@ -2,6 +2,7 @@ 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>;
     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

@@ -6,7 +6,7 @@ export class UtilsBee {
         this.bee = scraping_bee_api_key !== undefined ? new ScrapingBeeClient(scraping_bee_api_key) : undefined;
         this.text_decoder = new TextDecoder();
     }
-    async get(url, params = {}) {
+    async get_buffer(url, params = {}) {
         if (this.bee === undefined) {
             return undefined;
         }
@@ -16,8 +16,10 @@ export class UtilsBee {
                     url: url,
                     params: params
                 });
-                const text = this.text_decoder.decode(response.data);
-                return text;
+                if (response.data instanceof Buffer) {
+                    return response.data;
+                }
+                return undefined;
             }
             catch (error) {
                 if (error instanceof Error) {
@@ -29,6 +31,13 @@ export class UtilsBee {
         console.log("Failed to get from Scraping Bee, quitting.");
         return undefined;
     }
+    async get(url, params = {}) {
+        const buffer = await this.get_buffer(url, params);
+        if (buffer === undefined) {
+            return undefined;
+        }
+        return this.text_decoder.decode(buffer);
+    }
     async google_search(query, news = false) {
         if (this.bee === undefined) {
             return undefined;

package/dist/src/UtilsS3.d.ts

@@ -1,9 +1,10 @@
+import { Readable } from "stream";
 export declare class UtilsS3 {
     private readonly s3;
     constructor(region: string);
     file_exists(s3_filename: string): Promise<boolean | undefined>;
     get_file(s3_filename: string): Promise<string | undefined>;
-    get_file_stream(s3_filename: string): Promise<(import("node:stream").Readable & import("@smithy/types").SdkStreamMixin) | (Blob & import("@smithy/types").SdkStreamMixin) | (ReadableStream<any> & import("@smithy/types").SdkStreamMixin) | undefined>;
+    get_file_stream(s3_filename: string): Promise<Readable | undefined>;
     create_file(s3_filename: string, content: string | Buffer, options?: {
         content_type?: string;
     }): Promise<import("@aws-sdk/client-s3").PutObjectCommandOutput | undefined>;

package/dist/src/UtilsS3.js

@@ -1,5 +1,6 @@
 import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { Readable } from "stream";
 function parse_s3_filename(s3_filename) {
     if (s3_filename.substring(0, 5) !== "s3://") {
         return undefined;
@@ -59,7 +60,10 @@ export class UtilsS3 {
             if (body === undefined) {
                 return undefined;
             }
-            return body;
+            if (body instanceof Readable) {
+                return body;
+            }
+            return undefined;
         }
         catch (error) {
             if (error instanceof NoSuchKey) {

package/package.json

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

package/src/UtilsBee.ts

@@ -10,7 +10,7 @@ export class UtilsBee {
         this.text_decoder = new TextDecoder()
     }
 
-    async get(url : string, params : Record<string, string | number | boolean> = {}) {
+    async get_buffer(url : string, params : Record<string, string | number | boolean> = {}) {
         if (this.bee === undefined) {
             return undefined
         }
@@ -20,8 +20,10 @@ export class UtilsBee {
                     url : url,
                     params : params
                 })
-                const text = this.text_decoder.decode(response.data)
-                return text
+                if (response.data instanceof Buffer) {
+                    return response.data
+                }
+                return undefined
             } catch (error) {
                 if (error instanceof Error) {
                     console.log(error.stack)
@@ -31,6 +33,15 @@ export class UtilsBee {
         }
         console.log("Failed to get from Scraping Bee, quitting.")
         return undefined
+    
+    }
+
+    async get(url : string, params : Record<string, string | number | boolean> = {}) {
+        const buffer = await this.get_buffer(url, params)
+        if (buffer === undefined) {
+            return undefined
+        }
+        return this.text_decoder.decode(buffer)
     }
 
     async google_search(query : string, news : boolean = false) : Promise<Record<string, any>[] | undefined> {

package/src/UtilsS3.ts

@@ -1,5 +1,6 @@
 import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3"
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
+import { Readable } from "stream"
 
 interface S3Key {
     Bucket : string,
@@ -58,7 +59,7 @@ export class UtilsS3 {
         }
     }
 
-    async get_file_stream(s3_filename : string) {
+    async get_file_stream(s3_filename : string) : Promise<Readable | undefined> {
         const s3_key = parse_s3_filename(s3_filename)
         if (s3_key === undefined) {
             return undefined
@@ -69,7 +70,10 @@ export class UtilsS3 {
             if (body === undefined) {
                 return undefined
             }
-            return body
+            if (body instanceof Readable) {
+                return body
+            }
+            return undefined
         } catch (error) {
             if (error instanceof NoSuchKey) {
                 return undefined