fix: rc.unraid-api now cleans up older dependencies (#1404)

elibosley · web-flow · commit 83076bb94088 · 2025-05-23T10:23:58.000-04:00
&lt;!-- This is an auto-generated comment: release notes by coderabbit.ai
--&gt;
## Summary by CodeRabbit

- **New Features**
- Added an option to clean up old dependency files, keeping only those
needed for the current API version.
- Introduced a direct cleanup command to remove outdated dependencies
before installing new ones.

- **Bug Fixes**
- Improved handling and messaging for missing or invalid dependency
information during cleanup operations.
&lt;!-- end of auto-generated comment: release notes by coderabbit.ai --&gt;
diff --git a/plugin/source/dynamix.unraid.net/etc/rc.d/rc.unraid-api b/plugin/source/dynamix.unraid.net/etc/rc.d/rc.unraid-api
@@ -111,12 +111,23 @@ case "$1" in
   ;;
 'ensure')
   if [ -x "$scripts_dir/dependencies.sh" ]; then
+    # First clean up old dependencies
+    "$scripts_dir/dependencies.sh" cleanup
+    # Then ensure new dependencies are installed
     "$scripts_dir/dependencies.sh" ensure "$2"
   else
     echo "Error: dependencies.sh script not found or not executable"
     exit 1
   fi
   ;;
+'cleanup-dependencies')
+  if [ -x "$scripts_dir/dependencies.sh" ]; then
+    "$scripts_dir/dependencies.sh" cleanup
+  else
+    echo "Error: dependencies.sh script not found or not executable"
+    exit 1
+  fi
+  ;;
 'archive-dependencies')
   if [ -x "$scripts_dir/dependencies.sh" ]; then
     "$scripts_dir/dependencies.sh" archive
diff --git a/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/install/scripts/setup_api.sh b/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/install/scripts/setup_api.sh
@@ -69,19 +69,6 @@ else
   echo "ERROR: .env.production file not found"
 fi
 
-# Restore dependencies using vendor archive from package
-if [ -x "/etc/rc.d/rc.unraid-api" ]; then
-  echo "Restoring dependencies using auto-detection"
-  if /etc/rc.d/rc.unraid-api ensure; then
-    echo "Dependencies restored successfully"
-  else
-    echo "ERROR: Failed to restore dependencies" >&2
-    exit 1
-  fi
-else
-  echo "Dependencies not restored: rc.unraid-api executable not found"
-fi
-
 # Ensure rc directories exist and scripts are executable
 echo "Ensuring shutdown scripts are executable"
 if [ -d "/etc/rc.d/rc6.d" ]; then
diff --git a/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/scripts/dependencies.sh b/plugin/source/dynamix.unraid.net/usr/local/share/dynamix.unraid.net/scripts/dependencies.sh
@@ -10,6 +10,54 @@ source "${SCRIPT_DIR}/api_utils.sh"
 # Default paths
 DEPENDENCIES_DIR="/usr/local/unraid-api/node_modules"
 
+# Function to cleanup old dependency archives
+# Removes all node_modules archives except the one for the current API version
+cleanup() {
+  local info
+  local api_version=""
+  local vendor_store_path=""
+  local vendor_dir=""
+  local current_archive=""
+  
+  # Get archive information
+  if ! mapfile -t info < <(get_archive_information); then
+    echo "Error: Failed to get vendor archive information. Cannot proceed with cleanup." >&2
+    return 1
+  fi
+  
+  api_version="${info[0]}"
+  vendor_store_path="${info[2]}"
+  
+  echo "Cleaning up node_modules archives that don't match current API version: $api_version"
+  
+  # Extract the directory path from the full vendor_store_path
+  vendor_dir="$(dirname "$vendor_store_path")"
+  
+  # Extract the filename from the full vendor_store_path - this is our current archive
+  current_archive="$(basename "$vendor_store_path")"
+  
+  # Check if vendor directory exists
+  if [ ! -d "$vendor_dir" ]; then
+    echo "Vendor directory $vendor_dir does not exist. Nothing to clean up."
+    return 0
+  fi
+  
+  echo "Current archive to keep: $current_archive"
+  
+  # Find and remove all node_modules archives except the current one
+  find "$vendor_dir" -name "node_modules-for-*.tar.xz" | while read -r archive; do
+    if [ "$(basename "$archive")" != "$current_archive" ]; then
+      echo "Removing archive: $archive"
+      rm -f "$archive"
+    else
+      echo "Keeping current archive: $archive"
+    fi
+  done
+  
+  echo "Cleanup completed."
+  return 0
+}
+
 # Function to attempt redownload of vendor archive if missing
 # Args:
 #   $1 - Path to vendor archive to download (ignored, kept for backward compatibility)
@@ -228,6 +276,10 @@ case "$1" in
     ensure "$2"
     exit $?
     ;;
+  'cleanup')
+    cleanup
+    exit $?
+    ;;
   'redownload')
     # The path argument is ignored but kept for backward compatibility
     if downloaded_archive=$(redownload_vendor_archive) && [ -n "$downloaded_archive" ]; then
@@ -239,7 +291,7 @@ case "$1" in
     fi
     ;;
   *)
-    echo "Usage: $0 {restore|archive|ensure|redownload}"
+    echo "Usage: $0 {restore|archive|ensure|cleanup|redownload}"
     exit 1
     ;;
 esac 
