Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions lib/internal/webstreams/readablestream.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const {
canCopyArrayBuffer,
cloneAsUint8Array,
copyArrayBuffer,
createPromiseCallback,
createPromiseCallback1Param,
customInspect,
dequeueValue,
enqueueValueWithSize,
Expand Down Expand Up @@ -2582,10 +2582,10 @@ function setupReadableStreamDefaultControllerFromSource(
FunctionPrototypeBind(start, source, controller) :
nonOpStart;
const pullAlgorithm = pull ?
createPromiseCallback('source.pull', pull, source) :
createPromiseCallback1Param('source.pull', pull, source) :
nonOpPull;
const cancelAlgorithm = cancel ?
createPromiseCallback('source.cancel', cancel, source) :
createPromiseCallback1Param('source.cancel', cancel, source) :
nonOpCancel;

setupReadableStreamDefaultController(
Expand Down Expand Up @@ -3405,10 +3405,10 @@ function setupReadableByteStreamControllerFromSource(
FunctionPrototypeBind(start, source, controller) :
nonOpStart;
const pullAlgorithm = pull ?
createPromiseCallback('source.pull', pull, source, controller) :
createPromiseCallback1Param('source.pull', pull, source) :
nonOpPull;
const cancelAlgorithm = cancel ?
createPromiseCallback('source.cancel', cancel, source) :
createPromiseCallback1Param('source.cancel', cancel, source) :
nonOpCancel;

if (autoAllocateChunkSize === 0) {
Expand Down
9 changes: 5 additions & 4 deletions lib/internal/webstreams/transformstream.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ const {
} = require('internal/worker/js_transferable');

const {
createPromiseCallback,
createPromiseCallback1Param,
createPromiseCallback2Params,
customInspect,
extractHighWaterMark,
extractSizeAlgorithm,
Expand Down Expand Up @@ -462,13 +463,13 @@ function setupTransformStreamDefaultControllerFromTransformer(
const flush = transformer?.flush;
const cancel = transformer?.cancel;
const transformAlgorithm = transform ?
createPromiseCallback('transformer.transform', transform, transformer) :
createPromiseCallback2Params('transformer.transform', transform, transformer) :
defaultTransformAlgorithm;
const flushAlgorithm = flush ?
createPromiseCallback('transformer.flush', flush, transformer) :
createPromiseCallback1Param('transformer.flush', flush, transformer) :
nonOpFlush;
const cancelAlgorithm = cancel ?
createPromiseCallback('transformer.cancel', cancel, transformer) :
createPromiseCallback1Param('transformer.cancel', cancel, transformer) :
nonOpCancel;

setupTransformStreamDefaultController(
Expand Down
26 changes: 22 additions & 4 deletions lib/internal/webstreams/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ const {
ArrayPrototypePush,
ArrayPrototypeShift,
AsyncIteratorPrototype,
FunctionPrototypeCall,
MathMax,
NumberIsNaN,
PromisePrototypeThen,
ReflectApply,
ReflectGet,
Symbol,
Uint8Array,
Expand Down Expand Up @@ -169,9 +169,25 @@ function enqueueValueWithSize(controller, value, size) {
controller[kState].queueTotalSize += size;
}

function createPromiseCallback(name, fn, thisArg) {
// Arity-specialized variants of the promise-callback wrapper. The generic
// rest-parameter + ReflectApply form allocated an arguments array on every
// invocation; these run on per-chunk hot paths (pull/write/transform), so
// each known call-site arity gets its own wrapper. The exact number of
// arguments passed through to the user callback is observable and must be
// preserved.
function createPromiseCallbackNoParams(name, fn, thisArg) {
validateFunction(fn, name);
return async (...args) => ReflectApply(fn, thisArg, args);
return async () => FunctionPrototypeCall(fn, thisArg);
}

function createPromiseCallback1Param(name, fn, thisArg) {
validateFunction(fn, name);
return async (arg) => FunctionPrototypeCall(fn, thisArg, arg);
}

function createPromiseCallback2Params(name, fn, thisArg) {
validateFunction(fn, name);
return async (arg1, arg2) => FunctionPrototypeCall(fn, thisArg, arg1, arg2);
}

function isPromisePending(promise) {
Expand Down Expand Up @@ -213,7 +229,9 @@ module.exports = {
canCopyArrayBuffer,
cloneAsUint8Array,
copyArrayBuffer,
createPromiseCallback,
createPromiseCallbackNoParams,
createPromiseCallback1Param,
createPromiseCallback2Params,
customInspect,
dequeueValue,
enqueueValueWithSize,
Expand Down
10 changes: 6 additions & 4 deletions lib/internal/webstreams/writablestream.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ const {
} = require('internal/worker/js_transferable');

const {
createPromiseCallback,
createPromiseCallbackNoParams,
createPromiseCallback1Param,
createPromiseCallback2Params,
customInspect,
dequeueValue,
enqueueValueWithSize,
Expand Down Expand Up @@ -1272,13 +1274,13 @@ function setupWritableStreamDefaultControllerFromSink(
FunctionPrototypeBind(start, sink, controller) :
nonOpStart;
const writeAlgorithm = write ?
createPromiseCallback('sink.write', write, sink) :
createPromiseCallback2Params('sink.write', write, sink) :
nonOpWrite;
const closeAlgorithm = close ?
createPromiseCallback('sink.close', close, sink) :
createPromiseCallbackNoParams('sink.close', close, sink) :
nonOpCancel;
const abortAlgorithm = abort ?
createPromiseCallback('sink.abort', abort, sink) :
createPromiseCallback1Param('sink.abort', abort, sink) :
nonOpCancel;
setupWritableStreamDefaultController(
stream,
Expand Down
Loading