fix: MuxAsyncIterator throws muxed errors (#6295)

Fixes #5260
This commit is contained in:
Kitson Kelly 2020-06-16 02:03:07 +10:00 committed by GitHub
parent b1893e65f2
commit 490d2a5ca1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 8 deletions

View file

@ -7,14 +7,15 @@ interface TaggedYieldedValue<T> {
} }
/** The MuxAsyncIterator class multiplexes multiple async iterators into a /** The MuxAsyncIterator class multiplexes multiple async iterators into a
* single stream. It currently makes a few assumptions: * single stream. It currently makes an assumption:
* - The iterators do not throw.
* - The final result (the value returned and not yielded from the iterator) * - The final result (the value returned and not yielded from the iterator)
* does not matter; if there is any, it is discarded. * does not matter; if there is any, it is discarded.
*/ */
export class MuxAsyncIterator<T> implements AsyncIterable<T> { export class MuxAsyncIterator<T> implements AsyncIterable<T> {
private iteratorCount = 0; private iteratorCount = 0;
private yields: Array<TaggedYieldedValue<T>> = []; private yields: Array<TaggedYieldedValue<T>> = [];
// eslint-disable-next-line @typescript-eslint/no-explicit-any
private throws: any[] = [];
private signal: Deferred<void> = deferred(); private signal: Deferred<void> = deferred();
add(iterator: AsyncIterableIterator<T>): void { add(iterator: AsyncIterableIterator<T>): void {
@ -25,12 +26,16 @@ export class MuxAsyncIterator<T> implements AsyncIterable<T> {
private async callIteratorNext( private async callIteratorNext(
iterator: AsyncIterableIterator<T> iterator: AsyncIterableIterator<T>
): Promise<void> { ): Promise<void> {
try {
const { value, done } = await iterator.next(); const { value, done } = await iterator.next();
if (done) { if (done) {
--this.iteratorCount; --this.iteratorCount;
} else { } else {
this.yields.push({ iterator, value }); this.yields.push({ iterator, value });
} }
} catch (e) {
this.throws.push(e);
}
this.signal.resolve(); this.signal.resolve();
} }
@ -46,6 +51,12 @@ export class MuxAsyncIterator<T> implements AsyncIterable<T> {
this.callIteratorNext(iterator); this.callIteratorNext(iterator);
} }
if (this.throws.length) {
for (const e of this.throws) {
throw e;
}
this.throws.length = 0;
}
// Clear the `yields` list and reset the `signal` promise. // Clear the `yields` list and reset the `signal` promise.
this.yields.length = 0; this.yields.length = 0;
this.signal = deferred(); this.signal = deferred();

View file

@ -1,5 +1,5 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { assertEquals } from "../testing/asserts.ts"; import { assertEquals, assertThrowsAsync } from "../testing/asserts.ts";
import { MuxAsyncIterator } from "./mux_async_iterator.ts"; import { MuxAsyncIterator } from "./mux_async_iterator.ts";
// eslint-disable-next-line require-await // eslint-disable-next-line require-await
@ -16,6 +16,12 @@ async function* gen456(): AsyncIterableIterator<number> {
yield 6; yield 6;
} }
// eslint-disable-next-line require-await
async function* genThrows(): AsyncIterableIterator<number> {
yield 7;
throw new Error("something went wrong");
}
Deno.test("[async] MuxAsyncIterator", async function (): Promise<void> { Deno.test("[async] MuxAsyncIterator", async function (): Promise<void> {
const mux = new MuxAsyncIterator<number>(); const mux = new MuxAsyncIterator<number>();
mux.add(gen123()); mux.add(gen123());
@ -26,3 +32,22 @@ Deno.test("[async] MuxAsyncIterator", async function (): Promise<void> {
} }
assertEquals(results.size, 6); assertEquals(results.size, 6);
}); });
Deno.test({
name: "[async] MuxAsyncIterator throws",
async fn() {
const mux = new MuxAsyncIterator<number>();
mux.add(gen123());
mux.add(genThrows());
const results = new Set();
await assertThrowsAsync(
async () => {
for await (const value of mux) {
results.add(value);
}
},
Error,
"something went wrong"
);
},
});