@mtkruto/node 0.171.0 → 0.180.1

package/esm/client/2_file_manager.js

@@ -19,16 +19,16 @@ var _a;
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 import * as dntShim from "../_dnt.shims.js";
-import { AssertionError, basename, decodeHex, delay, extension, extname, ige256Decrypt, isAbsolute, join, MINUTE, SECOND, toFileUrl, unreachable } from "../0_deps.js";
+import { AssertionError, basename, concat, crypto, decodeHex, delay, extension, extname, ige256Decrypt, ige256Encrypt, isAbsolute, join, MINUTE, SECOND, toFileUrl, unreachable } from "../0_deps.js";
 import { InputError } from "../0_errors.js";
-import { getLogger, getRandomId, iterateReadableStream, kilobyte, megabyte, mod, PartStream } from "../1_utilities.js";
+import { getLogger, getRandomId, intFromBytes, iterateReadableStream, kilobyte, megabyte, mod, PartStream } from "../1_utilities.js";
 import { Api } from "../2_tl.js";
 import { TimeTooBig, TimeTooSmall } from "../3_errors.js";
 import { getDc } from "../3_transport.js";
 import { constructSticker, deserializeFileId, FileType, PhotoSourceType, serializeFileId, toUniqueFileId } from "../3_types.js";
 import { DOWNLOAD_MAX_CHUNK_SIZE, STICKER_SET_NAME_TTL } from "../4_constants.js";
 import { FloodWait, StickersetInvalid } from "../4_errors.js";
-import { UPLOAD_REQUEST_PER_CONNECTION } from "./0_utilities.js";
+import { DOWNLOAD_POOL_SIZE, DOWNLOAD_REQUEST_PER_CONNECTION, UPLOAD_REQUEST_PER_CONNECTION } from "./0_utilities.js";
 export class FileManager {
     #c;
     #Lupload;
@@ -48,7 +48,7 @@ export class FileManager {
         this.#progressIds.add(id);
         return Promise.resolve(String(id));
     }
-    async upload(file, params, checkName, allowStream = true) {
+    async upload(file, params, checkName, allowStream = true, encryptionInformation) {
         if (params?.progressId !== undefined && !this.#progressIds.has(BigInt(params.progressId))) {
             throw new InputError("Invalid progressId.");
         }
@@ -72,15 +72,28 @@ export class FileManager {
         this.#Lupload.debug("uploading " + whatIsUploaded + " with chunk size of " + chunkSize + " and pool size of " + poolSize + " and file ID of " + fileId);
         let result;
         if (contents instanceof Uint8Array) {
-            result = await this.#uploadBuffer(contents, fileId, mustTrackProgress, chunkSize, poolSize, params?.signal);
+            result = await this.#uploadBuffer(contents, fileId, mustTrackProgress, chunkSize, poolSize, params?.signal, encryptionInformation);
         }
         else {
-            result = await this.#uploadStream(contents, fileId, mustTrackProgress, chunkSize, poolSize, params?.signal);
+            result = await this.#uploadStream(contents, fileId, mustTrackProgress, chunkSize, poolSize, params?.signal, encryptionInformation);
         }
         this.#Lupload.debug(`[${fileId}] uploaded ` + result.parts + " part(s)");
         if (checkName) {
             name = checkName(name, result.firstPart);
         }
+        if (encryptionInformation) {
+            const digest = new Uint8Array(await crypto.subtle.digest("MD5", concat([encryptionInformation.key, encryptionInformation.iv])));
+            const right = digest.subarray(4, 8);
+            const key_fingerprint = Number(intFromBytes(digest.subarray(0, 4).map((v, i) => v ^ right[i])));
+            if (result.isSmall) {
+                const inputEncryptedFile = { _: "inputEncryptedFileUploaded", id: fileId, parts: result.parts, key_fingerprint, md5_checksum: "" };
+                return { inputEncryptedFile, fileSize: result.fileSize };
+            }
+            else {
+                const inputEncryptedFile = { _: "inputEncryptedFileBigUploaded", id: fileId, parts: result.parts, key_fingerprint };
+                return { inputEncryptedFile, fileSize: result.fileSize };
+            }
+        }
         if (result.isSmall) {
             return { _: "inputFile", id: fileId, name, parts: result.parts, md5_checksum: "" };
         }
@@ -88,12 +101,14 @@ export class FileManager {
             return { _: "inputFileBig", id: fileId, name, parts: result.parts };
         }
     }
-    async #uploadStream(stream, fileId, mustTrackProgress, chunkSize, poolSize, signal) {
+    async #uploadStream(stream, fileId, mustTrackProgress, chunkSize, poolSize, signal, encryptionInformation) {
         let part;
         let promises = new Array();
         let ms = 0.05;
         let uploaded = 0;
         let firstPart;
+        let iv = encryptionInformation?.iv;
+        let fileSize = 0;
         for await (part of iterateReadableStream(stream.pipeThrough(new PartStream(chunkSize)))) {
             if (!part.isSmall && part.part > 0) {
                 await delay(ms);
@@ -102,6 +117,16 @@ export class FileManager {
             if (!firstPart) {
                 firstPart = part.bytes;
             }
+            if (encryptionInformation) {
+                fileSize += part.bytes.byteLength;
+                if (part.bytes.byteLength % 16 !== 0) {
+                    part.bytes = concat([part.bytes, crypto.getRandomValues(new Uint8Array((16 - part.bytes.length % 16) % 16))]);
+                }
+                const right = part.bytes.subarray(-16);
+                part.bytes = ige256Encrypt(part.bytes, encryptionInformation.key, iv);
+                const left = part.bytes.subarray(-16);
+                iv = concat([left, right]);
+            }
             promises.push(this.#uploadPart(fileId, part.totalParts, !part.isSmall, part.part, part.bytes, signal).then(() => {
                 if (mustTrackProgress) {
                     uploaded += part.bytes.byteLength;
@@ -131,9 +156,9 @@ export class FileManager {
                 isUploaded: true,
             },
         });
-        return { isSmall: part.isSmall, parts: part.totalParts, firstPart };
+        return { isSmall: part.isSmall, parts: part.totalParts, firstPart, fileSize };
     }
-    async #uploadBuffer(buffer, fileId, mustTrackProgress, chunkSize, poolSize, signal) {
+    async #uploadBuffer(buffer, fileId, mustTrackProgress, chunkSize, poolSize, signal, encryptionInformation) {
         const isBig = buffer.byteLength > _a.#BIG_FILE_THRESHOLD;
         const partCount = Math.ceil(buffer.byteLength / chunkSize);
         let promises = new Array();
@@ -141,15 +166,30 @@ export class FileManager {
         let ms = 0.05;
         let uploaded = 0;
         let firstPart;
+        let iv = encryptionInformation?.iv;
+        let fileSize = 0;
         main: for (let part = 0; part < partCount;) {
             for (let i = 0; i < poolSize; ++i) {
                 for (let i = 0; i < UPLOAD_REQUEST_PER_CONNECTION; ++i) {
                     const start = part * chunkSize;
                     const end = start + chunkSize;
-                    const bytes = buffer.subarray(start, end);
+                    let bytes = buffer.subarray(start, end);
                     if (!bytes.byteLength) {
                         break main;
                     }
+                    if (!firstPart) {
+                        firstPart = bytes;
+                    }
+                    if (encryptionInformation) {
+                        fileSize += bytes.byteLength;
+                        if (bytes.byteLength % 16 !== 0) {
+                            bytes = concat([bytes, crypto.getRandomValues(new Uint8Array((16 - bytes.length % 16) % 16))]);
+                        }
+                        const right = bytes.subarray(-16);
+                        bytes = ige256Encrypt(bytes, encryptionInformation.key, iv);
+                        const left = bytes.subarray(-16);
+                        iv = concat([left, right]);
+                    }
                     if (!started) {
                         started = true;
                     }
@@ -157,9 +197,6 @@ export class FileManager {
                         await delay(ms);
                         ms = Math.max(ms * .8, 0.003);
                     }
-                    if (!firstPart) {
-                        firstPart = bytes;
-                    }
                     promises.push(this.#uploadPart(fileId, partCount, isBig, part++, bytes, signal).then(() => {
                         if (mustTrackProgress) {
                             uploaded += bytes.byteLength;
@@ -193,7 +230,7 @@ export class FileManager {
                 isUploaded: true,
             },
         });
-        return { isSmall: !isBig, parts: partCount, firstPart };
+        return { isSmall: !isBig, parts: partCount, firstPart, fileSize };
     }
     async #uploadPart(fileId, partCount, isBig, index, bytes, signal) {
         let retryIn = 1;
@@ -363,27 +400,29 @@ export class FileManager {
         let offset = params?.offset ? BigInt(params.offset) : 0n;
         let part = 0;
         let totalSize = 0;
-        let ms = 0.05;
+        const requestCount = DOWNLOAD_POOL_SIZE * DOWNLOAD_REQUEST_PER_CONNECTION;
+        let finished = false;
         while (true) {
             signal?.throwIfAborted();
-            let retryIn = 1;
-            let errorCount = 0;
-            try {
-                const file = await this.#c.invoke({ _: "upload.getFile", location, offset, limit }, { dc, type: "download" });
+            const results = await Promise.all(Array.from({ length: requestCount }, (_, i) => this.#downloadPart(location, offset + BigInt(i * limit), limit, dc, signal, id, part + i)));
+            for (const result of results) {
                 signal?.throwIfAborted();
-                if (Api.is("upload.file", file)) {
-                    const downloadedSize = file.bytes.byteLength;
-                    let finished = downloadedSize < limit;
+                if (Api.is("upload.file", result)) {
+                    const downloadedSize = result.bytes.byteLength;
+                    finished = downloadedSize < limit;
                     if (decryptionInformation) {
-                        const decryptedBytes = ige256Decrypt(file.bytes, decryptionInformation.key, decryptionInformation.iv);
+                        const left = result.bytes.subarray(-16);
+                        const decryptedBytes = ige256Decrypt(result.bytes, decryptionInformation.key, decryptionInformation.iv);
+                        const right = decryptedBytes.subarray(-16);
                         const remainingSize = Math.max(0, fileSize - totalSize);
-                        file.bytes = decryptedBytes.slice(0, remainingSize);
-                        totalSize += file.bytes.byteLength;
+                        result.bytes = decryptedBytes.slice(0, remainingSize);
+                        totalSize += result.bytes.byteLength;
                         finished = totalSize >= fileSize;
+                        decryptionInformation.iv = concat([left, right]);
                     }
-                    yield file.bytes;
+                    yield result.bytes;
                     if (id !== null) {
-                        await this.#c.storage.saveFilePart(id, part, file.bytes);
+                        await this.#c.storage.saveFilePart(id, part, result.bytes);
                         signal?.throwIfAborted();
                     }
                     ++part;
@@ -401,8 +440,19 @@ export class FileManager {
                 else {
                     unreachable();
                 }
-                await delay(ms);
-                ms = Math.max(ms * .8, 0.003);
+            }
+            if (finished) {
+                break;
+            }
+        }
+    }
+    async #downloadPart(location, offset, limit, dc, signal, id, part) {
+        let retryIn = 1;
+        let errorCount = 0;
+        while (true) {
+            try {
+                signal?.throwIfAborted();
+                return await this.#c.invoke({ _: "upload.getFile", location, offset, limit }, { dc, type: "download" });
             }
             catch (err) {
                 if (typeof err === "object" && err instanceof AssertionError) {
@@ -411,7 +461,7 @@ export class FileManager {
                 ++errorCount;
                 if (errorCount > 20) {
                     retryIn = 0;
-                    errorCount = 0;
+                    errorCount = 20;
                 }
                 await this.#handleError(err, retryIn, `[${id}-${part + 1}]`);
                 signal?.throwIfAborted();
@@ -500,13 +550,19 @@ export class FileManager {
             }
         }
         else if (fileId_.location.type === "common") {
-            const location = {
-                _: "inputDocumentFileLocation",
-                id: fileId_.location.id,
-                access_hash: fileId_.location.accessHash,
-                file_reference: fileId_.fileReference ?? new Uint8Array(),
-                thumb_size: "",
-            };
+            const location = fileId_.type === FileType.Encrypted
+                ? {
+                    _: "inputEncryptedFileLocation",
+                    id: fileId_.location.id,
+                    access_hash: fileId_.location.accessHash,
+                }
+                : {
+                    _: "inputDocumentFileLocation",
+                    id: fileId_.location.id,
+                    access_hash: fileId_.location.accessHash,
+                    file_reference: fileId_.fileReference ?? new Uint8Array(),
+                    thumb_size: "",
+                };
             yield* this.downloadInner(location, fileId_.dcId, params);
         }
         else {

package/esm/client/3_secret_chat_manager.d.ts

@@ -1,6 +1,6 @@
 import { Api } from "../2_tl.js";
-import { type ID, type Update } from "../3_types.js";
-import type { SendSecretContactParams, SendSecretLocationParams, SendSecretMessageParams, SendSecretVenueParams } from "./0_params.js";
+import { type FileSource, type ID, type Sticker, type Update } from "../3_types.js";
+import type { EndSecretChatParams, SendSecretAnimationParams, SendSecretAudioParams, SendSecretContactParams, SendSecretDocumentParams, SendSecretLocationParams, SendSecretMessageParams, SendSecretPhotoParams, SendSecretStickerParams, SendSecretVenueParams, SendSecretVideoNoteParams, SendSecretVideoParams, SendSecretVoiceParams } from "./0_params.js";
 import type { UpdateProcessor } from "./0_update_processor.js";
 import type { C as C_ } from "./1_types.js";
 import type { FileManager } from "./2_file_manager.js";
@@ -15,10 +15,19 @@ export declare class SecretChatManager implements UpdateProcessor<SecretChatMana
     loadSecretChats(): Promise<void>;
     requestSecretChat(chatId: ID): Promise<import("../3_types.js").SecretChat>;
     acceptSecretChat(id: number): Promise<import("../3_types.js").SecretChat>;
+    endSecretChat(id: number, params?: EndSecretChatParams): Promise<import("../3_types.js").SecretChat>;
     sendSecretMessage(id: number, text: string, params?: SendSecretMessageParams): Promise<void>;
     sendSecretLocation(id: number, latitude: number, longitude: number, params?: SendSecretLocationParams): Promise<void>;
     sendSecretVenue(id: number, latitude: number, longitude: number, title: string, address: string, params?: SendSecretVenueParams): Promise<void>;
     sendSecretContact(id: number, firstName: string, phoneNumber: string, params?: SendSecretContactParams): Promise<void>;
+    sendSecretDocument(id: number, document: FileSource, params?: SendSecretDocumentParams): Promise<void>;
+    sendSecretVideo(id: number, video: FileSource, params?: SendSecretVideoParams): Promise<void>;
+    sendSecretVideoNote(id: number, videoNote: FileSource, params?: SendSecretVideoNoteParams): Promise<void>;
+    sendSecretAudio(id: number, audio: FileSource, params?: SendSecretAudioParams): Promise<void>;
+    sendSecretVoice(id: number, voice: FileSource, params?: SendSecretVoiceParams): Promise<void>;
+    sendSecretAnimation(id: number, animation: FileSource, params?: SendSecretAnimationParams): Promise<void>;
+    sendSecretPhoto(id: number, photo: FileSource, params?: SendSecretPhotoParams): Promise<void>;
+    sendSecretSticker(id: number, sticker: Sticker, params?: SendSecretStickerParams): Promise<void>;
     canHandleUpdate(update: Api.Update): update is SecretChatManagerUpdate;
     handleUpdate(update: SecretChatManagerUpdate): Promise<Update | null>;
 }

package/esm/client/3_secret_chat_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3_secret_chat_manager.d.ts","sourceRoot":"","sources":["../../src/client/3_secret_chat_manager.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,GAAG,EAAsC,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,EAAiC,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAGpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGvI,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,UAAU,CAAE,SAAQ,EAAE;IACpB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,QAAA,MAAM,wBAAwB,4DAGpB,CAAC;AAEX,KAAK,uBAAuB,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEpF,qBAAa,iBAAkB,YAAW,eAAe,CAAC,uBAAuB,EAAE,IAAI,CAAC;;gBAI1E,CAAC,EAAE,CAAC;IAKV,eAAe;IA6Ef,iBAAiB,CAAC,MAAM,EAAE,EAAE;IA2B5B,gBAAgB,CAAC,EAAE,EAAE,MAAM;IA0E3B,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,uBAAuB;IAoB5E,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,wBAAwB;IAoBrG,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,qBAAqB;IAoB/H,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,uBAAuB;IAie5G,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,MAAM,IAAI,uBAAuB;IAIhE,YAAY,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAuG5E"}
+{"version":3,"file":"3_secret_chat_manager.d.ts","sourceRoot":"","sources":["../../src/client/3_secret_chat_manager.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,GAAG,EAA4C,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,EAAE,EAAiC,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAGtI,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGjW,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,UAAU,CAAE,SAAQ,EAAE;IACpB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,QAAA,MAAM,wBAAwB,4DAGpB,CAAC;AAEX,KAAK,uBAAuB,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEpF,qBAAa,iBAAkB,YAAW,eAAe,CAAC,uBAAuB,EAAE,IAAI,CAAC;;gBAI1E,CAAC,EAAE,CAAC;IAKV,eAAe;IA6Ef,iBAAiB,CAAC,MAAM,EAAE,EAAE;IA2B5B,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAgD3B,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;IAyCtD,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,uBAAuB;IAoB5E,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,wBAAwB;IAoBrG,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,qBAAqB;IAoB/H,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,uBAAuB;IA0BtG,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,wBAAwB;IAoCtF,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,qBAAqB;IAuC7E,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,yBAAyB;IAuCzF,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,qBAAqB;IAuC7E,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,qBAAqB;IAuC7E,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,yBAAyB;IAwCzF,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,qBAAqB;IAoC7E,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,uBAAuB;IA4gBtF,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,MAAM,IAAI,uBAAuB;IAIhE,YAAY,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAuG5E"}