reorder reading env allowing one off commands to work when logged in

Author: bmeck

lib/shadow/npm-injection.cjs

@@ -40,34 +40,50 @@ try {
  */
 
 const pubTokenPromise = sdkPromise.then(({ getDefaultKey, FREE_API_KEY }) => getDefaultKey() || FREE_API_KEY)
-const apiKeySettingsPromise = sdkPromise.then(async ({ setupSdk }) => {
-  const sdk = await setupSdk(await pubTokenPromise)
-  const orgResult = await sdk.getOrganizations()
-  if (!orgResult.success) {
-    throw new Error('Failed to fetch Socket organization info: ' + orgResult.error.message)
-  }
-  /**
-   * @type {(Exclude<typeof orgResult.data.organizations[string], undefined>)[]}
-   */
-  const orgs = []
-  for (const org of Object.values(orgResult.data.organizations)) {
-    if (org) {
-      orgs.push(org)
+const apiKeySettingsInit = sdkPromise.then(async ({ setupSdk }) => {
+  try {
+    const sdk = await setupSdk(await pubTokenPromise)
+    const orgResult = await sdk.getOrganizations()
+    if (!orgResult.success) {
+      throw new Error('Failed to fetch Socket organization info: ' + orgResult.error.message)
+    }
+    /**
+     * @type {(Exclude<typeof orgResult.data.organizations[string], undefined>)[]}
+     */
+    const orgs = []
+    for (const org of Object.values(orgResult.data.organizations)) {
+      if (org) {
+        orgs.push(org)
+      }
+    }
+    const result = await sdk.postSettings(orgs.map(org => {
+      return {
+        organization: org.id
+      }
+    }))
+    if (!result.success) {
+      throw new Error('Failed to fetch API key settings: ' + result.error.message)
     }
-  }
-  const result = await sdk.postSettings(orgs.map(org => {
     return {
-      organization: org.id
+      orgs,
+      settings: result.data
     }
-  }))
-  if (!result.success) {
-    throw new Error('Failed to fetch API key settings: ' + result.error.message)
-  }
-  return {
-    orgs,
-    settings: result.data
+  } catch (e) {
+    if (e && typeof e === 'object' && 'cause' in e) {
+      const cause = e.cause
+      if (isErrnoException(cause)) {
+        if (cause.code === 'ENOTFOUND' || cause.code === 'ECONNREFUSED') {
+          throw new Error('Unable to connect to socket.dev, ensure internet connectivity before retrying', {
+            cause: e
+          })
+        }
+      }
+    }
+    throw e
   }
 })
+// mark apiKeySettingsInit as handled
+apiKeySettingsInit.catch(() => {})
 
 /**
  *
@@ -78,42 +94,43 @@ async function findSocketYML () {
   const fs = require('fs/promises')
   while (dir !== prevDir) {
     const ymlPath = path.join(dir, 'socket.yml')
+    const yml = fs.readFile(ymlPath, 'utf-8')
     // mark as handled
-    const yml = fs.readFile(ymlPath, 'utf-8').catch(() => {})
+    yml.catch(() => {})
     const yamlPath = path.join(dir, 'socket.yaml')
+    const yaml = fs.readFile(yamlPath, 'utf-8')
     // mark as handled
-    const yaml = fs.readFile(yamlPath, 'utf-8').catch(() => {})
-    try {
-      const txt = await yml
-      if (txt != null) {
-        return {
-          path: ymlPath,
-          parsed: config.parseSocketConfig(txt)
-        }
-      }
-    } catch (e) {
+    yaml.catch(() => {})
+    /**
+     * @param {unknown} e
+     * @returns {boolean}
+     */
+    function checkFileFoundError (e) {
       if (isErrnoException(e)) {
         if (e.code !== 'ENOENT' && e.code !== 'EISDIR') {
           throw e
         }
-      } else {
+        return false
+      }
+      return true
+    }
+    try {
+      return {
+        path: ymlPath,
+        parsed: config.parseSocketConfig(await yml)
+      }
+    } catch (e) {
+      if (checkFileFoundError(e)) {
         throw new Error('Found file but was unable to parse ' + ymlPath)
       }
     }
     try {
-      const txt = await yaml
-      if (txt != null) {
-        return {
-          path: yamlPath,
-          parsed: config.parseSocketConfig(txt)
-        }
+      return {
+        path: ymlPath,
+        parsed: config.parseSocketConfig(await yaml)
       }
     } catch (e) {
-      if (isErrnoException(e)) {
-        if (e.code !== 'ENOENT' && e.code !== 'EISDIR') {
-          throw e
-        }
-      } else {
+      if (checkFileFoundError(e)) {
         throw new Error('Found file but was unable to parse ' + yamlPath)
       }
     }
@@ -124,11 +141,12 @@ async function findSocketYML () {
 }
 
 /**
- * @type {Promise<ReturnType<import('../utils/issue-rules.cjs')['createIssueUXLookup']>>}
+ * @type {Promise<ReturnType<import('../utils/issue-rules.cjs')['createIssueUXLookup']> | undefined>}
  */
-const uxLookupPromise = settingsPromise.then(async ({ getSetting }) => {
+const uxLookupInit = settingsPromise.then(async ({ getSetting }) => {
   const enforcedOrgs = getSetting('enforcedOrgs') ?? []
-  const { orgs, settings } = await apiKeySettingsPromise
+  const remoteSettings = await apiKeySettingsInit
+  const { orgs, settings } = remoteSettings
 
   // remove any organizations not being enforced
   for (const [i, org] of orgs.entries()) {
@@ -152,6 +170,8 @@ const uxLookupPromise = settingsPromise.then(async ({ getSetting }) => {
   }
   return createIssueUXLookup(settings)
 })
+// mark uxLookupInit as handled
+uxLookupInit.catch(() => {})
 
 // shadow `npm` and `npx` to mitigate subshells
 require('./link.cjs')(fs.realpathSync(path.join(__dirname, 'bin')), 'npm')
@@ -506,7 +526,7 @@ async function packagesHaveRiskyIssues (safeArb, _registry, pkgs, ora = null, _i
     const pkgDatas = []
     try {
       // TODO: determine org based on cwd, pass in
-      const uxLookup = await uxLookupPromise
+      const uxLookup = await uxLookupInit()
 
       for await (const pkgData of batchScan(pkgs.map(pkg => pkg.pkgid))) {
         /**

lib/shadow/tty-server.cjs

@@ -1,7 +1,8 @@
 const path = require('path')
 const { PassThrough } = require('stream')
-const { isErrnoException } = require('../utils/type-helpers.cjs')
+
 const ipc_version = require('../../package.json').version
+const { isErrnoException } = require('../utils/type-helpers.cjs')
 
 /**
  * @typedef {import('stream').Readable} Readable

lib/utils/sdk.js

@@ -20,7 +20,7 @@ let defaultKey
 
 /** @returns {string | undefined} */
 export function getDefaultKey () {
-  defaultKey = getSetting('apiKey') || process.env['SOCKET_SECURITY_API_KEY'] || defaultKey
+  defaultKey = process.env['SOCKET_SECURITY_API_KEY'] || getSetting('apiKey') || defaultKey
   return defaultKey
 }
 

tsconfig.json

@@ -9,16 +9,17 @@
     "test/**/*"
   ],
   "exclude": [
-    "lib/shadow/**"
+    "alib/shadow/**"
   ],
   "compilerOptions": {
     "allowJs": true,
     "checkJs": true,
     "noEmit": true,
     "resolveJsonModule": true,
-    "module": "es2022",
+    "module": "NodeNext",
     "moduleResolution": "node",
-    "target": "ESNext",
+    "lib": ["ES2022"],
+    "target": "es2022",
     "types": ["node"],
 
     /* New checks being tried out */