teidesu/mtcute
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(core): cleanly close connection on inactivity timeout

Browse source
This commit is contained in:
alina 🌸 2023-12-08 06:31:17 +03:00
parent ce3cebff66
commit b6fac0785c
Signed by: teidesu
SSH key fingerprint: SHA256:uNeCpw6aTSU4aIObXLvHfLkDa82HWH9EiOj9AXOIRpI
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/core/src/network/session-connection.ts
View file

@ -1404,12 +1404,6 @@ export class SessionConnection extends PersistentConnection {
// we schedule it on the next tick, so we can load-balance // we schedule it on the next tick, so we can load-balance
// between multiple connections using the same session // between multiple connections using the same session
this._flushTimer.emitWhenIdle() this._flushTimer.emitWhenIdle()
} else if (this._inactivityPendingFlush) {
this.log.debug('pending messages sent, closing connection')
this._flushTimer.reset()
this._inactivityPendingFlush = false
super._onInactivityTimeout()
} else { } else {
this._flushTimer.emitBefore(this._session.lastPingTime + 60000) this._flushTimer.emitBefore(this._session.lastPingTime + 60000)
} }
@ -1792,7 +1786,7 @@ export class SessionConnection extends PersistentConnection {
) )
const enc = this._session.encryptMessage(result) const enc = this._session.encryptMessage(result)
this.send(enc).catch((err: Error) => { const promise = this.send(enc).catch((err: Error) => {
this.log.error('error while sending pending messages (root msg_id = %l): %s', rootMsgId, err.stack) this.log.error('error while sending pending messages (root msg_id = %l): %s', rootMsgId, err.stack)
// put acks in the front so they are the first to be sent // put acks in the front so they are the first to be sent
@ -1803,5 +1797,15 @@ export class SessionConnection extends PersistentConnection {
this._onMessageFailed(rootMsgId, 'unknown error') this._onMessageFailed(rootMsgId, 'unknown error')
} }
}) })
if (this._inactivityPendingFlush && !this._session.hasPendingMessages) {
void promise.then(() => {
this.log.debug('pending messages sent, closing connection')
this._flushTimer.reset()
this._inactivityPendingFlush = false
super._onInactivityTimeout()
})
}
} }
} }