@mtkruto/browser 0.0.900 → 0.0.902

package/esm/client/client.js

@@ -1,11 +1,8 @@
 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";
-import { parseHtml } from "../utilities/0_html.js";
-import { decryptMessage, encryptMessage, getMessageId } from "../utilities/1_message.js";
-import { checkPassword } from "../utilities/1_password.js";
 import { as } from "../tl/1_tl_object.js";
 import * as types from "../tl/2_types.js";
 import * as functions from "../tl/3_functions.js";
@@ -16,15 +13,20 @@ import { MessageContainer } from "../tl/7_message_container.js";
 import { ClientAbstract } from "./client_abstract.js";
 import { ClientPlain } from "./client_plain.js";
 import { StorageMemory } from "../storage/storage_memory.js";
+import { parseHtml } from "../types/utilities/0_html.js";
 import { messageEntityToTlObject } from "../types/0_message_entity.js";
 import { replyKeyboardRemoveToTlObject } from "../types/0_reply_keyboard_remove.js";
 import { forceReplyToTlObject } from "../types/0_force_reply.js";
 import { replyKeyboardMarkupToTlObject } from "../types/2_reply_keyboard_markup.js";
 import { inlineKeyboardMarkupToTlObject } from "../types/2_inline_keyboard_markup.js";
 import { constructMessage } from "../types/3_message.js"; // high-level wrapper for Telegram API's message
-const d = debug("client");
-const dRecoverUpdateGap = debug("client_recoverUpdateGap");
-const dRecoverChannelUpdateGap = debug("client_recoverChannelUpdateGap");
+import { decryptMessage, encryptMessage, getMessageId } from "./utilities/0_message.js";
+import { checkPassword } from "./utilities/0_password.js";
+const d = debug("Client");
+const dGap = debug("Client/recoverUpdateGap");
+const dGapC = debug("Client/recoverChannelUpdateGap");
+const dAuth = debug("Client/authorize");
+const dRecv = debug("Client/receiveLoop");
 const UPDATE_GAP = Symbol();
 export const getEntity = Symbol();
 export const restartAuth = Symbol();
@@ -161,7 +163,7 @@ export class Client extends ClientAbstract {
                 if (body instanceof types.GZIPPacked) {
                     body = new TLReader(gunzip(body.packedData)).readObject();
                 }
-                d("received %s", body.constructor.name);
+                dRecv("received %s", body.constructor.name);
                 if (body instanceof types.Updates || body instanceof types.TypeUpdate) {
                     await this.processUpdates(body);
                 }
@@ -171,10 +173,10 @@ export class Client extends ClientAbstract {
                         result = new TLReader(gunzip(result.packedData)).readObject();
                     }
                     if (result instanceof types.RPCError) {
-                        d("RPCResult: %d %s", result.errorCode, result.errorMessage);
+                        dRecv("RPCResult: %d %s", result.errorCode, result.errorMessage);
                     }
                     else {
-                        d("RPCResult: %s", result.constructor.name);
+                        dRecv("RPCResult: %s", result.constructor.name);
                     }
                     if (result instanceof types.Updates || result instanceof types.TypeUpdate) {
                         await this.processUpdates(result);
@@ -247,6 +249,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 +291,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();
@@ -323,7 +326,7 @@ export class Client extends ClientAbstract {
         if (!this.apiHash) {
             throw new Error("apiHash not set");
         }
-        d("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
+        dAuth("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
         await this.invoke(new functions.InitConnection({
             apiId: this.apiId,
             appVersion: this.appVersion,
@@ -349,7 +352,7 @@ export class Client extends ClientAbstract {
                             const input = await checkPassword(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
                             await this.storage.setAccountType("user");
-                            d("authorized as user");
+                            dAuth("authorized as user");
                             break;
                         }
                         catch (err) {
@@ -385,7 +388,7 @@ export class Client extends ClientAbstract {
         try {
             if (params instanceof types.AuthExportedAuthorization) {
                 await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
-                d("authorization imported");
+                dAuth("authorization imported");
             }
             else if (typeof params == "object") {
                 while (true) {
@@ -401,7 +404,7 @@ export class Client extends ClientAbstract {
                                 phoneNumber,
                                 settings: new types.CodeSettings(),
                             }));
-                            d("verification code sent");
+                            dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
                                 while (true) {
                                     const phoneCode = typeof params.code === "string" ? params.code : await params.code();
@@ -413,7 +416,7 @@ export class Client extends ClientAbstract {
                                         else {
                                             signedIn = true;
                                             await this.storage.setAccountType("user");
-                                            d("authorized as user");
+                                            dAuth("authorized as user");
                                             break;
                                         }
                                     }
@@ -448,7 +451,7 @@ export class Client extends ClientAbstract {
             else {
                 await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
                 await this.storage.setAccountType("bot");
-                d("authorized as bot");
+                dAuth("authorized as bot");
             }
         }
         catch (err) {
@@ -510,7 +513,7 @@ export class Client extends ClientAbstract {
                 decrypted = await decryptMessage(buffer, this.auth.key, this.auth.id, this.sessionId);
             }
             catch (err) {
-                d("failed to decrypt message: %o", err);
+                dRecv("failed to decrypt message: %o", err);
                 continue;
             }
             const messages = decrypted instanceof MessageContainer ? decrypted.messages : [decrypted];
@@ -799,7 +802,7 @@ export class Client extends ClientAbstract {
         return localState;
     }
     async recoverUpdateGap(source) {
-        dRecoverUpdateGap("recovering from update gap [%s]", source);
+        dGap("recovering from update gap [%s]", source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             let state = await this.getLocalState();
@@ -815,7 +818,7 @@ export class Client extends ClientAbstract {
                         await this.applyUpdateNoGap(update);
                     }
                     if (difference instanceof types.UpdatesDifference) {
-                        dRecoverUpdateGap("recovered from update gap");
+                        dGap("recovered from update gap");
                         break;
                     }
                     else if (difference instanceof types.UpdatesDifferenceSlice) {
@@ -828,11 +831,11 @@ export class Client extends ClientAbstract {
                 else if (difference instanceof types.UpdatesDifferenceTooLong) {
                     // stored messages should be invalidated in case we store messages in the future
                     state.pts = difference.pts;
-                    dRecoverUpdateGap("received differenceTooLong");
+                    dGap("received differenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesDifferenceEmpty) {
                     await this.setUpdateStateDate(difference.date);
-                    dRecoverUpdateGap("there was no update gap");
+                    dGap("there was no update gap");
                     break;
                 }
                 else {
@@ -845,7 +848,7 @@ export class Client extends ClientAbstract {
         }
     }
     async recoverChannelUpdateGap(channelId, source) {
-        dRecoverChannelUpdateGap("recovering channel update gap [%o, %s]", channelId, source);
+        dGapC("recovering channel update gap [%o, %s]", channelId, source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             const pts_ = await this.storage.getChannelPts(channelId);
@@ -868,12 +871,12 @@ export class Client extends ClientAbstract {
                         await this.applyUpdateNoGap(update, false);
                     }
                     await this.storage.setChannelPts(channelId, difference.pts);
-                    dRecoverChannelUpdateGap("recovered from update gap");
+                    dGapC("recovered from update gap [%o, %s]", channelId, source);
                     break;
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceTooLong) {
                     // invalidate messages
-                    dRecoverChannelUpdateGap("received channelDifferenceTooLong");
+                    dGapC("received channelDifferenceTooLong");
                     await this.processChats(difference.chats);
                     await this.processUsers(difference.users);
                     for (const message of difference.messages) {
@@ -886,10 +889,10 @@ export class Client extends ClientAbstract {
                     else {
                         UNREACHABLE();
                     }
-                    dRecoverChannelUpdateGap("processed channelDifferenceTooLong");
+                    dGapC("processed channelDifferenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceEmpty) {
-                    dRecoverChannelUpdateGap("there was no update gap");
+                    dGapC("there was no update gap");
                     break;
                 }
             }

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,15 +2,16 @@ 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";
-import { packUnencryptedMessage, unpackUnencryptedMessage } from "../utilities/1_message.js";
 import { ClientDHInnerData, DHGenOK, PQInnerDataDC, ResPQ, ServerDHInnerData, ServerDHParamsOK } from "../tl/2_types.js";
 import { ReqDHParams, ReqPQMulti, SetClientDHParams } from "../tl/3_functions.js";
 import { TLReader } from "../tl/3_tl_reader.js";
 import { ClientAbstract } from "./client_abstract.js";
-const d = debug("auth_key_creation");
+import { packUnencryptedMessage, unpackUnencryptedMessage } from "./utilities/0_message.js";
+const d = debug("ClientPlain/createAuthKey");
 export class ClientPlain extends ClientAbstract {
     async invoke(function_) {
         await this.transport.send(packUnencryptedMessage(function_[serialize]()));
@@ -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/{script/utilities/1_message.d.ts → esm/client/utilities/0_message.d.ts}

@@ -1,5 +1,5 @@
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
+import { Message } from "../../tl/6_message.js";
+import { MessageContainer } from "../../tl/7_message_container.js";
 export declare function getMessageId(): bigint;
 export declare function packUnencryptedMessage(data: Uint8Array): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {

package/esm/{utilities/1_message.js → client/utilities/0_message.js}

@@ -1,13 +1,13 @@
-import { assertEquals, ige256Decrypt, ige256Encrypt } from "../deps.js";
-import { TLRawReader } from "../tl/0_tl_raw_reader.js";
-import { TLRawWriter } from "../tl/0_tl_raw_writer.js";
-import { id, serialize } from "../tl/1_tl_object.js";
-import { TLReader } from "../tl/3_tl_reader.js";
-import { RPCResult } from "../tl/5_rpc_result.js";
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
-import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { sha256 } from "./0_hash.js";
+import { assertEquals, ige256Decrypt, ige256Encrypt } from "../../deps.js";
+import { TLRawReader } from "../../tl/0_tl_raw_reader.js";
+import { TLRawWriter } from "../../tl/0_tl_raw_writer.js";
+import { id, serialize } from "../../tl/1_tl_object.js";
+import { TLReader } from "../../tl/3_tl_reader.js";
+import { RPCResult } from "../../tl/5_rpc_result.js";
+import { Message } from "../../tl/6_message.js";
+import { MessageContainer } from "../../tl/7_message_container.js";
+import { bufferFromBigInt, concat } from "../../utilities/0_buffer.js";
+import { sha256 } from "../../utilities/0_hash.js";
 let lastMsgId = 0n;
 export function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;

package/esm/{utilities/1_password.d.ts → client/utilities/0_password.d.ts}

@@ -1,5 +1,5 @@
-import * as types from "../tl/2_types.js";
-import { sha256 } from "./0_hash.js";
+import * as types from "../../tl/2_types.js";
+import { sha256 } from "../../utilities/0_hash.js";
 export declare function isSafePrime(primeBytes: Uint8Array, g: number): boolean;
 export declare const h: typeof sha256;
 export declare const sh: (data: Uint8Array, salt: Uint8Array) => Promise<Uint8Array>;

package/esm/{utilities/1_password.js → client/utilities/0_password.js}

@@ -1,7 +1,7 @@
-import * as types from "../tl/2_types.js";
-import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { sha256 } from "./0_hash.js";
-import { bigIntFromBuffer, getRandomBigInt, mod, modExp } from "./0_bigint.js";
+import * as types from "../../tl/2_types.js";
+import { bufferFromBigInt, concat } from "../../utilities/0_buffer.js";
+import { sha256 } from "../../utilities/0_hash.js";
+import { bigIntFromBuffer, getRandomBigInt, mod, modExp } from "../../utilities/0_bigint.js";
 export function isSafePrime(primeBytes, g) {
     // deno-fmt-ignore
     const goodPrime = new Uint8Array([

package/esm/connection/connection_web_socket.js

@@ -1,4 +1,5 @@
-import { Mutex } from "../deps.js";
+import { debug, Mutex } from "../deps.js";
+const d = debug("ConnectionWebSocket");
 export class ConnectionWebSocket {
     constructor(url) {
         Object.defineProperty(this, "webSocket", {
@@ -43,7 +44,9 @@ export class ConnectionWebSocket {
                 this.nextResolve = null;
             }
         };
-        this.webSocket.onerror = console.error;
+        this.webSocket.onerror = (err) => {
+            d("WebSocket error: %O", err);
+        };
     }
     get connected() {
         return this.webSocket.readyState == WebSocket.OPEN;

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.902";
+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

@@ -61,13 +61,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.902";
+// @ts-ignore: lib
+export const DEFAULT_DEVICE_MODEL = typeof Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : Deno.build.os + "-" + 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/deps.js

@@ -4,6 +4,6 @@ export { gunzip, gzip } from "./deps/raw.githubusercontent.com/MTKruto/compress/
 export { Mutex } from "async-mutex";
 export { Parser } from "./deps/deno.land/x/html_parser@v0.1.3/src/mod.js";
 import { debug as debug_ } from "./deps/raw.githubusercontent.com/MTKruto/debug/master/mod.js";
-export const debug = (v) => debug_(`mtkruto__${v}`);
+export const debug = (v) => debug_(`mtkruto/${v}`);
 export { queue } from "./deps/deno.land/x/q@v0.0.1/mod.js";
 export { decode as base64Decode, encode as base64Encode } from "./deps/deno.land/std@0.190.0/encoding/base64.js";

package/esm/mod.d.ts

@@ -1,5 +1,5 @@
-import { checkPassword } from "./utilities/1_password.js";
 import { getRandomId } from "./utilities/0_bigint.js";
+import { checkPassword } from "./client/utilities/0_password.js";
 export declare const utils: {
     checkPassword: typeof checkPassword;
     getRandomId: typeof getRandomId;

package/esm/mod.js

@@ -1,5 +1,5 @@
-import { checkPassword } from "./utilities/1_password.js";
 import { getRandomId } from "./utilities/0_bigint.js";
+import { checkPassword } from "./client/utilities/0_password.js";
 export const utils = { checkPassword, getRandomId };
 export { as } from "./tl/1_tl_object.js";
 export * as types from "./tl/2_types.js";

package/esm/transport/transport_abridged.js

@@ -1,5 +1,5 @@
 import { bufferFromBigInt, concat } from "../utilities/0_buffer.js";
-import { getObfuscationParameters } from "../utilities/1_obfuscation.js";
+import { getObfuscationParameters } from "./utilities/0_obfuscation.js";
 import { Transport } from "./transport.js";
 export class TransportAbridged extends Transport {
     constructor(connection, obfuscated = false) {

package/esm/transport/transport_intermediate.js

@@ -1,5 +1,5 @@
 import { bufferFromBigInt, concat } from "../utilities/0_buffer.js";
-import { getObfuscationParameters } from "../utilities/1_obfuscation.js";
+import { getObfuscationParameters } from "./utilities/0_obfuscation.js";
 import { Transport } from "./transport.js";
 export class TransportIntermediate extends Transport {
     constructor(connection, obfuscated = false) {

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/esm/{utilities/1_obfuscation.d.ts → transport/utilities/0_obfuscation.d.ts}

@@ -1,5 +1,5 @@
-import { Connection } from "../connection/connection.js";
-import { CTR } from "./0_crypto.js";
+import { CTR } from "../../utilities/0_crypto.js";
+import { Connection } from "../../connection/connection.js";
 export declare function getObfuscationParameters(protocol: number, connection: Connection): Promise<{
     encryptionCTR: CTR;
     decryptionCTR: CTR;

package/esm/{utilities/1_obfuscation.js → transport/utilities/0_obfuscation.js}

@@ -1,5 +1,5 @@
-import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { CTR } from "./0_crypto.js";
+import { bufferFromBigInt, concat } from "../../utilities/0_buffer.js";
+import { CTR } from "../../utilities/0_crypto.js";
 export async function getObfuscationParameters(protocol, connection) {
     const dc = 0xFCFF;
     let init;

package/esm/{utilities → types/utilities}/0_html.d.ts

@@ -1,2 +1,2 @@
-import { MessageEntity } from "../types/0_message_entity.js";
+import { MessageEntity } from "../0_message_entity.js";
 export declare function parseHtml(html: string): readonly [string, MessageEntity[]];

package/esm/{utilities → types/utilities}/0_html.js

@@ -1,5 +1,5 @@
-import { Parser } from "../deps.js";
-import { MessageEntityType } from "../types/0_message_entity.js";
+import { Parser } from "../../deps.js";
+import { MessageEntityType } from "../0_message_entity.js";
 export function parseHtml(html) {
     let text = "";
     const entities = new Array();

package/package.json

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

package/script/client/client.js

@@ -29,9 +29,6 @@ const constants_js_1 = require("../constants.js");
 const _0_bigint_js_1 = require("../utilities/0_bigint.js");
 const _0_control_js_1 = require("../utilities/0_control.js");
 const _0_hash_js_1 = require("../utilities/0_hash.js");
-const _0_html_js_1 = require("../utilities/0_html.js");
-const _1_message_js_1 = require("../utilities/1_message.js");
-const _1_password_js_1 = require("../utilities/1_password.js");
 const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
 const types = __importStar(require("../tl/2_types.js"));
 const functions = __importStar(require("../tl/3_functions.js"));
@@ -42,15 +39,20 @@ const _7_message_container_js_1 = require("../tl/7_message_container.js");
 const client_abstract_js_1 = require("./client_abstract.js");
 const client_plain_js_1 = require("./client_plain.js");
 const storage_memory_js_1 = require("../storage/storage_memory.js");
+const _0_html_js_1 = require("../types/utilities/0_html.js");
 const _0_message_entity_js_1 = require("../types/0_message_entity.js");
 const _0_reply_keyboard_remove_js_1 = require("../types/0_reply_keyboard_remove.js");
 const _0_force_reply_js_1 = require("../types/0_force_reply.js");
 const _2_reply_keyboard_markup_js_1 = require("../types/2_reply_keyboard_markup.js");
 const _2_inline_keyboard_markup_js_1 = require("../types/2_inline_keyboard_markup.js");
 const _3_message_js_1 = require("../types/3_message.js"); // high-level wrapper for Telegram API's message
-const d = (0, deps_js_1.debug)("client");
-const dRecoverUpdateGap = (0, deps_js_1.debug)("client_recoverUpdateGap");
-const dRecoverChannelUpdateGap = (0, deps_js_1.debug)("client_recoverChannelUpdateGap");
+const _0_message_js_1 = require("./utilities/0_message.js");
+const _0_password_js_1 = require("./utilities/0_password.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");
+const dAuth = (0, deps_js_1.debug)("Client/authorize");
+const dRecv = (0, deps_js_1.debug)("Client/receiveLoop");
 const UPDATE_GAP = Symbol();
 exports.getEntity = Symbol();
 exports.restartAuth = Symbol();
@@ -187,7 +189,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                 if (body instanceof types.GZIPPacked) {
                     body = new _3_tl_reader_js_1.TLReader((0, deps_js_1.gunzip)(body.packedData)).readObject();
                 }
-                d("received %s", body.constructor.name);
+                dRecv("received %s", body.constructor.name);
                 if (body instanceof types.Updates || body instanceof types.TypeUpdate) {
                     await this.processUpdates(body);
                 }
@@ -197,10 +199,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         result = new _3_tl_reader_js_1.TLReader((0, deps_js_1.gunzip)(result.packedData)).readObject();
                     }
                     if (result instanceof types.RPCError) {
-                        d("RPCResult: %d %s", result.errorCode, result.errorMessage);
+                        dRecv("RPCResult: %d %s", result.errorCode, result.errorMessage);
                     }
                     else {
-                        d("RPCResult: %s", result.constructor.name);
+                        dRecv("RPCResult: %s", result.constructor.name);
                     }
                     if (result instanceof types.Updates || result instanceof types.TypeUpdate) {
                         await this.processUpdates(result);
@@ -273,6 +275,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 +317,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();
@@ -349,7 +352,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (!this.apiHash) {
             throw new Error("apiHash not set");
         }
-        d("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
+        dAuth("authorizing with %s", typeof params === "string" ? "bot token" : params instanceof types.AuthExportedAuthorization ? "exported authorization" : "AuthorizeUserParams");
         await this.invoke(new functions.InitConnection({
             apiId: this.apiId,
             appVersion: this.appVersion,
@@ -372,10 +375,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
                     if (ap.currentAlgo instanceof types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow) {
                         try {
                             const password = typeof params.password === "string" ? params.password : await params.password();
-                            const input = await (0, _1_password_js_1.checkPassword)(password, ap);
+                            const input = await (0, _0_password_js_1.checkPassword)(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
                             await this.storage.setAccountType("user");
-                            d("authorized as user");
+                            dAuth("authorized as user");
                             break;
                         }
                         catch (err) {
@@ -411,7 +414,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         try {
             if (params instanceof types.AuthExportedAuthorization) {
                 await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
-                d("authorization imported");
+                dAuth("authorization imported");
             }
             else if (typeof params == "object") {
                 while (true) {
@@ -427,7 +430,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                                 phoneNumber,
                                 settings: new types.CodeSettings(),
                             }));
-                            d("verification code sent");
+                            dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
                                 while (true) {
                                     const phoneCode = typeof params.code === "string" ? params.code : await params.code();
@@ -439,7 +442,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                                         else {
                                             signedIn = true;
                                             await this.storage.setAccountType("user");
-                                            d("authorized as user");
+                                            dAuth("authorized as user");
                                             break;
                                         }
                                     }
@@ -474,7 +477,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             else {
                 await this.invoke(new functions.AuthImportBotAuthorization({ apiId: this.apiId, apiHash: this.apiHash, botAuthToken: params, flags: 0 }));
                 await this.storage.setAccountType("bot");
-                d("authorized as bot");
+                dAuth("authorized as bot");
             }
         }
         catch (err) {
@@ -533,10 +536,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
             }
             let decrypted;
             try {
-                decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.auth.key, this.auth.id, this.sessionId);
+                decrypted = await (0, _0_message_js_1.decryptMessage)(buffer, this.auth.key, this.auth.id, this.sessionId);
             }
             catch (err) {
-                d("failed to decrypt message: %o", err);
+                dRecv("failed to decrypt message: %o", err);
                 continue;
             }
             const messages = decrypted instanceof _7_message_container_js_1.MessageContainer ? decrypted.messages : [decrypted];
@@ -565,8 +568,8 @@ class Client extends client_abstract_js_1.ClientAbstract {
             seqNo++;
             this.state.seqNo++;
         }
-        const message = new _6_message_js_1.Message((0, _1_message_js_1.getMessageId)(), seqNo, function_);
-        await this.transport.send(await (0, _1_message_js_1.encryptMessage)(message, this.auth.key, this.auth.id, this.state.salt, this.sessionId));
+        const message = new _6_message_js_1.Message((0, _0_message_js_1.getMessageId)(), seqNo, function_);
+        await this.transport.send(await (0, _0_message_js_1.encryptMessage)(message, this.auth.key, this.auth.id, this.state.salt, this.sessionId));
         d("invoked %s", function_.constructor.name);
         if (noWait) {
             return;
@@ -825,7 +828,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         return localState;
     }
     async recoverUpdateGap(source) {
-        dRecoverUpdateGap("recovering from update gap [%s]", source);
+        dGap("recovering from update gap [%s]", source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             let state = await this.getLocalState();
@@ -841,7 +844,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         await this.applyUpdateNoGap(update);
                     }
                     if (difference instanceof types.UpdatesDifference) {
-                        dRecoverUpdateGap("recovered from update gap");
+                        dGap("recovered from update gap");
                         break;
                     }
                     else if (difference instanceof types.UpdatesDifferenceSlice) {
@@ -854,11 +857,11 @@ class Client extends client_abstract_js_1.ClientAbstract {
                 else if (difference instanceof types.UpdatesDifferenceTooLong) {
                     // stored messages should be invalidated in case we store messages in the future
                     state.pts = difference.pts;
-                    dRecoverUpdateGap("received differenceTooLong");
+                    dGap("received differenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesDifferenceEmpty) {
                     await this.setUpdateStateDate(difference.date);
-                    dRecoverUpdateGap("there was no update gap");
+                    dGap("there was no update gap");
                     break;
                 }
                 else {
@@ -871,7 +874,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
     }
     async recoverChannelUpdateGap(channelId, source) {
-        dRecoverChannelUpdateGap("recovering channel update gap [%o, %s]", channelId, source);
+        dGapC("recovering channel update gap [%o, %s]", channelId, source);
         const release = await this.updateGapRecoveryMutex.acquire();
         try {
             const pts_ = await this.storage.getChannelPts(channelId);
@@ -894,12 +897,12 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         await this.applyUpdateNoGap(update, false);
                     }
                     await this.storage.setChannelPts(channelId, difference.pts);
-                    dRecoverChannelUpdateGap("recovered from update gap");
+                    dGapC("recovered from update gap [%o, %s]", channelId, source);
                     break;
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceTooLong) {
                     // invalidate messages
-                    dRecoverChannelUpdateGap("received channelDifferenceTooLong");
+                    dGapC("received channelDifferenceTooLong");
                     await this.processChats(difference.chats);
                     await this.processUsers(difference.users);
                     for (const message of difference.messages) {
@@ -912,10 +915,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
                     else {
                         (0, _0_control_js_1.UNREACHABLE)();
                     }
-                    dRecoverChannelUpdateGap("processed channelDifferenceTooLong");
+                    dGapC("processed channelDifferenceTooLong");
                 }
                 else if (difference instanceof types.UpdatesChannelDifferenceEmpty) {
-                    dRecoverChannelUpdateGap("there was no update gap");
+                    dGapC("there was no update gap");
                     break;
                 }
             }

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,18 +5,19 @@ 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");
-const _1_message_js_1 = require("../utilities/1_message.js");
 const _2_types_js_1 = require("../tl/2_types.js");
 const _3_functions_js_1 = require("../tl/3_functions.js");
 const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
 const client_abstract_js_1 = require("./client_abstract.js");
-const d = (0, deps_js_1.debug)("auth_key_creation");
+const _0_message_js_1 = require("./utilities/0_message.js");
+const d = (0, deps_js_1.debug)("ClientPlain/createAuthKey");
 class ClientPlain extends client_abstract_js_1.ClientAbstract {
     async invoke(function_) {
-        await this.transport.send((0, _1_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize]()));
+        await this.transport.send((0, _0_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize]()));
         const buffer = await this.transport.receive();
         if (buffer.length == 4) {
             const int = (0, _0_bigint_js_1.bigIntFromBuffer)(buffer, true, true);
@@ -24,17 +25,30 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
                 throw new Error("-404");
             }
         }
-        const { message } = (0, _1_message_js_1.unpackUnencryptedMessage)(buffer);
+        const { message } = (0, _0_message_js_1.unpackUnencryptedMessage)(buffer);
         const reader = new _3_tl_reader_js_1.TLReader(message);
         return reader.readObject();
     }
     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/{esm/utilities/1_message.d.ts → script/client/utilities/0_message.d.ts}

@@ -1,5 +1,5 @@
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
+import { Message } from "../../tl/6_message.js";
+import { MessageContainer } from "../../tl/7_message_container.js";
 export declare function getMessageId(): bigint;
 export declare function packUnencryptedMessage(data: Uint8Array): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {

package/script/{utilities/1_message.js → client/utilities/0_message.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decryptMessage = exports.encryptMessage = exports.unpackUnencryptedMessage = exports.packUnencryptedMessage = exports.getMessageId = void 0;
-const deps_js_1 = require("../deps.js");
-const _0_tl_raw_reader_js_1 = require("../tl/0_tl_raw_reader.js");
-const _0_tl_raw_writer_js_1 = require("../tl/0_tl_raw_writer.js");
-const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
-const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
-const _5_rpc_result_js_1 = require("../tl/5_rpc_result.js");
-const _6_message_js_1 = require("../tl/6_message.js");
-const _7_message_container_js_1 = require("../tl/7_message_container.js");
-const _0_buffer_js_1 = require("./0_buffer.js");
-const _0_hash_js_1 = require("./0_hash.js");
+const deps_js_1 = require("../../deps.js");
+const _0_tl_raw_reader_js_1 = require("../../tl/0_tl_raw_reader.js");
+const _0_tl_raw_writer_js_1 = require("../../tl/0_tl_raw_writer.js");
+const _1_tl_object_js_1 = require("../../tl/1_tl_object.js");
+const _3_tl_reader_js_1 = require("../../tl/3_tl_reader.js");
+const _5_rpc_result_js_1 = require("../../tl/5_rpc_result.js");
+const _6_message_js_1 = require("../../tl/6_message.js");
+const _7_message_container_js_1 = require("../../tl/7_message_container.js");
+const _0_buffer_js_1 = require("../../utilities/0_buffer.js");
+const _0_hash_js_1 = require("../../utilities/0_hash.js");
 let lastMsgId = 0n;
 function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;

package/script/{utilities/1_password.d.ts → client/utilities/0_password.d.ts}

@@ -1,5 +1,5 @@
-import * as types from "../tl/2_types.js";
-import { sha256 } from "./0_hash.js";
+import * as types from "../../tl/2_types.js";
+import { sha256 } from "../../utilities/0_hash.js";
 export declare function isSafePrime(primeBytes: Uint8Array, g: number): boolean;
 export declare const h: typeof sha256;
 export declare const sh: (data: Uint8Array, salt: Uint8Array) => Promise<Uint8Array>;

package/script/{utilities/1_password.js → client/utilities/0_password.js}

@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPassword = exports.pad = exports.isGoodModExpFirst = exports.ph2 = exports.pbkdf2 = exports.ph1 = exports.sh = exports.h = exports.isSafePrime = void 0;
-const types = __importStar(require("../tl/2_types.js"));
-const _0_buffer_js_1 = require("./0_buffer.js");
-const _0_hash_js_1 = require("./0_hash.js");
-const _0_bigint_js_1 = require("./0_bigint.js");
+const types = __importStar(require("../../tl/2_types.js"));
+const _0_buffer_js_1 = require("../../utilities/0_buffer.js");
+const _0_hash_js_1 = require("../../utilities/0_hash.js");
+const _0_bigint_js_1 = require("../../utilities/0_bigint.js");
 function isSafePrime(primeBytes, g) {
     // deno-fmt-ignore
     const goodPrime = new Uint8Array([

package/script/connection/connection_web_socket.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionWebSocket = void 0;
 const deps_js_1 = require("../deps.js");
+const d = (0, deps_js_1.debug)("ConnectionWebSocket");
 class ConnectionWebSocket {
     constructor(url) {
         Object.defineProperty(this, "webSocket", {
@@ -46,7 +47,9 @@ class ConnectionWebSocket {
                 this.nextResolve = null;
             }
         };
-        this.webSocket.onerror = console.error;
+        this.webSocket.onerror = (err) => {
+            d("WebSocket error: %O", err);
+        };
     }
     get connected() {
         return this.webSocket.readyState == WebSocket.OPEN;

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.902";
+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

@@ -64,13 +64,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.902";
+// @ts-ignore: lib
+exports.DEFAULT_DEVICE_MODEL = typeof Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : Deno.build.os + "-" + 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/deps.js

@@ -31,7 +31,7 @@ Object.defineProperty(exports, "Mutex", { enumerable: true, get: function () { r
 var mod_js_2 = require("./deps/deno.land/x/html_parser@v0.1.3/src/mod.js");
 Object.defineProperty(exports, "Parser", { enumerable: true, get: function () { return mod_js_2.Parser; } });
 const mod_js_3 = require("./deps/raw.githubusercontent.com/MTKruto/debug/master/mod.js");
-const debug = (v) => (0, mod_js_3.debug)(`mtkruto__${v}`);
+const debug = (v) => (0, mod_js_3.debug)(`mtkruto/${v}`);
 exports.debug = debug;
 var mod_js_4 = require("./deps/deno.land/x/q@v0.0.1/mod.js");
 Object.defineProperty(exports, "queue", { enumerable: true, get: function () { return mod_js_4.queue; } });

package/script/mod.d.ts

@@ -1,5 +1,5 @@
-import { checkPassword } from "./utilities/1_password.js";
 import { getRandomId } from "./utilities/0_bigint.js";
+import { checkPassword } from "./client/utilities/0_password.js";
 export declare const utils: {
     checkPassword: typeof checkPassword;
     getRandomId: typeof getRandomId;

package/script/mod.js

@@ -27,9 +27,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LAYER = exports.DEFAULT_SYSTEM_VERSION = exports.DEFAULT_SYSTEM_LANG_CODE = exports.DEFAULT_LANG_PACK = exports.DEFAULT_LANG_CODE = exports.DEFAULT_INITIAL_DC = exports.DEFAULT_DEVICE_MODEL = exports.DEFAULT_APP_VERSION = exports.functions = exports.types = exports.as = exports.utils = void 0;
-const _1_password_js_1 = require("./utilities/1_password.js");
 const _0_bigint_js_1 = require("./utilities/0_bigint.js");
-exports.utils = { checkPassword: _1_password_js_1.checkPassword, getRandomId: _0_bigint_js_1.getRandomId };
+const _0_password_js_1 = require("./client/utilities/0_password.js");
+exports.utils = { checkPassword: _0_password_js_1.checkPassword, getRandomId: _0_bigint_js_1.getRandomId };
 var _1_tl_object_js_1 = require("./tl/1_tl_object.js");
 Object.defineProperty(exports, "as", { enumerable: true, get: function () { return _1_tl_object_js_1.as; } });
 exports.types = __importStar(require("./tl/2_types.js"));

package/script/transport/transport_abridged.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransportAbridged = void 0;
 const _0_buffer_js_1 = require("../utilities/0_buffer.js");
-const _1_obfuscation_js_1 = require("../utilities/1_obfuscation.js");
+const _0_obfuscation_js_1 = require("./utilities/0_obfuscation.js");
 const transport_js_1 = require("./transport.js");
 class TransportAbridged extends transport_js_1.Transport {
     constructor(connection, obfuscated = false) {
@@ -23,7 +23,7 @@ class TransportAbridged extends transport_js_1.Transport {
     async initialize() {
         if (!this.initialized) {
             if (this.obfuscated) {
-                this.obfuscationParameters = await (0, _1_obfuscation_js_1.getObfuscationParameters)(0xEFEFEFEF, this.connection);
+                this.obfuscationParameters = await (0, _0_obfuscation_js_1.getObfuscationParameters)(0xEFEFEFEF, this.connection);
             }
             else {
                 await this.connection.write(new Uint8Array([0xEF]));

package/script/transport/transport_intermediate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransportIntermediate = void 0;
 const _0_buffer_js_1 = require("../utilities/0_buffer.js");
-const _1_obfuscation_js_1 = require("../utilities/1_obfuscation.js");
+const _0_obfuscation_js_1 = require("./utilities/0_obfuscation.js");
 const transport_js_1 = require("./transport.js");
 class TransportIntermediate extends transport_js_1.Transport {
     constructor(connection, obfuscated = false) {
@@ -23,7 +23,7 @@ class TransportIntermediate extends transport_js_1.Transport {
     async initialize() {
         if (!this.initialized) {
             if (this.obfuscated) {
-                this.obfuscationParameters = await (0, _1_obfuscation_js_1.getObfuscationParameters)(0xEEEEEEEE, this.connection);
+                this.obfuscationParameters = await (0, _0_obfuscation_js_1.getObfuscationParameters)(0xEEEEEEEE, this.connection);
             }
             else {
                 await this.connection.write(new Uint8Array([0xEE, 0xEE, 0xEE, 0xEE]));

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;

package/script/{utilities/1_obfuscation.d.ts → transport/utilities/0_obfuscation.d.ts}

@@ -1,5 +1,5 @@
-import { Connection } from "../connection/connection.js";
-import { CTR } from "./0_crypto.js";
+import { CTR } from "../../utilities/0_crypto.js";
+import { Connection } from "../../connection/connection.js";
 export declare function getObfuscationParameters(protocol: number, connection: Connection): Promise<{
     encryptionCTR: CTR;
     decryptionCTR: CTR;

package/script/{utilities/1_obfuscation.js → transport/utilities/0_obfuscation.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObfuscationParameters = void 0;
-const _0_buffer_js_1 = require("./0_buffer.js");
-const _0_crypto_js_1 = require("./0_crypto.js");
+const _0_buffer_js_1 = require("../../utilities/0_buffer.js");
+const _0_crypto_js_1 = require("../../utilities/0_crypto.js");
 async function getObfuscationParameters(protocol, connection) {
     const dc = 0xFCFF;
     let init;

package/script/{utilities → types/utilities}/0_html.d.ts

@@ -1,2 +1,2 @@
-import { MessageEntity } from "../types/0_message_entity.js";
+import { MessageEntity } from "../0_message_entity.js";
 export declare function parseHtml(html: string): readonly [string, MessageEntity[]];

package/script/{utilities → types/utilities}/0_html.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHtml = void 0;
-const deps_js_1 = require("../deps.js");
-const _0_message_entity_js_1 = require("../types/0_message_entity.js");
+const deps_js_1 = require("../../deps.js");
+const _0_message_entity_js_1 = require("../0_message_entity.js");
 function parseHtml(html) {
     let text = "";
     const entities = new Array();