Skip to content

lib: make validateInternalField() throw ERR_INVALID_THIS #58765

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
wants to merge 2 commits into from
Closed

lib: make validateInternalField() throw ERR_INVALID_THIS #58765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8de1ac
lib: make `validateInternalField()` throw `ERR_INVALID_THIS`
LiviaMedeiros Jun 19, 2025
4cba46d
lib: rename `validateInternalField` into `validateThisInternalField`
LiviaMedeiros Jun 19, 2025
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
2 changes: 1 addition & 1 deletion lib/internal/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ E('ERR_INVALID_SYNC_FORK_INPUT',
'Asynchronous forks do not support ' +
'Buffer, TypedArray, DataView or string input: %s',
TypeError);
E('ERR_INVALID_THIS', 'Value of "this" must be of type %s', TypeError);
E('ERR_INVALID_THIS', 'Value of "this" must be of type %s', TypeError, HideStackFramesError);
E('ERR_INVALID_TUPLE', '%s must be an iterable %s tuple', TypeError);
E('ERR_INVALID_TYPESCRIPT_SYNTAX', '%s', SyntaxError);
E('ERR_INVALID_URI', 'URI malformed', URIError);
Expand Down
6 changes: 3 additions & 3 deletions lib/internal/event_target.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const {
validateAbortSignal,
validateObject,
validateString,
validateInternalField,
validateThisInternalField,
kValidateObjectAllowObjects,
} = require('internal/validators');

Expand Down Expand Up @@ -1118,7 +1118,7 @@ function defineEventHandler(emitter, name, event = name) {
// 8.1.5.1 Event handlers - basically `on[eventName]` attributes
const propName = `on${name}`;
function get() {
validateInternalField(this, kHandlers, 'EventTarget');
validateThisInternalField(this, kHandlers, 'EventTarget');
return this[kHandlers]?.get(event)?.handler ?? null;
}
ObjectDefineProperty(get, 'name', {
Expand All @@ -1127,7 +1127,7 @@ function defineEventHandler(emitter, name, event = name) {
});

function set(value) {
validateInternalField(this, kHandlers, 'EventTarget');
validateThisInternalField(this, kHandlers, 'EventTarget');
let wrappedHandler = this[kHandlers]?.get(event);
if (wrappedHandler) {
if (typeof wrappedHandler.handler === 'function') {
Expand Down
8 changes: 4 additions & 4 deletions lib/internal/perf/observe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const {
const {
validateFunction,
validateObject,
validateInternalField,
validateThisInternalField,
} = require('internal/validators');

const {
Expand Down Expand Up @@ -178,12 +178,12 @@ class PerformanceObserverEntryList {
}

getEntries() {
validateInternalField(this, kBuffer, 'PerformanceObserverEntryList');
validateThisInternalField(this, kBuffer, 'PerformanceObserverEntryList');
return ArrayPrototypeSlice(this[kBuffer]);
}

getEntriesByType(type) {
validateInternalField(this, kBuffer, 'PerformanceObserverEntryList');
validateThisInternalField(this, kBuffer, 'PerformanceObserverEntryList');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('type');
}
Expand All @@ -194,7 +194,7 @@ class PerformanceObserverEntryList {
}

getEntriesByName(name, type = undefined) {
validateInternalField(this, kBuffer, 'PerformanceObserverEntryList');
validateThisInternalField(this, kBuffer, 'PerformanceObserverEntryList');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('name');
}
Expand Down
26 changes: 13 additions & 13 deletions lib/internal/perf/performance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const nodeTiming = require('internal/perf/nodetiming');
const timerify = require('internal/perf/timerify');
const { customInspectSymbol: kInspect, kEnumerableProperty, kEmptyObject } = require('internal/util');
const { inspect } = require('util');
const { validateInternalField } = require('internal/validators');
const { validateThisInternalField } = require('internal/validators');
const { convertToInt } = require('internal/webidl');

const kPerformanceBrand = Symbol('performance');
Expand All @@ -68,7 +68,7 @@ class Performance extends EventTarget {
}

clearMarks(name = undefined) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (name !== undefined) {
name = `${name}`;
}
Expand All @@ -77,28 +77,28 @@ class Performance extends EventTarget {
}

clearMeasures(name = undefined) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (name !== undefined) {
name = `${name}`;
}
clearEntriesFromBuffer('measure', name);
}

clearResourceTimings(name = undefined) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (name !== undefined) {
name = `${name}`;
}
clearEntriesFromBuffer('resource', name);
}

getEntries() {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
return filterBufferMapByNameAndType();
}

getEntriesByName(name, type = undefined) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('name');
}
Expand All @@ -110,7 +110,7 @@ class Performance extends EventTarget {
}

getEntriesByType(type) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('type');
}
Expand All @@ -119,28 +119,28 @@ class Performance extends EventTarget {
}

mark(name, options = kEmptyObject) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('name');
}
return mark(name, options);
}

measure(name, startOrMeasureOptions = kEmptyObject, endMark = undefined) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('name');
}
return measure(name, startOrMeasureOptions, endMark);
}

now() {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
return now();
}

setResourceTimingBufferSize(maxSize) {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
if (arguments.length === 0) {
throw new ERR_MISSING_ARGS('maxSize');
}
Expand All @@ -150,12 +150,12 @@ class Performance extends EventTarget {
}

get timeOrigin() {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
return getTimeOriginTimestamp();
}

toJSON() {
validateInternalField(this, kPerformanceBrand, 'Performance');
validateThisInternalField(this, kPerformanceBrand, 'Performance');
return {
nodeTiming: this.nodeTiming,
timeOrigin: this.timeOrigin,
Expand Down
16 changes: 8 additions & 8 deletions lib/internal/perf/performance_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const {
customInspectSymbol: kInspect,
kEnumerableProperty,
} = require('internal/util');
const { validateInternalField } = require('internal/validators');
const { validateThisInternalField } = require('internal/validators');

const { inspect } = require('util');

Expand Down Expand Up @@ -49,22 +49,22 @@ class PerformanceEntry {
}

get name() {
validateInternalField(this, kName, 'PerformanceEntry');
validateThisInternalField(this, kName, 'PerformanceEntry');
return this[kName];
}

get entryType() {
validateInternalField(this, kEntryType, 'PerformanceEntry');
validateThisInternalField(this, kEntryType, 'PerformanceEntry');
return this[kEntryType];
}

get startTime() {
validateInternalField(this, kStartTime, 'PerformanceEntry');
validateThisInternalField(this, kStartTime, 'PerformanceEntry');
return this[kStartTime];
}

get duration() {
validateInternalField(this, kDuration, 'PerformanceEntry');
validateThisInternalField(this, kDuration, 'PerformanceEntry');
return this[kDuration];
}

Expand All @@ -80,7 +80,7 @@ class PerformanceEntry {
}

toJSON() {
validateInternalField(this, kName, 'PerformanceEntry');
validateThisInternalField(this, kName, 'PerformanceEntry');
return {
name: this[kName],
entryType: this[kEntryType],
Expand All @@ -106,12 +106,12 @@ function createPerformanceEntry(name, type, start, duration) {
*/
class PerformanceNodeEntry extends PerformanceEntry {
get detail() {
validateInternalField(this, kDetail, 'NodePerformanceEntry');
validateThisInternalField(this, kDetail, 'NodePerformanceEntry');
return this[kDetail];
}

toJSON() {
validateInternalField(this, kName, 'PerformanceEntry');
validateThisInternalField(this, kName, 'PerformanceEntry');
return {
name: this[kName],
entryType: this[kEntryType],
Expand Down
48 changes: 24 additions & 24 deletions lib/internal/perf/resource_timing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const {
const { PerformanceEntry, kSkipThrow } = require('internal/perf/performance_entry');
const assert = require('internal/assert');
const { enqueue, bufferResourceTiming } = require('internal/perf/observe');
const { validateInternalField } = require('internal/validators');
const { validateThisInternalField } = require('internal/validators');
const { kEnumerableProperty } = require('internal/util');

const kCacheMode = Symbol('kCacheMode');
Expand All @@ -34,122 +34,122 @@ class PerformanceResourceTiming extends PerformanceEntry {
}

get name() {
validateInternalField(this, kRequestedUrl, 'PerformanceResourceTiming');
validateThisInternalField(this, kRequestedUrl, 'PerformanceResourceTiming');
return this[kRequestedUrl];
}

get startTime() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].startTime;
}

get duration() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].endTime - this[kTimingInfo].startTime;
}

get initiatorType() {
validateInternalField(this, kInitiatorType, 'PerformanceResourceTiming');
validateThisInternalField(this, kInitiatorType, 'PerformanceResourceTiming');
return this[kInitiatorType];
}

get workerStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalServiceWorkerStartTime;
}

get redirectStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].redirectStartTime;
}

get redirectEnd() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].redirectEndTime;
}

get fetchStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].postRedirectStartTime;
}

get domainLookupStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalConnectionTimingInfo?.domainLookupStartTime;
}

get domainLookupEnd() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalConnectionTimingInfo?.domainLookupEndTime;
}

get connectStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalConnectionTimingInfo?.connectionStartTime;
}

get connectEnd() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalConnectionTimingInfo?.connectionEndTime;
}

get secureConnectionStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo]
.finalConnectionTimingInfo?.secureConnectionStartTime;
}

get nextHopProtocol() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo]
.finalConnectionTimingInfo?.ALPNNegotiatedProtocol;
}

get requestStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalNetworkRequestStartTime;
}

get responseStart() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].finalNetworkResponseStartTime;
}

get responseEnd() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].endTime;
}

get encodedBodySize() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].encodedBodySize;
}

get decodedBodySize() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kTimingInfo].decodedBodySize;
}

get transferSize() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
if (this[kCacheMode] === 'local') return 0;
if (this[kCacheMode] === 'validated') return 300;

return this[kTimingInfo].encodedBodySize + 300;
}

get deliveryType() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kDeliveryType];
}

get responseStatus() {
validateInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
validateThisInternalField(this, kTimingInfo, 'PerformanceResourceTiming');
return this[kResponseStatus];
}

toJSON() {
validateInternalField(this, kInitiatorType, 'PerformanceResourceTiming');
validateThisInternalField(this, kInitiatorType, 'PerformanceResourceTiming');
return {
name: this.name,
entryType: this.entryType,
Expand Down
Loading
Loading