@mtkruto/node 0.0.831 → 0.0.834

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/debug.js

@@ -0,0 +1,112 @@
+import * as dntShim from "../../../../../_dnt.shims.js";
+import { generateColor } from "./colors.js";
+import { format } from "./format.js";
+export class Debugger {
+    constructor(manager, namespace) {
+        Object.defineProperty(this, "manager", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "ns", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "color", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "last", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "enabled", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.manager = manager;
+        this.ns = namespace;
+        this.color = generateColor(namespace);
+        this.last = 0;
+        this.enabled = manager.enabled.some((r) => r.test(namespace));
+    }
+    log(fmt, ...args) {
+        if (!this.enabled)
+            return;
+        const diff = Date.now() - (this.last || Date.now());
+        fmt = format(fmt, ...args);
+        console.debug(...this.color(this.ns), fmt, ...this.color(`+${diff}ms`));
+        this.last = Date.now();
+    }
+}
+class DebugManager {
+    constructor(enabled) {
+        Object.defineProperty(this, "debuggers", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "enabled", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.debuggers = new Map();
+        this.enabled = enabled ?? [];
+    }
+}
+function extract(opts) {
+    if (!opts || opts.length === 0)
+        return [];
+    opts = opts.replace(/\s/g, "").replace(/\*/g, ".+");
+    return opts.split(",").map((rule) => new RegExp(`^${rule}$`));
+}
+let manager;
+export function withoutEnv(enabled) {
+    if (!enabled)
+        enabled = [];
+    if (typeof enabled === "string")
+        enabled = extract(enabled);
+    manager = new DebugManager(enabled);
+}
+// @ts-ignore: lib
+const isDeno = typeof dntShim.Deno !== "undefined" &&
+    typeof dntShim.dntGlobalThis !== "undefined";
+// @ts-ignore: lib
+const isNode = typeof process !== "undefined" &&
+    typeof dntShim.dntGlobalThis === "undefined";
+function getOpts() {
+    if (isDeno) {
+        // @ts-ignore: lib
+        return dntShim.Deno.env.get("DEBUG");
+    }
+    else if (isNode) {
+        // @ts-ignore: lib
+        return process.env.DEBUG;
+    }
+    else {
+        // @ts-ignore: lib
+        return globalThis.DEBUG;
+    }
+}
+export function debug(namespace) {
+    if (!manager)
+        manager = new DebugManager(extract(getOpts()));
+    const dbg = new Debugger(manager, namespace);
+    manager.debuggers.set(namespace, dbg);
+    const de = Object.assign(dbg.log.bind(dbg), {
+        self: dbg,
+    });
+    return de;
+}

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/deps.d.ts

@@ -0,0 +1,2 @@
+export * as colors from "../../../../deno.land/std@0.69.0/fmt/colors.js";
+export { default as inspect } from "object-inspect";

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/deps.js

@@ -0,0 +1,2 @@
+export * as colors from "../../../../deno.land/std@0.69.0/fmt/colors.js";
+export { default as inspect } from "object-inspect";

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/format.d.ts

@@ -0,0 +1 @@
+export declare function format(f: string, ...args: unknown[]): string;

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/format.js

@@ -0,0 +1,39 @@
+import { inspect } from "./deps.js";
+export function format(f, ...args) {
+    let i = 0;
+    const len = args.length;
+    let str = String(f).replace(/%[sdjoO%]/g, (x) => {
+        if (x === "%%")
+            return "%";
+        if (i >= len)
+            return x;
+        switch (x) {
+            case "%s":
+                return String(args[i++]);
+            case "%d":
+                return Number(args[i++]).toString();
+            case "%o":
+                return inspect(args[i++]).split("\n").map((_) => _.trim()).join(" ");
+            case "%O":
+                return inspect(args[i++]);
+            case "%j":
+                try {
+                    return JSON.stringify(args[i++]);
+                }
+                catch {
+                    return "[Circular]";
+                }
+            default:
+                return x;
+        }
+    });
+    for (const x of args.splice(i)) {
+        if (x === null || !(typeof x === "object" && x !== null)) {
+            str += " " + x;
+        }
+        else {
+            str += " " + inspect(x);
+        }
+    }
+    return str;
+}

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/mod.d.ts

@@ -0,0 +1 @@
+export * from "./debug.js";

package/esm/deps/raw.githubusercontent.com/MTKruto/debug/master/mod.js

@@ -0,0 +1 @@
+export * from "./debug.js";

package/esm/deps.d.ts

@@ -1,5 +1,7 @@
-export * from "./deps/deno.land/std@0.186.0/testing/asserts.js";
+export * from "./deps/deno.land/std@0.190.0/testing/asserts.js";
 export { ctr256Decrypt, ctr256Encrypt, factorize, ige256Decrypt, ige256Encrypt, init as initTgCrypto } from "./deps/deno.land/x/tgcrypto@0.1.3/mod.js";
 export { gunzip, gzip } from "./deps/raw.githubusercontent.com/MTKruto/compress/master/gzip/gzip.js";
 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 declare const debug: typeof debug_;

package/esm/deps.js

@@ -1,5 +1,7 @@
-export * from "./deps/deno.land/std@0.186.0/testing/asserts.js";
+export * from "./deps/deno.land/std@0.190.0/testing/asserts.js";
 export { ctr256Decrypt, ctr256Encrypt, factorize, ige256Decrypt, ige256Encrypt, init as initTgCrypto } from "./deps/deno.land/x/tgcrypto@0.1.3/mod.js";
 export { gunzip, gzip } from "./deps/raw.githubusercontent.com/MTKruto/compress/master/gzip/gzip.js";
 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}`);

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.0.831",
+  "version": "0.0.834",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",
@@ -10,6 +10,12 @@
     "type": "git",
     "url": "git+https://github.com/MTKruto/MTKruto.git"
   },
+  "devDependencies": {
+    "@types/node": "^18.11.9",
+    "picocolors": "^1.0.0",
+    "@types/ws": "^8.5.4",
+    "@types/object-inspect": "^1.8.1"
+  },
   "exports": {
     ".": {
       "import": "./esm/mod.js",
@@ -21,13 +27,9 @@
   },
   "dependencies": {
     "async-mutex": "0.4.0",
+    "object-inspect": "1.12.3",
     "@deno/shim-deno": "~0.16.1",
     "@deno/shim-crypto": "~0.3.1",
     "ws": "^8.13.0"
-  },
-  "devDependencies": {
-    "@types/node": "^18.11.9",
-    "picocolors": "^1.0.0",
-    "@types/ws": "^8.5.4"
   }
 }

package/script/client/client.js

@@ -42,6 +42,7 @@ const client_plain_js_1 = require("./client_plain.js");
 const storage_memory_js_1 = require("../storage/storage_memory.js");
 const _0_hash_js_1 = require("../utilities/0_hash.js");
 const _0_message_entity_js_1 = require("../types/0_message_entity.js");
+const d = (0, deps_js_1.debug)("client");
 exports.restartAuth = Symbol();
 var ParseMode;
 (function (ParseMode) {
@@ -226,7 +227,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (dc == null) {
             await this.storage.setDc(constants_js_1.DEFAULT_INITIAL_DC);
         }
-        // logger().debug("Client connected");
+        d("enrypted client connected");
         this.receiveLoop();
         this.pingLoop();
     }
@@ -254,6 +255,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");
         await this.invoke(new functions.InitConnection({
             apiId: this.apiId,
             appVersion: this.appVersion,
@@ -267,6 +269,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             systemLangCode: this.systemLangCode,
             systemVersion: this.systemVersion,
         }));
+        d("connection inited");
         const handlePassword = async (err) => {
             params = params;
             if (err instanceof types.RPCError && err.errorMessage == "SESSION_PASSWORD_NEEDED") {
@@ -277,6 +280,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                             const password = typeof params.password === "string" ? params.password : await params.password();
                             const input = await (0, _1_password_js_1.checkPassword)(password, ap);
                             await this.invoke(new functions.AuthCheckPassword({ password: input }));
+                            d("authorized as user");
                             break;
                         }
                         catch (err) {
@@ -299,6 +303,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         };
         try {
             await this.invoke(new functions.UpdatesGetState());
+            d("already authorized");
             return;
         }
         catch (err) {
@@ -311,6 +316,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");
             }
             else if (typeof params == "object") {
                 while (true) {
@@ -326,6 +332,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                                 phoneNumber,
                                 settings: new types.CodeSettings(),
                             }));
+                            d("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
                                 while (true) {
                                     const phoneCode = typeof params.code === "string" ? params.code : await params.code();
@@ -336,6 +343,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                                         }
                                         else {
                                             signedIn = true;
+                                            d("authorized as user");
                                             break;
                                         }
                                     }
@@ -369,6 +377,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 }));
+                d("authorized as bot");
             }
         }
         catch (err) {
@@ -380,6 +389,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
                         newDc += "-test";
                     }
                     await this.reconnect(newDc);
+                    d("migrated to DC%s", newDc);
                     if (typeof params === "object" && phoneNumber != null) {
                         params = Object.assign({}, params);
                         params.phone = phoneNumber;
@@ -420,8 +430,8 @@ class Client extends client_abstract_js_1.ClientAbstract {
             try {
                 decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.auth.key, this.auth.id, this.sessionId);
             }
-            catch (_err) {
-                // logger().error(`Failed to decrypt message: ${err}`);
+            catch (err) {
+                d("failed to decrypt message: %o", err);
                 continue;
             }
             const messages = decrypted instanceof _6_message_container_js_1.MessageContainer ? decrypted.messages : [decrypted];
@@ -430,7 +440,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();
                 }
-                // logger().debug(`Received ${body.constructor.name}`);
+                d("received %s", body.constructor.name);
                 if (body instanceof types.Updates) {
                     this.processUpdates(body);
                 }
@@ -439,6 +449,12 @@ 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();
                     }
+                    if (result instanceof types.RPCError) {
+                        d("RPCResult: %d %s", result.errorCode, result.errorMessage);
+                    }
+                    else {
+                        d("RPCResult: %s", result.constructor.name);
+                    }
                     const promise = this.promises.get(message.body.messageId);
                     if (promise) {
                         if (result instanceof types.RPCError) {
@@ -480,8 +496,8 @@ class Client extends client_abstract_js_1.ClientAbstract {
             try {
                 await this.invoke(new functions.Ping({ pingId: (0, _0_bigint_js_1.getRandomBigInt)(8, true, false) }));
             }
-            catch (_err) {
-                // logger().error(`Failed to invoke ping: ${err}`);
+            catch (err) {
+                d("ping loop error: %o", err);
             }
             await new Promise((r) => setTimeout(r, 60 * 1000));
         }
@@ -497,7 +513,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
         const message = new _5_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));
-        // logger().debug(`Invoked ${function_.constructor.name}`);
+        d("invoked %s", function_.constructor.name);
         if (noWait) {
             return;
         }

package/script/client/client_abstract.d.ts

@@ -7,10 +7,10 @@ export declare abstract class ClientAbstract {
     protected connection: Connection;
     protected transport: Transport;
     private _dcId;
-    protected connected: boolean;
     constructor(transportProvider?: import("../transport/transport_provider.js").TransportProvider);
     get dcId(): number;
     setDc(dc: DC): MaybePromise<void>;
+    get connected(): boolean;
     connect(): Promise<void>;
     reconnect(dc?: DC): Promise<void>;
     disconnect(): Promise<void>;

package/script/client/client_abstract.js

@@ -30,12 +30,6 @@ class ClientAbstract {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "connected", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
         const { connection, transport, dcId } = transportProvider({ cdn: false });
         this.connection = connection;
         this.transport = transport;
@@ -51,11 +45,13 @@ class ClientAbstract {
         this.transport = transport;
         this._dcId = dcId;
     }
+    get connected() {
+        return this.connection.connected;
+    }
     async connect() {
         await (0, deps_js_1.initTgCrypto)();
         await this.connection.open();
         await this.transport.initialize();
-        this.connected = true;
     }
     async reconnect(dc) {
         await this.disconnect();
@@ -67,7 +63,6 @@ class ClientAbstract {
     async disconnect() {
         await this.transport.deinitialize();
         await this.connection.close();
-        this.connected = false;
     }
 }
 exports.ClientAbstract = ClientAbstract;

package/script/client/client_plain.js

@@ -13,6 +13,7 @@ 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");
 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]()));
@@ -29,14 +30,14 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
     }
     async createAuthKey() {
         const nonce = (0, _0_bigint_js_1.getRandomBigInt)(16, false, true);
-        // logger().debug("Auth key creation started");
+        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);
-        // logger().debug("Got res_pq");
+        d("got res_pq");
         const pq_ = (0, _0_bigint_js_1.bigIntFromBuffer)(resPq.pq, false, false);
         const [p_, q_] = (0, deps_js_1.factorize)(pq_);
-        // logger().debug("Factorized pq");
+        d("factorized pq");
         const p = (0, _0_buffer_js_1.bufferFromBigInt)(p_, 4, false, false);
         const q = (0, _0_buffer_js_1.bufferFromBigInt)(q_, 4, false, false);
         let publicKeyFingerprint;
@@ -74,7 +75,7 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
             encryptedData,
         }));
         (0, deps_js_1.assertInstanceOf)(dhParams, _2_types_js_1.ServerDHParamsOK);
-        // logger().debug("Got server_DH_params_ok");
+        d("got server_DH_params_ok");
         const newNonce_ = (0, _0_buffer_js_1.bufferFromBigInt)(newNonce, 32, true, true);
         const serverNonce_ = (0, _0_buffer_js_1.bufferFromBigInt)(serverNonce, 16, true, true);
         const tmpAesKey = (0, _0_buffer_js_1.concat)(await (0, _0_hash_js_1.sha1)((0, _0_buffer_js_1.concat)(newNonce_, serverNonce_)), (await (0, _0_hash_js_1.sha1)((0, _0_buffer_js_1.concat)(serverNonce_, newNonce_))).slice(0, 0 + 12));
@@ -100,12 +101,12 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
         encryptedData = (0, deps_js_1.ige256Encrypt)(dataWithHash, tmpAesKey, tmpAesIv);
         const dhGenOk = await this.invoke(new _3_functions_js_1.SetClientDHParams({ nonce, serverNonce, encryptedData }));
         (0, deps_js_1.assertInstanceOf)(dhGenOk, _2_types_js_1.DHGenOK);
-        // logger().debug("Got dh_gen_ok");
+        d("got dh_gen_ok");
         const serverNonceSlice = serverNonce_.slice(0, 8);
         const salt = newNonce_.slice(0, 0 + 8).map((v, i) => v ^ serverNonceSlice[i]);
         const authKey_ = (0, _0_bigint_js_1.modExp)(gA, b, dhPrime);
         const authKey = (0, _0_buffer_js_1.bufferFromBigInt)(authKey_, 256, false, false);
-        // logger().debug("Auth key created");
+        d("auth key created");
         return {
             authKey,
             salt: (0, _0_bigint_js_1.bigIntFromBuffer)(salt, true, false),

package/script/connection/connection.d.ts

@@ -1,5 +1,6 @@
 import { MaybePromise } from "../types.js";
 export declare abstract class Connection {
+    abstract get connected(): boolean;
     abstract open(): MaybePromise<void>;
     abstract read(p: Uint8Array): MaybePromise<void>;
     abstract write(p: Uint8Array): MaybePromise<void>;

package/script/connection/connection_web_socket.d.ts

@@ -6,6 +6,7 @@ export declare class ConnectionWebSocket implements Connection {
     private buffer;
     private nextResolve;
     constructor(url: string | URL);
+    get connected(): boolean;
     open(): Promise<void>;
     read(p: Uint8Array): Promise<void>;
     write(p: Uint8Array): Promise<void>;

package/script/connection/connection_web_socket.js

@@ -72,6 +72,9 @@ class ConnectionWebSocket {
         };
         this.webSocket.onerror = console.error;
     }
+    get connected() {
+        return this.webSocket.readyState == dntShim.WebSocket.OPEN;
+    }
     async open() {
         while (this.webSocket.readyState != dntShim.WebSocket.OPEN) {
             if (this.webSocket.readyState == dntShim.WebSocket.CLOSED) {

package/script/deps/deno.land/std@0.69.0/fmt/colors.d.ts

@@ -0,0 +1,77 @@
+/** RGB 8-bits per channel. Each in range `0->255` or `0x00->0xff` */
+interface Rgb {
+    r: number;
+    g: number;
+    b: number;
+}
+export declare function setColorEnabled(value: boolean): void;
+export declare function getColorEnabled(): boolean;
+export declare function reset(str: string): string;
+export declare function bold(str: string): string;
+export declare function dim(str: string): string;
+export declare function italic(str: string): string;
+export declare function underline(str: string): string;
+export declare function inverse(str: string): string;
+export declare function hidden(str: string): string;
+export declare function strikethrough(str: string): string;
+export declare function black(str: string): string;
+export declare function red(str: string): string;
+export declare function green(str: string): string;
+export declare function yellow(str: string): string;
+export declare function blue(str: string): string;
+export declare function magenta(str: string): string;
+export declare function cyan(str: string): string;
+export declare function white(str: string): string;
+export declare function gray(str: string): string;
+export declare function brightBlack(str: string): string;
+export declare function brightRed(str: string): string;
+export declare function brightGreen(str: string): string;
+export declare function brightYellow(str: string): string;
+export declare function brightBlue(str: string): string;
+export declare function brightMagenta(str: string): string;
+export declare function brightCyan(str: string): string;
+export declare function brightWhite(str: string): string;
+export declare function bgBlack(str: string): string;
+export declare function bgRed(str: string): string;
+export declare function bgGreen(str: string): string;
+export declare function bgYellow(str: string): string;
+export declare function bgBlue(str: string): string;
+export declare function bgMagenta(str: string): string;
+export declare function bgCyan(str: string): string;
+export declare function bgWhite(str: string): string;
+export declare function bgBrightBlack(str: string): string;
+export declare function bgBrightRed(str: string): string;
+export declare function bgBrightGreen(str: string): string;
+export declare function bgBrightYellow(str: string): string;
+export declare function bgBrightBlue(str: string): string;
+export declare function bgBrightMagenta(str: string): string;
+export declare function bgBrightCyan(str: string): string;
+export declare function bgBrightWhite(str: string): string;
+/** Set text color using paletted 8bit colors.
+ * https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit */
+export declare function rgb8(str: string, color: number): string;
+/** Set background color using paletted 8bit colors.
+ * https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit */
+export declare function bgRgb8(str: string, color: number): string;
+/** Set text color using 24bit rgb.
+ * `color` can be a number in range `0x000000` to `0xffffff` or
+ * an `Rgb`.
+ *
+ * To produce the color magenta:
+ *
+ *      rgba24("foo", 0xff00ff);
+ *      rgba24("foo", {r: 255, g: 0, b: 255});
+ */
+export declare function rgb24(str: string, color: number | Rgb): string;
+/** Set background color using 24bit rgb.
+ * `color` can be a number in range `0x000000` to `0xffffff` or
+ * an `Rgb`.
+ *
+ * To produce the color magenta:
+ *
+ *      bgRgba24("foo", 0xff00ff);
+ *      bgRgba24("foo", {r: 255, g: 0, b: 255});
+ */
+export declare function bgRgb24(str: string, color: number | Rgb): string;
+export declare function stripColor(string: string): string;
+export {};