@mtkruto/node 0.0.71 → 0.0.72

package/esm/client/client.js

@@ -1,7 +1,6 @@
 import { gunzip } from "../deps.js";
 import { ackThreshold } from "../constants.js";
-import { bigIntFromBuffer, getRandomBigInt } from "../utilities/0_bigint.js";
-import { sha1 } from "../utilities/0_hash.js";
+import { getRandomBigInt } from "../utilities/0_bigint.js";
 import { decryptMessage, encryptMessage, getMessageId } from "../utilities/1_message.js";
 import * as types from "../tl/2_types.js";
 import * as functions from "../tl/3_functions.js";
@@ -27,12 +26,6 @@ export class Client extends ClientAbstract {
             writable: true,
             value: getRandomBigInt(8, true, false)
         });
-        Object.defineProperty(this, "auth", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "state", {
             enumerable: true,
             configurable: true,
@@ -60,22 +53,14 @@ export class Client extends ClientAbstract {
     }
     async connect() {
         await this.session.load();
-        let key;
-        let id;
-        if (this.session.authKey != null) {
-            key = this.session.authKey;
-            id = bigIntFromBuffer((await sha1(key)).slice(-8), true, false);
-        }
-        else {
+        if (this.session.authKey == null) {
             const plain = new ClientPlain(this.transportProvider);
             await plain.connect();
-            const { authKey, authKeyId, salt } = await plain.createAuthKey();
+            const { authKey, salt } = await plain.createAuthKey();
             await plain.disconnect();
-            key = authKey;
-            id = authKeyId;
             this.state.salt = salt;
+            this.session.authKey = authKey;
         }
-        this.auth = { key, id };
         if (this.session.dc != null) {
             const { connection, transport, dcId } = this.transportProvider({ dc: this.session.dc, cdn: false });
             this.connection = connection;
@@ -88,7 +73,7 @@ export class Client extends ClientAbstract {
         this.pingLoop();
     }
     async receiveLoop() {
-        if (!this.auth) {
+        if (!this.session.authKey) {
             throw new Error("Not connected");
         }
         while (this.connected) {
@@ -99,7 +84,7 @@ export class Client extends ClientAbstract {
             const buffer = await this.transport.receive();
             let decrypted;
             try {
-                decrypted = await decryptMessage(buffer, this.auth.key, this.auth.id, this.sessionId);
+                decrypted = await decryptMessage(buffer, this.session.authKey, this.sessionId);
             }
             catch (_err) {
                 // logger().error(`Failed to decrypt message: ${err}`);
@@ -164,7 +149,7 @@ export class Client extends ClientAbstract {
         }
     }
     async invoke(function_, noWait) {
-        if (!this.auth) {
+        if (!this.session.authKey) {
             throw new Error("Not connected");
         }
         let seqNo = this.state.seqNo * 2;
@@ -173,7 +158,7 @@ export class Client extends ClientAbstract {
             this.state.seqNo++;
         }
         const message = new Message(getMessageId(), seqNo, function_);
-        await this.transport.send(await encryptMessage(message, this.auth.key, this.auth.id, this.state.salt, this.sessionId));
+        await this.transport.send(await encryptMessage(message, this.session.authKey, this.state.salt, this.sessionId));
         // logger().debug(`Invoked ${function_.constructor.name}`);
         if (noWait) {
             return;

package/esm/client/client_plain.js

@@ -101,11 +101,9 @@ export class ClientPlain extends ClientAbstract {
         const salt = newNonce_.slice(0, 0 + 8).map((v, i) => v ^ serverNonceSlice[i]);
         const authKey_ = modExp(gA, b, dhPrime);
         const authKey = bufferFromBigInt(authKey_, 256, false, false);
-        const authKeyId = (await sha1(authKey)).slice(-8);
         // logger().debug("Auth key created");
         return {
             authKey,
-            authKeyId: bigIntFromBuffer(authKeyId, true, false),
             salt: bigIntFromBuffer(salt, true, false),
         };
     }

package/esm/utilities/1_message.js

@@ -6,8 +6,12 @@ import { TLReader } from "../tl/3_tl_reader.js";
 import { RPCResult } from "../tl/4_rpc_result.js";
 import { Message } from "../tl/5_message.js";
 import { MessageContainer } from "../tl/6_message_container.js";
+import { bigIntFromBuffer } from "./0_bigint.js";
 import { bufferFromBigInt, concat } from "./0_buffer.js";
-import { sha256 } from "./0_hash.js";
+import { sha1, sha256 } from "./0_hash.js";
+async function getAuthKeyId(authKey) {
+    return bigIntFromBuffer((await sha1(authKey)).slice(-8), true, false);
+}
 let lastMsgId = 0n;
 export function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;
@@ -33,8 +37,9 @@ export function unpackUnencryptedMessage(buffer) {
     const message = reader.read(messageLength);
     return { messageId, message };
 }
-export async function encryptMessage(message, authKey, authKeyId, salt, sessionId) {
+export async function encryptMessage(message, authKey, salt, sessionId) {
     const encoded = message.body.serialize();
+    const authKeyId = await getAuthKeyId(authKey);
     const payloadWriter = new TLRawWriter();
     payloadWriter.writeInt64(salt);
     payloadWriter.writeInt64(sessionId);
@@ -61,7 +66,8 @@ export async function encryptMessage(message, authKey, authKeyId, salt, sessionI
     messageWriter.write(ige256Encrypt(payload, aesKey, aesIV));
     return messageWriter.buffer;
 }
-export async function decryptMessage(buffer, authKey, authKeyId, _sessionId) {
+export async function decryptMessage(buffer, authKey, _sessionId) {
+    const authKeyId = await getAuthKeyId(authKey);
     const reader = new TLReader(buffer);
     assertEquals(reader.readInt64(false), authKeyId);
     const messageKey_ = reader.readInt128();

package/package.json

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

package/script/client/client.js

@@ -27,7 +27,6 @@ exports.Client = void 0;
 const deps_js_1 = require("../deps.js");
 const constants_js_1 = require("../constants.js");
 const _0_bigint_js_1 = require("../utilities/0_bigint.js");
-const _0_hash_js_1 = require("../utilities/0_hash.js");
 const _1_message_js_1 = require("../utilities/1_message.js");
 const types = __importStar(require("../tl/2_types.js"));
 const functions = __importStar(require("../tl/3_functions.js"));
@@ -53,12 +52,6 @@ class Client extends client_abstract_js_1.ClientAbstract {
             writable: true,
             value: (0, _0_bigint_js_1.getRandomBigInt)(8, true, false)
         });
-        Object.defineProperty(this, "auth", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         Object.defineProperty(this, "state", {
             enumerable: true,
             configurable: true,
@@ -86,22 +79,14 @@ class Client extends client_abstract_js_1.ClientAbstract {
     }
     async connect() {
         await this.session.load();
-        let key;
-        let id;
-        if (this.session.authKey != null) {
-            key = this.session.authKey;
-            id = (0, _0_bigint_js_1.bigIntFromBuffer)((await (0, _0_hash_js_1.sha1)(key)).slice(-8), true, false);
-        }
-        else {
+        if (this.session.authKey == null) {
             const plain = new client_plain_js_1.ClientPlain(this.transportProvider);
             await plain.connect();
-            const { authKey, authKeyId, salt } = await plain.createAuthKey();
+            const { authKey, salt } = await plain.createAuthKey();
             await plain.disconnect();
-            key = authKey;
-            id = authKeyId;
             this.state.salt = salt;
+            this.session.authKey = authKey;
         }
-        this.auth = { key, id };
         if (this.session.dc != null) {
             const { connection, transport, dcId } = this.transportProvider({ dc: this.session.dc, cdn: false });
             this.connection = connection;
@@ -114,7 +99,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         this.pingLoop();
     }
     async receiveLoop() {
-        if (!this.auth) {
+        if (!this.session.authKey) {
             throw new Error("Not connected");
         }
         while (this.connected) {
@@ -125,7 +110,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             const buffer = await this.transport.receive();
             let decrypted;
             try {
-                decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.auth.key, this.auth.id, this.sessionId);
+                decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.session.authKey, this.sessionId);
             }
             catch (_err) {
                 // logger().error(`Failed to decrypt message: ${err}`);
@@ -190,7 +175,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
     }
     async invoke(function_, noWait) {
-        if (!this.auth) {
+        if (!this.session.authKey) {
             throw new Error("Not connected");
         }
         let seqNo = this.state.seqNo * 2;
@@ -199,7 +184,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             this.state.seqNo++;
         }
         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));
+        await this.transport.send(await (0, _1_message_js_1.encryptMessage)(message, this.session.authKey, this.state.salt, this.sessionId));
         // logger().debug(`Invoked ${function_.constructor.name}`);
         if (noWait) {
             return;

package/script/client/client_plain.js

@@ -104,11 +104,9 @@ class ClientPlain extends client_abstract_js_1.ClientAbstract {
         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);
-        const authKeyId = (await (0, _0_hash_js_1.sha1)(authKey)).slice(-8);
         // logger().debug("Auth key created");
         return {
             authKey,
-            authKeyId: (0, _0_bigint_js_1.bigIntFromBuffer)(authKeyId, true, false),
             salt: (0, _0_bigint_js_1.bigIntFromBuffer)(salt, true, false),
         };
     }

package/script/utilities/1_message.js

@@ -9,8 +9,12 @@ const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
 const _4_rpc_result_js_1 = require("../tl/4_rpc_result.js");
 const _5_message_js_1 = require("../tl/5_message.js");
 const _6_message_container_js_1 = require("../tl/6_message_container.js");
+const _0_bigint_js_1 = require("./0_bigint.js");
 const _0_buffer_js_1 = require("./0_buffer.js");
 const _0_hash_js_1 = require("./0_hash.js");
+async function getAuthKeyId(authKey) {
+    return (0, _0_bigint_js_1.bigIntFromBuffer)((await (0, _0_hash_js_1.sha1)(authKey)).slice(-8), true, false);
+}
 let lastMsgId = 0n;
 function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;
@@ -39,8 +43,9 @@ function unpackUnencryptedMessage(buffer) {
     return { messageId, message };
 }
 exports.unpackUnencryptedMessage = unpackUnencryptedMessage;
-async function encryptMessage(message, authKey, authKeyId, salt, sessionId) {
+async function encryptMessage(message, authKey, salt, sessionId) {
     const encoded = message.body.serialize();
+    const authKeyId = await getAuthKeyId(authKey);
     const payloadWriter = new _0_tl_raw_writer_js_1.TLRawWriter();
     payloadWriter.writeInt64(salt);
     payloadWriter.writeInt64(sessionId);
@@ -68,7 +73,8 @@ async function encryptMessage(message, authKey, authKeyId, salt, sessionId) {
     return messageWriter.buffer;
 }
 exports.encryptMessage = encryptMessage;
-async function decryptMessage(buffer, authKey, authKeyId, _sessionId) {
+async function decryptMessage(buffer, authKey, _sessionId) {
+    const authKeyId = await getAuthKeyId(authKey);
     const reader = new _3_tl_reader_js_1.TLReader(buffer);
     (0, deps_js_1.assertEquals)(reader.readInt64(false), authKeyId);
     const messageKey_ = reader.readInt128();

package/types/client/client.d.ts

@@ -8,7 +8,6 @@ export type UpdatesHandler = null | ((client: Client, update: types.Updates) =>
 export declare class Client extends ClientAbstract {
     readonly session: Session;
     private sessionId;
-    private auth?;
     private state;
     private promises;
     private toAcknowledge;

package/types/client/client_plain.d.ts

@@ -4,7 +4,6 @@ export declare class ClientPlain extends ClientAbstract {
     invoke<T extends Function<unknown>>(function_: T): Promise<T["__R"]>;
     createAuthKey(): Promise<{
         authKey: Uint8Array;
-        authKeyId: bigint;
         salt: bigint;
     }>;
 }

package/types/utilities/1_message.d.ts

@@ -6,5 +6,5 @@ export declare function unpackUnencryptedMessage(buffer: Uint8Array): {
     messageId: bigint;
     message: Uint8Array;
 };
-export declare function encryptMessage(message: Message, authKey: Uint8Array, authKeyId: bigint, salt: bigint, sessionId: bigint): Promise<Uint8Array>;
-export declare function decryptMessage(buffer: Uint8Array, authKey: Uint8Array, authKeyId: bigint, _sessionId: bigint): Promise<Message | MessageContainer>;
+export declare function encryptMessage(message: Message, authKey: Uint8Array, salt: bigint, sessionId: bigint): Promise<Uint8Array>;
+export declare function decryptMessage(buffer: Uint8Array, authKey: Uint8Array, _sessionId: bigint): Promise<Message | MessageContainer>;