Skip to content

Commit

Permalink
feat: add std/signal/mod.ts (denoland#3913)
Browse files Browse the repository at this point in the history
  • Loading branch information
kt3k committed Feb 7, 2020
1 parent d9c84eb commit 5a8ba3b
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 4 deletions.
5 changes: 3 additions & 2 deletions cli/js/lib.deno.ns.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2146,14 +2146,15 @@ declare namespace Deno {
* SignalStream represents the stream of signals, implements both
* AsyncIterator and PromiseLike
*/
export class SignalStream implements AsyncIterator<void>, PromiseLike<void> {
export class SignalStream
implements AsyncIterableIterator<void>, PromiseLike<void> {
constructor(signal: typeof Deno.Signal);
then<T, S>(
f: (v: void) => T | Promise<T>,
g?: (v: void) => S | Promise<S>
): Promise<T | S>;
next(): Promise<IteratorResult<void>>;
[Symbol.asyncIterator](): AsyncIterator<void>;
[Symbol.asyncIterator](): AsyncIterableIterator<void>;
dispose(): void;
}

Expand Down
5 changes: 3 additions & 2 deletions cli/js/signals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ export const signals = {

/** SignalStream represents the stream of signals, implements both
* AsyncIterator and PromiseLike */
export class SignalStream implements AsyncIterator<void>, PromiseLike<void> {
export class SignalStream
implements AsyncIterableIterator<void>, PromiseLike<void> {
private rid: number;
/** The promise of polling the signal,
* resolves with false when it receives signal,
Expand Down Expand Up @@ -134,7 +135,7 @@ export class SignalStream implements AsyncIterator<void>, PromiseLike<void> {
return { done: await this.pollingPromise, value: undefined };
}

[Symbol.asyncIterator](): AsyncIterator<void> {
[Symbol.asyncIterator](): AsyncIterableIterator<void> {
return this;
}

Expand Down
28 changes: 28 additions & 0 deletions std/signal/mod.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { MuxAsyncIterator } from "../util/async.ts";

export function signal(
...signos: [number, ...number[]]
): AsyncIterable<void> & { dispose: () => void } {
const mux = new MuxAsyncIterator<void>();

if (signos.length < 1) {
throw new Error(
"No signals are given. You need to specify at least one signal to create a signal stream."
);
}

const streams = signos.map(Deno.signal);

streams.forEach(stream => {
mux.add(stream);
});

// Create dispose method for the muxer of signal streams.
const dispose = (): void => {
streams.forEach(stream => {
stream.dispose();
});
};

return Object.assign(mux, { dispose });
}
53 changes: 53 additions & 0 deletions std/signal/test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { test, assertEquals, assertThrows } from "../testing/mod.ts";
import { delay } from "../util/async.ts";
import { signal } from "./mod.ts";

if (Deno.build.os !== "win") {
test("signal() throws when called with empty signals", (): void => {
assertThrows(
() => {
// @ts-ignore
signal();
},
Error,
"No signals are given. You need to specify at least one signal to create a signal stream."
);
});

test("signal() iterates for multiple signals", async (): Promise<void> => {
// This prevents the program from exiting.
const t = setInterval(() => {}, 1000);

let c = 0;
const sig = signal(
Deno.Signal.SIGUSR1,
Deno.Signal.SIGUSR2,
Deno.Signal.SIGINT
);

setTimeout(async () => {
await delay(20);
Deno.kill(Deno.pid, Deno.Signal.SIGINT);
await delay(20);
Deno.kill(Deno.pid, Deno.Signal.SIGUSR2);
await delay(20);
Deno.kill(Deno.pid, Deno.Signal.SIGUSR1);
await delay(20);
Deno.kill(Deno.pid, Deno.Signal.SIGUSR2);
await delay(20);
Deno.kill(Deno.pid, Deno.Signal.SIGUSR1);
await delay(20);
Deno.kill(Deno.pid, Deno.Signal.SIGINT);
await delay(20);
sig.dispose();
});

for await (const _ of sig) {
c += 1;
}

assertEquals(c, 6);

clearTimeout(t);
});
}

0 comments on commit 5a8ba3b

Please sign in to comment.