socket 1.0.83 → 1.0.84

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;
@@ -4318,25 +4318,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: 'Arborist error',
+          cause: e?.message || 'Unknown Arborist 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.'
     };
   }
@@ -4527,13 +4541,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 +14684,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=2badc2bc-a4d7-4304-94c6-958c975e9822
+//# debugId=537e02e0-17da-42ea-8417-fef153f5f5ca
 //# sourceMappingURL=cli.js.map