Prevent redundant connection attempts

src/main/network/RuntimeComms.ts

@@ -128,10 +128,6 @@ export default class RuntimeComms {
    */
   disconnect() {
     this.#tcpDisconnected = true; // Don't reconnect
-    if (this.#pingInterval) {
-      clearInterval(this.#pingInterval);
-      this.#pingInterval = null;
-    }
     this.#disconnectTcp();
   }
 
@@ -153,6 +149,7 @@ export default class RuntimeComms {
     } catch {
       return false;
     }
+    this.#disconnectTcp();
     this.#connectTcp(); // Reconnect TCP
     return true;
   }
@@ -220,6 +217,9 @@ export default class RuntimeComms {
    * most recently known Runtime IP and port.
    */
   #connectTcp() {
+    if (this.#tcpSock && (this.#tcpSock.connecting || !this.#tcpSock.pending)) {
+      return; // Already trying to connect
+    }
     this.#tcpDisconnected = false;
     this.#disconnectTcp();
     const tcpStream = new PacketStream().on(
@@ -248,6 +248,10 @@ export default class RuntimeComms {
       this.#tcpSock.resetAndDestroy();
       this.#tcpSock = null;
     }
+    if (this.#pingInterval) {
+      clearInterval(this.#pingInterval);
+      this.#pingInterval = null;
+    }
   }
 
   /**
@@ -335,6 +339,7 @@ export default class RuntimeComms {
    */
   #handleTcpClose() {
     this.#commsListener.onRuntimeDisconnect();
+    this.#disconnectTcp();
     if (!this.#tcpDisconnected) {
       setTimeout(this.#connectTcp.bind(this), TCP_RECONNECT_DELAY);
     }