Ensure cancel reconnection timeout when reconnected and don't schedul…

…e more than one.
educates · May 9, 2022 · 55cc832 · 55cc832
1 parent b071d51
commit 55cc832
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/workshop-images/base-environment/opt/gateway/src/frontend/scripts/eduk8s.ts b/workshop-images/base-environment/opt/gateway/src/frontend/scripts/eduk8s.ts
@@ -100,6 +100,7 @@ class TerminalSession {
     private blocked: boolean
     private buffer: string[]
     private reconnecting: boolean
+    private reconnectTimer: any
     private shutdown: boolean
 
     constructor(context: string, id: string, element: HTMLElement, endpoint: string) {
@@ -205,6 +206,12 @@ class TerminalSession {
 
             console.log("Connection opened to terminal", this.id)
 
+            if (this.reconnectTimer) {
+                console.log("Clear reconnection timeout for terminal", this.id)
+                clearTimeout(this.reconnectTimer)
+                this.reconnectTimer = null
+            }
+
             if (socket !== this.socket) {
                 console.warn("Multiple connections to terminal", this.id)
                 socket.close()
@@ -514,6 +521,8 @@ class TerminalSession {
             setTimeout(connect, 100)
 
             function terminate() {
+                self.reconnectTimer = null
+
                 if (!self.reconnecting)
                     return
 
@@ -566,9 +575,9 @@ class TerminalSession {
             }
 
             if (!this.reconnecting) {
-                console.log("Schedule abandoning of terminal", self.id)
+                console.log("Trigger reconnection timeout for terminal", self.id)
 
-                setTimeout(terminate, 10000)
+                self.reconnectTimer = setTimeout(terminate, 10000)
 
                 this.reconnecting = true
             }
@@ -708,6 +717,8 @@ class TerminalSession {
         setTimeout(connect, 100)
 
         function terminate() {
+            self.reconnectTimer = null
+
             if (!self.reconnecting)
                 return
 
@@ -720,9 +731,9 @@ class TerminalSession {
         }
 
         if (!this.reconnecting) {
-            console.log("Schedule abandoning of terminal", self.id)
+            console.log("Trigger reconnection timeout for terminal", self.id)
 
-            setTimeout(terminate, 5000)
+            self.reconnectTimer = setTimeout(terminate, 5000)
 
             this.reconnecting = true
         }