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.

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

Jump to bottom

stream: improve WebStreams creation performance #49089

Merged
merged 9 commits into from
Aug 13, 2023
Merged

stream: improve WebStreams creation performance #49089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
470c7a1
stream: improve WebStreams performance
rluvaton Aug 9, 2023
2b4ef06
stream: format
rluvaton Aug 9, 2023
3276266
stream: wip
rluvaton Aug 10, 2023
7e021fd
stream: fix test failures
rluvaton Aug 10, 2023
ede6c54
stream: cleanup
rluvaton Aug 10, 2023
fe25995
stream: fix tests
rluvaton Aug 10, 2023
54e8215
stream: improve perf
rluvaton Aug 10, 2023
5c53418
stream: remove fn
rluvaton Aug 10, 2023
e5a3f9e
stream: improve ReadableStreamBYOBRequest
rluvaton Aug 10, 2023
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
66 changes: 25 additions & 41 deletions lib/internal/webstreams/readablestream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const kChunk = Symbol('kChunk');
const kError = Symbol('kError');
const kPull = Symbol('kPull');
const kRelease = Symbol('kRelease');
const kSkipThrow = Symbol('kSkipThrow');

let releasedError;
let releasingError;
Expand Down Expand Up @@ -675,8 +676,10 @@ TransferredReadableStream.prototype[kDeserialize] = () => {};
class ReadableStreamBYOBRequest {
[kType] = 'ReadableStreamBYOBRequest';

constructor() {
throw new ERR_ILLEGAL_CONSTRUCTOR();
constructor(skipThrowSymbol = undefined) {
if (skipThrowSymbol !== kSkipThrow) {
throw new ERR_ILLEGAL_CONSTRUCTOR();
}
}

/**
Expand Down Expand Up @@ -758,17 +761,14 @@ ObjectDefineProperties(ReadableStreamBYOBRequest.prototype, {
});

function createReadableStreamBYOBRequest(controller, view) {
return ReflectConstruct(
function() {
this[kType] = 'ReadableStreamBYOBRequest';
this[kState] = {
controller,
view,
};
},
[],
ReadableStreamBYOBRequest,
);
const stream = new ReadableStreamBYOBRequest(kSkipThrow);

stream[kState] = {
controller,
view,
};

return stream;
}

class DefaultReadRequest {
Expand Down Expand Up @@ -1018,9 +1018,12 @@ ObjectDefineProperties(ReadableStreamBYOBReader.prototype, {

class ReadableStreamDefaultController {
[kType] = 'ReadableStreamDefaultController';
[kState] = {};

constructor() {
throw new ERR_ILLEGAL_CONSTRUCTOR();
rluvaton marked this conversation as resolved.
Show resolved Hide resolved
constructor(skipThrowSymbol = undefined) {
if (skipThrowSymbol !== kSkipThrow) {
throw new ERR_ILLEGAL_CONSTRUCTOR();
}
}

/**
Expand Down Expand Up @@ -1076,22 +1079,14 @@ ObjectDefineProperties(ReadableStreamDefaultController.prototype, {
[SymbolToStringTag]: getNonWritablePropertyDescriptor(ReadableStreamDefaultController.name),
});

function createReadableStreamDefaultController() {
return ReflectConstruct(
function() {
this[kType] = 'ReadableStreamDefaultController';
this[kState] = {};
},
[],
ReadableStreamDefaultController,
);
}

class ReadableByteStreamController {
[kType] = 'ReadableByteStreamController';
[kState] = {};

constructor() {
throw new ERR_ILLEGAL_CONSTRUCTOR();
constructor(skipThrowSymbol = undefined) {
if (skipThrowSymbol !== kSkipThrow) {
throw new ERR_ILLEGAL_CONSTRUCTOR();
}
}

/**
Expand Down Expand Up @@ -1202,17 +1197,6 @@ ObjectDefineProperties(ReadableByteStreamController.prototype, {
[SymbolToStringTag]: getNonWritablePropertyDescriptor(ReadableByteStreamController.name),
});

function createReadableByteStreamController() {
return ReflectConstruct(
function() {
this[kType] = 'ReadableByteStreamController';
this[kState] = {};
},
[],
ReadableByteStreamController,
);
}

function createTeeReadableStream(start, pull, cancel) {
return ReflectConstruct(
function() {
Expand Down Expand Up @@ -2415,7 +2399,7 @@ function setupReadableStreamDefaultControllerFromSource(
source,
highWaterMark,
sizeAlgorithm) {
const controller = createReadableStreamDefaultController();
const controller = new ReadableStreamDefaultController(kSkipThrow);
const start = source?.start;
const pull = source?.pull;
const cancel = source?.cancel;
Expand Down Expand Up @@ -3213,7 +3197,7 @@ function setupReadableByteStreamControllerFromSource(
stream,
source,
highWaterMark) {
const controller = createReadableByteStreamController();
const controller = new ReadableByteStreamController(kSkipThrow);
const start = source?.start;
const pull = source?.pull;
const cancel = source?.cancel;
Expand Down
20 changes: 8 additions & 12 deletions lib/internal/webstreams/transformstream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {
PromiseResolve,
ReflectConstruct,
SymbolToStringTag,
Symbol,
} = primordials;

const {
Expand Down Expand Up @@ -65,6 +66,8 @@ const {

const assert = require('internal/assert');

const kSkipThrow = Symbol('kSkipThrow');

const getNonWritablePropertyDescriptor = (value) => {
return {
__proto__: null,
Expand Down Expand Up @@ -268,8 +271,10 @@ TransferredTransformStream.prototype[kDeserialize] = () => {};
class TransformStreamDefaultController {
[kType] = 'TransformStreamDefaultController';

constructor() {
throw new ERR_ILLEGAL_CONSTRUCTOR();
constructor(skipThrowSymbol = undefined) {
if (skipThrowSymbol !== kSkipThrow) {
throw new ERR_ILLEGAL_CONSTRUCTOR();
}
}

/**
Expand Down Expand Up @@ -330,15 +335,6 @@ ObjectDefineProperties(TransformStreamDefaultController.prototype, {
[SymbolToStringTag]: getNonWritablePropertyDescriptor(TransformStreamDefaultController.name),
});

function createTransformStreamDefaultController() {
return ReflectConstruct(
function() {
this[kType] = 'TransformStreamDefaultController';
},
[],
TransformStreamDefaultController);
}

const isTransformStream =
isBrandCheck('TransformStream');
const isTransformStreamDefaultController =
Expand Down Expand Up @@ -453,7 +449,7 @@ function setupTransformStreamDefaultController(
function setupTransformStreamDefaultControllerFromTransformer(
stream,
transformer) {
const controller = createTransformStreamDefaultController();
const controller = new TransformStreamDefaultController(kSkipThrow);
const transform = transformer?.transform || defaultTransformAlgorithm;
const flush = transformer?.flush || nonOpFlush;
const transformAlgorithm =
Expand Down
17 changes: 6 additions & 11 deletions lib/internal/webstreams/writablestream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const assert = require('internal/assert');
const kAbort = Symbol('kAbort');
const kCloseSentinel = Symbol('kCloseSentinel');
const kError = Symbol('kError');
const kSkipThrow = Symbol('kSkipThrow');

let releasedError;

Expand Down Expand Up @@ -522,8 +523,10 @@ ObjectDefineProperties(WritableStreamDefaultWriter.prototype, {
class WritableStreamDefaultController {
[kType] = 'WritableStreamDefaultController';

constructor() {
throw new ERR_ILLEGAL_CONSTRUCTOR();
constructor(skipThrowSymbol = undefined) {
if (skipThrowSymbol !== kSkipThrow) {
throw new ERR_ILLEGAL_CONSTRUCTOR();
}
}

[kAbort](reason) {
Expand Down Expand Up @@ -569,14 +572,6 @@ ObjectDefineProperties(WritableStreamDefaultController.prototype, {
[SymbolToStringTag]: getNonWritablePropertyDescriptor(WritableStreamDefaultController.name),
});

function createWritableStreamDefaultController() {
return ReflectConstruct(
function() {
this[kType] = 'WritableStreamDefaultController';
},
[], WritableStreamDefaultController);
}

const isWritableStream =
isBrandCheck('WritableStream');
const isWritableStreamDefaultWriter =
Expand Down Expand Up @@ -1233,7 +1228,7 @@ function setupWritableStreamDefaultControllerFromSink(
sink,
highWaterMark,
sizeAlgorithm) {
const controller = createWritableStreamDefaultController();
const controller = new WritableStreamDefaultController(kSkipThrow);
const start = sink?.start;
const write = sink?.write;
const close = sink?.close;
Expand Down