From 2b020c897a777a4ff0ece680da117a27d8d1f151 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Wed, 24 Apr 2024 20:57:29 -0700 Subject: [PATCH] lib: make navigator not runtime-lookup process.version/arch/platform Preserves #53649. --- lib/internal/navigator.js | 58 ++++++++++++++------------- lib/internal/process/per_thread.js | 7 ++++ test/parallel/test-navigator.js | 64 +++++++++++++++++++++--------- 3 files changed, 84 insertions(+), 45 deletions(-) diff --git a/lib/internal/navigator.js b/lib/internal/navigator.js index e56b2da5e339e3..6e184fe91bd1ea 100644 --- a/lib/internal/navigator.js +++ b/lib/internal/navigator.js @@ -27,52 +27,57 @@ const { } = internalBinding('os'); const kInitialize = Symbol('kInitialize'); -const nodeVersion = process.version; + +const { + platform, + arch, + version: nodeVersion, + language, +} = require('internal/process/per_thread'); /** - * @param {object} process - * @param {string} process.platform - * @param {string} process.arch + * @param {string} arch + * @param {string} platform * @returns {string} */ -function getNavigatorPlatform(process) { - if (process.platform === 'darwin') { +function getNavigatorPlatform(arch, platform) { + 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 { @@ -80,7 +85,7 @@ class Navigator { #availableParallelism; #userAgent; #platform; - #language; + #language = language; #languages; constructor() { @@ -102,7 +107,6 @@ class Navigator { * @return {string} */ get language() { - this.#language ??= Intl?.Collator().resolvedOptions().locale || 'en-US'; return this.#language; } @@ -126,7 +130,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/per_thread.js b/lib/internal/process/per_thread.js index 408fb1b944d2a8..2f78c7b21ff9fc 100644 --- a/lib/internal/process/per_thread.js +++ b/lib/internal/process/per_thread.js @@ -423,6 +423,9 @@ function toggleTraceCategoryState(asyncHooksEnabled) { } } +const { arch, platform, version } = process; +const language = Intl?.Collator().resolvedOptions().locale || 'en-US'; + module.exports = { toggleTraceCategoryState, assert, @@ -430,4 +433,8 @@ module.exports = { wrapProcessMethods, hrtime, hrtimeBigInt, + arch, + platform, + version, + language, }; diff --git a/test/parallel/test-navigator.js b/test/parallel/test-navigator.js index 53949cea246d16..ebd1f67760bd44 100644 --- 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'); @@ -57,23 +85,23 @@ if (process.platform === 'darwin') { assert.strictEqual(navigator.platform, `${process.platform[0].toUpperCase()}${process.platform.slice(1)} ${process.arch}`); } -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'darwin' }), 'MacIntel'); -assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'darwin' }), 'MacIntel'); -assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'linux' }), 'Linux i686'); -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'linux' }), 'Linux x86_64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'linux' }), 'Linux arm64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'win32' }), 'Win32'); -assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'win32' }), 'Win32'); -assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'freebsd' }), 'FreeBSD i386'); -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'freebsd' }), 'FreeBSD amd64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'freebsd' }), 'FreeBSD arm64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'openbsd' }), 'OpenBSD i386'); -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'openbsd' }), 'OpenBSD amd64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'arm64', platform: 'openbsd' }), 'OpenBSD arm64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'ia32', platform: 'sunos' }), 'SunOS i86pc'); -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'sunos' }), 'SunOS x64'); -assert.strictEqual(getNavigatorPlatform({ arch: 'ppc', platform: 'aix' }), 'AIX'); -assert.strictEqual(getNavigatorPlatform({ arch: 'x64', platform: 'reactos' }), 'Reactos x64'); +assert.strictEqual(getNavigatorPlatform('x64', 'darwin'), 'MacIntel'); +assert.strictEqual(getNavigatorPlatform('arm64', 'darwin'), 'MacIntel'); +assert.strictEqual(getNavigatorPlatform('ia32', 'linux'), 'Linux i686'); +assert.strictEqual(getNavigatorPlatform('x64', 'linux'), 'Linux x86_64'); +assert.strictEqual(getNavigatorPlatform('arm64', 'linux'), 'Linux arm64'); +assert.strictEqual(getNavigatorPlatform('x64', 'win32'), 'Win32'); +assert.strictEqual(getNavigatorPlatform('arm64', 'win32'), 'Win32'); +assert.strictEqual(getNavigatorPlatform('ia32', 'freebsd'), 'FreeBSD i386'); +assert.strictEqual(getNavigatorPlatform('x64', 'freebsd'), 'FreeBSD amd64'); +assert.strictEqual(getNavigatorPlatform('arm64', 'freebsd'), 'FreeBSD arm64'); +assert.strictEqual(getNavigatorPlatform('ia32', 'openbsd'), 'OpenBSD i386'); +assert.strictEqual(getNavigatorPlatform('x64', 'openbsd'), 'OpenBSD amd64'); +assert.strictEqual(getNavigatorPlatform('arm64', 'openbsd'), 'OpenBSD arm64'); +assert.strictEqual(getNavigatorPlatform('ia32', 'sunos'), 'SunOS i86pc'); +assert.strictEqual(getNavigatorPlatform('x64', 'sunos'), 'SunOS x64'); +assert.strictEqual(getNavigatorPlatform('ppc', 'aix'), 'AIX'); +assert.strictEqual(getNavigatorPlatform('x64', 'reactos'), 'Reactos x64'); assert.strictEqual(typeof navigator.language, 'string'); assert.strictEqual(navigator.language.length !== 0, true);