@mtkruto/node 0.0.901 → 0.0.903

package/esm/client/client.d.ts

@@ -159,7 +159,7 @@ export declare class Client extends ClientAbstract {
         messageThreadId?: number;
         sendAs?: number | string;
         replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
-    }): Promise<Message>;
-    getMessages(chatId: number | string, messageIds: number[]): Promise<Message[]>;
-    getMessage(chatId: number | string, messageId: number): Promise<Message | null>;
+    }): Promise<Omit<Message, "replyToMessage">>;
+    getMessages(chatId: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
 }

package/esm/client/client.js

@@ -3,9 +3,6 @@ import { ackThreshold, CHANNEL_DIFFERENCE_LIMIT_BOT, CHANNEL_DIFFERENCE_LIMIT_US
 import { bigIntFromBuffer, getRandomBigInt, getRandomId } from "../utilities/0_bigint.js";
 import { UNREACHABLE } from "../utilities/0_control.js";
 import { sha1 } from "../utilities/0_hash.js";
-import { parseHtml } from "../utilities/0_html.js";
-import { decryptMessage, encryptMessage, getMessageId } from "../utilities/1_message.js";
-import { checkPassword } from "../utilities/1_password.js";
 import { as } from "../tl/1_tl_object.js";
 import * as types from "../tl/2_types.js";
 import * as functions from "../tl/3_functions.js";
@@ -16,15 +13,20 @@ import { MessageContainer } from "../tl/7_message_container.js";
 import { ClientAbstract } from "./client_abstract.js";
 import { ClientPlain } from "./client_plain.js";
 import { StorageMemory } from "../storage/storage_memory.js";
+import { parseHtml } from "../types/utilities/0_html.js";
 import { messageEntityToTlObject } from "../types/0_message_entity.js";
 import { replyKeyboardRemoveToTlObject } from "../types/0_reply_keyboard_remove.js";
 import { forceReplyToTlObject } from "../types/0_force_reply.js";
 import { replyKeyboardMarkupToTlObject } from "../types/2_reply_keyboard_markup.js";
 import { inlineKeyboardMarkupToTlObject } from "../types/2_inline_keyboard_markup.js";
 import { constructMessage } from "../types/3_message.js"; // high-level wrapper for Telegram API's message
-const d = debug("client");
-const dRecoverUpdateGap = debug("client_recoverUpdateGap");
-const dRecoverChannelUpdateGap = debug("client_recoverChannelUpdateGap");
+import { decryptMessage, encryptMessage, getMessageId } from "./utilities/0_message.js";
+import { checkPassword } from "./utilities/0_password.js";
+const d = debug("Client");
+const dGap = debug("Client/recoverUpdateGap");
+const dGapC = debug("Client/recoverChannelUpdateGap");
+const dAuth = debug("Client/authorize");
+const dRecv = debug("Client/receiveLoop");
 const UPDATE_GAP = Symbol();
 export const getEntity = Symbol();
 export const restartAuth = Symbol();
@@ -161,7 +163,7 @@ export class Client extends ClientAbstract {
                 if (body instanceof types.GZIPPacked) {
                     body = new TLReader(gunzip(body.packedData)).readObject();
                 }
-                d("received %s", body.constructor.name);
+                dRecv("received %s", body.constructor.name);
                 if (body instanceof types.Updates || body instanceof types.TypeUpdate) {
                     await this.processUpdates(body);
                 }
@@ -171,10 +173,10 @@ export class Client extends ClientAbstract {
                         result = new TLReader(gunzip(result.packedData)).readObject();
                     }
                     if (result instanceof types.RPCError) {
-                        d("RPCResult: %d %s", result.errorCode, result.errorMessage);
+                        dRecv("RPCResult: %d %s", result.errorCode, result.errorMessage);
                     }
                     else {
-                        d("RPCResult: %s", result.constructor.name);
+                        dRecv("RPCResult: %s", result.constructor.name);
                     }
                     if (result instanceof types.Updates || result instanceof types.TypeUpdate) {
                         await this.processUpdates(result);
@@ -324,7 +326,7 @@ export class Client extends ClientAbstract {
         if (!this.apiHash) {
             throw new Error("apiHash not set");
         }
-        d("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
+        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,
@@ -350,7 +352,7 @@ export class Client extends ClientAbstract {
                             const input = await checkPassword(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
                             await this.storage.setAccountType("user");
-                            d("authorized as user");
+                            dAuth("authorized as user");
                             break;
                         }
                         catch (err) {
@@ -386,7 +388,7 @@ export class Client extends ClientAbstract {
         try {
             if (params instanceof types.AuthExportedAuthorization) {
                 await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
-                d("authorization imported");
+                dAuth("authorization imported");
             }
             else if (typeof params == "object") {
                 while (true) {
@@ -402,7 +404,7 @@ export class Client extends ClientAbstract {
                                 phoneNumber,
                                 settings: new types.CodeSettings(),
                             }));
-                            d("verification code sent");
+                            dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
                                 while (true) {
                                     const phoneCode = typeof params.code === "string" ? params.code : await params.code();
@@ -414,7 +416,7 @@ export class Client extends ClientAbstract {
                                         else {
                                             signedIn = true;
                                             await this.storage.setAccountType("user");
-                                            d("authorized as user");
+                                            dAuth("authorized as user");
                                             break;
                                         }
                                     }
@@ -449,7 +451,7 @@ export class Client extends ClientAbstract {
             else {
                 await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
                 await this.storage.setAccountType("bot");
-                d("authorized as bot");
+                dAuth("authorized as bot");
             }
         }
         catch (err) {
@@ -511,7 +513,7 @@ export class Client extends ClientAbstract {
                 decrypted = await decryptMessage(buffer, this.auth.key, this.auth.id, this.sessionId);
             }
             catch (err) {
-                d("failed to decrypt message: %o", err);
+                dRecv("failed to decrypt message: %o", err);
                 continue;
             }
             const messages = decrypted instanceof MessageContainer ? decrypted.messages : [decrypted];
@@ -800,7 +802,7 @@ export class Client extends ClientAbstract {
         return localState;
     }
     async recoverUpdateGap(source) {
-        dRecoverUpdateGap("recovering from update gap [%s]", source);
+        dGap("recovering from update gap [%s]", source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             let state = await this.getLocalState();
@@ -816,7 +818,7 @@ export class Client extends ClientAbstract {
                         await this.applyUpdateNoGap(update);
                     }
                     if (difference instanceof types.UpdatesDifference) {
-                        dRecoverUpdateGap("recovered from update gap");
+                        dGap("recovered from update gap");
                         break;
                     }
                     else if (difference instanceof types.UpdatesDifferenceSlice) {
@@ -829,11 +831,11 @@ export class Client extends ClientAbstract {
                 else if (difference instanceof types.UpdatesDifferenceTooLong) {
                     // stored messages should be invalidated in case we store messages in the future
                     state.pts = difference.pts;
-                    dRecoverUpdateGap("received differenceTooLong");
+                    dGap("received differenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesDifferenceEmpty) {
                     await this.setUpdateStateDate(difference.date);
-                    dRecoverUpdateGap("there was no update gap");
+                    dGap("there was no update gap");
                     break;
                 }
                 else {
@@ -846,7 +848,7 @@ export class Client extends ClientAbstract {
         }
     }
     async recoverChannelUpdateGap(channelId, source) {
-        dRecoverChannelUpdateGap("recovering channel update gap [%o, %s]", channelId, source);
+        dGapC("recovering channel update gap [%o, %s]", channelId, source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             const pts_ = await this.storage.getChannelPts(channelId);
@@ -869,12 +871,12 @@ export class Client extends ClientAbstract {
                         await this.applyUpdateNoGap(update, false);
                     }
                     await this.storage.setChannelPts(channelId, difference.pts);
-                    dRecoverChannelUpdateGap("recovered from update gap");
+                    dGapC("recovered from update gap [%o, %s]", channelId, source);
                     break;
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceTooLong) {
                     // invalidate messages
-                    dRecoverChannelUpdateGap("received channelDifferenceTooLong");
+                    dGapC("received channelDifferenceTooLong");
                     await this.processChats(difference.chats);
                     await this.processUsers(difference.users);
                     for (const message of difference.messages) {
@@ -887,10 +889,10 @@ export class Client extends ClientAbstract {
                     else {
                         UNREACHABLE();
                     }
-                    dRecoverChannelUpdateGap("processed channelDifferenceTooLong");
+                    dGapC("processed channelDifferenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceEmpty) {
-                    dRecoverChannelUpdateGap("there was no update gap");
+                    dGapC("there was no update gap");
                     break;
                 }
             }
@@ -1070,10 +1072,10 @@ export class Client extends ClientAbstract {
         if (result instanceof types.Updates) {
             for (const update of result.updates) {
                 if (update instanceof types.UpdateNewMessage) {
-                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this));
+                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this));
                 }
                 else if (update instanceof types.UpdateNewChannelMessage) {
-                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this));
+                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this));
                 }
             }
         }
@@ -1092,7 +1094,7 @@ export class Client extends ClientAbstract {
             messages_ = await this.invoke(new functions.ChannelsGetMessages({
                 channel: new types.InputChannel({ channelId: peer.channelId, accessHash: peer.accessHash }),
                 id: messageIds.map((v) => new types.InputMessageID({ id: v })),
-            })).then((v) => v[as](types.MessagesMessages));
+            })).then((v) => v[as](types.MessagesChannelMessages));
         }
         else {
             messages_ = await this.invoke(new functions.MessagesGetMessages({
@@ -1101,7 +1103,7 @@ export class Client extends ClientAbstract {
         }
         const messages = new Array();
         for (const message_ of messages_.messages) {
-            messages.push(await constructMessage(message_[as](types.Message), this[getEntity].bind(this)));
+            messages.push(await constructMessage(message_[as](types.Message), this[getEntity].bind(this), null));
         }
         return messages;
     }

package/esm/client/client_plain.js

@@ -6,12 +6,12 @@ import { UNREACHABLE } from "../utilities/0_control.js";
 import { sha1 } from "../utilities/0_hash.js";
 import { rsaPad } from "../utilities/1_auth.js";
 import { serialize } from "../tl/1_tl_object.js";
-import { packUnencryptedMessage, unpackUnencryptedMessage } from "../utilities/1_message.js";
 import { ClientDHInnerData, DHGenOK, PQInnerDataDC, ResPQ, ServerDHInnerData, ServerDHParamsOK } from "../tl/2_types.js";
 import { ReqDHParams, ReqPQMulti, SetClientDHParams } from "../tl/3_functions.js";
 import { TLReader } from "../tl/3_tl_reader.js";
 import { ClientAbstract } from "./client_abstract.js";
-const d = debug("auth_key_creation");
+import { packUnencryptedMessage, unpackUnencryptedMessage } from "./utilities/0_message.js";
+const d = debug("ClientPlain/createAuthKey");
 export class ClientPlain extends ClientAbstract {
     async invoke(function_) {
         await this.transport.send(packUnencryptedMessage(function_[serialize]()));

package/{script/utilities/1_message.d.ts → esm/client/utilities/0_message.d.ts}

@@ -1,5 +1,5 @@
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
+import { Message } from "../../tl/6_message.js";
+import { MessageContainer } from "../../tl/7_message_container.js";
 export declare function getMessageId(): bigint;
 export declare function packUnencryptedMessage(data: Uint8Array): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {

package/esm/{utilities/1_message.js → client/utilities/0_message.js}

@@ -1,13 +1,13 @@
-import { assertEquals, ige256Decrypt, ige256Encrypt } from "../deps.js";
-import { TLRawReader } from "../tl/0_tl_raw_reader.js";
-import { TLRawWriter } from "../tl/0_tl_raw_writer.js";
-import { id, serialize } from "../tl/1_tl_object.js";
-import { TLReader } from "../tl/3_tl_reader.js";
-import { RPCResult } from "../tl/5_rpc_result.js";
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
-import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { sha256 } from "./0_hash.js";
+import { assertEquals, ige256Decrypt, ige256Encrypt } from "../../deps.js";
+import { TLRawReader } from "../../tl/0_tl_raw_reader.js";
+import { TLRawWriter } from "../../tl/0_tl_raw_writer.js";
+import { id, serialize } from "../../tl/1_tl_object.js";
+import { TLReader } from "../../tl/3_tl_reader.js";
+import { RPCResult } from "../../tl/5_rpc_result.js";
+import { Message } from "../../tl/6_message.js";
+import { MessageContainer } from "../../tl/7_message_container.js";
+import { bufferFromBigInt, concat } from "../../utilities/0_buffer.js";
+import { sha256 } from "../../utilities/0_hash.js";
 let lastMsgId = 0n;
 export function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;

package/esm/{utilities/1_password.d.ts → client/utilities/0_password.d.ts}

@@ -1,5 +1,5 @@
-import * as types from "../tl/2_types.js";
-import { sha256 } from "./0_hash.js";
+import * as types from "../../tl/2_types.js";
+import { sha256 } from "../../utilities/0_hash.js";
 export declare function isSafePrime(primeBytes: Uint8Array, g: number): boolean;
 export declare const h: typeof sha256;
 export declare const sh: (data: Uint8Array, salt: Uint8Array) => Promise<Uint8Array>;

package/esm/{utilities/1_password.js → client/utilities/0_password.js}

@@ -1,8 +1,8 @@
-import * as dntShim from "../_dnt.shims.js";
-import * as types from "../tl/2_types.js";
-import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { sha256 } from "./0_hash.js";
-import { bigIntFromBuffer, getRandomBigInt, mod, modExp } from "./0_bigint.js";
+import * as dntShim from "../../_dnt.shims.js";
+import * as types from "../../tl/2_types.js";
+import { bufferFromBigInt, concat } from "../../utilities/0_buffer.js";
+import { sha256 } from "../../utilities/0_hash.js";
+import { bigIntFromBuffer, getRandomBigInt, mod, modExp } from "../../utilities/0_bigint.js";
 export function isSafePrime(primeBytes, g) {
     // deno-fmt-ignore
     const goodPrime = new Uint8Array([

package/esm/connection/connection_web_socket.js

@@ -1,5 +1,6 @@
 import * as dntShim from "../_dnt.shims.js";
-import { Mutex } from "../deps.js";
+import { debug, Mutex } from "../deps.js";
+const d = debug("ConnectionWebSocket");
 export class ConnectionWebSocket {
     constructor(url) {
         Object.defineProperty(this, "webSocket", {
@@ -44,7 +45,9 @@ export class ConnectionWebSocket {
                 this.nextResolve = null;
             }
         };
-        this.webSocket.onerror = console.error;
+        this.webSocket.onerror = (err) => {
+            d("WebSocket error: %O", err);
+        };
     }
     get connected() {
         return this.webSocket.readyState == dntShim.WebSocket.OPEN;

package/esm/constants.d.ts

@@ -4,7 +4,7 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const DEFAULT_INITIAL_DC: DC;
 export declare const LAYER = 158;
-export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.903";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/esm/constants.js

@@ -62,7 +62,7 @@ export const publicKeys = new Map([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const DEFAULT_INITIAL_DC = "2-test";
 export const LAYER = 158;
-export const DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+export const DEFAULT_APP_VERSION = "MTKruto 0.0.903";
 // @ts-ignore: lib
 export const DEFAULT_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 DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/esm/deps.js

@@ -4,6 +4,6 @@ export { gunzip, gzip } from "./deps/raw.githubusercontent.com/MTKruto/compress/
 export { Mutex } from "async-mutex";
 export { Parser } from "./deps/deno.land/x/html_parser@v0.1.3/src/mod.js";
 import { debug as debug_ } from "./deps/raw.githubusercontent.com/MTKruto/debug/master/mod.js";
-export const debug = (v) => debug_(`mtkruto__${v}`);
+export const debug = (v) => debug_(`mtkruto/${v}`);
 export { queue } from "./deps/deno.land/x/q@v0.0.1/mod.js";
 export { decode as base64Decode, encode as base64Encode } from "./deps/deno.land/std@0.190.0/encoding/base64.js";

package/esm/mod.d.ts

@@ -1,5 +1,5 @@
-import { checkPassword } from "./utilities/1_password.js";
 import { getRandomId } from "./utilities/0_bigint.js";
+import { checkPassword } from "./client/utilities/0_password.js";
 export declare const utils: {
     checkPassword: typeof checkPassword;
     getRandomId: typeof getRandomId;

package/esm/mod.js

@@ -1,5 +1,5 @@
-import { checkPassword } from "./utilities/1_password.js";
 import { getRandomId } from "./utilities/0_bigint.js";
+import { checkPassword } from "./client/utilities/0_password.js";
 export const utils = { checkPassword, getRandomId };
 export { as } from "./tl/1_tl_object.js";
 export * as types from "./tl/2_types.js";

package/esm/transport/transport_abridged.js

@@ -1,5 +1,5 @@
 import { bufferFromBigInt, concat } from "../utilities/0_buffer.js";
-import { getObfuscationParameters } from "../utilities/1_obfuscation.js";
+import { getObfuscationParameters } from "./utilities/0_obfuscation.js";
 import { Transport } from "./transport.js";
 export class TransportAbridged extends Transport {
     constructor(connection, obfuscated = false) {

package/esm/transport/transport_intermediate.js

@@ -1,5 +1,5 @@
 import { bufferFromBigInt, concat } from "../utilities/0_buffer.js";
-import { getObfuscationParameters } from "../utilities/1_obfuscation.js";
+import { getObfuscationParameters } from "./utilities/0_obfuscation.js";
 import { Transport } from "./transport.js";
 export class TransportIntermediate extends Transport {
     constructor(connection, obfuscated = false) {

package/esm/{utilities/1_obfuscation.d.ts → transport/utilities/0_obfuscation.d.ts}

@@ -1,5 +1,5 @@
-import { Connection } from "../connection/connection.js";
-import { CTR } from "./0_crypto.js";
+import { CTR } from "../../utilities/0_crypto.js";
+import { Connection } from "../../connection/connection.js";
 export declare function getObfuscationParameters(protocol: number, connection: Connection): Promise<{
     encryptionCTR: CTR;
     decryptionCTR: CTR;

package/esm/{utilities/1_obfuscation.js → transport/utilities/0_obfuscation.js}

@@ -1,6 +1,6 @@
-import * as dntShim from "../_dnt.shims.js";
-import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { CTR } from "./0_crypto.js";
+import * as dntShim from "../../_dnt.shims.js";
+import { bufferFromBigInt, concat } from "../../utilities/0_buffer.js";
+import { CTR } from "../../utilities/0_crypto.js";
 export async function getObfuscationParameters(protocol, connection) {
     const dc = 0xFCFF;
     let init;

package/esm/types/3_message.d.ts

@@ -1,3 +1,4 @@
+import { MaybePromise } from "../utilities/0_types.js";
 import * as types from "../tl/2_types.js";
 import { ForceReply } from "./0_force_reply.js";
 import { MessageEntity } from "./0_message_entity.js";
@@ -18,9 +19,12 @@ export interface Message {
     editDate?: Date;
     views?: number;
     replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
+    replyToMessage?: Omit<Message, "replyToMessage">;
 }
 export declare function constructMessage(message_: types.Message, getEntity: {
-    (peer: types.PeerUser): Promise<types.User | null>;
-    (peer: types.PeerChat): Promise<types.Chat | null>;
-    (peer: types.PeerChannel): Promise<types.Channel | null>;
-}): Promise<Message>;
+    (peer: types.PeerUser): MaybePromise<types.User | null>;
+    (peer: types.PeerChat): MaybePromise<types.Chat | null>;
+    (peer: types.PeerChannel): MaybePromise<types.Channel | null>;
+}, getMessage: {
+    (chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
+} | null): Promise<Message>;

package/esm/types/3_message.js

@@ -1,3 +1,4 @@
+import { debug } from "../deps.js";
 import { UNREACHABLE } from "../utilities/0_control.js";
 import { cleanObject } from "../utilities/0_object.js";
 import * as types from "../tl/2_types.js";
@@ -8,7 +9,8 @@ import { constructChat } from "./1_chat.js";
 import { constructUser } from "./1_user.js";
 import { constructInlineKeyboardMarkup } from "./2_inline_keyboard_markup.js";
 import { constructReplyKeyboardMarkup } from "./2_reply_keyboard_markup.js";
-export async function constructMessage(message_, getEntity) {
+const d = debug("types/Message");
+export async function constructMessage(message_, getEntity, getMessage) {
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -87,5 +89,14 @@ export async function constructMessage(message_, getEntity) {
             UNREACHABLE();
         }
     }
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+        const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
+        if (replyToMessage) {
+            message.replyToMessage = replyToMessage;
+        }
+        else {
+            d("couldn't get replied message");
+        }
+    }
     return cleanObject(message);
 }

package/esm/{utilities → types/utilities}/0_html.d.ts

@@ -1,2 +1,2 @@
-import { MessageEntity } from "../types/0_message_entity.js";
+import { MessageEntity } from "../0_message_entity.js";
 export declare function parseHtml(html: string): readonly [string, MessageEntity[]];

package/esm/{utilities → types/utilities}/0_html.js

@@ -1,5 +1,5 @@
-import { Parser } from "../deps.js";
-import { MessageEntityType } from "../types/0_message_entity.js";
+import { Parser } from "../../deps.js";
+import { MessageEntityType } from "../0_message_entity.js";
 export function parseHtml(html) {
     let text = "";
     const entities = new Array();

package/package.json

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

package/script/client/client.d.ts

@@ -159,7 +159,7 @@ export declare class Client extends ClientAbstract {
         messageThreadId?: number;
         sendAs?: number | string;
         replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
-    }): Promise<Message>;
-    getMessages(chatId: number | string, messageIds: number[]): Promise<Message[]>;
-    getMessage(chatId: number | string, messageId: number): Promise<Message | null>;
+    }): Promise<Omit<Message, "replyToMessage">>;
+    getMessages(chatId: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
 }

package/script/client/client.js

@@ -29,9 +29,6 @@ const constants_js_1 = require("../constants.js");
 const _0_bigint_js_1 = require("../utilities/0_bigint.js");
 const _0_control_js_1 = require("../utilities/0_control.js");
 const _0_hash_js_1 = require("../utilities/0_hash.js");
-const _0_html_js_1 = require("../utilities/0_html.js");
-const _1_message_js_1 = require("../utilities/1_message.js");
-const _1_password_js_1 = require("../utilities/1_password.js");
 const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
 const types = __importStar(require("../tl/2_types.js"));
 const functions = __importStar(require("../tl/3_functions.js"));
@@ -42,15 +39,20 @@ const _7_message_container_js_1 = require("../tl/7_message_container.js");
 const client_abstract_js_1 = require("./client_abstract.js");
 const client_plain_js_1 = require("./client_plain.js");
 const storage_memory_js_1 = require("../storage/storage_memory.js");
+const _0_html_js_1 = require("../types/utilities/0_html.js");
 const _0_message_entity_js_1 = require("../types/0_message_entity.js");
 const _0_reply_keyboard_remove_js_1 = require("../types/0_reply_keyboard_remove.js");
 const _0_force_reply_js_1 = require("../types/0_force_reply.js");
 const _2_reply_keyboard_markup_js_1 = require("../types/2_reply_keyboard_markup.js");
 const _2_inline_keyboard_markup_js_1 = require("../types/2_inline_keyboard_markup.js");
 const _3_message_js_1 = require("../types/3_message.js"); // high-level wrapper for Telegram API's message
-const d = (0, deps_js_1.debug)("client");
-const dRecoverUpdateGap = (0, deps_js_1.debug)("client_recoverUpdateGap");
-const dRecoverChannelUpdateGap = (0, deps_js_1.debug)("client_recoverChannelUpdateGap");
+const _0_message_js_1 = require("./utilities/0_message.js");
+const _0_password_js_1 = require("./utilities/0_password.js");
+const d = (0, deps_js_1.debug)("Client");
+const dGap = (0, deps_js_1.debug)("Client/recoverUpdateGap");
+const dGapC = (0, deps_js_1.debug)("Client/recoverChannelUpdateGap");
+const dAuth = (0, deps_js_1.debug)("Client/authorize");
+const dRecv = (0, deps_js_1.debug)("Client/receiveLoop");
 const UPDATE_GAP = Symbol();
 exports.getEntity = Symbol();
 exports.restartAuth = Symbol();
@@ -187,7 +189,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                 if (body instanceof types.GZIPPacked) {
                     body = new _3_tl_reader_js_1.TLReader((0, deps_js_1.gunzip)(body.packedData)).readObject();
                 }
-                d("received %s", body.constructor.name);
+                dRecv("received %s", body.constructor.name);
                 if (body instanceof types.Updates || body instanceof types.TypeUpdate) {
                     await this.processUpdates(body);
                 }
@@ -197,10 +199,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         result = new _3_tl_reader_js_1.TLReader((0, deps_js_1.gunzip)(result.packedData)).readObject();
                     }
                     if (result instanceof types.RPCError) {
-                        d("RPCResult: %d %s", result.errorCode, result.errorMessage);
+                        dRecv("RPCResult: %d %s", result.errorCode, result.errorMessage);
                     }
                     else {
-                        d("RPCResult: %s", result.constructor.name);
+                        dRecv("RPCResult: %s", result.constructor.name);
                     }
                     if (result instanceof types.Updates || result instanceof types.TypeUpdate) {
                         await this.processUpdates(result);
@@ -350,7 +352,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (!this.apiHash) {
             throw new Error("apiHash not set");
         }
-        d("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
+        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,
@@ -373,10 +375,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
                     if (ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow) {
                         try {
                             const password = typeof params.password === "string" ? params.password : await params.password();
-                            const input = await (0, _1_password_js_1.checkPassword)(password, ap);
+                            const input = await (0, _0_password_js_1.checkPassword)(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
                             await this.storage.setAccountType("user");
-                            d("authorized as user");
+                            dAuth("authorized as user");
                             break;
                         }
                         catch (err) {
@@ -412,7 +414,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         try {
             if (params instanceof types.AuthExportedAuthorization) {
                 await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
-                d("authorization imported");
+                dAuth("authorization imported");
             }
             else if (typeof params == "object") {
                 while (true) {
@@ -428,7 +430,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                                 phoneNumber,
                                 settings: new types.CodeSettings(),
                             }));
-                            d("verification code sent");
+                            dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
                                 while (true) {
                                     const phoneCode = typeof params.code === "string" ? params.code : await params.code();
@@ -440,7 +442,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                                         else {
                                             signedIn = true;
                                             await this.storage.setAccountType("user");
-                                            d("authorized as user");
+                                            dAuth("authorized as user");
                                             break;
                                         }
                                     }
@@ -475,7 +477,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             else {
                 await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
                 await this.storage.setAccountType("bot");
-                d("authorized as bot");
+                dAuth("authorized as bot");
             }
         }
         catch (err) {
@@ -534,10 +536,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
             }
             let decrypted;
             try {
-                decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.auth.key, this.auth.id, this.sessionId);
+                decrypted = await (0, _0_message_js_1.decryptMessage)(buffer, this.auth.key, this.auth.id, this.sessionId);
             }
             catch (err) {
-                d("failed to decrypt message: %o", err);
+                dRecv("failed to decrypt message: %o", err);
                 continue;
             }
             const messages = decrypted instanceof _7_message_container_js_1.MessageContainer ? decrypted.messages : [decrypted];
@@ -566,8 +568,8 @@ class Client extends client_abstract_js_1.ClientAbstract {
             seqNo++;
             this.state.seqNo++;
         }
-        const message = new _6_message_js_1.Message((0, _1_message_js_1.getMessageId)(), seqNo, function_);
-        await this.transport.send(await (0, _1_message_js_1.encryptMessage)(message, this.auth.key, this.auth.id, this.state.salt, this.sessionId));
+        const message = new _6_message_js_1.Message((0, _0_message_js_1.getMessageId)(), seqNo, function_);
+        await this.transport.send(await (0, _0_message_js_1.encryptMessage)(message, this.auth.key, this.auth.id, this.state.salt, this.sessionId));
         d("invoked %s", function_.constructor.name);
         if (noWait) {
             return;
@@ -826,7 +828,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         return localState;
     }
     async recoverUpdateGap(source) {
-        dRecoverUpdateGap("recovering from update gap [%s]", source);
+        dGap("recovering from update gap [%s]", source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             let state = await this.getLocalState();
@@ -842,7 +844,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         await this.applyUpdateNoGap(update);
                     }
                     if (difference instanceof types.UpdatesDifference) {
-                        dRecoverUpdateGap("recovered from update gap");
+                        dGap("recovered from update gap");
                         break;
                     }
                     else if (difference instanceof types.UpdatesDifferenceSlice) {
@@ -855,11 +857,11 @@ class Client extends client_abstract_js_1.ClientAbstract {
                 else if (difference instanceof types.UpdatesDifferenceTooLong) {
                     // stored messages should be invalidated in case we store messages in the future
                     state.pts = difference.pts;
-                    dRecoverUpdateGap("received differenceTooLong");
+                    dGap("received differenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesDifferenceEmpty) {
                     await this.setUpdateStateDate(difference.date);
-                    dRecoverUpdateGap("there was no update gap");
+                    dGap("there was no update gap");
                     break;
                 }
                 else {
@@ -872,7 +874,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
     }
     async recoverChannelUpdateGap(channelId, source) {
-        dRecoverChannelUpdateGap("recovering channel update gap [%o, %s]", channelId, source);
+        dGapC("recovering channel update gap [%o, %s]", channelId, source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             const pts_ = await this.storage.getChannelPts(channelId);
@@ -895,12 +897,12 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         await this.applyUpdateNoGap(update, false);
                     }
                     await this.storage.setChannelPts(channelId, difference.pts);
-                    dRecoverChannelUpdateGap("recovered from update gap");
+                    dGapC("recovered from update gap [%o, %s]", channelId, source);
                     break;
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceTooLong) {
                     // invalidate messages
-                    dRecoverChannelUpdateGap("received channelDifferenceTooLong");
+                    dGapC("received channelDifferenceTooLong");
                     await this.processChats(difference.chats);
                     await this.processUsers(difference.users);
                     for (const message of difference.messages) {
@@ -913,10 +915,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
                     else {
                         (0, _0_control_js_1.UNREACHABLE)();
                     }
-                    dRecoverChannelUpdateGap("processed channelDifferenceTooLong");
+                    dGapC("processed channelDifferenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceEmpty) {
-                    dRecoverChannelUpdateGap("there was no update gap");
+                    dGapC("there was no update gap");
                     break;
                 }
             }
@@ -1096,10 +1098,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (result instanceof types.Updates) {
             for (const update of result.updates) {
                 if (update instanceof types.UpdateNewMessage) {
-                    return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this));
+                    return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), this.getMessage.bind(this));
                 }
                 else if (update instanceof types.UpdateNewChannelMessage) {
-                    return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this));
+                    return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), this.getMessage.bind(this));
                 }
             }
         }
@@ -1118,7 +1120,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             messages_ = await this.invoke(new functions.ChannelsGetMessages({
                 channel: new types.InputChannel({ channelId: peer.channelId, accessHash: peer.accessHash }),
                 id: messageIds.map((v) => new types.InputMessageID({ id: v })),
-            })).then((v) => v[_1_tl_object_js_1.as](types.MessagesMessages));
+            })).then((v) => v[_1_tl_object_js_1.as](types.MessagesChannelMessages));
         }
         else {
             messages_ = await this.invoke(new functions.MessagesGetMessages({
@@ -1127,7 +1129,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
         const messages = new Array();
         for (const message_ of messages_.messages) {
-            messages.push(await (0, _3_message_js_1.constructMessage)(message_[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this)));
+            messages.push(await (0, _3_message_js_1.constructMessage)(message_[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), null));
         }
         return messages;
     }

package/script/client/client_plain.js

@@ -9,15 +9,15 @@ const _0_control_js_1 = require("../utilities/0_control.js");
 const _0_hash_js_1 = require("../utilities/0_hash.js");
 const _1_auth_js_1 = require("../utilities/1_auth.js");
 const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
-const _1_message_js_1 = require("../utilities/1_message.js");
 const _2_types_js_1 = require("../tl/2_types.js");
 const _3_functions_js_1 = require("../tl/3_functions.js");
 const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
 const client_abstract_js_1 = require("./client_abstract.js");
-const d = (0, deps_js_1.debug)("auth_key_creation");
+const _0_message_js_1 = require("./utilities/0_message.js");
+const d = (0, deps_js_1.debug)("ClientPlain/createAuthKey");
 class ClientPlain extends client_abstract_js_1.ClientAbstract {
     async invoke(function_) {
-        await this.transport.send((0, _1_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize]()));
+        await this.transport.send((0, _0_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize]()));
         const buffer = await this.transport.receive();
         if (buffer.length == 4) {
             const int = (0, _0_bigint_js_1.bigIntFromBuffer)(buffer, true, true);
@@ -25,7 +25,7 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
                 throw new Error("-404");
             }
         }
-        const { message } = (0, _1_message_js_1.unpackUnencryptedMessage)(buffer);
+        const { message } = (0, _0_message_js_1.unpackUnencryptedMessage)(buffer);
         const reader = new _3_tl_reader_js_1.TLReader(message);
         return reader.readObject();
     }

package/{esm/utilities/1_message.d.ts → script/client/utilities/0_message.d.ts}

@@ -1,5 +1,5 @@
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
+import { Message } from "../../tl/6_message.js";
+import { MessageContainer } from "../../tl/7_message_container.js";
 export declare function getMessageId(): bigint;
 export declare function packUnencryptedMessage(data: Uint8Array): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {

package/script/{utilities/1_message.js → client/utilities/0_message.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decryptMessage = exports.encryptMessage = exports.unpackUnencryptedMessage = exports.packUnencryptedMessage = exports.getMessageId = void 0;
-const deps_js_1 = require("../deps.js");
-const _0_tl_raw_reader_js_1 = require("../tl/0_tl_raw_reader.js");
-const _0_tl_raw_writer_js_1 = require("../tl/0_tl_raw_writer.js");
-const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
-const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
-const _5_rpc_result_js_1 = require("../tl/5_rpc_result.js");
-const _6_message_js_1 = require("../tl/6_message.js");
-const _7_message_container_js_1 = require("../tl/7_message_container.js");
-const _0_buffer_js_1 = require("./0_buffer.js");
-const _0_hash_js_1 = require("./0_hash.js");
+const deps_js_1 = require("../../deps.js");
+const _0_tl_raw_reader_js_1 = require("../../tl/0_tl_raw_reader.js");
+const _0_tl_raw_writer_js_1 = require("../../tl/0_tl_raw_writer.js");
+const _1_tl_object_js_1 = require("../../tl/1_tl_object.js");
+const _3_tl_reader_js_1 = require("../../tl/3_tl_reader.js");
+const _5_rpc_result_js_1 = require("../../tl/5_rpc_result.js");
+const _6_message_js_1 = require("../../tl/6_message.js");
+const _7_message_container_js_1 = require("../../tl/7_message_container.js");
+const _0_buffer_js_1 = require("../../utilities/0_buffer.js");
+const _0_hash_js_1 = require("../../utilities/0_hash.js");
 let lastMsgId = 0n;
 function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;

package/script/{utilities/1_password.d.ts → client/utilities/0_password.d.ts}

@@ -1,5 +1,5 @@
-import * as types from "../tl/2_types.js";
-import { sha256 } from "./0_hash.js";
+import * as types from "../../tl/2_types.js";
+import { sha256 } from "../../utilities/0_hash.js";
 export declare function isSafePrime(primeBytes: Uint8Array, g: number): boolean;
 export declare const h: typeof sha256;
 export declare const sh: (data: Uint8Array, salt: Uint8Array) => Promise<Uint8Array>;

package/script/{utilities/1_password.js → client/utilities/0_password.js}

@@ -24,11 +24,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPassword = exports.pad = exports.isGoodModExpFirst = exports.ph2 = exports.pbkdf2 = exports.ph1 = exports.sh = exports.h = exports.isSafePrime = void 0;
-const dntShim = __importStar(require("../_dnt.shims.js"));
-const types = __importStar(require("../tl/2_types.js"));
-const _0_buffer_js_1 = require("./0_buffer.js");
-const _0_hash_js_1 = require("./0_hash.js");
-const _0_bigint_js_1 = require("./0_bigint.js");
+const dntShim = __importStar(require("../../_dnt.shims.js"));
+const types = __importStar(require("../../tl/2_types.js"));
+const _0_buffer_js_1 = require("../../utilities/0_buffer.js");
+const _0_hash_js_1 = require("../../utilities/0_hash.js");
+const _0_bigint_js_1 = require("../../utilities/0_bigint.js");
 function isSafePrime(primeBytes, g) {
     // deno-fmt-ignore
     const goodPrime = new Uint8Array([

package/script/connection/connection_web_socket.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionWebSocket = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const deps_js_1 = require("../deps.js");
+const d = (0, deps_js_1.debug)("ConnectionWebSocket");
 class ConnectionWebSocket {
     constructor(url) {
         Object.defineProperty(this, "webSocket", {
@@ -70,7 +71,9 @@ class ConnectionWebSocket {
                 this.nextResolve = null;
             }
         };
-        this.webSocket.onerror = console.error;
+        this.webSocket.onerror = (err) => {
+            d("WebSocket error: %O", err);
+        };
     }
     get connected() {
         return this.webSocket.readyState == dntShim.WebSocket.OPEN;

package/script/constants.d.ts

@@ -4,7 +4,7 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const DEFAULT_INITIAL_DC: DC;
 export declare const LAYER = 158;
-export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.903";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/script/constants.js

@@ -88,7 +88,7 @@ exports.publicKeys = new Map([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.DEFAULT_INITIAL_DC = "2-test";
 exports.LAYER = 158;
-exports.DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+exports.DEFAULT_APP_VERSION = "MTKruto 0.0.903";
 // @ts-ignore: lib
 exports.DEFAULT_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.DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/script/deps.js

@@ -31,7 +31,7 @@ Object.defineProperty(exports, "Mutex", { enumerable: true, get: function () { r
 var mod_js_2 = require("./deps/deno.land/x/html_parser@v0.1.3/src/mod.js");
 Object.defineProperty(exports, "Parser", { enumerable: true, get: function () { return mod_js_2.Parser; } });
 const mod_js_3 = require("./deps/raw.githubusercontent.com/MTKruto/debug/master/mod.js");
-const debug = (v) => (0, mod_js_3.debug)(`mtkruto__${v}`);
+const debug = (v) => (0, mod_js_3.debug)(`mtkruto/${v}`);
 exports.debug = debug;
 var mod_js_4 = require("./deps/deno.land/x/q@v0.0.1/mod.js");
 Object.defineProperty(exports, "queue", { enumerable: true, get: function () { return mod_js_4.queue; } });

package/script/mod.d.ts

@@ -1,5 +1,5 @@
-import { checkPassword } from "./utilities/1_password.js";
 import { getRandomId } from "./utilities/0_bigint.js";
+import { checkPassword } from "./client/utilities/0_password.js";
 export declare const utils: {
     checkPassword: typeof checkPassword;
     getRandomId: typeof getRandomId;

package/script/mod.js

@@ -27,9 +27,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LAYER = exports.DEFAULT_SYSTEM_VERSION = exports.DEFAULT_SYSTEM_LANG_CODE = exports.DEFAULT_LANG_PACK = exports.DEFAULT_LANG_CODE = exports.DEFAULT_INITIAL_DC = exports.DEFAULT_DEVICE_MODEL = exports.DEFAULT_APP_VERSION = exports.functions = exports.types = exports.as = exports.utils = void 0;
-const _1_password_js_1 = require("./utilities/1_password.js");
 const _0_bigint_js_1 = require("./utilities/0_bigint.js");
-exports.utils = { checkPassword: _1_password_js_1.checkPassword, getRandomId: _0_bigint_js_1.getRandomId };
+const _0_password_js_1 = require("./client/utilities/0_password.js");
+exports.utils = { checkPassword: _0_password_js_1.checkPassword, getRandomId: _0_bigint_js_1.getRandomId };
 var _1_tl_object_js_1 = require("./tl/1_tl_object.js");
 Object.defineProperty(exports, "as", { enumerable: true, get: function () { return _1_tl_object_js_1.as; } });
 exports.types = __importStar(require("./tl/2_types.js"));

package/script/transport/transport_abridged.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransportAbridged = void 0;
 const _0_buffer_js_1 = require("../utilities/0_buffer.js");
-const _1_obfuscation_js_1 = require("../utilities/1_obfuscation.js");
+const _0_obfuscation_js_1 = require("./utilities/0_obfuscation.js");
 const transport_js_1 = require("./transport.js");
 class TransportAbridged extends transport_js_1.Transport {
     constructor(connection, obfuscated = false) {
@@ -23,7 +23,7 @@ class TransportAbridged extends transport_js_1.Transport {
     async initialize() {
         if (!this.initialized) {
             if (this.obfuscated) {
-                this.obfuscationParameters = await (0, _1_obfuscation_js_1.getObfuscationParameters)(0xEFEFEFEF, this.connection);
+                this.obfuscationParameters = await (0, _0_obfuscation_js_1.getObfuscationParameters)(0xEFEFEFEF, this.connection);
             }
             else {
                 await this.connection.write(new Uint8Array([0xEF]));

package/script/transport/transport_intermediate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransportIntermediate = void 0;
 const _0_buffer_js_1 = require("../utilities/0_buffer.js");
-const _1_obfuscation_js_1 = require("../utilities/1_obfuscation.js");
+const _0_obfuscation_js_1 = require("./utilities/0_obfuscation.js");
 const transport_js_1 = require("./transport.js");
 class TransportIntermediate extends transport_js_1.Transport {
     constructor(connection, obfuscated = false) {
@@ -23,7 +23,7 @@ class TransportIntermediate extends transport_js_1.Transport {
     async initialize() {
         if (!this.initialized) {
             if (this.obfuscated) {
-                this.obfuscationParameters = await (0, _1_obfuscation_js_1.getObfuscationParameters)(0xEEEEEEEE, this.connection);
+                this.obfuscationParameters = await (0, _0_obfuscation_js_1.getObfuscationParameters)(0xEEEEEEEE, this.connection);
             }
             else {
                 await this.connection.write(new Uint8Array([0xEE, 0xEE, 0xEE, 0xEE]));

package/script/{utilities/1_obfuscation.d.ts → transport/utilities/0_obfuscation.d.ts}

@@ -1,5 +1,5 @@
-import { Connection } from "../connection/connection.js";
-import { CTR } from "./0_crypto.js";
+import { CTR } from "../../utilities/0_crypto.js";
+import { Connection } from "../../connection/connection.js";
 export declare function getObfuscationParameters(protocol: number, connection: Connection): Promise<{
     encryptionCTR: CTR;
     decryptionCTR: CTR;

package/script/{utilities/1_obfuscation.js → transport/utilities/0_obfuscation.js}

@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObfuscationParameters = void 0;
-const dntShim = __importStar(require("../_dnt.shims.js"));
-const _0_buffer_js_1 = require("./0_buffer.js");
-const _0_crypto_js_1 = require("./0_crypto.js");
+const dntShim = __importStar(require("../../_dnt.shims.js"));
+const _0_buffer_js_1 = require("../../utilities/0_buffer.js");
+const _0_crypto_js_1 = require("../../utilities/0_crypto.js");
 async function getObfuscationParameters(protocol, connection) {
     const dc = 0xFCFF;
     let init;

package/script/types/3_message.d.ts

@@ -1,3 +1,4 @@
+import { MaybePromise } from "../utilities/0_types.js";
 import * as types from "../tl/2_types.js";
 import { ForceReply } from "./0_force_reply.js";
 import { MessageEntity } from "./0_message_entity.js";
@@ -18,9 +19,12 @@ export interface Message {
     editDate?: Date;
     views?: number;
     replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
+    replyToMessage?: Omit<Message, "replyToMessage">;
 }
 export declare function constructMessage(message_: types.Message, getEntity: {
-    (peer: types.PeerUser): Promise<types.User | null>;
-    (peer: types.PeerChat): Promise<types.Chat | null>;
-    (peer: types.PeerChannel): Promise<types.Channel | null>;
-}): Promise<Message>;
+    (peer: types.PeerUser): MaybePromise<types.User | null>;
+    (peer: types.PeerChat): MaybePromise<types.Chat | null>;
+    (peer: types.PeerChannel): MaybePromise<types.Channel | null>;
+}, getMessage: {
+    (chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
+} | null): Promise<Message>;

package/script/types/3_message.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructMessage = void 0;
+const deps_js_1 = require("../deps.js");
 const _0_control_js_1 = require("../utilities/0_control.js");
 const _0_object_js_1 = require("../utilities/0_object.js");
 const types = __importStar(require("../tl/2_types.js"));
@@ -34,7 +35,8 @@ const _1_chat_js_1 = require("./1_chat.js");
 const _1_user_js_1 = require("./1_user.js");
 const _2_inline_keyboard_markup_js_1 = require("./2_inline_keyboard_markup.js");
 const _2_reply_keyboard_markup_js_1 = require("./2_reply_keyboard_markup.js");
-async function constructMessage(message_, getEntity) {
+const d = (0, deps_js_1.debug)("types/Message");
+async function constructMessage(message_, getEntity, getMessage) {
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -113,6 +115,15 @@ async function constructMessage(message_, getEntity) {
             (0, _0_control_js_1.UNREACHABLE)();
         }
     }
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+        const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
+        if (replyToMessage) {
+            message.replyToMessage = replyToMessage;
+        }
+        else {
+            d("couldn't get replied message");
+        }
+    }
     return (0, _0_object_js_1.cleanObject)(message);
 }
 exports.constructMessage = constructMessage;

package/script/{utilities → types/utilities}/0_html.d.ts

@@ -1,2 +1,2 @@
-import { MessageEntity } from "../types/0_message_entity.js";
+import { MessageEntity } from "../0_message_entity.js";
 export declare function parseHtml(html: string): readonly [string, MessageEntity[]];

package/script/{utilities → types/utilities}/0_html.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHtml = void 0;
-const deps_js_1 = require("../deps.js");
-const _0_message_entity_js_1 = require("../types/0_message_entity.js");
+const deps_js_1 = require("../../deps.js");
+const _0_message_entity_js_1 = require("../0_message_entity.js");
 function parseHtml(html) {
     let text = "";
     const entities = new Array();