@mtcute/core 0.29.7 → 0.30.0

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

@@ -6,6 +6,7 @@ import { Deferred, Emitter } from '@fuman/utils';
 export declare class MultiSessionConnection {
     readonly params: SessionConnectionParams;
     private _count;
+    static _pickConnection(loads: readonly number[], ready: readonly boolean[]): number;
     private _log;
     private _enforcePfs;
     readonly onRequestKeys: Emitter<Deferred<void>>;
@@ -25,7 +26,6 @@ export declare class MultiSessionConnection {
     private _updateConnections;
     _destroyed: boolean;
     destroy(): Promise<void>;
-    private _nextConnection;
     sendRpc<T extends tl.RpcMethod>(request: T, timeout?: number, abortSignal?: AbortSignal, chainId?: string | number): Promise<tl.RpcCallReturn[T['_']] | mtp.RawMt_rpc_error>;
     connect(): void;
     ensureConnected(): void;

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

@@ -6,6 +6,7 @@ import { Deferred, Emitter } from '@fuman/utils';
 export declare class MultiSessionConnection {
     readonly params: SessionConnectionParams;
     private _count;
+    static _pickConnection(loads: readonly number[], ready: readonly boolean[]): number;
     private _log;
     private _enforcePfs;
     readonly onRequestKeys: Emitter<Deferred<void>>;
@@ -25,7 +26,6 @@ export declare class MultiSessionConnection {
     private _updateConnections;
     _destroyed: boolean;
     destroy(): Promise<void>;
-    private _nextConnection;
     sendRpc<T extends tl.RpcMethod>(request: T, timeout?: number, abortSignal?: AbortSignal, chainId?: string | number): Promise<tl.RpcCallReturn[T['_']] | mtp.RawMt_rpc_error>;
     connect(): void;
     ensureConnected(): void;

package/network/multi-session-connection.js

@@ -9,6 +9,24 @@ class MultiSessionConnection {
     this._enforcePfs = _count > 1 && params.isMainConnection;
     this._updateConnections();
   }
+  static _pickConnection(loads, ready) {
+    let min = Infinity;
+    let minIdx = 0;
+    let foundReady = false;
+    for (let i = 0; i < loads.length; i++) {
+      const isReady = ready[i];
+      if (foundReady && !isReady) continue;
+      if (isReady && !foundReady) {
+        foundReady = true;
+        min = Infinity;
+      }
+      if (loads[i] < min) {
+        min = loads[i];
+        minIdx = i;
+      }
+    }
+    return minIdx;
+  }
   _log;
   _enforcePfs = false;
   // NB: dont forget to update .reset()
@@ -96,10 +114,6 @@ class MultiSessionConnection {
       conn.onUsable.add(() => this.onUsable.emit(i));
       conn.onWait.add(() => this.onWait.emit(i));
       conn.onRequestAuth.add(() => this.onRequestAuth.emit(i));
-      conn.onFloodDone.add(() => {
-        this._log.debug("received flood-done from connection %d", i);
-        this._connections.forEach((it) => it.flushWhenIdle());
-      });
       this._connections.push(conn);
       if (this._authKey !== null) conn._session._authKey.setup(this._authKey);
       if (connect && !enforcePfsChanged) conn.connect();
@@ -120,19 +134,15 @@ class MultiSessionConnection {
     this.onRequestAuth.clear();
     this._destroyed = true;
   }
-  _nextConnection = 0;
   sendRpc(request, timeout, abortSignal, chainId) {
-    let min = Infinity;
-    let minIdx = 0;
-    for (let i = 0; i < this._connections.length; i++) {
-      const conn = this._connections[i];
-      const total = conn._session.queuedRpc.length + conn._session.pendingMessages.size;
-      if (total < min) {
-        min = total;
-        minIdx = i;
-      }
-    }
-    return this._connections[minIdx].sendRpc(request, timeout, abortSignal, chainId);
+    const loads = this._connections.map((c) => c._session.queuedRpc.length + c._session.pendingMessages.size);
+    const ready = this._connections.map((c) => c.isConnected);
+    return this._connections[MultiSessionConnection._pickConnection(loads, ready)].sendRpc(
+      request,
+      timeout,
+      abortSignal,
+      chainId
+    );
   }
   connect() {
     for (const conn of this._connections) {

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

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

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

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

package/network/network-manager.cjs

@@ -53,7 +53,8 @@ class DcConnectionManager {
       // NB: we need a separate salts manager for each pfs connection, because server salts are auth_key-bound
       salts: managerParams.usePfs ? new serverSalt.ServerSaltManager() : this._salts,
       platform: managerParams.platform,
-      pingInterval: managerParams.pingInterval ?? 6e4
+      pingInterval: managerParams.pingInterval ?? 6e4,
+      floodControl: managerParams.floodControl === false ? void 0 : managerParams.floodControl ?? {}
     });
     const mainParams = baseConnectionParams();
     mainParams.isMainConnection = true;
@@ -226,7 +227,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.29.7",
+      appVersion: "0.30.0",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/network-manager.d.cts

@@ -7,6 +7,7 @@ import { mtp, tl } from '../tl/index.js';
 import { ICorePlatform } from '../types/platform.js';
 import { DcOptions, ICryptoProvider, Logger } from '../utils/index.js';
 import { ConfigManager } from './config-manager.js';
+import { ConnectionFloodLimits } from './flood-control.js';
 import { TelegramTransport } from './transports/abstract.js';
 import { MultiSessionConnection } from './multi-session-connection.js';
 export type ConnectionKind = 'main' | 'upload' | 'download' | 'downloadSmall';
@@ -83,6 +84,17 @@ export interface NetworkManagerExtraParams {
      * @default  60000 (1 minute)
      */
     pingInterval?: number;
+    /**
+     * Per-connection-slot flood-control limits (each socket throttles its own
+     * connect attempts independently, like TDLib). Override only if you
+     * understand the consequences — defaults are derived from TDLib and
+     * should fit most clients.
+     *
+     * See {@link ConnectionFloodLimits} for the limiter taxonomy.
+     *
+     * `false` to disable flood control.
+     */
+    floodControl?: ConnectionFloodLimits | false;
 }
 /** Options that can be customized when making an RPC call */
 export interface RpcCallOptions {

package/network/network-manager.d.ts

@@ -7,6 +7,7 @@ import { mtp, tl } from '../tl/index.js';
 import { ICorePlatform } from '../types/platform.js';
 import { DcOptions, ICryptoProvider, Logger } from '../utils/index.js';
 import { ConfigManager } from './config-manager.js';
+import { ConnectionFloodLimits } from './flood-control.js';
 import { TelegramTransport } from './transports/abstract.js';
 import { MultiSessionConnection } from './multi-session-connection.js';
 export type ConnectionKind = 'main' | 'upload' | 'download' | 'downloadSmall';
@@ -83,6 +84,17 @@ export interface NetworkManagerExtraParams {
      * @default  60000 (1 minute)
      */
     pingInterval?: number;
+    /**
+     * Per-connection-slot flood-control limits (each socket throttles its own
+     * connect attempts independently, like TDLib). Override only if you
+     * understand the consequences — defaults are derived from TDLib and
+     * should fit most clients.
+     *
+     * See {@link ConnectionFloodLimits} for the limiter taxonomy.
+     *
+     * `false` to disable flood control.
+     */
+    floodControl?: ConnectionFloodLimits | false;
 }
 /** Options that can be customized when making an RPC call */
 export interface RpcCallOptions {

package/network/network-manager.js

@@ -46,7 +46,8 @@ class DcConnectionManager {
       // NB: we need a separate salts manager for each pfs connection, because server salts are auth_key-bound
       salts: managerParams.usePfs ? new ServerSaltManager() : this._salts,
       platform: managerParams.platform,
-      pingInterval: managerParams.pingInterval ?? 6e4
+      pingInterval: managerParams.pingInterval ?? 6e4,
+      floodControl: managerParams.floodControl === false ? void 0 : managerParams.floodControl ?? {}
     });
     const mainParams = baseConnectionParams();
     mainParams.isMainConnection = true;
@@ -219,7 +220,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.29.7",
+      appVersion: "0.30.0",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/persistent-connection.cjs

@@ -8,6 +8,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const io = require("@fuman/io");
 const net = require("@fuman/net");
 const utils = require("@fuman/utils");
+const floodControl = require("./flood-control.cjs");
 let nextConnectionUid = 0;
 class PersistentConnection {
   constructor(params, log) {
@@ -16,9 +17,20 @@ class PersistentConnection {
     this.params.transport.setup?.(this.params.crypto, log);
     this._codec = this.params.transport.packetCodec(params.dc);
     this._codec.setup?.(this.params.crypto, this.log);
+    if (params.floodControl) {
+      this._floodControl = new floodControl.ConnectionFloodController(params.floodControl);
+      this._floodControl.setLogger(log.create("flood"));
+    }
     this._onInactivityTimeout = this._onInactivityTimeout.bind(this);
     this._fuman = new net.PersistentConnection({
-      connect: (dc) => {
+      connect: async (dc) => {
+        if (this._floodControl) {
+          if (!this._connectAbort || this._connectAbort.signal.aborted) {
+            this._connectAbort = new AbortController();
+          }
+          this._updateLogPrefix();
+          await this._floodControl.wait(this._connectAbort.signal);
+        }
         this._updateLogPrefix();
         this.log.debug("connecting to %j", dc);
         return params.transport.connect(dc);
@@ -47,6 +59,14 @@ class PersistentConnection {
   _inactive = true;
   _destroyed = false;
   _usable = false;
+  // each connection slot throttles its own connect attempts, mirroring
+  // TDLib's per-SessionProxy flood control. a fresh controller has empty
+  // limiters, so the first connect always passes immediately.
+  _floodControl;
+  // aborts a pending flood-control wait when the connection is being
+  // closed (manually or for good) — otherwise close() would block until
+  // the wait expires, and the connect would still proceed afterwards
+  _connectAbort;
   onWait = new utils.Emitter();
   onUsable = new utils.Emitter();
   onError = new utils.Emitter();
@@ -111,6 +131,7 @@ class PersistentConnection {
     return "reconnect";
   }
   async changeTransport(transport) {
+    this._connectAbort?.abort();
     await this._fuman.close();
     this._codec = transport.packetCodec(this.params.dc);
     this._codec.setup?.(this.params.crypto, this.log);
@@ -134,6 +155,7 @@ class PersistentConnection {
       utils.timers.clearTimeout(this._inactivityTimeout);
     }
     this._disconnectedManually = true;
+    this._connectAbort?.abort();
     await this._fuman.close();
   }
   async destroy() {
@@ -141,6 +163,7 @@ class PersistentConnection {
       utils.timers.clearTimeout(this._inactivityTimeout);
     }
     this._destroyed = true;
+    this._connectAbort?.abort();
     await this._fuman.close();
   }
   _rescheduleInactivity() {
@@ -152,6 +175,7 @@ class PersistentConnection {
     this.log.info("disconnected because of inactivity for %d", this.params.inactivityTimeout);
     this._inactive = true;
     this._inactivityTimeout = null;
+    this._connectAbort?.abort();
     Promise.resolve(this._fuman.close()).catch((err) => {
       this.log.warn("error closing transport: %e", err);
     });

package/network/persistent-connection.d.cts

@@ -1,6 +1,7 @@
 import { ReconnectionStrategy } from '@fuman/net';
 import { tl } from '../tl/index.js';
 import { BasicDcOption, ICryptoProvider, Logger } from '../utils/index.js';
+import { ConnectionFloodLimits, ConnectionFloodController } from './flood-control.js';
 import { TelegramTransport } from './transports/abstract.js';
 import { Emitter } from '@fuman/utils';
 export interface PersistentConnectionParams {
@@ -10,6 +11,8 @@ export interface PersistentConnectionParams {
     testMode: boolean;
     reconnectionStrategy: ReconnectionStrategy;
     inactivityTimeout?: number;
+    /** if present, each connection gates its connects through its own flood controller */
+    floodControl?: ConnectionFloodLimits;
 }
 /**
  * Base class for persistent connections.
@@ -28,6 +31,8 @@ export declare abstract class PersistentConnection {
     _inactive: boolean;
     _destroyed: boolean;
     _usable: boolean;
+    protected readonly _floodControl?: ConnectionFloodController;
+    private _connectAbort?;
     readonly onWait: Emitter<number>;
     readonly onUsable: Emitter<void>;
     readonly onError: Emitter<Error>;

package/network/persistent-connection.d.ts

@@ -1,6 +1,7 @@
 import { ReconnectionStrategy } from '@fuman/net';
 import { tl } from '../tl/index.js';
 import { BasicDcOption, ICryptoProvider, Logger } from '../utils/index.js';
+import { ConnectionFloodLimits, ConnectionFloodController } from './flood-control.js';
 import { TelegramTransport } from './transports/abstract.js';
 import { Emitter } from '@fuman/utils';
 export interface PersistentConnectionParams {
@@ -10,6 +11,8 @@ export interface PersistentConnectionParams {
     testMode: boolean;
     reconnectionStrategy: ReconnectionStrategy;
     inactivityTimeout?: number;
+    /** if present, each connection gates its connects through its own flood controller */
+    floodControl?: ConnectionFloodLimits;
 }
 /**
  * Base class for persistent connections.
@@ -28,6 +31,8 @@ export declare abstract class PersistentConnection {
     _inactive: boolean;
     _destroyed: boolean;
     _usable: boolean;
+    protected readonly _floodControl?: ConnectionFloodController;
+    private _connectAbort?;
     readonly onWait: Emitter<number>;
     readonly onUsable: Emitter<void>;
     readonly onError: Emitter<Error>;

package/network/persistent-connection.js

@@ -1,6 +1,7 @@
 import { FramedReader, FramedWriter } from "@fuman/io";
 import { PersistentConnection as PersistentConnection$1, ip, ConnectionClosedError } from "@fuman/net";
 import { Emitter, timers } from "@fuman/utils";
+import { ConnectionFloodController } from "./flood-control.js";
 let nextConnectionUid = 0;
 class PersistentConnection {
   constructor(params, log) {
@@ -9,9 +10,20 @@ class PersistentConnection {
     this.params.transport.setup?.(this.params.crypto, log);
     this._codec = this.params.transport.packetCodec(params.dc);
     this._codec.setup?.(this.params.crypto, this.log);
+    if (params.floodControl) {
+      this._floodControl = new ConnectionFloodController(params.floodControl);
+      this._floodControl.setLogger(log.create("flood"));
+    }
     this._onInactivityTimeout = this._onInactivityTimeout.bind(this);
     this._fuman = new PersistentConnection$1({
-      connect: (dc) => {
+      connect: async (dc) => {
+        if (this._floodControl) {
+          if (!this._connectAbort || this._connectAbort.signal.aborted) {
+            this._connectAbort = new AbortController();
+          }
+          this._updateLogPrefix();
+          await this._floodControl.wait(this._connectAbort.signal);
+        }
         this._updateLogPrefix();
         this.log.debug("connecting to %j", dc);
         return params.transport.connect(dc);
@@ -40,6 +52,14 @@ class PersistentConnection {
   _inactive = true;
   _destroyed = false;
   _usable = false;
+  // each connection slot throttles its own connect attempts, mirroring
+  // TDLib's per-SessionProxy flood control. a fresh controller has empty
+  // limiters, so the first connect always passes immediately.
+  _floodControl;
+  // aborts a pending flood-control wait when the connection is being
+  // closed (manually or for good) — otherwise close() would block until
+  // the wait expires, and the connect would still proceed afterwards
+  _connectAbort;
   onWait = new Emitter();
   onUsable = new Emitter();
   onError = new Emitter();
@@ -104,6 +124,7 @@ class PersistentConnection {
     return "reconnect";
   }
   async changeTransport(transport) {
+    this._connectAbort?.abort();
     await this._fuman.close();
     this._codec = transport.packetCodec(this.params.dc);
     this._codec.setup?.(this.params.crypto, this.log);
@@ -127,6 +148,7 @@ class PersistentConnection {
       timers.clearTimeout(this._inactivityTimeout);
     }
     this._disconnectedManually = true;
+    this._connectAbort?.abort();
     await this._fuman.close();
   }
   async destroy() {
@@ -134,6 +156,7 @@ class PersistentConnection {
       timers.clearTimeout(this._inactivityTimeout);
     }
     this._destroyed = true;
+    this._connectAbort?.abort();
     await this._fuman.close();
   }
   _rescheduleInactivity() {
@@ -145,6 +168,7 @@ class PersistentConnection {
     this.log.info("disconnected because of inactivity for %d", this.params.inactivityTimeout);
     this._inactive = true;
     this._inactivityTimeout = null;
+    this._connectAbort?.abort();
     Promise.resolve(this._fuman.close()).catch((err) => {
       this.log.warn("error closing transport: %e", err);
     });

package/network/session-connection.cjs

@@ -48,7 +48,6 @@ class SessionConnection extends persistentConnection.PersistentConnection {
   onDisconnect = new utils.Emitter();
   onKeyChange = new utils.Emitter();
   onTmpKeyChange = new utils.Emitter();
-  onFloodDone = new utils.Emitter();
   onRequestAuth = new utils.Emitter();
   onAuthBegin = new utils.Emitter();
   onUpdate = new utils.Emitter();
@@ -120,7 +119,6 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       this.onDisconnect.clear();
       this.onKeyChange.clear();
       this.onTmpKeyChange.clear();
-      this.onFloodDone.clear();
       this.onRequestAuth.clear();
       this.onAuthBegin.clear();
       this.onUpdate.clear();
@@ -184,7 +182,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       this.log.error("transport error %d", error.code);
       this._onAllFailed(`transport error ${error.code}`);
       if (error.code === 429) {
-        this._session.onTransportFlood(() => this.onFloodDone.emit());
+        this._floodControl?.addMtprotoError();
         return;
       }
     }
@@ -1056,6 +1054,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
   notifyNetworkChanged(online) {
     this._online = online;
     if (online) {
+      this._floodControl?.notifyNetworkUp();
       if (this._inactive) return;
       this.reconnect();
     } else {
@@ -1113,9 +1112,6 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     this._inactivityPendingFlush = true;
     this._flush();
   }
-  flushWhenIdle() {
-    this._flushTimer.emitWhenIdle();
-  }
   _handleGetStateTimeout = (msgId) => {
     const pending = this._session.pendingGetStateTimeouts.get(msgId);
     if (!pending) {
@@ -1125,13 +1121,12 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     this._onMessageFailed(msgId, "timeout");
   };
   _flush() {
-    if (this._disconnectedManually || !this._session._authKey.ready || this._isPfsBindingPending || this._session.current429Timeout) {
+    if (this._disconnectedManually || !this._session._authKey.ready || this._isPfsBindingPending) {
       this.log.debug(
-        "skipping flush, connection is not usable (offline = %b, auth key ready = %b, pfs binding pending = %b, 429 timeout = %b)",
+        "skipping flush, connection is not usable (offline = %b, auth key ready = %b, pfs binding pending = %b)",
         this._disconnectedManually,
         this._session._authKey.ready,
-        this._isPfsBindingPending,
-        this._session.current429Timeout
+        this._isPfsBindingPending
       );
       return;
     }

package/network/session-connection.d.cts

@@ -43,7 +43,6 @@ export declare class SessionConnection extends PersistentConnection {
     readonly onDisconnect: Emitter<void>;
     readonly onKeyChange: Emitter<Uint8Array | null>;
     readonly onTmpKeyChange: Emitter<[Uint8Array, number] | null>;
-    readonly onFloodDone: Emitter<void>;
     readonly onRequestAuth: Emitter<void>;
     readonly onAuthBegin: Emitter<void>;
     readonly onUpdate: Emitter<tl.TypeUpdates>;
@@ -87,7 +86,6 @@ export declare class SessionConnection extends PersistentConnection {
     notifyNetworkChanged(online: boolean): void;
     private _cancelRpc;
     protected _onInactivityTimeout(): void;
-    flushWhenIdle(): void;
     private _handleGetStateTimeout;
     private _flush;
     private _doFlush;

package/network/session-connection.d.ts

@@ -43,7 +43,6 @@ export declare class SessionConnection extends PersistentConnection {
     readonly onDisconnect: Emitter<void>;
     readonly onKeyChange: Emitter<Uint8Array | null>;
     readonly onTmpKeyChange: Emitter<[Uint8Array, number] | null>;
-    readonly onFloodDone: Emitter<void>;
     readonly onRequestAuth: Emitter<void>;
     readonly onAuthBegin: Emitter<void>;
     readonly onUpdate: Emitter<tl.TypeUpdates>;
@@ -87,7 +86,6 @@ export declare class SessionConnection extends PersistentConnection {
     notifyNetworkChanged(online: boolean): void;
     private _cancelRpc;
     protected _onInactivityTimeout(): void;
-    flushWhenIdle(): void;
     private _handleGetStateTimeout;
     private _flush;
     private _doFlush;

package/network/session-connection.js

@@ -41,7 +41,6 @@ class SessionConnection extends PersistentConnection {
   onDisconnect = new Emitter();
   onKeyChange = new Emitter();
   onTmpKeyChange = new Emitter();
-  onFloodDone = new Emitter();
   onRequestAuth = new Emitter();
   onAuthBegin = new Emitter();
   onUpdate = new Emitter();
@@ -113,7 +112,6 @@ class SessionConnection extends PersistentConnection {
       this.onDisconnect.clear();
       this.onKeyChange.clear();
       this.onTmpKeyChange.clear();
-      this.onFloodDone.clear();
       this.onRequestAuth.clear();
       this.onAuthBegin.clear();
       this.onUpdate.clear();
@@ -177,7 +175,7 @@ class SessionConnection extends PersistentConnection {
       this.log.error("transport error %d", error.code);
       this._onAllFailed(`transport error ${error.code}`);
       if (error.code === 429) {
-        this._session.onTransportFlood(() => this.onFloodDone.emit());
+        this._floodControl?.addMtprotoError();
         return;
       }
     }
@@ -1049,6 +1047,7 @@ class SessionConnection extends PersistentConnection {
   notifyNetworkChanged(online) {
     this._online = online;
     if (online) {
+      this._floodControl?.notifyNetworkUp();
       if (this._inactive) return;
       this.reconnect();
     } else {
@@ -1106,9 +1105,6 @@ class SessionConnection extends PersistentConnection {
     this._inactivityPendingFlush = true;
     this._flush();
   }
-  flushWhenIdle() {
-    this._flushTimer.emitWhenIdle();
-  }
   _handleGetStateTimeout = (msgId) => {
     const pending = this._session.pendingGetStateTimeouts.get(msgId);
     if (!pending) {
@@ -1118,13 +1114,12 @@ class SessionConnection extends PersistentConnection {
     this._onMessageFailed(msgId, "timeout");
   };
   _flush() {
-    if (this._disconnectedManually || !this._session._authKey.ready || this._isPfsBindingPending || this._session.current429Timeout) {
+    if (this._disconnectedManually || !this._session._authKey.ready || this._isPfsBindingPending) {
       this.log.debug(
-        "skipping flush, connection is not usable (offline = %b, auth key ready = %b, pfs binding pending = %b, 429 timeout = %b)",
+        "skipping flush, connection is not usable (offline = %b, auth key ready = %b, pfs binding pending = %b)",
         this._disconnectedManually,
         this._session._authKey.ready,
-        this._isPfsBindingPending,
-        this._session.current429Timeout
+        this._isPfsBindingPending
       );
       return;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@mtcute/core",
     "type": "module",
-    "version": "0.29.7",
+    "version": "0.30.0",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},