From ce2d1b0a9a3a9a065e2f83b3a572c94abaa7be5c Mon Sep 17 00:00:00 2001
From: Alina Sireneva <alina@tei.su>
Date: Mon, 11 Dec 2023 01:03:19 +0300
Subject: [PATCH] fix(core): getState requests not scheduling properly

---
 packages/core/src/network/session-connection.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/network/session-connection.ts b/packages/core/src/network/session-connection.ts
index eadf12a3..d8aa2b6a 100644
--- a/packages/core/src/network/session-connection.ts
+++ b/packages/core/src/network/session-connection.ts
@@ -41,6 +41,7 @@ export interface SessionConnectionParams extends PersistentConnectionParams {
 
 const TEMP_AUTH_KEY_EXPIRY = 86400 // 24 hours
 const PING_INTERVAL = 60000 // 1 minute
+const GET_STATE_INTERVAL = 1500 // 1.5 seconds
 
 // destroy_auth_key#d1435160 = DestroyAuthKeyRes;
 // const DESTROY_AUTH_KEY = Buffer.from('605134d1', 'hex')
@@ -1163,7 +1164,7 @@ export class SessionConnection extends PersistentConnection {
                 case 2:
                 case 3:
                     // message wasn't received by the server
-                    this._onMessageFailed(msgId, `message info state ${status}`)
+                    return this._onMessageFailed(msgId, `message info state ${status}`)
                     break
 
                 case 0:
@@ -1192,6 +1193,12 @@ export class SessionConnection extends PersistentConnection {
             return
         }
 
+        if (answerMsgId.isZero()) {
+            this.log.debug('received message info for %l: message is still pending (status = %d)', msgId, status)
+
+            return
+        }
+
         this.log.debug('received message info for %l, and answer (%l) was already received', msgId, answerMsgId)
     }
 
@@ -1474,7 +1481,10 @@ export class SessionConnection extends PersistentConnection {
             // between multiple connections using the same session
             this._flushTimer.emitWhenIdle()
         } else {
-            this._flushTimer.emitBefore(this._session.lastPingTime + PING_INTERVAL)
+            const nextPingTime = this._session.lastPingTime + PING_INTERVAL
+            const nextGetScheduleTime = this._session.getStateSchedule.raw[0]?.getState || Infinity
+
+            this._flushTimer.emitBefore(Math.min(nextPingTime, nextGetScheduleTime))
         }
     }
 
@@ -1533,7 +1543,7 @@ export class SessionConnection extends PersistentConnection {
             messageCount += 1
         }
 
-        const getStateTime = now + 1500
+        const getStateTime = now + GET_STATE_INTERVAL
 
         if (now - this._session.lastPingTime > PING_INTERVAL) {
             if (!this._session.lastPingMsgId.isZero()) {