@mtcute/core 0.30.3 → 0.32.0

package/network/network-manager.test.d.ts

@@ -0,0 +1 @@
+export {};

package/network/persistent-connection.cjs

@@ -23,7 +23,7 @@ class PersistentConnection {
     }
     this._onInactivityTimeout = this._onInactivityTimeout.bind(this);
     this._fuman = new net.PersistentConnection({
-      connect: async (dc) => {
+      connect: async (dc, abortSignal) => {
         if (this._floodControl) {
           if (!this._connectAbort || this._connectAbort.signal.aborted) {
             this._connectAbort = new AbortController();
@@ -33,7 +33,7 @@ class PersistentConnection {
         }
         this._updateLogPrefix();
         this.log.debug("connecting to %j", dc);
-        return params.transport.connect(dc);
+        return params.transport.connect(dc, abortSignal);
       },
       strategy: params.reconnectionStrategy,
       onOpen: this._onOpen.bind(this),
@@ -139,10 +139,18 @@ class PersistentConnection {
     this._fuman.connect(this.params.dc);
   }
   connect() {
+    if (this._destroyed) {
+      this.log.warn("tried to connect a destroyed connection, ignoring");
+      return;
+    }
     this._fuman.connect(this.params.dc);
     this._inactive = false;
   }
   reconnect() {
+    if (this._destroyed) {
+      this.log.warn("tried to reconnect a destroyed connection, ignoring");
+      return;
+    }
     if (this._disconnectedManually) {
       this._disconnectedManually = false;
       this.connect();

package/network/persistent-connection.js

@@ -16,7 +16,7 @@ class PersistentConnection {
     }
     this._onInactivityTimeout = this._onInactivityTimeout.bind(this);
     this._fuman = new PersistentConnection$1({
-      connect: async (dc) => {
+      connect: async (dc, abortSignal) => {
         if (this._floodControl) {
           if (!this._connectAbort || this._connectAbort.signal.aborted) {
             this._connectAbort = new AbortController();
@@ -26,7 +26,7 @@ class PersistentConnection {
         }
         this._updateLogPrefix();
         this.log.debug("connecting to %j", dc);
-        return params.transport.connect(dc);
+        return params.transport.connect(dc, abortSignal);
       },
       strategy: params.reconnectionStrategy,
       onOpen: this._onOpen.bind(this),
@@ -132,10 +132,18 @@ class PersistentConnection {
     this._fuman.connect(this.params.dc);
   }
   connect() {
+    if (this._destroyed) {
+      this.log.warn("tried to connect a destroyed connection, ignoring");
+      return;
+    }
     this._fuman.connect(this.params.dc);
     this._inactive = false;
   }
   reconnect() {
+    if (this._destroyed) {
+      this.log.warn("tried to reconnect a destroyed connection, ignoring");
+      return;
+    }
     if (this._disconnectedManually) {
       this._disconnectedManually = false;
       this.connect();

package/network/session-connection.cjs

@@ -123,7 +123,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     this._session.initConnectionCalled = false;
     this._flushTimer.reset();
     this._salts.isFetching = false;
-    this._session.resetLastPing(true);
+    this._session.forgetPendingPings();
     for (const timeout of this._session.pendingGetStateTimeouts.values()) {
       utils.timers.clearTimeout(timeout);
     }
@@ -738,7 +738,9 @@ class SessionConnection extends persistentConnection.PersistentConnection {
         break;
       case "ping":
         this.log.debug("ping (msg_id = %l) failed because of %s", msgId, reason);
-        this._session.resetLastPing(true);
+        if (this._session.lastPingMsgId.eq(msgId)) {
+          this._session.resetLastPing(true);
+        }
         break;
       case "rpc": {
         const rpc = msgInfo.rpc;
@@ -811,14 +813,17 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     if (info.pingId.neq(pingId)) {
       this.log.warn("received pong to %l, but expected ping_id = %l (got %l)", msgId, info.pingId, pingId);
     }
-    const rtt = performance.now() - this._session.lastPingTime;
+    this._session.pendingMessages.delete(msgId);
+    const rtt = performance.now() - info.sentAt;
     this._session.lastPingRtt = rtt;
     if (info.containerId.neq(msgId)) {
       this._onMessageAcked(info.containerId);
     }
     this.log.debug("received pong: msg_id %l, ping_id %l, rtt = %dms", msgId, pingId, rtt);
-    this._session.resetLastPing();
-    this._flushTimer.emitBefore(this._session.lastPingTime + this._pingMustDelay());
+    if (this._session.lastPingMsgId.eq(msgId)) {
+      this._session.resetLastPing();
+      this._flushTimer.emitBefore(this._session.lastPingTime + this._pingMustDelay());
+    }
   }
   _onBadServerSalt(msg) {
     this._salts.currentSalt = msg.newServerSalt;
@@ -1008,6 +1013,9 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     }
   }
   sendRpc(request, timeout, abortSignal, chainId) {
+    if (this._destroyed) {
+      return Promise.reject(new errors.MtcuteError("Connection destroyed"));
+    }
     if (this._usable && this.params.inactivityTimeout) {
       this._rescheduleInactivity();
     }
@@ -1208,7 +1216,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     const active = this._online && this._isActive();
     if (active && !this._active) {
       this._session.lastActivityTime = now;
-      this._session.resetLastPing(true);
+      this._session.resetLastPing(true, true);
     }
     this._active = active;
     if (this._checkTimeouts(now)) return;
@@ -1390,6 +1398,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       const pingPending = {
         _: "ping",
         pingId,
+        sentAt: now,
         containerId: pingMsgId
       };
       this._session.pendingMessages.set(pingMsgId, pingPending);

package/network/session-connection.js

@@ -116,7 +116,7 @@ class SessionConnection extends PersistentConnection {
     this._session.initConnectionCalled = false;
     this._flushTimer.reset();
     this._salts.isFetching = false;
-    this._session.resetLastPing(true);
+    this._session.forgetPendingPings();
     for (const timeout of this._session.pendingGetStateTimeouts.values()) {
       timers.clearTimeout(timeout);
     }
@@ -731,7 +731,9 @@ class SessionConnection extends PersistentConnection {
         break;
       case "ping":
         this.log.debug("ping (msg_id = %l) failed because of %s", msgId, reason);
-        this._session.resetLastPing(true);
+        if (this._session.lastPingMsgId.eq(msgId)) {
+          this._session.resetLastPing(true);
+        }
         break;
       case "rpc": {
         const rpc = msgInfo.rpc;
@@ -804,14 +806,17 @@ class SessionConnection extends PersistentConnection {
     if (info.pingId.neq(pingId)) {
       this.log.warn("received pong to %l, but expected ping_id = %l (got %l)", msgId, info.pingId, pingId);
     }
-    const rtt = performance.now() - this._session.lastPingTime;
+    this._session.pendingMessages.delete(msgId);
+    const rtt = performance.now() - info.sentAt;
     this._session.lastPingRtt = rtt;
     if (info.containerId.neq(msgId)) {
       this._onMessageAcked(info.containerId);
     }
     this.log.debug("received pong: msg_id %l, ping_id %l, rtt = %dms", msgId, pingId, rtt);
-    this._session.resetLastPing();
-    this._flushTimer.emitBefore(this._session.lastPingTime + this._pingMustDelay());
+    if (this._session.lastPingMsgId.eq(msgId)) {
+      this._session.resetLastPing();
+      this._flushTimer.emitBefore(this._session.lastPingTime + this._pingMustDelay());
+    }
   }
   _onBadServerSalt(msg) {
     this._salts.currentSalt = msg.newServerSalt;
@@ -1001,6 +1006,9 @@ class SessionConnection extends PersistentConnection {
     }
   }
   sendRpc(request, timeout, abortSignal, chainId) {
+    if (this._destroyed) {
+      return Promise.reject(new MtcuteError("Connection destroyed"));
+    }
     if (this._usable && this.params.inactivityTimeout) {
       this._rescheduleInactivity();
     }
@@ -1201,7 +1209,7 @@ class SessionConnection extends PersistentConnection {
     const active = this._online && this._isActive();
     if (active && !this._active) {
       this._session.lastActivityTime = now;
-      this._session.resetLastPing(true);
+      this._session.resetLastPing(true, true);
     }
     this._active = active;
     if (this._checkTimeouts(now)) return;
@@ -1383,6 +1391,7 @@ class SessionConnection extends PersistentConnection {
       const pingPending = {
         _: "ping",
         pingId,
+        sentAt: now,
         containerId: pingMsgId
       };
       this._session.pendingMessages.set(pingMsgId, pingPending);

package/network/session-connection.test.d.cts

@@ -0,0 +1 @@
+export {};

package/network/session-connection.test.d.ts

@@ -0,0 +1 @@
+export {};

package/network/transports/abstract.cjs

@@ -5,6 +5,21 @@ if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WAR
 }
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+async function performHandshakeWithAbort(conn, abortSignal, handshake) {
+  if (abortSignal.aborted) {
+    conn.close();
+    throw abortSignal.reason;
+  }
+  const onAbort = () => conn.close();
+  abortSignal.addEventListener("abort", onAbort);
+  try {
+    await handshake();
+  } finally {
+    abortSignal.removeEventListener("abort", onAbort);
+  }
+  abortSignal.throwIfAborted();
+  return conn;
+}
 class TransportError extends Error {
   code;
   constructor(code) {
@@ -13,3 +28,4 @@ class TransportError extends Error {
   }
 }
 exports.TransportError = TransportError;
+exports.performHandshakeWithAbort = performHandshakeWithAbort;

package/network/transports/abstract.d.cts

@@ -1,4 +1,4 @@
-import { IFrameDecoder, IFrameEncoder } from '@fuman/io';
+import { IClosable, IFrameDecoder, IFrameEncoder } from '@fuman/io';
 import { IConnection } from '@fuman/net';
 import { tl } from '../../tl/index.js';
 import { MaybePromise } from '../../types/index.js';
@@ -18,9 +18,15 @@ export interface ITelegramConnection extends IConnection<any, any> {
 }
 export interface TelegramTransport {
     setup?(crypto: ICryptoProvider, log: Logger): void;
-    connect: (dc: BasicDcOption) => Promise<ITelegramConnection>;
+    connect: (dc: BasicDcOption, abortSignal: AbortSignal) => Promise<ITelegramConnection>;
     packetCodec: (dc: BasicDcOption) => IPacketCodec;
 }
+/**
+ * Run a post-connect handshake, closing the connection if `abortSignal`
+ * is aborted before it completes (which in turn makes any pending
+ * reads/writes inside the handshake reject)
+ */
+export declare function performHandshakeWithAbort<Connection extends IClosable>(conn: Connection, abortSignal: AbortSignal, handshake: () => Promise<void>): Promise<Connection>;
 /**
  * Interface declaring handling of received packets.
  * When receiving a packet, its content is sent to feed(),

package/network/transports/abstract.d.ts

@@ -1,4 +1,4 @@
-import { IFrameDecoder, IFrameEncoder } from '@fuman/io';
+import { IClosable, IFrameDecoder, IFrameEncoder } from '@fuman/io';
 import { IConnection } from '@fuman/net';
 import { tl } from '../../tl/index.js';
 import { MaybePromise } from '../../types/index.js';
@@ -18,9 +18,15 @@ export interface ITelegramConnection extends IConnection<any, any> {
 }
 export interface TelegramTransport {
     setup?(crypto: ICryptoProvider, log: Logger): void;
-    connect: (dc: BasicDcOption) => Promise<ITelegramConnection>;
+    connect: (dc: BasicDcOption, abortSignal: AbortSignal) => Promise<ITelegramConnection>;
     packetCodec: (dc: BasicDcOption) => IPacketCodec;
 }
+/**
+ * Run a post-connect handshake, closing the connection if `abortSignal`
+ * is aborted before it completes (which in turn makes any pending
+ * reads/writes inside the handshake reject)
+ */
+export declare function performHandshakeWithAbort<Connection extends IClosable>(conn: Connection, abortSignal: AbortSignal, handshake: () => Promise<void>): Promise<Connection>;
 /**
  * Interface declaring handling of received packets.
  * When receiving a packet, its content is sent to feed(),

package/network/transports/abstract.js

@@ -1,3 +1,18 @@
+async function performHandshakeWithAbort(conn, abortSignal, handshake) {
+  if (abortSignal.aborted) {
+    conn.close();
+    throw abortSignal.reason;
+  }
+  const onAbort = () => conn.close();
+  abortSignal.addEventListener("abort", onAbort);
+  try {
+    await handshake();
+  } finally {
+    abortSignal.removeEventListener("abort", onAbort);
+  }
+  abortSignal.throwIfAborted();
+  return conn;
+}
 class TransportError extends Error {
   code;
   constructor(code) {
@@ -6,5 +21,6 @@ class TransportError extends Error {
   }
 }
 export {
-  TransportError
+  TransportError,
+  performHandshakeWithAbort
 };

package/network/transports/obfuscated.cjs

@@ -74,7 +74,9 @@ class ObfuscatedPacketCodec {
       const into = this._decodeBuf.writeSync(reader.available);
       into.set(this._decryptor.process(reader.readSync(reader.available)));
     }
-    return this._inner.decode(this._decodeBuf, eof);
+    const packet = await this._inner.decode(this._decodeBuf, eof);
+    this._decodeBuf.reclaim();
+    return packet;
   }
   reset() {
     this._inner.reset();

package/network/transports/obfuscated.js

@@ -67,7 +67,9 @@ class ObfuscatedPacketCodec {
       const into = this._decodeBuf.writeSync(reader.available);
       into.set(this._decryptor.process(reader.readSync(reader.available)));
     }
-    return this._inner.decode(this._decodeBuf, eof);
+    const packet = await this._inner.decode(this._decodeBuf, eof);
+    this._decodeBuf.reclaim();
+    return packet;
   }
   reset() {
     this._inner.reset();

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@mtcute/core",
     "type": "module",
-    "version": "0.30.3",
+    "version": "0.32.0",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},
     "dependencies": {
-        "@fuman/io": "0.0.20",
-        "@fuman/net": "0.0.20",
-        "@fuman/utils": "0.0.20",
-        "@mtcute/file-id": "^0.30.3",
-        "@mtcute/tl-runtime": "^0.30.3",
+        "@fuman/io": "0.0.21",
+        "@fuman/net": "0.0.21",
+        "@fuman/utils": "0.0.21",
+        "@mtcute/file-id": "^0.32.0",
+        "@mtcute/tl-runtime": "^0.32.0",
         "@types/events": "3.0.0",
         "long": "^5.3.2"
     },