@mtkruto/node 0.0.964 → 0.0.966

package/esm/client/0_message.d.ts

@@ -1,7 +1,7 @@
 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 getMessageId(lastMsgId: bigint): bigint;
+export declare function packUnencryptedMessage(data: Uint8Array, messageId: bigint): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {
     messageId: bigint;
     message: Uint8Array;

package/esm/client/0_message.js

@@ -8,8 +8,7 @@ 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() {
+export function getMessageId(lastMsgId) {
     const now = new Date().getTime() / 1000 + 0;
     const nanoseconds = Math.floor((now - Math.floor(now)) * 1e9);
     let newMsgId = (BigInt(Math.floor(now)) <<
@@ -21,8 +20,8 @@ export function getMessageId() {
     lastMsgId = newMsgId;
     return newMsgId;
 }
-export function packUnencryptedMessage(data) {
-    const message = concat(bufferFromBigInt(0x00, 8), bufferFromBigInt(getMessageId(), 8), bufferFromBigInt(data.length, 4), data);
+export function packUnencryptedMessage(data, messageId) {
+    const message = concat(bufferFromBigInt(0x00, 8), bufferFromBigInt(getMessageId(messageId), 8), bufferFromBigInt(data.length, 4), data);
     return message;
 }
 export function unpackUnencryptedMessage(buffer) {

package/esm/client/2_client_plain.d.ts

@@ -1,6 +1,7 @@
 import { Function } from "../tl/3_functions.js";
 import { ClientAbstract } from "./1_client_abstract.js";
 export declare class ClientPlain extends ClientAbstract {
+    private lastMsgId;
     invoke<T extends Function<unknown>>(function_: T): Promise<T["__R"]>;
     createAuthKey(): Promise<{
         authKey: Uint8Array;

package/esm/client/2_client_plain.js

@@ -10,11 +10,21 @@ import { ClientDHInnerData, DHGenOK, PQInnerDataDC, ResPQ, ServerDHInnerData, Se
 import { ReqDHParams, ReqPQMulti, SetClientDHParams } from "../tl/3_functions.js";
 import { TLReader } from "../tl/3_tl_reader.js";
 import { ClientAbstract } from "./1_client_abstract.js";
-import { packUnencryptedMessage, unpackUnencryptedMessage } from "./0_message.js";
+import { getMessageId, packUnencryptedMessage, unpackUnencryptedMessage } from "./0_message.js";
 const d = debug("ClientPlain/createAuthKey");
 export class ClientPlain extends ClientAbstract {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "lastMsgId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0n
+        });
+    }
     async invoke(function_) {
-        await this.transport.send(packUnencryptedMessage(function_[serialize]()));
+        const msgId = this.lastMsgId = getMessageId(this.lastMsgId);
+        await this.transport.send(packUnencryptedMessage(function_[serialize](), msgId));
         const buffer = await this.transport.receive();
         if (buffer.length == 4) {
             const int = bigIntFromBuffer(buffer, true, true);

package/esm/client/3_client.d.ts

@@ -131,6 +131,7 @@ export declare class Client extends ClientAbstract {
     authorize(params: string | types.AuthExportedAuthorization | AuthorizeUserParams): Promise<void>;
     private receiveLoop;
     private pingLoop;
+    private lastMsgId;
     /**
      * Invokes a function waiting and returning its reply if the second parameter is not `true`. Requires the client
      * to be connected.

package/esm/client/3_client.js

@@ -159,6 +159,12 @@ export class Client extends ClientAbstract {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "lastMsgId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0n
+        });
         Object.defineProperty(this, "updateApplicationMutex", {
             enumerable: true,
             configurable: true,
@@ -558,7 +564,8 @@ export class Client extends ClientAbstract {
             seqNo++;
             this.state.seqNo++;
         }
-        const message = new Message_(getMessageId(), seqNo, function_);
+        const messageId = this.lastMsgId = getMessageId(this.lastMsgId);
+        const message = new Message_(messageId, seqNo, function_);
         await this.transport.send(await encryptMessage(message, this.auth.key, this.auth.id, this.state.salt, this.sessionId));
         const d_ = () => d("invoked %s", function_.constructor.name);
         if (noWait) {

package/esm/connection/1_connection_web_socket.d.ts

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

package/esm/connection/1_connection_web_socket.js

@@ -33,17 +33,35 @@ export class ConnectionWebSocket {
             writable: true,
             value: null
         });
+        Object.defineProperty(this, "isConnecting", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "connectionError", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         this.webSocket = this.reinitWs(url);
         // TODO
-        this.webSocket.onclose = () => {
-            this.webSocket = this.reinitWs(url);
-        };
+        this.webSocket.addEventListener("close", (e) => {
+            if (e.code != 1000 && e.reason != "method") {
+                this.webSocket = this.reinitWs(url);
+            }
+        });
     }
     reinitWs(url) {
         const webSocket = new dntShim.WebSocket(url, "binary");
-        webSocket.onmessage = async (e) => {
-            // deno-lint-ignore no-explicit-any
-            const data = e.data instanceof Blob ? new Uint8Array(await e.data.arrayBuffer()) : new Uint8Array(e.data);
+        const mutex = new Mutex();
+        webSocket.addEventListener("message", async (e) => {
+            if (typeof e.data === "string") {
+                return;
+            }
+            const release = await mutex.acquire();
+            const data = new Uint8Array(await new Blob([e.data].map((v) => v instanceof ArrayBuffer ? v : Array.isArray(v) ? v.map((v) => v.buffer) : v.buffer).flat()).arrayBuffer());
             for (const byte of data) {
                 this.buffer.push(byte);
             }
@@ -51,24 +69,44 @@ export class ConnectionWebSocket {
                 this.nextResolve[1]();
                 this.nextResolve = null;
             }
-        };
-        webSocket.onerror = (err) => {
+            release();
+        });
+        webSocket.addEventListener("error", (err) => {
+            if (this.isConnecting) {
+                // @ts-ignore: Node.js
+                this.connectionError = err;
+            }
             d("WebSocket error: %o", err);
-        };
+        });
         return webSocket;
     }
     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) {
-                throw new Error("Connection was closed");
-            }
-            else {
-                await new Promise((r) => setTimeout(r, 5));
+        if (this.isConnecting) {
+            throw new Error("Already connecting");
+        }
+        this.isConnecting = true;
+        try {
+            while (this.webSocket.readyState != dntShim.WebSocket.OPEN) {
+                if (this.webSocket.readyState == dntShim.WebSocket.CLOSED) {
+                    if (this.connectionError instanceof ErrorEvent) {
+                        throw new Error(this.connectionError.message);
+                    }
+                    else {
+                        throw new Error("Connection was closed");
+                    }
+                }
+                else {
+                    await new Promise((r) => setTimeout(r, 5));
+                }
             }
         }
+        finally {
+            this.isConnecting = false;
+            this.connectionError = null;
+        }
     }
     async read(p) {
         if (this.webSocket.readyState != dntShim.WebSocket.OPEN) {
@@ -101,6 +139,7 @@ export class ConnectionWebSocket {
         if (this.webSocket.readyState == dntShim.WebSocket.CLOSED) {
             throw new Error("Connection not open");
         }
-        this.webSocket.close();
+        this.webSocket.close(1000, "method");
+        console.trace("close called");
     }
 }

package/esm/constants.d.ts

@@ -4,7 +4,7 @@ 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 0.0.964";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.966";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/esm/constants.js

@@ -62,7 +62,7 @@ export const publicKeys = new Map([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const DEFAULT_INITIAL_DC = "2-test";
 export const LAYER = 158;
-export const DEFAULT_APP_VERSION = "MTKruto 0.0.964";
+export const DEFAULT_APP_VERSION = "MTKruto 0.0.966";
 // @ts-ignore: lib
 export const DEFAULT_DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 export const DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/package.json

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

package/script/client/0_message.d.ts

@@ -1,7 +1,7 @@
 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 getMessageId(lastMsgId: bigint): bigint;
+export declare function packUnencryptedMessage(data: Uint8Array, messageId: bigint): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {
     messageId: bigint;
     message: Uint8Array;

package/script/client/0_message.js

@@ -11,8 +11,7 @@ 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() {
+function getMessageId(lastMsgId) {
     const now = new Date().getTime() / 1000 + 0;
     const nanoseconds = Math.floor((now - Math.floor(now)) * 1e9);
     let newMsgId = (BigInt(Math.floor(now)) <<
@@ -25,8 +24,8 @@ function getMessageId() {
     return newMsgId;
 }
 exports.getMessageId = getMessageId;
-function packUnencryptedMessage(data) {
-    const message = (0, _0_buffer_js_1.concat)((0, _0_buffer_js_1.bufferFromBigInt)(0x00, 8), (0, _0_buffer_js_1.bufferFromBigInt)(getMessageId(), 8), (0, _0_buffer_js_1.bufferFromBigInt)(data.length, 4), data);
+function packUnencryptedMessage(data, messageId) {
+    const message = (0, _0_buffer_js_1.concat)((0, _0_buffer_js_1.bufferFromBigInt)(0x00, 8), (0, _0_buffer_js_1.bufferFromBigInt)(getMessageId(messageId), 8), (0, _0_buffer_js_1.bufferFromBigInt)(data.length, 4), data);
     return message;
 }
 exports.packUnencryptedMessage = packUnencryptedMessage;

package/script/client/2_client_plain.d.ts

@@ -1,6 +1,7 @@
 import { Function } from "../tl/3_functions.js";
 import { ClientAbstract } from "./1_client_abstract.js";
 export declare class ClientPlain extends ClientAbstract {
+    private lastMsgId;
     invoke<T extends Function<unknown>>(function_: T): Promise<T["__R"]>;
     createAuthKey(): Promise<{
         authKey: Uint8Array;

package/script/client/2_client_plain.js

@@ -16,8 +16,18 @@ const _1_client_abstract_js_1 = require("./1_client_abstract.js");
 const _0_message_js_1 = require("./0_message.js");
 const d = (0, deps_js_1.debug)("ClientPlain/createAuthKey");
 class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "lastMsgId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0n
+        });
+    }
     async invoke(function_) {
-        await this.transport.send((0, _0_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize]()));
+        const msgId = this.lastMsgId = (0, _0_message_js_1.getMessageId)(this.lastMsgId);
+        await this.transport.send((0, _0_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize](), msgId));
         const buffer = await this.transport.receive();
         if (buffer.length == 4) {
             const int = (0, _0_bigint_js_1.bigIntFromBuffer)(buffer, true, true);

package/script/client/3_client.d.ts

@@ -131,6 +131,7 @@ export declare class Client extends ClientAbstract {
     authorize(params: string | types.AuthExportedAuthorization | AuthorizeUserParams): Promise<void>;
     private receiveLoop;
     private pingLoop;
+    private lastMsgId;
     /**
      * Invokes a function waiting and returning its reply if the second parameter is not `true`. Requires the client
      * to be connected.

package/script/client/3_client.js

@@ -185,6 +185,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "lastMsgId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0n
+        });
         Object.defineProperty(this, "updateApplicationMutex", {
             enumerable: true,
             configurable: true,
@@ -584,7 +590,8 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             seqNo++;
             this.state.seqNo++;
         }
-        const message = new _6_message_js_1.Message((0, _0_message_js_1.getMessageId)(), seqNo, function_);
+        const messageId = this.lastMsgId = (0, _0_message_js_1.getMessageId)(this.lastMsgId);
+        const message = new _6_message_js_1.Message(messageId, 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));
         const d_ = () => d("invoked %s", function_.constructor.name);
         if (noWait) {

package/script/connection/1_connection_web_socket.d.ts

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

package/script/connection/1_connection_web_socket.js

@@ -59,17 +59,35 @@ class ConnectionWebSocket {
             writable: true,
             value: null
         });
+        Object.defineProperty(this, "isConnecting", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "connectionError", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         this.webSocket = this.reinitWs(url);
         // TODO
-        this.webSocket.onclose = () => {
-            this.webSocket = this.reinitWs(url);
-        };
+        this.webSocket.addEventListener("close", (e) => {
+            if (e.code != 1000 && e.reason != "method") {
+                this.webSocket = this.reinitWs(url);
+            }
+        });
     }
     reinitWs(url) {
         const webSocket = new dntShim.WebSocket(url, "binary");
-        webSocket.onmessage = async (e) => {
-            // deno-lint-ignore no-explicit-any
-            const data = e.data instanceof Blob ? new Uint8Array(await e.data.arrayBuffer()) : new Uint8Array(e.data);
+        const mutex = new deps_js_1.Mutex();
+        webSocket.addEventListener("message", async (e) => {
+            if (typeof e.data === "string") {
+                return;
+            }
+            const release = await mutex.acquire();
+            const data = new Uint8Array(await new Blob([e.data].map((v) => v instanceof ArrayBuffer ? v : Array.isArray(v) ? v.map((v) => v.buffer) : v.buffer).flat()).arrayBuffer());
             for (const byte of data) {
                 this.buffer.push(byte);
             }
@@ -77,24 +95,44 @@ class ConnectionWebSocket {
                 this.nextResolve[1]();
                 this.nextResolve = null;
             }
-        };
-        webSocket.onerror = (err) => {
+            release();
+        });
+        webSocket.addEventListener("error", (err) => {
+            if (this.isConnecting) {
+                // @ts-ignore: Node.js
+                this.connectionError = err;
+            }
             d("WebSocket error: %o", err);
-        };
+        });
         return webSocket;
     }
     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) {
-                throw new Error("Connection was closed");
-            }
-            else {
-                await new Promise((r) => setTimeout(r, 5));
+        if (this.isConnecting) {
+            throw new Error("Already connecting");
+        }
+        this.isConnecting = true;
+        try {
+            while (this.webSocket.readyState != dntShim.WebSocket.OPEN) {
+                if (this.webSocket.readyState == dntShim.WebSocket.CLOSED) {
+                    if (this.connectionError instanceof ErrorEvent) {
+                        throw new Error(this.connectionError.message);
+                    }
+                    else {
+                        throw new Error("Connection was closed");
+                    }
+                }
+                else {
+                    await new Promise((r) => setTimeout(r, 5));
+                }
             }
         }
+        finally {
+            this.isConnecting = false;
+            this.connectionError = null;
+        }
     }
     async read(p) {
         if (this.webSocket.readyState != dntShim.WebSocket.OPEN) {
@@ -127,7 +165,8 @@ class ConnectionWebSocket {
         if (this.webSocket.readyState == dntShim.WebSocket.CLOSED) {
             throw new Error("Connection not open");
         }
-        this.webSocket.close();
+        this.webSocket.close(1000, "method");
+        console.trace("close called");
     }
 }
 exports.ConnectionWebSocket = ConnectionWebSocket;

package/script/constants.d.ts

@@ -4,7 +4,7 @@ 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 0.0.964";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.966";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/script/constants.js

@@ -88,7 +88,7 @@ exports.publicKeys = new Map([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.DEFAULT_INITIAL_DC = "2-test";
 exports.LAYER = 158;
-exports.DEFAULT_APP_VERSION = "MTKruto 0.0.964";
+exports.DEFAULT_APP_VERSION = "MTKruto 0.0.966";
 // @ts-ignore: lib
 exports.DEFAULT_DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 exports.DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];