lib: make navigator not runtime-lookup process.version/arch/platform

Preserves most of nodejs#53649, except for `#language` due to the lack of Intl primordials.
ljharb · Apr 25, 2024 · 0f7da61 · 0f7da61
1 parent b9289a6
commit 0f7da61
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 39 deletions.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -85,6 +85,10 @@ const {
   },
 } = internalBinding('util');
 
+require('internal/process/arch'); // Ensure the process arch is cached
+require('internal/process/platform'); // Ensure the process platform is cached
+require('internal/process/version'); // Etnsure the process version is cached
+
 setupProcessObject();
 
 setupGlobalProxy();

diff --git a/lib/internal/navigator.js b/lib/internal/navigator.js
@@ -27,60 +27,62 @@ const {
 } = internalBinding('os');
 
 const kInitialize = Symbol('kInitialize');
-const nodeVersion = process.version;
+const nodeVersion = require('internal/process/version');
+const platform = require('internal/process/platform');
+const arch = require('internal/process/arch');
 
 /**
  * @param {object} process
  * @param {string} process.platform
  * @param {string} process.arch
  * @returns {string}
  */
-function getNavigatorPlatform(process) {
-  if (process.platform === 'darwin') {
+function getNavigatorPlatform({ platform, arch }) {
+  if (platform === 'darwin') {
     // On macOS, modern browsers return 'MacIntel' even if running on Apple Silicon.
     return 'MacIntel';
-  } else if (process.platform === 'win32') {
+  } else if (platform === 'win32') {
     // On Windows, modern browsers return 'Win32' even if running on a 64-bit version of Windows.
     // https://developer.mozilla.org/en-US/docs/Web/API/Navigator/platform#usage_notes
     return 'Win32';
-  } else if (process.platform === 'linux') {
-    if (process.arch === 'ia32') {
+  } else if (platform === 'linux') {
+    if (arch === 'ia32') {
       return 'Linux i686';
-    } else if (process.arch === 'x64') {
+    } else if (arch === 'x64') {
       return 'Linux x86_64';
     }
-    return `Linux ${process.arch}`;
-  } else if (process.platform === 'freebsd') {
-    if (process.arch === 'ia32') {
+    return `Linux ${arch}`;
+  } else if (platform === 'freebsd') {
+    if (arch === 'ia32') {
       return 'FreeBSD i386';
-    } else if (process.arch === 'x64') {
+    } else if (arch === 'x64') {
       return 'FreeBSD amd64';
     }
-    return `FreeBSD ${process.arch}`;
-  } else if (process.platform === 'openbsd') {
-    if (process.arch === 'ia32') {
+    return `FreeBSD ${arch}`;
+  } else if (platform === 'openbsd') {
+    if (arch === 'ia32') {
       return 'OpenBSD i386';
-    } else if (process.arch === 'x64') {
+    } else if (arch === 'x64') {
       return 'OpenBSD amd64';
     }
-    return `OpenBSD ${process.arch}`;
-  } else if (process.platform === 'sunos') {
-    if (process.arch === 'ia32') {
+    return `OpenBSD ${arch}`;
+  } else if (platform === 'sunos') {
+    if (arch === 'ia32') {
       return 'SunOS i86pc';
     }
-    return `SunOS ${process.arch}`;
-  } else if (process.platform === 'aix') {
+    return `SunOS ${arch}`;
+  } else if (platform === 'aix') {
     return 'AIX';
   }
-  return `${StringPrototypeToUpperCase(process.platform[0])}${StringPrototypeSlice(process.platform, 1)} ${process.arch}`;
+  return `${StringPrototypeToUpperCase(platform[0])}${StringPrototypeSlice(platform, 1)} ${arch}`;
 }
 
 class Navigator {
   // Private properties are used to avoid brand validations.
   #availableParallelism;
   #userAgent;
   #platform;
-  #language;
+  #language = Intl?.Collator().resolvedOptions().locale || 'en-US';
   #languages;
 
   constructor() {
@@ -102,7 +104,6 @@ class Navigator {
    * @return {string}
    */
   get language() {
-    this.#language ??= Intl?.Collator().resolvedOptions().locale || 'en-US';
     return this.#language;
   }
 
@@ -126,7 +127,7 @@ class Navigator {
    * @return {string}
    */
   get platform() {
-    this.#platform ??= getNavigatorPlatform(process);
+    this.#platform ??= getNavigatorPlatform({ arch, platform });
     return this.#platform;
   }
 }

diff --git a/lib/internal/process/arch.js b/lib/internal/process/arch.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('process').arch;
diff --git a/lib/internal/process/platform.js b/lib/internal/process/platform.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('process').platform;
diff --git a/lib/internal/process/version.js b/lib/internal/process/version.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('process').version;
diff --git a/test/parallel/test-bootstrap-modules.js b/test/parallel/test-bootstrap-modules.js
@@ -58,28 +58,32 @@ expected.beforePreExec = new Set([
   'NativeModule internal/process/promises',
   'NativeModule internal/fixed_queue',
   'NativeModule async_hooks',
-  'NativeModule internal/process/task_queues',
-  'NativeModule timers',
+  'Internal Binding blob',
+  'Internal Binding mksnapshot',
+  'Internal Binding performance',
+  'Internal Binding permission',
   'Internal Binding trace_events',
+  'Internal Binding url',
+  'NativeModule internal/console/constructor',
+  'NativeModule internal/console/global',
   'NativeModule internal/constants',
-  'NativeModule path',
+  'NativeModule internal/event_target',
+  'NativeModule internal/perf/utils',
+  'NativeModule internal/process/arch',
   'NativeModule internal/process/execution',
   'NativeModule internal/process/permission',
+  'NativeModule internal/process/platform',
+  'NativeModule internal/process/task_queues',
+  'NativeModule internal/process/version',
   'NativeModule internal/process/warning',
-  'NativeModule internal/console/constructor',
-  'NativeModule internal/console/global',
   'NativeModule internal/querystring',
-  'NativeModule querystring',
-  'Internal Binding url',
-  'Internal Binding blob',
   'NativeModule internal/url',
-  'NativeModule util',
   'NativeModule internal/webidl',
-  'Internal Binding performance',
-  'Internal Binding permission',
-  'NativeModule internal/perf/utils',
-  'NativeModule internal/event_target',
-  'Internal Binding mksnapshot',
+  'NativeModule path',
+  'NativeModule process',
+  'NativeModule querystring',
+  'NativeModule timers',
+  'NativeModule util',
   'NativeModule internal/v8/startup_snapshot',
   'NativeModule internal/process/signal',
   'Internal Binding fs',

diff --git a/test/parallel/test-navigator.js b/test/parallel/test-navigator.js
@@ -2,8 +2,36 @@
 
 'use strict';
 
-const common = require('../common');
+/* eslint node-core/require-common-first: 0 */
+
 const assert = require('assert');
+
+{
+
+  // Ensures `navigator` has not been evaluated yet
+  assert.strictEqual(require.resolve('../common') in require.cache, false);
+
+  const { version, platform, arch } = process;
+  try {
+    let called = false;
+    Object.defineProperty(process, 'arch', { get() { called += 'arch|'; return arch; } });
+    Object.defineProperty(process, 'platform', { get() { called = 'platform|'; return platform; } });
+    Object.defineProperty(process, 'version', { get() { called = 'version|'; return version; } });
+
+    navigator; // eslint-disable-line no-unused-expressions
+
+    assert.strictEqual(
+      called,
+      false
+    );
+  } finally {
+    Object.defineProperty(process, 'arch', { value: arch });
+    Object.defineProperty(process, 'platform', { value: platform });
+    Object.defineProperty(process, 'version', { value: version });
+  }
+}
+
+const common = require('../common');
 const { getNavigatorPlatform } = require('internal/navigator');
 const { execFile } = require('child_process');