teleproto 1.225.3 → 1.225.4

package/Version.d.ts

@@ -1 +1 @@
-export declare const version = "1.225.3";
+export declare const version = "1.225.4";

package/Version.js

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

package/client/TelegramClient.d.ts

@@ -131,11 +131,18 @@ export declare class TelegramClient extends TelegramBaseClient {
     /**
      * logs the user using a QR code to be scanned.<br/>
      * this function generates the QR code that needs to be scanned by mobile.
+     *
+     * The flow can be cancelled at any time (e.g. the user closed the page) by
+     * passing an `abortSignal`; once aborted it stops polling for tokens and
+     * rejects with an `AbortError`.
      * @example
      * '''ts
      * await client.connect();
-     * const user = await client.signInUserWithQrCode({ apiId, apiHash },
-     * {
+     * const controller = new AbortController();
+     * // call controller.abort() to cancel the QR login at any time
+     * try {
+     *   const user = await client.signInUserWithQrCode({ apiId, apiHash },
+     *   {
      *       onError: async function(p1: Error) {
      *           console.log("error", p1);
      *           // true = stop the authentication processes
@@ -150,14 +157,19 @@ export declare class TelegramClient extends TelegramBaseClient {
      *       password: async (hint) => {
      *           // password if needed
      *           return "1111";
-     *       }
+     *       },
+     *       abortSignal: controller.signal,
      *   }
-     * );
-     * console.log("user is", user);
+     *   );
+     *   console.log("user is", user);
+     * } catch (err) {
+     *   if (err.name === "AbortError") console.log("QR login cancelled");
+     *   else throw err;
+     * }
      *
      * '''
      * @param apiCredentials - credentials to be used.
-     * @param authParams - user auth params.
+     * @param authParams - user auth params. Pass `abortSignal` to cancel the flow.
      */
     signInUserWithQrCode(apiCredentials: authMethods.ApiCredentials, authParams: authMethods.QrCodeAuthParams): Promise<Api.TypeUser>;
     /**

package/client/TelegramClient.js

@@ -177,11 +177,18 @@ class TelegramClient extends telegramBaseClient_1.TelegramBaseClient {
     /**
      * logs the user using a QR code to be scanned.<br/>
      * this function generates the QR code that needs to be scanned by mobile.
+     *
+     * The flow can be cancelled at any time (e.g. the user closed the page) by
+     * passing an `abortSignal`; once aborted it stops polling for tokens and
+     * rejects with an `AbortError`.
      * @example
      * '''ts
      * await client.connect();
-     * const user = await client.signInUserWithQrCode({ apiId, apiHash },
-     * {
+     * const controller = new AbortController();
+     * // call controller.abort() to cancel the QR login at any time
+     * try {
+     *   const user = await client.signInUserWithQrCode({ apiId, apiHash },
+     *   {
      *       onError: async function(p1: Error) {
      *           console.log("error", p1);
      *           // true = stop the authentication processes
@@ -196,14 +203,19 @@ class TelegramClient extends telegramBaseClient_1.TelegramBaseClient {
      *       password: async (hint) => {
      *           // password if needed
      *           return "1111";
-     *       }
+     *       },
+     *       abortSignal: controller.signal,
      *   }
-     * );
-     * console.log("user is", user);
+     *   );
+     *   console.log("user is", user);
+     * } catch (err) {
+     *   if (err.name === "AbortError") console.log("QR login cancelled");
+     *   else throw err;
+     * }
      *
      * '''
      * @param apiCredentials - credentials to be used.
-     * @param authParams - user auth params.
+     * @param authParams - user auth params. Pass `abortSignal` to cancel the flow.
      */
     signInUserWithQrCode(apiCredentials, authParams) {
         return authMethods.signInUserWithQrCode(this, apiCredentials, authParams);

package/client/UpdateManager.d.ts

@@ -14,6 +14,8 @@ export declare class UpdateManager {
     private globalPtsTimer?;
     private readonly channels;
     private readonly pendingSeq;
+    private readonly recentMessageKeys;
+    private readonly recentMessageQueue;
     private fetchingDifference;
     private failTimeoutS;
     private failRetryTimer?;
@@ -38,6 +40,7 @@ export declare class UpdateManager {
     private handleShortMessage;
     private feedUpdate;
     private dispatch;
+    private isDuplicateMessage;
     private collectEntities;
     private makeGlobalWaiter;
     private getOrCreateChannel;

package/client/UpdateManager.js

@@ -43,6 +43,7 @@ const NO_UPDATES_TIMEOUT_MS = 15 * 60 * 1000;
 const FAIL_DIFFERENCE_INITIAL_S = 1;
 const FAIL_DIFFERENCE_CAP_S = 64;
 const CHANNEL_DIFFERENCE_LIMIT = 100;
+const RECENT_MESSAGE_BUFFER_SIZE = 1000;
 function isCommonPtsUpdate(update) {
     return (update instanceof tl_1.Api.UpdateNewMessage ||
         update instanceof tl_1.Api.UpdateDeleteMessages ||
@@ -79,6 +80,8 @@ class UpdateManager {
         this.lastUpdateTime = 0;
         this.channels = new Map();
         this.pendingSeq = [];
+        this.recentMessageKeys = new Set();
+        this.recentMessageQueue = [];
         this.fetchingDifference = false;
         this.failTimeoutS = FAIL_DIFFERENCE_INITIAL_S;
         this.channelFailTimeoutS = new Map();
@@ -306,9 +309,39 @@ class UpdateManager {
     }
     dispatch(update, payload) {
         var _a;
+        if (this.isDuplicateMessage(update)) {
+            this.client._log.debug("Skip duplicate message update (already dispatched)");
+            return;
+        }
         update._entities = (_a = payload.entities) !== null && _a !== void 0 ? _a : new Map();
         (0, updates_1._dispatchUpdate)(this.client, { update }).catch((e) => this.client._log.error(`Error dispatching update: ${e}`));
     }
+    isDuplicateMessage(update) {
+        if (!(update instanceof tl_1.Api.UpdateNewMessage) &&
+            !(update instanceof tl_1.Api.UpdateNewChannelMessage)) {
+            return false;
+        }
+        const message = update.message;
+        if ((message === null || message === void 0 ? void 0 : message.id) == undefined || message.peerId == undefined)
+            return false;
+        let peerId;
+        try {
+            peerId = utils.getPeerId(message.peerId);
+        }
+        catch (_a) {
+            return false;
+        }
+        const key = `${peerId}:${message.id}`;
+        if (this.recentMessageKeys.has(key))
+            return true;
+        this.recentMessageKeys.add(key);
+        this.recentMessageQueue.push(key);
+        if (this.recentMessageQueue.length > RECENT_MESSAGE_BUFFER_SIZE) {
+            const old = this.recentMessageQueue.shift();
+            this.recentMessageKeys.delete(old);
+        }
+        return false;
+    }
     collectEntities(users, chats) {
         const entities = new Map();
         for (const x of [...users, ...chats]) {

package/client/auth.d.ts

@@ -86,6 +86,9 @@ export interface QrCodeAuthParams extends UserPasswordAuthParams {
     /** when an error happens during auth this function will be called with the error.<br/>
      *  if this returns true the auth operation will stop. */
     onError: (err: Error) => Promise<boolean> | void;
+    /** an AbortSignal to cancel the QR login flow (e.g. the user closed the page).<br/>
+     *  when aborted, the flow stops polling and rejects with an `AbortError`. */
+    abortSignal?: AbortSignal;
 }
 interface ReturnString {
     (): string;

package/client/auth.js

@@ -248,17 +248,23 @@ async function signInUser(client, apiCredentials, authParams) {
     await authParams.onError(new Error("Auth failed"));
     return client.signInUser(apiCredentials, authParams);
 }
+function qrAbortError() {
+    const err = new Error("QR login aborted");
+    err.name = "AbortError";
+    return err;
+}
 /** @hidden */
 async function signInUserWithQrCode(client, apiCredentials, authParams) {
-    let isScanningComplete = false;
     if (authParams.qrCode == undefined) {
         throw new Error("qrCode callback not defined");
     }
+    const { abortSignal } = authParams;
+    if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)
+        throw qrAbortError();
+    let isScanningComplete = false;
+    const stopped = () => isScanningComplete || !!(abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted);
     const inputPromise = (async () => {
-        while (1) {
-            if (isScanningComplete) {
-                break;
-            }
+        while (!stopped()) {
             const result = await client.invoke(new tl_1.Api.auth.ExportLoginToken({
                 apiId: Number(apiCredentials.apiId),
                 apiHash: apiCredentials.apiHash,
@@ -275,21 +281,24 @@ async function signInUserWithQrCode(client, apiCredentials, authParams) {
             await (0, Helpers_1.sleep)(QR_CODE_TIMEOUT);
         }
     })();
-    const updatePromise = new Promise((resolve) => {
-        client.addEventHandler((update) => {
-            if (update instanceof tl_1.Api.UpdateLoginToken) {
-                resolve(undefined);
-            }
-        });
-    });
+    const Raw = require("../events/Raw").Raw;
+    const rawEvent = new Raw({});
+    const onUpdate = (update) => {
+        if (update instanceof tl_1.Api.UpdateLoginToken)
+            resolveUpdate();
+    };
+    let resolveUpdate;
+    const updatePromise = new Promise((resolve) => (resolveUpdate = resolve));
+    client.addEventHandler(onUpdate, rawEvent);
+    const abortPromise = new Promise((_, reject) => abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener("abort", () => reject(qrAbortError()), {
+        once: true,
+    }));
     try {
-        await Promise.race([updatePromise, inputPromise]);
-    }
-    catch (err) {
-        throw err;
+        await Promise.race([updatePromise, inputPromise, abortPromise]);
     }
     finally {
         isScanningComplete = true;
+        client.removeEventHandler(onUpdate, rawEvent);
     }
     try {
         const result2 = await client.invoke(new tl_1.Api.auth.ExportLoginToken({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teleproto",
-  "version": "1.225.3",
+  "version": "1.225.4",
   "description": "Telegram MTProto API client library written in TypeScript",
   "main": "index.js",
   "types": "index.d.ts",

package/sessions/StoreSession.js

@@ -123,7 +123,6 @@ class StoreSession extends Memory_1.MemorySession {
             return;
         }
         for (const row of rows) {
-            row.push(new Date().getTime().toString());
             this.store.set(this.sessionName + row[0], row);
         }
     }

package/tl/custom/dialog.d.ts

@@ -10,7 +10,7 @@ export declare class Dialog {
     folderId?: number;
     archived: boolean;
     message?: Api.Message;
-    date: number;
+    date?: number;
     entity?: Entity;
     inputEntity: Api.TypeInputPeer;
     id?: bigInt.BigInteger;

package/tl/custom/dialog.js

@@ -7,13 +7,14 @@ const draft_1 = require("./draft");
 const Helpers_1 = require("../../Helpers");
 class Dialog {
     constructor(client, dialog, entities, message) {
+        var _a;
         this._client = client;
         this.dialog = dialog;
         this.pinned = !!dialog.pinned;
         this.folderId = dialog.folderId;
         this.archived = dialog.folderId != undefined;
         this.message = message;
-        this.date = this.message.date;
+        this.date = (_a = this.message) === null || _a === void 0 ? void 0 : _a.date;
         this.entity = entities.get((0, Utils_1.getPeerId)(dialog.peer));
         this.inputEntity = (0, Utils_1.getInputPeer)(this.entity);
         if (this.entity) {