Commit a9528e8
stream: use internal addAbortListener
PR-URL: #52081
Refs: #48596
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent b9d8a14 commit a9528e8
4 files changed
Lines changed: 5 additions & 5 deletions
File tree
- lib/internal
- streams
- webstreams
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -51,7 +51,7 @@ module.exports.addAbortSignalNoValidate = function(signal, stream) { | |||
| 51 | 51 | if (signal.aborted) { | |
| 52 | 52 | onAbort(); | |
| 53 | 53 | } else { | |
| 54 | - addAbortListener ??= require('events').addAbortListener; | ||
| 54 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 55 | 55 | const disposable = addAbortListener(signal, onAbort); | |
| 56 | 56 | eos(stream, disposable[SymbolDispose]); | |
| 57 | 57 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -254,7 +254,7 @@ function eos(stream, options, callback) { | |||
| 254 | 254 | if (options.signal.aborted) { | |
| 255 | 255 | process.nextTick(abort); | |
| 256 | 256 | } else { | |
| 257 | - addAbortListener ??= require('events').addAbortListener; | ||
| 257 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 258 | 258 | const disposable = addAbortListener(options.signal, abort); | |
| 259 | 259 | const originalCallback = callback; | |
| 260 | 260 | callback = once((...args) => { | |
@@ -278,7 +278,7 @@ function eosWeb(stream, options, callback) { | |||
| 278 | 278 | if (options.signal.aborted) { | |
| 279 | 279 | process.nextTick(abort); | |
| 280 | 280 | } else { | |
| 281 | - addAbortListener ??= require('events').addAbortListener; | ||
| 281 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 282 | 282 | const disposable = addAbortListener(options.signal, abort); | |
| 283 | 283 | const originalCallback = callback; | |
| 284 | 284 | callback = once((...args) => { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -208,7 +208,7 @@ function pipelineImpl(streams, callback, opts) { | |||
| 208 | 208 | finishImpl(new AbortError()); | |
| 209 | 209 | } | |
| 210 | 210 | ||
| 211 | - addAbortListener ??= require('events').addAbortListener; | ||
| 211 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 212 | 212 | let disposable; | |
| 213 | 213 | if (outerSignal) { | |
| 214 | 214 | disposable = addAbortListener(outerSignal, abort); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1523,7 +1523,7 @@ function readableStreamPipeTo( | |||
| 1523 | 1523 | abortAlgorithm(); | |
| 1524 | 1524 | return promise.promise; | |
| 1525 | 1525 | } | |
| 1526 | - addAbortListener ??= require('events').addAbortListener; | ||
| 1526 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 1527 | 1527 | disposable = addAbortListener(signal, abortAlgorithm); | |
| 1528 | 1528 | } | |
| 1529 | 1529 | ||
0 commit comments