vovk 1.1.2 → 1.1.3-beta.1

package/cli/lib/parallel.cjs

@@ -1,52 +1,54 @@
-// @ts-check
 const { spawn } = require('child_process');
 
-/** @type {(commands: { command: string; name: string; env: import('../../src').VovkEnv }[]) => Promise<void>} */
+/**
+ * Execute multiple commands in parallel and return a promise.
+ * @param {Array} commands - An array of command objects { command: string, name: string, env: Object }
+ * @returns {Promise} - A promise that resolves when all commands have completed.
+ * @type {(commands: { command: string; name: string; env: import('../../src').VovkEnv }[]) => Promise<void>}
+ */
 function parallel(commands) {
   return new Promise((resolve, reject) => {
-    /** @type {{ name: string; process: import('child_process').ChildProcess; }[]} */
-    let processes = [];
-
-    commands.forEach((cmd) => {
-      const processObj = {
-        name: cmd.name,
-        process: runCommand(
-          cmd.command,
-          cmd.env,
-          /** @type {(code: number) => void} */
-          (code) => handleProcessExit(code, cmd.name)
-        ),
+    let children = [];
+    let results = [];
+
+    // Helper function to handle closure of a child process
+    function childClose(index, resolve, reject) {
+      return (code) => {
+        code = code ? code.code || code : code;
+        if (code > 0) {
+          reject(new Error('`' + commands[index].name + '` failed with exit code ' + code));
+        } else {
+          resolve('`' + commands[index].name + '` ended successfully');
+        }
       };
-      processes.push(processObj);
-    });
-
-    /** @type {(command: string, env: import('../../src').VovkEnv, onExit: (code: number) => void) => import('child_process').ChildProcess} */
-    function runCommand(command, env, onExit) {
-      const proc = spawn(command, { shell: true, detached: true, env: { ...env, ...process.env }, stdio: 'inherit' });
+    }
 
-      proc.on('exit', onExit);
+    // Start each command as a child process
+    commands.forEach((command, index) => {
+      let cmd = command.command;
+      let sh = process.platform === 'win32' ? 'cmd' : 'sh';
+      let shFlag = process.platform === 'win32' ? '/c' : '-c';
 
-      return proc;
-    }
+      let child = spawn(sh, [shFlag, cmd], {
+        cwd: process.cwd(),
+        env: { ...process.env, ...command.env },
+        stdio: ['pipe', 'inherit', 'inherit'], // Use 'inherit' to keep stdout and stderr
+      });
 
-    /** @type {(code: number, name: string) => void} */
-    function handleProcessExit(code, name) {
-      processes = processes.filter((p) => p.name !== name);
+      children.push(child);
 
-      processes.forEach((p) => {
-        if (p.name !== name) {
-          // TS fix
-          if (p.process.pid) {
-            process.kill(-p.process.pid, 'SIGTERM');
-          }
-        }
+      // Create a new promise for each child process
+      let childPromise = new Promise((childResolve, childReject) => {
+        child.on('close', childClose(index, childResolve, childReject));
       });
-      processes = [];
-      process.stdout.write('\n');
-      if (code !== 0) {
-        return reject(new Error(`Process ${name} exited with code ${code}`));
-      }
-    }
+
+      results.push(childPromise);
+    });
+
+    // Use Promise.all to wait for all child processes to complete
+    Promise.all(results)
+      .then(() => resolve('All processes have ended successfully'))
+      .catch((error) => reject(error));
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "1.1.2",
+  "version": "1.1.3-beta.1",
   "description": "REST for Next",
   "bin": "./cli/index.cjs",
   "scripts": {