Support expectResponse and waitForCommand

Author: pokey

README.md

@@ -26,6 +26,12 @@ POST /execute-command HTTP/1.1
 Upon receiving the above, this extension would run the command
 `some-command-id` with argument `"some-argument"`.
 
+If you'd like the server to wait for the command to finish before responding,
+pass `waitForFinish=true`.
+
+If you'd like the server to wait for the command to finish and then respond
+with the command return value encoded as JSON, pass `expectResponse=true`.
+
 Note that the server is bound to `localhost`, so it will only accept commands
 from processes running on the same host as VSCode.
 

package.json

@@ -8,7 +8,7 @@
 		"type": "git",
 		"url": "https://github.com/pokey/command-server"
 	},
-	"version": "0.1.3",
+	"version": "0.2.2",
 	"engines": {
 		"vscode": "^1.53.0"
 	},

src/extension.ts

@@ -3,7 +3,7 @@
 import * as vscode from "vscode";
 import * as http from "http";
 import { AddressInfo } from "net";
-import { writeFileSync } from "fs";
+import { existsSync, readFileSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 import { getRequestJSON } from "./getRequestJSON";
@@ -12,6 +12,7 @@ interface Command {
   commandId: string;
   args: any[];
   expectResponse: boolean;
+  waitForFinish: boolean;
 }
 
 export function activate(context: vscode.ExtensionContext) {
@@ -26,9 +27,23 @@ export function activate(context: vscode.ExtensionContext) {
 
     const commandInfo: Command = await getRequestJSON(req);
 
-    vscode.commands.executeCommand(commandInfo.commandId, ...commandInfo.args);
+    const commandPromise = vscode.commands.executeCommand(
+      commandInfo.commandId,
+      ...commandInfo.args
+    );
+
+    var commandReturnValue;
+
+    if (commandInfo.expectResponse || commandInfo.waitForFinish) {
+      commandReturnValue = await commandPromise;
+    }
 
     res.writeHead(200);
+
+    if (commandInfo.expectResponse) {
+      res.write(JSON.stringify(commandReturnValue));
+    }
+
     res.end();
   });
 
@@ -43,6 +58,17 @@ export function activate(context: vscode.ExtensionContext) {
     }
   });
 
+  setInterval(() => {
+    const path = getPortPath();
+
+    if (
+      vscode.window.state.focused &&
+      (!existsSync(path) || parseInt(readFileSync(path).toString()) !== port)
+    ) {
+      writePort();
+    }
+  }, 500);
+
   const windowStateDisposable = vscode.window.onDidChangeWindowState(
     (event) => {
       if (event.focused && port !== null) {
@@ -52,7 +78,7 @@ export function activate(context: vscode.ExtensionContext) {
   );
 
   function writePort() {
-    const path = join(tmpdir(), "vscode-port");
+    const path = getPortPath();
     console.log(`Saving port ${port} to path ${path}`);
     writeFileSync(path, `${port}`);
   }
@@ -62,6 +88,10 @@ export function activate(context: vscode.ExtensionContext) {
       server.close();
     },
   });
+
+  function getPortPath() {
+    return join(tmpdir(), "vscode-port");
+  }
 }
 
 // this method is called when your extension is deactivated