@mtkruto/node 0.0.76 → 0.0.78

package/esm/client/client.js

@@ -86,10 +86,8 @@ export class Client extends ClientAbstract {
             let decrypted;
             try {
                 decrypted = await decryptMessage(buffer, this.session.authKey, this.sessionId);
-                console.log({ decrypted });
             }
             catch (_err) {
-                console.log("failed to decrypt msg", { _err });
                 // logger().error(`Failed to decrypt message: ${err}`);
                 continue;
             }
@@ -99,10 +97,6 @@ export class Client extends ClientAbstract {
                 if (body instanceof types.GZIPPacked) {
                     body = new TLReader(gunzip(body.packedData)).readObject();
                 }
-                console.log("---");
-                console.log("message.body", message.body.constructor.name);
-                console.log("body", body.constructor.name);
-                console.log("---");
                 // logger().debug(`Received ${body.constructor.name}`);
                 if (body instanceof types.Updates) {
                     this.updatesHandler?.(this, body);
@@ -112,7 +106,6 @@ export class Client extends ClientAbstract {
                     if (result instanceof types.GZIPPacked) {
                         result = new TLReader(gunzip(result.packedData)).readObject();
                     }
-                    // console.log(result.constructor.name)
                     const promise = this.promises.get(message.body.messageId);
                     if (promise) {
                         if (result instanceof types.RPCError) {
@@ -160,7 +153,6 @@ export class Client extends ClientAbstract {
         if (!this.session.authKey) {
             throw new Error("Not connected");
         }
-        console.log("invoking", function_.constructor.name);
         let seqNo = this.state.seqNo * 2;
         if (!(function_ instanceof functions.Ping) && !(function_ instanceof types.MsgsAck)) {
             seqNo++;

package/esm/client/client_abstract.js

@@ -1,7 +1,8 @@
 import { initTgCrypto } from "../deps.js";
-import { defaultDc, defaultTransportProvider } from "../transport/transport_provider.js";
+import { DEFAULT_INITIAL_DC } from "../constants.js";
+import { defaultTransportProvider } from "../transport/transport_provider.js";
 export class ClientAbstract {
-    constructor(transportProvider = defaultTransportProvider()) {
+    constructor(transportProvider = defaultTransportProvider({ initialDc: DEFAULT_INITIAL_DC })) {
         Object.defineProperty(this, "transportProvider", {
             enumerable: true,
             configurable: true,
@@ -32,7 +33,7 @@ export class ClientAbstract {
             writable: true,
             value: false
         });
-        const { connection, transport, dcId } = transportProvider({ dc: defaultDc, cdn: false });
+        const { connection, transport, dcId } = transportProvider({ cdn: false });
         this.connection = connection;
         this.transport = transport;
         this.dcId = dcId;

package/esm/constants.js

@@ -59,3 +59,4 @@ export const publicKeys = new Map([
     ],
 ]);
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
+export const DEFAULT_INITIAL_DC = "2-test";

package/esm/mod.js

@@ -17,3 +17,4 @@ export * from "./transport/transport.js";
 export * from "./transport/transport_provider.js";
 export * from "./connection/connection.js";
 export * from "./connection/connection_web_socket.js";
+export { DEFAULT_INITIAL_DC } from "./constants.js";

package/esm/transport/transport_provider.js

@@ -1,6 +1,5 @@
 import { ConnectionWebSocket } from "../connection/connection_web_socket.js";
 import { TransportIntermediate } from "./transport_intermediate.js";
-export const defaultDc = "2-test";
 const dcToNameMap = {
     "1": "pluto",
     "1-test": "pluto",
@@ -11,8 +10,9 @@ const dcToNameMap = {
     "4": "vesta",
     "5": "flora",
 };
-export function defaultTransportProvider(wss) {
+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);
@@ -20,4 +20,4 @@ export function defaultTransportProvider(wss) {
         const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
         return { connection, transport, dcId };
     };
-}
+};

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/mod.js",
   "types": "./types/mod.d.ts",
   "name": "@mtkruto/node",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/client/client.js

@@ -112,10 +112,8 @@ class Client extends client_abstract_js_1.ClientAbstract {
             let decrypted;
             try {
                 decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.session.authKey, this.sessionId);
-                console.log({ decrypted });
             }
             catch (_err) {
-                console.log("failed to decrypt msg", { _err });
                 // logger().error(`Failed to decrypt message: ${err}`);
                 continue;
             }
@@ -125,10 +123,6 @@ 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();
                 }
-                console.log("---");
-                console.log("message.body", message.body.constructor.name);
-                console.log("body", body.constructor.name);
-                console.log("---");
                 // logger().debug(`Received ${body.constructor.name}`);
                 if (body instanceof types.Updates) {
                     this.updatesHandler?.(this, body);
@@ -138,7 +132,6 @@ class Client extends client_abstract_js_1.ClientAbstract {
                     if (result instanceof types.GZIPPacked) {
                         result = new _3_tl_reader_js_1.TLReader((0, deps_js_1.gunzip)(result.packedData)).readObject();
                     }
-                    // console.log(result.constructor.name)
                     const promise = this.promises.get(message.body.messageId);
                     if (promise) {
                         if (result instanceof types.RPCError) {
@@ -186,7 +179,6 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (!this.session.authKey) {
             throw new Error("Not connected");
         }
-        console.log("invoking", function_.constructor.name);
         let seqNo = this.state.seqNo * 2;
         if (!(function_ instanceof functions.Ping) && !(function_ instanceof types.MsgsAck)) {
             seqNo++;

package/script/client/client_abstract.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientAbstract = void 0;
 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 {
-    constructor(transportProvider = (0, transport_provider_js_1.defaultTransportProvider)()) {
+    constructor(transportProvider = (0, transport_provider_js_1.defaultTransportProvider)({ initialDc: constants_js_1.DEFAULT_INITIAL_DC })) {
         Object.defineProperty(this, "transportProvider", {
             enumerable: true,
             configurable: true,
@@ -35,7 +36,7 @@ class ClientAbstract {
             writable: true,
             value: false
         });
-        const { connection, transport, dcId } = transportProvider({ dc: transport_provider_js_1.defaultDc, cdn: false });
+        const { connection, transport, dcId } = transportProvider({ cdn: false });
         this.connection = connection;
         this.transport = transport;
         this.dcId = dcId;

package/script/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VECTOR_CONSTRUCTOR = exports.publicKeys = exports.ackThreshold = void 0;
+exports.DEFAULT_INITIAL_DC = exports.VECTOR_CONSTRUCTOR = exports.publicKeys = exports.ackThreshold = void 0;
 exports.ackThreshold = 10;
 exports.publicKeys = new Map([
     [
@@ -62,3 +62,4 @@ exports.publicKeys = new Map([
     ],
 ]);
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
+exports.DEFAULT_INITIAL_DC = "2-test";

package/script/mod.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functions = exports.types = exports.utils = void 0;
+exports.DEFAULT_INITIAL_DC = exports.functions = exports.types = 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 };
@@ -46,3 +46,5 @@ __exportStar(require("./transport/transport.js"), exports);
 __exportStar(require("./transport/transport_provider.js"), exports);
 __exportStar(require("./connection/connection.js"), exports);
 __exportStar(require("./connection/connection_web_socket.js"), exports);
+var constants_js_1 = require("./constants.js");
+Object.defineProperty(exports, "DEFAULT_INITIAL_DC", { enumerable: true, get: function () { return constants_js_1.DEFAULT_INITIAL_DC; } });

package/script/transport/transport_provider.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultTransportProvider = exports.defaultDc = void 0;
+exports.defaultTransportProvider = void 0;
 const connection_web_socket_js_1 = require("../connection/connection_web_socket.js");
 const transport_intermediate_js_1 = require("./transport_intermediate.js");
-exports.defaultDc = "2-test";
 const dcToNameMap = {
     "1": "pluto",
     "1-test": "pluto",
@@ -14,8 +13,9 @@ const dcToNameMap = {
     "4": "vesta",
     "5": "flora",
 };
-function defaultTransportProvider(wss) {
+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);
@@ -23,5 +23,5 @@ function defaultTransportProvider(wss) {
         const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
         return { connection, transport, dcId };
     };
-}
+};
 exports.defaultTransportProvider = defaultTransportProvider;

package/types/constants.d.ts

@@ -1,3 +1,5 @@
+import { DC } from "./transport/transport_provider.js";
 export declare const ackThreshold = 10;
 export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
+export declare const DEFAULT_INITIAL_DC: DC;

package/types/mod.d.ts

@@ -20,3 +20,4 @@ export * from "./transport/transport.js";
 export * from "./transport/transport_provider.js";
 export * from "./connection/connection.js";
 export * from "./connection/connection_web_socket.js";
+export { DEFAULT_INITIAL_DC } from "./constants.js";

package/types/transport/transport_provider.d.ts

@@ -1,7 +1,8 @@
 import { Connection } from "../connection/connection.js";
 import { Transport } from "./transport.js";
+export type DC = "1" | "2" | "3" | "4" | "5" | "1-test" | "2-test" | "3-test";
 export interface TransportProviderParams {
-    dc: "1" | "2" | "3" | "4" | "5" | "1-test" | "2-test" | "3-test";
+    dc?: DC;
     cdn: boolean;
 }
 export type TransportProvider = (params: TransportProviderParams) => {
@@ -9,5 +10,8 @@ export type TransportProvider = (params: TransportProviderParams) => {
     transport: Transport;
     dcId: number;
 };
-export declare const defaultDc: TransportProviderParams["dc"];
-export declare function defaultTransportProvider(wss?: boolean): TransportProvider;
+export interface TransportProviderCreatorParams {
+    initialDc: DC;
+}
+export type TransportProviderCreator = (params: TransportProviderCreatorParams) => TransportProvider;
+export declare const defaultTransportProvider: TransportProviderCreator;