Add reconnection logic

kylecarbs · kylecarbs · commit 639911b5b0f8 · 2023-01-03T22:59:05.000-06:00
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "description": "Open any workspace with a single click.",
   "repository": "https://github.com/coder/vscode-coder",
   "preview": true,
-  "version": "0.0.2",
+  "version": "0.0.3",
   "engines": {
     "vscode": "^1.73.0"
   },
diff --git a/src/remote.ts b/src/remote.ts
@@ -263,36 +263,67 @@ export class Remote {
     }
     const binPath = agent.operating_system === "windows" ? "code-server" : "$HOME/.vscode-remote/bin/code-server"
 
-    const remotePort = await new Promise<number>((resolve, reject) => {
-      const script =
-        binPath +
-        " serve-local --start-server --port 0 --without-connection-token --commit-id " +
-        this.vscodeCommit +
-        " --accept-server-license-terms"
-      this.ipc
-        ?.execute(shell, script, (data) => {
-          const lines = data.split("\n")
-          lines.forEach((line) => {
-            this.output.appendLine(line)
+    let running: {
+      commit: string
+      process_id: number
+    }[] = []
+    await this.ipc.execute(shell, `${binPath} ps`, (data) => {
+      try {
+        running = JSON.parse(data)
+      } catch {
+        // We can ignore this, it's probably blank!
+      }
+    })
+    // Store the running port for the current commit in a file for reconnection!
+    const portFilePath = `/tmp/.vscode-remote-${this.vscodeCommit}-port`
+    let remotePort = 0
+    if (running.filter((instance) => instance.commit === this.vscodeCommit)) {
+      await this.ipc.execute(shell, `cat ${portFilePath}`, (data) => {
+        if (data.trim()) {
+          remotePort = Number.parseInt(data.trim())
+        }
+      })
 
-            if (!line.startsWith("Server bound to")) {
-              return
-            }
-            const parts = line.split(" ").filter((part) => part.startsWith("127.0.0.1:"))
-            if (parts.length === 0) {
-              return reject("No port found in output: " + line)
-            }
-            const port = parts[0].split(":").pop()
-            if (!port) {
-              return reject("No port found in parts: " + parts.join(","))
-            }
-            resolve(Number.parseInt(port))
+      this.output.appendLine("Found existing server running on port: " + remotePort)
+    }
+
+    if (!remotePort) {
+      remotePort = await new Promise<number>((resolve, reject) => {
+        const script =
+          binPath +
+          " serve-local --start-server --port 0 --without-connection-token --commit-id " +
+          this.vscodeCommit +
+          " --accept-server-license-terms"
+        this.ipc
+          ?.execute(shell, script, (data) => {
+            const lines = data.split("\n")
+            lines.forEach((line) => {
+              this.output.appendLine(line)
+              if (!line.startsWith("Server bound to")) {
+                return
+              }
+              const parts = line.split(" ").filter((part) => part.startsWith("127.0.0.1:"))
+              if (parts.length === 0) {
+                return reject("No port found in output: " + line)
+              }
+              const port = parts[0].split(":").pop()
+              if (!port) {
+                return reject("No port found in parts: " + parts.join(","))
+              }
+              resolve(Number.parseInt(port))
+            })
           })
-        })
-        .then((exitCode) => {
-          reject("Exited with: " + exitCode)
-        })
-    })
+          .then((exitCode) => {
+            reject("Exited with: " + exitCode)
+          })
+      })
+
+      await this.ipc.execute(
+        shell,
+        `echo ${remotePort} > /tmp/.vscode-remote-${this.vscodeCommit}-port`,
+        () => undefined,
+      )
+    }
 
     const forwarded = await this.ipc.portForward(remotePort)
     vscode.commands.executeCommand("setContext", "forwardedPortsViewEnabled", true)
