@vbarbarosh/node-helpers 3.23.5 → 3.24.0

package/package.json

@@ -2,7 +2,7 @@
     "author": "Vladimir Barbarosh <vladimir.barbarosh@gmail.com>",
     "license": "MIT",
     "name": "@vbarbarosh/node-helpers",
-    "version": "3.23.5",
+    "version": "3.24.0",
     "description": "A set of helpers for JavaScript/Node.js",
     "files": [
         "src"

package/src/parallel.js

@@ -8,6 +8,7 @@ async function parallel({concurrency, spawn, progress})
 {
     const running = [];
     return new Promise(function (resolve, reject) {
+        let failed = false;
         const timer = setInterval(tick, 1000);
         schedule();
         if (running.length) {
@@ -15,6 +16,9 @@ async function parallel({concurrency, spawn, progress})
         }
         function schedule() {
             while (running.length < concurrency) {
+                if (failed) {
+                    break;
+                }
                 const w = spawn();
                 if (!w) {
                     break;
@@ -22,6 +26,9 @@ async function parallel({concurrency, spawn, progress})
                 const item = Promise.resolve(w).then(resolved, rejected);
                 running.push(item);
                 function resolved() {
+                    if (failed) {
+                        return;
+                    }
                     const i = running.indexOf(item);
                     if (i === -1) {
                         throw new NotImplemented();
@@ -30,8 +37,11 @@ async function parallel({concurrency, spawn, progress})
                     schedule();
                 }
                 function rejected(error) {
-                    console.log(error);
-                    throw new NotImplemented();
+                    if (failed) {
+                        return;
+                    }
+                    running.splice(0, running.length);
+                    reject(error);
                 }
             }
             if (running.length === 0) {

package/src/shell_spawn.js

@@ -1,33 +1,39 @@
+const Promise = require('bluebird');
 const child_process = require('child_process');
 
 function shell_spawn(args, options)
 {
-    let promise;
-    const proc = child_process.spawn(args[0], args.slice(1), options);
-    proc.promise = function () {
-        let is_pending = true;
+    let init, promise;
+    const out = child_process.spawn(args[0], args.slice(1), options);
+    out.init = function () {
+        return init = init || new Promise(function (resolve, reject) {
+            out.once('error', init_error);
+            out.once('spawn', init_spawn);
+            function init_error(error) {
+                out.off('spawn', init_spawn);
+                reject(error);
+            }
+            function init_spawn() {
+                out.off('error', init_error);
+                resolve(out);
+            }
+        });
+    };
+    out.promise = function () {
         return promise = promise || new Promise(function (resolve, reject) {
-            proc.on('error', on_error);
-            proc.on('exit', on_exit);
-            function on_error(error) {
-                if (is_pending) {
-                    is_pending = false;
-                    proc.off('error', on_error);
-                    proc.off('exit', on_exit);
-                    reject(error);
-                }
+            out.once('error', promise_error);
+            out.once('exit', promise_exit);
+            function promise_error(error) {
+                out.off('exit', promise_exit);
+                reject(error);
             }
-            function on_exit(code, signal) {
-                if (is_pending) {
-                    is_pending = false;
-                    proc.off('error', on_error);
-                    proc.off('exit', on_exit);
-                    resolve({code, signal});
-                }
+            function promise_exit(code, signal) {
+                out.off('error', promise_error);
+                resolve({code, signal});
             }
         });
     };
-    return proc;
+    return out;
 }
 
 module.exports = shell_spawn;