Retry yarn when npm fails

Signed-off-by: 석지영/책임연구원/SW공학(연)Open Source TP <[email protected]>

Author: dd-jy

src/fosslight_dependency/_analyze_dependency.py

@@ -33,11 +33,13 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
     ret = True
     package_dep_item_list = []
     cover_comment = ''
+    npm_fallback_to_yarn = False
 
     if package_manager_name == const.PYPI:
         package_manager = Pypi(input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd)
     elif package_manager_name == const.NPM:
         package_manager = Npm(input_dir, output_dir)
+        npm_fallback_to_yarn = True
     elif package_manager_name == const.YARN:
         package_manager = Yarn(input_dir, output_dir)
     elif package_manager_name == const.MAVEN:
@@ -69,14 +71,32 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
     else:
         logger.error(f"Not supported package manager name: {package_manager_name}")
         ret = False
-        return ret, package_dep_item_list
+        return ret, package_dep_item_list, cover_comment, package_manager_name
 
     if manifest_file_name:
         package_manager.set_manifest_file(manifest_file_name)
 
     if direct:
         package_manager.set_direct_dependencies(direct)
     ret = package_manager.run_plugin()
+
+    if not ret and npm_fallback_to_yarn:
+        logger.warning("Npm analysis failed. Attempting to use Yarn as fallback...")
+        del package_manager
+        package_manager = Yarn(input_dir, output_dir)
+        package_manager_name = const.YARN
+        
+        if manifest_file_name:
+            package_manager.set_manifest_file(manifest_file_name)
+        if direct:
+            package_manager.set_direct_dependencies(direct)
+        
+        ret = package_manager.run_plugin()
+        if ret:
+            logger.info("Successfully switched to Yarn")
+        else:
+            logger.error("Yarn also failed")
+    
     if ret:
         if direct:
             package_manager.parse_direct_dependencies()
@@ -103,4 +123,4 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
 
     del package_manager
 
-    return ret, package_dep_item_list, cover_comment
+    return ret, package_dep_item_list, cover_comment, package_manager_name

src/fosslight_dependency/run_dependency_scanner.py

@@ -275,33 +275,33 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
     cover_comment = ''
     for pm, manifest_file_name_list in found_package_manager.items():
         if not manifest_file_name_list and not autodetect:
-            ret, package_dep_item_list, cover_comment = analyze_dependency(pm, input_dir, output_path,
+            ret, package_dep_item_list, cover_comment, actual_pm = analyze_dependency(pm, input_dir, output_path,
                                                                            pip_activate_cmd, pip_deactivate_cmd,
                                                                            output_custom_dir, app_name, github_token,
                                                                            [], direct)
             if ret:
-                success_pm[pm][input_dir].extend(['manual mode (-m option)'])
+                success_pm[actual_pm][input_dir].extend(['manual mode (-m option)'])
                 scan_item.append_file_items(package_dep_item_list)
             else:
-                fail_pm[pm][input_dir].extend(['manual mode (-m option)'])
+                fail_pm[actual_pm][input_dir].extend(['manual mode (-m option)'])
         else:
             for manifest_dir, manifest_file_name in manifest_file_name_list.items():
                 input_dir = manifest_dir
                 if manifest_file_name == pass_key:
                     continue
                 os.chdir(input_dir)
-                ret, package_dep_item_list, cover_comment = analyze_dependency(pm, input_dir, output_path,
+                ret, package_dep_item_list, cover_comment, actual_pm = analyze_dependency(pm, input_dir, output_path,
                                                                                pip_activate_cmd, pip_deactivate_cmd,
                                                                                output_custom_dir, app_name, github_token,
                                                                                manifest_file_name, direct)
                 if ret:
-                    success_pm[pm][input_dir].extend(manifest_file_name)
+                    success_pm[actual_pm][input_dir].extend(manifest_file_name)
                     scan_item.append_file_items(package_dep_item_list)
 
                     dup_pm = None
-                    if pm == const.GRADLE and const.ANDROID in found_package_manager:
+                    if actual_pm == const.GRADLE and const.ANDROID in found_package_manager:
                         dup_pm = const.ANDROID
-                    elif pm == const.ANDROID and const.GRADLE in found_package_manager:
+                    elif actual_pm == const.ANDROID and const.GRADLE in found_package_manager:
                         dup_pm = const.GRADLE
 
                     if dup_pm:
@@ -312,7 +312,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
                         else:
                             found_package_manager[dup_pm][manifest_dir] = pass_key
                 else:
-                    fail_pm[pm][input_dir].extend(manifest_file_name)
+                    fail_pm[actual_pm][input_dir].extend(manifest_file_name)
 
     success_pm = {k: dict(v) for k, v in success_pm.items()}
     fail_pm = {k: dict(v) for k, v in fail_pm.items()}