Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for domains. #185

Closed
wants to merge 1 commit into from
Closed

Support for domains. #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions lib/async.js
View file
Open in desktop
Expand Up @@ -78,6 +78,7 @@


async.forEach = function (arr, iterator, callback) { async.forEach = function (arr, iterator, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
if (!arr.length) { if (!arr.length) {
return callback(); return callback();
} }
Expand All @@ -100,6 +101,7 @@


async.forEachSeries = function (arr, iterator, callback) { async.forEachSeries = function (arr, iterator, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
if (!arr.length) { if (!arr.length) {
return callback(); return callback();
} }
Expand All @@ -126,6 +128,7 @@


async.forEachLimit = function (arr, limit, iterator, callback) { async.forEachLimit = function (arr, limit, iterator, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
if (!arr.length || limit <= 0) { if (!arr.length || limit <= 0) {
return callback(); return callback();
} }
Expand Down Expand Up @@ -177,6 +180,7 @@




var _asyncMap = function (eachfn, arr, iterator, callback) { var _asyncMap = function (eachfn, arr, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
var results = []; var results = [];
arr = _map(arr, function (x, i) { arr = _map(arr, function (x, i) {
return {index: i, value: x}; return {index: i, value: x};
Expand All @@ -197,6 +201,7 @@
// reduce only has a series version, as doing reduce in parallel won't // reduce only has a series version, as doing reduce in parallel won't
// work in many situations. // work in many situations.
async.reduce = function (arr, memo, iterator, callback) { async.reduce = function (arr, memo, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
async.forEachSeries(arr, function (x, callback) { async.forEachSeries(arr, function (x, callback) {
iterator(memo, x, function (err, v) { iterator(memo, x, function (err, v) {
memo = v; memo = v;
Expand All @@ -212,6 +217,7 @@
async.foldl = async.reduce; async.foldl = async.reduce;


async.reduceRight = function (arr, memo, iterator, callback) { async.reduceRight = function (arr, memo, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
var reversed = _map(arr, function (x) { var reversed = _map(arr, function (x) {
return x; return x;
}).reverse(); }).reverse();
Expand All @@ -221,6 +227,7 @@
async.foldr = async.reduceRight; async.foldr = async.reduceRight;


var _filter = function (eachfn, arr, iterator, callback) { var _filter = function (eachfn, arr, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
var results = []; var results = [];
arr = _map(arr, function (x, i) { arr = _map(arr, function (x, i) {
return {index: i, value: x}; return {index: i, value: x};
Expand All @@ -247,6 +254,7 @@
async.selectSeries = async.filterSeries; async.selectSeries = async.filterSeries;


var _reject = function (eachfn, arr, iterator, callback) { var _reject = function (eachfn, arr, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
var results = []; var results = [];
arr = _map(arr, function (x, i) { arr = _map(arr, function (x, i) {
return {index: i, value: x}; return {index: i, value: x};
Expand All @@ -270,6 +278,7 @@
async.rejectSeries = doSeries(_reject); async.rejectSeries = doSeries(_reject);


var _detect = function (eachfn, arr, iterator, main_callback) { var _detect = function (eachfn, arr, iterator, main_callback) {
if (process.domain) main_callback = process.domain.bind(main_callback);
eachfn(arr, function (x, callback) { eachfn(arr, function (x, callback) {
iterator(x, function (result) { iterator(x, function (result) {
if (result) { if (result) {
Expand All @@ -288,6 +297,7 @@
async.detectSeries = doSeries(_detect); async.detectSeries = doSeries(_detect);


async.some = function (arr, iterator, main_callback) { async.some = function (arr, iterator, main_callback) {
if (process.domain) main_callback = process.domain.bind(main_callback);
async.forEach(arr, function (x, callback) { async.forEach(arr, function (x, callback) {
iterator(x, function (v) { iterator(x, function (v) {
if (v) { if (v) {
Expand All @@ -304,6 +314,7 @@
async.any = async.some; async.any = async.some;


async.every = function (arr, iterator, main_callback) { async.every = function (arr, iterator, main_callback) {
if (process.domain) main_callback = process.domain.bind(main_callback);
async.forEach(arr, function (x, callback) { async.forEach(arr, function (x, callback) {
iterator(x, function (v) { iterator(x, function (v) {
if (!v) { if (!v) {
Expand All @@ -320,6 +331,7 @@
async.all = async.every; async.all = async.every;


async.sortBy = function (arr, iterator, callback) { async.sortBy = function (arr, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
async.map(arr, function (x, callback) { async.map(arr, function (x, callback) {
iterator(x, function (err, criteria) { iterator(x, function (err, criteria) {
if (err) { if (err) {
Expand Down Expand Up @@ -347,6 +359,7 @@


async.auto = function (tasks, callback) { async.auto = function (tasks, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
var keys = _keys(tasks); var keys = _keys(tasks);
if (!keys.length) { if (!keys.length) {
return callback(null); return callback(null);
Expand Down Expand Up @@ -419,6 +432,7 @@


async.waterfall = function (tasks, callback) { async.waterfall = function (tasks, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
if (!tasks.length) { if (!tasks.length) {
return callback(); return callback();
} }
Expand Down Expand Up @@ -448,6 +462,7 @@


async.parallel = function (tasks, callback) { async.parallel = function (tasks, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
if (tasks.constructor === Array) { if (tasks.constructor === Array) {
async.map(tasks, function (fn, callback) { async.map(tasks, function (fn, callback) {
if (fn) { if (fn) {
Expand Down Expand Up @@ -480,6 +495,7 @@


async.series = function (tasks, callback) { async.series = function (tasks, callback) {
callback = callback || function () {}; callback = callback || function () {};
if (process.domain) callback = process.domain.bind(callback);
if (tasks.constructor === Array) { if (tasks.constructor === Array) {
async.mapSeries(tasks, function (fn, callback) { async.mapSeries(tasks, function (fn, callback) {
if (fn) { if (fn) {
Expand Down Expand Up @@ -537,6 +553,7 @@


var _concat = function (eachfn, arr, fn, callback) { var _concat = function (eachfn, arr, fn, callback) {
var r = []; var r = [];
if (process.domain) callback = process.domain.bind(callback);
eachfn(arr, function (x, cb) { eachfn(arr, function (x, cb) {
fn(x, function (err, y) { fn(x, function (err, y) {
r = r.concat(y || []); r = r.concat(y || []);
Expand All @@ -550,6 +567,7 @@
async.concatSeries = doSeries(_concat); async.concatSeries = doSeries(_concat);


async.whilst = function (test, iterator, callback) { async.whilst = function (test, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
if (test()) { if (test()) {
iterator(function (err) { iterator(function (err) {
if (err) { if (err) {
Expand All @@ -564,6 +582,7 @@
}; };


async.until = function (test, iterator, callback) { async.until = function (test, iterator, callback) {
if (process.domain) callback = process.domain.bind(callback);
if (!test()) { if (!test()) {
iterator(function (err) { iterator(function (err) {
if (err) { if (err) {
Expand Down
22 changes: 22 additions & 0 deletions test/test-async.js
View file
Open in desktop
Expand Up @@ -1618,3 +1618,25 @@ exports['queue events'] = function(test) {
q.push('poo', function () {calls.push('poo cb');}); q.push('poo', function () {calls.push('poo cb');});
q.push('moo', function () {calls.push('moo cb');}); q.push('moo', function () {calls.push('moo cb');});
}; };

// test domains

var d = require('domain').create()
d.on('error', function (err) {
console.log('domain error:', err.message)
d.errors += 1
})
d.errors = 0

pn = function (cb) {process.nextTick(function () {cb()})}

d.run(function () {
async.forEach([1,2], function (i, cb) {pn(cb)}, function (err) {
throw new Error('test async')
})
})

process.nextTick(function () {
if (d.errors !== 1) throw new Error('did not pass all domain errors')
})