2 files changed, 17 insertions, 14 deletions
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 1e921c18..93a471ff 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -143,9 +143,7 @@ export async function startContinuePythonServer() {
       console.log("Continue python server already running");
       return;
     }
-  } catch (e) {
-    console.log("Error checking for existing server", e);
-  }
+  } catch (e) {}
 
   let activateCmd = ". env/bin/activate";
   let pythonCmd = "python3";
@@ -162,6 +160,7 @@ export async function startContinuePythonServer() {
     // exec(command);
     let child = spawn(command, {
       shell: true,
+      detached: true,
     });
     child.stdout.on("data", (data: any) => {
       console.log(`stdout: ${data}`);
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 6c65415f..35eb668d 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -66,18 +66,22 @@ class IdeProtocolClient {
   }
 
   async isConnected() {
-    if (this._ws === null) {
-      this._ws = new WebSocket(this._serverUrl);
-    }
-    // On open, return a promise
-    if (this._ws!.readyState === WebSocket.OPEN) {
-      return;
-    }
-    return new Promise((resolve, reject) => {
-      this._ws!.onopen = () => {
-        resolve(null);
+    if (this._ws === null || this._ws.readyState !== WebSocket.OPEN) {
+      let ws = new WebSocket(this._serverUrl);
+      ws.onclose = () => {
+        this._ws = null;
       };
-    });
+      ws.on("message", (data: any) => {
+        this.handleMessage(JSON.parse(data));
+      });
+      this._ws = ws;
+
+      return new Promise((resolve, reject) => {
+        ws.addEventListener("open", () => {
+          resolve(null);
+        });
+      });
+    }
   }
 
   async startCore() {