Skip to content

Commit b37ef83

Browse files
legendecastargos
legendecas
authored and
targos
committed
lib: distinguish webidl interfaces with the extended property "Exposed"
PR-URL: #46809 Refs: #42528 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
1 parent 9537672 commit b37ef83

6 files changed

Lines changed: 131 additions & 81 deletions

File tree

lib/internal/bootstrap/browser.js renamed to lib/internal/bootstrap/web/exposed-wildcard.js

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
'use strict';
22

3+
/**
4+
* This file exposes web interfaces that is defined with the WebIDL
5+
* [Exposed=*] extended attribute.
6+
* See more details at https://webidl.spec.whatwg.org/#Exposed.
7+
*/
8+
39
const {
4-
ObjectDefineProperty,
510
globalThis,
611
} = primordials;
712

813
const {
9-
defineOperation,
1014
exposeInterface,
1115
lazyDOMExceptionClass,
12-
defineLazyProperties,
13-
defineReplaceableLazyAttribute,
1416
exposeLazyInterfaces,
17+
exposeGetterAndSetter,
18+
exposeNamespace,
1519
} = require('internal/util');
1620
const config = internalBinding('config');
1721

@@ -35,36 +39,17 @@ exposeGetterAndSetter(globalThis,
3539
exposeInterface(globalThis, 'DOMException', value);
3640
});
3741

38-
// https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
39-
const timers = require('timers');
40-
defineOperation(globalThis, 'clearInterval', timers.clearInterval);
41-
defineOperation(globalThis, 'clearTimeout', timers.clearTimeout);
42-
defineOperation(globalThis, 'setInterval', timers.setInterval);
43-
defineOperation(globalThis, 'setTimeout', timers.setTimeout);
44-
42+
// https://dom.spec.whatwg.org/#interface-abortcontroller
4543
// Lazy ones.
46-
exposeLazyInterfaces(globalThis, 'internal/worker/io', ['BroadcastChannel']);
4744
exposeLazyInterfaces(globalThis, 'internal/abort_controller', [
4845
'AbortController', 'AbortSignal',
4946
]);
47+
// https://dom.spec.whatwg.org/#interface-eventtarget
5048
const {
5149
EventTarget, Event,
5250
} = require('internal/event_target');
5351
exposeInterface(globalThis, 'Event', Event);
5452
exposeInterface(globalThis, 'EventTarget', EventTarget);
55-
exposeLazyInterfaces(globalThis, 'internal/worker/io', [
56-
'MessageChannel', 'MessagePort', 'MessageEvent',
57-
]);
58-
defineLazyProperties(globalThis, 'buffer', ['atob', 'btoa']);
59-
// https://www.w3.org/TR/FileAPI/#dfn-Blob
60-
exposeLazyInterfaces(globalThis, 'internal/blob', ['Blob']);
61-
// https://www.w3.org/TR/hr-time-2/#the-performance-attribute
62-
exposeLazyInterfaces(globalThis, 'perf_hooks', [
63-
'Performance', 'PerformanceEntry', 'PerformanceMark', 'PerformanceMeasure',
64-
'PerformanceObserver', 'PerformanceObserverEntryList', 'PerformanceResourceTiming',
65-
]);
66-
67-
defineReplaceableLazyAttribute(globalThis, 'perf_hooks', ['performance']);
6853

6954
// https://encoding.spec.whatwg.org/#textencoder
7055
// https://encoding.spec.whatwg.org/#textdecoder
@@ -87,27 +72,6 @@ function createGlobalConsole() {
8772
return consoleFromNode;
8873
}
8974

90-
// https://heycam.github.io/webidl/#es-namespaces
91-
function exposeNamespace(target, name, namespaceObject) {
92-
ObjectDefineProperty(target, name, {
93-
__proto__: null,
94-
writable: true,
95-
enumerable: false,
96-
configurable: true,
97-
value: namespaceObject,
98-
});
99-
}
100-
101-
function exposeGetterAndSetter(target, name, getter, setter = undefined) {
102-
ObjectDefineProperty(target, name, {
103-
__proto__: null,
104-
enumerable: false,
105-
configurable: true,
106-
get: getter,
107-
set: setter,
108-
});
109-
}
110-
11175
// Web Streams API
11276
exposeLazyInterfaces(
11377
globalThis,

‎lib/internal/bootstrap/web/exposed-window-or-worker.js‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
'use strict';
2+
3+
/**
4+
* This file exposes web interfaces that is defined with the WebIDL
5+
* Exposed=(Window,Worker) extended attribute or exposed in
6+
* WindowOrWorkerGlobalScope mixin.
7+
* See more details at https://webidl.spec.whatwg.org/#Exposed and
8+
* https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope.
9+
*/
10+
11+
const {
12+
globalThis,
13+
} = primordials;
14+
15+
const {
16+
defineOperation,
17+
defineLazyProperties,
18+
defineReplaceableLazyAttribute,
19+
exposeLazyInterfaces,
20+
} = require('internal/util');
21+
22+
// https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
23+
const timers = require('timers');
24+
defineOperation(globalThis, 'clearInterval', timers.clearInterval);
25+
defineOperation(globalThis, 'clearTimeout', timers.clearTimeout);
26+
defineOperation(globalThis, 'setInterval', timers.setInterval);
27+
defineOperation(globalThis, 'setTimeout', timers.setTimeout);
28+
29+
// https://html.spec.whatwg.org/multipage/web-messaging.html#broadcasting-to-other-browsing-contexts
30+
exposeLazyInterfaces(globalThis, 'internal/worker/io', ['BroadcastChannel']);
31+
exposeLazyInterfaces(globalThis, 'internal/worker/io', [
32+
'MessageChannel', 'MessagePort', 'MessageEvent',
33+
]);
34+
defineLazyProperties(globalThis, 'buffer', ['atob', 'btoa']);
35+
// https://www.w3.org/TR/FileAPI/#dfn-Blob
36+
exposeLazyInterfaces(globalThis, 'internal/blob', ['Blob']);
37+
// https://www.w3.org/TR/hr-time-2/#the-performance-attribute
38+
exposeLazyInterfaces(globalThis, 'perf_hooks', [
39+
'Performance', 'PerformanceEntry', 'PerformanceMark', 'PerformanceMeasure',
40+
'PerformanceObserver', 'PerformanceObserverEntryList', 'PerformanceResourceTiming',
41+
]);
42+
43+
defineReplaceableLazyAttribute(globalThis, 'perf_hooks', ['performance']);
44+
45+
// https://w3c.github.io/FileAPI/#creating-revoking
46+
const { installObjectURLMethods } = require('internal/url');
47+
installObjectURLMethods();

‎lib/internal/process/pre_execution.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function setupFetch() {
262262
});
263263
}
264264

265-
// TODO(aduh95): move this to internal/bootstrap/browser when the CLI flag is
265+
// TODO(aduh95): move this to internal/bootstrap/web/* when the CLI flag is
266266
// removed.
267267
function setupWebCrypto() {
268268
if (process.config.variables.node_no_browser_globals ||
@@ -310,7 +310,7 @@ function setupCodeCoverage() {
310310
}
311311
}
312312

313-
// TODO(daeyeon): move this to internal/bootstrap/browser when the CLI flag is
313+
// TODO(daeyeon): move this to internal/bootstrap/web/* when the CLI flag is
314314
// removed.
315315
function setupCustomEvent() {
316316
if (process.config.variables.node_no_browser_globals ||

‎lib/internal/url.js‎

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ const {
9191
updateUrl,
9292
} = internalBinding('url');
9393

94-
const {
95-
storeDataObject,
96-
revokeDataObject,
97-
} = internalBinding('blob');
98-
9994
const FORWARD_SLASH = /\//g;
10095

10196
const context = Symbol('context');
@@ -760,8 +755,33 @@ class URL {
760755
throw new ERR_INVALID_THIS('URL');
761756
return this[context].href;
762757
}
758+
}
759+
760+
ObjectDefineProperties(URL.prototype, {
761+
[SymbolToStringTag]: { __proto__: null, configurable: true, value: 'URL' },
762+
toString: kEnumerableProperty,
763+
href: kEnumerableProperty,
764+
origin: kEnumerableProperty,
765+
protocol: kEnumerableProperty,
766+
username: kEnumerableProperty,
767+
password: kEnumerableProperty,
768+
host: kEnumerableProperty,
769+
hostname: kEnumerableProperty,
770+
port: kEnumerableProperty,
771+
pathname: kEnumerableProperty,
772+
search: kEnumerableProperty,
773+
searchParams: kEnumerableProperty,
774+
hash: kEnumerableProperty,
775+
toJSON: kEnumerableProperty,
776+
});
777+
778+
function installObjectURLMethods() {
779+
const {
780+
storeDataObject,
781+
revokeDataObject,
782+
} = internalBinding('blob');
763783

764-
static createObjectURL(obj) {
784+
function createObjectURL(obj) {
765785
const cryptoRandom = lazyCryptoRandom();
766786
if (cryptoRandom === undefined)
767787
throw new ERR_NO_CRYPTO();
@@ -777,7 +797,7 @@ class URL {
777797
return `blob:nodedata:${id}`;
778798
}
779799

780-
static revokeObjectURL(url) {
800+
function revokeObjectURL(url) {
781801
url = `${url}`;
782802
try {
783803
// TODO(@anonrig): Remove this try/catch by calling `parse` directly.
@@ -789,30 +809,24 @@ class URL {
789809
// If there's an error, it's ignored.
790810
}
791811
}
792-
}
793-
794-
ObjectDefineProperties(URL.prototype, {
795-
[SymbolToStringTag]: { __proto__: null, configurable: true, value: 'URL' },
796-
toString: kEnumerableProperty,
797-
href: kEnumerableProperty,
798-
origin: kEnumerableProperty,
799-
protocol: kEnumerableProperty,
800-
username: kEnumerableProperty,
801-
password: kEnumerableProperty,
802-
host: kEnumerableProperty,
803-
hostname: kEnumerableProperty,
804-
port: kEnumerableProperty,
805-
pathname: kEnumerableProperty,
806-
search: kEnumerableProperty,
807-
searchParams: kEnumerableProperty,
808-
hash: kEnumerableProperty,
809-
toJSON: kEnumerableProperty,
810-
});
811812

812-
ObjectDefineProperties(URL, {
813-
createObjectURL: kEnumerableProperty,
814-
revokeObjectURL: kEnumerableProperty,
815-
});
813+
ObjectDefineProperties(URL, {
814+
createObjectURL: {
815+
__proto__: null,
816+
configurable: true,
817+
writable: true,
818+
enumerable: true,
819+
value: createObjectURL,
820+
},
821+
revokeObjectURL: {
822+
__proto__: null,
823+
configurable: true,
824+
writable: true,
825+
enumerable: true,
826+
value: revokeObjectURL,
827+
},
828+
});
829+
}
816830

817831
// application/x-www-form-urlencoded parser
818832
// Ref: https://url.spec.whatwg.org/#concept-urlencoded-parser
@@ -1297,6 +1311,7 @@ module.exports = {
12971311
fileURLToPath,
12981312
pathToFileURL,
12991313
toPathIfFileURL,
1314+
installObjectURLMethods,
13001315
isURLInstance,
13011316
URL,
13021317
URLSearchParams,

‎lib/internal/util.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,27 @@ function exposeInterface(target, name, interfaceObject) {
511511
});
512512
}
513513

514+
// https://heycam.github.io/webidl/#es-namespaces
515+
function exposeNamespace(target, name, namespaceObject) {
516+
ObjectDefineProperty(target, name, {
517+
__proto__: null,
518+
writable: true,
519+
enumerable: false,
520+
configurable: true,
521+
value: namespaceObject,
522+
});
523+
}
524+
525+
function exposeGetterAndSetter(target, name, getter, setter = undefined) {
526+
ObjectDefineProperty(target, name, {
527+
__proto__: null,
528+
enumerable: false,
529+
configurable: true,
530+
get: getter,
531+
set: setter,
532+
});
533+
}
534+
514535
function defineLazyProperties(target, id, keys, enumerable = true) {
515536
const descriptors = { __proto__: null };
516537
let mod;
@@ -750,6 +771,8 @@ module.exports = {
750771
emitExperimentalWarning,
751772
exposeInterface,
752773
exposeLazyInterfaces,
774+
exposeNamespace,
775+
exposeGetterAndSetter,
753776
filterDuplicateStrings,
754777
filterOwnProperties,
755778
getConstructorOf,

‎src/node_realm.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,10 @@ MaybeLocal<Value> Realm::BootstrapNode() {
218218
}
219219

220220
if (!env_->no_browser_globals()) {
221-
result = ExecuteBootstrapper("internal/bootstrap/browser");
222-
223-
if (result.IsEmpty()) {
221+
if (ExecuteBootstrapper("internal/bootstrap/web/exposed-wildcard")
222+
.IsEmpty() ||
223+
ExecuteBootstrapper("internal/bootstrap/web/exposed-window-or-worker")
224+
.IsEmpty()) {
224225
return MaybeLocal<Value>();
225226
}
226227
}

0 commit comments

Comments
 (0)