teleproto 1.220.0 → 1.221.1

package/Version.d.ts

@@ -1 +1 @@
-export declare const version = "1.220.0";
+export declare const version = "1.221.1";

package/Version.js

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

package/client/TelegramClient.d.ts

@@ -158,9 +158,10 @@ export declare class TelegramClient extends TelegramBaseClient {
      * @param apiCredentials - credentials to be used.
      * @param phoneNumber - the phone number to send the code to
      * @param forceSMS - whether to send it as an SMS or a normal in app message
+     * @param reCaptchaCallback - callback to handle reCAPTCHA verification
      * @return the phone code hash and whether it was sent via app
      */
-    sendCode(apiCredentials: authMethods.ApiCredentials, phoneNumber: string, forceSMS?: boolean): Promise<{
+    sendCode(apiCredentials: authMethods.ApiCredentials, phoneNumber: string, forceSMS?: boolean, reCaptchaCallback?: (siteKey: string) => Promise<string>): Promise<{
         phoneCodeHash: string;
         isCodeViaApp: boolean;
     }>;

package/client/TelegramClient.js

@@ -205,10 +205,11 @@ class TelegramClient extends telegramBaseClient_1.TelegramBaseClient {
      * @param apiCredentials - credentials to be used.
      * @param phoneNumber - the phone number to send the code to
      * @param forceSMS - whether to send it as an SMS or a normal in app message
+     * @param reCaptchaCallback - callback to handle reCAPTCHA verification
      * @return the phone code hash and whether it was sent via app
      */
-    sendCode(apiCredentials, phoneNumber, forceSMS = false) {
-        return authMethods.sendCode(this, apiCredentials, phoneNumber, forceSMS);
+    sendCode(apiCredentials, phoneNumber, forceSMS = false, reCaptchaCallback) {
+        return authMethods.sendCode(this, apiCredentials, phoneNumber, forceSMS, reCaptchaCallback);
     }
     /**
      * Uses the 2FA password to sign in the account.<br/>

package/client/auth.d.ts

@@ -27,6 +27,8 @@ export interface UserAuthParams {
     onError: (err: Error) => Promise<boolean> | void;
     /** whether to send the code through SMS or not. */
     forceSMS?: boolean;
+    /** optional callback for handling reCAPTCHA. */
+    reCaptchaCallback?: (siteKey: string) => Promise<string>;
 }
 export interface UserPasswordAuthParams {
     /** optional string or callback that should return the 2FA password if present.<br/>
@@ -79,7 +81,8 @@ export declare function signInUser(client: TelegramClient, apiCredentials: ApiCr
 /** @hidden */
 export declare function signInUserWithQrCode(client: TelegramClient, apiCredentials: ApiCredentials, authParams: QrCodeAuthParams): Promise<Api.TypeUser>;
 /** @hidden */
-export declare function sendCode(client: TelegramClient, apiCredentials: ApiCredentials, phoneNumber: string, forceSMS?: boolean): Promise<{
+/** @hidden */
+export declare function sendCode(client: TelegramClient, apiCredentials: ApiCredentials, phoneNumber: string, forceSMS?: boolean, reCaptchaCallback?: (siteKey: string) => Promise<string>): Promise<{
     phoneCodeHash: string;
     isCodeViaApp: boolean;
 }>;

package/client/auth.js

@@ -92,7 +92,7 @@ async function signInUser(client, apiCredentials, authParams) {
             else {
                 phoneNumber = authParams.phoneNumber;
             }
-            const sendCodeResult = await client.sendCode(apiCredentials, phoneNumber, authParams.forceSMS);
+            const sendCodeResult = await client.sendCode(apiCredentials, phoneNumber, authParams.forceSMS, authParams.reCaptchaCallback);
             phoneCodeHash = sendCodeResult.phoneCodeHash;
             isCodeViaApp = sendCodeResult.isCodeViaApp;
             if (typeof phoneCodeHash !== "string") {
@@ -273,15 +273,35 @@ async function signInUserWithQrCode(client, apiCredentials, authParams) {
     throw new Error("QR auth failed");
 }
 /** @hidden */
-async function sendCode(client, apiCredentials, phoneNumber, forceSMS = false) {
+/** @hidden */
+async function sendCode(client, apiCredentials, phoneNumber, forceSMS = false, reCaptchaCallback) {
+    var _a;
     try {
         const { apiId, apiHash } = apiCredentials;
-        const sendResult = await client.invoke(new tl_1.Api.auth.SendCode({
+        const request = new tl_1.Api.auth.SendCode({
             phoneNumber,
             apiId,
             apiHash,
             settings: new tl_1.Api.CodeSettings({}),
-        }));
+        });
+        let sendResult;
+        try {
+            sendResult = await client.invoke(request);
+        }
+        catch (err) {
+            const match = (_a = err.errorMessage) === null || _a === void 0 ? void 0 : _a.match(/RECAPTCHA_CHECK_.*(6Le[-\w]+)/);
+            if (match && reCaptchaCallback) {
+                const siteKey = match[1];
+                const token = await reCaptchaCallback(siteKey);
+                sendResult = await client.invoke(new tl_1.Api.InvokeWithReCaptcha({
+                    token: token,
+                    query: request,
+                }));
+            }
+            else {
+                throw err;
+            }
+        }
         if (sendResult instanceof tl_1.Api.auth.SentCodeSuccess)
             throw new Error("logged in right after sending the code");
         if (!(sendResult instanceof tl_1.Api.auth.SentCode)) {
@@ -316,7 +336,7 @@ async function sendCode(client, apiCredentials, phoneNumber, forceSMS = false) {
     }
     catch (err) {
         if (err.errorMessage === "AUTH_RESTART") {
-            return client.sendCode(apiCredentials, phoneNumber, forceSMS);
+            return sendCode(client, apiCredentials, phoneNumber, forceSMS, reCaptchaCallback);
         }
         else {
             throw err;

package/client/telegramBaseClient.d.ts

@@ -110,6 +110,11 @@ export interface TelegramClientParams {
      * What type of network connection to use (Normal Socket (for node) or Websockets (for browsers usually) )
      */
     networkSocket?: typeof PromisedNetSockets | typeof PromisedWebSockets;
+    /**
+     * Callback for handling reCAPTCHA verification.
+     * It should return the token obtained after solving the CAPTCHA.
+     */
+    reCaptchaCallback?: (siteKey: string) => Promise<string>;
 }
 export declare abstract class TelegramBaseClient {
     /** The current teleproto version. */
@@ -166,6 +171,8 @@ export declare abstract class TelegramBaseClient {
     /** @hidden */
     _parseMode?: ParseInterface;
     /** @hidden */
+    _reCaptchaCallback?: (siteKey: string) => Promise<string>;
+    /** @hidden */
     _ALBUMS: Map<string, [NodeJS.Timeout, Api.TypeUpdate[]]>;
     /** @hidden */
     _exportedSenderPromises: Map<number, Promise<MTProtoSender>>;

package/client/telegramBaseClient.js

@@ -88,6 +88,7 @@ class TelegramBaseClient {
         this._semaphore = new async_mutex_1.Semaphore(clientParams.maxConcurrentDownloads || 1);
         this.testServers = clientParams.testServers || false;
         this.networkSocket = clientParams.networkSocket || extensions_1.PromisedNetSockets;
+        this._reCaptchaCallback = clientParams.reCaptchaCallback;
         if (!(clientParams.connection instanceof Function)) {
             throw new Error("Connection should be a class not an instance");
         }

package/client/users.js

@@ -95,6 +95,26 @@ async function invoke(client, request, dcId, otherSender) {
                 await state.isReady();
                 state.after = undefined;
             }
+            else if (e.errorMessage &&
+                e.errorMessage.startsWith("RECAPTCHA_CHECK_") &&
+                client._reCaptchaCallback) {
+                const match = e.errorMessage.match(/RECAPTCHA_CHECK_.*(6Le[-\w]+)/);
+                if (match) {
+                    const siteKey = match[1];
+                    const token = await client._reCaptchaCallback(siteKey);
+                    const newRequest = new tl_1.Api.InvokeWithReCaptcha({
+                        token: token,
+                        query: request,
+                    });
+                    await newRequest.resolve(client, __1.utils);
+                    state.request = newRequest;
+                    state.data = newRequest.getBytes();
+                }
+                else {
+                    state.finished.resolve();
+                    throw e;
+                }
+            }
             else if (e.message === "CONNECTION_NOT_INITED") {
                 await client.disconnect();
                 await (0, Helpers_1.sleep)(2000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teleproto",
-  "version": "1.220.0",
+  "version": "1.221.1",
   "description": "NodeJS MTProto API Telegram client library,",
   "main": "index.js",
   "types": "index.d.ts",

package/tl/AllTLObjects.d.ts

@@ -1,3 +1,3 @@
-export declare const LAYER = 220;
+export declare const LAYER = 221;
 declare const tlobjects: any;
 export { tlobjects };

package/tl/AllTLObjects.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tlobjects = exports.LAYER = void 0;
-exports.LAYER = 220;
+exports.LAYER = 221;
 const _1 = require(".");
 const tlobjects = {};
 exports.tlobjects = tlobjects;