@mtcute/core 0.30.2 → 0.31.0

package/network/network-manager.js

@@ -1,5 +1,5 @@
 import { defaultReconnectionStrategy } from "@fuman/net";
-import { asNonNull, Deferred, LruMap, composeMiddlewares } from "@fuman/utils";
+import { asNonNull, Deferred, noop, LruMap, composeMiddlewares } from "@fuman/utils";
 import { dropUndefined } from "../utils/misc-utils.js";
 import { isTlRpcError, assertTypeIs } from "../utils/type-assertions.js";
 import "@mtcute/tl-runtime";
@@ -220,7 +220,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.30.2",
+      appVersion: "0.31.0",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"
@@ -272,34 +272,45 @@ class NetworkManager {
     return { main, media };
   }
   _resetOnNetworkChange;
+  _destroyed = false;
+  _teardownAbort = new AbortController();
+  /** Signal that is aborted when the network manager is disconnected or destroyed */
+  get teardownSignal() {
+    return this._teardownAbort.signal;
+  }
+  _onPrimaryUsable = () => this.params.onUsable();
+  _onPrimaryWait = () => this.params.onConnecting();
+  _onPrimaryUpdate = (update) => this._updateHandler(update, false);
   _switchPrimaryDc(dc) {
     if (this._primaryDc && this._primaryDc !== dc) {
       this._primaryDc.setIsPrimary(false);
+      this._primaryDc.main.onUsable.remove(this._onPrimaryUsable);
+      this._primaryDc.main.onWait.remove(this._onPrimaryWait);
+      this._primaryDc.main.onUpdate.remove(this._onPrimaryUpdate);
     }
     this._primaryDc = dc;
     dc.setIsPrimary(true);
     this.params.onConnecting();
-    dc.main.onUsable.add(() => {
-      if (dc !== this._primaryDc) return;
-      this.params.onUsable();
-    });
-    dc.main.onWait.add(() => {
-      if (dc !== this._primaryDc) return;
-      this.params.onConnecting();
-    });
-    dc.main.onUpdate.add((update) => {
-      this._updateHandler(update, false);
-    });
+    dc.main.onUsable.remove(this._onPrimaryUsable);
+    dc.main.onWait.remove(this._onPrimaryWait);
+    dc.main.onUpdate.remove(this._onPrimaryUpdate);
+    dc.main.onUsable.add(this._onPrimaryUsable);
+    dc.main.onWait.add(this._onPrimaryWait);
+    dc.main.onUpdate.add(this._onPrimaryUpdate);
     return dc.loadKeys().then(() => dc.main.ensureConnected());
   }
   _dcCreationPromise = /* @__PURE__ */ new Map();
   async _getOtherDc(dcId) {
+    if (this._destroyed) {
+      throw new MtcuteError("Network manager is destroyed");
+    }
     if (!this._dcConnections.has(dcId)) {
       if (this._dcCreationPromise.has(dcId)) {
         await this._dcCreationPromise.get(dcId);
         return asNonNull(this._dcConnections.get(dcId));
       }
       const promise = new Deferred();
+      promise.promise.catch(noop);
       this._dcCreationPromise.set(dcId, promise.promise);
       this._log.debug("creating new DC %d", dcId);
       try {
@@ -316,7 +327,7 @@ class NetworkManager {
         this._log.debug("dc %d was not created: %e", dcId, e);
         promise.reject(e);
         this._dcCreationPromise.delete(dcId);
-        return this._getOtherDc(dcId);
+        throw e;
       }
     }
     return this._dcConnections.get(dcId);
@@ -327,9 +338,15 @@ class NetworkManager {
    * @param defaultDcs  Default DCs to connect to
    */
   async connect(defaultDcs) {
+    if (this._destroyed) {
+      throw new MtcuteError("Network manager is destroyed");
+    }
     if (defaultDcs.main.id !== defaultDcs.media.id) {
       throw new MtArgumentError("Default DCs must be the same");
     }
+    if (this._teardownAbort.signal.aborted) {
+      this._teardownAbort = new AbortController();
+    }
     if (this._dcConnections.has(defaultDcs.main.id)) {
       throw new MtArgumentError("DC manager already exists");
     }
@@ -368,11 +385,12 @@ class NetworkManager {
       }
       assertTypeIs("auth.importAuthorization", res, "auth.authorization");
       promise.resolve();
-      this._pendingExports.delete(manager.dcId);
     } catch (e) {
       this._log.warn("failed to export auth to dc %d: %s", manager.dcId, e);
       promise.reject(e);
       throw e;
+    } finally {
+      this._pendingExports.delete(manager.dcId);
     }
   }
   setIsPremium(isPremium) {
@@ -442,6 +460,9 @@ class NetworkManager {
     }
   }
   async changePrimaryDc(newDc) {
+    if (this._destroyed) {
+      throw new MtcuteError("Network manager is destroyed");
+    }
     if (newDc === this._primaryDc?.dcId) return;
     const options = await this._findDcOptions(newDc);
     if (!this._dcConnections.has(newDc)) {
@@ -574,13 +595,20 @@ class NetworkManager {
     if (!this._primaryDc) throw new MtcuteError("Not connected to any DC");
     return this._primaryDc.dcId;
   }
-  async destroy() {
+  async disconnect() {
+    this._teardownAbort.abort();
+    this._primaryDc = void 0;
     for (const dc of this._dcConnections.values()) {
       await dc.destroy();
     }
     this._dcConnections.clear();
-    this.config.onUpdated.remove(this._onConfigChanged);
     this._resetOnNetworkChange?.();
+    this._resetOnNetworkChange = void 0;
+  }
+  async destroy() {
+    this._destroyed = true;
+    await this.disconnect();
+    this.config.onUpdated.remove(this._onConfigChanged);
   }
   getMtprotoMessageId() {
     return this._primaryDc.main._connections[0]._session.getMessageId();

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

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

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

@@ -1008,6 +1008,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();
     }

package/network/session-connection.js

@@ -1001,6 +1001,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();
     }

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.2",
+    "version": "0.31.0",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},
     "dependencies": {
-        "@fuman/io": "0.0.19",
-        "@fuman/net": "0.0.19",
-        "@fuman/utils": "0.0.19",
-        "@mtcute/file-id": "^0.29.0",
-        "@mtcute/tl-runtime": "^0.29.0",
+        "@fuman/io": "0.0.21",
+        "@fuman/net": "0.0.21",
+        "@fuman/utils": "0.0.21",
+        "@mtcute/file-id": "^0.31.0",
+        "@mtcute/tl-runtime": "^0.31.0",
         "@types/events": "3.0.0",
         "long": "^5.3.2"
     },