@socketsecurity/cli-with-sentry 0.15.45 → 0.15.47

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})$`);
@@ -4392,6 +4392,11 @@ async function npmFix(pkgEnvDetails, {
           activeBranches.push(parsedBranch);
         }
       }
+      if (activeBranches.length) {
+        debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
+      } else if (openPrs.length) {
+        debug.debugFn('miss: 0 active branches found');
+      }
       infos = infos.filter(info => !activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier));
     }
     if (!infos.length) {
@@ -4877,13 +4882,16 @@ async function pnpmFix(pkgEnvDetails, {
       const activeBranches = [];
       for (const pr of openPrs) {
         const parsedBranch = branchParser(pr.headRefName);
+        debug.debugFn(`parse: ${pr.headRefName}\n`, parsedBranch);
+        debug.debugFn(`check: branchPurlType ${branchPurlType} === ${parsedBranch?.type}`);
+        debug.debugFn(`check: branchFullName ${branchFullName} === ${parsedBranch?.fullName}`);
         if (branchPurlType === parsedBranch?.type && branchFullName === parsedBranch?.fullName) {
           activeBranches.push(parsedBranch);
         }
       }
       if (activeBranches.length) {
         debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
-      } else {
+      } else if (openPrs.length) {
         debug.debugFn('miss: 0 active branches found');
       }
       infos = infos.filter(info => !activeBranches.find(b => b.newVersion === info.firstPatchedVersionIdentifier));
@@ -11654,8 +11662,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,
@@ -11664,7 +11673,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,
@@ -11733,7 +11742,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',
@@ -11741,6 +11751,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',
@@ -11759,7 +11770,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
@@ -11780,6 +11794,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',
@@ -14260,5 +14275,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=a7078a69-7665-417e-a14a-4c06fdddafa4
+//# debugId=7ed4fffc-f660-40e2-8f0b-b1981857752e
 //# sourceMappingURL=cli.js.map