@mtkruto/node 0.0.966 → 0.0.968

package/esm/transport/1_transport_piped.d.ts

@@ -0,0 +1,10 @@
+import { ConnectionFramed } from "../connection/0_connection.js";
+import { Transport } from "./0_transport.js";
+export declare class TransportPiped extends Transport implements Transport {
+    private readonly connection;
+    constructor(connection: ConnectionFramed);
+    initialize(): Promise<void>;
+    receive(): import("../utilities/0_types.js").MaybePromise<Uint8Array>;
+    send(buffer: Uint8Array): import("../utilities/0_types.js").MaybePromise<void>;
+    deinitialize(): void;
+}

package/esm/transport/1_transport_piped.js

@@ -0,0 +1,23 @@
+import { Transport } from "./0_transport.js";
+export class TransportPiped extends Transport {
+    constructor(connection) {
+        super();
+        Object.defineProperty(this, "connection", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: connection
+        });
+    }
+    async initialize() {
+    }
+    receive() {
+        return this.connection.read();
+    }
+    send(buffer) {
+        return this.connection.write(buffer);
+    }
+    deinitialize() {
+        this.initialized = false;
+    }
+}

package/esm/transport/2_transport_provider.d.ts

@@ -16,5 +16,11 @@ export type TransportProvider = {
 export interface TransportProviderCreatorParams {
     initialDc: DC;
 }
-export type TransportProviderCreator = (params: TransportProviderCreatorParams) => TransportProvider;
-export declare const defaultTransportProvider: TransportProviderCreator;
+export type TransportProviderCreator<E = Record<never, never>> = (params: TransportProviderCreatorParams & E) => TransportProvider;
+export declare const webSocketTransportProvider: TransportProviderCreator<{
+    wss?: boolean;
+}>;
+export declare const httpTransportProvider: TransportProviderCreator<{
+    secure?: boolean;
+    v6?: boolean;
+}>;

package/esm/transport/2_transport_provider.js

@@ -1,4 +1,6 @@
+import { ConnectionHTTP } from "../connection/1_connection_http.js";
 import { ConnectionWebSocket } from "../connection/1_connection_web_socket.js";
+import { TransportPiped } from "./1_transport_piped.js";
 import { TransportIntermediate } from "./1_transport_intermediate.js";
 const dcToNameMap = {
     "1": "pluto",
@@ -10,7 +12,10 @@ const dcToNameMap = {
     "4": "vesta",
     "5": "flora",
 };
-export const defaultTransportProvider = ({ initialDc, wss }) => {
+function getDcId(dc, cdn) {
+    return Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
+}
+export const webSocketTransportProvider = ({ initialDc, wss }) => {
     return {
         initialDc,
         createTransport: ({ dc, cdn }) => {
@@ -19,7 +24,40 @@ export const defaultTransportProvider = ({ initialDc, wss }) => {
             const url = `${wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
             const connection = new ConnectionWebSocket(url);
             const transport = new TransportIntermediate(connection, true);
-            const dcId = Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
+            const dcId = getDcId(dc, cdn);
+            return { connection, transport, dcId };
+        },
+    };
+};
+const dcToIPv4Map = {
+    "1": "149.154.175.50",
+    "1-test": "149.154.175.10",
+    "2": "149.154.167.51",
+    "2-test": "149.154.167.40",
+    "3": "149.154.175.100",
+    "3-test": "149.154.175.117",
+    "4": "149.154.167.91",
+    "5": "149.154.171.5",
+};
+const dcToIPv6Map = {
+    "1": "[2001:b28:f23d:f001::a]",
+    "1-test": "[2001:b28:f23d:f001::e]",
+    "2": "[2001:67c:4e8:f002::a]",
+    "2-test": "[2001:67c:4e8:f002::e]",
+    "3": "[2001:b28:f23d:f003::a]",
+    "3-test": "[2001:b28:f23d:f003::e]",
+    "4": "[2001:67c:4e8:f004::a]",
+    "5": "[2001:b28:f23f:f005::a]",
+};
+export const httpTransportProvider = ({ initialDc, secure, v6 }) => {
+    return {
+        initialDc,
+        createTransport({ dc, cdn }) {
+            dc ??= initialDc;
+            const url = secure ? `https://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiw1_test" : "apiw1"}` : `http://${(v6 ? dcToIPv6Map : dcToIPv4Map)[dc]}/${dc.endsWith("-test") ? "api_test" : "api"}`;
+            const connection = new ConnectionHTTP(url);
+            const transport = new TransportPiped(connection);
+            const dcId = getDcId(dc, cdn);
             return { connection, transport, dcId };
         },
     };

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.0.966",
+  "version": "0.0.968",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/client/0_message.js

@@ -20,12 +20,11 @@ function getMessageId(lastMsgId) {
     if (lastMsgId >= (newMsgId)) {
         newMsgId = lastMsgId + 4n;
     }
-    lastMsgId = newMsgId;
     return newMsgId;
 }
 exports.getMessageId = getMessageId;
 function packUnencryptedMessage(data, messageId) {
-    const message = (0, _0_buffer_js_1.concat)((0, _0_buffer_js_1.bufferFromBigInt)(0x00, 8), (0, _0_buffer_js_1.bufferFromBigInt)(getMessageId(messageId), 8), (0, _0_buffer_js_1.bufferFromBigInt)(data.length, 4), data);
+    const message = (0, _0_buffer_js_1.concat)((0, _0_buffer_js_1.bufferFromBigInt)(0x00, 8), (0, _0_buffer_js_1.bufferFromBigInt)(messageId, 8), (0, _0_buffer_js_1.bufferFromBigInt)(data.length, 4), data);
     return message;
 }
 exports.packUnencryptedMessage = packUnencryptedMessage;

package/script/client/1_client_abstract.js

@@ -8,7 +8,7 @@ class ClientAbstract {
     get initialDc() {
         return this._initialDc;
     }
-    constructor(transportProvider = (0, _2_transport_provider_js_1.defaultTransportProvider)({ initialDc: constants_js_1.DEFAULT_INITIAL_DC }), cdn = false) {
+    constructor(transportProvider = (0, _2_transport_provider_js_1.webSocketTransportProvider)({ initialDc: constants_js_1.DEFAULT_INITIAL_DC }), cdn = false) {
         Object.defineProperty(this, "transportProvider", {
             enumerable: true,
             configurable: true,

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

@@ -69,8 +69,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;
@@ -93,7 +93,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/script/client/3_client.js

@@ -398,7 +398,7 @@ class Client extends _1_client_abstract_js_1.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) {
@@ -593,9 +593,8 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         const messageId = this.lastMsgId = (0, _0_message_js_1.getMessageId)(this.lastMsgId);
         const message = new _6_message_js_1.Message(messageId, seqNo, function_);
         await this.transport.send(await (0, _0_message_js_1.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) => {
@@ -605,7 +604,6 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             return await this.invoke(function_);
         }
         else {
-            d_();
             return result;
         }
     }
@@ -1173,8 +1171,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             noWebpage,
             silent,
             noforwards,
-            replyToMsgId,
-            topMsgId,
+            replyTo: replyToMsgId !== undefined ? new types.InputReplyToMessage({ replyToMsgId, topMsgId }) : undefined,
             sendAs,
             entities,
             replyMarkup,

package/script/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/script/connection/0_connection.js

@@ -1,6 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
-class Connection {
+exports.ConnectionFramed = exports.ConnectionUnframed = void 0;
+class Foundation {
 }
-exports.Connection = Connection;
+class ConnectionUnframed extends Foundation {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "framed"
+        });
+    }
+}
+exports.ConnectionUnframed = ConnectionUnframed;
+class ConnectionFramed extends Foundation {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "framed"
+        });
+    }
+}
+exports.ConnectionFramed = ConnectionFramed;

package/script/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/script/connection/1_connection_http.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionHTTP = void 0;
+const deps_js_1 = require("../deps.js");
+const _0_control_js_1 = require("../utilities/0_control.js");
+const _0_connection_js_1 = require("./0_connection.js");
+class ConnectionHTTP extends _0_connection_js_1.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 deps_js_1.Mutex()
+        });
+        Object.defineProperty(this, "wMutex", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new deps_js_1.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 (0, _0_control_js_1.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() {
+    }
+}
+exports.ConnectionHTTP = ConnectionHTTP;

package/script/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/script/connection/1_connection_web_socket.js

@@ -26,9 +26,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionWebSocket = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const deps_js_1 = require("../deps.js");
+const _0_connection_js_1 = require("./0_connection.js");
 const d = (0, deps_js_1.debug)("ConnectionWebSocket");
-class ConnectionWebSocket {
+class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
     constructor(url) {
+        super();
         Object.defineProperty(this, "webSocket", {
             enumerable: true,
             configurable: true,
@@ -72,7 +74,6 @@ 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);
@@ -87,7 +88,7 @@ class ConnectionWebSocket {
                 return;
             }
             const release = await mutex.acquire();
-            const data = new Uint8Array(await new Blob([e.data].map((v) => v instanceof ArrayBuffer ? v : Array.isArray(v) ? v.map((v) => v.buffer) : v.buffer).flat()).arrayBuffer());
+            const data = new Uint8Array(await new Blob([e.data].map((v) => v instanceof Blob ? v : v instanceof ArrayBuffer ? v : Array.isArray(v) ? v.map((v) => v.buffer) : v.buffer).flat()).arrayBuffer());
             for (const byte of data) {
                 this.buffer.push(byte);
             }
@@ -166,7 +167,6 @@ class ConnectionWebSocket {
             throw new Error("Connection not open");
         }
         this.webSocket.close(1000, "method");
-        console.trace("close called");
     }
 }
 exports.ConnectionWebSocket = ConnectionWebSocket;

package/script/constants.d.ts

@@ -3,8 +3,8 @@ export declare const ackThreshold = 10;
 export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 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.966";
+export declare const LAYER = 160;
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.968";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/script/constants.js

@@ -87,8 +87,8 @@ exports.publicKeys = new Map([
 ]);
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.DEFAULT_INITIAL_DC = "2-test";
-exports.LAYER = 158;
-exports.DEFAULT_APP_VERSION = "MTKruto 0.0.966";
+exports.LAYER = 160;
+exports.DEFAULT_APP_VERSION = "MTKruto 0.0.968";
 // @ts-ignore: lib
 exports.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;
 exports.DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];