lib: distinguish webidl interfaces with the extended property "Exposed"

Author: legendecas

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

@@ -1,23 +1,21 @@
 'use strict';
 
+/**
+ * This file exposes web interfaces that is defined with the WebIDL
+ * [Exposed=*] extended attribute.
+ * See more details at https://webidl.spec.whatwg.org/#Exposed.
+ */
+
 const {
-  ObjectDefineProperty,
   globalThis,
 } = primordials;
 
 const {
-  defineOperation,
   exposeInterface,
   lazyDOMExceptionClass,
-  defineLazyProperties,
-  defineReplaceableLazyAttribute,
   exposeLazyInterfaces,
+  exposeGetterAndSetter,
 } = require('internal/util');
-const config = internalBinding('config');
-
-// https://console.spec.whatwg.org/#console-namespace
-exposeNamespace(globalThis, 'console',
-                createGlobalConsole());
 
 const { URL, URLSearchParams } = require('internal/url');
 // https://url.spec.whatwg.org/#url
@@ -35,78 +33,24 @@ exposeGetterAndSetter(globalThis,
                         exposeInterface(globalThis, 'DOMException', value);
                       });
 
-// https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
-const timers = require('timers');
-defineOperation(globalThis, 'clearInterval', timers.clearInterval);
-defineOperation(globalThis, 'clearTimeout', timers.clearTimeout);
-defineOperation(globalThis, 'setInterval', timers.setInterval);
-defineOperation(globalThis, 'setTimeout', timers.setTimeout);
-
+// https://dom.spec.whatwg.org/#interface-abortcontroller
 // Lazy ones.
 exposeLazyInterfaces(globalThis, 'internal/abort_controller', [
   'AbortController', 'AbortSignal',
 ]);
+// https://dom.spec.whatwg.org/#interface-eventtarget
 const {
   EventTarget, Event,
 } = require('internal/event_target');
 exposeInterface(globalThis, 'Event', Event);
 exposeInterface(globalThis, 'EventTarget', EventTarget);
-exposeLazyInterfaces(globalThis, 'internal/worker/io', [
-  'MessageChannel', 'MessagePort', 'MessageEvent',
-]);
-defineLazyProperties(globalThis, 'buffer', ['atob', 'btoa']);
-// https://www.w3.org/TR/FileAPI/#dfn-Blob
-exposeLazyInterfaces(globalThis, 'internal/blob', ['Blob']);
-// https://www.w3.org/TR/hr-time-2/#the-performance-attribute
-exposeLazyInterfaces(globalThis, 'perf_hooks', [
-  'Performance', 'PerformanceEntry', 'PerformanceMark', 'PerformanceMeasure',
-  'PerformanceObserver', 'PerformanceObserverEntryList', 'PerformanceResourceTiming',
-]);
-
-defineReplaceableLazyAttribute(globalThis, 'perf_hooks', ['performance']);
 
 // https://encoding.spec.whatwg.org/#textencoder
 // https://encoding.spec.whatwg.org/#textdecoder
 exposeLazyInterfaces(globalThis,
                      'internal/encoding',
                      ['TextEncoder', 'TextDecoder']);
 
-function createGlobalConsole() {
-  const consoleFromNode =
-    require('internal/console/global');
-  if (config.hasInspector) {
-    const inspector = require('internal/util/inspector');
-    // TODO(joyeecheung): postpone this until the first time inspector
-    // is activated.
-    inspector.wrapConsole(consoleFromNode);
-    const { setConsoleExtensionInstaller } = internalBinding('inspector');
-    // Setup inspector command line API.
-    setConsoleExtensionInstaller(inspector.installConsoleExtensions);
-  }
-  return consoleFromNode;
-}
-
-// https://heycam.github.io/webidl/#es-namespaces
-function exposeNamespace(target, name, namespaceObject) {
-  ObjectDefineProperty(target, name, {
-    __proto__: null,
-    writable: true,
-    enumerable: false,
-    configurable: true,
-    value: namespaceObject
-  });
-}
-
-function exposeGetterAndSetter(target, name, getter, setter = undefined) {
-  ObjectDefineProperty(target, name, {
-    __proto__: null,
-    enumerable: false,
-    configurable: true,
-    get: getter,
-    set: setter,
-  });
-}
-
 // Web Streams API
 exposeLazyInterfaces(
   globalThis,

lib/internal/bootstrap/web/exposed-window.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const {
+  globalThis,
+} = primordials;
+
+const {
+  defineOperation,
+  defineLazyProperties,
+  defineReplaceableLazyAttribute,
+  exposeLazyInterfaces,
+  exposeNamespace,
+} = require('internal/util');
+const config = internalBinding('config');
+
+// https://console.spec.whatwg.org/#console-namespace
+exposeNamespace(globalThis, 'console',
+                createGlobalConsole());
+
+// https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
+const timers = require('timers');
+defineOperation(globalThis, 'clearInterval', timers.clearInterval);
+defineOperation(globalThis, 'clearTimeout', timers.clearTimeout);
+defineOperation(globalThis, 'setInterval', timers.setInterval);
+defineOperation(globalThis, 'setTimeout', timers.setTimeout);
+
+exposeLazyInterfaces(globalThis, 'internal/worker/io', [
+  'MessageChannel', 'MessagePort', 'MessageEvent',
+]);
+defineLazyProperties(globalThis, 'buffer', ['atob', 'btoa']);
+// https://www.w3.org/TR/FileAPI/#dfn-Blob
+exposeLazyInterfaces(globalThis, 'internal/blob', ['Blob']);
+// https://www.w3.org/TR/hr-time-2/#the-performance-attribute
+exposeLazyInterfaces(globalThis, 'perf_hooks', [
+  'Performance', 'PerformanceEntry', 'PerformanceMark', 'PerformanceMeasure',
+  'PerformanceObserver', 'PerformanceObserverEntryList', 'PerformanceResourceTiming',
+]);
+
+defineReplaceableLazyAttribute(globalThis, 'perf_hooks', ['performance']);
+
+const { installObjectURLMethods } = require('internal/url');
+installObjectURLMethods();
+
+function createGlobalConsole() {
+  const consoleFromNode =
+    require('internal/console/global');
+  if (config.hasInspector) {
+    const inspector = require('internal/util/inspector');
+    // TODO(joyeecheung): postpone this until the first time inspector
+    // is activated.
+    inspector.wrapConsole(consoleFromNode);
+    const { setConsoleExtensionInstaller } = internalBinding('inspector');
+    // Setup inspector command line API.
+    setConsoleExtensionInstaller(inspector.installConsoleExtensions);
+  }
+  return consoleFromNode;
+}

lib/internal/process/pre_execution.js

@@ -268,7 +268,7 @@ function setupFetch() {
   });
 }
 
-// TODO(aduh95): move this to internal/bootstrap/browser when the CLI flag is
+// TODO(aduh95): move this to internal/bootstrap/web/* when the CLI flag is
 //               removed.
 function setupWebCrypto() {
   if (process.config.variables.node_no_browser_globals ||
@@ -316,7 +316,7 @@ function setupCodeCoverage() {
   }
 }
 
-// TODO(daeyeon): move this to internal/bootstrap/browser when the CLI flag is
+// TODO(daeyeon): move this to internal/bootstrap/web/* when the CLI flag is
 //                removed.
 function setupCustomEvent() {
   if (process.config.variables.node_no_browser_globals ||

lib/internal/url.js

@@ -91,11 +91,6 @@ const {
   updateUrl,
 } = internalBinding('url');
 
-const {
-  storeDataObject,
-  revokeDataObject,
-} = internalBinding('blob');
-
 const FORWARD_SLASH = /\//g;
 
 const context = Symbol('context');
@@ -762,8 +757,34 @@ class URL {
       throw new ERR_INVALID_THIS('URL');
     return this[context].href;
   }
+}
 
-  static createObjectURL(obj) {
+ObjectDefineProperties(URL.prototype, {
+  [kFormat]: { __proto__: null, configurable: false, writable: false },
+  [SymbolToStringTag]: { __proto__: null, configurable: true, value: 'URL' },
+  toString: kEnumerableProperty,
+  href: kEnumerableProperty,
+  origin: kEnumerableProperty,
+  protocol: kEnumerableProperty,
+  username: kEnumerableProperty,
+  password: kEnumerableProperty,
+  host: kEnumerableProperty,
+  hostname: kEnumerableProperty,
+  port: kEnumerableProperty,
+  pathname: kEnumerableProperty,
+  search: kEnumerableProperty,
+  searchParams: kEnumerableProperty,
+  hash: kEnumerableProperty,
+  toJSON: kEnumerableProperty,
+});
+
+function installObjectURLMethods() {
+  const {
+    storeDataObject,
+    revokeDataObject,
+  } = internalBinding('blob');
+
+  function createObjectURL(obj) {
     const cryptoRandom = lazyCryptoRandom();
     if (cryptoRandom === undefined)
       throw new ERR_NO_CRYPTO();
@@ -779,7 +800,7 @@ class URL {
     return `blob:nodedata:${id}`;
   }
 
-  static revokeObjectURL(url) {
+  function revokeObjectURL(url) {
     url = `${url}`;
     try {
       // TODO(@anonrig): Remove this try/catch by calling `parse` directly.
@@ -791,31 +812,24 @@ class URL {
       // If there's an error, it's ignored.
     }
   }
-}
-
-ObjectDefineProperties(URL.prototype, {
-  [kFormat]: { __proto__: null, configurable: false, writable: false },
-  [SymbolToStringTag]: { __proto__: null, configurable: true, value: 'URL' },
-  toString: kEnumerableProperty,
-  href: kEnumerableProperty,
-  origin: kEnumerableProperty,
-  protocol: kEnumerableProperty,
-  username: kEnumerableProperty,
-  password: kEnumerableProperty,
-  host: kEnumerableProperty,
-  hostname: kEnumerableProperty,
-  port: kEnumerableProperty,
-  pathname: kEnumerableProperty,
-  search: kEnumerableProperty,
-  searchParams: kEnumerableProperty,
-  hash: kEnumerableProperty,
-  toJSON: kEnumerableProperty,
-});
 
-ObjectDefineProperties(URL, {
-  createObjectURL: kEnumerableProperty,
-  revokeObjectURL: kEnumerableProperty,
-});
+  ObjectDefineProperties(URL, {
+    createObjectURL: {
+      __proto__: null,
+      configurable: true,
+      writable: true,
+      enumerable: true,
+      value: createObjectURL,
+    },
+    revokeObjectURL: {
+      __proto__: null,
+      configurable: true,
+      writable: true,
+      enumerable: true,
+      value: revokeObjectURL,
+    },
+  });
+}
 
 function initSearchParams(url, init) {
   if (!init) {
@@ -1310,6 +1324,7 @@ module.exports = {
   pathToFileURL,
   toPathIfFileURL,
   isURLInstance,
+  installObjectURLMethods,
   URL,
   URLSearchParams,
   domainToASCII,

lib/internal/util.js

@@ -511,6 +511,27 @@ function exposeInterface(target, name, interfaceObject) {
   });
 }
 
+// https://heycam.github.io/webidl/#es-namespaces
+function exposeNamespace(target, name, namespaceObject) {
+  ObjectDefineProperty(target, name, {
+    __proto__: null,
+    writable: true,
+    enumerable: false,
+    configurable: true,
+    value: namespaceObject,
+  });
+}
+
+function exposeGetterAndSetter(target, name, getter, setter = undefined) {
+  ObjectDefineProperty(target, name, {
+    __proto__: null,
+    enumerable: false,
+    configurable: true,
+    get: getter,
+    set: setter,
+  });
+}
+
 function defineLazyProperties(target, id, keys, enumerable = true) {
   const descriptors = { __proto__: null };
   let mod;
@@ -750,6 +771,8 @@ module.exports = {
   emitExperimentalWarning,
   exposeInterface,
   exposeLazyInterfaces,
+  exposeNamespace,
+  exposeGetterAndSetter,
   filterDuplicateStrings,
   filterOwnProperties,
   getConstructorOf,

src/node_realm.cc

@@ -224,7 +224,13 @@ MaybeLocal<Value> Realm::BootstrapNode() {
   }
 
   if (!env_->no_browser_globals()) {
-    result = ExecuteBootstrapper("internal/bootstrap/browser");
+    result = ExecuteBootstrapper("internal/bootstrap/web/exposed-wildcard");
+
+    if (result.IsEmpty()) {
+      return MaybeLocal<Value>();
+    }
+
+    result = ExecuteBootstrapper("internal/bootstrap/web/exposed-window");
 
     if (result.IsEmpty()) {
       return MaybeLocal<Value>();