@mtcute/core 0.31.0 → 0.32.0

package/highlevel/types/updates/ephemeral-callback-query.js

@@ -17,9 +17,17 @@ class EphemeralCallbackQuery {
   get user() {
     return new User$2(this._peers.user(this.raw.userId));
   }
-  /** Chat where the originating ephemeral message was sent */
+  /**
+   * Chat where the originating ephemeral message was sent.
+   *
+   * `null` if not available (see {@link chatInstance})
+   */
   get chat() {
-    return parsePeer(this.raw.peer, this._peers);
+    return this.raw.peer ? parsePeer(this.raw.peer, this._peers) : null;
+  }
+  /** Identifier uniquely corresponding to the chat the message was sent to, if any */
+  get chatInstance() {
+    return this.raw.chatInstance ?? null;
   }
   /** Identifier of the ephemeral message containing the button which was clicked */
   get messageId() {

package/highlevel/types/updates/user-typing-update.cjs

@@ -102,10 +102,28 @@ class UserTypingUpdate {
         return "interaction";
       case "sendMessageEmojiInteractionSeen":
         return "interaction_seen";
+      case "sendMessageStopDraftAction":
+        return "stop_draft";
       default:
         utils.assertNever(this.raw.action);
     }
   }
+  /**
+   * ID of the draft this update is related to, if any
+   * (i.e. the status is `typing` for a draft action, or `stop_draft`)
+   */
+  get draftId() {
+    const action = this.raw.action;
+    return "randomId" in action ? action.randomId : null;
+  }
+  /** Whether the ongoing draft streaming may be stopped by the user */
+  get canStopDraft() {
+    return "canStop" in this.raw.action ? this.raw.action.canStop : false;
+  }
+  /** Whether the draft should be kept once the user stops the streaming */
+  get keepDraftOnStop() {
+    return "keepOnStop" in this.raw.action ? this.raw.action.keepOnStop : false;
+  }
 }
 const UserTypingUpdate$1 = /* @__PURE__ */ inspectable.makeInspectable(UserTypingUpdate);
 exports.UserTypingUpdate = UserTypingUpdate$1;

package/highlevel/types/updates/user-typing-update.d.cts

@@ -30,4 +30,13 @@ export declare class UserTypingUpdate {
      * Current typing status
      */
     get status(): TypingStatus;
+    /**
+     * ID of the draft this update is related to, if any
+     * (i.e. the status is `typing` for a draft action, or `stop_draft`)
+     */
+    get draftId(): tl.Long | null;
+    /** Whether the ongoing draft streaming may be stopped by the user */
+    get canStopDraft(): boolean;
+    /** Whether the draft should be kept once the user stops the streaming */
+    get keepDraftOnStop(): boolean;
 }

package/highlevel/types/updates/user-typing-update.d.ts

@@ -30,4 +30,13 @@ export declare class UserTypingUpdate {
      * Current typing status
      */
     get status(): TypingStatus;
+    /**
+     * ID of the draft this update is related to, if any
+     * (i.e. the status is `typing` for a draft action, or `stop_draft`)
+     */
+    get draftId(): tl.Long | null;
+    /** Whether the ongoing draft streaming may be stopped by the user */
+    get canStopDraft(): boolean;
+    /** Whether the draft should be kept once the user stops the streaming */
+    get keepDraftOnStop(): boolean;
 }

package/highlevel/types/updates/user-typing-update.js

@@ -95,10 +95,28 @@ class UserTypingUpdate {
         return "interaction";
       case "sendMessageEmojiInteractionSeen":
         return "interaction_seen";
+      case "sendMessageStopDraftAction":
+        return "stop_draft";
       default:
         assertNever(this.raw.action);
     }
   }
+  /**
+   * ID of the draft this update is related to, if any
+   * (i.e. the status is `typing` for a draft action, or `stop_draft`)
+   */
+  get draftId() {
+    const action = this.raw.action;
+    return "randomId" in action ? action.randomId : null;
+  }
+  /** Whether the ongoing draft streaming may be stopped by the user */
+  get canStopDraft() {
+    return "canStop" in this.raw.action ? this.raw.action.canStop : false;
+  }
+  /** Whether the draft should be kept once the user stops the streaming */
+  get keepDraftOnStop() {
+    return "keepOnStop" in this.raw.action ? this.raw.action.keepOnStop : false;
+  }
 }
 const UserTypingUpdate$1 = /* @__PURE__ */ makeInspectable(UserTypingUpdate);
 export {

package/highlevel/updates/manager.cjs

@@ -480,6 +480,24 @@ class UpdatesManager {
       index.set(bare, cached);
       return true;
     }
+    async function fetchEntitiesPeers(entities) {
+      if (!entities) return true;
+      for (const ent of entities) {
+        if (ent._ === "messageEntityMentionName" && !await fetchPeer(ent.userId)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    async function fetchRichMessagePeers(richMessage) {
+      if (!richMessage) return true;
+      const richMessagePeers = /* @__PURE__ */ new Set();
+      collectRichMessagePeerIds(richMessage, richMessagePeers);
+      for (const peer of richMessagePeers) {
+        if (!await fetchPeer(peer)) return false;
+      }
+      return true;
+    }
     switch (upd._) {
       case "updateNewMessage":
       case "updateNewChannelMessage":
@@ -503,20 +521,8 @@ class UpdatesManager {
           }
           if (!await fetchPeer(msg.viaBotId)) return missing;
           if (!await fetchPeer(msg.guestchatViaFrom)) return missing;
-          if (msg.entities) {
-            for (const ent of msg.entities) {
-              if (ent._ === "messageEntityMentionName") {
-                if (!await fetchPeer(ent.userId)) return missing;
-              }
-            }
-          }
-          if (msg.richMessage) {
-            const richMessagePeers = /* @__PURE__ */ new Set();
-            collectRichMessagePeerIds(msg.richMessage, richMessagePeers);
-            for (const peer of richMessagePeers) {
-              if (!await fetchPeer(peer)) return missing;
-            }
-          }
+          if (!await fetchEntitiesPeers(msg.entities)) return missing;
+          if (!await fetchRichMessagePeers(msg.richMessage)) return missing;
           if (msg.media) {
             switch (msg.media._) {
               case "messageMediaContact":
@@ -554,6 +560,22 @@ class UpdatesManager {
               if (!await fetchPeer(msg.action.fromId)) return missing;
               if (!await fetchPeer(msg.action.toId)) return missing;
               break;
+            case "messageActionChatJoinedViaCommunity":
+              if (!await fetchPeer(peerUtils.toggleChannelIdMark(msg.action.communityId), true)) {
+                return missing;
+              }
+              break;
+            case "messageActionChangeCommunity":
+              if (msg.action.communityId !== void 0 && !await fetchPeer(peerUtils.toggleChannelIdMark(msg.action.communityId), true)) {
+                return missing;
+              }
+              break;
+            case "messageActionGiftPremium":
+            case "messageActionGiftCode":
+            case "messageActionStarGift":
+            case "messageActionStarGiftUnique":
+              if (!await fetchEntitiesPeers(msg.action.message?.entities)) return missing;
+              break;
           }
         }
         break;
@@ -564,6 +586,8 @@ class UpdatesManager {
         if (!await fetchPeer(msg.peerId, true)) return missing;
         if (!await fetchPeer(msg.fromId)) return missing;
         if (!await fetchPeer(msg.receiverId)) return missing;
+        if (!await fetchEntitiesPeers(msg.entities)) return missing;
+        if (!await fetchRichMessagePeers(msg.richMessage)) return missing;
         break;
       }
       case "updateEphemeralBotCallbackQuery":
@@ -571,20 +595,8 @@ class UpdatesManager {
         if (!await fetchPeer(upd.userId)) return missing;
         break;
       case "updateDraftMessage":
-        if ("entities" in upd.draft && upd.draft.entities) {
-          for (const ent of upd.draft.entities) {
-            if (ent._ === "messageEntityMentionName") {
-              if (!await fetchPeer(ent.userId)) return missing;
-            }
-          }
-        }
-        if ("richMessage" in upd.draft && upd.draft.richMessage) {
-          const richMessagePeers = /* @__PURE__ */ new Set();
-          collectRichMessagePeerIds(upd.draft.richMessage, richMessagePeers);
-          for (const peer of richMessagePeers) {
-            if (!await fetchPeer(peer)) return missing;
-          }
-        }
+        if ("entities" in upd.draft && !await fetchEntitiesPeers(upd.draft.entities)) return missing;
+        if ("richMessage" in upd.draft && !await fetchRichMessagePeers(upd.draft.richMessage)) return missing;
     }
     return missing;
   }

package/highlevel/updates/manager.js

@@ -473,6 +473,24 @@ class UpdatesManager {
       index.set(bare, cached);
       return true;
     }
+    async function fetchEntitiesPeers(entities) {
+      if (!entities) return true;
+      for (const ent of entities) {
+        if (ent._ === "messageEntityMentionName" && !await fetchPeer(ent.userId)) {
+          return false;
+        }
+      }
+      return true;
+    }
+    async function fetchRichMessagePeers(richMessage) {
+      if (!richMessage) return true;
+      const richMessagePeers = /* @__PURE__ */ new Set();
+      collectRichMessagePeerIds(richMessage, richMessagePeers);
+      for (const peer of richMessagePeers) {
+        if (!await fetchPeer(peer)) return false;
+      }
+      return true;
+    }
     switch (upd._) {
       case "updateNewMessage":
       case "updateNewChannelMessage":
@@ -496,20 +514,8 @@ class UpdatesManager {
           }
           if (!await fetchPeer(msg.viaBotId)) return missing;
           if (!await fetchPeer(msg.guestchatViaFrom)) return missing;
-          if (msg.entities) {
-            for (const ent of msg.entities) {
-              if (ent._ === "messageEntityMentionName") {
-                if (!await fetchPeer(ent.userId)) return missing;
-              }
-            }
-          }
-          if (msg.richMessage) {
-            const richMessagePeers = /* @__PURE__ */ new Set();
-            collectRichMessagePeerIds(msg.richMessage, richMessagePeers);
-            for (const peer of richMessagePeers) {
-              if (!await fetchPeer(peer)) return missing;
-            }
-          }
+          if (!await fetchEntitiesPeers(msg.entities)) return missing;
+          if (!await fetchRichMessagePeers(msg.richMessage)) return missing;
           if (msg.media) {
             switch (msg.media._) {
               case "messageMediaContact":
@@ -547,6 +553,22 @@ class UpdatesManager {
               if (!await fetchPeer(msg.action.fromId)) return missing;
               if (!await fetchPeer(msg.action.toId)) return missing;
               break;
+            case "messageActionChatJoinedViaCommunity":
+              if (!await fetchPeer(toggleChannelIdMark(msg.action.communityId), true)) {
+                return missing;
+              }
+              break;
+            case "messageActionChangeCommunity":
+              if (msg.action.communityId !== void 0 && !await fetchPeer(toggleChannelIdMark(msg.action.communityId), true)) {
+                return missing;
+              }
+              break;
+            case "messageActionGiftPremium":
+            case "messageActionGiftCode":
+            case "messageActionStarGift":
+            case "messageActionStarGiftUnique":
+              if (!await fetchEntitiesPeers(msg.action.message?.entities)) return missing;
+              break;
           }
         }
         break;
@@ -557,6 +579,8 @@ class UpdatesManager {
         if (!await fetchPeer(msg.peerId, true)) return missing;
         if (!await fetchPeer(msg.fromId)) return missing;
         if (!await fetchPeer(msg.receiverId)) return missing;
+        if (!await fetchEntitiesPeers(msg.entities)) return missing;
+        if (!await fetchRichMessagePeers(msg.richMessage)) return missing;
         break;
       }
       case "updateEphemeralBotCallbackQuery":
@@ -564,20 +588,8 @@ class UpdatesManager {
         if (!await fetchPeer(upd.userId)) return missing;
         break;
       case "updateDraftMessage":
-        if ("entities" in upd.draft && upd.draft.entities) {
-          for (const ent of upd.draft.entities) {
-            if (ent._ === "messageEntityMentionName") {
-              if (!await fetchPeer(ent.userId)) return missing;
-            }
-          }
-        }
-        if ("richMessage" in upd.draft && upd.draft.richMessage) {
-          const richMessagePeers = /* @__PURE__ */ new Set();
-          collectRichMessagePeerIds(upd.draft.richMessage, richMessagePeers);
-          for (const peer of richMessagePeers) {
-            if (!await fetchPeer(peer)) return missing;
-          }
-        }
+        if ("entities" in upd.draft && !await fetchEntitiesPeers(upd.draft.entities)) return missing;
+        if ("richMessage" in upd.draft && !await fetchRichMessagePeers(upd.draft.richMessage)) return missing;
     }
     return missing;
   }

package/highlevel/utils/walk-page-blocks.cjs

@@ -39,6 +39,7 @@ function walkRichText(text, visitor) {
     case "textBankCard":
     case "textDate":
     case "textMentionName":
+    case "textButton":
       walkRichText(text.text, visitor);
       break;
     case "textConcat":
@@ -125,6 +126,7 @@ function walkPageBlock(block, visitor) {
     case "pageBlockAudio":
     case "pageBlockMap":
     case "inputPageBlockMap":
+    case "pageBlockDocument":
       walkPageCaption(block.caption, visitor);
       break;
     case "pageBlockCover":
@@ -141,6 +143,9 @@ function walkPageBlock(block, visitor) {
       break;
     case "pageBlockChannel":
       break;
+    case "pageBlockButtonRow":
+      for (const button of block.buttons) walkRichText(button.text, visitor);
+      break;
     case "pageBlockTable":
       walkRichText(block.title, visitor);
       for (const row of block.rows) {

package/highlevel/utils/walk-page-blocks.js

@@ -32,6 +32,7 @@ function walkRichText(text, visitor) {
     case "textBankCard":
     case "textDate":
     case "textMentionName":
+    case "textButton":
       walkRichText(text.text, visitor);
       break;
     case "textConcat":
@@ -118,6 +119,7 @@ function walkPageBlock(block, visitor) {
     case "pageBlockAudio":
     case "pageBlockMap":
     case "inputPageBlockMap":
+    case "pageBlockDocument":
       walkPageCaption(block.caption, visitor);
       break;
     case "pageBlockCover":
@@ -134,6 +136,9 @@ function walkPageBlock(block, visitor) {
       break;
     case "pageBlockChannel":
       break;
+    case "pageBlockButtonRow":
+      for (const button of block.buttons) walkRichText(button.text, visitor);
+      break;
     case "pageBlockTable":
       walkRichText(block.title, visitor);
       for (const row of block.rows) {

package/methods.cjs

@@ -112,9 +112,12 @@ const getPeerDialogs = require("./highlevel/methods/dialogs/get-peer-dialogs.cjs
 const iterDialogs = require("./highlevel/methods/dialogs/iter-dialogs.cjs");
 const joinChatlist = require("./highlevel/methods/dialogs/join-chatlist.cjs");
 const setFoldersOrder = require("./highlevel/methods/dialogs/set-folders-order.cjs");
+const deleteAllWelcomeMessages = require("./highlevel/methods/ephemeral/delete-all-welcome-messages.cjs");
 const deleteEphemeralMessage = require("./highlevel/methods/ephemeral/delete-ephemeral-message.cjs");
+const deleteWelcomeMessage = require("./highlevel/methods/ephemeral/delete-welcome-message.cjs");
 const editEphemeralMessage = require("./highlevel/methods/ephemeral/edit-ephemeral-message.cjs");
 const getEphemeralCallbackAnswer = require("./highlevel/methods/ephemeral/get-ephemeral-callback-answer.cjs");
+const getWelcomeMessages = require("./highlevel/methods/ephemeral/get-welcome-messages.cjs");
 const sendEphemeralMessage = require("./highlevel/methods/ephemeral/send-ephemeral-message.cjs");
 const downloadBuffer = require("./highlevel/methods/files/download-buffer.cjs");
 const downloadChunk = require("./highlevel/methods/files/download-chunk.cjs");
@@ -415,9 +418,12 @@ exports.getPeerDialogs = getPeerDialogs.getPeerDialogs;
 exports.iterDialogs = iterDialogs.iterDialogs;
 exports.joinChatlist = joinChatlist.joinChatlist;
 exports.setFoldersOrder = setFoldersOrder.setFoldersOrder;
+exports.deleteAllWelcomeMessages = deleteAllWelcomeMessages.deleteAllWelcomeMessages;
 exports.deleteEphemeralMessage = deleteEphemeralMessage.deleteEphemeralMessage;
+exports.deleteWelcomeMessage = deleteWelcomeMessage.deleteWelcomeMessage;
 exports.editEphemeralMessage = editEphemeralMessage.editEphemeralMessage;
 exports.getEphemeralCallbackAnswer = getEphemeralCallbackAnswer.getEphemeralCallbackAnswer;
+exports.getWelcomeMessages = getWelcomeMessages.getWelcomeMessages;
 exports.sendEphemeralMessage = sendEphemeralMessage.sendEphemeralMessage;
 exports.downloadAsBuffer = downloadBuffer.downloadAsBuffer;
 exports.downloadChunk = downloadChunk.downloadChunk;

package/methods.js

@@ -105,9 +105,12 @@ import { getPeerDialogs } from "./highlevel/methods/dialogs/get-peer-dialogs.js"
 import { iterDialogs } from "./highlevel/methods/dialogs/iter-dialogs.js";
 import { joinChatlist } from "./highlevel/methods/dialogs/join-chatlist.js";
 import { setFoldersOrder } from "./highlevel/methods/dialogs/set-folders-order.js";
+import { deleteAllWelcomeMessages } from "./highlevel/methods/ephemeral/delete-all-welcome-messages.js";
 import { deleteEphemeralMessage } from "./highlevel/methods/ephemeral/delete-ephemeral-message.js";
+import { deleteWelcomeMessage } from "./highlevel/methods/ephemeral/delete-welcome-message.js";
 import { editEphemeralMessage } from "./highlevel/methods/ephemeral/edit-ephemeral-message.js";
 import { getEphemeralCallbackAnswer } from "./highlevel/methods/ephemeral/get-ephemeral-callback-answer.js";
+import { getWelcomeMessages } from "./highlevel/methods/ephemeral/get-welcome-messages.js";
 import { sendEphemeralMessage } from "./highlevel/methods/ephemeral/send-ephemeral-message.js";
 import { downloadAsBuffer } from "./highlevel/methods/files/download-buffer.js";
 import { downloadChunk } from "./highlevel/methods/files/download-chunk.js";
@@ -340,6 +343,7 @@ export {
   createStickerSet,
   createStreamingDraft,
   createSupergroup,
+  deleteAllWelcomeMessages,
   deleteBusinessChatLink,
   deleteChannel,
   deleteChatPhoto,
@@ -357,6 +361,7 @@ export {
   deleteStickerFromSet,
   deleteStories,
   deleteUserHistory,
+  deleteWelcomeMessage,
   downloadAsBuffer,
   downloadAsIterable,
   downloadAsStream,
@@ -466,6 +471,7 @@ export {
   getUser,
   getUsers,
   getWebPagePreview,
+  getWelcomeMessages,
   hideAllCommunityLinkRequests,
   hideAllJoinRequests,
   hideCommunityLinkRequest,

package/network/mtproto-session.cjs

@@ -201,13 +201,20 @@ class MtprotoSession {
     else writer.object(content);
     return messageId;
   }
-  resetLastPing(withTime = false) {
+  resetLastPing(withTime = false, keepPending = false) {
     if (withTime) this.lastPingTime = 0;
-    if (!this.lastPingMsgId.isZero()) {
+    if (!keepPending && !this.lastPingMsgId.isZero()) {
       this.pendingMessages.delete(this.lastPingMsgId);
     }
     this.lastPingMsgId = Long.ZERO;
   }
+  forgetPendingPings() {
+    for (const [msgId, info] of this.pendingMessages) {
+      if (info._ === "ping") this.pendingMessages.delete(msgId);
+    }
+    this.lastPingTime = 0;
+    this.lastPingMsgId = Long.ZERO;
+  }
   addToChain(chainId, msgId) {
     const prevMsgId = this.chains.get(chainId);
     this.chains.set(chainId, msgId);

package/network/mtproto-session.d.cts

@@ -43,6 +43,7 @@ export type PendingMessage = {
 } | {
     _: 'ping';
     pingId: Long;
+    sentAt: number;
     containerId: Long;
 } | {
     _: 'destroy_session';
@@ -120,7 +121,8 @@ export declare class MtprotoSession {
     /** Decrypt a single MTProto message using session's keys */
     decryptMessage(data: Uint8Array, callback: Parameters<AuthKey['decryptMessage']>[2]): void;
     writeMessage(writer: TlBinaryWriter, content: tl.TlObject | mtp.TlObject | Uint8Array, isContentRelated?: boolean): Long;
-    resetLastPing(withTime?: boolean): void;
+    resetLastPing(withTime?: boolean, keepPending?: boolean): void;
+    forgetPendingPings(): void;
     addToChain(chainId: string | number, msgId: Long): Long | undefined;
     removeFromChain(chainId: string | number, msgId: Long): void;
     getPendingChainedFails(chainId: string | number): SortedArray<PendingRpc>;

package/network/mtproto-session.d.ts

@@ -43,6 +43,7 @@ export type PendingMessage = {
 } | {
     _: 'ping';
     pingId: Long;
+    sentAt: number;
     containerId: Long;
 } | {
     _: 'destroy_session';
@@ -120,7 +121,8 @@ export declare class MtprotoSession {
     /** Decrypt a single MTProto message using session's keys */
     decryptMessage(data: Uint8Array, callback: Parameters<AuthKey['decryptMessage']>[2]): void;
     writeMessage(writer: TlBinaryWriter, content: tl.TlObject | mtp.TlObject | Uint8Array, isContentRelated?: boolean): Long;
-    resetLastPing(withTime?: boolean): void;
+    resetLastPing(withTime?: boolean, keepPending?: boolean): void;
+    forgetPendingPings(): void;
     addToChain(chainId: string | number, msgId: Long): Long | undefined;
     removeFromChain(chainId: string | number, msgId: Long): void;
     getPendingChainedFails(chainId: string | number): SortedArray<PendingRpc>;

package/network/mtproto-session.js

@@ -194,13 +194,20 @@ class MtprotoSession {
     else writer.object(content);
     return messageId;
   }
-  resetLastPing(withTime = false) {
+  resetLastPing(withTime = false, keepPending = false) {
     if (withTime) this.lastPingTime = 0;
-    if (!this.lastPingMsgId.isZero()) {
+    if (!keepPending && !this.lastPingMsgId.isZero()) {
       this.pendingMessages.delete(this.lastPingMsgId);
     }
     this.lastPingMsgId = Long.ZERO;
   }
+  forgetPendingPings() {
+    for (const [msgId, info] of this.pendingMessages) {
+      if (info._ === "ping") this.pendingMessages.delete(msgId);
+    }
+    this.lastPingTime = 0;
+    this.lastPingMsgId = Long.ZERO;
+  }
   addToChain(chainId, msgId) {
     const prevMsgId = this.chains.get(chainId);
     this.chains.set(chainId, msgId);

package/network/network-manager.cjs

@@ -227,7 +227,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.31.0",
+      appVersion: "0.32.0",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/network-manager.js

@@ -220,7 +220,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.31.0",
+      appVersion: "0.32.0",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

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;
@@ -1211,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;
@@ -1393,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;
@@ -1204,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;
@@ -1386,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 {};