Revert "fix: revert "feat: use spawn instead of exec""

This reverts commit 824ed6c.

Author: olehmisar

src/install.ts

@@ -1,4 +1,5 @@
-import { makeRunCommand } from "./utils";
+import { HardhatPluginError } from "hardhat/plugins";
+import { makeRunCommand, PLUGIN_NAME } from "./utils";
 
 const installationSeparator = "hardhat";
 
@@ -9,9 +10,10 @@ async function installNoirup() {
   if (!fs.existsSync(noirupBinary)) {
     const runCommand = makeRunCommand();
     console.log("Installing noirup");
-    await runCommand(
-      "curl -L https://raw.githubusercontent.com/noir-lang/noirup/refs/heads/main/install | bash",
+    const installScript = await downloadScript(
+      "https://raw.githubusercontent.com/noir-lang/noirup/refs/heads/main/install",
     );
+    await runCommand("bash", ["-c", installScript]);
   }
   return noirupBinary;
 }
@@ -33,9 +35,9 @@ export async function installNargo(version: string) {
     const nargoBinDir = path.dirname(nargoBinary);
     fs.mkdirSync(path.join(nargoBinDir), { recursive: true });
     console.log(`Installing nargo@${version} in ${nargoBinDir}`);
-    await runCommand(
-      `NARGO_HOME=${path.dirname(nargoBinDir)} ${noirupBinary} -v ${version}`,
-    );
+    await runCommand(noirupBinary, ["-v", version], {
+      env: { NARGO_HOME: path.dirname(nargoBinDir) },
+    });
   }
   return nargoBinary;
 }
@@ -45,3 +47,11 @@ async function getNargoHome() {
   const path = await import("path");
   return path.join(os.homedir(), ".nargo");
 }
+
+async function downloadScript(url: string) {
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new HardhatPluginError(PLUGIN_NAME, `Failed to download ${url}`);
+  }
+  return await res.text();
+}

src/tasks.ts

@@ -27,7 +27,7 @@ task(TASK_COMPILE, "Compile and generate circuits and contracts").setAction(
     const cache = await NoirCache.fromConfig(config);
     if ((await cache.haveSourceFilesChanged()) || force) {
       console.log("Compiling Noir circuits...");
-      await runCommand(`${nargoBinary} compile`);
+      await runCommand(nargoBinary, ["compile"]);
       await cache.saveSourceFilesHash();
       console.log("Compiled Noir circuits");
     }
@@ -81,9 +81,11 @@ task("noir-new", "Create a new Noir package")
     const nargoBinary = await installNargo(config.noir.version);
     const runCommand = makeRunCommand(config.paths.noir);
     fs.mkdirSync(config.paths.noir, { recursive: true });
-    await runCommand(
-      `${nargoBinary} new ${args.name} ${args.lib ? "--lib" : ""}`,
-    );
+    const cmdArgs = ["new", args.name];
+    if (args.lib) {
+      cmdArgs.push("--lib");
+    }
+    await runCommand(nargoBinary, cmdArgs);
   });
 
 task(

src/utils.ts

@@ -1,29 +1,49 @@
 import { HardhatPluginError } from "hardhat/plugins";
+import type { SpawnOptions } from "node:child_process";
 
 export const PLUGIN_NAME = "hardhat-plugin-noir";
 
-export const makeRunCommand = (cwd?: string) => async (command: string) => {
-  const { exec } = await import("child_process");
-  const { promisify } = await import("util");
-  const execAsync = promisify(exec);
-  // TODO(security): escape command arguments (use template strings)
-  try {
-    const { stdout, stderr } = await execAsync(command, {
-      cwd,
-      maxBuffer: Infinity,
-    });
-    if (stdout) {
-      console.log(stdout);
-    }
-    if (stderr) {
-      console.error(stderr);
-    }
-  } catch (error) {
-    console.error(`Error executing command: ${command}`);
-    console.error((error as any).stderr || (error as any).message); // Log only error messages
-    throw new HardhatPluginError(
-      PLUGIN_NAME,
-      `Error executing command: ${command}`,
+export const makeRunCommand =
+  (cwd?: string) =>
+  async (
+    command: string,
+    args: (string | number)[],
+    options?: Pick<SpawnOptions, "env">,
+  ) => {
+    const { spawn } = await import("node:child_process");
+
+    const spawned = spawn(
+      command,
+      args.map((arg) => arg.toString()),
+      { ...options, cwd },
     );
-  }
-};
+    spawned.stdout.on("data", (data) => {
+      process.stdout.write(data);
+    });
+
+    spawned.stderr.on("data", (data) => {
+      process.stderr.write(data);
+    });
+
+    return await new Promise<void>((resolve, reject) => {
+      spawned.on("close", (code: number) => {
+        if (code !== 0) {
+          reject(new Error(`Process exited with code ${code}`));
+          return;
+        }
+
+        resolve();
+      });
+
+      spawned.on("error", (err) => {
+        reject(
+          new HardhatPluginError(
+            PLUGIN_NAME,
+            `Error executing command \`${
+              command + " " + args.join(" ")
+            }\`: ${err.message}`,
+          ),
+        );
+      });
+    });
+  };