renowncoder
diff --git a/‎lib/parallel.js
Lines changed: 71 additions & 19 deletions b/‎lib/parallel.js
Lines changed: 71 additions & 19 deletions
@@ -37,7 +37,7 @@
 			this._result = err;
 
 			for (var iE = 0; iE < this._errCallbacks.length; ++iE) {
-				this._errCallbacks[iE](res);
+				this._errCallbacks[iE](err);
 			}
 		}
 
@@ -87,8 +87,8 @@
 	}
 
 	// static method
-	Parallel.isSupported=function(){ return _supports; }
-	
+	Parallel.isSupported = function () { return _supports; }
+
 	Parallel.prototype.getWorkerSource = function (cb, env) {
 		var that = this;
 		var preStr = '';
@@ -189,11 +189,19 @@
 					that.data = msg.data;
 					newOp.resolve(null, that.data);
 				};
+				wrk.onerror = function (e) {
+					wrk.terminate();
+					newOp.resolve(e, null);
+				};
 				wrk.postMessage(that.data);
 			} else if (that.options.synchronous) {
 				setImmediate(function () {
-					that.data = cb(that.data);
-					newOp.resolve(null, that.data);
+					try {
+						that.data = cb(that.data);
+						newOp.resolve(null, that.data);
+					} catch (e) {
+						newOp.resolve(e, null);
+					}
 				});
 			} else {
 				throw new Error('Workers do not exist and synchronous operation not allowed!');
@@ -205,13 +213,17 @@
 
 	Parallel.prototype._spawnMapWorker = function (i, cb, done, env, wrk) {
 		var that = this;
-		
+
 		if (!wrk) wrk = that._spawnWorker(cb, env);
-		
+
 		if (wrk !== undefined) {
 			wrk.onmessage = function (msg) {
 				that.data[i] = msg.data;
-				done(wrk);
+				done(null, wrk);
+			};
+			wrk.onerror = function (e) {
+				wrk.terminate();
+				done(e);
 			};
 			wrk.postMessage(that.data[i]);
 		} else if (that.options.synchronous) {
@@ -234,8 +246,10 @@
 		var that = this;
 		var startedOps = 0;
 		var doneOps = 0;
-		function done(wrk) {
-			if (++doneOps === that.data.length) {
+		function done(err, wrk) {
+			if (err) {
+				newOp.resolve(err, null);
+			} else if (++doneOps === that.data.length) {
 				newOp.resolve(null, that.data);
 				if (wrk) wrk.terminate();
 			} else if (startedOps < that.data.length) {
@@ -250,6 +264,8 @@
 			for (; startedOps - doneOps < that.options.maxWorkers && startedOps < that.data.length; ++startedOps) {
 				that._spawnMapWorker(startedOps, cb, done, env);
 			}
+		}, function (err) {
+			newOp.resolve(err, null);
 		});
 		this.operation = newOp;
 		return this;
@@ -262,8 +278,12 @@
 		if (wrk !== undefined) {
 			wrk.onmessage = function (msg) {
 				that.data[that.data.length] = msg.data;
-				done(wrk);
+				done(null, wrk);
 			};
+			wrk.onerror = function (e) {
+				wrk.terminate();
+				done(e, null);
+			}
 			wrk.postMessage(data);
 		} else if (that.options.synchronous) {
 			setImmediate(function () {
@@ -284,9 +304,11 @@
 
 		var runningWorkers = 0;
 		var that = this;
-		function done(wrk) {
+		function done(err, wrk) {
 			--runningWorkers;
-			if (that.data.length === 1 && runningWorkers === 0) {
+			if (err) {
+				newOp.resolve(err, null);
+			} else if (that.data.length === 1 && runningWorkers === 0) {
 				that.data = that.data[0];
 				newOp.resolve(null, that.data);
 				if (wrk) wrk.terminate();
@@ -304,7 +326,7 @@
 			if (that.data.length === 1) {
 				newOp.resolve(null, that.data[0]);
 			} else {
-				for (var i = 0; i < that.options.maxWorkers && i < Math.floor(that.data.length / 2); ++i) {
+				for (var i = 0; i < that.options.maxWorkers && i < Math.floor(that.data.length / 2) ; ++i) {
 					++runningWorkers;
 					that._spawnReduceWorker([that.data[i * 2], that.data[i * 2 + 1]], cb, done, env);
 				}
@@ -319,13 +341,43 @@
 	Parallel.prototype.then = function (cb, errCb) {
 		var that = this;
 		var newOp = new Operation();
+		errCb = typeof errCb === 'function' ? errCb : function(){};
+
 		this.operation.then(function () {
-			var retData = cb(that.data);
-			if (retData !== undefined) {
-				that.data = retData;
+			var retData;
+
+			try {
+				if (cb) {
+					retData = cb(that.data);
+					if (retData !== undefined) {
+						that.data = retData;
+					}
+				}
+				newOp.resolve(null, that.data);
+			} catch (e) {
+				if (errCb) {
+					retData = errCb(e);
+					if (retData !== undefined) {
+						that.data = retData;
+					}
+
+					newOp.resolve(null, that.data);
+				} else {
+					newOp.resolve(null, e);
+				}
 			}
-			newOp.resolve(null, that.data);
-		}, errCb);
+		}, function (err) {
+			if (errCb) {
+				var retData = errCb(err);
+				if (retData !== undefined) {
+					that.data = retData;
+				}
+
+				newOp.resolve(null, that.data);
+			} else {
+				newOp.resolve(null, err);
+			}
+		});
 		this.operation = newOp;
 		return this;
 	};