Skip to content

events: extract addAbortListener for safe internal use #52081

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.

Sign up for GitHub

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

Closed
atlowChemi wants to merge 10 commits into from
Closed

events: extract addAbortListener for safe internal use #52081

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29ee68a
events: extract addAbortListener for safe internal use
atlowChemi Mar 14, 2024
814ff46
child_process: use internal addAbortListener
atlowChemi Mar 14, 2024
0e2ac27
dgram: use internal addAbortListener
atlowChemi Mar 14, 2024
0169b22
net: use internal addAbortListener
atlowChemi Mar 14, 2024
8260223
readline: use internal addAbortListener
atlowChemi Mar 14, 2024
4a76d0d
http2: use internal addAbortListener
atlowChemi Mar 14, 2024
54b7633
stream: use internal addAbortListener
atlowChemi Mar 14, 2024
be86203
test_runner: use internal addAbortListener
atlowChemi Mar 14, 2024
4b7ac75
watch: use internal addAbortListener
atlowChemi Mar 14, 2024
3117855
fixup! events: extract addAbortListener for safe internal use
atlowChemi Mar 15, 2024
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
Prev Previous commit
Next Next commit
stream: use internal addAbortListener
  • Loading branch information
@atlowChemi
atlowChemi committed Mar 15, 2024
commit 54b7633a7cbac5b8d5e487dc59d8e36011923fd3
2 changes: 1 addition & 1 deletion lib/internal/streams/add-abort-signal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module.exports.addAbortSignalNoValidate = function(signal, stream) {
if (signal.aborted) {
onAbort();
} else {
addAbortListener ??= require('events').addAbortListener;
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
const disposable = addAbortListener(signal, onAbort);
eos(stream, disposable[SymbolDispose]);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/streams/end-of-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ function eos(stream, options, callback) {
if (options.signal.aborted) {
process.nextTick(abort);
} else {
addAbortListener ??= require('events').addAbortListener;
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
const disposable = addAbortListener(options.signal, abort);
const originalCallback = callback;
callback = once((...args) => {
Expand All @@ -278,7 +278,7 @@ function eosWeb(stream, options, callback) {
if (options.signal.aborted) {
process.nextTick(abort);
} else {
addAbortListener ??= require('events').addAbortListener;
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
const disposable = addAbortListener(options.signal, abort);
const originalCallback = callback;
callback = once((...args) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/streams/pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ function pipelineImpl(streams, callback, opts) {
finishImpl(new AbortError());
}

addAbortListener ??= require('events').addAbortListener;
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
let disposable;
if (outerSignal) {
disposable = addAbortListener(outerSignal, abort);
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/webstreams/readablestream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,7 @@ function readableStreamPipeTo(
abortAlgorithm();
return promise.promise;
}
addAbortListener ??= require('events').addAbortListener;
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
disposable = addAbortListener(signal, abortAlgorithm);
}

Expand Down