@mtkruto/node 0.0.978 → 0.0.980

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

@@ -68,12 +68,69 @@ export interface ClientParams {
      */
     autoStart?: boolean;
 }
+/**
+ * A chat identifier as provided by MTKruto or a string starting with a @ that is followed by a username.
+ */
+export type ChatID = number | string;
+export interface SendMessagesParams {
+    /**
+     * The parse mode to use. If not provided, the default parse mode will be used.
+     */
+    parseMode?: ParseMode;
+    /**
+     * The message's entities.
+     */
+    entities?: MessageEntity[];
+    /**
+     * Whether to disable web page previews in the message that is to be sent.
+     */
+    disableWebPagePreview?: boolean;
+    /**
+     * Whether to send the message in a silent way without making a sound on the recipients' clients.
+     */
+    disableNotification?: boolean;
+    /**
+     * Whether to protect the contents of the message from copying and forwarding.
+     */
+    protectContent?: boolean;
+    /**
+     * The identifier of a message to reply to.
+     */
+    replyToMessageId?: number;
+    /**
+     * The identifier of a thread to send the message to.
+     */
+    messageThreadId?: number;
+    /**
+     * The identifier of the chat to send the message on behalf of.
+     */
+    sendAs?: ChatID;
+    /**
+     * The reply markup of the message.
+     */
+    replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
+}
 export interface ForwardMessagesParams {
     messageThreadId?: number;
+    /**
+     * Whether to forward the message in a silent way without making a sound on the recipients' clients.
+     */
     disableNotification?: boolean;
+    /**
+     * Whether to protect the contents of the forwarded message from copying and forwarding.
+     */
     protectContent?: boolean;
-    sendAs?: number | string;
+    /**
+     * The identifier of the chat to forward the message on behalf of.
+     */
+    sendAs?: ChatID;
+    /**
+     * Whether to not include the original sender of the message that is going to be forwarded.
+     */
     dropSenderName?: boolean;
+    /**
+     * Whether to not include the original caption of the message that is going to be forwarded.
+     */
     dropCaption?: boolean;
 }
 export declare class Client extends ClientAbstract {
@@ -178,23 +235,53 @@ export declare class Client extends ClientAbstract {
     [getEntity](peer: types.PeerChannel): Promise<types.Channel | null>;
     processResult(result: ReadObject): Promise<void>;
     private updatesToMessages;
-    sendMessage(chatId: number | string, text: string, params?: {
-        parseMode?: ParseMode;
-        entities?: MessageEntity[];
-        disableWebPagePreview?: boolean;
-        disableNotification?: boolean;
-        protectContent?: boolean;
-        replyToMessageId?: number;
-        messageThreadId?: number;
-        sendAs?: number | string;
-        replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
-    }): Promise<Message>;
-    getMessages(chatId_: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
-    getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
+    /**
+     * Send a text message.
+     *
+     * @param chatId The chat to send the message to.
+     * @param text The message's text.
+     */
+    sendMessage(chatId: ChatID, text: string, params?: SendMessagesParams): Promise<Message>;
+    /**
+     * Retrieve multiple messages.
+     *
+     * @param chatId The identifier of the chat to retrieve the messages from.
+     * @param messageIds The identifiers of the messages to retrieve.
+     */
+    getMessages(chatId_: ChatID, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    /**
+     * Retrieve a single message.
+     *
+     * @param chatId The identifier of the chat to retrieve the message from.
+     * @param messageId The identifier of the message to retrieve.
+     */
+    getMessage(chatId: ChatID, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
     private downloadInner;
-    download(fileId_: string): Promise<AsyncGenerator<Uint8Array, void, unknown>>;
+    /**
+     * Download a file.
+     *
+     * @param fileId The identifier of the file to download.
+     */
+    download(fileId: string): Promise<AsyncGenerator<Uint8Array, void, unknown>>;
     [getStickerSetName](inputStickerSet: types.InputStickerSetID, hash?: number): Promise<string>;
-    forwardMessages(from: number | string, to: number | string, messageIds: number[], params?: ForwardMessagesParams): Promise<Message[]>;
-    forwardMessage(from: number | string, to: number | string, messageId: number, params?: ForwardMessagesParams): Promise<Message>;
+    /**
+     * Forward multiple messages.
+     *
+     * @param from The identifier of the chat to forward the messages from.
+     * @param to The identifier of the chat to forward the messages to.
+     * @param messageIds The identifiers of the messages to forward.
+     */
+    forwardMessages(from: ChatID, to: ChatID, messageIds: number[], params?: ForwardMessagesParams): Promise<Message[]>;
+    /**
+     * Forward a single message.
+     *
+     * @param from The identifier of the chat to forward the message from.
+     * @param to The identifier of the chat to forward the message to.
+     * @param messageId The identifier of the message to forward.
+     */
+    forwardMessage(from: ChatID, to: ChatID, messageId: number, params?: ForwardMessagesParams): Promise<Message>;
+    /**
+     * Get information on the currently authorized user.
+     */
     getMe(): Promise<import("../types/1_user.js").User>;
 }

package/esm/client/3_client.js

@@ -327,52 +327,23 @@ export class Client extends ClientAbstract {
             }
         }
         dAuth("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
-        await this.invoke(new functions.InitConnection({
-            apiId: this.apiId,
-            appVersion: this.appVersion,
-            deviceModel: this.deviceModel,
-            langCode: this.langCode,
-            langPack: this.langPack,
-            query: new functions.InvokeWithLayer({
-                layer: LAYER,
-                query: new functions.HelpGetConfig(),
-            }),
-            systemLangCode: this.systemLangCode,
-            systemVersion: this.systemVersion,
-        }));
-        d("connection inited");
-        const handlePassword = async (err) => {
-            params = params;
-            if (err instanceof types.RPCError && err.errorMessage == "SESSION_PASSWORD_NEEDED") {
-                while (true) {
-                    const ap = await this.invoke(new functions.AccountGetPassword());
-                    if (ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow) {
-                        try {
-                            const password = typeof params.password === "string" ? params.password : await params.password(ap.hint ?? null);
-                            const input = await checkPassword(password, ap);
-                            await this.invoke(new functions.AuthCheckPassword({ password: input }));
-                            await this.storage.setAccountType("user");
-                            dAuth("authorized as user");
-                            break;
-                        }
-                        catch (err) {
-                            if (err instanceof types.RPCError && err.errorMessage == "PASSWORD_HASH_INVALID") {
-                                continue;
-                            }
-                            else {
-                                throw err;
-                            }
-                        }
-                    }
-                    else {
-                        throw new Error(`Handling ${ap.currentAlgo?.constructor.name} not implemented`);
-                    }
-                }
-            }
-            else {
-                throw err;
-            }
+        const initConnection = async () => {
+            await this.invoke(new functions.InitConnection({
+                apiId: this.apiId,
+                appVersion: this.appVersion,
+                deviceModel: this.deviceModel,
+                langCode: this.langCode,
+                langPack: this.langPack,
+                query: new functions.InvokeWithLayer({
+                    layer: LAYER,
+                    query: new functions.HelpGetConfig(),
+                }),
+                systemLangCode: this.systemLangCode,
+                systemVersion: this.systemVersion,
+            }));
+            d("connection inited");
         };
+        await initConnection();
         try {
             await this.fetchState("authorize");
             d("already authorized");
@@ -383,102 +354,129 @@ export class Client extends ClientAbstract {
                 throw err;
             }
         }
-        let signedIn = false;
-        let phoneNumber = null;
-        try {
-            if (params instanceof types.AuthExportedAuthorization) {
-                await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
-                dAuth("authorization imported");
-            }
-            else if (typeof params == "object") {
-                while (true) {
-                    if (signedIn) {
-                        break;
-                    }
-                    try {
-                        try {
-                            phoneNumber = typeof params.phone === "string" ? params.phone : await params.phone();
-                            const sentCode = await this.invoke(new functions.AuthSendCode({
-                                apiId: this.apiId,
-                                apiHash: this.apiHash,
-                                phoneNumber,
-                                settings: new types.CodeSettings(),
-                            }));
-                            dAuth("verification code sent");
-                            if (sentCode instanceof types.AuthSentCode) {
-                                while (true) {
-                                    const phoneCode = typeof params.code === "string" ? params.code : await params.code();
-                                    try {
-                                        const auth = await this.invoke(new functions.AuthSignIn({ phoneNumber, phoneCode, phoneCodeHash: sentCode.phoneCodeHash }));
-                                        if (auth instanceof types.AuthAuthorizationSignUpRequired) {
-                                            throw new Error("Sign up not supported");
-                                        }
-                                        else {
-                                            signedIn = true;
-                                            await this.storage.setAccountType("user");
-                                            dAuth("authorized as user");
-                                            break;
-                                        }
-                                    }
-                                    catch (err) {
-                                        if (err instanceof types.RPCError && err.errorMessage == "PHONE_CODE_INVALID") {
-                                            continue;
-                                        }
-                                        else {
-                                            throw err;
-                                        }
-                                    }
-                                }
-                            }
-                            else {
-                                throw new Error(`Handling ${sentCode.constructor.name} not implemented`);
-                            }
+        if (typeof params === "string") {
+            while (true) {
+                try {
+                    await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
+                    await this.storage.setAccountType("bot");
+                    break;
+                }
+                catch (err) {
+                    if (err instanceof types.RPCError) {
+                        const match = err.errorMessage.match(/MIGRATE_(\d)$/);
+                        if (match) {
+                            await this[handleMigrationError](err);
+                            await initConnection();
+                            continue;
                         }
-                        catch (err) {
-                            await handlePassword(err);
+                        else {
+                            throw err;
                         }
                     }
-                    catch (err) {
-                        if (err == restartAuth) {
-                            continue;
+                    else {
+                        throw err;
+                    }
+                }
+            }
+            dAuth("authorized as bot");
+            await this.fetchState("authorize");
+            return;
+        }
+        if (params instanceof types.AuthExportedAuthorization) {
+            await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
+            dAuth("authorization imported");
+            return;
+        }
+        let phone;
+        let sentCode;
+        while (true) {
+            try {
+                phone = typeof params.phone === "string" ? params.phone : await params.phone();
+                const sendCode = () => this.invoke(new functions.AuthSendCode({
+                    phoneNumber: phone,
+                    apiId: this.apiId,
+                    apiHash: this.apiHash,
+                    settings: new types.CodeSettings(),
+                })).then((v) => v[as](types.AuthSentCode));
+                try {
+                    sentCode = await sendCode();
+                }
+                catch (err) {
+                    if (err instanceof types.RPCError) {
+                        const match = err.errorMessage.match(/MIGRATE_(\d)$/);
+                        if (match) {
+                            await this[handleMigrationError](err);
+                            await initConnection();
+                            sentCode = await sendCode();
                         }
                         else {
                             throw err;
                         }
                     }
+                    else {
+                        throw err;
+                    }
                 }
+                break;
             }
-            else {
-                await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
-                await this.storage.setAccountType("bot");
-                dAuth("authorized as bot");
+            catch (err) {
+                if (err instanceof types.RPCError && err.errorMessage == "PHONE_NUMBER_INVALID") {
+                    continue;
+                }
+                else {
+                    throw err;
+                }
             }
         }
-        catch (err) {
-            if (err instanceof types.RPCError) {
-                const match = err.errorMessage.match(/MIGRATE_(\d)$/);
-                if (match) {
-                    await this[handleMigrationError](err);
-                    if (typeof params === "object" && phoneNumber != null) {
-                        params = Object.assign({}, params);
-                        params.phone = phoneNumber;
-                    }
-                    await this.authorize(params);
+        dAuth("verification code sent");
+        let err;
+        while (true) {
+            const code = typeof params.code === "string" ? params.code : await params.code();
+            try {
+                await this.invoke(new functions.AuthSignIn({
+                    phoneNumber: phone,
+                    phoneCode: code,
+                    phoneCodeHash: sentCode.phoneCodeHash,
+                }));
+                await this.storage.setAccountType("user");
+                dAuth("authorized as user");
+                await this.fetchState("authorize");
+                return;
+            }
+            catch (err_) {
+                if (err_ instanceof types.RPCError && err_.errorMessage == "PHONE_CODE_INVALID") {
+                    continue;
                 }
                 else {
-                    await handlePassword(err);
+                    err = err_;
+                    break;
                 }
             }
-            else {
-                throw err;
-            }
         }
-        finally {
+        if (!(err instanceof types.RPCError && err.errorMessage == "SESSION_PASSWORD_NEEDED")) {
+            throw err;
+        }
+        while (true) {
+            const ap = await this.invoke(new functions.AccountGetPassword());
+            if (!(ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow)) {
+                throw new Error(`Handling ${ap.currentAlgo?.constructor.name} not implemented`);
+            }
             try {
+                const password = typeof params.password === "string" ? params.password : await params.password(ap.hint ?? null);
+                const input = await checkPassword(password, ap);
+                await this.invoke(new functions.AuthCheckPassword({ password: input }));
+                await this.storage.setAccountType("user");
+                dAuth("authorized as user");
                 await this.fetchState("authorize");
+                break;
             }
-            catch (_err) {
-                //
+            catch (err) {
+                if (err instanceof types.RPCError && err.errorMessage == "PASSWORD_HASH_INVALID") {
+                    continue;
+                }
+                else {
+                    throw err;
+                }
             }
         }
     }
@@ -487,6 +485,16 @@ export class Client extends ClientAbstract {
      */
     async start(params) {
         await this.connect();
+        try {
+            await this.fetchState("authorize");
+            d("already authorized");
+            return;
+        }
+        catch (err) {
+            if (!(err instanceof types.RPCError) || err.errorMessage != "AUTH_KEY_UNREGISTERED") {
+                throw err;
+            }
+        }
         await this.authorize(params);
     }
     async receiveLoop() {
@@ -558,15 +566,16 @@ export class Client extends ClientAbstract {
                             this.promises.delete(message.body.msgId);
                         }
                     }
-                    else if (message.body instanceof types.BadMsgNotification || message.body instanceof types.BadServerSalt) {
+                    else if (message.body instanceof types.TypeBadMsgNotification || message.body instanceof types.BadServerSalt) {
                         if (message.body instanceof types.BadServerSalt) {
+                            d("server salt reassigned");
                             this.state.salt = message.body.newServerSalt;
                         }
-                        const promise = this.promises.get(message.body.badMsgId);
-                        if (promise) {
-                            promise.resolve(message.body);
-                            this.promises.delete(message.body.badMsgId);
-                        }
+                        // const promise = this.promises.get(message.body.badMsgId);
+                        // if (promise) {
+                        //   promise.resolve(message.body);
+                        //   this.promises.delete(message.body.badMsgId);
+                        // }
                     }
                     this.toAcknowledge.add(message.id);
                 }
@@ -1138,6 +1147,12 @@ export class Client extends ClientAbstract {
         }
         return messages;
     }
+    /**
+     * Send a text message.
+     *
+     * @param chatId The chat to send the message to.
+     * @param text The message's text.
+     */
     async sendMessage(chatId, text, params) {
         const entities_ = params?.entities ?? [];
         const parseMode = params?.parseMode ?? this.parseMode;
@@ -1197,6 +1212,12 @@ export class Client extends ClientAbstract {
         }));
         return await this.updatesToMessages(chatId, result).then((v) => v[0]);
     }
+    /**
+     * Retrieve multiple messages.
+     *
+     * @param chatId The identifier of the chat to retrieve the messages from.
+     * @param messageIds The identifiers of the messages to retrieve.
+     */
     async getMessages(chatId_, messageIds) {
         const peer = await this.getInputPeer(chatId_);
         let messages_ = new Array();
@@ -1232,6 +1253,12 @@ export class Client extends ClientAbstract {
         }
         return messages;
     }
+    /**
+     * Retrieve a single message.
+     *
+     * @param chatId The identifier of the chat to retrieve the message from.
+     * @param messageId The identifier of the message to retrieve.
+     */
     async getMessage(chatId, messageId) {
         const messages = await this.getMessages(chatId, [messageId]);
         return messages[0] ?? null;
@@ -1275,24 +1302,29 @@ export class Client extends ClientAbstract {
             }
         }
     }
-    async download(fileId_) {
-        const fileId = FileID.decode(fileId_);
-        switch (fileId.fileType) {
+    /**
+     * Download a file.
+     *
+     * @param fileId The identifier of the file to download.
+     */
+    async download(fileId) {
+        const fileId_ = FileID.decode(fileId);
+        switch (fileId_.fileType) {
             case FileType.ChatPhoto: {
-                const big = fileId.params.thumbnailSource == ThumbnailSource.ChatPhotoBig;
-                const peer = await this.getInputPeer(fileId.params.chatId);
-                const location = new types.InputPeerPhotoFileLocation({ big: big ? true : undefined, peer, photoId: fileId.params.mediaId });
+                const big = fileId_.params.thumbnailSource == ThumbnailSource.ChatPhotoBig;
+                const peer = await this.getInputPeer(fileId_.params.chatId);
+                const location = new types.InputPeerPhotoFileLocation({ big: big ? true : undefined, peer, photoId: fileId_.params.mediaId });
                 return this.downloadInner(location);
             }
             case FileType.Photo: {
-                if (fileId.params.mediaId == undefined || fileId.params.accessHash == undefined || fileId.params.fileReference == undefined || fileId.params.thumbnailSize == undefined) {
+                if (fileId_.params.mediaId == undefined || fileId_.params.accessHash == undefined || fileId_.params.fileReference == undefined || fileId_.params.thumbnailSize == undefined) {
                     UNREACHABLE();
                 }
                 const location = new types.InputPhotoFileLocation({
-                    id: fileId.params.mediaId,
-                    accessHash: fileId.params.accessHash,
-                    fileReference: fileId.params.fileReference,
-                    thumbSize: fileId.params.thumbnailSize,
+                    id: fileId_.params.mediaId,
+                    accessHash: fileId_.params.accessHash,
+                    fileReference: fileId_.params.fileReference,
+                    thumbSize: fileId_.params.thumbnailSize,
                 });
                 return this.downloadInner(location);
             }
@@ -1312,6 +1344,13 @@ export class Client extends ClientAbstract {
             return name;
         }
     }
+    /**
+     * Forward multiple messages.
+     *
+     * @param from The identifier of the chat to forward the messages from.
+     * @param to The identifier of the chat to forward the messages to.
+     * @param messageIds The identifiers of the messages to forward.
+     */
     async forwardMessages(from, to, messageIds, params) {
         const result = await this.invoke(new functions.MessagesForwardMessages({
             fromPeer: await this.getInputPeer(from),
@@ -1327,9 +1366,19 @@ export class Client extends ClientAbstract {
         }));
         return await this.updatesToMessages(to, result);
     }
+    /**
+     * Forward a single message.
+     *
+     * @param from The identifier of the chat to forward the message from.
+     * @param to The identifier of the chat to forward the message to.
+     * @param messageId The identifier of the message to forward.
+     */
     async forwardMessage(from, to, messageId, params) {
         return await this.forwardMessages(from, to, [messageId], params).then((v) => v[0]);
     }
+    /**
+     * Get information on the currently authorized user.
+     */
     async getMe() {
         const users = await this.invoke(new functions.UsersGetUsers({ id: [new types.InputUserSelf()] }));
         if (users.length < 1) {

package/esm/constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 160;
-export declare const APP_VERSION = "MTKruto 0.0.978";
+export declare const APP_VERSION = "MTKruto 0.0.980";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/constants.js

@@ -54,7 +54,7 @@ export const PUBLIC_KEYS = Object.freeze([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const INITIAL_DC = "2-test";
 export const LAYER = 160;
-export const APP_VERSION = "MTKruto 0.0.978";
+export const APP_VERSION = "MTKruto 0.0.980";
 // @ts-ignore: lib
 export const DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 export const LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.0.978",
+  "version": "0.0.980",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/client/3_client.d.ts

@@ -68,12 +68,69 @@ export interface ClientParams {
      */
     autoStart?: boolean;
 }
+/**
+ * A chat identifier as provided by MTKruto or a string starting with a @ that is followed by a username.
+ */
+export type ChatID = number | string;
+export interface SendMessagesParams {
+    /**
+     * The parse mode to use. If not provided, the default parse mode will be used.
+     */
+    parseMode?: ParseMode;
+    /**
+     * The message's entities.
+     */
+    entities?: MessageEntity[];
+    /**
+     * Whether to disable web page previews in the message that is to be sent.
+     */
+    disableWebPagePreview?: boolean;
+    /**
+     * Whether to send the message in a silent way without making a sound on the recipients' clients.
+     */
+    disableNotification?: boolean;
+    /**
+     * Whether to protect the contents of the message from copying and forwarding.
+     */
+    protectContent?: boolean;
+    /**
+     * The identifier of a message to reply to.
+     */
+    replyToMessageId?: number;
+    /**
+     * The identifier of a thread to send the message to.
+     */
+    messageThreadId?: number;
+    /**
+     * The identifier of the chat to send the message on behalf of.
+     */
+    sendAs?: ChatID;
+    /**
+     * The reply markup of the message.
+     */
+    replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
+}
 export interface ForwardMessagesParams {
     messageThreadId?: number;
+    /**
+     * Whether to forward the message in a silent way without making a sound on the recipients' clients.
+     */
     disableNotification?: boolean;
+    /**
+     * Whether to protect the contents of the forwarded message from copying and forwarding.
+     */
     protectContent?: boolean;
-    sendAs?: number | string;
+    /**
+     * The identifier of the chat to forward the message on behalf of.
+     */
+    sendAs?: ChatID;
+    /**
+     * Whether to not include the original sender of the message that is going to be forwarded.
+     */
     dropSenderName?: boolean;
+    /**
+     * Whether to not include the original caption of the message that is going to be forwarded.
+     */
     dropCaption?: boolean;
 }
 export declare class Client extends ClientAbstract {
@@ -178,23 +235,53 @@ export declare class Client extends ClientAbstract {
     [getEntity](peer: types.PeerChannel): Promise<types.Channel | null>;
     processResult(result: ReadObject): Promise<void>;
     private updatesToMessages;
-    sendMessage(chatId: number | string, text: string, params?: {
-        parseMode?: ParseMode;
-        entities?: MessageEntity[];
-        disableWebPagePreview?: boolean;
-        disableNotification?: boolean;
-        protectContent?: boolean;
-        replyToMessageId?: number;
-        messageThreadId?: number;
-        sendAs?: number | string;
-        replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
-    }): Promise<Message>;
-    getMessages(chatId_: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
-    getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
+    /**
+     * Send a text message.
+     *
+     * @param chatId The chat to send the message to.
+     * @param text The message's text.
+     */
+    sendMessage(chatId: ChatID, text: string, params?: SendMessagesParams): Promise<Message>;
+    /**
+     * Retrieve multiple messages.
+     *
+     * @param chatId The identifier of the chat to retrieve the messages from.
+     * @param messageIds The identifiers of the messages to retrieve.
+     */
+    getMessages(chatId_: ChatID, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    /**
+     * Retrieve a single message.
+     *
+     * @param chatId The identifier of the chat to retrieve the message from.
+     * @param messageId The identifier of the message to retrieve.
+     */
+    getMessage(chatId: ChatID, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
     private downloadInner;
-    download(fileId_: string): Promise<AsyncGenerator<Uint8Array, void, unknown>>;
+    /**
+     * Download a file.
+     *
+     * @param fileId The identifier of the file to download.
+     */
+    download(fileId: string): Promise<AsyncGenerator<Uint8Array, void, unknown>>;
     [getStickerSetName](inputStickerSet: types.InputStickerSetID, hash?: number): Promise<string>;
-    forwardMessages(from: number | string, to: number | string, messageIds: number[], params?: ForwardMessagesParams): Promise<Message[]>;
-    forwardMessage(from: number | string, to: number | string, messageId: number, params?: ForwardMessagesParams): Promise<Message>;
+    /**
+     * Forward multiple messages.
+     *
+     * @param from The identifier of the chat to forward the messages from.
+     * @param to The identifier of the chat to forward the messages to.
+     * @param messageIds The identifiers of the messages to forward.
+     */
+    forwardMessages(from: ChatID, to: ChatID, messageIds: number[], params?: ForwardMessagesParams): Promise<Message[]>;
+    /**
+     * Forward a single message.
+     *
+     * @param from The identifier of the chat to forward the message from.
+     * @param to The identifier of the chat to forward the message to.
+     * @param messageId The identifier of the message to forward.
+     */
+    forwardMessage(from: ChatID, to: ChatID, messageId: number, params?: ForwardMessagesParams): Promise<Message>;
+    /**
+     * Get information on the currently authorized user.
+     */
     getMe(): Promise<import("../types/1_user.js").User>;
 }

package/script/client/3_client.js

@@ -353,52 +353,23 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             }
         }
         dAuth("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
-        await this.invoke(new functions.InitConnection({
-            apiId: this.apiId,
-            appVersion: this.appVersion,
-            deviceModel: this.deviceModel,
-            langCode: this.langCode,
-            langPack: this.langPack,
-            query: new functions.InvokeWithLayer({
-                layer: constants_js_1.LAYER,
-                query: new functions.HelpGetConfig(),
-            }),
-            systemLangCode: this.systemLangCode,
-            systemVersion: this.systemVersion,
-        }));
-        d("connection inited");
-        const handlePassword = async (err) => {
-            params = params;
-            if (err instanceof types.RPCError && err.errorMessage == "SESSION_PASSWORD_NEEDED") {
-                while (true) {
-                    const ap = await this.invoke(new functions.AccountGetPassword());
-                    if (ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow) {
-                        try {
-                            const password = typeof params.password === "string" ? params.password : await params.password(ap.hint ?? null);
-                            const input = await (0, _0_password_js_1.checkPassword)(password, ap);
-                            await this.invoke(new functions.AuthCheckPassword({ password: input }));
-                            await this.storage.setAccountType("user");
-                            dAuth("authorized as user");
-                            break;
-                        }
-                        catch (err) {
-                            if (err instanceof types.RPCError && err.errorMessage == "PASSWORD_HASH_INVALID") {
-                                continue;
-                            }
-                            else {
-                                throw err;
-                            }
-                        }
-                    }
-                    else {
-                        throw new Error(`Handling ${ap.currentAlgo?.constructor.name} not implemented`);
-                    }
-                }
-            }
-            else {
-                throw err;
-            }
+        const initConnection = async () => {
+            await this.invoke(new functions.InitConnection({
+                apiId: this.apiId,
+                appVersion: this.appVersion,
+                deviceModel: this.deviceModel,
+                langCode: this.langCode,
+                langPack: this.langPack,
+                query: new functions.InvokeWithLayer({
+                    layer: constants_js_1.LAYER,
+                    query: new functions.HelpGetConfig(),
+                }),
+                systemLangCode: this.systemLangCode,
+                systemVersion: this.systemVersion,
+            }));
+            d("connection inited");
         };
+        await initConnection();
         try {
             await this.fetchState("authorize");
             d("already authorized");
@@ -409,102 +380,129 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 throw err;
             }
         }
-        let signedIn = false;
-        let phoneNumber = null;
-        try {
-            if (params instanceof types.AuthExportedAuthorization) {
-                await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
-                dAuth("authorization imported");
-            }
-            else if (typeof params == "object") {
-                while (true) {
-                    if (signedIn) {
-                        break;
-                    }
-                    try {
-                        try {
-                            phoneNumber = typeof params.phone === "string" ? params.phone : await params.phone();
-                            const sentCode = await this.invoke(new functions.AuthSendCode({
-                                apiId: this.apiId,
-                                apiHash: this.apiHash,
-                                phoneNumber,
-                                settings: new types.CodeSettings(),
-                            }));
-                            dAuth("verification code sent");
-                            if (sentCode instanceof types.AuthSentCode) {
-                                while (true) {
-                                    const phoneCode = typeof params.code === "string" ? params.code : await params.code();
-                                    try {
-                                        const auth = await this.invoke(new functions.AuthSignIn({ phoneNumber, phoneCode, phoneCodeHash: sentCode.phoneCodeHash }));
-                                        if (auth instanceof types.AuthAuthorizationSignUpRequired) {
-                                            throw new Error("Sign up not supported");
-                                        }
-                                        else {
-                                            signedIn = true;
-                                            await this.storage.setAccountType("user");
-                                            dAuth("authorized as user");
-                                            break;
-                                        }
-                                    }
-                                    catch (err) {
-                                        if (err instanceof types.RPCError && err.errorMessage == "PHONE_CODE_INVALID") {
-                                            continue;
-                                        }
-                                        else {
-                                            throw err;
-                                        }
-                                    }
-                                }
-                            }
-                            else {
-                                throw new Error(`Handling ${sentCode.constructor.name} not implemented`);
-                            }
+        if (typeof params === "string") {
+            while (true) {
+                try {
+                    await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
+                    await this.storage.setAccountType("bot");
+                    break;
+                }
+                catch (err) {
+                    if (err instanceof types.RPCError) {
+                        const match = err.errorMessage.match(/MIGRATE_(\d)$/);
+                        if (match) {
+                            await this[exports.handleMigrationError](err);
+                            await initConnection();
+                            continue;
                         }
-                        catch (err) {
-                            await handlePassword(err);
+                        else {
+                            throw err;
                         }
                     }
-                    catch (err) {
-                        if (err == exports.restartAuth) {
-                            continue;
+                    else {
+                        throw err;
+                    }
+                }
+            }
+            dAuth("authorized as bot");
+            await this.fetchState("authorize");
+            return;
+        }
+        if (params instanceof types.AuthExportedAuthorization) {
+            await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
+            dAuth("authorization imported");
+            return;
+        }
+        let phone;
+        let sentCode;
+        while (true) {
+            try {
+                phone = typeof params.phone === "string" ? params.phone : await params.phone();
+                const sendCode = () => this.invoke(new functions.AuthSendCode({
+                    phoneNumber: phone,
+                    apiId: this.apiId,
+                    apiHash: this.apiHash,
+                    settings: new types.CodeSettings(),
+                })).then((v) => v[_1_tl_object_js_1.as](types.AuthSentCode));
+                try {
+                    sentCode = await sendCode();
+                }
+                catch (err) {
+                    if (err instanceof types.RPCError) {
+                        const match = err.errorMessage.match(/MIGRATE_(\d)$/);
+                        if (match) {
+                            await this[exports.handleMigrationError](err);
+                            await initConnection();
+                            sentCode = await sendCode();
                         }
                         else {
                             throw err;
                         }
                     }
+                    else {
+                        throw err;
+                    }
                 }
+                break;
             }
-            else {
-                await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
-                await this.storage.setAccountType("bot");
-                dAuth("authorized as bot");
+            catch (err) {
+                if (err instanceof types.RPCError && err.errorMessage == "PHONE_NUMBER_INVALID") {
+                    continue;
+                }
+                else {
+                    throw err;
+                }
             }
         }
-        catch (err) {
-            if (err instanceof types.RPCError) {
-                const match = err.errorMessage.match(/MIGRATE_(\d)$/);
-                if (match) {
-                    await this[exports.handleMigrationError](err);
-                    if (typeof params === "object" && phoneNumber != null) {
-                        params = Object.assign({}, params);
-                        params.phone = phoneNumber;
-                    }
-                    await this.authorize(params);
+        dAuth("verification code sent");
+        let err;
+        while (true) {
+            const code = typeof params.code === "string" ? params.code : await params.code();
+            try {
+                await this.invoke(new functions.AuthSignIn({
+                    phoneNumber: phone,
+                    phoneCode: code,
+                    phoneCodeHash: sentCode.phoneCodeHash,
+                }));
+                await this.storage.setAccountType("user");
+                dAuth("authorized as user");
+                await this.fetchState("authorize");
+                return;
+            }
+            catch (err_) {
+                if (err_ instanceof types.RPCError && err_.errorMessage == "PHONE_CODE_INVALID") {
+                    continue;
                 }
                 else {
-                    await handlePassword(err);
+                    err = err_;
+                    break;
                 }
             }
-            else {
-                throw err;
-            }
         }
-        finally {
+        if (!(err instanceof types.RPCError && err.errorMessage == "SESSION_PASSWORD_NEEDED")) {
+            throw err;
+        }
+        while (true) {
+            const ap = await this.invoke(new functions.AccountGetPassword());
+            if (!(ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow)) {
+                throw new Error(`Handling ${ap.currentAlgo?.constructor.name} not implemented`);
+            }
             try {
+                const password = typeof params.password === "string" ? params.password : await params.password(ap.hint ?? null);
+                const input = await (0, _0_password_js_1.checkPassword)(password, ap);
+                await this.invoke(new functions.AuthCheckPassword({ password: input }));
+                await this.storage.setAccountType("user");
+                dAuth("authorized as user");
                 await this.fetchState("authorize");
+                break;
             }
-            catch (_err) {
-                //
+            catch (err) {
+                if (err instanceof types.RPCError && err.errorMessage == "PASSWORD_HASH_INVALID") {
+                    continue;
+                }
+                else {
+                    throw err;
+                }
             }
         }
     }
@@ -513,6 +511,16 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
      */
     async start(params) {
         await this.connect();
+        try {
+            await this.fetchState("authorize");
+            d("already authorized");
+            return;
+        }
+        catch (err) {
+            if (!(err instanceof types.RPCError) || err.errorMessage != "AUTH_KEY_UNREGISTERED") {
+                throw err;
+            }
+        }
         await this.authorize(params);
     }
     async receiveLoop() {
@@ -584,15 +592,16 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                             this.promises.delete(message.body.msgId);
                         }
                     }
-                    else if (message.body instanceof types.BadMsgNotification || message.body instanceof types.BadServerSalt) {
+                    else if (message.body instanceof types.TypeBadMsgNotification || message.body instanceof types.BadServerSalt) {
                         if (message.body instanceof types.BadServerSalt) {
+                            d("server salt reassigned");
                             this.state.salt = message.body.newServerSalt;
                         }
-                        const promise = this.promises.get(message.body.badMsgId);
-                        if (promise) {
-                            promise.resolve(message.body);
-                            this.promises.delete(message.body.badMsgId);
-                        }
+                        // const promise = this.promises.get(message.body.badMsgId);
+                        // if (promise) {
+                        //   promise.resolve(message.body);
+                        //   this.promises.delete(message.body.badMsgId);
+                        // }
                     }
                     this.toAcknowledge.add(message.id);
                 }
@@ -1164,6 +1173,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }
         return messages;
     }
+    /**
+     * Send a text message.
+     *
+     * @param chatId The chat to send the message to.
+     * @param text The message's text.
+     */
     async sendMessage(chatId, text, params) {
         const entities_ = params?.entities ?? [];
         const parseMode = params?.parseMode ?? this.parseMode;
@@ -1223,6 +1238,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }));
         return await this.updatesToMessages(chatId, result).then((v) => v[0]);
     }
+    /**
+     * Retrieve multiple messages.
+     *
+     * @param chatId The identifier of the chat to retrieve the messages from.
+     * @param messageIds The identifiers of the messages to retrieve.
+     */
     async getMessages(chatId_, messageIds) {
         const peer = await this.getInputPeer(chatId_);
         let messages_ = new Array();
@@ -1258,6 +1279,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }
         return messages;
     }
+    /**
+     * Retrieve a single message.
+     *
+     * @param chatId The identifier of the chat to retrieve the message from.
+     * @param messageId The identifier of the message to retrieve.
+     */
     async getMessage(chatId, messageId) {
         const messages = await this.getMessages(chatId, [messageId]);
         return messages[0] ?? null;
@@ -1301,24 +1328,29 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             }
         }
     }
-    async download(fileId_) {
-        const fileId = _0_file_id_js_1.FileID.decode(fileId_);
-        switch (fileId.fileType) {
+    /**
+     * Download a file.
+     *
+     * @param fileId The identifier of the file to download.
+     */
+    async download(fileId) {
+        const fileId_ = _0_file_id_js_1.FileID.decode(fileId);
+        switch (fileId_.fileType) {
             case _0_file_id_js_1.FileType.ChatPhoto: {
-                const big = fileId.params.thumbnailSource == _0_file_id_js_1.ThumbnailSource.ChatPhotoBig;
-                const peer = await this.getInputPeer(fileId.params.chatId);
-                const location = new types.InputPeerPhotoFileLocation({ big: big ? true : undefined, peer, photoId: fileId.params.mediaId });
+                const big = fileId_.params.thumbnailSource == _0_file_id_js_1.ThumbnailSource.ChatPhotoBig;
+                const peer = await this.getInputPeer(fileId_.params.chatId);
+                const location = new types.InputPeerPhotoFileLocation({ big: big ? true : undefined, peer, photoId: fileId_.params.mediaId });
                 return this.downloadInner(location);
             }
             case _0_file_id_js_1.FileType.Photo: {
-                if (fileId.params.mediaId == undefined || fileId.params.accessHash == undefined || fileId.params.fileReference == undefined || fileId.params.thumbnailSize == undefined) {
+                if (fileId_.params.mediaId == undefined || fileId_.params.accessHash == undefined || fileId_.params.fileReference == undefined || fileId_.params.thumbnailSize == undefined) {
                     (0, _0_control_js_1.UNREACHABLE)();
                 }
                 const location = new types.InputPhotoFileLocation({
-                    id: fileId.params.mediaId,
-                    accessHash: fileId.params.accessHash,
-                    fileReference: fileId.params.fileReference,
-                    thumbSize: fileId.params.thumbnailSize,
+                    id: fileId_.params.mediaId,
+                    accessHash: fileId_.params.accessHash,
+                    fileReference: fileId_.params.fileReference,
+                    thumbSize: fileId_.params.thumbnailSize,
                 });
                 return this.downloadInner(location);
             }
@@ -1338,6 +1370,13 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             return name;
         }
     }
+    /**
+     * Forward multiple messages.
+     *
+     * @param from The identifier of the chat to forward the messages from.
+     * @param to The identifier of the chat to forward the messages to.
+     * @param messageIds The identifiers of the messages to forward.
+     */
     async forwardMessages(from, to, messageIds, params) {
         const result = await this.invoke(new functions.MessagesForwardMessages({
             fromPeer: await this.getInputPeer(from),
@@ -1353,9 +1392,19 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }));
         return await this.updatesToMessages(to, result);
     }
+    /**
+     * Forward a single message.
+     *
+     * @param from The identifier of the chat to forward the message from.
+     * @param to The identifier of the chat to forward the message to.
+     * @param messageId The identifier of the message to forward.
+     */
     async forwardMessage(from, to, messageId, params) {
         return await this.forwardMessages(from, to, [messageId], params).then((v) => v[0]);
     }
+    /**
+     * Get information on the currently authorized user.
+     */
     async getMe() {
         const users = await this.invoke(new functions.UsersGetUsers({ id: [new types.InputUserSelf()] }));
         if (users.length < 1) {

package/script/constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 160;
-export declare const APP_VERSION = "MTKruto 0.0.978";
+export declare const APP_VERSION = "MTKruto 0.0.980";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2-test";
 exports.LAYER = 160;
-exports.APP_VERSION = "MTKruto 0.0.978";
+exports.APP_VERSION = "MTKruto 0.0.980";
 // @ts-ignore: lib
 exports.DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 exports.LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];