Reset session state on disconnect

MTKruto · Jun 19, 2024 · a182113 · a182113
1 parent 1776e63
commit a182113
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/client/1_client_encrypted.ts b/client/1_client_encrypted.ts
@@ -20,7 +20,7 @@
 
 import { gunzip, unreachable } from "../0_deps.ts";
 import { ConnectionError } from "../0_errors.ts";
-import { bigIntFromBuffer, CacheMap, drop, getLogger, getRandomBigInt, Logger, sha1 } from "../1_utilities.ts";
+import { bigIntFromBuffer, CacheMap, drop, getLogger, getRandomId, Logger, sha1 } from "../1_utilities.ts";
 import { Api, is, isOfEnum, message, ReadObject, TLError, TLReader } from "../2_tl.ts";
 import { constructTelegramError } from "../4_errors.ts";
 import { ClientAbstract } from "./0_client_abstract.ts";
@@ -53,7 +53,7 @@ export interface Handlers {
 export class ClientEncrypted extends ClientAbstract {
   #authKey = new Uint8Array();
   #authKeyId = 0n;
-  #sessionId = getRandomBigInt(8, true, false);
+  #sessionId = getRandomId();
   #state = { serverSalt: 0n, seqNo: 0, messageId: 0n };
   #toAcknowledge = new Set<bigint>();
   #recentAcks = new CacheMap<bigint, { container?: bigint; message: message }>(20);
@@ -80,6 +80,12 @@ export class ClientEncrypted extends ClientAbstract {
     drop(this.#receiveLoop()); // TODO: ability to join this promise
   }
 
+  resetState() {
+    this.#state = { serverSalt: 0n, seqNo: 0, messageId: 0n };
+    this.#toAcknowledge.clear();
+    this.#recentAcks.clear();
+  }
+
   async setAuthKey(key: Uint8Array) {
     const hash = await sha1(key);
     this.#authKeyId = bigIntFromBuffer(hash.slice(-8), true, false);

diff --git a/client/5_client.ts b/client/5_client.ts
@@ -973,6 +973,9 @@ export class Client<C extends Context = Context> extends Composer<C> {
 
   #lastPropagatedConnectionState: ConnectionState | null = null;
   #stateChangeHandler: (connected: boolean) => void = ((connected: boolean) => {
+    if (!connected) {
+      this.#client.resetState();
+    }
     const connectionState = connected ? "ready" : "notConnected";
     if (this.#lastPropagatedConnectionState != connectionState) {
       this.#propagateConnectionState(connectionState);

diff --git a/connection/1_connection_tcp.node.ts b/connection/1_connection_tcp.node.ts
@@ -1,6 +1,6 @@
 import { Socket } from "node:net";
-import { Mutex } from "../1_utilities.ts";
 import { ConnectionError } from "../0_errors.ts";
+import { Mutex } from "../1_utilities.ts";
 import { Connection } from "./0_connection.ts";
 
 const errConnectionNotOpen = new ConnectionError("Connection not open");