@socketsecurity/cli-with-sentry 0.15.46 → 0.15.48

package/dist/cli.js

@@ -3702,10 +3702,10 @@ function getSocketBranchPattern(options) {
     ...options
   };
   const purlObj = purl ? utils.getPurlObject(purl) : null;
-  const escType = purlObj ? regexps.escapeRegExp(purlObj.type) : '[^_]+';
-  const escWorkspace = workspace ? `${regexps.escapeRegExp(formatBranchName(workspace))}` : '[^_]+';
+  const escType = purlObj ? regexps.escapeRegExp(purlObj.type) : '[^/]+';
+  const escWorkspace = workspace ? `${regexps.escapeRegExp(formatBranchName(workspace))}` : '.+';
   const escMaybeNamespace = purlObj?.namespace ? `${regexps.escapeRegExp(formatBranchName(purlObj.namespace))}--` : '';
-  const escFullName = purlObj ? `${escMaybeNamespace}${regexps.escapeRegExp(formatBranchName(purlObj.name))}` : '[^_]+';
+  const escFullName = purlObj ? `${escMaybeNamespace}${regexps.escapeRegExp(formatBranchName(purlObj.name))}` : '[^/_]+';
   const escVersion = purlObj ? regexps.escapeRegExp(formatBranchName(purlObj.version)) : '[^_]+';
   const escNewVersion = newVersion ? regexps.escapeRegExp(formatBranchName(newVersion)) : '[^_]+';
   return new RegExp(`^socket/(${escType})/(${escWorkspace})/(${escFullName})_(${escVersion})_(${escNewVersion})$`);
@@ -4894,7 +4894,16 @@ async function pnpmFix(pkgEnvDetails, {
       } else if (openPrs.length) {
         debug.debugFn('miss: 0 active branches found');
       }
-      infos = infos.filter(info => !activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier));
+      infos = infos.filter(info => {
+        const found = activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier);
+        if (found) {
+          debug.debugFn(`found: active branch for ${name}@${info.firstPatchedVersionIdentifier}`);
+          return false;
+        } else {
+          debug.debugFn(`miss: no active branch found for ${name}@${info.firstPatchedVersionIdentifier}`);
+          return true;
+        }
+      });
     }
     if (!infos.length) {
       continue infoEntriesLoop;
@@ -11662,8 +11671,9 @@ async function testAndDownloadManifestFile({
   repoApiUrl,
   tmpDir
 }) {
-  debug.debugFn('test: file', file);
+  debug.debugFn('testing: file', file);
   if (!SUPPORTED_FILE_PATTERNS.some(regex => regex.test(file))) {
+    debug.debugFn('  - skip: not a known pattern');
     // Not an error.
     return {
       ok: true,
@@ -11672,7 +11682,7 @@ async function testAndDownloadManifestFile({
       }
     };
   }
-  debug.debugFn('found: manifest file', file);
+  debug.debugFn('found: manifest file, going to attempt to download it;', file);
   const result = await downloadManifestFile({
     file,
     tmpDir,
@@ -11741,7 +11751,8 @@ async function streamDownloadWithFetch(localPath, downloadUrl) {
   try {
     response = await fetch(downloadUrl);
     if (!response.ok) {
-      const errorMsg = `Download failed: ${response.status} ${response.statusText} for ${downloadUrl}`;
+      const errorMsg = `Download failed due to bad server response: ${response.status} ${response.statusText} for ${downloadUrl}`;
+      logger.logger.fail(errorMsg);
       return {
         ok: false,
         message: 'Download Failed',
@@ -11749,6 +11760,7 @@ async function streamDownloadWithFetch(localPath, downloadUrl) {
       };
     }
     if (!response.body) {
+      logger.logger.fail(`Download failed because the server response was empty, for ${downloadUrl}`);
       return {
         ok: false,
         message: 'Download Failed',
@@ -11767,7 +11779,10 @@ async function streamDownloadWithFetch(localPath, downloadUrl) {
       data: localPath
     };
   } catch (error) {
-    logger.logger.fail('An error occurred trying to download the file...');
+    logger.logger.fail('An error was thrown while trying to download a manifest file... url:', downloadUrl);
+    debug.debugFn('Raw error:');
+    debug.debugFn(error);
+
     // If an error occurs and fileStream was created, attempt to clean up.
     if (fs$1.existsSync(localPath)) {
       // Check if fileStream was even opened before trying to delete
@@ -11788,6 +11803,7 @@ async function streamDownloadWithFetch(localPath, downloadUrl) {
       // If error was due to bad HTTP status
       detailedError += ` (HTTP Status: ${response.status} ${response.statusText})`;
     }
+    debug.debugFn(detailedError);
     return {
       ok: false,
       message: 'Download Failed',
@@ -14268,5 +14284,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=ad52decd-77a1-456a-85fe-05c2c8c57de5
+//# debugId=d77f850e-4116-456a-acb9-b74d5a8977aa
 //# sourceMappingURL=cli.js.map