@mtkruto/node 0.0.900 → 0.0.901

package/esm/client/client.js

@@ -1,5 +1,5 @@
 import { debug, gunzip, Mutex, queue } from "../deps.js";
-import { ackThreshold, CHANNEL_DIFFERENCE_LIMIT_BOT, CHANNEL_DIFFERENCE_LIMIT_USER, DEFAULT_APP_VERSION, DEFAULT_DEVICE_MODEL, DEFAULT_INITIAL_DC, DEFAULT_LANG_CODE, DEFAULT_LANG_PACK, DEFAULT_SYSTEM_LANG_CODE, DEFAULT_SYSTEM_VERSION, LAYER, MAX_CHANNEL_ID, MAX_CHAT_ID, USERNAME_TTL, ZERO_CHANNEL_ID } from "../constants.js";
+import { ackThreshold, CHANNEL_DIFFERENCE_LIMIT_BOT, CHANNEL_DIFFERENCE_LIMIT_USER, DEFAULT_APP_VERSION, DEFAULT_DEVICE_MODEL, DEFAULT_LANG_CODE, DEFAULT_LANG_PACK, DEFAULT_SYSTEM_LANG_CODE, DEFAULT_SYSTEM_VERSION, LAYER, MAX_CHANNEL_ID, MAX_CHAT_ID, USERNAME_TTL, ZERO_CHANNEL_ID } from "../constants.js";
 import { bigIntFromBuffer, getRandomBigInt, getRandomId } from "../utilities/0_bigint.js";
 import { UNREACHABLE } from "../utilities/0_control.js";
 import { sha1 } from "../utilities/0_hash.js";
@@ -247,6 +247,7 @@ export class Client extends ClientAbstract {
         if (await this.storage.getDc() != dc) {
             await this.storage.setDc(dc);
             await this.storage.setAuthKey(null);
+            await this.storage.getAuthKey();
         }
         super.setDc(dc);
     }
@@ -288,7 +289,7 @@ export class Client extends ClientAbstract {
         }
         await super.connect();
         if (dc == null) {
-            await this.storage.setDc(DEFAULT_INITIAL_DC);
+            await this.storage.setDc(this.transportProvider.initialDc);
         }
         d("enrypted client connected");
         this.receiveLoop();

package/esm/client/client_abstract.d.ts

@@ -7,6 +7,8 @@ export declare abstract class ClientAbstract {
     protected connection: Connection;
     protected transport: Transport;
     private _dcId;
+    private _initialDc;
+    get initialDc(): DC;
     constructor(transportProvider?: import("../transport/transport_provider.js").TransportProvider);
     get dcId(): number;
     setDc(dc: DC): MaybePromise<void>;

package/esm/client/client_abstract.js

@@ -2,6 +2,9 @@ import { initTgCrypto } from "../deps.js";
 import { DEFAULT_INITIAL_DC } from "../constants.js";
 import { defaultTransportProvider } from "../transport/transport_provider.js";
 export class ClientAbstract {
+    get initialDc() {
+        return this._initialDc;
+    }
     constructor(transportProvider = defaultTransportProvider({ initialDc: DEFAULT_INITIAL_DC })) {
         Object.defineProperty(this, "transportProvider", {
             enumerable: true,
@@ -27,7 +30,15 @@ export class ClientAbstract {
             writable: true,
             value: void 0
         });
-        const { connection, transport, dcId } = transportProvider({ cdn: false });
+        Object.defineProperty(this, "_initialDc", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        const { initialDc, createTransport } = transportProvider;
+        this._initialDc = initialDc;
+        const { connection, transport, dcId } = createTransport({ cdn: false });
         this.connection = connection;
         this.transport = transport;
         this._dcId = dcId;
@@ -37,7 +48,7 @@ export class ClientAbstract {
     }
     // MaybePromise since `Client` has to deal with `Storage.set()`
     setDc(dc) {
-        const { connection, transport, dcId } = this.transportProvider({ dc, cdn: false });
+        const { connection, transport, dcId } = this.transportProvider.createTransport({ dc, cdn: false });
         this.connection = connection;
         this.transport = transport;
         this._dcId = dcId;
@@ -53,7 +64,7 @@ export class ClientAbstract {
     async reconnect(dc) {
         await this.disconnect();
         if (dc) {
-            this.setDc(dc);
+            await this.setDc(dc);
         }
         await this.connect();
     }

package/esm/client/client_plain.js

@@ -2,6 +2,7 @@ import { assertEquals, assertInstanceOf, debug, factorize, ige256Decrypt, ige256
 import { publicKeys } from "../constants.js";
 import { bigIntFromBuffer, getRandomBigInt, modExp } from "../utilities/0_bigint.js";
 import { bufferFromBigInt, concat } from "../utilities/0_buffer.js";
+import { UNREACHABLE } from "../utilities/0_control.js";
 import { sha1 } from "../utilities/0_hash.js";
 import { rsaPad } from "../utilities/1_auth.js";
 import { serialize } from "../tl/1_tl_object.js";
@@ -28,10 +29,23 @@ export class ClientPlain extends ClientAbstract {
     async createAuthKey() {
         const nonce = getRandomBigInt(16, false, true);
         d("auth key creation started");
-        const resPq = await this.invoke(new ReqPQMulti({ nonce }));
-        assertInstanceOf(resPq, ResPQ);
-        assertEquals(resPq.nonce, nonce);
-        d("got res_pq");
+        let resPq = null;
+        for (let i = 0; i < 10; i++) {
+            try {
+                d("req_pq_multi [%d]", i + 1);
+                resPq = await this.invoke(new ReqPQMulti({ nonce }));
+                assertInstanceOf(resPq, ResPQ);
+                assertEquals(resPq.nonce, nonce);
+                d("got res_pq");
+                break;
+            }
+            catch (err) {
+                d("req_pq_multi error: %o", err);
+            }
+        }
+        if (!resPq) {
+            UNREACHABLE();
+        }
         const pq_ = bigIntFromBuffer(resPq.pq, false, false);
         const [p_, q_] = factorize(pq_);
         d("factorized pq");

package/esm/constants.d.ts

@@ -4,12 +4,12 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const DEFAULT_INITIAL_DC: DC;
 export declare const LAYER = 158;
-export declare const DEFAULT_APP_VERSION = "MTKruto Unstable <v1.0.0";
-export declare const DEFAULT_DEVICE_MODEL = "Krutaya Device";
-export declare const DEFAULT_LANG_CODE = "en";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+export declare const DEFAULT_DEVICE_MODEL: string;
+export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";
-export declare const DEFAULT_SYSTEM_LANG_CODE = "en";
-export declare const DEFAULT_SYSTEM_VERSION = "1.0";
+export declare const DEFAULT_SYSTEM_LANG_CODE: string;
+export declare const DEFAULT_SYSTEM_VERSION: string;
 export declare const USERNAME_TTL = 86400;
 export declare const MAX_CHAT_ID = 999999999999;
 export declare const MAX_CHANNEL_ID = 997852516352;

package/esm/constants.js

@@ -1,3 +1,4 @@
+import * as dntShim from "./_dnt.shims.js";
 export const ackThreshold = 10;
 export const publicKeys = new Map([
     [
@@ -61,13 +62,14 @@ export const publicKeys = new Map([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const DEFAULT_INITIAL_DC = "2-test";
 export const LAYER = 158;
-// TODO
-export const DEFAULT_APP_VERSION = "MTKruto Unstable <v1.0.0";
-export const DEFAULT_DEVICE_MODEL = "Krutaya Device";
-export const DEFAULT_LANG_CODE = "en";
+export const DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+// @ts-ignore: lib
+export const DEFAULT_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 DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
 export const DEFAULT_LANG_PACK = "";
-export const DEFAULT_SYSTEM_LANG_CODE = "en";
-export const DEFAULT_SYSTEM_VERSION = "1.0";
+export const DEFAULT_SYSTEM_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
+// @ts-ignore: lib
+export const DEFAULT_SYSTEM_VERSION = typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : "Node.js/" + process.versions.node : navigator.userAgent;
 export const USERNAME_TTL = 86400;
 export const MAX_CHAT_ID = 999999999999;
 export const MAX_CHANNEL_ID = 997852516352;

package/esm/transport/transport_provider.d.ts

@@ -5,10 +5,13 @@ export interface TransportProviderParams {
     dc?: DC;
     cdn: boolean;
 }
-export type TransportProvider = (params: TransportProviderParams) => {
-    connection: Connection;
-    transport: Transport;
-    dcId: number;
+export type TransportProvider = {
+    initialDc: DC;
+    createTransport: (params: TransportProviderParams) => {
+        connection: Connection;
+        transport: Transport;
+        dcId: number;
+    };
 };
 export interface TransportProviderCreatorParams {
     initialDc: DC;

package/esm/transport/transport_provider.js

@@ -11,13 +11,16 @@ const dcToNameMap = {
     "5": "flora",
 };
 export const defaultTransportProvider = ({ initialDc, wss }) => {
-    return ({ dc, cdn }) => {
-        dc ??= initialDc;
-        wss ??= typeof location !== "undefined" && location.protocol == "http:" ? false : true;
-        const url = `${wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
-        const connection = new ConnectionWebSocket(url);
-        const transport = new TransportIntermediate(connection, true);
-        const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
-        return { connection, transport, dcId };
+    return {
+        initialDc,
+        createTransport: ({ dc, cdn }) => {
+            dc ??= initialDc;
+            wss ??= typeof location !== "undefined" && location.protocol == "http:" ? false : true;
+            const url = `${wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
+            const connection = new ConnectionWebSocket(url);
+            const transport = new TransportIntermediate(connection, true);
+            const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
+            return { connection, transport, dcId };
+        },
     };
 };

package/package.json

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

package/script/client/client.js

@@ -273,6 +273,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (await this.storage.getDc() != dc) {
             await this.storage.setDc(dc);
             await this.storage.setAuthKey(null);
+            await this.storage.getAuthKey();
         }
         super.setDc(dc);
     }
@@ -314,7 +315,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
         await super.connect();
         if (dc == null) {
-            await this.storage.setDc(constants_js_1.DEFAULT_INITIAL_DC);
+            await this.storage.setDc(this.transportProvider.initialDc);
         }
         d("enrypted client connected");
         this.receiveLoop();

package/script/client/client_abstract.d.ts

@@ -7,6 +7,8 @@ export declare abstract class ClientAbstract {
     protected connection: Connection;
     protected transport: Transport;
     private _dcId;
+    private _initialDc;
+    get initialDc(): DC;
     constructor(transportProvider?: import("../transport/transport_provider.js").TransportProvider);
     get dcId(): number;
     setDc(dc: DC): MaybePromise<void>;

package/script/client/client_abstract.js

@@ -5,6 +5,9 @@ const deps_js_1 = require("../deps.js");
 const constants_js_1 = require("../constants.js");
 const transport_provider_js_1 = require("../transport/transport_provider.js");
 class ClientAbstract {
+    get initialDc() {
+        return this._initialDc;
+    }
     constructor(transportProvider = (0, transport_provider_js_1.defaultTransportProvider)({ initialDc: constants_js_1.DEFAULT_INITIAL_DC })) {
         Object.defineProperty(this, "transportProvider", {
             enumerable: true,
@@ -30,7 +33,15 @@ class ClientAbstract {
             writable: true,
             value: void 0
         });
-        const { connection, transport, dcId } = transportProvider({ cdn: false });
+        Object.defineProperty(this, "_initialDc", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        const { initialDc, createTransport } = transportProvider;
+        this._initialDc = initialDc;
+        const { connection, transport, dcId } = createTransport({ cdn: false });
         this.connection = connection;
         this.transport = transport;
         this._dcId = dcId;
@@ -40,7 +51,7 @@ class ClientAbstract {
     }
     // MaybePromise since `Client` has to deal with `Storage.set()`
     setDc(dc) {
-        const { connection, transport, dcId } = this.transportProvider({ dc, cdn: false });
+        const { connection, transport, dcId } = this.transportProvider.createTransport({ dc, cdn: false });
         this.connection = connection;
         this.transport = transport;
         this._dcId = dcId;
@@ -56,7 +67,7 @@ class ClientAbstract {
     async reconnect(dc) {
         await this.disconnect();
         if (dc) {
-            this.setDc(dc);
+            await this.setDc(dc);
         }
         await this.connect();
     }

package/script/client/client_plain.js

@@ -5,6 +5,7 @@ const deps_js_1 = require("../deps.js");
 const constants_js_1 = require("../constants.js");
 const _0_bigint_js_1 = require("../utilities/0_bigint.js");
 const _0_buffer_js_1 = require("../utilities/0_buffer.js");
+const _0_control_js_1 = require("../utilities/0_control.js");
 const _0_hash_js_1 = require("../utilities/0_hash.js");
 const _1_auth_js_1 = require("../utilities/1_auth.js");
 const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
@@ -31,10 +32,23 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
     async createAuthKey() {
         const nonce = (0, _0_bigint_js_1.getRandomBigInt)(16, false, true);
         d("auth key creation started");
-        const resPq = await this.invoke(new _3_functions_js_1.ReqPQMulti({ nonce }));
-        (0, deps_js_1.assertInstanceOf)(resPq, _2_types_js_1.ResPQ);
-        (0, deps_js_1.assertEquals)(resPq.nonce, nonce);
-        d("got res_pq");
+        let resPq = null;
+        for (let i = 0; i < 10; i++) {
+            try {
+                d("req_pq_multi [%d]", i + 1);
+                resPq = await this.invoke(new _3_functions_js_1.ReqPQMulti({ nonce }));
+                (0, deps_js_1.assertInstanceOf)(resPq, _2_types_js_1.ResPQ);
+                (0, deps_js_1.assertEquals)(resPq.nonce, nonce);
+                d("got res_pq");
+                break;
+            }
+            catch (err) {
+                d("req_pq_multi error: %o", err);
+            }
+        }
+        if (!resPq) {
+            (0, _0_control_js_1.UNREACHABLE)();
+        }
         const pq_ = (0, _0_bigint_js_1.bigIntFromBuffer)(resPq.pq, false, false);
         const [p_, q_] = (0, deps_js_1.factorize)(pq_);
         d("factorized pq");

package/script/constants.d.ts

@@ -4,12 +4,12 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const DEFAULT_INITIAL_DC: DC;
 export declare const LAYER = 158;
-export declare const DEFAULT_APP_VERSION = "MTKruto Unstable <v1.0.0";
-export declare const DEFAULT_DEVICE_MODEL = "Krutaya Device";
-export declare const DEFAULT_LANG_CODE = "en";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+export declare const DEFAULT_DEVICE_MODEL: string;
+export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";
-export declare const DEFAULT_SYSTEM_LANG_CODE = "en";
-export declare const DEFAULT_SYSTEM_VERSION = "1.0";
+export declare const DEFAULT_SYSTEM_LANG_CODE: string;
+export declare const DEFAULT_SYSTEM_VERSION: string;
 export declare const USERNAME_TTL = 86400;
 export declare const MAX_CHAT_ID = 999999999999;
 export declare const MAX_CHANNEL_ID = 997852516352;

package/script/constants.js

@@ -1,6 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CHANNEL_DIFFERENCE_LIMIT_BOT = exports.CHANNEL_DIFFERENCE_LIMIT_USER = exports.ZERO_CHANNEL_ID = exports.MAX_CHANNEL_ID = exports.MAX_CHAT_ID = exports.USERNAME_TTL = exports.DEFAULT_SYSTEM_VERSION = exports.DEFAULT_SYSTEM_LANG_CODE = exports.DEFAULT_LANG_PACK = exports.DEFAULT_LANG_CODE = exports.DEFAULT_DEVICE_MODEL = exports.DEFAULT_APP_VERSION = exports.LAYER = exports.DEFAULT_INITIAL_DC = exports.VECTOR_CONSTRUCTOR = exports.publicKeys = exports.ackThreshold = void 0;
+const dntShim = __importStar(require("./_dnt.shims.js"));
 exports.ackThreshold = 10;
 exports.publicKeys = new Map([
     [
@@ -64,13 +88,14 @@ exports.publicKeys = new Map([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.DEFAULT_INITIAL_DC = "2-test";
 exports.LAYER = 158;
-// TODO
-exports.DEFAULT_APP_VERSION = "MTKruto Unstable <v1.0.0";
-exports.DEFAULT_DEVICE_MODEL = "Krutaya Device";
-exports.DEFAULT_LANG_CODE = "en";
+exports.DEFAULT_APP_VERSION = "MTKruto 0.0.901";
+// @ts-ignore: lib
+exports.DEFAULT_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.DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
 exports.DEFAULT_LANG_PACK = "";
-exports.DEFAULT_SYSTEM_LANG_CODE = "en";
-exports.DEFAULT_SYSTEM_VERSION = "1.0";
+exports.DEFAULT_SYSTEM_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
+// @ts-ignore: lib
+exports.DEFAULT_SYSTEM_VERSION = typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : "Node.js/" + process.versions.node : navigator.userAgent;
 exports.USERNAME_TTL = 86400;
 exports.MAX_CHAT_ID = 999999999999;
 exports.MAX_CHANNEL_ID = 997852516352;

package/script/transport/transport_provider.d.ts

@@ -5,10 +5,13 @@ export interface TransportProviderParams {
     dc?: DC;
     cdn: boolean;
 }
-export type TransportProvider = (params: TransportProviderParams) => {
-    connection: Connection;
-    transport: Transport;
-    dcId: number;
+export type TransportProvider = {
+    initialDc: DC;
+    createTransport: (params: TransportProviderParams) => {
+        connection: Connection;
+        transport: Transport;
+        dcId: number;
+    };
 };
 export interface TransportProviderCreatorParams {
     initialDc: DC;

package/script/transport/transport_provider.js

@@ -14,14 +14,17 @@ const dcToNameMap = {
     "5": "flora",
 };
 const defaultTransportProvider = ({ initialDc, wss }) => {
-    return ({ dc, cdn }) => {
-        dc ??= initialDc;
-        wss ??= typeof location !== "undefined" && location.protocol == "http:" ? false : true;
-        const url = `${wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
-        const connection = new connection_web_socket_js_1.ConnectionWebSocket(url);
-        const transport = new transport_intermediate_js_1.TransportIntermediate(connection, true);
-        const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
-        return { connection, transport, dcId };
+    return {
+        initialDc,
+        createTransport: ({ dc, cdn }) => {
+            dc ??= initialDc;
+            wss ??= typeof location !== "undefined" && location.protocol == "http:" ? false : true;
+            const url = `${wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
+            const connection = new connection_web_socket_js_1.ConnectionWebSocket(url);
+            const transport = new transport_intermediate_js_1.TransportIntermediate(connection, true);
+            const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
+            return { connection, transport, dcId };
+        },
     };
 };
 exports.defaultTransportProvider = defaultTransportProvider;