@mtkruto/node 0.0.74 → 0.0.76

package/esm/client/client.js

@@ -86,8 +86,10 @@ 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;
             }
@@ -97,6 +99,10 @@ 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);
@@ -106,6 +112,7 @@ 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) {
@@ -153,6 +160,7 @@ 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/constants.js

@@ -58,3 +58,4 @@ export const publicKeys = new Map([
         ],
     ],
 ]);
+export const VECTOR_CONSTRUCTOR = 0x1CB5C415;

package/esm/tl/1_tl_object.js

@@ -26,7 +26,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             return;
         }
         else {
-            throw new Error("a");
+            throw new TypeError(`Expected ${type.name}`);
         }
     }
     if (type == Uint8Array) {
@@ -34,7 +34,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             writer.writeBytes(value);
         }
         else {
-            throw new Error("Expected Uint8Array");
+            throw new TypeError("Expected Uint8Array");
         }
     }
     switch (type) {
@@ -51,7 +51,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new Error("Expected bigint");
+                throw new TypeError("Expected bigint");
             }
             break;
         case "boolean":
@@ -64,7 +64,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new Error("Expected boolean");
+                throw new TypeError("Expected boolean");
             }
             break;
         case "number":
@@ -72,7 +72,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeInt32(value);
             }
             else {
-                throw new Error("Expected number");
+                throw new TypeError("Expected number");
             }
             break;
         case "string":
@@ -83,7 +83,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeBytes(value);
             }
             else {
-                throw new Error("Expected string or Uint8Array");
+                throw new TypeError("Expected string or Uint8Array");
             }
             break;
         case "true":
@@ -91,7 +91,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeInt32(0x997275B5);
             }
             else {
-                throw new Error("Expected true");
+                throw new TypeError("Expected true");
             }
     }
 }
@@ -129,7 +129,7 @@ export class TLObject {
             if (type instanceof Array) {
                 const itemsType = type[0];
                 if (!Array.isArray(value)) {
-                    throw new Error("Expected array");
+                    throw new TypeError("Expected array");
                 }
                 writer.writeInt32(0x1CB5C415); // vector constructor
                 writer.writeInt32(value.length);

package/esm/tl/3_tl_reader.js

@@ -7,6 +7,14 @@ export class TLReader extends TLRawReader {
         if (!id) {
             id = this.readInt32(false);
         }
+        if (id == 0x1CB5C415) {
+            const count = this.readInt32();
+            const items = new Array();
+            for (let i = 0; i < count; i++) {
+                items.push(this.readObject());
+            }
+            return items;
+        }
         const constructor = map.get(id);
         if (constructor) {
             return deserialize(this, constructor[paramDesc], constructor);

package/esm/tl/3_tl_writer.js

@@ -1,7 +1,17 @@
+import { VECTOR_CONSTRUCTOR } from "../constants.js";
 import { TLRawWriter } from "./0_tl_raw_writer.js";
 export class TLWriter extends TLRawWriter {
     writeObject(object) {
-        this.write(object.serialize());
+        if (Array.isArray(object)) {
+            this.writeInt32(VECTOR_CONSTRUCTOR, false);
+            this.writeInt32(object.length);
+            for (const item of object) {
+                this.writeObject(item);
+            }
+        }
+        else {
+            this.write(object.serialize());
+        }
         return this;
     }
 }

package/esm/tl/5_message.js

@@ -1,7 +1,22 @@
-import { id, length } from "./1_tl_object.js";
+import { id } from "./1_tl_object.js";
 import { TLReader } from "./3_tl_reader.js";
 import { TLWriter } from "./3_tl_writer.js";
 import { RPCResult } from "./4_rpc_result.js";
+// TODO: test
+function calculateLength(object) {
+    let length = 0;
+    if (Array.isArray(object)) {
+        length += 32 / 8; // vector constructor
+        length += 32 / 8; // number of items
+        for (const item of object) {
+            length += calculateLength(item);
+        }
+    }
+    else {
+        length += object.serialize().length;
+    }
+    return length;
+}
 export class Message {
     constructor(id, seqNo, body) {
         Object.defineProperty(this, "id", {
@@ -30,7 +45,7 @@ export class Message {
         return new TLWriter()
             .writeInt64(this.id)
             .writeInt32(this.seqNo)
-            .writeInt32(this.body[length])
+            .writeInt32(calculateLength(this.body))
             .writeObject(this.body)
             .buffer;
     }

package/package.json

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

package/script/client/client.js

@@ -112,8 +112,10 @@ 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;
             }
@@ -123,6 +125,10 @@ 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);
@@ -132,6 +138,7 @@ 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) {
@@ -179,6 +186,7 @@ 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/constants.js

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

package/script/tl/1_tl_object.js

@@ -31,7 +31,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             return;
         }
         else {
-            throw new Error("a");
+            throw new TypeError(`Expected ${type.name}`);
         }
     }
     if (type == Uint8Array) {
@@ -39,7 +39,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             writer.writeBytes(value);
         }
         else {
-            throw new Error("Expected Uint8Array");
+            throw new TypeError("Expected Uint8Array");
         }
     }
     switch (type) {
@@ -56,7 +56,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new Error("Expected bigint");
+                throw new TypeError("Expected bigint");
             }
             break;
         case "boolean":
@@ -69,7 +69,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new Error("Expected boolean");
+                throw new TypeError("Expected boolean");
             }
             break;
         case "number":
@@ -77,7 +77,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeInt32(value);
             }
             else {
-                throw new Error("Expected number");
+                throw new TypeError("Expected number");
             }
             break;
         case "string":
@@ -88,7 +88,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeBytes(value);
             }
             else {
-                throw new Error("Expected string or Uint8Array");
+                throw new TypeError("Expected string or Uint8Array");
             }
             break;
         case "true":
@@ -96,7 +96,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeInt32(0x997275B5);
             }
             else {
-                throw new Error("Expected true");
+                throw new TypeError("Expected true");
             }
     }
 }
@@ -134,7 +134,7 @@ class TLObject {
             if (type instanceof Array) {
                 const itemsType = type[0];
                 if (!Array.isArray(value)) {
-                    throw new Error("Expected array");
+                    throw new TypeError("Expected array");
                 }
                 writer.writeInt32(0x1CB5C415); // vector constructor
                 writer.writeInt32(value.length);

package/script/tl/3_tl_reader.js

@@ -10,6 +10,14 @@ class TLReader extends _0_tl_raw_reader_js_1.TLRawReader {
         if (!id) {
             id = this.readInt32(false);
         }
+        if (id == 0x1CB5C415) {
+            const count = this.readInt32();
+            const items = new Array();
+            for (let i = 0; i < count; i++) {
+                items.push(this.readObject());
+            }
+            return items;
+        }
         const constructor = _2_types_js_1.map.get(id);
         if (constructor) {
             return (0, _3_tl_object_deserializer_js_1.deserialize)(this, constructor[_1_tl_object_js_1.paramDesc], constructor);

package/script/tl/3_tl_writer.js

@@ -1,10 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TLWriter = void 0;
+const constants_js_1 = require("../constants.js");
 const _0_tl_raw_writer_js_1 = require("./0_tl_raw_writer.js");
 class TLWriter extends _0_tl_raw_writer_js_1.TLRawWriter {
     writeObject(object) {
-        this.write(object.serialize());
+        if (Array.isArray(object)) {
+            this.writeInt32(constants_js_1.VECTOR_CONSTRUCTOR, false);
+            this.writeInt32(object.length);
+            for (const item of object) {
+                this.writeObject(item);
+            }
+        }
+        else {
+            this.write(object.serialize());
+        }
         return this;
     }
 }

package/script/tl/5_message.js

@@ -5,6 +5,21 @@ const _1_tl_object_js_1 = require("./1_tl_object.js");
 const _3_tl_reader_js_1 = require("./3_tl_reader.js");
 const _3_tl_writer_js_1 = require("./3_tl_writer.js");
 const _4_rpc_result_js_1 = require("./4_rpc_result.js");
+// TODO: test
+function calculateLength(object) {
+    let length = 0;
+    if (Array.isArray(object)) {
+        length += 32 / 8; // vector constructor
+        length += 32 / 8; // number of items
+        for (const item of object) {
+            length += calculateLength(item);
+        }
+    }
+    else {
+        length += object.serialize().length;
+    }
+    return length;
+}
 class Message {
     constructor(id, seqNo, body) {
         Object.defineProperty(this, "id", {
@@ -33,7 +48,7 @@ class Message {
         return new _3_tl_writer_js_1.TLWriter()
             .writeInt64(this.id)
             .writeInt32(this.seqNo)
-            .writeInt32(this.body[_1_tl_object_js_1.length])
+            .writeInt32(calculateLength(this.body))
             .writeObject(this.body)
             .buffer;
     }

package/types/constants.d.ts

@@ -1,2 +1,3 @@
 export declare const ackThreshold = 10;
 export declare const publicKeys: Map<bigint, [bigint, bigint]>;
+export declare const VECTOR_CONSTRUCTOR = 481674261;

package/types/tl/1_tl_object.d.ts

@@ -28,6 +28,7 @@ export declare abstract class TLObject {
     get [length](): number;
     serialize(): Uint8Array;
 }
+export type MaybeVectorTLObject = TLObject | Array<MaybeVectorTLObject | TLObject>;
 export interface TLObjectConstructor<T = TLObject> {
     new (params: Record<string, Param>): T;
     [paramDesc]: ParamDesc;

package/types/tl/3_tl_reader.d.ts

@@ -1,4 +1,6 @@
 import { TLRawReader } from "./0_tl_raw_reader.js";
+import { TLObject } from "./1_tl_object.js";
+export type ReadObject = TLObject | Array<ReadObject | TLObject>;
 export declare class TLReader extends TLRawReader {
-    readObject(id?: number): import("./1_tl_object.js").TLObject;
+    readObject(id?: number): ReadObject;
 }

package/types/tl/3_tl_writer.d.ts

@@ -1,5 +1,5 @@
 import { TLRawWriter } from "./0_tl_raw_writer.js";
-import { TLObject } from "./1_tl_object.js";
+import { MaybeVectorTLObject } from "./1_tl_object.js";
 export declare class TLWriter extends TLRawWriter {
-    writeObject(object: TLObject): this;
+    writeObject(object: MaybeVectorTLObject): this;
 }

package/types/tl/4_rpc_result.d.ts

@@ -1,8 +1,8 @@
-import { id, TLObject } from "./1_tl_object.js";
+import { id, MaybeVectorTLObject } from "./1_tl_object.js";
 export declare class RPCResult {
     readonly messageId: bigint;
-    readonly result: TLObject;
+    readonly result: MaybeVectorTLObject;
     static get [id](): number;
-    constructor(messageId: bigint, result: TLObject);
+    constructor(messageId: bigint, result: MaybeVectorTLObject);
     static deserialize(buffer: Uint8Array): RPCResult;
 }

package/types/tl/5_message.d.ts

@@ -1,11 +1,11 @@
-import { TLObject } from "./1_tl_object.js";
+import { MaybeVectorTLObject } from "./1_tl_object.js";
 import { TLReader } from "./3_tl_reader.js";
 import { RPCResult } from "./4_rpc_result.js";
 export declare class Message {
     readonly id: bigint;
     readonly seqNo: number;
-    readonly body: TLObject | RPCResult;
-    constructor(id: bigint, seqNo: number, body: TLObject | RPCResult);
+    readonly body: MaybeVectorTLObject | RPCResult;
+    constructor(id: bigint, seqNo: number, body: MaybeVectorTLObject | RPCResult);
     serialize(): Uint8Array;
     static deserialize(reader: TLReader): Message;
 }