@mtkruto/node 0.1.109 → 0.1.111

package/esm/3_transport.d.ts

@@ -2,3 +2,4 @@ export * from "./transport/0_transport.js";
 export * from "./transport/1_transport_abridged.js";
 export * from "./transport/1_transport_intermediate.js";
 export * from "./transport/2_transport_provider.js";
+export * from "./transport/3_transport_provider_web_socket.js";

package/esm/3_transport.js

@@ -2,3 +2,4 @@ export * from "./transport/0_transport.js";
 export * from "./transport/1_transport_abridged.js";
 export * from "./transport/1_transport_intermediate.js";
 export * from "./transport/2_transport_provider.js";
+export * from "./transport/3_transport_provider_web_socket.js";

package/esm/4_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 = 166;
-export declare const APP_VERSION = "MTKruto 0.1.109";
+export declare const APP_VERSION = "MTKruto 0.1.111";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/4_constants.js

@@ -54,7 +54,7 @@ export const PUBLIC_KEYS = Object.freeze([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const INITIAL_DC = "2";
 export const LAYER = 166;
-export const APP_VERSION = "MTKruto 0.1.109";
+export const APP_VERSION = "MTKruto 0.1.111";
 // @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/client/1_client_abstract.js

@@ -11,7 +11,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ClientAbstract_dc;
 import { initTgCrypto } from "../0_deps.js";
-import { webSocketTransportProvider } from "../3_transport.js";
+import { transportProviderWebSocket } from "../3_transport.js";
 import { INITIAL_DC } from "../4_constants.js";
 export class ClientAbstract {
     constructor(params) {
@@ -47,7 +47,7 @@ export class ClientAbstract {
             value: void 0
         });
         this.initialDc = params?.initialDc ?? INITIAL_DC;
-        this.transportProvider = params?.transportProvider ?? webSocketTransportProvider();
+        this.transportProvider = params?.transportProvider ?? transportProviderWebSocket();
         this.cdn = params?.cdn ?? false;
     }
     get dcId() {

package/esm/client/4_client.js

@@ -237,7 +237,9 @@ export class Client extends ClientAbstract {
         }
     }
     async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_errorHandler = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_lastOutgoing = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
-        return __classPrivateFieldGet(this, _Client_handle, "f").call(this, { connectionState }, resolve);
+        __classPrivateFieldGet(this, _Client_handleUpdateQueue, "f").add(async () => {
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, { connectionState }, resolve);
+        });
     }, _Client_setAuth = async function _Client_setAuth(key) {
         const hash = await sha1(key);
         const id = bigIntFromBuffer(hash.slice(-8), true, false);

package/esm/connection/1_connection_web_socket.js

@@ -9,12 +9,13 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _ConnectionWebSocket_instances, _ConnectionWebSocket_webSocket, _ConnectionWebSocket_rMutex, _ConnectionWebSocket_wMutex, _ConnectionWebSocket_buffer, _ConnectionWebSocket_nextResolve, _ConnectionWebSocket_initWs, _ConnectionWebSocket_wasConnected, _ConnectionWebSocket_isConnecting, _ConnectionWebSocket_connectionError;
+var _ConnectionWebSocket_instances, _ConnectionWebSocket_webSocket, _ConnectionWebSocket_rMutex, _ConnectionWebSocket_wMutex, _ConnectionWebSocket_buffer, _ConnectionWebSocket_nextResolve, _ConnectionWebSocket_initWs, _ConnectionWebSocket_wasConnected, _ConnectionWebSocket_isConnecting, _ConnectionWebSocket_connectionError, _ConnectionWebSocket_assertConnected, _ConnectionWebSocket_rejectRead;
 import * as dntShim from "../_dnt.shims.js";
 import { debug, Mutex } from "../0_deps.js";
 import { UNREACHABLE } from "../1_utilities.js";
 import { ConnectionUnframed } from "./0_connection.js";
 const d = debug("ConnectionWebSocket");
+const errConnectionNotOpen = new Error("Connection not open");
 export class ConnectionWebSocket extends ConnectionUnframed {
     constructor(url) {
         super();
@@ -68,11 +69,10 @@ export class ConnectionWebSocket extends ConnectionUnframed {
         }
     }
     async read(p) {
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").readyState != dntShim.WebSocket.OPEN) {
-            throw new Error("Connection not open");
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
         const release = await __classPrivateFieldGet(this, _ConnectionWebSocket_rMutex, "f").acquire();
         try {
+            __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
             if (__classPrivateFieldGet(this, _ConnectionWebSocket_buffer, "f").length < p.length) {
                 await new Promise((resolve, reject) => __classPrivateFieldSet(this, _ConnectionWebSocket_nextResolve, [p.length, { resolve, reject }], "f"));
             }
@@ -83,11 +83,10 @@ export class ConnectionWebSocket extends ConnectionUnframed {
         }
     }
     async write(p) {
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").readyState == dntShim.WebSocket.CLOSED) {
-            throw new Error("Connection not open");
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
         const release = await __classPrivateFieldGet(this, _ConnectionWebSocket_wMutex, "f").acquire();
         try {
+            __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
             __classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").send(p);
         }
         finally {
@@ -95,19 +94,16 @@ export class ConnectionWebSocket extends ConnectionUnframed {
         }
     }
     close() {
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").readyState == dntShim.WebSocket.CLOSED) {
-            throw new Error("Connection not open");
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
         __classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").close(1000, "method");
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f") != null) {
-            __classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f")[1].reject(new Error("Connection not open"));
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_rejectRead).call(this);
     }
 }
 _ConnectionWebSocket_webSocket = new WeakMap(), _ConnectionWebSocket_rMutex = new WeakMap(), _ConnectionWebSocket_wMutex = new WeakMap(), _ConnectionWebSocket_buffer = new WeakMap(), _ConnectionWebSocket_nextResolve = new WeakMap(), _ConnectionWebSocket_wasConnected = new WeakMap(), _ConnectionWebSocket_isConnecting = new WeakMap(), _ConnectionWebSocket_connectionError = new WeakMap(), _ConnectionWebSocket_instances = new WeakSet(), _ConnectionWebSocket_initWs = function _ConnectionWebSocket_initWs() {
     const webSocket = new dntShim.WebSocket(this.url, "binary");
     const mutex = new Mutex();
     webSocket.addEventListener("close", () => {
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_rejectRead).call(this);
         this.stateChangeHandler?.(false);
     });
     webSocket.addEventListener("open", () => {
@@ -138,4 +134,13 @@ _ConnectionWebSocket_webSocket = new WeakMap(), _ConnectionWebSocket_rMutex = ne
         }
     });
     return webSocket;
+}, _ConnectionWebSocket_assertConnected = function _ConnectionWebSocket_assertConnected() {
+    if (!this.connected) {
+        throw errConnectionNotOpen;
+    }
+}, _ConnectionWebSocket_rejectRead = function _ConnectionWebSocket_rejectRead() {
+    if (__classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f") != null) {
+        __classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f")[1].reject(errConnectionNotOpen);
+        __classPrivateFieldSet(this, _ConnectionWebSocket_nextResolve, null, "f");
+    }
 };

package/esm/mod.d.ts

@@ -1,9 +1,5 @@
-import { getRandomId } from "./1_utilities.js";
-import { checkPassword } from "./client/0_password.js";
-export declare const utils: {
-    checkPassword: typeof checkPassword;
-    getRandomId: typeof getRandomId;
-};
+export { getRandomId } from "./1_utilities.js";
+export { checkPassword } from "./client/0_password.js";
 export * from "./2_connection.js";
 export * from "./3_storage.js";
 export * from "./3_transport.js";

package/esm/mod.js

@@ -1,6 +1,5 @@
-import { getRandomId } from "./1_utilities.js";
-import { checkPassword } from "./client/0_password.js";
-export const utils = { checkPassword, getRandomId };
+export { getRandomId } from "./1_utilities.js";
+export { checkPassword } from "./client/0_password.js";
 export * from "./2_connection.js";
 export * from "./3_storage.js";
 export * from "./3_transport.js";

package/esm/storage/0_utilities.js

@@ -88,7 +88,7 @@ export function fromString(string) {
     }
 }
 export function fixKey(key) {
-    return key.map((v) => typeof v === "bigint" ? String(v) : v);
+    return key.map((v) => typeof v === "bigint" ? String(ValueType.BigInt) + String(v) : typeof v === "string" ? String(ValueType.String) + v : v);
 }
 // Source: https://gist.github.com/inexorabletash/5462871
 // deno-lint-ignore no-explicit-any

package/esm/storage/0_utilities_test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/transport/2_transport_provider.d.ts

@@ -1,6 +1,7 @@
 import { Connection } from "../2_connection.js";
 import { Transport } from "./0_transport.js";
 export type DC = "1" | "2" | "3" | "4" | "5" | "1-test" | "2-test" | "3-test";
+export declare function getDcIps(dc: DC, version: "ipv4" | "ipv6"): [string, ...string[]];
 export interface TransportProviderParams {
     dc: DC;
     cdn: boolean;
@@ -10,6 +11,4 @@ export type TransportProvider = (params: TransportProviderParams) => {
     transport: Transport;
     dcId: number;
 };
-export declare const webSocketTransportProvider: (params?: {
-    wss?: boolean;
-}) => TransportProvider;
+export declare function getDcId(dc: DC, cdn: boolean): number;

package/esm/transport/2_transport_provider.js

@@ -1,26 +1,54 @@
-import { ConnectionWebSocket } from "../2_connection.js";
-import { TransportIntermediate } from "./1_transport_intermediate.js";
-const dcToNameMap = {
-    "1": "pluto",
-    "1-test": "pluto",
-    "2": "venus",
-    "2-test": "venus",
-    "3": "aurora",
-    "3-test": "aurora",
-    "4": "vesta",
-    "5": "flora",
-};
-function getDcId(dc, cdn) {
+import { UNREACHABLE } from "../1_utilities.js";
+export function getDcIps(dc, version) {
+    switch (version) {
+        case "ipv4":
+            switch (dc) {
+                case "1":
+                    return ["149.154.175.50"];
+                case "2":
+                    return ["149.154.167.51", "95.161.76.100"];
+                case "3":
+                    return ["149.154.175.100"];
+                case "4":
+                    return ["149.154.167.91"];
+                case "5":
+                    return ["149.154.171.5"];
+                case "1-test":
+                    return ["149.154.175.10"];
+                case "2-test":
+                    return ["149.154.167.40"];
+                case "3-test":
+                    return ["149.154.175.117"];
+                default:
+                    UNREACHABLE();
+            }
+            break;
+        case "ipv6":
+            switch (dc) {
+                case "1":
+                    return ["2001:b28:f23d:f001::a"];
+                case "2":
+                    return ["2001:67c:4e8:f002::a"];
+                case "3":
+                    return ["2001:b28:f23d:f003::a"];
+                case "4":
+                    return ["2001:67c:4e8:f004::a"];
+                case "5":
+                    return ["2001:b28:f23f:f005::a"];
+                case "1-test":
+                    return ["2001:b28:f23d:f001::e"];
+                case "2-test":
+                    return ["2001:67c:4e8:f002::e"];
+                case "3-test":
+                    return ["2001:b28:f23d:f003::e"];
+                default:
+                    UNREACHABLE();
+            }
+            break;
+        default:
+            UNREACHABLE();
+    }
+}
+export function getDcId(dc, cdn) {
     return Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
 }
-export const webSocketTransportProvider = (params) => {
-    return ({ dc, cdn }) => {
-        params ??= {};
-        params.wss ??= typeof location !== "undefined" && location.protocol == "http:" && location.hostname != "localhost" ? false : true;
-        const url = `${params.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 = getDcId(dc, cdn);
-        return { connection, transport, dcId };
-    };
-};

package/esm/transport/3_transport_provider_web_socket.d.ts

@@ -0,0 +1,4 @@
+import { TransportProvider } from "./2_transport_provider.js";
+export declare const transportProviderWebSocket: (params?: {
+    wss?: boolean;
+}) => TransportProvider;

package/esm/transport/3_transport_provider_web_socket.js

@@ -0,0 +1,24 @@
+import { ConnectionWebSocket } from "../2_connection.js";
+import { TransportIntermediate } from "./1_transport_intermediate.js";
+import { getDcId } from "./2_transport_provider.js";
+const dcToNameMap = {
+    "1": "pluto",
+    "1-test": "pluto",
+    "2": "venus",
+    "2-test": "venus",
+    "3": "aurora",
+    "3-test": "aurora",
+    "4": "vesta",
+    "5": "flora",
+};
+export const transportProviderWebSocket = (params) => {
+    return ({ dc, cdn }) => {
+        params ??= {};
+        params.wss ??= typeof location !== "undefined" && location.protocol == "http:" && location.hostname != "localhost" ? false : true;
+        const url = `${params.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 = getDcId(dc, cdn);
+        return { connection, transport, dcId };
+    };
+};

package/package.json

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

package/script/3_transport.d.ts

@@ -2,3 +2,4 @@ export * from "./transport/0_transport.js";
 export * from "./transport/1_transport_abridged.js";
 export * from "./transport/1_transport_intermediate.js";
 export * from "./transport/2_transport_provider.js";
+export * from "./transport/3_transport_provider_web_socket.js";

package/script/3_transport.js

@@ -18,3 +18,4 @@ __exportStar(require("./transport/0_transport.js"), exports);
 __exportStar(require("./transport/1_transport_abridged.js"), exports);
 __exportStar(require("./transport/1_transport_intermediate.js"), exports);
 __exportStar(require("./transport/2_transport_provider.js"), exports);
+__exportStar(require("./transport/3_transport_provider_web_socket.js"), exports);

package/script/4_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 = 166;
-export declare const APP_VERSION = "MTKruto 0.1.109";
+export declare const APP_VERSION = "MTKruto 0.1.111";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/4_constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2";
 exports.LAYER = 166;
-exports.APP_VERSION = "MTKruto 0.1.109";
+exports.APP_VERSION = "MTKruto 0.1.111";
 // @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/client/1_client_abstract.js

@@ -50,7 +50,7 @@ class ClientAbstract {
             value: void 0
         });
         this.initialDc = params?.initialDc ?? _4_constants_js_1.INITIAL_DC;
-        this.transportProvider = params?.transportProvider ?? (0, _3_transport_js_1.webSocketTransportProvider)();
+        this.transportProvider = params?.transportProvider ?? (0, _3_transport_js_1.transportProviderWebSocket)();
         this.cdn = params?.cdn ?? false;
     }
     get dcId() {

package/script/client/4_client.js

@@ -241,7 +241,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }
     }
     async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_errorHandler = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_lastOutgoing = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
-        return __classPrivateFieldGet(this, _Client_handle, "f").call(this, { connectionState }, _0_utilities_js_1.resolve);
+        __classPrivateFieldGet(this, _Client_handleUpdateQueue, "f").add(async () => {
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, { connectionState }, _0_utilities_js_1.resolve);
+        });
     }, _Client_setAuth = async function _Client_setAuth(key) {
         const hash = await (0, _1_utilities_js_1.sha1)(key);
         const id = (0, _1_utilities_js_1.bigIntFromBuffer)(hash.slice(-8), true, false);

package/script/connection/1_connection_web_socket.js

@@ -33,7 +33,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _ConnectionWebSocket_instances, _ConnectionWebSocket_webSocket, _ConnectionWebSocket_rMutex, _ConnectionWebSocket_wMutex, _ConnectionWebSocket_buffer, _ConnectionWebSocket_nextResolve, _ConnectionWebSocket_initWs, _ConnectionWebSocket_wasConnected, _ConnectionWebSocket_isConnecting, _ConnectionWebSocket_connectionError;
+var _ConnectionWebSocket_instances, _ConnectionWebSocket_webSocket, _ConnectionWebSocket_rMutex, _ConnectionWebSocket_wMutex, _ConnectionWebSocket_buffer, _ConnectionWebSocket_nextResolve, _ConnectionWebSocket_initWs, _ConnectionWebSocket_wasConnected, _ConnectionWebSocket_isConnecting, _ConnectionWebSocket_connectionError, _ConnectionWebSocket_assertConnected, _ConnectionWebSocket_rejectRead;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionWebSocket = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
@@ -41,6 +41,7 @@ const _0_deps_js_1 = require("../0_deps.js");
 const _1_utilities_js_1 = require("../1_utilities.js");
 const _0_connection_js_1 = require("./0_connection.js");
 const d = (0, _0_deps_js_1.debug)("ConnectionWebSocket");
+const errConnectionNotOpen = new Error("Connection not open");
 class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
     constructor(url) {
         super();
@@ -94,11 +95,10 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
         }
     }
     async read(p) {
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").readyState != dntShim.WebSocket.OPEN) {
-            throw new Error("Connection not open");
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
         const release = await __classPrivateFieldGet(this, _ConnectionWebSocket_rMutex, "f").acquire();
         try {
+            __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
             if (__classPrivateFieldGet(this, _ConnectionWebSocket_buffer, "f").length < p.length) {
                 await new Promise((resolve, reject) => __classPrivateFieldSet(this, _ConnectionWebSocket_nextResolve, [p.length, { resolve, reject }], "f"));
             }
@@ -109,11 +109,10 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
         }
     }
     async write(p) {
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").readyState == dntShim.WebSocket.CLOSED) {
-            throw new Error("Connection not open");
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
         const release = await __classPrivateFieldGet(this, _ConnectionWebSocket_wMutex, "f").acquire();
         try {
+            __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
             __classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").send(p);
         }
         finally {
@@ -121,13 +120,9 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
         }
     }
     close() {
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").readyState == dntShim.WebSocket.CLOSED) {
-            throw new Error("Connection not open");
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_assertConnected).call(this);
         __classPrivateFieldGet(this, _ConnectionWebSocket_webSocket, "f").close(1000, "method");
-        if (__classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f") != null) {
-            __classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f")[1].reject(new Error("Connection not open"));
-        }
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_rejectRead).call(this);
     }
 }
 exports.ConnectionWebSocket = ConnectionWebSocket;
@@ -135,6 +130,7 @@ _ConnectionWebSocket_webSocket = new WeakMap(), _ConnectionWebSocket_rMutex = ne
     const webSocket = new dntShim.WebSocket(this.url, "binary");
     const mutex = new _0_deps_js_1.Mutex();
     webSocket.addEventListener("close", () => {
+        __classPrivateFieldGet(this, _ConnectionWebSocket_instances, "m", _ConnectionWebSocket_rejectRead).call(this);
         this.stateChangeHandler?.(false);
     });
     webSocket.addEventListener("open", () => {
@@ -165,4 +161,13 @@ _ConnectionWebSocket_webSocket = new WeakMap(), _ConnectionWebSocket_rMutex = ne
         }
     });
     return webSocket;
+}, _ConnectionWebSocket_assertConnected = function _ConnectionWebSocket_assertConnected() {
+    if (!this.connected) {
+        throw errConnectionNotOpen;
+    }
+}, _ConnectionWebSocket_rejectRead = function _ConnectionWebSocket_rejectRead() {
+    if (__classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f") != null) {
+        __classPrivateFieldGet(this, _ConnectionWebSocket_nextResolve, "f")[1].reject(errConnectionNotOpen);
+        __classPrivateFieldSet(this, _ConnectionWebSocket_nextResolve, null, "f");
+    }
 };

package/script/mod.d.ts

@@ -1,9 +1,5 @@
-import { getRandomId } from "./1_utilities.js";
-import { checkPassword } from "./client/0_password.js";
-export declare const utils: {
-    checkPassword: typeof checkPassword;
-    getRandomId: typeof getRandomId;
-};
+export { getRandomId } from "./1_utilities.js";
+export { checkPassword } from "./client/0_password.js";
 export * from "./2_connection.js";
 export * from "./3_storage.js";
 export * from "./3_transport.js";

package/script/mod.js

@@ -26,10 +26,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errors = exports.SYSTEM_VERSION = exports.SYSTEM_LANG_CODE = exports.LAYER = exports.LANG_PACK = exports.LANG_CODE = exports.INITIAL_DC = exports.DEVICE_MODEL = exports.APP_VERSION = exports.utils = void 0;
-const _1_utilities_js_1 = require("./1_utilities.js");
-const _0_password_js_1 = require("./client/0_password.js");
-exports.utils = { checkPassword: _0_password_js_1.checkPassword, getRandomId: _1_utilities_js_1.getRandomId };
+exports.errors = exports.SYSTEM_VERSION = exports.SYSTEM_LANG_CODE = exports.LAYER = exports.LANG_PACK = exports.LANG_CODE = exports.INITIAL_DC = exports.DEVICE_MODEL = exports.APP_VERSION = exports.checkPassword = exports.getRandomId = void 0;
+var _1_utilities_js_1 = require("./1_utilities.js");
+Object.defineProperty(exports, "getRandomId", { enumerable: true, get: function () { return _1_utilities_js_1.getRandomId; } });
+var _0_password_js_1 = require("./client/0_password.js");
+Object.defineProperty(exports, "checkPassword", { enumerable: true, get: function () { return _0_password_js_1.checkPassword; } });
 __exportStar(require("./2_connection.js"), exports);
 __exportStar(require("./3_storage.js"), exports);
 __exportStar(require("./3_transport.js"), exports);

package/script/storage/0_utilities.js

@@ -93,7 +93,7 @@ function fromString(string) {
 }
 exports.fromString = fromString;
 function fixKey(key) {
-    return key.map((v) => typeof v === "bigint" ? String(v) : v);
+    return key.map((v) => typeof v === "bigint" ? String(ValueType.BigInt) + String(v) : typeof v === "string" ? String(ValueType.String) + v : v);
 }
 exports.fixKey = fixKey;
 // Source: https://gist.github.com/inexorabletash/5462871

package/script/storage/0_utilities_test.d.ts

@@ -0,0 +1 @@
+export {};

package/script/transport/2_transport_provider.d.ts

@@ -1,6 +1,7 @@
 import { Connection } from "../2_connection.js";
 import { Transport } from "./0_transport.js";
 export type DC = "1" | "2" | "3" | "4" | "5" | "1-test" | "2-test" | "3-test";
+export declare function getDcIps(dc: DC, version: "ipv4" | "ipv6"): [string, ...string[]];
 export interface TransportProviderParams {
     dc: DC;
     cdn: boolean;
@@ -10,6 +11,4 @@ export type TransportProvider = (params: TransportProviderParams) => {
     transport: Transport;
     dcId: number;
 };
-export declare const webSocketTransportProvider: (params?: {
-    wss?: boolean;
-}) => TransportProvider;
+export declare function getDcId(dc: DC, cdn: boolean): number;

package/script/transport/2_transport_provider.js

@@ -1,30 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webSocketTransportProvider = void 0;
-const _2_connection_js_1 = require("../2_connection.js");
-const _1_transport_intermediate_js_1 = require("./1_transport_intermediate.js");
-const dcToNameMap = {
-    "1": "pluto",
-    "1-test": "pluto",
-    "2": "venus",
-    "2-test": "venus",
-    "3": "aurora",
-    "3-test": "aurora",
-    "4": "vesta",
-    "5": "flora",
-};
+exports.getDcId = exports.getDcIps = void 0;
+const _1_utilities_js_1 = require("../1_utilities.js");
+function getDcIps(dc, version) {
+    switch (version) {
+        case "ipv4":
+            switch (dc) {
+                case "1":
+                    return ["149.154.175.50"];
+                case "2":
+                    return ["149.154.167.51", "95.161.76.100"];
+                case "3":
+                    return ["149.154.175.100"];
+                case "4":
+                    return ["149.154.167.91"];
+                case "5":
+                    return ["149.154.171.5"];
+                case "1-test":
+                    return ["149.154.175.10"];
+                case "2-test":
+                    return ["149.154.167.40"];
+                case "3-test":
+                    return ["149.154.175.117"];
+                default:
+                    (0, _1_utilities_js_1.UNREACHABLE)();
+            }
+            break;
+        case "ipv6":
+            switch (dc) {
+                case "1":
+                    return ["2001:b28:f23d:f001::a"];
+                case "2":
+                    return ["2001:67c:4e8:f002::a"];
+                case "3":
+                    return ["2001:b28:f23d:f003::a"];
+                case "4":
+                    return ["2001:67c:4e8:f004::a"];
+                case "5":
+                    return ["2001:b28:f23f:f005::a"];
+                case "1-test":
+                    return ["2001:b28:f23d:f001::e"];
+                case "2-test":
+                    return ["2001:67c:4e8:f002::e"];
+                case "3-test":
+                    return ["2001:b28:f23d:f003::e"];
+                default:
+                    (0, _1_utilities_js_1.UNREACHABLE)();
+            }
+            break;
+        default:
+            (0, _1_utilities_js_1.UNREACHABLE)();
+    }
+}
+exports.getDcIps = getDcIps;
 function getDcId(dc, cdn) {
     return Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
 }
-const webSocketTransportProvider = (params) => {
-    return ({ dc, cdn }) => {
-        params ??= {};
-        params.wss ??= typeof location !== "undefined" && location.protocol == "http:" && location.hostname != "localhost" ? false : true;
-        const url = `${params.wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
-        const connection = new _2_connection_js_1.ConnectionWebSocket(url);
-        const transport = new _1_transport_intermediate_js_1.TransportIntermediate(connection, true);
-        const dcId = getDcId(dc, cdn);
-        return { connection, transport, dcId };
-    };
-};
-exports.webSocketTransportProvider = webSocketTransportProvider;
+exports.getDcId = getDcId;

package/script/transport/3_transport_provider_web_socket.d.ts

@@ -0,0 +1,4 @@
+import { TransportProvider } from "./2_transport_provider.js";
+export declare const transportProviderWebSocket: (params?: {
+    wss?: boolean;
+}) => TransportProvider;

package/script/transport/3_transport_provider_web_socket.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transportProviderWebSocket = void 0;
+const _2_connection_js_1 = require("../2_connection.js");
+const _1_transport_intermediate_js_1 = require("./1_transport_intermediate.js");
+const _2_transport_provider_js_1 = require("./2_transport_provider.js");
+const dcToNameMap = {
+    "1": "pluto",
+    "1-test": "pluto",
+    "2": "venus",
+    "2-test": "venus",
+    "3": "aurora",
+    "3-test": "aurora",
+    "4": "vesta",
+    "5": "flora",
+};
+const transportProviderWebSocket = (params) => {
+    return ({ dc, cdn }) => {
+        params ??= {};
+        params.wss ??= typeof location !== "undefined" && location.protocol == "http:" && location.hostname != "localhost" ? false : true;
+        const url = `${params.wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
+        const connection = new _2_connection_js_1.ConnectionWebSocket(url);
+        const transport = new _1_transport_intermediate_js_1.TransportIntermediate(connection, true);
+        const dcId = (0, _2_transport_provider_js_1.getDcId)(dc, cdn);
+        return { connection, transport, dcId };
+    };
+};
+exports.transportProviderWebSocket = transportProviderWebSocket;