@socketsecurity/cli-with-sentry 1.0.83 → 1.0.85

package/dist/cli.js

@@ -1047,15 +1047,15 @@ async function fetchScanData(orgSlug, scanId, options) {
     updateScan('failure; unknown blocking error occurred');
     return {
       ok: false,
-      message: 'Unexpected Socket API error',
-      cause: `We encountered an unexpected error while requesting the Scan from the API: ${e?.message || '(no error message found)'}${e?.cause ? ` (cause: ${e.cause})` : ''}`
+      message: 'Socket API error',
+      cause: `Error requesting scan: ${e?.message || '(no error message found)'}${e?.cause ? ` (cause: ${e.cause})` : ''}`
     };
   }), fetchSecurityPolicy().catch(e => {
     updatePolicy('failure; unknown blocking error occurred');
     return {
       ok: false,
-      message: 'Unexpected Socket API error',
-      cause: `We encountered an unexpected error while requesting the policy from the Socket API: ${e?.message || '(no error message found)'}${e?.cause ? ` (cause: ${e.cause})` : ''}`
+      message: 'Socket API error',
+      cause: `Error requesting policy: ${e?.message || '(no error message found)'}${e?.cause ? ` (cause: ${e.cause})` : ''}`
     };
   })]).finally(() => {
     finishedFetching = true;
@@ -3627,15 +3627,23 @@ async function getFixEnv() {
 }
 
 async function getActualTree(cwd = process.cwd()) {
-  // @npmcli/arborist DOES have partial support for pnpm structured node_modules
-  // folders. However, support is iffy resulting in unhappy path errors and hangs.
-  // So, to avoid the unhappy path, we restrict our usage to --dry-run loading
-  // of the node_modules folder.
-  const arb = new shadowNpmInject.Arborist({
-    path: cwd,
-    ...shadowNpmInject.SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES
-  });
-  return await arb.loadActual();
+  try {
+    // @npmcli/arborist DOES have partial support for pnpm structured node_modules
+    // folders. However, support is iffy resulting in unhappy paths of errors and hangs.
+    // So, to avoid unhappy paths, we restrict our usage to --dry-run loading of the
+    // node_modules folder.
+    const arb = new shadowNpmInject.Arborist({
+      path: cwd,
+      ...shadowNpmInject.SAFE_NO_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES
+    });
+    return {
+      actualTree: await arb.loadActual()
+    };
+  } catch (e) {
+    return {
+      error: e
+    };
+  }
 }
 
 const {
@@ -3865,7 +3873,13 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
         }
         if (fixEnv.isCi && fs$1.existsSync(path.join(rootPath, 'node_modules'))) {
           // eslint-disable-next-line no-await-in-loop
-          actualTree = await getActualTree(cwd);
+          const treeResult = await getActualTree(cwd);
+          const maybeActualTree = treeResult.actualTree;
+          if (!maybeActualTree) {
+            // Exit early if install fails.
+            return handleInstallFail(treeResult.error);
+          }
+          actualTree = maybeActualTree;
         } else {
           // eslint-disable-next-line no-await-in-loop
           const installResult = await installer(pkgEnvDetails, {
@@ -4258,50 +4272,37 @@ async function install$1(pkgEnvDetails, options) {
   // default is "notice".
   // https://docs.npmjs.com/cli/v8/using-npm/config#loglevel
   ...(useDebug ? [] : ['--silent']), ...(extraArgs ?? [])];
-  const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
-  require$$6.debugFn('stdio', `spawn: ${quotedCmd}`);
   const isSpinning = spinner?.isSpinning;
   spinner?.stop();
-  let error;
-  let errored = false;
+  const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
+  require$$6.debugFn('stdio', `spawn: ${quotedCmd}`);
   try {
     await utils.runAgentInstall(pkgEnvDetails, {
       args,
       spinner,
       stdio: useDebug ? 'inherit' : 'ignore'
     });
-  } catch (e) {
-    errored = true;
-    error = e;
-    require$$6.debugFn('error', `caught: ${quotedCmd} failed`);
-    require$$6.debugDir('inspect', {
+  } catch (error) {
+    const result = {
       error
-    });
+    };
+    require$$6.debugFn('error', `caught: ${quotedCmd} failed`);
+    require$$6.debugDir('inspect', result);
+    return result;
   }
-  let actualTree = undefined;
-  if (!errored) {
-    try {
-      actualTree = await getActualTree(cwd);
-    } catch (e) {
-      errored = true;
-      error = e;
-      require$$6.debugFn('error', 'caught: Arborist error');
-      require$$6.debugDir('inspect', {
-        error
-      });
+  const treeResult = await getActualTree(cwd);
+  if (treeResult.actualTree) {
+    if (isSpinning) {
+      spinner.start();
     }
+    return treeResult;
   }
+  require$$6.debugFn('error', 'caught: await arb.loadActual() error');
+  require$$6.debugDir('inspect', treeResult);
   if (isSpinning) {
     spinner.start();
   }
-  return {
-    ...(actualTree ? {
-      actualTree
-    } : undefined),
-    ...(errored ? {
-      error
-    } : undefined)
-  };
+  return treeResult;
 }
 async function npmFix(pkgEnvDetails, fixConfig) {
   const {
@@ -4318,25 +4319,39 @@ async function npmFix(pkgEnvDetails, fixConfig) {
     if (purls.length) {
       alertsMap = await utils.getAlertsMapFromPurls(purls, getFixAlertsMapOptions());
     } else {
-      const arb = new shadowNpmInject.Arborist({
-        path: pkgEnvDetails.pkgPath,
-        ...flatConfig,
-        ...shadowNpmInject.SAFE_WITH_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES
-      });
-      actualTree = await arb.reify();
-      // Calling arb.reify() creates the arb.diff object, nulls-out arb.idealTree,
-      // and populates arb.actualTree.
+      let arb;
+      try {
+        arb = new shadowNpmInject.Arborist({
+          path: pkgEnvDetails.pkgPath,
+          ...flatConfig,
+          ...shadowNpmInject.SAFE_WITH_SAVE_ARBORIST_REIFY_OPTIONS_OVERRIDES
+        });
+        // Calling arb.reify() creates the arb.diff object, nulls-out arb.idealTree,
+        // and populates arb.actualTree.
+        actualTree = await arb.reify();
+      } catch (e) {
+        spinner?.stop();
+        require$$6.debugFn('error', 'caught: await arb.reify() error');
+        require$$6.debugDir('inspect', {
+          error: e
+        });
+        return {
+          ok: false,
+          message: 'npm error',
+          cause: e?.message || 'Unknown npm error.'
+        };
+      }
       alertsMap = await shadowNpmInject.getAlertsMapFromArborist(arb, getFixAlertsMapOptions());
     }
   } catch (e) {
     spinner?.stop();
-    require$$6.debugFn('error', 'caught: PURL API');
+    require$$6.debugFn('error', 'caught: Socket batch PURL API error');
     require$$6.debugDir('inspect', {
       error: e
     });
     return {
       ok: false,
-      message: 'API Error',
+      message: 'Socket API error',
       cause: e?.message || 'Unknown Socket batch PURL API error.'
     };
   }
@@ -4435,50 +4450,37 @@ async function install(pkgEnvDetails, options) {
   // Enable a non-interactive pnpm install
   // https://github.com/pnpm/pnpm/issues/6778
   '--config.confirmModulesPurge=false', ...(extraArgs ?? [])];
-  const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
-  require$$6.debugFn('stdio', `spawn: ${quotedCmd}`);
   const isSpinning = spinner?.isSpinning;
   spinner?.stop();
-  let error;
-  let errored = false;
+  const quotedCmd = `\`${pkgEnvDetails.agent} install ${args.join(' ')}\``;
+  require$$6.debugFn('stdio', `spawn: ${quotedCmd}`);
   try {
     await utils.runAgentInstall(pkgEnvDetails, {
       args,
       spinner,
       stdio: require$$6.isDebug('stdio') ? 'inherit' : 'ignore'
     });
-  } catch (e) {
-    errored = true;
-    error = e;
-    require$$6.debugFn('error', `caught: ${quotedCmd} failed`);
-    require$$6.debugDir('inspect', {
+  } catch (error) {
+    const result = {
       error
-    });
+    };
+    require$$6.debugFn('error', `caught: ${quotedCmd} failed`);
+    require$$6.debugDir('inspect', result);
+    return result;
   }
-  let actualTree = undefined;
-  if (!errored) {
-    try {
-      actualTree = await getActualTree(cwd);
-    } catch (e) {
-      errored = true;
-      error = e;
-      require$$6.debugFn('error', 'caught: Arborist error');
-      require$$6.debugDir('inspect', {
-        error
-      });
+  const treeResult = await getActualTree(cwd);
+  if (treeResult.actualTree) {
+    if (isSpinning) {
+      spinner.start();
     }
+    return treeResult;
   }
+  require$$6.debugFn('error', 'caught: await arb.loadActual() error');
+  require$$6.debugDir('inspect', treeResult);
   if (isSpinning) {
     spinner.start();
   }
-  return {
-    ...(actualTree ? {
-      actualTree
-    } : undefined),
-    ...(errored ? {
-      error
-    } : undefined)
-  };
+  return treeResult;
 }
 async function pnpmFix(pkgEnvDetails, fixConfig) {
   const {
@@ -4527,13 +4529,13 @@ async function pnpmFix(pkgEnvDetails, fixConfig) {
     alertsMap = purls.length ? await utils.getAlertsMapFromPurls(purls, getFixAlertsMapOptions()) : await utils.getAlertsMapFromPnpmLockfile(lockfile, getFixAlertsMapOptions());
   } catch (e) {
     spinner?.stop();
-    require$$6.debugFn('error', 'caught: PURL API');
+    require$$6.debugFn('error', 'caught: Socket batch PURL API error');
     require$$6.debugDir('inspect', {
       error: e
     });
     return {
       ok: false,
-      message: 'API Error',
+      message: 'Socket API error',
       cause: e?.message || 'Unknown Socket batch PURL API error.'
     };
   }
@@ -14670,5 +14672,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=2badc2bc-a4d7-4304-94c6-958c975e9822
+//# debugId=45ca8976-a28f-4fa2-8dee-275eacd6152a
 //# sourceMappingURL=cli.js.map