@mtkruto/node 0.0.79 → 0.0.801

package/esm/client/client.js

@@ -98,11 +98,11 @@ export class Client extends ClientAbstract {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "sessionLoaded", {
+        Object.defineProperty(this, "shouldLoadSession", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: false
+            value: true
         });
         this.appVersion = params?.appVersion ?? DEFAULT_APP_VERSION;
         this.deviceModel = params?.deviceModel ?? DEFAULT_DEVICE_MODEL;
@@ -115,13 +115,16 @@ export class Client extends ClientAbstract {
         if (this.session.dc != dc) {
             this.session.dc = dc;
             this.session.authKey = null;
+            if (this.shouldLoadSession) {
+                this.shouldLoadSession = false;
+            }
         }
         super.setDc(dc);
     }
     async connect() {
-        if (!this.sessionLoaded) {
+        if (this.shouldLoadSession) {
             await this.session.load();
-            this.sessionLoaded = true;
+            this.shouldLoadSession = false;
         }
         if (this.session.authKey == null) {
             const plain = new ClientPlain(this.transportProvider);
@@ -173,7 +176,10 @@ export class Client extends ClientAbstract {
             }
         }
         try {
-            if (typeof params == "object") {
+            if (params instanceof types.AuthExportedAuthorization) {
+                await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
+            }
+            else if (typeof params == "object") {
                 throw new Error("Not implemented");
             }
             else {
@@ -223,7 +229,7 @@ export class Client extends ClientAbstract {
             }
             let decrypted;
             try {
-                decrypted = await decryptMessage(buffer, this.session.authKey, this.sessionId);
+                decrypted = await decryptMessage(buffer, this.session.authKey, (await this.session.authKeyId), this.sessionId);
             }
             catch (_err) {
                 // logger().error(`Failed to decrypt message: ${err}`);
@@ -297,7 +303,7 @@ export class Client extends ClientAbstract {
             this.state.seqNo++;
         }
         const message = new Message(getMessageId(), seqNo, function_);
-        await this.transport.send(await encryptMessage(message, this.session.authKey, this.state.salt, this.sessionId));
+        await this.transport.send(await encryptMessage(message, this.session.authKey, (await this.session.authKeyId), this.state.salt, this.sessionId));
         // logger().debug(`Invoked ${function_.constructor.name}`);
         if (noWait) {
             return;

package/esm/session/session.js

@@ -1,3 +1,5 @@
+import { sha1 } from "../utilities/0_hash.js";
+import { bigIntFromBuffer } from "../utilities/0_bigint.js";
 export class Session {
     constructor() {
         Object.defineProperty(this, "dc", {
@@ -6,11 +8,29 @@ export class Session {
             writable: true,
             value: null
         });
-        Object.defineProperty(this, "authKey", {
+        Object.defineProperty(this, "_authKeyId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: Promise.resolve(null)
+        });
+        Object.defineProperty(this, "_authKey", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: null
         });
     }
+    get authKeyId() {
+        return this._authKeyId;
+    }
+    set authKey(authKey) {
+        this._authKey = authKey;
+        if (authKey != null) {
+            this._authKeyId = sha1(authKey).then((hash) => bigIntFromBuffer(hash.slice(-8), true, false));
+        }
+    }
+    get authKey() {
+        return this._authKey;
+    }
 }

package/esm/utilities/0_buffer.js

@@ -1,5 +1,10 @@
 export function concat(...buffers) {
-    return new Uint8Array(buffers.map((v) => Array.from(v)).flat());
+    const bytes = new Array();
+    for (const buffer of buffers) {
+        bytes.push(...buffer);
+    }
+    const buffer = new Uint8Array(bytes);
+    return buffer;
 }
 const bufferFromHexString = (hexString) => Uint8Array.from(hexString.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
 export function bufferFromBigInt(bigIntVar, bytesNumber, little = true, signed = false) {

package/esm/utilities/1_message.js

@@ -6,12 +6,8 @@ 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 { sha1, sha256 } from "./0_hash.js";
-async function getAuthKeyId(authKey) {
-    return bigIntFromBuffer((await sha1(authKey)).slice(-8), true, false);
-}
+import { sha256 } from "./0_hash.js";
 let lastMsgId = 0n;
 export function getMessageId() {
     const now = new Date().getTime() / 1000 + 0;
@@ -37,9 +33,8 @@ export function unpackUnencryptedMessage(buffer) {
     const message = reader.read(messageLength);
     return { messageId, message };
 }
-export async function encryptMessage(message, authKey, salt, sessionId) {
+export async function encryptMessage(message, authKey, authKeyId, salt, sessionId) {
     const encoded = message.body.serialize();
-    const authKeyId = await getAuthKeyId(authKey);
     const payloadWriter = new TLRawWriter();
     payloadWriter.writeInt64(salt);
     payloadWriter.writeInt64(sessionId);
@@ -66,8 +61,7 @@ export async function encryptMessage(message, authKey, salt, sessionId) {
     messageWriter.write(ige256Encrypt(payload, aesKey, aesIV));
     return messageWriter.buffer;
 }
-export async function decryptMessage(buffer, authKey, _sessionId) {
-    const authKeyId = await getAuthKeyId(authKey);
+export async function decryptMessage(buffer, authKey, authKeyId, _sessionId) {
     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.79",
+  "version": "0.0.801",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/client/client.js

@@ -124,11 +124,11 @@ class Client extends client_abstract_js_1.ClientAbstract {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "sessionLoaded", {
+        Object.defineProperty(this, "shouldLoadSession", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: false
+            value: true
         });
         this.appVersion = params?.appVersion ?? constants_js_1.DEFAULT_APP_VERSION;
         this.deviceModel = params?.deviceModel ?? constants_js_1.DEFAULT_DEVICE_MODEL;
@@ -141,13 +141,16 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (this.session.dc != dc) {
             this.session.dc = dc;
             this.session.authKey = null;
+            if (this.shouldLoadSession) {
+                this.shouldLoadSession = false;
+            }
         }
         super.setDc(dc);
     }
     async connect() {
-        if (!this.sessionLoaded) {
+        if (this.shouldLoadSession) {
             await this.session.load();
-            this.sessionLoaded = true;
+            this.shouldLoadSession = false;
         }
         if (this.session.authKey == null) {
             const plain = new client_plain_js_1.ClientPlain(this.transportProvider);
@@ -199,7 +202,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
             }
         }
         try {
-            if (typeof params == "object") {
+            if (params instanceof types.AuthExportedAuthorization) {
+                await this.invoke(new functions.AuthImportAuthorization({ id: params.id, bytes: params.bytes }));
+            }
+            else if (typeof params == "object") {
                 throw new Error("Not implemented");
             }
             else {
@@ -249,7 +255,7 @@ 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);
+                decrypted = await (0, _1_message_js_1.decryptMessage)(buffer, this.session.authKey, (await this.session.authKeyId), this.sessionId);
             }
             catch (_err) {
                 // logger().error(`Failed to decrypt message: ${err}`);
@@ -323,7 +329,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.session.authKey, this.state.salt, this.sessionId));
+        await this.transport.send(await (0, _1_message_js_1.encryptMessage)(message, this.session.authKey, (await this.session.authKeyId), this.state.salt, this.sessionId));
         // logger().debug(`Invoked ${function_.constructor.name}`);
         if (noWait) {
             return;

package/script/session/session.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Session = void 0;
+const _0_hash_js_1 = require("../utilities/0_hash.js");
+const _0_bigint_js_1 = require("../utilities/0_bigint.js");
 class Session {
     constructor() {
         Object.defineProperty(this, "dc", {
@@ -9,12 +11,30 @@ class Session {
             writable: true,
             value: null
         });
-        Object.defineProperty(this, "authKey", {
+        Object.defineProperty(this, "_authKeyId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: Promise.resolve(null)
+        });
+        Object.defineProperty(this, "_authKey", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: null
         });
     }
+    get authKeyId() {
+        return this._authKeyId;
+    }
+    set authKey(authKey) {
+        this._authKey = authKey;
+        if (authKey != null) {
+            this._authKeyId = (0, _0_hash_js_1.sha1)(authKey).then((hash) => (0, _0_bigint_js_1.bigIntFromBuffer)(hash.slice(-8), true, false));
+        }
+    }
+    get authKey() {
+        return this._authKey;
+    }
 }
 exports.Session = Session;

package/script/utilities/0_buffer.js

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bufferFromBigInt = exports.concat = void 0;
 function concat(...buffers) {
-    return new Uint8Array(buffers.map((v) => Array.from(v)).flat());
+    const bytes = new Array();
+    for (const buffer of buffers) {
+        bytes.push(...buffer);
+    }
+    const buffer = new Uint8Array(bytes);
+    return buffer;
 }
 exports.concat = concat;
 const bufferFromHexString = (hexString) => Uint8Array.from(hexString.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));

package/script/utilities/1_message.js

@@ -9,12 +9,8 @@ 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;
@@ -43,9 +39,8 @@ function unpackUnencryptedMessage(buffer) {
     return { messageId, message };
 }
 exports.unpackUnencryptedMessage = unpackUnencryptedMessage;
-async function encryptMessage(message, authKey, salt, sessionId) {
+async function encryptMessage(message, authKey, authKeyId, 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);
@@ -73,8 +68,7 @@ async function encryptMessage(message, authKey, salt, sessionId) {
     return messageWriter.buffer;
 }
 exports.encryptMessage = encryptMessage;
-async function decryptMessage(buffer, authKey, _sessionId) {
-    const authKeyId = await getAuthKeyId(authKey);
+async function decryptMessage(buffer, authKey, authKeyId, _sessionId) {
     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

@@ -38,10 +38,10 @@ export declare class Client extends ClientAbstract {
         systemLangCode?: string;
         systemVersion?: string;
     });
+    private shouldLoadSession;
     setDc(dc: DC): void;
-    private sessionLoaded;
     connect(): Promise<void>;
-    authorize(params: string | AuthorizeUserParams): Promise<void>;
+    authorize(params: string | types.AuthExportedAuthorization | AuthorizeUserParams): Promise<void>;
     private receiveLoop;
     private pingLoop;
     invoke<T extends (functions.Function<unknown> | types.Type) = functions.Function<unknown>>(function_: T): Promise<T extends functions.Function<unknown> ? T["__R"] : void>;

package/types/session/session.d.ts

@@ -2,7 +2,11 @@ import { MaybePromise } from "../types.js";
 import { DC } from "../transport/transport_provider.js";
 export declare abstract class Session {
     dc: DC | null;
-    authKey: Uint8Array | null;
+    private _authKeyId;
+    private _authKey;
     abstract load(): MaybePromise<void>;
     abstract save(): MaybePromise<void>;
+    get authKeyId(): Promise<bigint | null>;
+    set authKey(authKey: Uint8Array | null);
+    get authKey(): Uint8Array | null;
 }