From 1925c1cd5fc3f840f4365d80d1e9ef19a375374b Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:01:24 +0100
Subject: [PATCH] Update tools.func

---
 misc/tools.func | 57 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/misc/tools.func b/misc/tools.func
index a7e045e48..16902fad0 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -3319,45 +3319,96 @@ function setup_nodejs() {
       msg_info "Setup Node.js $NODE_VERSION"
     fi
 
+    # DEBUG: Initial state
+    echo "🔍 DEBUG: Initial state check..."
+    echo "   - Requested version: $NODE_VERSION"
+    echo "   - Current version: ${CURRENT_NODE_VERSION:-none}"
+    echo "   - Installed packages:"
+    dpkg -l | grep -E "(nodejs|libnode|node-)" | awk '{print "     * " $2 " " $3}' || echo "     * none"
+    echo ""
+
     # Clean up legacy installations (nvm, etc.)
+    echo "🔍 DEBUG: Running cleanup_legacy_install..."
     cleanup_legacy_install "nodejs"
 
     # CRITICAL: Remove ALL Debian nodejs packages BEFORE adding NodeSource repo
     # This prevents conflicts during dependency resolution
+    echo "🔍 DEBUG: Checking for Debian nodejs packages..."
     if dpkg -l 2>/dev/null | grep -qE "^ii.*(nodejs|libnode|node-cjs|node-acorn|node-balanced|node-brace|node-minimatch|node-undici|node-xtend|node-corepack)"; then
+      echo "   ⚠️  Found Debian nodejs packages - purging now..."
       msg_info "Removing Debian-packaged Node.js and dependencies"
-      $STD apt purge -y nodejs nodejs-doc libnode* node-* 2>/dev/null || true
-      $STD apt autoremove -y 2>/dev/null || true
-      $STD apt clean 2>/dev/null || true
+      apt purge -y nodejs nodejs-doc libnode* node-* 2>&1 | tee -a /tmp/silent.$$.log || true
+      apt autoremove -y 2>&1 | tee -a /tmp/silent.$$.log || true
+      apt clean 2>&1 | tee -a /tmp/silent.$$.log || true
+      echo "   ✅ Purge completed"
+    else
+      echo "   ✅ No Debian nodejs packages found"
     fi
+    echo ""
 
     # Remove any APT pinning (not needed if Debian nodejs is purged)
+    echo "🔍 DEBUG: Removing old APT pinning..."
     rm -f /etc/apt/preferences.d/nodesource 2>/dev/null || true
 
     # Prepare repository (cleanup + validation)
+    echo "🔍 DEBUG: Running prepare_repository_setup..."
     prepare_repository_setup "nodesource" || {
       msg_error "Failed to prepare Node.js repository"
       return 1
     }
 
     # Setup NodeSource repository BEFORE installing dependencies
+    echo "🔍 DEBUG: Setting up NodeSource repository..."
+    echo "   - URL: https://deb.nodesource.com/node_${NODE_VERSION}.x"
     manage_tool_repository "nodejs" "$NODE_VERSION" "https://deb.nodesource.com/node_${NODE_VERSION}.x" "https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key" || {
       msg_error "Failed to setup Node.js repository"
       return 1
     }
 
+    # Verify repository is active
+    echo "🔍 DEBUG: Verifying NodeSource repository..."
+    if [[ -f /etc/apt/sources.list.d/nodesource.sources ]]; then
+      echo "   ✅ Repository file exists:"
+      cat /etc/apt/sources.list.d/nodesource.sources | sed 's/^/     /'
+    else
+      echo "   ❌ Repository file NOT FOUND!"
+    fi
+    echo ""
+
+    # Force APT cache refresh to see NodeSource packages
+    echo "🔍 DEBUG: Forcing APT update to refresh NodeSource cache..."
+    apt update 2>&1 | grep -i "node\|nodesource" || echo "   (no nodejs-related output)"
+    echo ""
+
+    # Check what version APT will install
+    echo "🔍 DEBUG: Checking APT policy for nodejs package..."
+    apt-cache policy nodejs | head -n 20
+    echo ""
+
     # Now install dependencies (NodeSource repo is already active, no Debian nodejs available)
+    echo "🔍 DEBUG: Installing dependencies (curl, ca-certificates, gnupg)..."
     ensure_dependencies curl ca-certificates gnupg
 
+    # Check again after dependencies
+    echo "🔍 DEBUG: Checking installed packages after dependencies..."
+    dpkg -l | grep -E "(nodejs|libnode|node-)" | awk '{print "   * " $2 " " $3}' || echo "   * none"
+    echo ""
+
     # Wait for repo to settle
     sleep 2
 
     # Install Node.js with retry logic (explicit version to avoid Debian repo)
+    echo "🔍 DEBUG: Installing Node.js from NodeSource..."
     install_packages_with_retry "nodejs" || {
+      echo "❌ DEBUG: Installation failed!"
+      echo "Final APT policy:"
+      apt-cache policy nodejs
       msg_error "Failed to install Node.js ${NODE_VERSION} from NodeSource"
       return 1
     }
 
+    echo "🔍 DEBUG: Installation completed, verifying..."
+
     # Verify Node.js was installed correctly
     if ! command -v node >/dev/null 2>&1; then
       msg_error "Node.js binary not found after installation"