fix: some more robust handling of npm list, yarn list, etc...

sonatype-nexus-community · Dec 10, 2019 · e5822a1 · e5822a1
1 parent eacad25
commit e5822a1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/ext-src/packages/npm/NpmDependencies.ts b/ext-src/packages/npm/NpmDependencies.ts
@@ -45,7 +45,7 @@ export class NpmDependencies implements PackageDependencies {
       Promise.resolve();
     }
     catch (e) {
-      Promise.reject();
+      throw new TypeError(e);
     }
   }
 

diff --git a/ext-src/packages/npm/NpmUtils.ts b/ext-src/packages/npm/NpmUtils.ts
@@ -94,6 +94,10 @@ export class NpmUtils {
       }
     });
 
+    dependencyList = _.uniqBy(dependencyList, (x) => {
+      return x.toPurl();
+    });
+
     return this.sortDependencyList(dependencyList);
   }
 
@@ -103,7 +107,7 @@ export class NpmUtils {
     const name = newSplit[0];
     const version = newSplit[1];
     if (name != "" && version != undefined) {
-      return new NpmPackage(name, version, "");
+      return new NpmPackage(name.replace("%40", "@"), version, "");
     }
     else {
       throw new Error(`No valid information, skipping dependency: ${newName}`);
@@ -157,12 +161,16 @@ export class NpmUtils {
             dependencyList.push(this.setAndReturnNpmPackage(splitParts));
           }
           catch (e) {
-            console.debug(e.stderr);
+            console.debug(e);
           }
         }
       }
     });
 
+    dependencyList = _.uniqBy(dependencyList, (x) => {
+      return x.toPurl();
+    });
+
     return this.sortDependencyList(dependencyList);
   }
 

diff --git a/ext-src/services/IqRequestService.ts b/ext-src/services/IqRequestService.ts
@@ -89,7 +89,6 @@ export class IqRequestService implements RequestService {
           auth: { user: this.user, pass: this.password }
         },
         (err: any, response: any, body: any) => {
-          // console.log(response.statusCode, body);
           if (err) {
             reject(`Unable to perform IQ scan: ${err}`);
             return;