@mtkruto/node 0.1.107 → 0.1.109

package/esm/transport/1_transport_abridged.js

@@ -1,29 +1,33 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TransportAbridged_connection, _TransportAbridged_obfuscated;
 import { bufferFromBigInt, concat } from "../1_utilities.js";
 import { getObfuscationParameters } from "./0_obfuscation.js";
 import { Transport } from "./0_transport.js";
 export class TransportAbridged extends Transport {
     constructor(connection, obfuscated = false) {
         super();
-        Object.defineProperty(this, "connection", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: connection
-        });
-        Object.defineProperty(this, "obfuscated", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: obfuscated
-        });
+        _TransportAbridged_connection.set(this, void 0);
+        _TransportAbridged_obfuscated.set(this, void 0);
+        __classPrivateFieldSet(this, _TransportAbridged_connection, connection, "f");
+        __classPrivateFieldSet(this, _TransportAbridged_obfuscated, obfuscated, "f");
     }
     async initialize() {
         if (!this.initialized) {
-            if (this.obfuscated) {
-                this.obfuscationParameters = await getObfuscationParameters(0xEFEFEFEF, this.connection);
+            if (__classPrivateFieldGet(this, _TransportAbridged_obfuscated, "f")) {
+                this.obfuscationParameters = await getObfuscationParameters(0xEFEFEFEF, __classPrivateFieldGet(this, _TransportAbridged_connection, "f"));
             }
             else {
-                await this.connection.write(new Uint8Array([0xEF]));
+                await __classPrivateFieldGet(this, _TransportAbridged_connection, "f").write(new Uint8Array([0xEF]));
             }
             this.initialized = true;
         }
@@ -35,14 +39,14 @@ export class TransportAbridged extends Transport {
         let length;
         {
             const buffer = new Uint8Array(1);
-            await this.connection.read(buffer);
+            await __classPrivateFieldGet(this, _TransportAbridged_connection, "f").read(buffer);
             this.decrypt(buffer);
             if (buffer[0] < 0x7F) {
                 length = buffer[0];
             }
             else {
                 const buffer = new Uint8Array(3);
-                await this.connection.read(buffer);
+                await __classPrivateFieldGet(this, _TransportAbridged_connection, "f").read(buffer);
                 this.decrypt(buffer);
                 const dataView = new DataView(buffer.buffer);
                 length = dataView.getUint16(0, true);
@@ -50,7 +54,7 @@ export class TransportAbridged extends Transport {
         }
         length *= 4;
         const buffer = new Uint8Array(length);
-        await this.connection.read(buffer);
+        await __classPrivateFieldGet(this, _TransportAbridged_connection, "f").read(buffer);
         this.decrypt(buffer);
         return buffer;
     }
@@ -63,9 +67,10 @@ export class TransportAbridged extends Transport {
         const length = bufferLength >= 0x7F ? bufferFromBigInt(bufferLength, 3) : new Uint8Array();
         const data = concat(header, length, buffer);
         this.encrypt(data);
-        await this.connection.write(data);
+        await __classPrivateFieldGet(this, _TransportAbridged_connection, "f").write(data);
     }
     deinitialize() {
         this.initialized = false;
     }
 }
+_TransportAbridged_connection = new WeakMap(), _TransportAbridged_obfuscated = new WeakMap();

package/esm/transport/1_transport_intermediate.d.ts

@@ -1,8 +1,7 @@
 import { Connection } from "../2_connection.js";
 import { Transport } from "./0_transport.js";
 export declare class TransportIntermediate extends Transport implements Transport {
-    private readonly connection;
-    private readonly obfuscated;
+    #private;
     constructor(connection: Connection, obfuscated?: boolean);
     initialize(): Promise<void>;
     receive(): Promise<Uint8Array>;

package/esm/transport/1_transport_intermediate.js

@@ -1,29 +1,33 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TransportIntermediate_connection, _TransportIntermediate_obfuscated;
 import { bufferFromBigInt, concat } from "../1_utilities.js";
 import { getObfuscationParameters } from "./0_obfuscation.js";
 import { Transport } from "./0_transport.js";
 export class TransportIntermediate extends Transport {
     constructor(connection, obfuscated = false) {
         super();
-        Object.defineProperty(this, "connection", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: connection
-        });
-        Object.defineProperty(this, "obfuscated", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: obfuscated
-        });
+        _TransportIntermediate_connection.set(this, void 0);
+        _TransportIntermediate_obfuscated.set(this, void 0);
+        __classPrivateFieldSet(this, _TransportIntermediate_connection, connection, "f");
+        __classPrivateFieldSet(this, _TransportIntermediate_obfuscated, obfuscated, "f");
     }
     async initialize() {
         if (!this.initialized) {
-            if (this.obfuscated) {
-                this.obfuscationParameters = await getObfuscationParameters(0xEEEEEEEE, this.connection);
+            if (__classPrivateFieldGet(this, _TransportIntermediate_obfuscated, "f")) {
+                this.obfuscationParameters = await getObfuscationParameters(0xEEEEEEEE, __classPrivateFieldGet(this, _TransportIntermediate_connection, "f"));
             }
             else {
-                await this.connection.write(new Uint8Array([0xEE, 0xEE, 0xEE, 0xEE]));
+                await __classPrivateFieldGet(this, _TransportIntermediate_connection, "f").write(new Uint8Array([0xEE, 0xEE, 0xEE, 0xEE]));
             }
             this.initialized = true;
         }
@@ -35,13 +39,13 @@ export class TransportIntermediate extends Transport {
         let length;
         {
             const buffer = new Uint8Array(4);
-            await this.connection.read(buffer);
+            await __classPrivateFieldGet(this, _TransportIntermediate_connection, "f").read(buffer);
             this.decrypt(buffer);
             const dataView = new DataView(buffer.buffer);
             length = dataView.getUint32(0, true);
         }
         const buffer = new Uint8Array(length);
-        await this.connection.read(buffer);
+        await __classPrivateFieldGet(this, _TransportIntermediate_connection, "f").read(buffer);
         this.decrypt(buffer);
         return buffer;
     }
@@ -52,9 +56,10 @@ export class TransportIntermediate extends Transport {
         const length = bufferFromBigInt(buffer.length, 4);
         const data = concat(length, buffer);
         this.encrypt(data);
-        await this.connection.write(data);
+        await __classPrivateFieldGet(this, _TransportIntermediate_connection, "f").write(data);
     }
     deinitialize() {
         this.initialized = false;
     }
 }
+_TransportIntermediate_connection = new WeakMap(), _TransportIntermediate_obfuscated = new WeakMap();

package/esm/types/0_color.d.ts

@@ -1,2 +1,3 @@
 export type Color = "red" | "orange" | "violet" | "green" | "cyan" | "blue" | "pink";
-export declare function getColor(id: number): Color;
+export declare function getColorFromPeerId(id: number): Color;
+export declare function getColorFromColorId(id: number): Color;

package/esm/types/0_color.js

@@ -7,10 +7,30 @@ const colors = [
     "blue",
     "pink",
 ];
-export function getColor(id) {
+export function getColorFromPeerId(id) {
     id = Number(String(id).replaceAll("-100", "-"));
     if (id < 0) {
         id = -id;
     }
     return colors[id % 7];
 }
+export function getColorFromColorId(id) {
+    switch (id) {
+        case 0:
+            return "red";
+        case 1:
+            return "orange";
+        case 2:
+            return "violet";
+        case 3:
+            return "green";
+        case 4:
+            return "cyan";
+        case 5:
+            return "blue";
+        case 6:
+            return "pink";
+        default:
+            return "blue";
+    }
+}

package/esm/types/0_message_entity.d.ts

@@ -77,4 +77,4 @@ export declare namespace MessageEntity {
 /** A single entity of a message's text or caption. */
 export type MessageEntity = MessageEntity.Mention | MessageEntity.Hashtag | MessageEntity.BotCommand | MessageEntity.URL | MessageEntity.EmailAddress | MessageEntity.Bold | MessageEntity.Italic | MessageEntity.Code | MessageEntity.Pre | MessageEntity.TextLink | MessageEntity.TextMention | MessageEntity.Cashtag | MessageEntity.PhoneNumber | MessageEntity.Underline | MessageEntity.Strikethrough | MessageEntity.Blockquote | MessageEntity.BankCard | MessageEntity.Spoiler | MessageEntity.CustomEmoji;
 export declare function constructMessageEntity(obj: types.TypeMessageEntity): MessageEntity | null;
-export declare function messageEntityToTlObject(entity: MessageEntity): types.MessageEntityMention | types.MessageEntityHashtag | types.MessageEntityBotCommand | types.MessageEntityURL | types.MessageEntityEmail | types.MessageEntityBold | types.MessageEntityItalic | types.MessageEntityCode | types.MessageEntityPre | types.MessageEntityTextURL | types.MessageEntityMentionName | types.MessageEntityPhone | types.MessageEntityCashtag | types.MessageEntityUnderline | types.MessageEntityStrike | types.MessageEntityBlockquote | types.MessageEntityBankCard | types.MessageEntitySpoiler | types.MessageEntityCustomEmoji;
+export declare function messageEntityToTlObject(entity: MessageEntity): types.MessageEntityMention | types.MessageEntityHashtag | types.MessageEntityBotCommand | types.MessageEntityURL | types.MessageEntityEmail | types.MessageEntityBold | types.MessageEntityItalic | types.MessageEntityCode | types.MessageEntityPre | types.MessageEntityTextURL | types.MessageEntityMentionName | types.MessageEntityPhone | types.MessageEntityCashtag | types.MessageEntityUnderline | types.MessageEntityStrike | types.MessageEntityBankCard | types.MessageEntitySpoiler | types.MessageEntityCustomEmoji | types.MessageEntityBlockquote;

package/esm/types/1_chat.js

@@ -2,7 +2,7 @@ import { cleanObject, UNREACHABLE } from "../1_utilities.js";
 import { types } from "../2_tl.js";
 import { ZERO_CHANNEL_ID } from "../4_constants.js";
 import { constructChatPhoto } from "./0_chat_photo.js";
-import { getColor } from "./0_color.js";
+import { getColorFromColorId, getColorFromPeerId } from "./0_color.js";
 import { constructRestrictionReason } from "./0_restriction_reason.js";
 export function constructChat(chat) {
     if (chat instanceof types.User) {
@@ -11,7 +11,7 @@ export function constructChat(chat) {
             type: "private",
             isBot: chat.bot || false,
             id,
-            color: getColor(id),
+            color: chat.color !== undefined ? getColorFromColorId(chat.color) : getColorFromPeerId(id),
             firstName: chat.firstName || "",
             lastName: chat.lastName,
             isScam: chat.scam || false,
@@ -33,7 +33,7 @@ export function constructChat(chat) {
         const chat_ = {
             type: "group",
             id,
-            color: getColor(id),
+            color: getColorFromPeerId(id),
             title: chat.title,
             isCreator: chat.creator || false,
         };
@@ -49,7 +49,7 @@ export function constructChat(chat) {
         if (chat.megagroup) {
             chat_ = {
                 id,
-                color: getColor(id),
+                color: chat.color !== undefined ? getColorFromColorId(chat.color) : getColorFromPeerId(id),
                 type: "supergroup",
                 title,
                 isScam,
@@ -63,7 +63,7 @@ export function constructChat(chat) {
             const id = ZERO_CHANNEL_ID + -Number(chat.id);
             chat_ = {
                 id,
-                color: getColor(id),
+                color: chat.color !== undefined ? getColorFromColorId(chat.color) : getColorFromPeerId(id),
                 type: "channel",
                 title,
                 isScam,

package/esm/types/1_user.js

@@ -1,12 +1,12 @@
 import { cleanObject } from "../1_utilities.js";
 import { types } from "../2_tl.js";
 import { constructChatPhoto } from "./0_chat_photo.js";
-import { getColor } from "./0_color.js";
+import { getColorFromColorId, getColorFromPeerId } from "./0_color.js";
 export function constructUser(user_) {
     const id = Number(user_.id);
     const user = {
         id,
-        color: getColor(id),
+        color: user_.color !== undefined ? getColorFromColorId(user_.color) : getColorFromPeerId(id),
         isBot: user_.bot || false,
         firstName: user_.firstName || "",
         lastName: user_.lastName,

package/esm/types/3_message.js

@@ -46,7 +46,7 @@ async function getSender(message_, getEntity) {
     }
 }
 async function getReply(message_, chat, getMessage) {
-    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader && message_.replyTo.replyToMsgId) {
         let isTopicMessage = false;
         if (message_.replyTo.forumTopic) {
             isTopicMessage = true;

package/esm/utilities/0_base64.js

@@ -1,11 +1,11 @@
-import { base64Decode, base64Encode } from "../0_deps.js";
+import { decodeBase64, encodeBase64 } from "../0_deps.js";
 export function base64EncodeUrlSafe(data) {
-    return base64Encode(data).replace(/=*$/, "").replaceAll("+", "-").replaceAll("/", "_");
+    return encodeBase64(data).replace(/=*$/, "").replaceAll("+", "-").replaceAll("/", "_");
 }
 export function base64DecodeUrlSafe(data) {
     data = data.replaceAll("_", "/").replaceAll("-", "+");
     if (data.length != 4) {
         data += "=".repeat(4 - data.length % 4);
     }
-    return base64Decode(data);
+    return decodeBase64(data);
 }

package/esm/utilities/0_queue.d.ts

@@ -1,8 +1,6 @@
 export declare class Queue {
-    private d;
-    private functions;
+    #private;
+    functions: (() => Promise<void>)[];
     constructor(name: string);
     add(fn: () => Promise<void>): void;
-    private busy;
-    private check;
 }

package/esm/utilities/0_queue.js

@@ -1,50 +1,53 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Queue_instances, _Queue_d, _Queue_busy, _Queue_check;
 import { debug } from "../0_deps.js";
 export class Queue {
     constructor(name) {
-        Object.defineProperty(this, "d", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        _Queue_instances.add(this);
+        _Queue_d.set(this, void 0);
         Object.defineProperty(this, "functions", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: new Array()
         });
-        Object.defineProperty(this, "busy", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        this.d = debug(`q/${name}`);
+        _Queue_busy.set(this, false);
+        __classPrivateFieldSet(this, _Queue_d, debug(`q/${name}`), "f");
     }
     add(fn) {
         this.functions.push(fn);
-        this.check();
-    }
-    check() {
-        if (this.busy) {
-            return;
-        }
-        else {
-            this.busy = true;
-        }
-        const fn = this.functions.shift();
-        if (fn !== undefined) {
-            fn()
-                .catch((err) => {
-                this.d("%o", "stack" in err ? err.stack : err);
-            })
-                .finally(() => {
-                this.busy = false;
-                this.check();
-            });
-        }
-        else {
-            this.busy = false;
-        }
+        __classPrivateFieldGet(this, _Queue_instances, "m", _Queue_check).call(this);
     }
 }
+_Queue_d = new WeakMap(), _Queue_busy = new WeakMap(), _Queue_instances = new WeakSet(), _Queue_check = function _Queue_check() {
+    if (__classPrivateFieldGet(this, _Queue_busy, "f")) {
+        return;
+    }
+    else {
+        __classPrivateFieldSet(this, _Queue_busy, true, "f");
+    }
+    const fn = this.functions.shift();
+    if (fn !== undefined) {
+        fn()
+            .catch((err) => {
+            __classPrivateFieldGet(this, _Queue_d, "f").call(this, "%o", "stack" in err ? err.stack : err);
+        })
+            .finally(() => {
+            __classPrivateFieldSet(this, _Queue_busy, false, "f");
+            __classPrivateFieldGet(this, _Queue_instances, "m", _Queue_check).call(this);
+        });
+    }
+    else {
+        __classPrivateFieldSet(this, _Queue_busy, false, "f");
+    }
+};

package/package.json

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

package/script/0_deps.d.ts

@@ -5,4 +5,4 @@ export { Mutex, type MutexInterface } 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/main/mod.js";
 export declare const debug: typeof debug_;
-export { decode as base64Decode, encode as base64Encode } from "./deps/deno.land/std@0.204.0/encoding/base64.js";
+export { decodeBase64, encodeBase64 } from "./deps/deno.land/std@0.204.0/encoding/base64.js";

package/script/0_deps.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.base64Encode = exports.base64Decode = exports.debug = exports.Parser = exports.Mutex = exports.gzip = exports.gunzip = exports.initTgCrypto = exports.ige256Encrypt = exports.ige256Decrypt = exports.factorize = exports.ctr256 = void 0;
+exports.encodeBase64 = exports.decodeBase64 = exports.debug = exports.Parser = exports.Mutex = exports.gzip = exports.gunzip = exports.initTgCrypto = exports.ige256Encrypt = exports.ige256Decrypt = exports.factorize = exports.ctr256 = void 0;
 __exportStar(require("./deps/deno.land/std@0.204.0/assert/mod.js"), exports);
 var mod_js_1 = require("./deps/deno.land/x/tgcrypto@0.3.3/mod.js");
 Object.defineProperty(exports, "ctr256", { enumerable: true, get: function () { return mod_js_1.ctr256; } });
@@ -33,5 +33,5 @@ const mod_js_3 = require("./deps/raw.githubusercontent.com/MTKruto/debug/main/mo
 const debug = (v) => (0, mod_js_3.debug)(v);
 exports.debug = debug;
 var base64_js_1 = require("./deps/deno.land/std@0.204.0/encoding/base64.js");
-Object.defineProperty(exports, "base64Decode", { enumerable: true, get: function () { return base64_js_1.decode; } });
-Object.defineProperty(exports, "base64Encode", { enumerable: true, get: function () { return base64_js_1.encode; } });
+Object.defineProperty(exports, "decodeBase64", { enumerable: true, get: function () { return base64_js_1.decodeBase64; } });
+Object.defineProperty(exports, "encodeBase64", { enumerable: true, get: function () { return base64_js_1.encodeBase64; } });

package/script/4_constants.d.ts

@@ -4,8 +4,8 @@ export type PublicKeys = readonly [bigint, [bigint, bigint]][];
 export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
-export declare const LAYER = 165;
-export declare const APP_VERSION = "MTKruto 0.1.107";
+export declare const LAYER = 166;
+export declare const APP_VERSION = "MTKruto 0.1.109";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/4_constants.js

@@ -78,9 +78,9 @@ exports.PUBLIC_KEYS = Object.freeze([
     ],
 ]);
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
-exports.INITIAL_DC = "2-test";
-exports.LAYER = 165;
-exports.APP_VERSION = "MTKruto 0.1.107";
+exports.INITIAL_DC = "2";
+exports.LAYER = 166;
+exports.APP_VERSION = "MTKruto 0.1.109";
 // @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];

package/script/5_client.d.ts

@@ -1,2 +1,3 @@
 export * from "./client/2_client_plain.js";
+export * from "./client/3_types.js";
 export * from "./client/4_client.js";

package/script/5_client.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./client/2_client_plain.js"), exports);
+__exportStar(require("./client/3_types.js"), exports);
 __exportStar(require("./client/4_client.js"), exports);

package/script/client/0_html.js

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHtml = void 0;
 const _0_deps_js_1 = require("../0_deps.js");
 function parseHtml(html) {
+    html = html.trim();
     let text = "";
     const entities = new Array();
-    const queue = new Array();
+    const stack = new Array();
     const parser = new _0_deps_js_1.Parser({
         onopentag(name, attribs) {
             switch (name) {
                 case "b":
                 case "strong":
-                    queue.push({ type: "bold", offset: text.length, length: 0 });
+                    stack.push({ type: "bold", offset: text.length, length: 0 });
                     break;
                 case "em":
                 case "i":
-                    queue.push({ type: "italic", offset: text.length, length: 0 });
+                    stack.push({ type: "italic", offset: text.length, length: 0 });
                     break;
                 case "code":
-                    queue.push({ type: "code", offset: text.length, length: 0 });
+                    stack.push({ type: "code", offset: text.length, length: 0 });
                     break;
                 case "pre": {
                     const language = attribs.language ?? "";
-                    queue.push({ type: "pre", offset: text.length, length: 0, language });
+                    stack.push({ type: "pre", offset: text.length, length: 0, language });
                     break;
                 }
                 case "a": {
@@ -30,16 +31,16 @@ function parseHtml(html) {
                     if (!url) {
                         throw new Error("Missing attribute href");
                     }
-                    queue.push({ type: "textLink", offset: text.length, length: 0, url });
+                    stack.push({ type: "textLink", offset: text.length, length: 0, url });
                     break;
                 }
                 case "ins":
                 case "u":
-                    queue.push({ type: "underline", offset: text.length, length: 0 });
+                    stack.push({ type: "underline", offset: text.length, length: 0 });
                     break;
                 case "del":
                 case "strike":
-                    queue.push({ type: "strikethrough", offset: text.length, length: 0 });
+                    stack.push({ type: "strikethrough", offset: text.length, length: 0 });
                     break;
                 case "span":
                     if (attribs.class != "tg-spoiler") {
@@ -47,24 +48,29 @@ function parseHtml(html) {
                     }
                 // falls through
                 case "tg-spoiler":
-                    queue.push({ type: "spoiler", offset: text.length, length: 0 });
+                    stack.push({ type: "spoiler", offset: text.length, length: 0 });
                     break;
                 case "tg-emoji":
                     if (!attribs["emoji-id"]) {
                         throw new Error("Missing attribute emoji-id");
                     }
-                    queue.push({ type: "spoiler", offset: text.length, length: 0 });
+                    stack.push({ type: "spoiler", offset: text.length, length: 0 });
+                    break;
+                case "blockquote":
+                    stack.push({ type: "blockquote", offset: text.length, length: 0 });
             }
         },
         ontext(data) {
+            if (!text.length) {
+                data = data.trimStart();
+            }
             text += data;
-            const lastItem = queue[queue.length - 1];
-            if (lastItem) {
-                lastItem.length += data.length;
+            for (const item of stack) {
+                item.length += data.length;
             }
         },
         onclosetag() {
-            const lastItem = queue.pop();
+            const lastItem = stack.pop();
             if (lastItem) {
                 entities.push(lastItem);
             }
@@ -72,6 +78,12 @@ function parseHtml(html) {
     });
     parser.write(html);
     parser.end();
+    text = text.trimEnd();
+    for (const entity of entities) {
+        while (text[entity.offset + (entity.length - 1)] === undefined) {
+            --entity.length;
+        }
+    }
     return [text, entities];
 }
 exports.parseHtml = parseHtml;

package/script/client/0_utilities.d.ts

@@ -2,4 +2,4 @@ import { types } from "../2_tl.js";
 export declare const resolve: () => Promise<void>;
 export type With<T, K extends keyof T> = T & Required<Pick<T, K>>;
 export declare function isPtsUpdate(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateShortMessage | types.UpdateShortChatMessage | types.UpdateShortSentMessage | types.UpdateNewMessage | types.UpdateDeleteMessages | types.UpdateReadHistoryInbox | types.UpdateReadHistoryOutbox | types.UpdatePinnedChannelMessages | types.UpdatePinnedMessages | types.UpdateFolderPeers | types.UpdateChannelWebPage | types.UpdateEditMessage | types.UpdateReadMessagesContents | types.UpdateWebPage;
-export declare function isChannelPtsUpdate(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateNewChannelMessage | types.UpdateEditChannelMessage | types.UpdateDeleteChannelMessages | types.UpdateReadChannelInbox;
+export declare function isChannelPtsUpdate(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateNewChannelMessage | types.UpdateEditChannelMessage | types.UpdateDeleteChannelMessages;

package/script/client/0_utilities.js

@@ -24,7 +24,6 @@ exports.isPtsUpdate = isPtsUpdate;
 function isChannelPtsUpdate(v) {
     return v instanceof _2_tl_js_1.types.UpdateNewChannelMessage ||
         v instanceof _2_tl_js_1.types.UpdateEditChannelMessage ||
-        v instanceof _2_tl_js_1.types.UpdateDeleteChannelMessages ||
-        v instanceof _2_tl_js_1.types.UpdateReadChannelInbox;
+        v instanceof _2_tl_js_1.types.UpdateDeleteChannelMessages;
 }
 exports.isChannelPtsUpdate = isChannelPtsUpdate;

package/script/client/1_client_abstract.d.ts

@@ -15,11 +15,11 @@ export interface ClientAbstractParams {
     cdn?: boolean;
 }
 export declare abstract class ClientAbstract {
+    #private;
     protected readonly initialDc: DC;
     protected readonly transportProvider: TransportProvider;
     protected readonly cdn: boolean;
     protected transport?: ReturnType<TransportProvider>;
-    private dc?;
     constructor(params?: ClientAbstractParams);
     protected stateChangeHandler?: (connected: boolean) => void;
     get dcId(): number;