GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — stream: refactor to use `validateAbortSignal` · nodejs/node@17b4e9b

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal
- abort_controller.js
- webstreams
  - readablestream.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/abort_controller.js‎`

Copy file name to clipboardExpand all lines: lib/internal/abort_controller.js

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,6 @@ ObjectDefineProperty(AbortController.prototype, SymbolToStringTag, {`
`406`	`406`	`});`
`407`	`407`
`408`	`408`	`module.exports = {`
`409`		`- kAborted,`
`410`	`409`	`AbortController,`
`411`	`410`	`AbortSignal,`
`412`	`411`	`ClonedAbortSignal,`

Collapse file

`‎lib/internal/webstreams/readablestream.js‎`

Copy file name to clipboardExpand all lines: lib/internal/webstreams/readablestream.js

+13-14Lines changed: 13 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,11 @@ const {`
`58`	`58`	`} = require('internal/util');`
`59`	`59`
`60`	`60`	`const {`
	`61`	`+ validateAbortSignal,`
`61`	`62`	`validateBuffer,`
`62`	`63`	`validateObject,`
`63`	`64`	`} = require('internal/validators');`
`64`	`65`
`65`		`-const {`
`66`		`- kAborted,`
`67`		`-} = require('internal/abort_controller');`
`68`		`-`
`69`	`66`	`const {`
`70`	`67`	`MessageChannel,`
`71`	`68`	`} = require('internal/worker/io');`
`@@ -381,8 +378,9 @@ class ReadableStream {`
`381`	`378`	`const preventClose = options?.preventClose;`
`382`	`379`	`const signal = options?.signal;`
`383`	`380`
`384`		`- if (signal !== undefined && signal?.[kAborted] === undefined)`
`385`		`- throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal);`
	`381`	`+ if (signal !== undefined) {`
	`382`	`+ validateAbortSignal(signal, 'options.signal');`
	`383`	`+ }`
`386`	`384`
`387`	`385`	`if (isReadableStreamLocked(this))`
`388`	`386`	`throw new ERR_INVALID_STATE.TypeError('The ReadableStream is locked');`
`@@ -422,8 +420,9 @@ class ReadableStream {`
`422`	`420`	`const preventClose = options?.preventClose;`
`423`	`421`	`const signal = options?.signal;`
`424`	`422`
`425`		`- if (signal !== undefined && signal?.[kAborted] === undefined)`
`426`		`- throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal);`
	`423`	`+ if (signal !== undefined) {`
	`424`	`+ validateAbortSignal(signal, 'options.signal');`
	`425`	`+ }`
`427`	`426`
`428`	`427`	`if (isReadableStreamLocked(this))`
`429`	`428`	`throw new ERR_INVALID_STATE.TypeError('The ReadableStream is locked');`
`@@ -1269,12 +1268,12 @@ function readableStreamPipeTo(`
`1269`	`1268`
`1270`	`1269`	`let shuttingDown = false;`
`1271`	`1270`
`1272`		`- if (signal !== undefined && signal?.[kAborted] === undefined) {`
`1273`		`- return PromiseReject(`
`1274`		`- new ERR_INVALID_ARG_TYPE(`
`1275`		`- 'options.signal',`
`1276`		`- 'AbortSignal',`
`1277`		`- signal));`
	`1271`	`+ if (signal !== undefined) {`
	`1272`	`+ try {`
	`1273`	`+ validateAbortSignal(signal, 'options.signal');`
	`1274`	`+ } catch (error) {`
	`1275`	`+ return PromiseReject(error);`
	`1276`	`+ }`
`1278`	`1277`	`}`
`1279`	`1278`
`1280`	`1279`	`const promise = createDeferredPromise();`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.