Merge pull request #145 from SocketDev/better-npm-errors-and-detection

more robustly handle npm version changes

Author: bmeck

.gitignore

@@ -18,3 +18,4 @@
 
 # Library specific ones
 !/.vscode/extensions.json
+/test/socket-npm-fixtures/**/node_modules/

lib/shadow/npm-injection.cjs

@@ -254,29 +254,44 @@ const ttyServerPromise = chalkPromise.then(async (chalk) => {
 const npmEntrypoint = fs.realpathSync(`${process.argv[1]}`)
 /**
  * @param {string} filepath
- * @returns {string}
+ * @returns {string | null}
  */
 function findRoot (filepath) {
   if (path.basename(filepath) === 'npm') {
     return filepath
   }
   const parent = path.dirname(filepath)
   if (parent === filepath) {
-    process.exit(127)
+    return null
   }
   return findRoot(parent)
 }
 const npmDir = findRoot(path.dirname(npmEntrypoint))
-const arboristLibClassPath = path.join(npmDir, 'node_modules', '@npmcli', 'arborist', 'lib', 'arborist', 'index.js')
+if (npmDir === null) {
+  console.error('Unable to find npm cli install directory, this is potentiall a bug with socket-npm caused by changes to npm cli.')
+  console.error(`Searched parent directories of ${npmEntrypoint}`)
+  process.exit(127)
+}
+let arboristLibClassPath
+try {
+  arboristLibClassPath = path.join(npmDir, 'node_modules', '@npmcli', 'arborist', 'lib', 'arborist', 'index.js')
+} catch (e) {
+  console.error('Unable to integrate with npm cli internals, this is potentially a bug with socket-npm caused by changes to npm cli.')
+  process.exit(127);
+}
 
-const npmVersion = process.env.NPM_VERSION.split('.')
 let npmlog
 
-if(npmVersion[0] === '10' && npmVersion[1] >= '6'){
-  const { log } = require(path.join(npmDir, 'node_modules', 'proc-log', 'lib', 'index.js'))
-  npmlog = log
-} else {
+try {
   npmlog = require(path.join(npmDir, 'node_modules', 'npmlog', 'lib', 'log.js'))
+} catch {
+  try {
+    const { log } = require(path.join(npmDir, 'node_modules', 'proc-log', 'lib', 'index.js'))
+    npmlog = log
+  } catch {
+    console.error('Unable to integrate with npm cli logging infrastructure, this is potentially a bug with socket-npm caused by changes to npm cli.')
+    process.exit(127);
+  }
 }
 
 /**

package.json

@@ -103,7 +103,7 @@
   },
 
   "scripts": {
-    "check:dependency-check": "dependency-check '*.js' 'lib/shadow/*.cjs' '*.mjs' 'test/**/*.js' --no-dev --ignore-module node:* --ignore-module @cyclonedx/* --ignore-module synp",
+    "check:dependency-check": "dependency-check '*.js' 'lib/shadow/*.cjs' '*.mjs' 'test/*.js' --no-dev --ignore-module node:* --ignore-module @cyclonedx/* --ignore-module synp",
     "check:installed-check": "installed-check -i eslint-plugin-jsdoc",
     "check:lint": "eslint --report-unused-disable-directives .",
     "check:tsc": "tsc",