Add constants.processEnv

Author: jdalton

bin/cli.js

@@ -12,8 +12,6 @@ const { spawn } = require(
   path.join(rootPath, 'external/@socketsecurity/registry/lib/spawn.js'),
 )
 
-const { NODE_COMPILE_CACHE } = constants
-
 process.exitCode = 1
 
 spawn(
@@ -39,7 +37,8 @@ spawn(
   {
     env: {
       ...process.env,
-      ...(NODE_COMPILE_CACHE ? { NODE_COMPILE_CACHE } : undefined),
+      // Lazily access constants.processEnv.
+      ...constants.processEnv,
     },
     stdio: 'inherit',
   },

src/constants.mts

@@ -82,6 +82,10 @@ type ENV = Remap<
     }>
 >
 
+type ProcessEnv = {
+  [K in keyof ENV]?: string
+}
+
 type IPC = Readonly<{
   SOCKET_CLI_FIX?: string | undefined
   SOCKET_CLI_OPTIMIZE?: boolean | undefined
@@ -162,6 +166,7 @@ type Constants = Remap<
     readonly minimumVersionByAgent: Map<Agent, string>
     readonly nmBinPath: string
     readonly nodeHardenFlags: string[]
+    readonly processEnv: ProcessEnv
     readonly rootPath: string
     readonly shadowBinPath: string
     readonly shadowNpmBinPath: string
@@ -508,6 +513,28 @@ const lazyNpmNmNodeGypPath = () =>
     '../../node_modules/node-gyp/bin/node-gyp.js',
   )
 
+const lazyProcessEnv = () =>
+  // Lazily access constants.ENV.
+  Object.setPrototypeOf(
+    Object.fromEntries(
+      Object.entries(constants.ENV).reduce(
+        (entries, entry) => {
+          const { 0: key, 1: value } = entry
+          if (typeof value === 'string') {
+            if (value) {
+              entries.push(entry as [string, string])
+            }
+          } else if (typeof value === 'boolean') {
+            entries.push([key, value ? '1' : '0'])
+          }
+          return entries
+        },
+        [] as Array<[string, string]>,
+      ),
+    ),
+    null,
+  )
+
 const lazyRootPath = () => path.join(realpathSync.native(__dirname), '..')
 
 const lazyShadowBinPath = () =>
@@ -638,6 +665,7 @@ const constants: Constants = createConstantsObject(
     nmBinPath: undefined,
     nodeHardenFlags: undefined,
     npmNmNodeGypPath: undefined,
+    processEnv: undefined,
     rootPath: undefined,
     shadowBinPath: undefined,
     shadowNpmInjectPath: undefined,
@@ -669,6 +697,7 @@ const constants: Constants = createConstantsObject(
       nmBinPath: lazyNmBinPath,
       nodeHardenFlags: lazyNodeHardenFlags,
       npmNmNodeGypPath: lazyNpmNmNodeGypPath,
+      processEnv: lazyProcessEnv,
       rootPath: lazyRootPath,
       shadowBinPath: lazyShadowBinPath,
       shadowNpmBinPath: lazyShadowNpmBinPath,

src/shadow/npm/bin.mts

@@ -20,8 +20,6 @@ export default async function shadowBin(
   args = process.argv.slice(2),
 ) {
   process.exitCode = 1
-  // Lazily access constants.ENV.NODE_COMPILE_CACHE
-  const { NODE_COMPILE_CACHE } = constants.ENV
   const terminatorPos = args.indexOf('--')
   const rawBinArgs = terminatorPos === -1 ? args : args.slice(0, terminatorPos)
   const binArgs = rawBinArgs.filter(
@@ -101,7 +99,8 @@ export default async function shadowBin(
     {
       env: {
         ...process.env,
-        ...(NODE_COMPILE_CACHE ? { NODE_COMPILE_CACHE } : undefined),
+        // Lazily access constants.processEnv.
+        ...constants.processEnv,
       },
       // 'inherit' + 'ipc'
       stdio: [0, 1, 2, 'ipc'],

src/shadow/npm/install.mts

@@ -41,8 +41,6 @@ export function safeNpmInstall(
     spinner,
     ...spawnOptions
   } = { __proto__: null, ...options } as SafeNpmInstallOptions
-  // Lazily access constants.ENV.NODE_COMPILE_CACHE
-  const { NODE_COMPILE_CACHE } = constants.ENV
   let stdio = spawnOptions.stdio
   const useIpc = isObject(ipc)
   // Include 'ipc' in the spawnOptions.stdio when an options.ipc object is provided.
@@ -101,7 +99,8 @@ export function safeNpmInstall(
       stdio,
       env: {
         ...process.env,
-        ...(NODE_COMPILE_CACHE ? { NODE_COMPILE_CACHE } : undefined),
+        // Lazily access constants.processEnv.
+        ...constants.processEnv,
         ...spawnOptions.env,
       },
     },

src/utils/agent.mts

@@ -45,6 +45,8 @@ export function runAgentInstall(
     ...spawnOptions,
     env: {
       ...process.env,
+      // Lazily access constants.processEnv.
+      ...constants.processEnv,
       NODE_OPTIONS: cmdFlagsToString([
         ...(skipNodeHardenFlags
           ? []

src/utils/coana.mts

@@ -29,10 +29,10 @@ export async function spawnCoana(
         ...options,
         env: {
           ...process.env,
-          ...spawnEnv,
-          SOCKET_CLI_API_BASE_URL:
-            constants.ENV.SOCKET_CLI_API_BASE_URL || undefined,
+          // Lazily access constants.processEnv.
+          ...constants.processEnv,
           SOCKET_CLI_API_TOKEN: getDefaultToken(),
+          ...spawnEnv,
         },
       },
       extra,

src/utils/sdk.mts

@@ -71,8 +71,9 @@ export function hasDefaultToken(): boolean {
 
 export function getPublicToken(): string {
   return (
+    getDefaultToken() ||
     // Lazily access constants.ENV.SOCKET_CLI_API_TOKEN.
-    (constants.ENV.SOCKET_CLI_API_TOKEN || getDefaultToken()) ??
+    constants.ENV.SOCKET_CLI_API_TOKEN ||
     // Lazily access constants.SOCKET_PUBLIC_API_TOKEN.
     constants.SOCKET_PUBLIC_API_TOKEN
   )

test/socket-cdxgen.test.mts

@@ -23,6 +23,8 @@ const spawnOpts: PromiseSpawnOptions = {
   cwd: npmFixturesPath,
   env: {
     ...process.env,
+    // Lazily access constants.processEnv.
+    ...constants.processEnv,
     SOCKET_CLI_DEBUG: '1',
   },
 }

test/socket-npm.test.mts

@@ -57,6 +57,8 @@ for (const npmDir of ['npm9', 'npm10', 'npm11']) {
               cwd: path.join(npmFixturesPath, 'lacking-typosquat'),
               env: {
                 ...process.env,
+                // Lazily access constants.processEnv.
+                ...constants.processEnv,
                 // Lazily access constants.ENV.PATH.
                 PATH: `${npmBinPath}:${constants.ENV.PATH}`,
               },

test/utils.mts

@@ -52,7 +52,12 @@ export async function invokeNpm(
       [entryPath, ...args],
       {
         cwd: npmFixturesPath,
-        env: { ...process.env, ...env },
+        env: {
+          ...process.env,
+          // Lazily access constants.processEnv.
+          ...constants.processEnv,
+          ...env,
+        },
       },
     )
     return {