@mtcute/core 0.30.1 → 0.30.2

package/network/session-connection.cjs

@@ -11,6 +11,7 @@ const Long = require("long");
 const mtproto = require("../utils/crypto/mtproto.cjs");
 const earlyTimer = require("../utils/early-timer.cjs");
 const longUtils = require("../utils/long-utils.cjs");
+const miscUtils = require("../utils/misc-utils.cjs");
 const authorization = require("./authorization.cjs");
 const mtprotoSession = require("./mtproto-session.cjs");
 const persistentConnection = require("./persistent-connection.cjs");
@@ -18,6 +19,8 @@ const abstract = require("./transports/abstract.cjs");
 const errors = require("../types/errors.cjs");
 const innerTl = require("../tl/inner-tl.cjs");
 const TEMP_AUTH_KEY_EXPIRY = 86400;
+const TEMP_AUTH_KEY_REFRESH_MARGIN = 3600;
+const TEMP_AUTH_KEY_REFRESH_JITTER = 600;
 const GET_STATE_INTERVAL = 1500;
 const GET_STATE_TIMEOUT = 2500;
 const GZIP_PACKED_ID = 812830625;
@@ -29,6 +32,8 @@ const INVOKE_AFTER_MSG_SIZE = 12;
 class SessionConnection extends persistentConnection.PersistentConnection {
   _flushTimer = new earlyTimer.EarlyTimer();
   _queuedDestroySession = [];
+  _needDestroyAuthKey = false;
+  _sentDestroyAuthKey = false;
   // waitForMessage
   _pendingWaitForUnencrypted = [];
   _usePfs;
@@ -41,9 +46,8 @@ class SessionConnection extends persistentConnection.PersistentConnection {
   _crypto;
   _salts;
   _session;
-  // todo: we should probably do adaptive ping interval based on rtt like tdlib:
-  // https://github.com/tdlib/td/blob/91aa6c9e4d0774eabf4f8d7f3aa51239032059a6/td/mtproto/SessionConnection.h
   _pingInterval;
+  _randomDelay = miscUtils.getRandomInt(5e3);
   // NB: dont forget to update .reset()
   onDisconnect = new utils.Emitter();
   onKeyChange = new utils.Emitter();
@@ -73,6 +77,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     this._online = params.platform.isOnline?.() ?? true;
   }
   _online;
+  _active = false;
   getAuthKey(temp = false) {
     const key = temp ? this._session._authKeyTemp : this._session._authKey;
     if (!key.ready) return null;
@@ -98,6 +103,9 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     for (const msgId of this._session.pendingGetStateTimeouts.keys()) {
       this._onMessageFailed(msgId, "connection loss", true);
     }
+    for (const rpc of this._session.getStateSchedule.raw) {
+      rpc.getState = 0;
+    }
     this.onDisconnect.emit();
     this.reset();
   }
@@ -105,6 +113,12 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     await super.destroy();
     this.reset(true);
   }
+  destroyAuthKey() {
+    if (!this._session._authKey.ready || this._needDestroyAuthKey) return;
+    this._needDestroyAuthKey = true;
+    this._sentDestroyAuthKey = false;
+    this._flushTimer.emitNow();
+  }
   reset(forever = false) {
     this._session.initConnectionCalled = false;
     this._flushTimer.reset();
@@ -114,6 +128,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       utils.timers.clearTimeout(timeout);
     }
     this._session.pendingGetStateTimeouts.clear();
+    if (this._needDestroyAuthKey) this._sentDestroyAuthKey = false;
     if (forever) {
       utils.timers.clearTimeout(this._pfsUpdateTimeout);
       this.onDisconnect.clear();
@@ -189,6 +204,8 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     this.onError.emit(error);
   }
   onConnectionUsable() {
+    this._session.lastActivityTime = performance.now();
+    this._active = false;
     if (this.params.withUpdates) {
       this.sendRpc({ _: "updates.getState" }).catch((err) => {
         if (this._destroyed || innerTl.RpcError.is(err, "AUTH_KEY_UNREGISTERED")) return;
@@ -212,7 +229,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     authorization.doAuthorization(this, this._crypto).then(([authKey, serverSalt, timeOffset]) => {
       this._session._authKey.setup(authKey);
       this._salts.currentSalt = serverSalt;
-      this._session.updateTimeOffset(timeOffset);
+      this._session.updateTimeOffset(timeOffset, true);
       this._session.authorizationPending = false;
       this.onKeyChange.emit(authKey);
       if (this._usePfs) {
@@ -328,7 +345,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
           this.log.debug("temp key is expiring soon");
           this._authorizePfs(true);
         },
-        (TEMP_AUTH_KEY_EXPIRY - 60) * 1e3
+        (TEMP_AUTH_KEY_EXPIRY - TEMP_AUTH_KEY_REFRESH_MARGIN - miscUtils.getRandomInt(TEMP_AUTH_KEY_REFRESH_JITTER)) * 1e3
       );
     }).catch((err) => {
       if (this._destroyed) return;
@@ -356,6 +373,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
   }
   _warnedAboutUpdates = false;
   onMessage(data) {
+    this._session.lastActivityTime = performance.now();
     if (this._pendingWaitForUnencrypted.length) {
       const int32 = new Int32Array(data.buffer, data.byteOffset, 2);
       if (int32[0] === 0 && int32[1] === 0) {
@@ -410,13 +428,12 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       this.log.warn("warn: ignoring message with invalid messageId = %s (is even)", messageId);
       return;
     }
-    if (this._session.recentIncomingMsgIds.has(messageId)) {
-      this.log.debug("ignoring duplicate message %s", messageId);
+    if (!this._session.recentIncomingMsgIds.add(messageId)) {
+      this.log.debug("ignoring duplicate or too old message %s", messageId);
       return;
     }
     const message = message_;
     this.log.debug("received %s (msg_id: %l)", message._, messageId);
-    this._session.recentIncomingMsgIds.add(messageId);
     switch (message._) {
       case "mt_msgs_ack":
       case "mt_http_wait":
@@ -469,6 +486,16 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       case "mt_destroy_session_none":
         this.log.debug("received %s (msg_id = %l): %j", message._, messageId, message);
         break;
+      case "mt_destroy_auth_key_ok":
+      case "mt_destroy_auth_key_none":
+        this.log.info("auth key destroyed: %s", message._);
+        this._needDestroyAuthKey = false;
+        this._sentDestroyAuthKey = false;
+        break;
+      case "mt_destroy_auth_key_fail":
+        this.log.warn("auth key destruction failed");
+        this._sentDestroyAuthKey = false;
+        break;
       default:
         if (innerTl.isAnyUpdates(message)) {
           if (this._usable && this.params.inactivityTimeout) {
@@ -791,6 +818,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     }
     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());
   }
   _onBadServerSalt(msg) {
     this._salts.currentSalt = msg.newServerSalt;
@@ -798,8 +826,19 @@ class SessionConnection extends persistentConnection.PersistentConnection {
   }
   _onBadMsgNotification(msgId, msg) {
     switch (msg.errorCode) {
+      case 17: {
+        const serverTime = msgId.high >>> 0;
+        const timeOffset = serverTime - Math.floor(performance.now() / 1e3);
+        this._session.updateTimeOffset(timeOffset, true);
+        this.log.warn(
+          "msg_id too high, server time: %d, corrected offset to %d, resetting session",
+          serverTime,
+          timeOffset
+        );
+        this._resetSession("msg_id too high");
+        break;
+      }
       case 16:
-      case 17:
       case 20: {
         if (msg.errorCode !== 20) {
           const serverTime = msgId.high >>> 0;
@@ -1120,6 +1159,41 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     }
     this._onMessageFailed(msgId, "timeout");
   };
+  // https://github.com/tdlib/td/blob/master/td/mtproto/SessionConnection.h
+  _rtt() {
+    const rtt = this._session.lastPingRtt;
+    if (Number.isNaN(rtt)) return 2e3;
+    return Math.max(2e3, rtt * 1.5 + 1e3);
+  }
+  _readDisconnectDelay() {
+    return this._active ? this._rtt() * 3.5 : 135e3 + this._randomDelay;
+  }
+  _pingDisconnectDelay() {
+    return this._active && this.params.isMainConnection ? this._rtt() * 2.5 : 135e3 + this._randomDelay;
+  }
+  _pingMustDelay() {
+    return this._active ? this._rtt() : this._pingInterval + this._randomDelay;
+  }
+  _isActive() {
+    if (this._session.queuedRpc.length > 0) return true;
+    for (const msg of this._session.pendingMessages.values()) {
+      if (msg._ === "rpc") return true;
+    }
+    return false;
+  }
+  _checkTimeouts(now) {
+    if (!this._session.lastPingMsgId.isZero() && now - this._session.lastPingTime > this._pingDisconnectDelay()) {
+      this.log.warn("ping timeout, no pong for %dms", Math.round(now - this._session.lastPingTime));
+      this._resetSession("ping timeout");
+      return true;
+    }
+    if (now - this._session.lastActivityTime > this._readDisconnectDelay()) {
+      this.log.warn("read timeout, last read was %dms ago", Math.round(now - this._session.lastActivityTime));
+      this._resetSession("read timeout");
+      return true;
+    }
+    return false;
+  }
   _flush() {
     if (this._disconnectedManually || !this._session._authKey.ready || this._isPfsBindingPending) {
       this.log.debug(
@@ -1130,6 +1204,14 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       );
       return;
     }
+    const now = performance.now();
+    const active = this._online && this._isActive();
+    if (active && !this._active) {
+      this._session.lastActivityTime = now;
+      this._session.resetLastPing(true);
+    }
+    this._active = active;
+    if (this._checkTimeouts(now)) return;
     try {
       this._doFlush();
     } catch (e) {
@@ -1140,9 +1222,11 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     if (this._session.hasPendingMessages) {
       this._flushTimer.emitWhenIdle();
     } else {
-      const nextPingTime = this._session.lastPingTime + this._pingInterval;
+      const nextPingTime = this._session.lastPingMsgId.isZero() ? this._session.lastPingTime + this._pingMustDelay() : Infinity;
       const nextGetScheduleTime = this._session.getStateSchedule.raw[0]?.getState || Infinity;
-      this._flushTimer.emitBefore(Math.min(nextPingTime, nextGetScheduleTime));
+      const readDeadline = this._session.lastActivityTime + this._readDisconnectDelay();
+      const pingDeadline = this._session.lastPingMsgId.isZero() ? Infinity : this._session.lastPingTime + this._pingDisconnectDelay();
+      this._flushTimer.emitBefore(Math.min(nextPingTime, nextGetScheduleTime, readDeadline, pingDeadline));
     }
   }
   _doFlush() {
@@ -1166,6 +1250,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     let resendMsgIds = null;
     let cancelRpcs = null;
     let destroySessions = null;
+    let destroyAuthKey = false;
     let rootMsgId = null;
     const now = performance.now();
     if (this._session.queuedAcks.length) {
@@ -1185,20 +1270,12 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       packetSize += ackRequest.length + 16;
       messageCount += 1;
     }
-    if (now - this._session.lastPingTime > this._pingInterval) {
-      if (!this._session.lastPingMsgId.isZero()) {
-        this.log.warn("didn't receive pong for previous ping (msg_id = %l). are we offline?", this._session.lastPingMsgId);
-        if (!this._disconnectedManually) {
-          this._resetSession("ping timeout");
-        }
-        return;
-      }
+    if (this._session.lastPingMsgId.isZero() && now - this._session.lastPingTime > this._pingMustDelay()) {
       pingId = longUtils.randomLong();
       const obj = {
         _: "mt_ping_delay_disconnect",
         pingId,
-        // ÷ 1000 * 1.25
-        disconnectDelay: Math.round(this._pingInterval * 125e-5)
+        disconnectDelay: Math.round(this._pingDisconnectDelay() / 1e3) + 2
       };
       this._session.lastPingTime = now;
       pingRequest = tlRuntime.TlBinaryWriter.serializeObject(this._writerMap, obj);
@@ -1260,6 +1337,11 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       destroySessions = this._queuedDestroySession;
       this._queuedDestroySession = [];
     }
+    if (this._needDestroyAuthKey && !this._sentDestroyAuthKey) {
+      destroyAuthKey = true;
+      containerMessageCount += 1;
+      containerSize += 20;
+    }
     if (this._salts.shouldFetchSalts()) {
       const obj = {
         _: "mt_get_future_salts",
@@ -1370,6 +1452,10 @@ class SessionConnection extends persistentConnection.PersistentConnection {
         otherPendings.push(pending);
       });
     }
+    if (destroyAuthKey) {
+      this._registerOutgoingMsgId(this._session.writeMessage(writer, { _: "mt_destroy_auth_key" }));
+      this._sentDestroyAuthKey = true;
+    }
     if (getFutureSaltsRequest) {
       getFutureSaltsMsgId = this._registerOutgoingMsgId(this._session.writeMessage(writer, getFutureSaltsRequest));
       const pending = {

package/network/session-connection.d.cts

@@ -28,6 +28,8 @@ export declare class SessionConnection extends PersistentConnection {
     readonly params: SessionConnectionParams;
     private _flushTimer;
     private _queuedDestroySession;
+    private _needDestroyAuthKey;
+    private _sentDestroyAuthKey;
     private _pendingWaitForUnencrypted;
     private _usePfs;
     private _isPfsBindingPending;
@@ -40,6 +42,7 @@ export declare class SessionConnection extends PersistentConnection {
     private _salts;
     readonly _session: MtprotoSession;
     private _pingInterval;
+    private _randomDelay;
     readonly onDisconnect: Emitter<void>;
     readonly onKeyChange: Emitter<Uint8Array | null>;
     readonly onTmpKeyChange: Emitter<[Uint8Array, number] | null>;
@@ -50,10 +53,12 @@ export declare class SessionConnection extends PersistentConnection {
     private _triedReconnectingOn404;
     constructor(params: SessionConnectionParams, log: Logger);
     private _online;
+    private _active;
     getAuthKey(temp?: boolean): Uint8Array | null;
     setUsePfs(usePfs: boolean): void;
     onClosed(): void;
     destroy(): Promise<void>;
+    destroyAuthKey(): void;
     reset(forever?: boolean): void;
     onConnected(): void;
     protected handleError(error: Error): void;
@@ -87,6 +92,12 @@ export declare class SessionConnection extends PersistentConnection {
     private _cancelRpc;
     protected _onInactivityTimeout(): void;
     private _handleGetStateTimeout;
+    private _rtt;
+    private _readDisconnectDelay;
+    private _pingDisconnectDelay;
+    private _pingMustDelay;
+    private _isActive;
+    private _checkTimeouts;
     private _flush;
     private _doFlush;
 }

package/network/session-connection.d.ts

@@ -28,6 +28,8 @@ export declare class SessionConnection extends PersistentConnection {
     readonly params: SessionConnectionParams;
     private _flushTimer;
     private _queuedDestroySession;
+    private _needDestroyAuthKey;
+    private _sentDestroyAuthKey;
     private _pendingWaitForUnencrypted;
     private _usePfs;
     private _isPfsBindingPending;
@@ -40,6 +42,7 @@ export declare class SessionConnection extends PersistentConnection {
     private _salts;
     readonly _session: MtprotoSession;
     private _pingInterval;
+    private _randomDelay;
     readonly onDisconnect: Emitter<void>;
     readonly onKeyChange: Emitter<Uint8Array | null>;
     readonly onTmpKeyChange: Emitter<[Uint8Array, number] | null>;
@@ -50,10 +53,12 @@ export declare class SessionConnection extends PersistentConnection {
     private _triedReconnectingOn404;
     constructor(params: SessionConnectionParams, log: Logger);
     private _online;
+    private _active;
     getAuthKey(temp?: boolean): Uint8Array | null;
     setUsePfs(usePfs: boolean): void;
     onClosed(): void;
     destroy(): Promise<void>;
+    destroyAuthKey(): void;
     reset(forever?: boolean): void;
     onConnected(): void;
     protected handleError(error: Error): void;
@@ -87,6 +92,12 @@ export declare class SessionConnection extends PersistentConnection {
     private _cancelRpc;
     protected _onInactivityTimeout(): void;
     private _handleGetStateTimeout;
+    private _rtt;
+    private _readDisconnectDelay;
+    private _pingDisconnectDelay;
+    private _pingMustDelay;
+    private _isActive;
+    private _checkTimeouts;
     private _flush;
     private _doFlush;
 }

package/network/session-connection.js

@@ -4,6 +4,7 @@ import Long from "long";
 import { createAesIgeForMessageOld } from "../utils/crypto/mtproto.js";
 import { EarlyTimer } from "../utils/early-timer.js";
 import { longFromBuffer, randomLong, removeFromLongArray } from "../utils/long-utils.js";
+import { getRandomInt } from "../utils/misc-utils.js";
 import { doAuthorization } from "./authorization.js";
 import { MtprotoSession } from "./mtproto-session.js";
 import { PersistentConnection } from "./persistent-connection.js";
@@ -11,6 +12,8 @@ import { TransportError } from "./transports/abstract.js";
 import { MtcuteError, MtTimeoutError, MtArgumentError } from "../types/errors.js";
 import { RpcError, isAnyUpdates } from "../tl/inner-tl.js";
 const TEMP_AUTH_KEY_EXPIRY = 86400;
+const TEMP_AUTH_KEY_REFRESH_MARGIN = 3600;
+const TEMP_AUTH_KEY_REFRESH_JITTER = 600;
 const GET_STATE_INTERVAL = 1500;
 const GET_STATE_TIMEOUT = 2500;
 const GZIP_PACKED_ID = 812830625;
@@ -22,6 +25,8 @@ const INVOKE_AFTER_MSG_SIZE = 12;
 class SessionConnection extends PersistentConnection {
   _flushTimer = new EarlyTimer();
   _queuedDestroySession = [];
+  _needDestroyAuthKey = false;
+  _sentDestroyAuthKey = false;
   // waitForMessage
   _pendingWaitForUnencrypted = [];
   _usePfs;
@@ -34,9 +39,8 @@ class SessionConnection extends PersistentConnection {
   _crypto;
   _salts;
   _session;
-  // todo: we should probably do adaptive ping interval based on rtt like tdlib:
-  // https://github.com/tdlib/td/blob/91aa6c9e4d0774eabf4f8d7f3aa51239032059a6/td/mtproto/SessionConnection.h
   _pingInterval;
+  _randomDelay = getRandomInt(5e3);
   // NB: dont forget to update .reset()
   onDisconnect = new Emitter();
   onKeyChange = new Emitter();
@@ -66,6 +70,7 @@ class SessionConnection extends PersistentConnection {
     this._online = params.platform.isOnline?.() ?? true;
   }
   _online;
+  _active = false;
   getAuthKey(temp = false) {
     const key = temp ? this._session._authKeyTemp : this._session._authKey;
     if (!key.ready) return null;
@@ -91,6 +96,9 @@ class SessionConnection extends PersistentConnection {
     for (const msgId of this._session.pendingGetStateTimeouts.keys()) {
       this._onMessageFailed(msgId, "connection loss", true);
     }
+    for (const rpc of this._session.getStateSchedule.raw) {
+      rpc.getState = 0;
+    }
     this.onDisconnect.emit();
     this.reset();
   }
@@ -98,6 +106,12 @@ class SessionConnection extends PersistentConnection {
     await super.destroy();
     this.reset(true);
   }
+  destroyAuthKey() {
+    if (!this._session._authKey.ready || this._needDestroyAuthKey) return;
+    this._needDestroyAuthKey = true;
+    this._sentDestroyAuthKey = false;
+    this._flushTimer.emitNow();
+  }
   reset(forever = false) {
     this._session.initConnectionCalled = false;
     this._flushTimer.reset();
@@ -107,6 +121,7 @@ class SessionConnection extends PersistentConnection {
       timers.clearTimeout(timeout);
     }
     this._session.pendingGetStateTimeouts.clear();
+    if (this._needDestroyAuthKey) this._sentDestroyAuthKey = false;
     if (forever) {
       timers.clearTimeout(this._pfsUpdateTimeout);
       this.onDisconnect.clear();
@@ -182,6 +197,8 @@ class SessionConnection extends PersistentConnection {
     this.onError.emit(error);
   }
   onConnectionUsable() {
+    this._session.lastActivityTime = performance.now();
+    this._active = false;
     if (this.params.withUpdates) {
       this.sendRpc({ _: "updates.getState" }).catch((err) => {
         if (this._destroyed || RpcError.is(err, "AUTH_KEY_UNREGISTERED")) return;
@@ -205,7 +222,7 @@ class SessionConnection extends PersistentConnection {
     doAuthorization(this, this._crypto).then(([authKey, serverSalt, timeOffset]) => {
       this._session._authKey.setup(authKey);
       this._salts.currentSalt = serverSalt;
-      this._session.updateTimeOffset(timeOffset);
+      this._session.updateTimeOffset(timeOffset, true);
       this._session.authorizationPending = false;
       this.onKeyChange.emit(authKey);
       if (this._usePfs) {
@@ -321,7 +338,7 @@ class SessionConnection extends PersistentConnection {
           this.log.debug("temp key is expiring soon");
           this._authorizePfs(true);
         },
-        (TEMP_AUTH_KEY_EXPIRY - 60) * 1e3
+        (TEMP_AUTH_KEY_EXPIRY - TEMP_AUTH_KEY_REFRESH_MARGIN - getRandomInt(TEMP_AUTH_KEY_REFRESH_JITTER)) * 1e3
       );
     }).catch((err) => {
       if (this._destroyed) return;
@@ -349,6 +366,7 @@ class SessionConnection extends PersistentConnection {
   }
   _warnedAboutUpdates = false;
   onMessage(data) {
+    this._session.lastActivityTime = performance.now();
     if (this._pendingWaitForUnencrypted.length) {
       const int32 = new Int32Array(data.buffer, data.byteOffset, 2);
       if (int32[0] === 0 && int32[1] === 0) {
@@ -403,13 +421,12 @@ class SessionConnection extends PersistentConnection {
       this.log.warn("warn: ignoring message with invalid messageId = %s (is even)", messageId);
       return;
     }
-    if (this._session.recentIncomingMsgIds.has(messageId)) {
-      this.log.debug("ignoring duplicate message %s", messageId);
+    if (!this._session.recentIncomingMsgIds.add(messageId)) {
+      this.log.debug("ignoring duplicate or too old message %s", messageId);
       return;
     }
     const message = message_;
     this.log.debug("received %s (msg_id: %l)", message._, messageId);
-    this._session.recentIncomingMsgIds.add(messageId);
     switch (message._) {
       case "mt_msgs_ack":
       case "mt_http_wait":
@@ -462,6 +479,16 @@ class SessionConnection extends PersistentConnection {
       case "mt_destroy_session_none":
         this.log.debug("received %s (msg_id = %l): %j", message._, messageId, message);
         break;
+      case "mt_destroy_auth_key_ok":
+      case "mt_destroy_auth_key_none":
+        this.log.info("auth key destroyed: %s", message._);
+        this._needDestroyAuthKey = false;
+        this._sentDestroyAuthKey = false;
+        break;
+      case "mt_destroy_auth_key_fail":
+        this.log.warn("auth key destruction failed");
+        this._sentDestroyAuthKey = false;
+        break;
       default:
         if (isAnyUpdates(message)) {
           if (this._usable && this.params.inactivityTimeout) {
@@ -784,6 +811,7 @@ class SessionConnection extends PersistentConnection {
     }
     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());
   }
   _onBadServerSalt(msg) {
     this._salts.currentSalt = msg.newServerSalt;
@@ -791,8 +819,19 @@ class SessionConnection extends PersistentConnection {
   }
   _onBadMsgNotification(msgId, msg) {
     switch (msg.errorCode) {
+      case 17: {
+        const serverTime = msgId.high >>> 0;
+        const timeOffset = serverTime - Math.floor(performance.now() / 1e3);
+        this._session.updateTimeOffset(timeOffset, true);
+        this.log.warn(
+          "msg_id too high, server time: %d, corrected offset to %d, resetting session",
+          serverTime,
+          timeOffset
+        );
+        this._resetSession("msg_id too high");
+        break;
+      }
       case 16:
-      case 17:
       case 20: {
         if (msg.errorCode !== 20) {
           const serverTime = msgId.high >>> 0;
@@ -1113,6 +1152,41 @@ class SessionConnection extends PersistentConnection {
     }
     this._onMessageFailed(msgId, "timeout");
   };
+  // https://github.com/tdlib/td/blob/master/td/mtproto/SessionConnection.h
+  _rtt() {
+    const rtt = this._session.lastPingRtt;
+    if (Number.isNaN(rtt)) return 2e3;
+    return Math.max(2e3, rtt * 1.5 + 1e3);
+  }
+  _readDisconnectDelay() {
+    return this._active ? this._rtt() * 3.5 : 135e3 + this._randomDelay;
+  }
+  _pingDisconnectDelay() {
+    return this._active && this.params.isMainConnection ? this._rtt() * 2.5 : 135e3 + this._randomDelay;
+  }
+  _pingMustDelay() {
+    return this._active ? this._rtt() : this._pingInterval + this._randomDelay;
+  }
+  _isActive() {
+    if (this._session.queuedRpc.length > 0) return true;
+    for (const msg of this._session.pendingMessages.values()) {
+      if (msg._ === "rpc") return true;
+    }
+    return false;
+  }
+  _checkTimeouts(now) {
+    if (!this._session.lastPingMsgId.isZero() && now - this._session.lastPingTime > this._pingDisconnectDelay()) {
+      this.log.warn("ping timeout, no pong for %dms", Math.round(now - this._session.lastPingTime));
+      this._resetSession("ping timeout");
+      return true;
+    }
+    if (now - this._session.lastActivityTime > this._readDisconnectDelay()) {
+      this.log.warn("read timeout, last read was %dms ago", Math.round(now - this._session.lastActivityTime));
+      this._resetSession("read timeout");
+      return true;
+    }
+    return false;
+  }
   _flush() {
     if (this._disconnectedManually || !this._session._authKey.ready || this._isPfsBindingPending) {
       this.log.debug(
@@ -1123,6 +1197,14 @@ class SessionConnection extends PersistentConnection {
       );
       return;
     }
+    const now = performance.now();
+    const active = this._online && this._isActive();
+    if (active && !this._active) {
+      this._session.lastActivityTime = now;
+      this._session.resetLastPing(true);
+    }
+    this._active = active;
+    if (this._checkTimeouts(now)) return;
     try {
       this._doFlush();
     } catch (e) {
@@ -1133,9 +1215,11 @@ class SessionConnection extends PersistentConnection {
     if (this._session.hasPendingMessages) {
       this._flushTimer.emitWhenIdle();
     } else {
-      const nextPingTime = this._session.lastPingTime + this._pingInterval;
+      const nextPingTime = this._session.lastPingMsgId.isZero() ? this._session.lastPingTime + this._pingMustDelay() : Infinity;
       const nextGetScheduleTime = this._session.getStateSchedule.raw[0]?.getState || Infinity;
-      this._flushTimer.emitBefore(Math.min(nextPingTime, nextGetScheduleTime));
+      const readDeadline = this._session.lastActivityTime + this._readDisconnectDelay();
+      const pingDeadline = this._session.lastPingMsgId.isZero() ? Infinity : this._session.lastPingTime + this._pingDisconnectDelay();
+      this._flushTimer.emitBefore(Math.min(nextPingTime, nextGetScheduleTime, readDeadline, pingDeadline));
     }
   }
   _doFlush() {
@@ -1159,6 +1243,7 @@ class SessionConnection extends PersistentConnection {
     let resendMsgIds = null;
     let cancelRpcs = null;
     let destroySessions = null;
+    let destroyAuthKey = false;
     let rootMsgId = null;
     const now = performance.now();
     if (this._session.queuedAcks.length) {
@@ -1178,20 +1263,12 @@ class SessionConnection extends PersistentConnection {
       packetSize += ackRequest.length + 16;
       messageCount += 1;
     }
-    if (now - this._session.lastPingTime > this._pingInterval) {
-      if (!this._session.lastPingMsgId.isZero()) {
-        this.log.warn("didn't receive pong for previous ping (msg_id = %l). are we offline?", this._session.lastPingMsgId);
-        if (!this._disconnectedManually) {
-          this._resetSession("ping timeout");
-        }
-        return;
-      }
+    if (this._session.lastPingMsgId.isZero() && now - this._session.lastPingTime > this._pingMustDelay()) {
       pingId = randomLong();
       const obj = {
         _: "mt_ping_delay_disconnect",
         pingId,
-        // ÷ 1000 * 1.25
-        disconnectDelay: Math.round(this._pingInterval * 125e-5)
+        disconnectDelay: Math.round(this._pingDisconnectDelay() / 1e3) + 2
       };
       this._session.lastPingTime = now;
       pingRequest = TlBinaryWriter.serializeObject(this._writerMap, obj);
@@ -1253,6 +1330,11 @@ class SessionConnection extends PersistentConnection {
       destroySessions = this._queuedDestroySession;
       this._queuedDestroySession = [];
     }
+    if (this._needDestroyAuthKey && !this._sentDestroyAuthKey) {
+      destroyAuthKey = true;
+      containerMessageCount += 1;
+      containerSize += 20;
+    }
     if (this._salts.shouldFetchSalts()) {
       const obj = {
         _: "mt_get_future_salts",
@@ -1363,6 +1445,10 @@ class SessionConnection extends PersistentConnection {
         otherPendings.push(pending);
       });
     }
+    if (destroyAuthKey) {
+      this._registerOutgoingMsgId(this._session.writeMessage(writer, { _: "mt_destroy_auth_key" }));
+      this._sentDestroyAuthKey = true;
+    }
     if (getFutureSaltsRequest) {
       getFutureSaltsMsgId = this._registerOutgoingMsgId(this._session.writeMessage(writer, getFutureSaltsRequest));
       const pending = {

package/package.json

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