refactor: use exec instead of spawn

Author: jsjoeio

test/integration/installExtension.test.ts

@@ -17,7 +17,7 @@ describe("--install-extension", () => {
     const extName = `wesbos.theme-cobalt2-2.1.6`
     const vsixFileName = "wesbos.theme-cobalt2-2.1.6.vsix"
     const extensionFixture = path.resolve(`./test/integration/fixtures/${vsixFileName}`)
-    await runCodeServerCommand([...setupFlags, "--install-extension", extensionFixture], {})
+    await runCodeServerCommand([...setupFlags, "--install-extension", extensionFixture])
     const pathToExtFolder = path.join(tempDir, extName)
     const statInfo = await stat(pathToExtFolder)
     expect(statInfo.isDirectory()).toBe(true)

test/integration/listExtensions.test.ts

@@ -25,7 +25,7 @@ describe("--list-extensions", () => {
     await rename(`${tempPathToUnpackedExtension}/extension`, pathToUnpackedExtension)
   })
   it("should list installed extensions", async () => {
-    const { stdout } = await runCodeServerCommand([...setupFlags, "--list-extensions"], { stdout: "log" })
+    const { stdout } = await runCodeServerCommand([...setupFlags, "--list-extensions"])
     expect(stdout).toMatch(extName)
   }, 20000)
 })

test/utils/runCodeServerCommand.ts

@@ -1,86 +1,13 @@
-import { spawn } from "child_process"
-
-type RunCodeServerCommandOptions = {
-  stderr?: "log"
-  stdout?: "log"
-  ignoreFail?: boolean
-}
-
-interface ErrorWithMoreInfo extends Error {
-  stderr: string
-  stdout: string
-}
-
-type CSCmd =
-  | {
-      code: number | null
-      signal: NodeJS.Signals | null
-      stdout: string
-      stderr: string
-    }
-  | ErrorWithMoreInfo
+import { exec } from "child_process"
+import { promisify } from "util"
 
 /**
  *
  * A helper function for integration tests to run code-server commands.
  */
-export async function runCodeServerCommand(argv: string[], options: RunCodeServerCommandOptions = {}): Promise<CSCmd> {
+export async function runCodeServerCommand(argv: string[]): Promise<{ stdout: string; stderr: string }> {
   const CODE_SERVER_COMMAND = process.env.CODE_SERVER_PATH || "/var/tmp/coder/code-server/bin/code-server"
-  // Credit: https://github.com/vercel/next.js/blob/canary/test/lib/next-test-utils.js#L139
-  return new Promise((resolve, reject) => {
-    console.log(`Running command "${CODE_SERVER_COMMAND} ${argv.join(" ")}"`)
-    const instance = spawn(CODE_SERVER_COMMAND, [...argv])
-    let mergedStdio = ""
-
-    let stderrOutput = ""
-    if (options.stderr) {
-      instance.stderr.on("data", function (chunk) {
-        mergedStdio += chunk
-        stderrOutput += chunk
-
-        if (options.stderr === "log") {
-          console.log(chunk.toString())
-        }
-      })
-    } else {
-      instance.stderr.on("data", function (chunk) {
-        mergedStdio += chunk
-      })
-    }
-
-    let stdoutOutput = ""
-    if (options.stdout) {
-      instance.stdout.on("data", function (chunk) {
-        mergedStdio += chunk
-        stdoutOutput += chunk
-
-        if (options.stdout === "log") {
-          console.log(chunk.toString())
-        }
-      })
-    } else {
-      instance.stdout.on("data", function (chunk) {
-        mergedStdio += chunk
-      })
-    }
-
-    instance.on("close", (code, signal) => {
-      if (!options.stderr && !options.stdout && !options.ignoreFail && code !== 0) {
-        return reject(new Error(`command failed with code ${code}\n${mergedStdio}`))
-      }
-
-      resolve({
-        code,
-        signal,
-        stdout: stdoutOutput,
-        stderr: stderrOutput,
-      })
-    })
+  const { stdout, stderr } = await promisify(exec)(`${CODE_SERVER_COMMAND} ${argv.join(" ")}`)
 
-    instance.on("error", (err: ErrorWithMoreInfo) => {
-      err.stdout = stdoutOutput
-      err.stderr = stderrOutput
-      reject(err)
-    })
-  })
+  return { stdout, stderr }
 }