teleproto 1.227.0 → 1.227.1

package/Utils.d.ts

@@ -1,5 +1,4 @@
 import bigInt from "big-integer";
-import type { ParseInterface } from "./client/messageParse";
 import { CustomFile } from "./client/uploads";
 import type { Entity, EntityLike, MessageIDLike } from "./define";
 import { EntityCache } from "./entityCache";
@@ -151,7 +150,6 @@ export declare function getInputMedia(media: any, { isPhoto, attributes, forceDo
  */
 export declare function getAppropriatedPartSize(fileSize: bigInt.BigInteger): 256 | 512 | 128;
 export declare function getPeer(peer: EntityLike | any): any;
-export declare function sanitizeParseMode(mode: string | ParseInterface): ParseInterface;
 /**
  Convert the given peer into its marked ID by default.
 

package/Utils.js

@@ -24,7 +24,6 @@ exports.getInputGeo = getInputGeo;
 exports.getInputMedia = getInputMedia;
 exports.getAppropriatedPartSize = getAppropriatedPartSize;
 exports.getPeer = getPeer;
-exports.sanitizeParseMode = sanitizeParseMode;
 exports.getPeerId = getPeerId;
 exports.resolveId = resolveId;
 exports.getMessageId = getMessageId;
@@ -43,9 +42,6 @@ exports.resolveBotFileId = resolveBotFileId;
 exports.packBotFileId = packBotFileId;
 const big_integer_1 = __importDefault(require("big-integer"));
 const mime_1 = __importDefault(require("mime"));
-const html_1 = require("./extensions/html");
-const markdown_1 = require("./extensions/markdown");
-const markdownv2_1 = require("./extensions/markdownv2");
 const Helpers_1 = require("./Helpers");
 const tl_1 = require("./tl");
 function getFileInfo(fileLocation) {
@@ -1042,23 +1038,6 @@ function getPeer(peer) {
     catch (e) { }
     _raiseCastFail(peer, "peer");
 }
-function sanitizeParseMode(mode) {
-    if (mode === "md" || mode === "markdown") {
-        return markdown_1.MarkdownParser;
-    }
-    if (mode === "md2" || mode === "markdownv2") {
-        return markdownv2_1.MarkdownV2Parser;
-    }
-    if (mode == "html") {
-        return html_1.HTMLParser;
-    }
-    if (typeof mode == "object") {
-        if ("parse" in mode && "unparse" in mode) {
-            return mode;
-        }
-    }
-    throw new Error(`Invalid parse mode type ${mode}`);
-}
 /**
  Convert the given peer into its marked ID by default.
 

package/Version.d.ts

@@ -1 +1 @@
-export declare const version = "1.227.0";
+export declare const version = "1.227.1";

package/Version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = "1.227.0";
+exports.version = "1.227.1";

package/client/TelegramClient.d.ts

@@ -448,6 +448,8 @@ export declare class TelegramClient extends TelegramBaseClient {
      * await client.sendMessage("me",{message:"<u> this will be sent as it is</u> ** with no formatting **});
      */
     setParseMode(mode: "md" | "md2" | "markdown" | "markdownv2" | "html" | parseMethods.ParseInterface | undefined): void;
+    /** @hidden */
+    _sanitizeParseMode(mode: string | parseMethods.ParseInterface): parseMethods.ParseInterface;
     /**
      * Iterates over the messages for a given chat.
      * <br/>
@@ -519,6 +521,11 @@ export declare class TelegramClient extends TelegramBaseClient {
      * ```
      */
     getMessages(entity: EntityLike | undefined, getMessagesParams?: Partial<messageMethods.IterMessagesParams>): Promise<import("../Helpers").TotalList<Api.Message>>;
+    /** @hidden */
+    getCommentData(entity: EntityLike, message: number | Api.Message): Promise<{
+        entity: Api.TypeInputPeer;
+        replyTo: number;
+    }>;
     /**
      * Sends a message to the specified user, chat or channel.<br/>
      * The default parse mode is the same as the official applications (a custom flavour of markdown). **bold**, `code` or __italic__ are available.<br/>

package/client/TelegramClient.js

@@ -48,11 +48,12 @@ const chatMethods = __importStar(require("./chats"));
 const dialogMethods = __importStar(require("./dialogs"));
 const twoFA = __importStar(require("./2fa"));
 const tl_1 = require("../tl");
-const Utils_1 = require("../Utils");
+const html_1 = require("../extensions/html");
+const markdown_1 = require("../extensions/markdown");
+const markdownv2_1 = require("../extensions/markdownv2");
 const network_1 = require("../network");
 const registry_1 = require("../tl/runtime/registry");
 const updates_1 = require("./updates");
-const Logger_1 = require("../extensions/Logger");
 /**
  * The TelegramClient uses several methods in different files to provide all the common functionality in a nice interface.</br>
  * **In short, to create a client you must do:**
@@ -542,12 +543,28 @@ class TelegramClient extends telegramBaseClient_1.TelegramBaseClient {
      */
     setParseMode(mode) {
         if (mode) {
-            this._parseMode = (0, Utils_1.sanitizeParseMode)(mode);
+            this._parseMode = this._sanitizeParseMode(mode);
         }
         else {
             this._parseMode = undefined;
         }
     }
+    /** @hidden */
+    _sanitizeParseMode(mode) {
+        if (mode === "md" || mode === "markdown") {
+            return markdown_1.MarkdownParser;
+        }
+        if (mode === "md2" || mode === "markdownv2") {
+            return markdownv2_1.MarkdownV2Parser;
+        }
+        if (mode == "html") {
+            return html_1.HTMLParser;
+        }
+        if (typeof mode == "object" && "parse" in mode && "unparse" in mode) {
+            return mode;
+        }
+        throw new Error(`Invalid parse mode type ${mode}`);
+    }
     //endregion
     // region messages
     /**
@@ -625,6 +642,10 @@ class TelegramClient extends telegramBaseClient_1.TelegramBaseClient {
     getMessages(entity, getMessagesParams = {}) {
         return messageMethods.getMessages(this, entity, getMessagesParams);
     }
+    /** @hidden */
+    getCommentData(entity, message) {
+        return messageMethods.getCommentData(this, entity, message);
+    }
     /**
      * Sends a message to the specified user, chat or channel.<br/>
      * The default parse mode is the same as the official applications (a custom flavour of markdown). **bold**, `code` or __italic__ are available.<br/>
@@ -1155,13 +1176,10 @@ class TelegramClient extends telegramBaseClient_1.TelegramBaseClient {
             const res = await this.getMe();
         }
         catch (e) {
-            this._log.error(`Error while trying to reconnect`);
+            this._log.error(`Error while trying to reconnect`, e);
             if (this._errorHandler) {
                 await this._errorHandler(e);
             }
-            if (this._log.canSend(Logger_1.LogLevel.ERROR)) {
-                console.error(e);
-            }
         }
         // Restart update loop if it was stopped during reconnect
         if (!this._loopStarted && !this._destroyed) {

package/client/dialogs.js

@@ -44,7 +44,6 @@ const requestIter_1 = require("../requestIter");
 const utils = __importStar(require("../Utils"));
 const dialog_1 = require("../tl/custom/dialog");
 const big_integer_1 = __importDefault(require("big-integer"));
-const Logger_1 = require("../extensions/Logger");
 const _MAX_CHUNK_SIZE = 100;
 /**
  Get the key to get messages from a dialog.
@@ -134,12 +133,8 @@ class _DialogsIter extends requestIter_1.RequestIter {
                 }
             }
             catch (e) {
-                console.log("msg", message);
                 this.client._log.error("Got error while trying to finish init message with id " +
-                    m.id);
-                if (this.client._log.canSend(Logger_1.LogLevel.ERROR)) {
-                    console.error(e);
-                }
+                    m.id, e);
                 if (this.client._errorHandler) {
                     await this.client._errorHandler(e);
                 }

package/client/messageParse.d.ts

@@ -1,10 +1,6 @@
 import { Api } from "../tl";
 import type { EntityLike } from "../define";
 import type { TelegramClient } from "./TelegramClient";
-export type messageEntities = typeof Api.MessageEntityBold | typeof Api.MessageEntityItalic | typeof Api.MessageEntityStrike | typeof Api.MessageEntityCode | typeof Api.MessageEntityPre;
-export declare const DEFAULT_DELIMITERS: {
-    [key: string]: messageEntities;
-};
 export interface ParseInterface {
     parse: (message: string) => [string, Api.TypeMessageEntity[]];
     unparse: (text: string, entities: Api.TypeMessageEntity[]) => string;

package/client/messageParse.js

@@ -36,7 +36,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_DELIMITERS = void 0;
 exports._replaceWithMention = _replaceWithMention;
 exports._parseMessageText = _parseMessageText;
 exports._getResponseMessage = _getResponseMessage;
@@ -45,13 +44,6 @@ const tl_1 = require("../tl");
 const utils = __importStar(require("../Utils"));
 const Helpers_1 = require("../Helpers");
 const big_integer_1 = __importDefault(require("big-integer"));
-exports.DEFAULT_DELIMITERS = {
-    "**": tl_1.Api.MessageEntityBold,
-    __: tl_1.Api.MessageEntityItalic,
-    "~~": tl_1.Api.MessageEntityStrike,
-    "`": tl_1.Api.MessageEntityCode,
-    "```": tl_1.Api.MessageEntityPre,
-};
 /** @hidden */
 async function _replaceWithMention(client, entities, i, user) {
     try {
@@ -78,7 +70,7 @@ async function _parseMessageText(client, message, parseMode) {
         parseMode = client.parseMode;
     }
     else if (typeof parseMode === "string") {
-        parseMode = (0, Utils_1.sanitizeParseMode)(parseMode);
+        parseMode = client._sanitizeParseMode(parseMode);
     }
     const [rawMessage, msgEntities] = parseMode.parse(message);
     for (let i = msgEntities.length - 1; i >= 0; i--) {

package/client/telegramBaseClient.js

@@ -19,7 +19,6 @@ const FilePool_1 = require("../network/FilePool");
 const registry_1 = require("../tl/runtime/registry");
 const TCPMTProxy_1 = require("../network/connection/TCPMTProxy");
 const async_mutex_1 = require("async-mutex");
-const Logger_1 = require("../extensions/Logger");
 const Deferred_1 = __importDefault(require("../extensions/Deferred"));
 const UpdateManager_1 = require("./UpdateManager");
 const API_SENDER_IDLE_TIMEOUT_MS = 30000;
@@ -216,8 +215,8 @@ class TelegramBaseClient {
     }
     async disconnect() {
         await this._disconnect();
-        await this._filePool.close({ waitMs: FILE_POOL_CLOSE_GRACE_MS });
-        await this._apiSenderPool.close();
+        await this._filePool.purge();
+        await this._apiSenderPool.purge();
         this._teardownUpdateState();
     }
     /** @hidden */
@@ -246,6 +245,8 @@ class TelegramBaseClient {
     async destroy() {
         this._destroyed = true;
         await this.disconnect();
+        await this._filePool.close({ waitMs: FILE_POOL_CLOSE_GRACE_MS });
+        await this._apiSenderPool.close();
         this._eventBuilders = [];
     }
     /** @hidden */
@@ -316,8 +317,8 @@ class TelegramBaseClient {
                 if (this._errorHandler) {
                     await this._errorHandler(err);
                 }
-                else if (this._log.canSend(Logger_1.LogLevel.ERROR)) {
-                    console.error(err);
+                else {
+                    this._log.error("Error while connecting sender", err);
                 }
                 await (0, Helpers_1.sleep)(1000);
                 await sender.disconnect();
@@ -375,10 +376,8 @@ class TelegramBaseClient {
                 await handler(error);
             }
             catch (e) {
-                if (this._log.canSend(Logger_1.LogLevel.ERROR)) {
-                    e.message = `Error ${e.message} thrown while handling top-level error: ${error.message}`;
-                    console.error(e);
-                }
+                e.message = `Error ${e.message} thrown while handling top-level error: ${error.message}`;
+                this._log.error(e.message, e);
             }
         };
     }

package/client/uploads.js

@@ -49,7 +49,6 @@ const fs_1 = require("fs");
 const errors = __importStar(require("../errors"));
 const utils = __importStar(require("../Utils"));
 const messageParse_1 = require("./messageParse");
-const messages_1 = require("./messages");
 const big_integer_1 = __importDefault(require("big-integer"));
 /**
  * A custom file class compatible with File-like upload shape.<br/>
@@ -377,7 +376,7 @@ async function _sendAlbum(client, entity, { file, caption, formattingEntities, f
         }
     }
     if (commentTo != undefined) {
-        const discussionData = await (0, messages_1.getCommentData)(client, entity, commentTo);
+        const discussionData = await client.getCommentData(entity, commentTo);
         entity = discussionData.entity;
         replyTo = discussionData.replyTo;
     }
@@ -473,7 +472,7 @@ async function sendFile(client, entity, { file, caption, forceDocument = false,
     }
     entity = await client.getInputEntity(entity);
     if (commentTo != undefined) {
-        const discussionData = await (0, messages_1.getCommentData)(client, entity, commentTo);
+        const discussionData = await client.getCommentData(entity, commentTo);
         entity = discussionData.entity;
         replyTo = discussionData.replyTo;
     }

package/client/users.js

@@ -54,7 +54,6 @@ const Helpers_1 = require("../Helpers");
 const errors = __importStar(require("../errors"));
 const utils = __importStar(require("../Utils"));
 const big_integer_1 = __importDefault(require("big-integer"));
-const Logger_1 = require("../extensions/Logger");
 const RequestState_1 = require("../network/RequestState");
 // UserMethods {
 // region Invoking Telegram request
@@ -425,12 +424,10 @@ async function getInputEntity(client, peer) {
             return utils.getInputPeer(channels.chats[0]);
         }
         catch (e) {
+            client._log.error("Error while resolving channel entity", e);
             if (client._errorHandler) {
                 await client._errorHandler(e);
             }
-            if (client._log.canSend(Logger_1.LogLevel.ERROR)) {
-                console.error(e);
-            }
         }
     }
     throw new Error(`Could not find the input entity for ${JSON.stringify(peer)}.

package/events/Album.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlbumEvent = exports.Album = void 0;
 const common_1 = require("./common");
 const tl_1 = require("../tl");
-const Logger_1 = require("../extensions/Logger");
 const _ALBUM_DELAY = 500; // 0.5 sec
 /**
  * Occurs whenever an album (multiple grouped messages with media) arrive.
@@ -90,13 +89,10 @@ class AlbumEvent extends common_1.EventCommon {
             }
             catch (e) {
                 client._log.error("Got error while trying to finish init message with id " +
-                    this.messages[i].id);
+                    this.messages[i].id, e);
                 if (client._errorHandler) {
                     client._errorHandler(e);
                 }
-                if (client._log.canSend(Logger_1.LogLevel.ERROR)) {
-                    console.error(e);
-                }
             }
         }
     }

package/events/NewMessage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewMessageEvent = exports.NewMessage = void 0;
 const common_1 = require("./common");
 const tl_1 = require("../tl");
-const Logger_1 = require("../extensions/Logger");
 /**
  * Occurs whenever a new text message or a message with media arrives.
  * @example
@@ -168,13 +167,10 @@ class NewMessageEvent extends common_1.EventCommon {
             m._finishInit(client, this.originalUpdate._entities || new Map(), undefined);
         }
         catch (e) {
-            client._log.error("Got error while trying to finish init message with id " + m.id);
+            client._log.error("Got error while trying to finish init message with id " + m.id, e);
             if (client._errorHandler) {
                 client._errorHandler(e);
             }
-            if (client._log.canSend(Logger_1.LogLevel.ERROR)) {
-                console.error(e);
-            }
         }
     }
     /**

package/extensions/Logger.d.ts

@@ -5,50 +5,29 @@ export declare enum LogLevel {
     INFO = "info",
     DEBUG = "debug"
 }
+export interface LogRecord {
+    readonly level: LogLevel;
+    readonly message: string;
+    readonly error?: unknown;
+    readonly date: Date;
+}
+export type LogHandler = (record: LogRecord) => void;
 export declare class Logger {
-    private levels;
-    private nodeColors;
+    handler?: LogHandler;
     messageFormat: string;
-    private _logLevel;
     tzOffset: number;
+    private _logLevel;
     constructor(level?: LogLevel);
-    /**
-     *
-     * @param level {string}
-     * @returns {boolean}
-     */
     canSend(level: LogLevel): boolean;
-    /**
-     * @param message {string}
-     */
-    warn(message: string): void;
-    /**
-     * @param message {string}
-     */
-    info(message: string): void;
-    /**
-     * @param message {string}
-     */
-    debug(message: string): void;
-    /**
-     * @param message {string}
-     */
-    error(message: string): void;
+    error(message: string, error?: unknown): void;
+    warn(message: string, error?: unknown): void;
+    info(message: string, error?: unknown): void;
+    debug(message: string, error?: unknown): void;
     format(message: string, level: string): string;
+    getDateTime(): string;
     get logLevel(): LogLevel;
     setLevel(level: LogLevel): void;
     static setLevel(level: string): void;
-    /**
-     * @param level {string}
-     * @param message {string}
-     */
-    _log(level: LogLevel, message: string): void;
-    /**
-     * Override this function for custom Logger. <br />
-     *
-     * @param level {string}
-     * @param message {string}
-     */
-    log(level: LogLevel, message: string): void;
-    getDateTime(): string;
+    _log(level: LogLevel, message: string, error?: unknown): void;
+    log(level: LogLevel, message: string, error?: unknown): void;
 }

package/extensions/Logger.js

@@ -1,5 +1,4 @@
 "use strict";
-// let _level: string | undefined = undefined;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = exports.LogLevel = void 0;
 var LogLevel;
@@ -10,66 +9,40 @@ var LogLevel;
     LogLevel["INFO"] = "info";
     LogLevel["DEBUG"] = "debug";
 })(LogLevel || (exports.LogLevel = LogLevel = {}));
-const NodeColors = {
-    reset: "\x1b[0m",
-    red: "\x1b[31m",
-    green: "\x1b[32m",
-    yellow: "\x1b[33m",
-    blue: "\x1b[34m",
-    magenta: "\x1b[35m",
-    cyan: "\x1b[36m",
-    white: "\x1b[37m",
-    bold: "\x1b[1m",
-    dim: "\x1b[2m",
-    underline: "\x1b[4m",
+const SEVERITY = {
+    none: 0,
+    error: 1,
+    warn: 2,
+    info: 3,
+    debug: 4,
 };
+const COLOR = {
+    error: "\x1b[31m",
+    warn: "\x1b[35m",
+    info: "\x1b[33m",
+    debug: "\x1b[36m",
+};
+const RESET = "\x1b[0m";
 class Logger {
-    constructor(level) {
-        this.levels = ["error", "warn", "info", "debug"];
-        this._logLevel = level || LogLevel.INFO;
-        this.nodeColors = {
-            warn: NodeColors.magenta,
-            info: NodeColors.yellow,
-            debug: NodeColors.cyan,
-            error: NodeColors.red,
-            reset: NodeColors.reset
-        };
+    constructor(level = LogLevel.INFO) {
         this.messageFormat = "[%t] [%l] - [%m]";
         this.tzOffset = new Date().getTimezoneOffset() * 60000;
+        this._logLevel = level;
     }
-    /**
-     *
-     * @param level {string}
-     * @returns {boolean}
-     */
     canSend(level) {
-        return this._logLevel
-            ? this.levels.indexOf(this._logLevel) >= this.levels.indexOf(level)
-            : false;
+        return SEVERITY[this._logLevel] >= SEVERITY[level];
     }
-    /**
-     * @param message {string}
-     */
-    warn(message) {
-        this._log(LogLevel.WARN, message);
+    error(message, error) {
+        this._log(LogLevel.ERROR, message, error);
     }
-    /**
-     * @param message {string}
-     */
-    info(message) {
-        this._log(LogLevel.INFO, message);
+    warn(message, error) {
+        this._log(LogLevel.WARN, message, error);
     }
-    /**
-     * @param message {string}
-     */
-    debug(message) {
-        this._log(LogLevel.DEBUG, message);
+    info(message, error) {
+        this._log(LogLevel.INFO, message, error);
     }
-    /**
-     * @param message {string}
-     */
-    error(message) {
-        this._log(LogLevel.ERROR, message);
+    debug(message, error) {
+        this._log(LogLevel.DEBUG, message, error);
     }
     format(message, level) {
         return this.messageFormat
@@ -77,6 +50,9 @@ class Logger {
             .replace("%l", level.toUpperCase())
             .replace("%m", message);
     }
+    getDateTime() {
+        return new Date(Date.now() - this.tzOffset).toISOString().slice(0, -1);
+    }
     get logLevel() {
         return this._logLevel;
     }
@@ -86,43 +62,26 @@ class Logger {
     static setLevel(level) {
         console.log("Logger.setLevel is deprecated, it will has no effect. Please, use client.setLogLevel instead.");
     }
-    /**
-     * @param level {string}
-     * @param message {string}
-     */
-    _log(level, message) {
+    _log(level, message, error) {
         if (this.canSend(level)) {
-            this.log(level, message);
+            this.log(level, message, error);
         }
     }
-    /**
-     * Override this function for custom Logger. <br />
-     *
-     * @param level {string}
-     * @param message {string}
-     */
-    log(level, message) {
-        let nodeColor;
-        switch (level) {
-            case LogLevel.ERROR:
-                nodeColor = this.nodeColors.error;
-                break;
-            case LogLevel.WARN:
-                nodeColor = this.nodeColors.warn;
-                break;
-            case LogLevel.INFO:
-                nodeColor = this.nodeColors.info;
-                break;
-            case LogLevel.DEBUG:
-                nodeColor = this.nodeColors.debug;
-                break;
-            default:
-                nodeColor = "";
+    log(level, message, error) {
+        var _a;
+        if (this.handler) {
+            this.handler({
+                level,
+                message,
+                error,
+                date: new Date(Date.now() - this.tzOffset),
+            });
+            return;
+        }
+        console.log(((_a = COLOR[level]) !== null && _a !== void 0 ? _a : "") + this.format(message, level) + RESET);
+        if (error !== undefined) {
+            console.error(error);
         }
-        console.log(nodeColor + this.format(message, level) + this.nodeColors.reset);
-    }
-    getDateTime() {
-        return new Date(Date.now() - this.tzOffset).toISOString().slice(0, -1);
     }
 }
 exports.Logger = Logger;

package/extensions/html.d.ts

@@ -1,5 +1,20 @@
 import { Api } from "../tl";
+interface OpenTag {
+    readonly name: string;
+    readonly start: number;
+    readonly entity?: Api.TypeMessageEntity;
+}
 export declare class HTMLParser {
+    static readonly _tag: RegExp;
+    static readonly _ref: RegExp;
+    static readonly _attr: RegExp;
+    static readonly _esc: Record<string, string>;
     static parse(html: string): [string, Api.TypeMessageEntity[]];
-    static unparse(text: string, entities: Api.TypeMessageEntity[] | undefined, _offset?: number, _length?: number): string;
+    static unparse(text: string, entities?: Api.TypeMessageEntity[], _offset?: number, _length?: number): string;
+    static _decode(text: string): string;
+    static _escapeHtml(text: string): string;
+    static _readAttributes(source: string): Record<string, string>;
+    static _entityFor(name: string, attrs: Record<string, string>, offset: number, stack: OpenTag[]): Api.TypeMessageEntity | undefined;
+    static _markupFor(entity: Api.TypeMessageEntity, text: string): readonly [string, string] | null;
 }
+export {};