@mtkruto/node 0.0.986 → 0.0.987

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

@@ -1,6 +1,7 @@
 import { MaybePromise } from "../utilities/0_types.js";
 declare abstract class Foundation {
     abstract get connected(): boolean;
+    stateChangeHandler?: (connected: boolean) => void;
     abstract open(): MaybePromise<void>;
     abstract write(p: Uint8Array): MaybePromise<void>;
     abstract close(): MaybePromise<void>;

package/script/connection/0_connection.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionFramed = exports.ConnectionUnframed = void 0;
 class Foundation {
+    constructor() {
+        Object.defineProperty(this, "stateChangeHandler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+    }
 }
 class ConnectionUnframed extends Foundation {
     constructor() {

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

@@ -1,13 +1,15 @@
 import { ConnectionUnframed } from "./0_connection.js";
 export declare class ConnectionWebSocket extends ConnectionUnframed implements ConnectionUnframed {
+    private readonly url;
     private webSocket;
     private rMutex;
     private wMutex;
     private buffer;
     private nextResolve;
     constructor(url: string | URL);
-    private reinitWs;
+    private initWs;
     get connected(): boolean;
+    private wasConnected;
     private isConnecting;
     private connectionError;
     open(): Promise<void>;

package/script/connection/1_connection_web_socket.js

@@ -31,6 +31,12 @@ const d = (0, deps_js_1.debug)("ConnectionWebSocket");
 class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
     constructor(url) {
         super();
+        Object.defineProperty(this, "url", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: url
+        });
         Object.defineProperty(this, "webSocket", {
             enumerable: true,
             configurable: true,
@@ -61,6 +67,12 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
             writable: true,
             value: null
         });
+        Object.defineProperty(this, "wasConnected", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "isConnecting", {
             enumerable: true,
             configurable: true,
@@ -73,16 +85,17 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
             writable: true,
             value: null
         });
-        this.webSocket = this.reinitWs(url);
-        this.webSocket.addEventListener("close", (e) => {
-            if (e.code != 1000 && e.reason != "method") {
-                this.webSocket = this.reinitWs(url);
-            }
-        });
+        this.webSocket = this.initWs();
     }
-    reinitWs(url) {
-        const webSocket = new dntShim.WebSocket(url, "binary");
+    initWs() {
+        const webSocket = new dntShim.WebSocket(this.url, "binary");
         const mutex = new deps_js_1.Mutex();
+        webSocket.addEventListener("close", () => {
+            this.stateChangeHandler?.(false);
+        });
+        webSocket.addEventListener("open", () => {
+            this.stateChangeHandler?.(true);
+        });
         webSocket.addEventListener("message", async (e) => {
             if (typeof e.data === "string") {
                 return;
@@ -103,7 +116,9 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
                 // @ts-ignore: Node.js
                 this.connectionError = err;
             }
-            d("WebSocket error: %o", err);
+            if (this.connected) {
+                d("WebSocket error: %o", err);
+            }
         });
         return webSocket;
     }
@@ -115,6 +130,9 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
             throw new Error("Already connecting");
         }
         this.isConnecting = true;
+        if (!this.connected && this.wasConnected) {
+            this.webSocket = this.initWs();
+        }
         try {
             while (this.webSocket.readyState != dntShim.WebSocket.OPEN) {
                 if (this.webSocket.readyState == dntShim.WebSocket.CLOSED) {
@@ -129,6 +147,7 @@ class ConnectionWebSocket extends _0_connection_js_1.ConnectionUnframed {
                     await new Promise((r) => setTimeout(r, 5));
                 }
             }
+            this.wasConnected = true;
         }
         finally {
             this.isConnecting = false;

package/script/constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 161;
-export declare const APP_VERSION = "MTKruto 0.0.986";
+export declare const APP_VERSION = "MTKruto 0.0.987";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2-test";
 exports.LAYER = 161;
-exports.APP_VERSION = "MTKruto 0.0.986";
+exports.APP_VERSION = "MTKruto 0.0.987";
 // @ts-ignore: lib
 exports.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.LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/script/deps.js

@@ -31,7 +31,7 @@ Object.defineProperty(exports, "Mutex", { enumerable: true, get: function () { r
 var mod_js_2 = require("./deps/deno.land/x/html_parser@v0.1.3/src/mod.js");
 Object.defineProperty(exports, "Parser", { enumerable: true, get: function () { return mod_js_2.Parser; } });
 const mod_js_3 = require("./deps/raw.githubusercontent.com/MTKruto/debug/main/mod.js");
-const debug = (v) => (0, mod_js_3.debug)(`mtkruto/${v}`);
+const debug = (v) => (0, mod_js_3.debug)(v);
 exports.debug = debug;
 var base64_js_1 = require("./deps/deno.land/std@0.200.0/encoding/base64.js");
 Object.defineProperty(exports, "base64Decode", { enumerable: true, get: function () { return base64_js_1.decode; } });

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

@@ -2,21 +2,14 @@ import { Connection } from "../connection/0_connection.js";
 import { Transport } from "./0_transport.js";
 export type DC = "1" | "2" | "3" | "4" | "5" | "1-test" | "2-test" | "3-test";
 export interface TransportProviderParams {
-    dc?: DC;
+    dc: DC;
     cdn: boolean;
 }
-export type TransportProvider = {
-    initialDc: DC;
-    createTransport: (params: TransportProviderParams) => {
-        connection: Connection;
-        transport: Transport;
-        dcId: number;
-    };
+export type TransportProvider = (params: TransportProviderParams) => {
+    connection: Connection;
+    transport: Transport;
+    dcId: number;
 };
-export interface TransportProviderCreatorParams {
-    initialDc: DC;
-}
-export type TransportProviderCreator<E = Record<never, never>> = (params: TransportProviderCreatorParams & E) => TransportProvider;
-export declare const webSocketTransportProvider: TransportProviderCreator<{
+export declare const webSocketTransportProvider: (params?: {
     wss?: boolean;
-}>;
+}) => TransportProvider;

package/script/transport/2_transport_provider.js

@@ -16,18 +16,15 @@ const dcToNameMap = {
 function getDcId(dc, cdn) {
     return Number(dc[0]) + (dc.endsWith("-test") ? 10000 : 0) * (cdn ? -1 : 1);
 }
-const webSocketTransportProvider = ({ initialDc, wss }) => {
-    return {
-        initialDc,
-        createTransport: ({ dc, cdn }) => {
-            dc ??= initialDc;
-            wss ??= typeof location !== "undefined" && location.protocol == "http:" && location.hostname != "localhost" ? false : true;
-            const url = `${wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
-            const connection = new _1_connection_web_socket_js_1.ConnectionWebSocket(url);
-            const transport = new _1_transport_intermediate_js_1.TransportIntermediate(connection, true);
-            const dcId = getDcId(dc, cdn);
-            return { connection, transport, dcId };
-        },
+const webSocketTransportProvider = (params) => {
+    return ({ dc, cdn }) => {
+        params ??= {};
+        params.wss ??= typeof location !== "undefined" && location.protocol == "http:" && location.hostname != "localhost" ? false : true;
+        const url = `${params.wss ? "wss" : "ws"}://${dcToNameMap[dc]}${cdn ? "-1" : ""}.web.telegram.org/${dc.endsWith("-test") ? "apiws_test" : "apiws"}`;
+        const connection = new _1_connection_web_socket_js_1.ConnectionWebSocket(url);
+        const transport = new _1_transport_intermediate_js_1.TransportIntermediate(connection, true);
+        const dcId = getDcId(dc, cdn);
+        return { connection, transport, dcId };
     };
 };
 exports.webSocketTransportProvider = webSocketTransportProvider;

package/script/utilities/0_queue.d.ts

@@ -0,0 +1,6 @@
+export declare class Queue {
+    private functions;
+    add(fn: () => Promise<void>): void;
+    private busy;
+    private check;
+}

package/script/utilities/0_queue.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Queue = void 0;
+class Queue {
+    constructor() {
+        Object.defineProperty(this, "functions", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Array()
+        });
+        Object.defineProperty(this, "busy", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+    }
+    add(fn) {
+        this.functions.push(fn);
+        this.check();
+    }
+    check() {
+        if (this.busy) {
+            return;
+        }
+        else {
+            this.busy = true;
+        }
+        const fn = this.functions.shift();
+        if (fn !== undefined) {
+            fn().finally(() => {
+                this.busy = false;
+                this.check();
+            });
+        }
+        else {
+            this.busy = false;
+        }
+    }
+}
+exports.Queue = Queue;