@mtkruto/node 0.70.0 → 0.71.0

package/script/client/2_client_encrypted.js

@@ -40,7 +40,7 @@ class ClientEncrypted extends _0_client_abstract_js_1.ClientAbstract {
     #L;
     #plain;
     session;
-    #pendingRequests = new Map();
+    #sentRequests = new Map();
     #apiId;
     #appVersion;
     #deviceModel;
@@ -179,17 +179,18 @@ class ClientEncrypted extends _0_client_abstract_js_1.ClientAbstract {
     async #resend(request) {
         try {
             const messageId = await this.#send(request.call);
-            this.#pendingRequests.set(messageId, request);
+            this.#sentRequests.set(messageId, request);
         }
         catch (err) {
-            request.reject(err);
+            request.promiseWithResolvers.reject(err);
         }
     }
     async invoke(function_) {
         const messageId = await this.#send(function_);
-        return (await new Promise((resolve, reject) => {
-            this.#pendingRequests.set(messageId, { resolve, reject, call: function_ });
-        }));
+        this.#L.debug("sent", function_._, "with msg_id", messageId);
+        const sentRequest = { call: function_, promiseWithResolvers: Promise.withResolvers() };
+        this.#sentRequests.set(messageId, sentRequest);
+        return await sentRequest.promiseWithResolvers.promise;
     }
     async #onUpdate(body) {
         let type;
@@ -212,49 +213,51 @@ class ClientEncrypted extends _0_client_abstract_js_1.ClientAbstract {
         this.handlers.onNewServerSalt?.(serverSalt);
     }
     async #onMessageFailed(msgId, error) {
-        const request = this.#pendingRequests.get(msgId);
+        const request = this.#sentRequests.get(msgId);
         if (request) {
-            this.#pendingRequests.delete(msgId);
+            this.#sentRequests.delete(msgId);
             if (error instanceof _4_session_js_1.SessionError) {
                 await this.#resend(request);
             }
             else {
-                request.reject(error);
+                request.promiseWithResolvers.reject(error);
             }
         }
     }
     async #onRpcError(msgId, error) {
-        const request = this.#pendingRequests.get(msgId);
+        const request = this.#sentRequests.get(msgId);
+        this.#L.debug("received rpc_error with req_msg_id =", msgId, "for", request === undefined ? "unknown" : "known", "request");
         if (request) {
-            this.#pendingRequests.delete(msgId);
+            this.#sentRequests.delete(msgId);
             const reason = (0, _4_errors_js_1.constructTelegramError)(error, request.call);
             if (reason instanceof _3_errors_js_1.ConnectionNotInited) {
                 this.#connectionInited = false;
                 await this.#resend(request);
             }
             else {
-                request.reject((0, _4_errors_js_1.constructTelegramError)(error, request.call));
+                request.promiseWithResolvers.reject((0, _4_errors_js_1.constructTelegramError)(error, request.call));
             }
         }
     }
     async #onRpcResult(msgId, body) {
-        const request = this.#pendingRequests.get(msgId);
-        if (request) {
+        const sentRequest = this.#sentRequests.get(msgId);
+        this.#L.debug("received rpc_result with req_msg_id =", msgId, "for", sentRequest === undefined ? "unknown" : "known", "request");
+        if (sentRequest) {
             let type;
             try {
-                type = await _2_tl_js_1.Api.deserializeType(_2_tl_js_1.Api.mustGetReturnType(request.call._), body);
+                type = await _2_tl_js_1.Api.deserializeType(_2_tl_js_1.Api.mustGetReturnType(sentRequest.call._), body);
                 this.#L.in(type);
                 this.#L.debug("received rpc_result", (0, _0_utilities_js_1.repr)(type));
-                request.resolve(type);
+                sentRequest.promiseWithResolvers.resolve(type);
             }
             catch (err) {
-                request.reject(err);
-                this.#L.error("failed to deserialize RPC result body:", err);
+                sentRequest.promiseWithResolvers.reject(err);
+                this.#L.error("failed to deserialize rpc_result body:", err);
                 this.handlers.onDeserializationError?.();
                 return;
             }
             finally {
-                this.#pendingRequests.delete(msgId);
+                this.#sentRequests.delete(msgId);
             }
         }
         if (!this.#connectionInited) {
@@ -262,10 +265,10 @@ class ClientEncrypted extends _0_client_abstract_js_1.ClientAbstract {
         }
     }
     #onPong(pong) {
-        const pendingRequest = this.#pendingRequests.get(pong.msg_id);
-        if (pendingRequest) {
-            pendingRequest.resolve(pong);
-            this.#pendingRequests.delete(pong.msg_id);
+        const sentRequest = this.#sentRequests.get(pong.msg_id);
+        if (sentRequest) {
+            sentRequest.promiseWithResolvers.resolve(pong);
+            this.#sentRequests.delete(pong.msg_id);
         }
     }
 }

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

@@ -32,8 +32,8 @@ export declare class NetworkStatisticsManager {
         };
     }>;
     getTransportReadWriteCallback(cdn: boolean): {
-        read: (count: number) => Promise<void>;
-        write: (count: number) => Promise<void>;
+        read: (count: number) => void;
+        write: (count: number) => void;
     };
 }
 //# sourceMappingURL=2_network_statistics_manager.d.ts.map

package/script/client/2_network_statistics_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"2_network_statistics_manager.d.ts","sourceRoot":"","sources":["../../src/client/2_network_statistics_manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,cAAc,CAAC;AAEtC,qBAAa,wBAAwB;;gBAGvB,CAAC,EAAE,CAAC;IAIV,oBAAoB;;;;;;;;;;IAkB1B,6BAA6B,CAAC,GAAG,EAAE,OAAO;sBAElB,MAAM;uBAIL,MAAM;;CAMhC"}
+{"version":3,"file":"2_network_statistics_manager.d.ts","sourceRoot":"","sources":["../../src/client/2_network_statistics_manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,cAAc,CAAC;AAEtC,qBAAa,wBAAwB;;gBAIvB,CAAC,EAAE,CAAC;IAKV,oBAAoB;;;;;;;;;;IAmB1B,6BAA6B,CAAC,GAAG,EAAE,OAAO;sBAExB,MAAM;uBAKL,MAAM;;CA2B1B"}

package/script/client/2_network_statistics_manager.js

@@ -20,10 +20,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkStatisticsManager = void 0;
+const _1_logger_js_1 = require("../utilities/1_logger.js");
 class NetworkStatisticsManager {
     #c;
+    #L;
     constructor(c) {
         this.#c = c;
+        this.#L = (0, _1_logger_js_1.getLogger)("NetworkStatisticsManager");
     }
     async getNetworkStatistics() {
         const [messagesRead, messagesWrite, cdnRead, cdnWrite] = await Promise.all([
@@ -42,17 +45,40 @@ class NetworkStatisticsManager {
         };
         return { messages, cdn };
     }
+    #pendingWrites = {};
     getTransportReadWriteCallback(cdn) {
         return {
-            read: async (count) => {
+            read: (count) => {
                 const key = cdn ? "netstat_cdn_read" : "netstat_messages_read";
-                await this.#c.storage.incr([key], count);
+                this.#pendingWrites[key] = (this.#pendingWrites[key] ?? 0) + count;
+                this.#write();
             },
-            write: async (count) => {
+            write: (count) => {
                 const key = cdn ? "netstat_cdn_write" : "netstat_messages_write";
-                await this.#c.storage.incr([key], count);
+                this.#pendingWrites[key] = (this.#pendingWrites[key] ?? 0) + count;
+                this.#write();
             },
         };
     }
+    #writing = false;
+    async #write() {
+        if (this.#writing) {
+            return;
+        }
+        this.#writing = true;
+        for (const [k, v] of Object.entries(this.#pendingWrites)) {
+            if (v < 1) {
+                continue;
+            }
+            try {
+                await this.#c.messageStorage.incr([k], v);
+                this.#pendingWrites[k] -= v;
+            }
+            catch (err) {
+                this.#L.error("write failed:", err);
+            }
+        }
+        this.#writing = false;
+    }
 }
 exports.NetworkStatisticsManager = NetworkStatisticsManager;

package/script/client/2_update_manager.js

@@ -962,7 +962,7 @@ class UpdateManager {
                     const timeout = await this.#recoverChannelUpdateGap(channelId, "openChat");
                     const dT = Date.now() - Ti;
                     const delay = Math.max(timeout * 1_000 - dT, 0);
-                    logger.debug("timeout=", timeout, "delay=", delay, "dT=", dT);
+                    logger.debug("timeout =", timeout, "delay =", delay, "dT =", dT);
                     if (delay) {
                         await new Promise((r) => {
                             const resolve = () => {

package/script/client/5_client.js

@@ -853,10 +853,10 @@ class Client extends Composer {
         return this.#lastGetMe?.isPremium ?? false;
     }
     #lastUpdates = new Date();
-    #updateGapRecoveryLoop = new _0_abortable_loop_js_1.AbortableLoop(async (signal) => {
+    #updateGapRecoveryLoop = new _0_abortable_loop_js_1.AbortableLoop(async (loop, signal) => {
         await (0, _0_deps_js_1.delay)(60 * _0_deps_js_1.SECOND, { signal });
         if (!this.connected) {
-            this.#updateGapRecoveryLoop.abort();
+            loop.abort();
             return;
         }
         if (Date.now() - this.#lastUpdates.getTime() >= 15 * _0_deps_js_1.MINUTE) {
@@ -864,18 +864,18 @@ class Client extends Composer {
                 this.#lastUpdates = new Date();
             }));
         }
-    }, (err) => {
+    }, (loop, err) => {
         if (!this.connected) {
-            this.#updateGapRecoveryLoop.abort();
+            loop.abort();
         }
         else {
             this.#LupdateGapRecoveryLoop.error(err);
         }
     });
-    #clientDisconnectionLoop = new _0_abortable_loop_js_1.AbortableLoop(async (signal) => {
+    #clientDisconnectionLoop = new _0_abortable_loop_js_1.AbortableLoop(async (loop, signal) => {
         await (0, _0_deps_js_1.delay)(60 * _0_deps_js_1.SECOND, { signal });
         if (!this.connected) {
-            this.#clientDisconnectionLoop.abort();
+            loop.abort();
             return;
         }
         const now = Date.now();
@@ -885,12 +885,12 @@ class Client extends Composer {
                 client?.disconnect();
             }
         }
-    }, () => {
+    }, (loop) => {
         if (!this.connected) {
-            this.#clientDisconnectionLoop.abort();
+            loop.abort();
         }
     });
-    #storageWriteLoop = new _0_abortable_loop_js_1.AbortableLoop(async (signal) => {
+    #storageWriteLoop = new _0_abortable_loop_js_1.AbortableLoop(async (_loop, signal) => {
         await (0, _0_deps_js_1.delay)(60 * _0_deps_js_1.SECOND, { signal });
         await this.messageStorage.commit();
         await this.storage.commit();

package/script/session/1_session.d.ts

@@ -21,6 +21,7 @@ export declare abstract class Session {
     get dc(): DC;
     get cdn(): boolean;
     set serverSalt(serverSalt: bigint);
+    get serverSalt(): bigint;
     get connected(): boolean;
     connect(): Promise<void>;
     protected waitUntilConnected(): Promise<void>;

package/script/session/1_session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1_session.d.ts","sourceRoot":"","sources":["../../src/session/1_session.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAoD,MAAM,mBAAmB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,8BAAsB,OAAO;;IAG3B,SAAS,CAAC,KAAK,EAAE,YAAY,CAAsB;IACnD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBAMvC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAc1C,IAAI,uBAAuB,CAAC,uBAAuB,EAAE,UAAU,CAAC,oBAAoB,CAAC,EAEpF;IAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,EAExE;IAED,IAAI,EAAE,IAAI,EAAE,CAEX;IAED,IAAI,GAAG,IAAI,OAAO,CAEjB;IAED,IAAI,UAAU,CAAC,UAAU,EAAE,MAAM,EAEhC;IA6BD,IAAI,SAAS,IAAI,OAAO,CAEvB;IAGK,OAAO;cAeG,kBAAkB;IAIlC,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,UAAU;IAOV,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CACjD"}
+{"version":3,"file":"1_session.d.ts","sourceRoot":"","sources":["../../src/session/1_session.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAoD,MAAM,mBAAmB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,8BAAsB,OAAO;;IAG3B,SAAS,CAAC,KAAK,EAAE,YAAY,CAAsB;IACnD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBAMvC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAc1C,IAAI,uBAAuB,CAAC,uBAAuB,EAAE,UAAU,CAAC,oBAAoB,CAAC,EAEpF;IAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,EAExE;IAED,IAAI,EAAE,IAAI,EAAE,CAEX;IAED,IAAI,GAAG,IAAI,OAAO,CAEjB;IAED,IAAI,UAAU,CAAC,UAAU,EAAE,MAAM,EAEhC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IA6BD,IAAI,SAAS,IAAI,OAAO,CAEvB;IAGK,OAAO;cAeG,kBAAkB;IAIlC,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,UAAU;IAOV,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CACjD"}

package/script/session/1_session.js

@@ -98,6 +98,9 @@ class Session {
     set serverSalt(serverSalt) {
         this.state.serverSalt = serverSalt;
     }
+    get serverSalt() {
+        return this.state.serverSalt;
+    }
     #lastState;
     async #stateChangeHandler(connected) {
         if (this.#lastState !== connected) {

package/script/session/2_session_encrypted.d.ts

@@ -36,6 +36,6 @@ export declare class SessionEncrypted extends Session implements Session {
     get authKey(): Uint8Array<ArrayBuffer>;
     connect(): Promise<void>;
     disconnect(): void;
-    send(body: Uint8Array): Promise<bigint>;
+    send(body: Uint8Array<ArrayBuffer>): Promise<bigint>;
 }
 //# sourceMappingURL=2_session_encrypted.d.ts.map

package/script/session/2_session_encrypted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"2_session_encrypted.d.ts","sourceRoot":"","sources":["../../src/session/2_session_encrypted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAKH,OAAO,EAAwD,OAAO,EAAuC,MAAM,YAAY,CAAC;AAChI,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAS7D,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACtC,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxD,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;IACtC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC;IAC5D,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;CACxD;AAQD,qBAAa,gBAAiB,SAAQ,OAAQ,YAAW,OAAO;;IAI9D,QAAQ,EAAE,QAAQ,CAAM;gBAUZ,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAMpC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC;IAM7C,IAAI,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAErC;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,UAAU,IAAI,IAAI;IA2ErB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAsT9C"}
+{"version":3,"file":"2_session_encrypted.d.ts","sourceRoot":"","sources":["../../src/session/2_session_encrypted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAKH,OAAO,EAAwD,OAAO,EAAuC,MAAM,YAAY,CAAC;AAChI,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAa7D,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACtC,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxD,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;IACtC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC;IAC5D,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;CACxD;AAED,qBAAa,gBAAiB,SAAQ,OAAQ,YAAW,OAAO;;IAI9D,QAAQ,EAAE,QAAQ,CAAM;gBAiBZ,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAQpC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC;IAM7C,IAAI,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAErC;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,UAAU,IAAI,IAAI;IA6ErB,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CA6W3D"}