@mtkruto/node 0.0.976 → 0.0.978

package/esm/client/3_client.d.ts

@@ -23,7 +23,7 @@ export declare enum ParseMode {
 export interface AuthorizeUserParams<S = string> {
     phone: S | (() => MaybePromise<S>);
     code: S | (() => MaybePromise<S>);
-    password: S | (() => MaybePromise<S>);
+    password: S | ((hint: string | null) => MaybePromise<S>);
 }
 export type UpdateHandler = null | ((client: Client, update: types.TypeUpdate) => MaybePromise<void>);
 export interface ClientParams {
@@ -32,7 +32,7 @@ export interface ClientParams {
      */
     parseMode?: ParseMode;
     /**
-     * The transport provider to use. Defaults to `defaultTransportProvider`.
+     * The transport provider to use. Defaults to `webSocketTransportProvider`.
      */
     transportProvider?: TransportProvider;
     /**
@@ -59,7 +59,14 @@ export interface ClientParams {
      * The system_version parameter to be passed to initConnection when calling `authorize`.
      */
     systemVersion?: string;
+    /**
+     * MTProto public keys to use in the `[keyId, [key, exponent]][]` format. Don't set this unless you know what you are doing.
+     */
     publicKeys?: PublicKeys;
+    /**
+     * Whether to automatically call `start` with no parameters in the first `invoke` call.
+     */
+    autoStart?: boolean;
 }
 export interface ForwardMessagesParams {
     messageThreadId?: number;
@@ -88,6 +95,7 @@ export declare class Client extends ClientAbstract {
     readonly systemLangCode: string;
     readonly systemVersion: string;
     private readonly publicKeys?;
+    private readonly autoStart;
     /**
      * Constructs the client.
      *
@@ -138,6 +146,7 @@ export declare class Client extends ClientAbstract {
     start(params?: string | types.AuthExportedAuthorization | AuthorizeUserParams): Promise<void>;
     private receiveLoop;
     private pingLoop;
+    private autoStarted;
     private lastMsgId;
     /**
      * Invokes a function waiting and returning its reply if the second parameter is not `true`. Requires the client
@@ -187,4 +196,5 @@ export declare class Client extends ClientAbstract {
     [getStickerSetName](inputStickerSet: types.InputStickerSetID, hash?: number): Promise<string>;
     forwardMessages(from: number | string, to: number | string, messageIds: number[], params?: ForwardMessagesParams): Promise<Message[]>;
     forwardMessage(from: number | string, to: number | string, messageId: number, params?: ForwardMessagesParams): Promise<Message>;
+    getMe(): Promise<import("../types/1_user.js").User>;
 }

package/esm/client/3_client.js

@@ -23,9 +23,9 @@ import { parseHtml } from "./0_html.js";
 import { checkPassword } from "./0_password.js";
 import { ClientAbstract } from "./1_client_abstract.js";
 import { ClientPlain } from "./2_client_plain.js";
-import { drop } from "../utilities/1_misc.js";
+import { drop, mustPrompt, mustPromptOneOf } from "../utilities/1_misc.js";
 import { getChannelChatId, peerToChatId } from "./0_utilities.js";
-import { mustPrompt, mustPromptNumber } from "../utilities/1_misc.js";
+import { constructUser } from "../types/1_user.js";
 const d = debug("Client");
 const dGap = debug("Client/recoverUpdateGap");
 const dGapC = debug("Client/recoverChannelUpdateGap");
@@ -160,12 +160,24 @@ export class Client extends ClientAbstract {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "autoStart", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "storageInited", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "autoStarted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "lastMsgId", {
             enumerable: true,
             configurable: true,
@@ -198,6 +210,7 @@ export class Client extends ClientAbstract {
         this.systemLangCode = params?.systemLangCode ?? SYSTEM_LANG_CODE;
         this.systemVersion = params?.systemVersion ?? SYSTEM_VERSION;
         this.publicKeys = params?.publicKeys;
+        this.autoStart = params?.autoStart ?? true;
     }
     /**
      * Sets the DC and resets the auth key stored in the session provider
@@ -305,16 +318,12 @@ export class Client extends ClientAbstract {
             throw new Error("apiHash not set");
         }
         if (typeof params === "undefined") {
-            const phoneNumberOrBotToken = mustPrompt("Enter a phone number or a bot token:");
-            if (phoneNumberOrBotToken.startsWith("+")) {
-                params = {
-                    phone: phoneNumberOrBotToken,
-                    code: () => String(mustPromptNumber("Enter the verification code:")),
-                    password: () => mustPrompt("Enter the account password:"),
-                };
+            const loginType = mustPromptOneOf("Do you want to login as bot [b] or user [u]?", ["b", "u"]);
+            if (loginType == "b") {
+                params = mustPrompt("Bot token:");
             }
             else {
-                params = phoneNumberOrBotToken;
+                params = { phone: () => mustPrompt("Phone number:"), code: () => mustPrompt("Verification code:"), password: () => mustPrompt(`Password:`) };
             }
         }
         dAuth("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
@@ -339,7 +348,7 @@ export class Client extends ClientAbstract {
                     const ap = await this.invoke(new functions.AccountGetPassword());
                     if (ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow) {
                         try {
-                            const password = typeof params.password === "string" ? params.password : await params.password();
+                            const password = typeof params.password === "string" ? params.password : await params.password(ap.hint ?? null);
                             const input = await checkPassword(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
                             await this.storage.setAccountType("user");
@@ -393,7 +402,7 @@ export class Client extends ClientAbstract {
                                 apiId: this.apiId,
                                 apiHash: this.apiHash,
                                 phoneNumber,
-                                settings: new types.CodeSettings({}),
+                                settings: new types.CodeSettings(),
                             }));
                             dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
@@ -585,7 +594,15 @@ export class Client extends ClientAbstract {
     }
     async invoke(function_, noWait) {
         if (!this.auth) {
-            throw new Error("Not connected");
+            if (this.autoStart && !this.autoStarted) {
+                await this.start();
+            }
+            else {
+                throw new Error("Not connected");
+            }
+        }
+        if (!this.auth) {
+            UNREACHABLE();
         }
         let seqNo = this.state.seqNo * 2;
         if (!(function_ instanceof functions.Ping) && !(function_ instanceof types.MsgsAck)) {
@@ -1313,4 +1330,11 @@ export class Client extends ClientAbstract {
     async forwardMessage(from, to, messageId, params) {
         return await this.forwardMessages(from, to, [messageId], params).then((v) => v[0]);
     }
+    async getMe() {
+        const users = await this.invoke(new functions.UsersGetUsers({ id: [new types.InputUserSelf()] }));
+        if (users.length < 1) {
+            UNREACHABLE();
+        }
+        return constructUser(users[0][as](types.User));
+    }
 }

package/esm/constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 160;
-export declare const APP_VERSION = "MTKruto 0.0.976";
+export declare const APP_VERSION = "MTKruto 0.0.978";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/constants.js

@@ -54,7 +54,7 @@ export const PUBLIC_KEYS = Object.freeze([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const INITIAL_DC = "2-test";
 export const LAYER = 160;
-export const APP_VERSION = "MTKruto 0.0.976";
+export const APP_VERSION = "MTKruto 0.0.978";
 // @ts-ignore: lib
 export const 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;
 export const LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/esm/utilities/1_misc.d.ts

@@ -1,3 +1,4 @@
 export declare function drop<T>(promise: Promise<T>): void;
 export declare function mustPrompt(message: string): string;
 export declare function mustPromptNumber(message: string): number;
+export declare function mustPromptOneOf<T extends readonly string[]>(message: string, choices: T): T[number];

package/esm/utilities/1_misc.js

@@ -19,3 +19,10 @@ export function mustPromptNumber(message) {
     }
     return result;
 }
+export function mustPromptOneOf(message, choices) {
+    let result = prompt(message);
+    while (result == null || !choices.includes(result)) {
+        result = prompt(message);
+    }
+    return result;
+}

package/package.json

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

package/script/client/3_client.d.ts

@@ -23,7 +23,7 @@ export declare enum ParseMode {
 export interface AuthorizeUserParams<S = string> {
     phone: S | (() => MaybePromise<S>);
     code: S | (() => MaybePromise<S>);
-    password: S | (() => MaybePromise<S>);
+    password: S | ((hint: string | null) => MaybePromise<S>);
 }
 export type UpdateHandler = null | ((client: Client, update: types.TypeUpdate) => MaybePromise<void>);
 export interface ClientParams {
@@ -32,7 +32,7 @@ export interface ClientParams {
      */
     parseMode?: ParseMode;
     /**
-     * The transport provider to use. Defaults to `defaultTransportProvider`.
+     * The transport provider to use. Defaults to `webSocketTransportProvider`.
      */
     transportProvider?: TransportProvider;
     /**
@@ -59,7 +59,14 @@ export interface ClientParams {
      * The system_version parameter to be passed to initConnection when calling `authorize`.
      */
     systemVersion?: string;
+    /**
+     * MTProto public keys to use in the `[keyId, [key, exponent]][]` format. Don't set this unless you know what you are doing.
+     */
     publicKeys?: PublicKeys;
+    /**
+     * Whether to automatically call `start` with no parameters in the first `invoke` call.
+     */
+    autoStart?: boolean;
 }
 export interface ForwardMessagesParams {
     messageThreadId?: number;
@@ -88,6 +95,7 @@ export declare class Client extends ClientAbstract {
     readonly systemLangCode: string;
     readonly systemVersion: string;
     private readonly publicKeys?;
+    private readonly autoStart;
     /**
      * Constructs the client.
      *
@@ -138,6 +146,7 @@ export declare class Client extends ClientAbstract {
     start(params?: string | types.AuthExportedAuthorization | AuthorizeUserParams): Promise<void>;
     private receiveLoop;
     private pingLoop;
+    private autoStarted;
     private lastMsgId;
     /**
      * Invokes a function waiting and returning its reply if the second parameter is not `true`. Requires the client
@@ -187,4 +196,5 @@ export declare class Client extends ClientAbstract {
     [getStickerSetName](inputStickerSet: types.InputStickerSetID, hash?: number): Promise<string>;
     forwardMessages(from: number | string, to: number | string, messageIds: number[], params?: ForwardMessagesParams): Promise<Message[]>;
     forwardMessage(from: number | string, to: number | string, messageId: number, params?: ForwardMessagesParams): Promise<Message>;
+    getMe(): Promise<import("../types/1_user.js").User>;
 }

package/script/client/3_client.js

@@ -51,7 +51,7 @@ const _1_client_abstract_js_1 = require("./1_client_abstract.js");
 const _2_client_plain_js_1 = require("./2_client_plain.js");
 const _1_misc_js_1 = require("../utilities/1_misc.js");
 const _0_utilities_js_1 = require("./0_utilities.js");
-const _1_misc_js_2 = require("../utilities/1_misc.js");
+const _1_user_js_1 = require("../types/1_user.js");
 const d = (0, deps_js_1.debug)("Client");
 const dGap = (0, deps_js_1.debug)("Client/recoverUpdateGap");
 const dGapC = (0, deps_js_1.debug)("Client/recoverChannelUpdateGap");
@@ -186,12 +186,24 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "autoStart", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "storageInited", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "autoStarted", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "lastMsgId", {
             enumerable: true,
             configurable: true,
@@ -224,6 +236,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         this.systemLangCode = params?.systemLangCode ?? constants_js_1.SYSTEM_LANG_CODE;
         this.systemVersion = params?.systemVersion ?? constants_js_1.SYSTEM_VERSION;
         this.publicKeys = params?.publicKeys;
+        this.autoStart = params?.autoStart ?? true;
     }
     /**
      * Sets the DC and resets the auth key stored in the session provider
@@ -331,16 +344,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             throw new Error("apiHash not set");
         }
         if (typeof params === "undefined") {
-            const phoneNumberOrBotToken = (0, _1_misc_js_2.mustPrompt)("Enter a phone number or a bot token:");
-            if (phoneNumberOrBotToken.startsWith("+")) {
-                params = {
-                    phone: phoneNumberOrBotToken,
-                    code: () => String((0, _1_misc_js_2.mustPromptNumber)("Enter the verification code:")),
-                    password: () => (0, _1_misc_js_2.mustPrompt)("Enter the account password:"),
-                };
+            const loginType = (0, _1_misc_js_1.mustPromptOneOf)("Do you want to login as bot [b] or user [u]?", ["b", "u"]);
+            if (loginType == "b") {
+                params = (0, _1_misc_js_1.mustPrompt)("Bot token:");
             }
             else {
-                params = phoneNumberOrBotToken;
+                params = { phone: () => (0, _1_misc_js_1.mustPrompt)("Phone number:"), code: () => (0, _1_misc_js_1.mustPrompt)("Verification code:"), password: () => (0, _1_misc_js_1.mustPrompt)(`Password:`) };
             }
         }
         dAuth("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
@@ -365,7 +374,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     const ap = await this.invoke(new functions.AccountGetPassword());
                     if (ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow) {
                         try {
-                            const password = typeof params.password === "string" ? params.password : await params.password();
+                            const password = typeof params.password === "string" ? params.password : await params.password(ap.hint ?? null);
                             const input = await (0, _0_password_js_1.checkPassword)(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
                             await this.storage.setAccountType("user");
@@ -419,7 +428,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                                 apiId: this.apiId,
                                 apiHash: this.apiHash,
                                 phoneNumber,
-                                settings: new types.CodeSettings({}),
+                                settings: new types.CodeSettings(),
                             }));
                             dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
@@ -611,7 +620,15 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
     }
     async invoke(function_, noWait) {
         if (!this.auth) {
-            throw new Error("Not connected");
+            if (this.autoStart && !this.autoStarted) {
+                await this.start();
+            }
+            else {
+                throw new Error("Not connected");
+            }
+        }
+        if (!this.auth) {
+            (0, _0_control_js_1.UNREACHABLE)();
         }
         let seqNo = this.state.seqNo * 2;
         if (!(function_ instanceof functions.Ping) && !(function_ instanceof types.MsgsAck)) {
@@ -1339,5 +1356,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
     async forwardMessage(from, to, messageId, params) {
         return await this.forwardMessages(from, to, [messageId], params).then((v) => v[0]);
     }
+    async getMe() {
+        const users = await this.invoke(new functions.UsersGetUsers({ id: [new types.InputUserSelf()] }));
+        if (users.length < 1) {
+            (0, _0_control_js_1.UNREACHABLE)();
+        }
+        return (0, _1_user_js_1.constructUser)(users[0][_1_tl_object_js_1.as](types.User));
+    }
 }
 exports.Client = Client;

package/script/constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 160;
-export declare const APP_VERSION = "MTKruto 0.0.976";
+export declare const APP_VERSION = "MTKruto 0.0.978";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2-test";
 exports.LAYER = 160;
-exports.APP_VERSION = "MTKruto 0.0.976";
+exports.APP_VERSION = "MTKruto 0.0.978";
 // @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/utilities/1_misc.d.ts

@@ -1,3 +1,4 @@
 export declare function drop<T>(promise: Promise<T>): void;
 export declare function mustPrompt(message: string): string;
 export declare function mustPromptNumber(message: string): number;
+export declare function mustPromptOneOf<T extends readonly string[]>(message: string, choices: T): T[number];

package/script/utilities/1_misc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mustPromptNumber = exports.mustPrompt = exports.drop = void 0;
+exports.mustPromptOneOf = exports.mustPromptNumber = exports.mustPrompt = exports.drop = void 0;
 const _0_control_js_1 = require("./0_control.js");
 function drop(promise) {
     promise.then().catch();
@@ -25,3 +25,11 @@ function mustPromptNumber(message) {
     return result;
 }
 exports.mustPromptNumber = mustPromptNumber;
+function mustPromptOneOf(message, choices) {
+    let result = prompt(message);
+    while (result == null || !choices.includes(result)) {
+        result = prompt(message);
+    }
+    return result;
+}
+exports.mustPromptOneOf = mustPromptOneOf;