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.

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

Add support for AbortController/AbortSignal #4757

Merged
merged 3 commits into from
Apr 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cli/js/globals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import "./lib.deno.shared_globals.d.ts";

import * as abortController from "./web/abort_controller.ts";
import * as abortSignal from "./web/abort_signal.ts";
import * as blob from "./web/blob.ts";
import * as consoleTypes from "./web/console.ts";
import * as promiseTypes from "./web/promise.ts";
Expand Down Expand Up @@ -207,6 +209,8 @@ export const windowOrWorkerGlobalScopeMethods = {
// Other properties shared between WindowScope and WorkerGlobalScope
export const windowOrWorkerGlobalScopeProperties = {
console: writable(new consoleTypes.Console(core.print)),
AbortController: nonEnumerable(abortController.AbortControllerImpl),
AbortSignal: nonEnumerable(abortSignal.AbortSignalImpl),
Blob: nonEnumerable(blob.DenoBlob),
File: nonEnumerable(domFile.DomFileImpl),
CustomEvent: nonEnumerable(customEvent.CustomEventImpl),
Expand Down
16 changes: 12 additions & 4 deletions cli/js/lib.deno.shared_globals.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1256,17 +1256,25 @@ declare class CustomEvent<T = any> extends Event {
readonly detail: T;
}

/** A controller object that allows you to abort one or more DOM requests as and
* when desired. */
declare class AbortController {
/** Returns the AbortSignal object associated with this object. */
readonly signal: AbortSignal;
/** Invoking this method will set this object's AbortSignal's aborted flag and
* signal to any observers that the associated activity is to be aborted. */
abort(): void;
}

interface AbortSignalEventMap {
abort: Event;
}

/** A signal object that allows you to communicate with a DOM request (such as a
* Fetch) and abort it if required via an AbortController object. */
interface AbortSignal extends EventTarget {
/**
* Returns true if this AbortSignal's AbortController has signaled to abort,
* and false otherwise.
*/
/** Returns true if this AbortSignal's AbortController has signaled to abort,
* and false otherwise. */
readonly aborted: boolean;
onabort: ((this: AbortSignal, ev: Event) => any) | null;
addEventListener<K extends keyof AbortSignalEventMap>(
Expand Down
56 changes: 56 additions & 0 deletions cli/js/tests/abort_controller_test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { unitTest, assert, assertEquals } from "./test_util.ts";

unitTest(function basicAbortController() {
const controller = new AbortController();
assert(controller);
const { signal } = controller;
assert(signal);
assertEquals(signal.aborted, false);
controller.abort();
assertEquals(signal.aborted, true);
});

unitTest(function signalCallsOnabort() {
const controller = new AbortController();
const { signal } = controller;
let called = false;
signal.onabort = (evt): void => {
assert(evt);
assertEquals(evt.type, "abort");
called = true;
};
controller.abort();
assert(called);
});

unitTest(function signalEventListener() {
const controller = new AbortController();
const { signal } = controller;
let called = false;
signal.addEventListener("abort", function (ev) {
assert(this === signal);
assertEquals(ev.type, "abort");
called = true;
});
controller.abort();
assert(called);
});

unitTest(function onlyAbortsOnce() {
const controller = new AbortController();
const { signal } = controller;
let called = 0;
signal.addEventListener("abort", () => called++);
signal.onabort = (): void => {
called++;
};
controller.abort();
assertEquals(called, 2);
controller.abort();
assertEquals(called, 2);
});

unitTest(function controllerHasProperToString() {
const actual = Object.prototype.toString.call(new AbortController());
assertEquals(actual, "[object AbortController]");
});
1 change: 1 addition & 0 deletions cli/js/tests/unit_tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//
// Test runner automatically spawns subprocesses for each required permissions combination.

import "./abort_controller_test.ts";
import "./blob_test.ts";
import "./body_test.ts";
import "./buffer_test.ts";
Expand Down
23 changes: 23 additions & 0 deletions cli/js/web/abort_controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { AbortSignalImpl, signalAbort } from "./abort_signal.ts";

export class AbortControllerImpl implements AbortController {
#signal = new AbortSignalImpl();

get signal(): AbortSignal {
return this.#signal;
}

abort(): void {
this.#signal[signalAbort]();
}

get [Symbol.toStringTag](): string {
return "AbortController";
}
}

Object.defineProperty(AbortControllerImpl, "name", {
value: "AbortController",
configurable: true,
});
58 changes: 58 additions & 0 deletions cli/js/web/abort_signal.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { EventImpl } from "./event.ts";
import { EventTargetImpl } from "./event_target.ts";

export const add = Symbol("add");
export const signalAbort = Symbol("signalAbort");
export const remove = Symbol("remove");

export class AbortSignalImpl extends EventTargetImpl implements AbortSignal {
#aborted?: boolean;
#abortAlgorithms = new Set<() => void>();

// eslint-disable-next-line @typescript-eslint/no-explicit-any
onabort: ((this: AbortSignal, ev: Event) => any) | null = null;

[add](algorithm: () => void): void {
this.#abortAlgorithms.add(algorithm);
}

[signalAbort](): void {
if (this.#aborted) {
return;
}
this.#aborted = true;
for (const algorithm of this.#abortAlgorithms) {
algorithm();
}
this.#abortAlgorithms.clear();
this.dispatchEvent(new EventImpl("abort"));
}

[remove](algorithm: () => void): void {
this.#abortAlgorithms.delete(algorithm);
}

constructor() {
super();
this.addEventListener("abort", (evt: Event) => {
const { onabort } = this;
if (typeof onabort === "function") {
onabort.call(this, evt);
}
});
}

get aborted(): boolean {
return Boolean(this.#aborted);
}

get [Symbol.toStringTag](): string {
return "AbortSignal";
}
}

Object.defineProperty(AbortSignalImpl, "name", {
value: "AbortSignal",
configurable: true,
});