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

Support AbortController #2020

Merged
merged 20 commits into from Jul 24, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
23 changes: 23 additions & 0 deletions documentation/2-options.md
Expand Up @@ -209,6 +209,29 @@ await got('https://httpbin.org/anything');
#### **Note:**
> - If you're passing an absolute URL as `url`, you need to set `prefixUrl` to an empty string.


### `signal`

**Type: [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)**

You can abort the `request` using [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).

*Requires Node.js 16 or later.*

```js
import got from 'got';

const abortController = new AbortController();

const request = got('https://httpbin.org/anything', {
signal: abortController.signal
});

setTimeout(() => {
abortController.abort();
}, 100);
```

### `method`

**Type: `string`**\
Expand Down
4 changes: 4 additions & 0 deletions source/core/index.ts
Expand Up @@ -235,6 +235,10 @@ export default class Request extends Duplex implements RequestEvents<Request> {
return;
}

this.options.signal?.addEventListener('abort', () => {
this.destroy(new Error('This operation was aborted.'));
szmarczak marked this conversation as resolved.
Show resolved Hide resolved
});

// Important! If you replace `body` in a handler with another stream, make sure it's readable first.
// The below is run only once.
const {body} = this.options;
Expand Down
32 changes: 32 additions & 0 deletions source/core/options.ts
Expand Up @@ -827,6 +827,7 @@ const defaultInternals: Options['_internals'] = {
},
setHost: true,
maxHeaderSize: undefined,
signal: undefined,
};

const cloneInternals = (internals: typeof defaultInternals) => {
Expand Down Expand Up @@ -1484,6 +1485,36 @@ export default class Options {
}
}

/**
You can abort the `request` using [`AbortController`](https://developer.mozilla.org/en-US/docs/Web/API/AbortController).

**Requires Node.js 16 or later.*
jopemachine marked this conversation as resolved.
Show resolved Hide resolved

@example
```
import got from 'got';

const abortController = new AbortController();

const request = got('https://httpbin.org/anything', {
signal: abortController.signal
});

setTimeout(() => {
abortController.abort();
}, 100);
```
*/
get signal(): AbortSignal | undefined {
return this._internals.signal;
}

set signal(value: AbortSignal | undefined) {
assert.object(value);

this._internals.signal = value;
}

/**
Ignore invalid cookies instead of throwing an error.
Only useful when the `cookieJar` option has been set. Not recommended.
Expand Down Expand Up @@ -2473,5 +2504,6 @@ export default class Options {
Object.freeze(options.retry.methods);
Object.freeze(options.retry.statusCodes);
Object.freeze(options.context);
Object.freeze(options.signal);
}
}
267 changes: 267 additions & 0 deletions test/abort.ts
@@ -0,0 +1,267 @@
import process from 'process';
import {EventEmitter} from 'events';
import stream, {Readable as ReadableStream} from 'stream';
import test from 'ava';
import delay from 'delay';
import {pEvent} from 'p-event';
import {Handler} from 'express';
import got from '../source/index.js';
import slowDataStream from './helpers/slow-data-stream.js';
import {GlobalClock} from './helpers/types.js';
import {ExtendedHttpTestServer} from './helpers/create-http-test-server.js';
import withServer, {withServerAndFakeTimers} from './helpers/with-server.js';

const prepareServer = (server: ExtendedHttpTestServer, clock: GlobalClock): {emitter: EventEmitter; promise: Promise<unknown>} => {
const emitter = new EventEmitter();

const promise = new Promise<void>((resolve, reject) => {
server.all('/abort', async (request, response) => {
emitter.emit('connection');

request.once('aborted', resolve);
response.once('finish', reject.bind(null, new Error('Request finished instead of aborting.')));

try {
await pEvent(request, 'end');
} catch {
// Node.js 15.0.0 throws AND emits `aborted`
}

response.end();
});

server.get('/redirect', (_request, response) => {
response.writeHead(302, {
location: `${server.url}/abort`,
});
response.end();

emitter.emit('sentRedirect');

clock.tick(3000);
resolve();
});
});

return {emitter, promise};
};

const downloadHandler = (clock?: GlobalClock): Handler => (_request, response) => {
response.writeHead(200, {
'transfer-encoding': 'chunked',
});

response.flushHeaders();

stream.pipeline(
slowDataStream(clock),
response,
() => {
response.end();
},
);
};

if (globalThis.AbortController !== undefined) {
test.serial('does not retry after abort', withServerAndFakeTimers, async (t, server, got, clock) => {
const {emitter, promise} = prepareServer(server, clock);
const controller = new AbortController();

const gotPromise = got('redirect', {
signal: controller.signal,
retry: {
calculateDelay() {
t.fail('Makes a new try after abort');
return 0;
},
},
});

emitter.once('sentRedirect', () => {
controller.abort();
});

await t.throwsAsync(gotPromise, {
name: 'AbortError',
});

await t.notThrowsAsync(promise, 'Request finished instead of aborting.');
});

test.serial('abort request timeouts', withServer, async (t, server, got) => {
server.get('/', () => {});

const controller = new AbortController();

const gotPromise = got({
signal: controller.signal,
timeout: {
request: 10,
},
retry: {
calculateDelay({computedValue}) {
process.nextTick(() => {
controller.abort();
});

if (computedValue) {
return 20;
}

return 0;
},
limit: 1,
},
});

await t.throwsAsync(gotPromise, {
name: 'AbortError',
});

// Wait for unhandled errors
await delay(40);
});

test.serial('aborts in-progress request', withServerAndFakeTimers, async (t, server, got, clock) => {
const {emitter, promise} = prepareServer(server, clock);

const controller = new AbortController();

const body = new ReadableStream({
read() {},
});
body.push('1');

const gotPromise = got.post('abort', {body, signal: controller.signal});

// Wait for the connection to be established before canceling
emitter.once('connection', () => {
controller.abort();
body.push(null);
});

await t.throwsAsync(gotPromise, {
name: 'AbortError',
});
await t.notThrowsAsync(promise, 'Request finished instead of aborting.');
});

test.serial('aborts in-progress request with timeout', withServerAndFakeTimers, async (t, server, got, clock) => {
const {emitter, promise} = prepareServer(server, clock);

const controller = new AbortController();

const body = new ReadableStream({
read() {},
});
body.push('1');

const gotPromise = got.post('abort', {body, timeout: {request: 10_000}, signal: controller.signal});

// Wait for the connection to be established before canceling
emitter.once('connection', () => {
controller.abort();
body.push(null);
});

await t.throwsAsync(gotPromise, {
name: 'AbortError',
});
await t.notThrowsAsync(promise, 'Request finished instead of aborting.');
});

test.serial('abort immediately', withServerAndFakeTimers, async (t, server, got, clock) => {
const controller = new AbortController();

const promise = new Promise<void>((resolve, reject) => {
// We won't get an abort or even a connection
// We assume no request within 1000ms equals a (client side) aborted request
server.get('/abort', (_request, response) => {
response.once('finish', reject.bind(global, new Error('Request finished instead of aborting.')));
response.end();
});

clock.tick(1000);
resolve();
});

const gotPromise = got('abort', {signal: controller.signal});
controller.abort();

await t.throwsAsync(gotPromise, {
name: 'AbortError',
});
await t.notThrowsAsync(promise, 'Request finished instead of aborting.');
});

test('recover from abort using abortable promise attribute', async t => {
// Abort before connection started
const controller = new AbortController();

const p = got('http://example.com', {signal: controller.signal});
const recover = p.catch((error: Error) => {
if (controller.signal.aborted) {
return;
}

throw error;
});

controller.abort();

await t.notThrowsAsync(recover);
});

test('recover from abort using error instance', async t => {
const controller = new AbortController();

const p = got('http://example.com', {signal: controller.signal});
const recover = p.catch((error: Error) => {
if (error.name === 'AbortError') {
return;
}

throw error;
});

controller.abort();

await t.notThrowsAsync(recover);
});

// TODO: Use `fakeTimers` here
test.serial('throws on incomplete (aborted) response', withServer, async (t, server, got) => {
server.get('/', downloadHandler());

const controller = new AbortController();

const promise = got('', {signal: controller.signal});

setTimeout(() => {
controller.abort();
}, 400);

await t.throwsAsync(promise, {
name: 'AbortError',
});
});

test('throws when aborting cached request', withServer, async (t, server, got) => {
server.get('/', (_request, response) => {
response.setHeader('Cache-Control', 'public, max-age=60');
response.end(Date.now().toString());
});

const cache = new Map();

await got({cache});

const controller = new AbortController();
const promise = got({cache, signal: controller.signal});
controller.abort();

await t.throwsAsync(promise, {
name: 'AbortError',
});
});
}