zimgao/gochan
1
0
Fork 0
Code Issues Pull requests Packages Wiki Activity Actions

Simplify handling of promises as values.

Browse source
This commit is contained in:
David Braun 2018-10-22 15:59:06 -04:00
parent cdfb4655b5
commit 58fe68f1c4
No known key found for this signature in database
GPG key ID: 87EC41ADF710B7E2
2 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/index.js
View file

@ -60,14 +60,9 @@ const Channel = function(length = 0) {
index.push++; index.push++;
} else if (shift.cancelled) { } else if (shift.cancelled) {
index.shift++; index.shift++;
} else {
if (`reason` in push) {
shift.reject(push.reason);
} else { } else {
lastValue = push.value; lastValue = push.value;
shift.resolve(lastValue); shift.resolve(lastValue);
}
buffered = Math.max(0, buffered - 1); buffered = Math.max(0, buffered - 1);
index.push++; index.push++;
index.shift++; index.shift++;
@ -323,9 +318,7 @@ const Channel = function(length = 0) {
// If value is a promise that rejects, catch it in case there hasn't // If value is a promise that rejects, catch it in case there hasn't
// been a matching shift yet in order to prevent an unhandledRejection // been a matching shift yet in order to prevent an unhandledRejection
// error. Reject it again when there's a shift. // error. Reject it again when there's a shift.
Promise.resolve(value).catch(reason => { Promise.resolve(value).catch(() => {});
order.reason = reason;
});
if (closed) { if (closed) {
order.reject(new Error(`Can't push to closed channel.`)); order.reject(new Error(`Can't push to closed channel.`));

11
test/index.js
View file

@ -455,13 +455,12 @@ describe(`Channel object`, function() {
it(`allows promises to be sent through a channel`, function() { it(`allows promises to be sent through a channel`, function() {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
process.once(`unhandledRejection`, reject); process.once(`unhandledRejection`, reject);
const channel = Channel();
const channel = Channel.of( (async () => {
Promise.resolve(`resolved`), await channel.push(Promise.resolve(`resolved`));
new Promise((resolve, reject) => { await channel.push(Promise.reject(new Error(`rejected`)));
setImmediate(reject, new Error(`rejected`)); })();
})
);
assert.equal(await channel.shift(), `resolved`); assert.equal(await channel.shift(), `resolved`);