@mtkruto/node 0.0.967 → 0.0.969

package/esm/client/1_client_abstract.js

@@ -1,11 +1,11 @@
 import { initTgCrypto } from "../deps.js";
-import { DEFAULT_INITIAL_DC } from "../constants.js";
-import { defaultTransportProvider } from "../transport/2_transport_provider.js";
+import { INITIAL_DC } from "../constants.js";
+import { webSocketTransportProvider } from "../transport/2_transport_provider.js";
 export class ClientAbstract {
     get initialDc() {
         return this._initialDc;
     }
-    constructor(transportProvider = defaultTransportProvider({ initialDc: DEFAULT_INITIAL_DC }), cdn = false) {
+    constructor(transportProvider = webSocketTransportProvider({ initialDc: INITIAL_DC }), cdn = false) {
         Object.defineProperty(this, "transportProvider", {
             enumerable: true,
             configurable: true,

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

@@ -1,7 +1,10 @@
 import { Function } from "../tl/3_functions.js";
+import { TransportProvider } from "../transport/2_transport_provider.js";
 import { ClientAbstract } from "./1_client_abstract.js";
 export declare class ClientPlain extends ClientAbstract {
+    private readonly publicKeys;
     private lastMsgId;
+    constructor(transportProvider: TransportProvider, publicKeys?: import("../constants.js").PublicKeys);
     invoke<T extends Function<unknown>>(function_: T): Promise<T["__R"]>;
     createAuthKey(): Promise<{
         authKey: Uint8Array;

package/esm/client/2_client_plain.js

@@ -1,5 +1,5 @@
 import { assertEquals, assertInstanceOf, debug, factorize, ige256Decrypt, ige256Encrypt } from "../deps.js";
-import { publicKeys } from "../constants.js";
+import { PUBLIC_KEYS } from "../constants.js";
 import { bigIntFromBuffer, getRandomBigInt, modExp } from "../utilities/0_bigint.js";
 import { bufferFromBigInt, concat } from "../utilities/0_buffer.js";
 import { UNREACHABLE } from "../utilities/0_control.js";
@@ -13,8 +13,14 @@ import { ClientAbstract } from "./1_client_abstract.js";
 import { getMessageId, packUnencryptedMessage, unpackUnencryptedMessage } from "./0_message.js";
 const d = debug("ClientPlain/createAuthKey");
 export class ClientPlain extends ClientAbstract {
-    constructor() {
-        super(...arguments);
+    constructor(transportProvider, publicKeys = PUBLIC_KEYS) {
+        super(transportProvider);
+        Object.defineProperty(this, "publicKeys", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: publicKeys
+        });
         Object.defineProperty(this, "lastMsgId", {
             enumerable: true,
             configurable: true,
@@ -64,10 +70,10 @@ export class ClientPlain extends ClientAbstract {
         let publicKeyFingerprint;
         let publicKey;
         for (const fingerprint of resPq.serverPublicKeyFingerprints) {
-            const maybePublicKey = publicKeys.get(fingerprint);
+            const maybePublicKey = this.publicKeys.find(([k]) => (k == fingerprint));
             if (maybePublicKey) {
                 publicKeyFingerprint = fingerprint;
-                publicKey = maybePublicKey;
+                publicKey = maybePublicKey[1];
                 break;
             }
         }

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

@@ -1,3 +1,4 @@
+import { PublicKeys } from "../constants.js";
 import { MaybePromise } from "../utilities/0_types.js";
 import * as types from "../tl/2_types.js";
 import * as functions from "../tl/3_functions.js";
@@ -58,6 +59,7 @@ export interface ClientParams {
      * The system_version parameter to be passed to initConnection when calling `authorize`.
      */
     systemVersion?: string;
+    publicKeys?: PublicKeys;
 }
 export interface ForwardMessagesParams {
     messageThreadId?: number;
@@ -69,8 +71,8 @@ export interface ForwardMessagesParams {
 }
 export declare class Client extends ClientAbstract {
     readonly storage: Storage;
-    readonly apiId: number;
-    readonly apiHash: string;
+    readonly apiId: number | null;
+    readonly apiHash: string | null;
     private auth;
     private sessionId;
     private state;
@@ -85,6 +87,7 @@ export declare class Client extends ClientAbstract {
     readonly langPack: string;
     readonly systemLangCode: string;
     readonly systemVersion: string;
+    private readonly publicKeys?;
     /**
      * Constructs the client.
      *
@@ -93,7 +96,7 @@ export declare class Client extends ClientAbstract {
      * @param apiHash App's API hash from [my.telegram.org/apps](https://my.telegram.org/apps). Default to empty string (unset).
      * @param params Other parameters.
      */
-    constructor(storage?: Storage, apiId?: number, apiHash?: string, params?: ClientParams, cdn?: boolean);
+    constructor(storage?: Storage, apiId?: number | null, apiHash?: string | null, params?: ClientParams, cdn?: boolean);
     private storageInited;
     /**
      * Sets the DC and resets the auth key stored in the session provider

package/esm/client/3_client.js

@@ -1,5 +1,5 @@
 import { debug, gunzip, Mutex } from "../deps.js";
-import { ackThreshold, CHANNEL_DIFFERENCE_LIMIT_BOT, CHANNEL_DIFFERENCE_LIMIT_USER, DEFAULT_APP_VERSION, DEFAULT_DEVICE_MODEL, DEFAULT_LANG_CODE, DEFAULT_LANG_PACK, DEFAULT_SYSTEM_LANG_CODE, DEFAULT_SYSTEM_VERSION, LAYER, MAX_CHANNEL_ID, MAX_CHAT_ID, STICKER_SET_NAME_TTL, USERNAME_TTL, ZERO_CHANNEL_ID } from "../constants.js";
+import { ACK_THRESHOLD, APP_VERSION, CHANNEL_DIFFERENCE_LIMIT_BOT, CHANNEL_DIFFERENCE_LIMIT_USER, DEVICE_MODEL, LANG_CODE, LANG_PACK, LAYER, MAX_CHANNEL_ID, MAX_CHAT_ID, STICKER_SET_NAME_TTL, SYSTEM_LANG_CODE, SYSTEM_VERSION, USERNAME_TTL, ZERO_CHANNEL_ID } from "../constants.js";
 import { bigIntFromBuffer, getRandomBigInt, getRandomId } from "../utilities/0_bigint.js";
 import { UNREACHABLE } from "../utilities/0_control.js";
 import { sha1 } from "../utilities/0_hash.js";
@@ -153,6 +153,12 @@ export class Client extends ClientAbstract {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "publicKeys", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "storageInited", {
             enumerable: true,
             configurable: true,
@@ -184,12 +190,13 @@ export class Client extends ClientAbstract {
             value: new Mutex()
         });
         this.parseMode = params?.parseMode ?? ParseMode.None;
-        this.appVersion = params?.appVersion ?? DEFAULT_APP_VERSION;
-        this.deviceModel = params?.deviceModel ?? DEFAULT_DEVICE_MODEL;
-        this.langCode = params?.langCode ?? DEFAULT_LANG_CODE;
-        this.langPack = params?.langPack ?? DEFAULT_LANG_PACK;
-        this.systemLangCode = params?.systemLangCode ?? DEFAULT_SYSTEM_LANG_CODE;
-        this.systemVersion = params?.systemVersion ?? DEFAULT_SYSTEM_VERSION;
+        this.appVersion = params?.appVersion ?? APP_VERSION;
+        this.deviceModel = params?.deviceModel ?? DEVICE_MODEL;
+        this.langCode = params?.langCode ?? LANG_CODE;
+        this.langPack = params?.langPack ?? LANG_PACK;
+        this.systemLangCode = params?.systemLangCode ?? SYSTEM_LANG_CODE;
+        this.systemVersion = params?.systemVersion ?? SYSTEM_VERSION;
+        this.publicKeys = params?.publicKeys;
     }
     /**
      * Sets the DC and resets the auth key stored in the session provider
@@ -226,7 +233,7 @@ export class Client extends ClientAbstract {
         }
         const authKey = await this.storage.getAuthKey();
         if (authKey == null) {
-            const plain = new ClientPlain(this.transportProvider);
+            const plain = new ClientPlain(this.transportProvider, this.publicKeys);
             const dc = await this.storage.getDc();
             if (dc != null) {
                 plain.setDc(dc);
@@ -372,7 +379,7 @@ export class Client extends ClientAbstract {
                                 apiId: this.apiId,
                                 apiHash: this.apiHash,
                                 phoneNumber,
-                                settings: new types.CodeSettings(),
+                                settings: new types.CodeSettings({}),
                             }));
                             dAuth("verification code sent");
                             if (sentCode instanceof types.AuthSentCode) {
@@ -458,7 +465,7 @@ export class Client extends ClientAbstract {
         }
         while (this.connected) {
             try {
-                if (this.toAcknowledge.size >= ackThreshold) {
+                if (this.toAcknowledge.size >= ACK_THRESHOLD) {
                     await this.send(new types.MsgsAck({ msgIds: [...this.toAcknowledge] }));
                     this.toAcknowledge.clear();
                 }
@@ -567,9 +574,8 @@ export class Client extends ClientAbstract {
         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);
+        d("invoked %s", function_.constructor.name);
         if (noWait) {
-            d_();
             return;
         }
         const result = await new Promise((resolve, reject) => {
@@ -579,7 +585,6 @@ export class Client extends ClientAbstract {
             return await this.invoke(function_);
         }
         else {
-            d_();
             return result;
         }
     }
@@ -1147,8 +1152,7 @@ export class Client extends ClientAbstract {
             noWebpage,
             silent,
             noforwards,
-            replyToMsgId,
-            topMsgId,
+            replyTo: replyToMsgId !== undefined ? new types.InputReplyToMessage({ replyToMsgId, topMsgId }) : undefined,
             sendAs,
             entities,
             replyMarkup,

package/esm/connection/0_connection.d.ts

@@ -1,8 +1,17 @@
 import { MaybePromise } from "../utilities/0_types.js";
-export declare abstract class Connection {
+declare abstract class Foundation {
     abstract get connected(): boolean;
     abstract open(): MaybePromise<void>;
-    abstract read(p: Uint8Array): MaybePromise<void>;
     abstract write(p: Uint8Array): MaybePromise<void>;
     abstract close(): MaybePromise<void>;
 }
+export declare abstract class ConnectionUnframed extends Foundation {
+    readonly type: "framed";
+    abstract read(p: Uint8Array): MaybePromise<void>;
+}
+export declare abstract class ConnectionFramed extends Foundation {
+    readonly type: "framed";
+    abstract read(): MaybePromise<Uint8Array>;
+}
+export type Connection = ConnectionUnframed | ConnectionFramed;
+export {};

package/esm/connection/0_connection.js

@@ -1,2 +1,24 @@
-export class Connection {
+class Foundation {
+}
+export class ConnectionUnframed extends Foundation {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "framed"
+        });
+    }
+}
+export class ConnectionFramed extends Foundation {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "framed"
+        });
+    }
 }

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

@@ -0,0 +1,16 @@
+import { ConnectionFramed } from "./0_connection.js";
+export declare class ConnectionHTTP extends ConnectionFramed implements ConnectionFramed {
+    private readonly url;
+    private rMutex;
+    private wMutex;
+    private resolveCanRead;
+    private canRead;
+    private buffers;
+    constructor(url: string | URL);
+    private resetCanRead;
+    get connected(): boolean;
+    open(): Promise<void>;
+    read(): Promise<Uint8Array>;
+    write(buffer: Uint8Array): Promise<void>;
+    close(): void;
+}

package/esm/connection/1_connection_http.js

@@ -0,0 +1,91 @@
+import { Mutex } from "../deps.js";
+import { UNREACHABLE } from "../utilities/0_control.js";
+import { ConnectionFramed } from "./0_connection.js";
+export class ConnectionHTTP extends ConnectionFramed {
+    constructor(url) {
+        super();
+        Object.defineProperty(this, "url", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: url
+        });
+        Object.defineProperty(this, "rMutex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Mutex()
+        });
+        Object.defineProperty(this, "wMutex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Mutex()
+        });
+        Object.defineProperty(this, "resolveCanRead", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: () => { }
+        });
+        Object.defineProperty(this, "canRead", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: Promise.resolve()
+        });
+        Object.defineProperty(this, "buffers", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Array()
+        });
+        this.resetCanRead();
+    }
+    resetCanRead() {
+        this.canRead = new Promise((r) => this.resolveCanRead = r);
+    }
+    get connected() {
+        return true;
+    }
+    async open() {
+    }
+    async read() {
+        await this.canRead;
+        const release = await this.rMutex.acquire();
+        try {
+            const buffer = this.buffers.pop();
+            if (buffer === undefined) {
+                throw UNREACHABLE();
+            }
+            else {
+                return buffer;
+            }
+        }
+        finally {
+            if (this.buffers.length == 0) {
+                this.resetCanRead();
+            }
+            release();
+        }
+    }
+    async write(buffer) {
+        const release = await this.wMutex.acquire();
+        try {
+            const res = await fetch(this.url, {
+                mode: "cors",
+                method: "POST",
+                body: buffer,
+            });
+            this.buffers.push(new Uint8Array(await res.arrayBuffer()));
+        }
+        finally {
+            if (this.buffers.length == 1) {
+                this.resolveCanRead();
+            }
+            release();
+        }
+    }
+    close() {
+    }
+}

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

@@ -1,5 +1,5 @@
-import { Connection } from "./0_connection.js";
-export declare class ConnectionWebSocket implements Connection {
+import { ConnectionUnframed } from "./0_connection.js";
+export declare class ConnectionWebSocket extends ConnectionUnframed implements ConnectionUnframed {
     private webSocket;
     private rMutex;
     private wMutex;

package/esm/connection/1_connection_web_socket.js

@@ -1,8 +1,10 @@
 import * as dntShim from "../_dnt.shims.js";
 import { debug, Mutex } from "../deps.js";
+import { ConnectionUnframed } from "./0_connection.js";
 const d = debug("ConnectionWebSocket");
-export class ConnectionWebSocket {
+export class ConnectionWebSocket extends ConnectionUnframed {
     constructor(url) {
+        super();
         Object.defineProperty(this, "webSocket", {
             enumerable: true,
             configurable: true,
@@ -46,7 +48,6 @@ export class ConnectionWebSocket {
             value: null
         });
         this.webSocket = this.reinitWs(url);
-        // TODO
         this.webSocket.addEventListener("close", (e) => {
             if (e.code != 1000 && e.reason != "method") {
                 this.webSocket = this.reinitWs(url);

package/esm/constants.d.ts

@@ -1,15 +1,16 @@
 import { DC } from "./transport/2_transport_provider.js";
-export declare const ackThreshold = 10;
-export declare const publicKeys: Map<bigint, [bigint, bigint]>;
+export declare const ACK_THRESHOLD = 10;
+export type PublicKeys = readonly [bigint, [bigint, bigint]][];
+export declare const PUBLIC_KEYS: PublicKeys;
 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.967";
-export declare const DEFAULT_DEVICE_MODEL: string;
-export declare const DEFAULT_LANG_CODE: string;
-export declare const DEFAULT_LANG_PACK = "";
-export declare const DEFAULT_SYSTEM_LANG_CODE: string;
-export declare const DEFAULT_SYSTEM_VERSION: string;
+export declare const INITIAL_DC: DC;
+export declare const LAYER = 160;
+export declare const APP_VERSION = "MTKruto 0.0.969";
+export declare const DEVICE_MODEL: string;
+export declare const LANG_CODE: string;
+export declare const LANG_PACK = "";
+export declare const SYSTEM_LANG_CODE: string;
+export declare const SYSTEM_VERSION: string;
 export declare const USERNAME_TTL = 86400;
 export declare const STICKER_SET_NAME_TTL = 172800;
 export declare const MAX_CHAT_ID = 999999999999;

package/esm/constants.js

@@ -1,6 +1,6 @@
 import * as dntShim from "./_dnt.shims.js";
-export const ackThreshold = 10;
-export const publicKeys = new Map([
+export const ACK_THRESHOLD = 10;
+export const PUBLIC_KEYS = Object.freeze([
     [
         1562291298945373506n,
         [
@@ -50,26 +50,18 @@ export const publicKeys = new Map([
             0x010001n,
         ],
     ],
-    // Piltover
-    [
-        -5746138571559360724n,
-        [
-            26007219673003768186863565706940772901187119797549016801229858995725553827566821957407312503173782965285118977548255274803204174826509270586421841734996746493071723679186583391927378886693846518017621303145594627156874011707147548520576401963675756312298478878474644101348427872255774246965916073553469761183250044599310582333625453447885100318336864215713703860033765477732305055537755094341310278183464296754000479758644167423888581130401586546401934096183449791147912201040435037926911688179080223967863256047196705714611239523210563418382771999824529581206920323901890386681875893623076449827387008128524246269437n,
-            0x010001n,
-        ],
-    ],
 ]);
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
-export const DEFAULT_INITIAL_DC = "2-test";
-export const LAYER = 158;
-export const DEFAULT_APP_VERSION = "MTKruto 0.0.967";
+export const INITIAL_DC = "2-test";
+export const LAYER = 160;
+export const APP_VERSION = "MTKruto 0.0.969";
 // @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];
-export const DEFAULT_LANG_PACK = "";
-export const DEFAULT_SYSTEM_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
+export const 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 LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
+export const LANG_PACK = "";
+export const SYSTEM_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
 // @ts-ignore: lib
-export const DEFAULT_SYSTEM_VERSION = typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : "Node.js/" + process.versions.node : navigator.userAgent;
+export const SYSTEM_VERSION = typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : "Node.js/" + process.versions.node : navigator.userAgent;
 export const USERNAME_TTL = 86400;
 export const STICKER_SET_NAME_TTL = 172800;
 export const MAX_CHAT_ID = 999999999999;

package/esm/mod.d.ts

@@ -23,4 +23,4 @@ export * from "./transport/0_transport.js";
 export * from "./transport/2_transport_provider.js";
 export * from "./connection/0_connection.js";
 export * from "./connection/1_connection_web_socket.js";
-export { DEFAULT_APP_VERSION, DEFAULT_DEVICE_MODEL, DEFAULT_INITIAL_DC, DEFAULT_LANG_CODE, DEFAULT_LANG_PACK, DEFAULT_SYSTEM_LANG_CODE, DEFAULT_SYSTEM_VERSION, LAYER } from "./constants.js";
+export { APP_VERSION, DEVICE_MODEL, INITIAL_DC, LANG_CODE, LANG_PACK, LAYER, SYSTEM_LANG_CODE, SYSTEM_VERSION } from "./constants.js";

package/esm/mod.js

@@ -20,4 +20,4 @@ export * from "./transport/0_transport.js";
 export * from "./transport/2_transport_provider.js";
 export * from "./connection/0_connection.js";
 export * from "./connection/1_connection_web_socket.js";
-export { DEFAULT_APP_VERSION, DEFAULT_DEVICE_MODEL, DEFAULT_INITIAL_DC, DEFAULT_LANG_CODE, DEFAULT_LANG_PACK, DEFAULT_SYSTEM_LANG_CODE, DEFAULT_SYSTEM_VERSION, LAYER } from "./constants.js";
+export { APP_VERSION, DEVICE_MODEL, INITIAL_DC, LANG_CODE, LANG_PACK, LAYER, SYSTEM_LANG_CODE, SYSTEM_VERSION } from "./constants.js";