triangle-utils 1.4.113 → 1.4.115

package/dist/src/UtilsMisc.d.ts

@@ -21,23 +21,9 @@ export declare class UtilsMisc {
     static get_current_milliseconds(): number;
     static get_random_string(length: number, encoding?: "binary" | "hex" | "base64"): string;
     static sha256(input: string): Promise<string>;
+    static mini_sha256(input: string): Promise<string>;
     static encrypt(secret_key: string, text: string): Encryption;
     static decrypt(secret_key: string, encryption: Encryption): string;
     static get_secret_hash(username: string, cognito_client_id: string, cognito_client_secret: string): string;
-    static get_chunk_indices(text_length: number, max_length?: number, overlap?: number): [number, number][];
-    static chunkify(text: string, max_length?: number, overlap?: number): {
-        chunk_index: [number, number];
-        chunk_text: string;
-    }[];
-    static chunkify_lined(text: string, max_length?: number, overlap?: number): {
-        chunk_index: [number, number];
-        chunk_text: string;
-    }[];
-    static chunkify_pages(pages: string[], max_length?: number, overlap?: number): {
-        chunk_index: [number, number];
-        chunk_text: string;
-    }[];
-    static instantiate<T>(constructor: new (x: any) => T, x: any): T | undefined;
-    static instantiator<T>(constructor: new (x: any) => T): (x: any) => T | undefined;
 }
 export {};

package/dist/src/UtilsMisc.js

@@ -86,6 +86,10 @@ export class UtilsMisc {
         const hash = hash_array.map(b => b.toString(16).padStart(2, "0")).join("");
         return hash;
     }
+    static async mini_sha256(input) {
+        return await this.sha256(input)
+            .then(hash => hash.substring(0, 32));
+    }
     static encrypt(secret_key, text) {
         const iv = crypto.randomBytes(16);
         const cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(secret_key, "hex"), iv);
@@ -110,68 +114,4 @@ export class UtilsMisc {
             .digest("base64");
         return secret_hash;
     }
-    static get_chunk_indices(text_length, max_length = 2500, overlap = 50) {
-        const num_chunks = Math.ceil((text_length + overlap) / max_length);
-        const chunk_length = Math.ceil((text_length - overlap) / num_chunks + overlap);
-        const chunk_indices = [];
-        for (let i = 0; i < num_chunks; i++) {
-            chunk_indices.push([
-                (chunk_length - overlap) * i,
-                (chunk_length - overlap) * i + chunk_length
-            ]);
-        }
-        return chunk_indices;
-    }
-    static chunkify(text, max_length = 2500, overlap = 50) {
-        const chunk_indices = this.get_chunk_indices(text.length, max_length, overlap);
-        const chunks = chunk_indices.map(chunk_index => ({
-            chunk_index: chunk_index,
-            chunk_text: text.substring(...chunk_index)
-        }));
-        return chunks;
-    }
-    static chunkify_lined(text, max_length = 2500, overlap = 50) {
-        const chunk_indices = this.get_chunk_indices(text.length, max_length, overlap);
-        const lined_chunk_indices = [];
-        for (const chunk_index of chunk_indices) {
-            const lined_chunk_index = [
-                text.lastIndexOf("\n", chunk_index[0]) + 1,
-                text.indexOf("\n", chunk_index[1]) + 1
-            ];
-            if (lined_chunk_index[1] < lined_chunk_index[0]) {
-                lined_chunk_index[1] += text.length;
-            }
-            lined_chunk_indices.push(lined_chunk_index);
-        }
-        return lined_chunk_indices.map(chunk_index => ({
-            chunk_index: chunk_index,
-            chunk_text: text.substring(...chunk_index)
-        }));
-    }
-    static chunkify_pages(pages, max_length = 2500, overlap = 50) {
-        const chunks = [];
-        for (const page of pages) {
-            const page_chunks = UtilsMisc.chunkify(page, max_length, overlap);
-            const start_index = (chunks.length > 0 ? (chunks[chunks.length - 1].chunk_index[1]) : 0);
-            for (const page_chunk of page_chunks) {
-                chunks.push({
-                    chunk_index: [page_chunk.chunk_index[0] + start_index, page_chunk.chunk_index[1] + start_index],
-                    chunk_text: page_chunk.chunk_text + "\n\n"
-                });
-            }
-        }
-        return chunks;
-    }
-    static instantiate(constructor, x) {
-        try {
-            const instance = new constructor(x);
-            return instance;
-        }
-        catch (error) {
-            return undefined;
-        }
-    }
-    static instantiator(constructor) {
-        return (x) => UtilsMisc.instantiate(constructor, x);
-    }
 }

package/dist/src/UtilsS3.d.ts

@@ -15,6 +15,11 @@ export declare class UtilsS3 {
         ChecksumCRC64NVME?: string | undefined;
         ChecksumSHA1?: string | undefined;
         ChecksumSHA256?: string | undefined;
+        ChecksumSHA512?: string | undefined;
+        ChecksumMD5?: string | undefined;
+        ChecksumXXHASH64?: string | undefined;
+        ChecksumXXHASH3?: string | undefined;
+        ChecksumXXHASH128?: string | undefined;
         ChecksumType?: import("@aws-sdk/client-s3").ChecksumType | undefined;
         ETag?: string | undefined;
         MissingMeta?: number | undefined;
@@ -54,6 +59,9 @@ export declare class UtilsS3 {
     create(s3_id: string, content: string | Buffer | Readable, options?: {
         content_type_id?: string;
     }): Promise<import("@aws-sdk/client-s3").PutObjectCommandOutput | undefined>;
+    upload(s3_id: string, content: string | Buffer | Readable, options?: {
+        content_type_id?: string;
+    }): Promise<void>;
     delete(s3_id: string): Promise<void>;
     get_download_url(s3_id: string): Promise<string | undefined>;
     get_upload_url(s3_id: string, options?: {

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 { Upload } from "@aws-sdk/lib-storage";
 import { Readable } from "stream";
 function get_s3_input(s3_id) {
     const [bucket, path] = (s3_id.match(/^s3\:\/\/([^\/]+)\/([^$]+)$/) || []).slice(1, 3);
@@ -146,6 +147,22 @@ export class UtilsS3 {
             ContentType: content_type_id
         });
     }
+    async upload(s3_id, content, options = {}) {
+        const content_type_id = options.content_type_id !== undefined ? options.content_type_id : undefined;
+        const s3_input = get_s3_input(s3_id);
+        if (s3_input === undefined) {
+            return undefined;
+        }
+        const upload = new Upload({
+            client: this.s3,
+            params: {
+                ...s3_input,
+                Body: content,
+                ContentType: content_type_id
+            }
+        });
+        await upload.done();
+    }
     async delete(s3_id) {
         const s3_input = get_s3_input(s3_id);
         if (s3_input === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.113",
+    "version": "1.4.115",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {
@@ -20,11 +20,12 @@
         "@aws-sdk/client-bedrock-runtime": "^3.953.0",
         "@aws-sdk/client-cognito-identity-provider": "^3.1004.0",
         "@aws-sdk/client-dynamodb": "^3.953.0",
-        "@aws-sdk/client-s3": "^3.953.0",
+        "@aws-sdk/client-s3": "^3.1106.0",
         "@aws-sdk/client-s3vectors": "^3.953.0",
         "@aws-sdk/client-secrets-manager": "^3.965.0",
         "@aws-sdk/client-ses": "^3.1032.0",
-        "@aws-sdk/s3-request-presigner": "^3.953.0",
+        "@aws-sdk/lib-storage": "^3.1106.0",
+        "@aws-sdk/s3-request-presigner": "^3.1106.0",
         "@types/jsdom": "^28.0.1",
         "@types/node": "^25.2.3",
         "@types/nodemailer": "^7.0.9",

package/src/UtilsMisc.ts

@@ -108,6 +108,11 @@ export class UtilsMisc {
         return hash
     }
 
+    static async mini_sha256(input : string) : Promise<string> {
+        return await this.sha256(input)
+            .then(hash => hash.substring(0, 32))
+    }
+
     static encrypt(secret_key : string, text : string) : Encryption {
         const iv = crypto.randomBytes(16)
         const cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(secret_key, "hex"), iv)
@@ -135,85 +140,4 @@ export class UtilsMisc {
         return secret_hash
     }
 
-    static get_chunk_indices(text_length : number, max_length = 2500, overlap = 50) : [number, number][] {
-        const num_chunks = Math.ceil((text_length + overlap) / max_length)
-        const chunk_length = Math.ceil((text_length - overlap) / num_chunks + overlap)
-        const chunk_indices : [number, number][] = []
-        for (let i = 0; i < num_chunks; i++) {
-            chunk_indices.push([
-                (chunk_length - overlap) * i,
-                (chunk_length - overlap) * i + chunk_length
-            ])
-        }
-        return chunk_indices
-    }
-
-    static chunkify(text : string, max_length = 2500, overlap = 50) : {
-        chunk_index : [number, number],
-        chunk_text : string
-    }[] {
-        const chunk_indices = this.get_chunk_indices(text.length, max_length, overlap)
-        const chunks =  chunk_indices.map(chunk_index => ({
-            chunk_index : chunk_index,
-            chunk_text : text.substring(...chunk_index)
-        }))
-        return chunks
-    }
-    
-    static chunkify_lined(text : string, max_length = 2500, overlap = 50) : {
-        chunk_index : [number, number],
-        chunk_text : string
-    }[] {
-        const chunk_indices : [number, number][] = this.get_chunk_indices(text.length, max_length, overlap)
-        const lined_chunk_indices : [number, number][] = []
-        for (const chunk_index of chunk_indices) {
-            const lined_chunk_index : [number, number] = [
-                text.lastIndexOf("\n", chunk_index[0]) + 1,
-                text.indexOf("\n", chunk_index[1]) + 1
-            ]
-            if (lined_chunk_index[1] < lined_chunk_index[0]) {
-                lined_chunk_index[1] += text.length
-            }
-            lined_chunk_indices.push(lined_chunk_index)
-        }
-        return lined_chunk_indices.map(chunk_index => ({
-            chunk_index : chunk_index,
-            chunk_text : text.substring(...chunk_index)
-        }))
-    }
-
-    static chunkify_pages(pages : string[], max_length = 2500, overlap = 50) : {
-        chunk_index : [number, number],
-        chunk_text : string
-    }[] {
-        const chunks : {
-            chunk_index : [number, number],
-            chunk_text : string
-        }[] = []
-        for (const page of pages) {
-            const page_chunks = UtilsMisc.chunkify(page, max_length, overlap)
-            const start_index : number = (chunks.length > 0 ? (chunks[chunks.length - 1].chunk_index[1]) : 0)
-            for (const page_chunk of page_chunks) {
-                chunks.push({
-                    chunk_index : [page_chunk.chunk_index[0] + start_index, page_chunk.chunk_index[1] + start_index],
-                    chunk_text : page_chunk.chunk_text + "\n\n"
-                })
-            }
-        }
-        return chunks
-    }
-
-    static instantiate<T>(constructor : new (x : any) => T, x : any) : T | undefined {
-        try {
-            const instance = new constructor(x)
-            return instance
-        } catch (error) {
-            return undefined
-        }
-    }
-
-    static instantiator<T>(constructor : new (x : any) => T) : (x : any) => T | undefined {
-        return (x : any) => UtilsMisc.instantiate(constructor, x)
-    }
-
 }

package/src/UtilsS3.ts

@@ -1,5 +1,6 @@
 import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand, ListObjectsV2CommandOutput, ListObjectsV2CommandInput } from "@aws-sdk/client-s3"
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
+import { Upload } from "@aws-sdk/lib-storage"
 import { Readable } from "stream"
 
 interface S3Input {
@@ -161,6 +162,25 @@ export class UtilsS3 {
         })
     }
 
+    async upload(s3_id : string, content : string | Buffer | Readable, options : {
+        content_type_id? : string
+    } = {}) : Promise<void> {
+        const content_type_id = options.content_type_id !== undefined ? options.content_type_id : undefined
+        const s3_input = get_s3_input(s3_id)
+        if (s3_input === undefined) {
+            return undefined
+        }
+        const upload = new Upload({
+            client : this.s3,
+            params : {
+                ...s3_input,
+                Body : content,
+                ContentType : content_type_id
+            }
+        })
+        await upload.done()
+    }
+
     async delete(s3_id : string) : Promise<void>{
         const s3_input = get_s3_input(s3_id)
         if (s3_input === undefined) {