@mtkruto/node 0.0.991 → 0.0.992

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

@@ -1,5 +1,4 @@
-import { Message } from "../tl/6_message.js";
-import { MessageContainer } from "../tl/7_message_container.js";
+import { Message, MessageContainer } from "../2_tl.js";
 export declare function getMessageId(lastMsgId: bigint): bigint;
 export declare function packUnencryptedMessage(data: Uint8Array, messageId: bigint): Uint8Array;
 export declare function unpackUnencryptedMessage(buffer: Uint8Array): {

package/script/client/0_message.js

@@ -1,16 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decryptMessage = exports.encryptMessage = exports.unpackUnencryptedMessage = exports.packUnencryptedMessage = exports.getMessageId = void 0;
-const deps_js_1 = require("../deps.js");
-const _0_tl_raw_reader_js_1 = require("../tl/0_tl_raw_reader.js");
-const _0_tl_raw_writer_js_1 = require("../tl/0_tl_raw_writer.js");
-const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
-const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
-const _5_rpc_result_js_1 = require("../tl/5_rpc_result.js");
-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");
+const _0_deps_js_1 = require("../0_deps.js");
+const _1_utilities_js_1 = require("../1_utilities.js");
+const _2_tl_js_1 = require("../2_tl.js");
 function getMessageId(lastMsgId) {
     const now = new Date().getTime() / 1000 + 0;
     const nanoseconds = Math.floor((now - Math.floor(now)) * 1e9);
@@ -24,7 +17,7 @@ function getMessageId(lastMsgId) {
 }
 exports.getMessageId = getMessageId;
 function packUnencryptedMessage(data, messageId) {
-    const writer = new _0_tl_raw_writer_js_1.TLRawWriter();
+    const writer = new _2_tl_js_1.TLWriter();
     writer.writeInt64(0n); // auth key
     writer.writeInt64(messageId);
     writer.writeInt32(data.length);
@@ -33,7 +26,7 @@ function packUnencryptedMessage(data, messageId) {
 }
 exports.packUnencryptedMessage = packUnencryptedMessage;
 function unpackUnencryptedMessage(buffer) {
-    const reader = new _0_tl_raw_reader_js_1.TLRawReader(buffer);
+    const reader = new _2_tl_js_1.TLReader(buffer);
     const _authKeyId = reader.readInt64();
     const messageId = reader.readInt64();
     const messageLength = reader.readInt32();
@@ -42,8 +35,8 @@ function unpackUnencryptedMessage(buffer) {
 }
 exports.unpackUnencryptedMessage = unpackUnencryptedMessage;
 async function encryptMessage(message, authKey, authKeyId, salt, sessionId) {
-    const encoded = message.body[_1_tl_object_js_1.serialize]();
-    const payloadWriter = new _0_tl_raw_writer_js_1.TLRawWriter();
+    const encoded = message.body[_2_tl_js_1.serialize]();
+    const payloadWriter = new _2_tl_js_1.TLWriter();
     payloadWriter.writeInt64(salt);
     payloadWriter.writeInt64(sessionId);
     payloadWriter.writeInt64(message.id);
@@ -56,49 +49,49 @@ async function encryptMessage(message, authKey, authKeyId, salt, sessionId) {
         if (payload.length % 16 == 0 && (payload.length) % 4 == 0) {
             break;
         }
-        payload = (0, _0_buffer_js_1.concat)(payload, new Uint8Array(1));
+        payload = (0, _1_utilities_js_1.concat)(payload, new Uint8Array(1));
     }
-    const messageKey = (await (0, _0_hash_js_1.sha256)((0, _0_buffer_js_1.concat)(authKey.slice(88, 120), payload))).slice(8, 24);
-    const a = await (0, _0_hash_js_1.sha256)((0, _0_buffer_js_1.concat)(messageKey, authKey.slice(0, 36)));
-    const b = await (0, _0_hash_js_1.sha256)((0, _0_buffer_js_1.concat)(authKey.slice(40, 76), messageKey));
-    const aesKey = (0, _0_buffer_js_1.concat)(a.slice(0, 8), b.slice(8, 24), a.slice(24, 32));
-    const aesIV = (0, _0_buffer_js_1.concat)(b.slice(0, 8), a.slice(8, 24), b.slice(24, 32));
-    const messageWriter = new _0_tl_raw_writer_js_1.TLRawWriter();
+    const messageKey = (await (0, _1_utilities_js_1.sha256)((0, _1_utilities_js_1.concat)(authKey.slice(88, 120), payload))).slice(8, 24);
+    const a = await (0, _1_utilities_js_1.sha256)((0, _1_utilities_js_1.concat)(messageKey, authKey.slice(0, 36)));
+    const b = await (0, _1_utilities_js_1.sha256)((0, _1_utilities_js_1.concat)(authKey.slice(40, 76), messageKey));
+    const aesKey = (0, _1_utilities_js_1.concat)(a.slice(0, 8), b.slice(8, 24), a.slice(24, 32));
+    const aesIV = (0, _1_utilities_js_1.concat)(b.slice(0, 8), a.slice(8, 24), b.slice(24, 32));
+    const messageWriter = new _2_tl_js_1.TLWriter();
     messageWriter.writeInt64(authKeyId);
     messageWriter.write(messageKey);
-    messageWriter.write((0, deps_js_1.ige256Encrypt)(payload, aesKey, aesIV));
+    messageWriter.write((0, _0_deps_js_1.ige256Encrypt)(payload, aesKey, aesIV));
     return messageWriter.buffer;
 }
 exports.encryptMessage = encryptMessage;
 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 reader = new _2_tl_js_1.TLReader(buffer);
+    (0, _0_deps_js_1.assertEquals)(reader.readInt64(false), authKeyId);
     const messageKey_ = reader.readInt128();
-    const messageKey = (0, _0_buffer_js_1.bufferFromBigInt)(messageKey_, 16, true, true);
-    const a = await (0, _0_hash_js_1.sha256)((0, _0_buffer_js_1.concat)(messageKey, authKey.slice(8, 44)));
-    const b = await (0, _0_hash_js_1.sha256)((0, _0_buffer_js_1.concat)(authKey.slice(48, 84), messageKey));
-    const aesKey = (0, _0_buffer_js_1.concat)(a.slice(0, 8), b.slice(8, 24), a.slice(24, 32));
-    const aesIv = (0, _0_buffer_js_1.concat)(b.slice(0, 8), a.slice(8, 24), b.slice(24, 32));
-    const plaintext = (0, deps_js_1.ige256Decrypt)(reader.buffer, aesKey, aesIv);
-    (0, deps_js_1.assertEquals)(plaintext.buffer.byteLength % 4, 0);
-    let plainReader = new _3_tl_reader_js_1.TLReader(plaintext);
+    const messageKey = (0, _1_utilities_js_1.bufferFromBigInt)(messageKey_, 16, true, true);
+    const a = await (0, _1_utilities_js_1.sha256)((0, _1_utilities_js_1.concat)(messageKey, authKey.slice(8, 44)));
+    const b = await (0, _1_utilities_js_1.sha256)((0, _1_utilities_js_1.concat)(authKey.slice(48, 84), messageKey));
+    const aesKey = (0, _1_utilities_js_1.concat)(a.slice(0, 8), b.slice(8, 24), a.slice(24, 32));
+    const aesIv = (0, _1_utilities_js_1.concat)(b.slice(0, 8), a.slice(8, 24), b.slice(24, 32));
+    const plaintext = (0, _0_deps_js_1.ige256Decrypt)(reader.buffer, aesKey, aesIv);
+    (0, _0_deps_js_1.assertEquals)(plaintext.buffer.byteLength % 4, 0);
+    let plainReader = new _2_tl_js_1.TLReader(plaintext);
     const _salt = plainReader.readInt64();
     const _sessionId_ = plainReader.readInt64(false);
     const mid = plainReader.readInt64();
     const seqno = plainReader.readInt32();
     const length = plainReader.readInt32();
-    plainReader = new _3_tl_reader_js_1.TLReader(plainReader.read(length));
+    plainReader = new _2_tl_js_1.TLReader(plainReader.read(length));
     const cid = plainReader.readInt32(false);
-    if (cid == _7_message_container_js_1.MessageContainer[_1_tl_object_js_1.id]) {
-        return _7_message_container_js_1.MessageContainer.deserialize(plainReader.buffer);
+    if (cid == _2_tl_js_1.MessageContainer[_2_tl_js_1.id]) {
+        return _2_tl_js_1.MessageContainer.deserialize(plainReader.buffer);
     }
-    else if (cid == _5_rpc_result_js_1.RPCResult[_1_tl_object_js_1.id]) {
-        const body = _5_rpc_result_js_1.RPCResult.deserialize(plainReader.buffer);
-        return new _6_message_js_1.Message(mid, seqno, body);
+    else if (cid == _2_tl_js_1.RPCResult[_2_tl_js_1.id]) {
+        const body = _2_tl_js_1.RPCResult.deserialize(plainReader.buffer);
+        return new _2_tl_js_1.Message(mid, seqno, body);
     }
     else {
         const body = plainReader.readObject(cid);
-        return new _6_message_js_1.Message(mid, seqno, body);
+        return new _2_tl_js_1.Message(mid, seqno, body);
     }
 }
 exports.decryptMessage = decryptMessage;

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

@@ -1,5 +1,5 @@
-import * as types from "../tl/2_types.js";
-import { sha256 } from "../utilities/0_hash.js";
+import { sha256 } from "../1_utilities.js";
+import { types } from "../2_tl.js";
 export declare function isSafePrime(primeBytes: Uint8Array, g: number): boolean;
 export declare const h: typeof sha256;
 export declare const sh: (data: Uint8Array, salt: Uint8Array) => Promise<Uint8Array>;

package/script/client/0_password.js

@@ -25,10 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPassword = exports.pad = exports.isGoodModExpFirst = exports.ph2 = exports.pbkdf2 = exports.ph1 = exports.sh = exports.h = exports.isSafePrime = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
-const types = __importStar(require("../tl/2_types.js"));
-const _0_buffer_js_1 = require("../utilities/0_buffer.js");
-const _0_hash_js_1 = require("../utilities/0_hash.js");
-const _0_bigint_js_1 = require("../utilities/0_bigint.js");
+const _1_utilities_js_1 = require("../1_utilities.js");
+const _2_tl_js_1 = require("../2_tl.js");
 function isSafePrime(primeBytes, g) {
     // deno-fmt-ignore
     const goodPrime = new Uint8Array([
@@ -64,9 +62,9 @@ function isSafePrime(primeBytes, g) {
 }
 exports.isSafePrime = isSafePrime;
 // H(data) := sha256(data)
-exports.h = _0_hash_js_1.sha256;
+exports.h = _1_utilities_js_1.sha256;
 // SH(data, salt) := H(salt | data | salt)
-const sh = (data, salt) => (0, exports.h)((0, _0_buffer_js_1.concat)(salt, data, salt));
+const sh = (data, salt) => (0, exports.h)((0, _1_utilities_js_1.concat)(salt, data, salt));
 exports.sh = sh;
 // PH1(password, salt1, salt2) := SH(SH(password, salt1), salt2)
 const ph1 = async (password, salt1, salt2) => await (0, exports.sh)(await (0, exports.sh)(password, salt1), salt2);
@@ -95,10 +93,10 @@ function pad(bigint) {
         bigint = BigInt(bigint);
     }
     if (typeof bigint === "bigint") {
-        return (0, _0_buffer_js_1.bufferFromBigInt)(bigint, 256, false);
+        return (0, _1_utilities_js_1.bufferFromBigInt)(bigint, 256, false);
     }
     else {
-        return (0, _0_buffer_js_1.concat)(new Uint8Array(256 - bigint.length), bigint);
+        return (0, _1_utilities_js_1.concat)(new Uint8Array(256 - bigint.length), bigint);
     }
 }
 exports.pad = pad;
@@ -106,13 +104,13 @@ async function checkPassword(password_, ap) {
     const password = new TextEncoder().encode(password_);
     const algo = ap.currentAlgo;
     if (!(algo instanceof
-        types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow)) {
+        _2_tl_js_1.types.PasswordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow)) {
         throw new Error("Unexpected algorithm");
     }
     // g := algo.g
     const g = algo.g;
     // p := algo.p
-    const p = (0, _0_bigint_js_1.bigIntFromBuffer)(algo.p, false);
+    const p = (0, _1_utilities_js_1.bigIntFromBuffer)(algo.p, false);
     if (!isSafePrime(algo.p, g)) {
         throw new Error("Got unsafe prime");
     }
@@ -131,18 +129,18 @@ async function checkPassword(password_, ap) {
     // salt2 := algo.salt2
     const salt2 = algo.salt2;
     // g_b := srp_B
-    const gB = (0, _0_bigint_js_1.bigIntFromBuffer)(srpB, false);
+    const gB = (0, _1_utilities_js_1.bigIntFromBuffer)(srpB, false);
     // k := H(p | g)
-    const k = (0, _0_bigint_js_1.bigIntFromBuffer)(await (0, exports.h)((0, _0_buffer_js_1.concat)(pad(p), pad(g))), false);
+    const k = (0, _1_utilities_js_1.bigIntFromBuffer)(await (0, exports.h)((0, _1_utilities_js_1.concat)(pad(p), pad(g))), false);
     let u = 0n;
     let a = 0n;
     let gA = 0n;
     for (let i = 0; i < 1000; i++) {
-        a = (0, _0_bigint_js_1.getRandomBigInt)(256, false);
+        a = (0, _1_utilities_js_1.getRandomBigInt)(256, false);
         // g_a := pow(g, a) mod p
-        gA = (0, _0_bigint_js_1.modExp)(BigInt(g), a, p);
+        gA = (0, _1_utilities_js_1.modExp)(BigInt(g), a, p);
         if (isGoodModExpFirst(gA, p)) {
-            u = (0, _0_bigint_js_1.bigIntFromBuffer)(await (0, _0_hash_js_1.sha256)((0, _0_buffer_js_1.concat)(pad(gA), pad(gB))), false);
+            u = (0, _1_utilities_js_1.bigIntFromBuffer)(await (0, _1_utilities_js_1.sha256)((0, _1_utilities_js_1.concat)(pad(gA), pad(gB))), false);
             if (u > 0n) {
                 break;
             }
@@ -152,21 +150,21 @@ async function checkPassword(password_, ap) {
         throw new Error();
     }
     // x := PH2(password, salt1, salt2)
-    const x = (0, _0_bigint_js_1.bigIntFromBuffer)(await (0, exports.ph2)(password, salt1, salt2), false);
+    const x = (0, _1_utilities_js_1.bigIntFromBuffer)(await (0, exports.ph2)(password, salt1, salt2), false);
     // v := pow(g, x) mod p
-    const v = (0, _0_bigint_js_1.modExp)(BigInt(g), x, p);
+    const v = (0, _1_utilities_js_1.modExp)(BigInt(g), x, p);
     // k_v := (k * v) mod p
-    const kV = (0, _0_bigint_js_1.mod)(k * v, p);
+    const kV = (0, _1_utilities_js_1.mod)(k * v, p);
     // t := (g_b - k_v) mod p
-    const t = (0, _0_bigint_js_1.mod)(gB - kV, p);
+    const t = (0, _1_utilities_js_1.mod)(gB - kV, p);
     // s_a := pow(t, a + u * x) mod p
-    const sA = (0, _0_bigint_js_1.modExp)(t, a + u * x, p);
+    const sA = (0, _1_utilities_js_1.modExp)(t, a + u * x, p);
     // k_a := H(s_a)
     const kA = await (0, exports.h)(pad(sA));
     // M1 := H(H(p) xor H(g) | H(salt1) | H(salt2) | g_a | g_b | k_a)
     const hG = await (0, exports.h)(pad(g));
-    const m1 = await (0, exports.h)((0, _0_buffer_js_1.concat)((await (0, exports.h)(pad(p))).map((v, i) => v ^ hG[i]), await (0, exports.h)(salt1), await (0, exports.h)(salt2), pad(gA), pad(gB), kA));
-    return new types.InputCheckPasswordSRP({
+    const m1 = await (0, exports.h)((0, _1_utilities_js_1.concat)((await (0, exports.h)(pad(p))).map((v, i) => v ^ hG[i]), await (0, exports.h)(salt1), await (0, exports.h)(salt2), pad(gA), pad(gB), kA));
+    return new _2_tl_js_1.types.InputCheckPasswordSRP({
         srpId: srpId,
         A: pad(gA),
         M1: m1,

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

@@ -1,5 +1,3 @@
-import * as types from "../tl/2_types.js";
-export declare function getChannelChatId(channelId: bigint): number;
-export declare function peerToChatId(peer: types.TypePeer | types.TypeInputPeer): number;
-export declare function hasPts(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateShortMessage | types.UpdateShortChatMessage | types.UpdateShortSentMessage | types.UpdateNewMessage | types.UpdateDeleteMessages | types.UpdateReadHistoryInbox | types.UpdateReadHistoryOutbox | types.UpdatePinnedChannelMessages | types.UpdatePinnedMessages | types.UpdateFolderPeers | types.UpdateChannelWebPage | types.UpdateEditMessage | types.UpdateReadMessagesContents | types.UpdateWebPage;
-export declare function hasChannelPts(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateNewChannelMessage | types.UpdateEditChannelMessage | types.UpdateDeleteChannelMessages | types.UpdateReadChannelInbox;
+import { types } from "../2_tl.js";
+export declare function isPtsUpdate(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateShortMessage | types.UpdateShortChatMessage | types.UpdateShortSentMessage | types.UpdateNewMessage | types.UpdateDeleteMessages | types.UpdateReadHistoryInbox | types.UpdateReadHistoryOutbox | types.UpdatePinnedChannelMessages | types.UpdatePinnedMessages | types.UpdateFolderPeers | types.UpdateChannelWebPage | types.UpdateEditMessage | types.UpdateReadMessagesContents | types.UpdateWebPage;
+export declare function isChannelPtsUpdate(v: types.TypeUpdate | types.TypeUpdates): v is types.UpdateNewChannelMessage | types.UpdateEditChannelMessage | types.UpdateDeleteChannelMessages | types.UpdateReadChannelInbox;

package/script/client/0_utilities.js

@@ -1,72 +1,28 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasChannelPts = exports.hasPts = exports.peerToChatId = exports.getChannelChatId = void 0;
-const constants_js_1 = require("../constants.js");
-const types = __importStar(require("../tl/2_types.js"));
-const _0_control_js_1 = require("../utilities/0_control.js");
-function getChannelChatId(channelId) {
-    return constants_js_1.ZERO_CHANNEL_ID + -Number(channelId);
+exports.isChannelPtsUpdate = exports.isPtsUpdate = void 0;
+const _2_tl_js_1 = require("../2_tl.js");
+function isPtsUpdate(v) {
+    return v instanceof _2_tl_js_1.types.UpdateShortMessage ||
+        v instanceof _2_tl_js_1.types.UpdateShortChatMessage ||
+        v instanceof _2_tl_js_1.types.UpdateShortSentMessage ||
+        v instanceof _2_tl_js_1.types.UpdateNewMessage ||
+        v instanceof _2_tl_js_1.types.UpdateDeleteMessages ||
+        v instanceof _2_tl_js_1.types.UpdateReadHistoryInbox ||
+        v instanceof _2_tl_js_1.types.UpdateReadHistoryOutbox ||
+        v instanceof _2_tl_js_1.types.UpdatePinnedChannelMessages ||
+        v instanceof _2_tl_js_1.types.UpdatePinnedMessages ||
+        v instanceof _2_tl_js_1.types.UpdateFolderPeers ||
+        v instanceof _2_tl_js_1.types.UpdateChannelWebPage ||
+        v instanceof _2_tl_js_1.types.UpdateEditMessage ||
+        v instanceof _2_tl_js_1.types.UpdateReadMessagesContents ||
+        v instanceof _2_tl_js_1.types.UpdateWebPage;
 }
-exports.getChannelChatId = getChannelChatId;
-function peerToChatId(peer) {
-    if (peer instanceof types.PeerUser || peer instanceof types.InputPeerUser) {
-        return Number(peer.userId);
-    }
-    else if (peer instanceof types.PeerChat || peer instanceof types.InputPeerChat) {
-        return -Number(peer.chatId);
-    }
-    else if (peer instanceof types.PeerChannel || peer instanceof types.InputPeerChannel) {
-        return getChannelChatId(peer.channelId);
-    }
-    else {
-        (0, _0_control_js_1.UNREACHABLE)();
-    }
+exports.isPtsUpdate = isPtsUpdate;
+function isChannelPtsUpdate(v) {
+    return v instanceof _2_tl_js_1.types.UpdateNewChannelMessage ||
+        v instanceof _2_tl_js_1.types.UpdateEditChannelMessage ||
+        v instanceof _2_tl_js_1.types.UpdateDeleteChannelMessages ||
+        v instanceof _2_tl_js_1.types.UpdateReadChannelInbox;
 }
-exports.peerToChatId = peerToChatId;
-function hasPts(v) {
-    return v instanceof types.UpdateShortMessage ||
-        v instanceof types.UpdateShortChatMessage ||
-        v instanceof types.UpdateShortSentMessage ||
-        v instanceof types.UpdateNewMessage ||
-        v instanceof types.UpdateDeleteMessages ||
-        v instanceof types.UpdateReadHistoryInbox ||
-        v instanceof types.UpdateReadHistoryOutbox ||
-        v instanceof types.UpdatePinnedChannelMessages ||
-        v instanceof types.UpdatePinnedMessages ||
-        v instanceof types.UpdateFolderPeers ||
-        v instanceof types.UpdateChannelWebPage ||
-        v instanceof types.UpdateEditMessage ||
-        v instanceof types.UpdateReadMessagesContents ||
-        v instanceof types.UpdateWebPage;
-}
-exports.hasPts = hasPts;
-function hasChannelPts(v) {
-    return v instanceof types.UpdateNewChannelMessage ||
-        v instanceof types.UpdateEditChannelMessage ||
-        v instanceof types.UpdateDeleteChannelMessages ||
-        v instanceof types.UpdateReadChannelInbox;
-}
-exports.hasChannelPts = hasChannelPts;
+exports.isChannelPtsUpdate = isChannelPtsUpdate;

package/script/client/1_client_abstract.d.ts

@@ -1,5 +1,5 @@
-import { MaybePromise } from "../utilities/0_types.js";
-import { DC, TransportProvider } from "../transport/2_transport_provider.js";
+import { MaybePromise } from "../1_utilities.js";
+import { DC, TransportProvider } from "../3_transport.js";
 export interface ClientAbstractParams {
     /**
      * The first DC to connect to. This is commonly used to decide whether to connect to test or production servers. It is not necessarily the DC that the client will directly connect to or is currently connected to. Defaults to the default initial DC.

package/script/client/1_client_abstract.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientAbstract = void 0;
-const deps_js_1 = require("../deps.js");
-const constants_js_1 = require("../constants.js");
-const _2_transport_provider_js_1 = require("../transport/2_transport_provider.js");
+const _0_deps_js_1 = require("../0_deps.js");
+const _3_transport_js_1 = require("../3_transport.js");
+const _4_constants_js_1 = require("../4_constants.js");
 class ClientAbstract {
     constructor(params) {
         Object.defineProperty(this, "initialDc", {
@@ -42,8 +42,8 @@ class ClientAbstract {
             writable: true,
             value: void 0
         });
-        this.initialDc = params?.initialDc ?? constants_js_1.INITIAL_DC;
-        this.transportProvider = params?.transportProvider ?? (0, _2_transport_provider_js_1.webSocketTransportProvider)();
+        this.initialDc = params?.initialDc ?? _4_constants_js_1.INITIAL_DC;
+        this.transportProvider = params?.transportProvider ?? (0, _3_transport_js_1.webSocketTransportProvider)();
         this.cdn = params?.cdn ?? false;
     }
     get dcId() {
@@ -62,7 +62,7 @@ class ClientAbstract {
     async connect() {
         this.transport = this.transportProvider({ dc: this.dc ?? this.initialDc, cdn: this.cdn });
         this.transport.connection.stateChangeHandler = this.stateChangeHandler;
-        await (0, deps_js_1.initTgCrypto)();
+        await (0, _0_deps_js_1.initTgCrypto)();
         await this.transport.connection.open();
         await this.transport.transport.initialize();
     }

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

@@ -1,5 +1,5 @@
-import { PublicKeys } from "../constants.js";
-import { Function } from "../tl/3_functions.js";
+import { functions } from "../2_tl.js";
+import { PublicKeys } from "../4_constants.js";
 import { ClientAbstract, ClientAbstractParams } from "./1_client_abstract.js";
 export interface ClientPlainParams extends ClientAbstractParams {
     /**
@@ -11,7 +11,7 @@ export declare class ClientPlain extends ClientAbstract {
     private readonly publicKeys;
     private lastMsgId;
     constructor(params?: ClientPlainParams);
-    invoke<T extends Function<unknown>>(function_: T): Promise<T["__R"]>;
+    invoke<T extends functions.Function<unknown>>(function_: T): Promise<T["__R"]>;
     createAuthKey(): Promise<{
         authKey: Uint8Array;
         salt: bigint;

package/script/client/2_client_plain.js

@@ -1,20 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientPlain = 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_buffer_js_1 = require("../utilities/0_buffer.js");
-const _0_control_js_1 = require("../utilities/0_control.js");
-const _0_hash_js_1 = require("../utilities/0_hash.js");
-const _1_auth_js_1 = require("../utilities/1_auth.js");
-const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
-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 _0_deps_js_1 = require("../0_deps.js");
+const _1_utilities_js_1 = require("../1_utilities.js");
+const _2_tl_js_1 = require("../2_tl.js");
+const _4_constants_js_1 = require("../4_constants.js");
 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");
+const d = (0, _0_deps_js_1.debug)("ClientPlain/createAuthKey");
 class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
     constructor(params) {
         super(params);
@@ -30,35 +23,35 @@ class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
             writable: true,
             value: 0n
         });
-        this.publicKeys = params?.publicKeys ?? constants_js_1.PUBLIC_KEYS;
+        this.publicKeys = params?.publicKeys ?? _4_constants_js_1.PUBLIC_KEYS;
     }
     async invoke(function_) {
         if (!this.transport) {
             throw new Error("Not connected");
         }
         const msgId = this.lastMsgId = (0, _0_message_js_1.getMessageId)(this.lastMsgId);
-        await this.transport.transport.send((0, _0_message_js_1.packUnencryptedMessage)(function_[_1_tl_object_js_1.serialize](), msgId));
+        await this.transport.transport.send((0, _0_message_js_1.packUnencryptedMessage)(function_[_2_tl_js_1.serialize](), msgId));
         const buffer = await this.transport.transport.receive();
         if (buffer.length == 4) {
-            const int = (0, _0_bigint_js_1.bigIntFromBuffer)(buffer, true, true);
+            const int = (0, _1_utilities_js_1.bigIntFromBuffer)(buffer, true, true);
             if (int == -404n) {
                 throw new Error("-404");
             }
         }
         const { message } = (0, _0_message_js_1.unpackUnencryptedMessage)(buffer);
-        const reader = new _3_tl_reader_js_1.TLReader(message);
+        const reader = new _2_tl_js_1.TLReader(message);
         return reader.readObject();
     }
     async createAuthKey() {
-        const nonce = (0, _0_bigint_js_1.getRandomBigInt)(16, false, true);
+        const nonce = (0, _1_utilities_js_1.getRandomBigInt)(16, false, true);
         d("auth key creation started");
         let resPq = null;
         for (let i = 0; i < 10; i++) {
             try {
                 d("req_pq_multi [%d]", i + 1);
-                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);
+                resPq = await this.invoke(new _2_tl_js_1.functions.ReqPQMulti({ nonce }));
+                (0, _0_deps_js_1.assertInstanceOf)(resPq, _2_tl_js_1.types.ResPQ);
+                (0, _0_deps_js_1.assertEquals)(resPq.nonce, nonce);
                 d("got res_pq");
                 break;
             }
@@ -67,13 +60,13 @@ class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
             }
         }
         if (!resPq) {
-            (0, _0_control_js_1.UNREACHABLE)();
+            (0, _1_utilities_js_1.UNREACHABLE)();
         }
-        const pq_ = (0, _0_bigint_js_1.bigIntFromBuffer)(resPq.pq, false, false);
-        const [p_, q_] = (0, deps_js_1.factorize)(pq_);
+        const pq_ = (0, _1_utilities_js_1.bigIntFromBuffer)(resPq.pq, false, false);
+        const [p_, q_] = (0, _0_deps_js_1.factorize)(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);
+        const p = (0, _1_utilities_js_1.bufferFromBigInt)(p_, 4, false, false);
+        const q = (0, _1_utilities_js_1.bufferFromBigInt)(q_, 4, false, false);
         let publicKeyFingerprint;
         let publicKey;
         for (const fingerprint of resPq.serverPublicKeyFingerprints) {
@@ -90,8 +83,8 @@ class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
         const dc = this.dcId;
         const pq = resPq.pq;
         const serverNonce = resPq.serverNonce;
-        const newNonce = (0, _0_bigint_js_1.getRandomBigInt)(32, false, true);
-        let encryptedData = await (0, _1_auth_js_1.rsaPad)(new _2_types_js_1.PQInnerDataDC({
+        const newNonce = (0, _1_utilities_js_1.getRandomBigInt)(32, false, true);
+        let encryptedData = await (0, _1_utilities_js_1.rsaPad)(new _2_tl_js_1.types.PQInnerDataDC({
             pq,
             p,
             q,
@@ -99,8 +92,8 @@ class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
             newNonce,
             nonce,
             serverNonce,
-        })[_1_tl_object_js_1.serialize](), publicKey);
-        const dhParams = await this.invoke(new _3_functions_js_1.ReqDHParams({
+        })[_2_tl_js_1.serialize](), publicKey);
+        const dhParams = await this.invoke(new _2_tl_js_1.functions.ReqDHParams({
             nonce,
             serverNonce,
             p,
@@ -108,42 +101,42 @@ class ClientPlain extends _1_client_abstract_js_1.ClientAbstract {
             publicKeyFingerprint,
             encryptedData,
         }));
-        (0, deps_js_1.assertInstanceOf)(dhParams, _2_types_js_1.ServerDHParamsOK);
+        (0, _0_deps_js_1.assertInstanceOf)(dhParams, _2_tl_js_1.types.ServerDHParamsOK);
         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));
-        const tmpAesIv = (0, _0_buffer_js_1.concat)((await (0, _0_hash_js_1.sha1)((0, _0_buffer_js_1.concat)(serverNonce_, newNonce_))).slice(12, 12 + 8), await (0, _0_hash_js_1.sha1)((0, _0_buffer_js_1.concat)(newNonce_, newNonce_)), newNonce_.slice(0, 0 + 4));
-        const answerWithHash = (0, deps_js_1.ige256Decrypt)(dhParams.encryptedAnswer, tmpAesKey, tmpAesIv);
-        const dhInnerData = new _3_tl_reader_js_1.TLReader(answerWithHash.slice(20)).readObject();
-        (0, deps_js_1.assertInstanceOf)(dhInnerData, _2_types_js_1.ServerDHInnerData);
+        const newNonce_ = (0, _1_utilities_js_1.bufferFromBigInt)(newNonce, 32, true, true);
+        const serverNonce_ = (0, _1_utilities_js_1.bufferFromBigInt)(serverNonce, 16, true, true);
+        const tmpAesKey = (0, _1_utilities_js_1.concat)(await (0, _1_utilities_js_1.sha1)((0, _1_utilities_js_1.concat)(newNonce_, serverNonce_)), (await (0, _1_utilities_js_1.sha1)((0, _1_utilities_js_1.concat)(serverNonce_, newNonce_))).slice(0, 0 + 12));
+        const tmpAesIv = (0, _1_utilities_js_1.concat)((await (0, _1_utilities_js_1.sha1)((0, _1_utilities_js_1.concat)(serverNonce_, newNonce_))).slice(12, 12 + 8), await (0, _1_utilities_js_1.sha1)((0, _1_utilities_js_1.concat)(newNonce_, newNonce_)), newNonce_.slice(0, 0 + 4));
+        const answerWithHash = (0, _0_deps_js_1.ige256Decrypt)(dhParams.encryptedAnswer, tmpAesKey, tmpAesIv);
+        const dhInnerData = new _2_tl_js_1.TLReader(answerWithHash.slice(20)).readObject();
+        (0, _0_deps_js_1.assertInstanceOf)(dhInnerData, _2_tl_js_1.types.ServerDHInnerData);
         const { g, gA: gA_, dhPrime: dhPrime_ } = dhInnerData;
-        const gA = (0, _0_bigint_js_1.bigIntFromBuffer)(gA_, false, false);
-        const dhPrime = (0, _0_bigint_js_1.bigIntFromBuffer)(dhPrime_, false, false);
-        const b = (0, _0_bigint_js_1.getRandomBigInt)(256, false, false);
-        const gB = (0, _0_bigint_js_1.modExp)(BigInt(g), b, dhPrime);
-        const data = new _2_types_js_1.ClientDHInnerData({
+        const gA = (0, _1_utilities_js_1.bigIntFromBuffer)(gA_, false, false);
+        const dhPrime = (0, _1_utilities_js_1.bigIntFromBuffer)(dhPrime_, false, false);
+        const b = (0, _1_utilities_js_1.getRandomBigInt)(256, false, false);
+        const gB = (0, _1_utilities_js_1.modExp)(BigInt(g), b, dhPrime);
+        const data = new _2_tl_js_1.types.ClientDHInnerData({
             nonce,
             serverNonce,
             retryId: 0n,
-            gB: (0, _0_buffer_js_1.bufferFromBigInt)(gB, 256, false, false),
-        })[_1_tl_object_js_1.serialize]();
-        let dataWithHash = (0, _0_buffer_js_1.concat)(await (0, _0_hash_js_1.sha1)(data), data);
+            gB: (0, _1_utilities_js_1.bufferFromBigInt)(gB, 256, false, false),
+        })[_2_tl_js_1.serialize]();
+        let dataWithHash = (0, _1_utilities_js_1.concat)(await (0, _1_utilities_js_1.sha1)(data), data);
         while (dataWithHash.length % 16 != 0) {
-            dataWithHash = (0, _0_buffer_js_1.concat)(dataWithHash, new Uint8Array(1));
+            dataWithHash = (0, _1_utilities_js_1.concat)(dataWithHash, new Uint8Array(1));
         }
-        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);
+        encryptedData = (0, _0_deps_js_1.ige256Encrypt)(dataWithHash, tmpAesKey, tmpAesIv);
+        const dhGenOk = await this.invoke(new _2_tl_js_1.functions.SetClientDHParams({ nonce, serverNonce, encryptedData }));
+        (0, _0_deps_js_1.assertInstanceOf)(dhGenOk, _2_tl_js_1.types.DHGenOK);
         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);
+        const authKey_ = (0, _1_utilities_js_1.modExp)(gA, b, dhPrime);
+        const authKey = (0, _1_utilities_js_1.bufferFromBigInt)(authKey_, 256, false, false);
         d("auth key created");
         return {
             authKey,
-            salt: (0, _0_bigint_js_1.bigIntFromBuffer)(salt, true, false),
+            salt: (0, _1_utilities_js_1.bigIntFromBuffer)(salt, true, false),
         };
     }
 }