@mtcute/core 0.19.3 → 0.19.6

package/highlevel/base.cjs

@@ -33,7 +33,14 @@ class BaseTelegramClient {
     this.platform = this.params.platform;
     this.mt = new client.MtClient({
       ...this.params,
-      logger: this.log.create("mtproto")
+      logger: this.log.create("mtproto"),
+      onError: (err) => {
+        if (this.onError.length > 0) {
+          this.onError.emit(utils.unknownToError(err));
+        } else if (this._connect.finished()) {
+          this.log.error("unhandled error:", err);
+        }
+      }
     });
     if (!params.disableUpdates && params.updates !== false) {
       this.updates = new manager.UpdatesManager(this, params.updates);

package/highlevel/base.js

@@ -26,7 +26,14 @@ class BaseTelegramClient {
     this.platform = this.params.platform;
     this.mt = new MtClient({
       ...this.params,
-      logger: this.log.create("mtproto")
+      logger: this.log.create("mtproto"),
+      onError: (err) => {
+        if (this.onError.length > 0) {
+          this.onError.emit(unknownToError(err));
+        } else if (this._connect.finished()) {
+          this.log.error("unhandled error:", err);
+        }
+      }
     });
     if (!params.disableUpdates && params.updates !== false) {
       this.updates = new UpdatesManager(this, params.updates);

package/highlevel/client.d.cts

@@ -144,11 +144,17 @@ export interface TelegramClient extends ITelegramClient {
      *
      * **Available**: 👤 users only
      *
-     * @param password  Your Two-Step verification password
      * @returns  The authorized user
      * @throws BadRequestError  In case the password is invalid
      */
-    checkPassword(password: string): Promise<User>;
+    checkPassword(options: string | {
+        /** Your Two-Step verification password */
+        password: string;
+        /** Existing response from `account.getPassword`, if available (to avoid extra API calls) */
+        passwordObj?: tl.account.TypePassword;
+        /** Abort signal */
+        abortSignal?: AbortSignal;
+    }): Promise<User>;
     /**
      * Get your Two-Step Verification password hint.
      *
@@ -3819,7 +3825,9 @@ export interface TelegramClient extends ITelegramClient {
      *
      * @returns  Whether the action was successful
      */
-    acceptStarGift(params: InputMessageId & {
+    acceptStarGift(params: {
+        /** ID of the message containing the gift */
+        message: number | Message;
         /**
          * Action to perform on the gift.
          *  - `save` - save the gift to your profile

package/highlevel/client.d.ts

@@ -144,11 +144,17 @@ export interface TelegramClient extends ITelegramClient {
      *
      * **Available**: 👤 users only
      *
-     * @param password  Your Two-Step verification password
      * @returns  The authorized user
      * @throws BadRequestError  In case the password is invalid
      */
-    checkPassword(password: string): Promise<User>;
+    checkPassword(options: string | {
+        /** Your Two-Step verification password */
+        password: string;
+        /** Existing response from `account.getPassword`, if available (to avoid extra API calls) */
+        passwordObj?: tl.account.TypePassword;
+        /** Abort signal */
+        abortSignal?: AbortSignal;
+    }): Promise<User>;
     /**
      * Get your Two-Step Verification password hint.
      *
@@ -3819,7 +3825,9 @@ export interface TelegramClient extends ITelegramClient {
      *
      * @returns  Whether the action was successful
      */
-    acceptStarGift(params: InputMessageId & {
+    acceptStarGift(params: {
+        /** ID of the message containing the gift */
+        message: number | Message;
         /**
          * Action to perform on the gift.
          *  - `save` - save the gift to your profile

package/highlevel/methods/auth/check-password.cjs

@@ -6,16 +6,18 @@ if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WAR
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const utils = require("./utils.cjs");
-async function checkPassword(client, password) {
+async function checkPassword(client, options) {
+  const opts = typeof options === "string" ? { password: options } : options;
+  const passwordObj = opts.passwordObj ?? await client.call({
+    _: "account.getPassword"
+  }, { abortSignal: opts.abortSignal });
   const res = await client.call({
     _: "auth.checkPassword",
     password: await client.computeSrpParams(
-      await client.call({
-        _: "account.getPassword"
-      }),
-      password
+      passwordObj,
+      opts.password
     )
-  });
+  }, { abortSignal: opts.abortSignal });
   return utils._onAuthorization(client, res);
 }
 exports.checkPassword = checkPassword;

package/highlevel/methods/auth/check-password.d.cts

@@ -1,10 +1,17 @@
+import { tl } from '@mtcute/tl';
 import { ITelegramClient } from '../../client.types.js';
 import { User } from '../../types/index.js';
 /**
  * Check your Two-Step verification password and log in
  *
- * @param password  Your Two-Step verification password
  * @returns  The authorized user
  * @throws BadRequestError  In case the password is invalid
  */
-export declare function checkPassword(client: ITelegramClient, password: string): Promise<User>;
+export declare function checkPassword(client: ITelegramClient, options: string | {
+    /** Your Two-Step verification password */
+    password: string;
+    /** Existing response from `account.getPassword`, if available (to avoid extra API calls) */
+    passwordObj?: tl.account.TypePassword;
+    /** Abort signal */
+    abortSignal?: AbortSignal;
+}): Promise<User>;

package/highlevel/methods/auth/check-password.d.ts

@@ -1,10 +1,17 @@
+import { tl } from '@mtcute/tl';
 import { ITelegramClient } from '../../client.types.js';
 import { User } from '../../types/index.js';
 /**
  * Check your Two-Step verification password and log in
  *
- * @param password  Your Two-Step verification password
  * @returns  The authorized user
  * @throws BadRequestError  In case the password is invalid
  */
-export declare function checkPassword(client: ITelegramClient, password: string): Promise<User>;
+export declare function checkPassword(client: ITelegramClient, options: string | {
+    /** Your Two-Step verification password */
+    password: string;
+    /** Existing response from `account.getPassword`, if available (to avoid extra API calls) */
+    passwordObj?: tl.account.TypePassword;
+    /** Abort signal */
+    abortSignal?: AbortSignal;
+}): Promise<User>;

package/highlevel/methods/auth/check-password.js

@@ -1,14 +1,16 @@
 import { _onAuthorization } from "./utils.js";
-async function checkPassword(client, password) {
+async function checkPassword(client, options) {
+  const opts = typeof options === "string" ? { password: options } : options;
+  const passwordObj = opts.passwordObj ?? await client.call({
+    _: "account.getPassword"
+  }, { abortSignal: opts.abortSignal });
   const res = await client.call({
     _: "auth.checkPassword",
     password: await client.computeSrpParams(
-      await client.call({
-        _: "account.getPassword"
-      }),
-      password
+      passwordObj,
+      opts.password
     )
-  });
+  }, { abortSignal: opts.abortSignal });
   return _onAuthorization(client, res);
 }
 export {

package/highlevel/methods/auth/sign-in-qr.cjs

@@ -32,7 +32,10 @@ async function signInQr(client, params) {
     while (true) {
       const password = await miscUtils.resolveMaybeDynamic(input);
       try {
-        return await checkPassword.checkPassword(client, password);
+        return await checkPassword.checkPassword(client, {
+          password,
+          abortSignal
+        });
       } catch (e) {
         if (tl.tl.RpcError.is(e, "PASSWORD_HASH_INVALID")) {
           if (!isDynamic) {

package/highlevel/methods/auth/sign-in-qr.js

@@ -25,7 +25,10 @@ async function signInQr(client, params) {
     while (true) {
       const password = await resolveMaybeDynamic(input);
       try {
-        return await checkPassword(client, password);
+        return await checkPassword(client, {
+          password,
+          abortSignal
+        });
       } catch (e) {
         if (tl.RpcError.is(e, "PASSWORD_HASH_INVALID")) {
           if (!isDynamic) {

package/highlevel/methods/auth/start.cjs

@@ -10,6 +10,7 @@ const errors = require("../../../types/errors.cjs");
 const miscUtils = require("../../utils/misc-utils.cjs");
 const getMe = require("../users/get-me.cjs");
 const checkPassword = require("./check-password.cjs");
+const logOut = require("./log-out.cjs");
 const resendCode = require("./resend-code.cjs");
 const sendCode = require("./send-code.cjs");
 const signInBot = require("./sign-in-bot.cjs");
@@ -30,8 +31,15 @@ async function start(client, params) {
     return me;
   } catch (e) {
     if (tl.tl.RpcError.is(e)) {
-      if (e.text === "SESSION_PASSWORD_NEEDED") has2fa = true;
-      else if (e.text !== "AUTH_KEY_UNREGISTERED") throw e;
+      if (e.text === "SESSION_PASSWORD_NEEDED") {
+        has2fa = true;
+      } else if (e.text === "SESSION_REVOKED" || e.text === "USER_DEACTIVATED" || e.text === "USER_DEACTIVATED_BAN") {
+        await logOut.logOut(client).catch((err) => {
+          client.log.warn("failed to log out: %e", err);
+        });
+      } else if (e.text !== "AUTH_KEY_UNREGISTERED") {
+        throw e;
+      }
     } else {
       throw e;
     }
@@ -123,7 +131,10 @@ async function start(client, params) {
     for (; ; ) {
       const password = await miscUtils.resolveMaybeDynamic(params.password);
       try {
-        return await checkPassword.checkPassword(client, password);
+        return await checkPassword.checkPassword(client, {
+          password,
+          abortSignal
+        });
       } catch (e) {
         if (typeof params.password !== "function") {
           throw new errors.MtArgumentError("Provided password was invalid");

package/highlevel/methods/auth/start.js

@@ -3,6 +3,7 @@ import { MtArgumentError, MtcuteError } from "../../../types/errors.js";
 import { resolveMaybeDynamic, normalizePhoneNumber } from "../../utils/misc-utils.js";
 import { getMe } from "../users/get-me.js";
 import { checkPassword } from "./check-password.js";
+import { logOut } from "./log-out.js";
 import { resendCode } from "./resend-code.js";
 import { sendCode } from "./send-code.js";
 import { signInBot } from "./sign-in-bot.js";
@@ -23,8 +24,15 @@ async function start(client, params) {
     return me;
   } catch (e) {
     if (tl.RpcError.is(e)) {
-      if (e.text === "SESSION_PASSWORD_NEEDED") has2fa = true;
-      else if (e.text !== "AUTH_KEY_UNREGISTERED") throw e;
+      if (e.text === "SESSION_PASSWORD_NEEDED") {
+        has2fa = true;
+      } else if (e.text === "SESSION_REVOKED" || e.text === "USER_DEACTIVATED" || e.text === "USER_DEACTIVATED_BAN") {
+        await logOut(client).catch((err) => {
+          client.log.warn("failed to log out: %e", err);
+        });
+      } else if (e.text !== "AUTH_KEY_UNREGISTERED") {
+        throw e;
+      }
     } else {
       throw e;
     }
@@ -116,7 +124,10 @@ async function start(client, params) {
     for (; ; ) {
       const password = await resolveMaybeDynamic(params.password);
       try {
-        return await checkPassword(client, password);
+        return await checkPassword(client, {
+          password,
+          abortSignal
+        });
       } catch (e) {
         if (typeof params.password !== "function") {
           throw new MtArgumentError("Provided password was invalid");

package/network/client.cjs

@@ -62,7 +62,7 @@ class MtClient {
         storage: this.storage,
         testMode: Boolean(params.testMode),
         transport: params.transport,
-        emitError: this.emitError.bind(this),
+        emitError: params.onError,
         isPremium: false,
         useIpv6: Boolean(params.useIpv6),
         enableErrorReporting: params.enableErrorReporting ?? false,
@@ -103,7 +103,6 @@ class MtClient {
     if (typeAssertions.isTlRpcError(res)) throw new Error(`Failed to get config: ${res.errorMessage}`);
     return res;
   });
-  _emitError;
   log;
   network;
   _abortController;
@@ -112,13 +111,6 @@ class MtClient {
   onConnecting = new utils.Emitter();
   onNetworkChanged = new utils.Emitter();
   onUpdate = new utils.Emitter();
-  emitError(err) {
-    if (this._emitError) {
-      this._emitError(err);
-    } else if (this._connect.finished()) {
-      this.log.error("unhandled error:", err);
-    }
-  }
   _prepare = functionUtils.asyncResettable(async () => {
     await this.crypto.initialize?.();
     await this.storage.load();
@@ -179,13 +171,5 @@ class MtClient {
   async call(message, params) {
     return this.network.call(message, params);
   }
-  /**
-   * Register an error handler for the client
-   *
-   * @param handler Error handler.
-   */
-  onError(handler) {
-    this._emitError = handler;
-  }
 }
 exports.MtClient = MtClient;

package/network/client.d.cts

@@ -139,7 +139,9 @@ export interface MtClientOptions {
  * some APIs to manage that.
  */
 export declare class MtClient {
-    readonly params: MtClientOptions;
+    readonly params: MtClientOptions & {
+        onError: (err: unknown) => void;
+    };
     /**
      * Crypto provider taken from {@link MtClientOptions.crypto}
      */
@@ -162,7 +164,6 @@ export declare class MtClient {
     /** TL writers map used by the client */
     readonly _writerMap: TlWriterMap;
     readonly _config: ConfigManager;
-    private _emitError?;
     readonly log: Logger;
     readonly network: NetworkManager;
     private _abortController;
@@ -171,8 +172,9 @@ export declare class MtClient {
     readonly onConnecting: Emitter<void>;
     readonly onNetworkChanged: Emitter<boolean>;
     readonly onUpdate: Emitter<tl.TypeUpdates>;
-    constructor(params: MtClientOptions);
-    emitError(err: unknown): void;
+    constructor(params: MtClientOptions & {
+        onError: (err: unknown) => void;
+    });
     private _prepare;
     /**
      * **ADVANCED**
@@ -209,10 +211,4 @@ export declare class MtClient {
      * @param params  Additional call parameters
      */
     call<T extends tl.RpcMethod>(message: MustEqual<T, tl.RpcMethod>, params?: RpcCallOptions): Promise<tl.RpcCallReturn[T['_']] | mtp.RawMt_rpc_error>;
-    /**
-     * Register an error handler for the client
-     *
-     * @param handler Error handler.
-     */
-    onError(handler: (err: unknown) => void): void;
 }

package/network/client.d.ts

@@ -139,7 +139,9 @@ export interface MtClientOptions {
  * some APIs to manage that.
  */
 export declare class MtClient {
-    readonly params: MtClientOptions;
+    readonly params: MtClientOptions & {
+        onError: (err: unknown) => void;
+    };
     /**
      * Crypto provider taken from {@link MtClientOptions.crypto}
      */
@@ -162,7 +164,6 @@ export declare class MtClient {
     /** TL writers map used by the client */
     readonly _writerMap: TlWriterMap;
     readonly _config: ConfigManager;
-    private _emitError?;
     readonly log: Logger;
     readonly network: NetworkManager;
     private _abortController;
@@ -171,8 +172,9 @@ export declare class MtClient {
     readonly onConnecting: Emitter<void>;
     readonly onNetworkChanged: Emitter<boolean>;
     readonly onUpdate: Emitter<tl.TypeUpdates>;
-    constructor(params: MtClientOptions);
-    emitError(err: unknown): void;
+    constructor(params: MtClientOptions & {
+        onError: (err: unknown) => void;
+    });
     private _prepare;
     /**
      * **ADVANCED**
@@ -209,10 +211,4 @@ export declare class MtClient {
      * @param params  Additional call parameters
      */
     call<T extends tl.RpcMethod>(message: MustEqual<T, tl.RpcMethod>, params?: RpcCallOptions): Promise<tl.RpcCallReturn[T['_']] | mtp.RawMt_rpc_error>;
-    /**
-     * Register an error handler for the client
-     *
-     * @param handler Error handler.
-     */
-    onError(handler: (err: unknown) => void): void;
 }

package/network/client.js

@@ -55,7 +55,7 @@ class MtClient {
         storage: this.storage,
         testMode: Boolean(params.testMode),
         transport: params.transport,
-        emitError: this.emitError.bind(this),
+        emitError: params.onError,
         isPremium: false,
         useIpv6: Boolean(params.useIpv6),
         enableErrorReporting: params.enableErrorReporting ?? false,
@@ -96,7 +96,6 @@ class MtClient {
     if (isTlRpcError(res)) throw new Error(`Failed to get config: ${res.errorMessage}`);
     return res;
   });
-  _emitError;
   log;
   network;
   _abortController;
@@ -105,13 +104,6 @@ class MtClient {
   onConnecting = new Emitter();
   onNetworkChanged = new Emitter();
   onUpdate = new Emitter();
-  emitError(err) {
-    if (this._emitError) {
-      this._emitError(err);
-    } else if (this._connect.finished()) {
-      this.log.error("unhandled error:", err);
-    }
-  }
   _prepare = asyncResettable(async () => {
     await this.crypto.initialize?.();
     await this.storage.load();
@@ -172,14 +164,6 @@ class MtClient {
   async call(message, params) {
     return this.network.call(message, params);
   }
-  /**
-   * Register an error handler for the client
-   *
-   * @param handler Error handler.
-   */
-  onError(handler) {
-    this._emitError = handler;
-  }
 }
 export {
   MtClient

package/network/network-manager.cjs

@@ -220,7 +220,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.19.3",
+      appVersion: "0.19.6",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/network-manager.js

@@ -213,7 +213,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.19.3",
+      appVersion: "0.19.6",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/session-connection.cjs

@@ -172,6 +172,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
           return;
         }
         this.log.warn("transport error 404, reauthorizing");
+        this.onError.emit(error);
         this._session.resetAuthKey();
         this._resetSession();
         this.onKeyChange.emit(null);

package/network/session-connection.js

@@ -165,6 +165,7 @@ class SessionConnection extends PersistentConnection {
           return;
         }
         this.log.warn("transport error 404, reauthorizing");
+        this.onError.emit(error);
         this._session.resetAuthKey();
         this._resetSession();
         this.onKeyChange.emit(null);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@mtcute/core",
     "type": "module",
-    "version": "0.19.3",
+    "version": "0.19.6",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},