From daadc943bc8d76f3b217537ce452e5903f05d0ec Mon Sep 17 00:00:00 2001
From: Ajit Mehrotra <ajitmehrotra2009@gmail.com>
Date: Fri, 21 Nov 2025 12:28:42 -0500
Subject: [PATCH] enhance: add ssh retry logic and SSH options in deploy script

---
 .gitignore                |  1 +
 web/scripts/deploy-dev.sh | 30 ++++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8449fad73..f7f64ea27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,7 @@ api/dev/Unraid.net/myservers.cfg
 
 # local Mise settings
 .mise.toml
+mise.toml
 
 # Compiled test pages (generated from Nunjucks templates)
 web/public/test-pages/*.html
diff --git a/web/scripts/deploy-dev.sh b/web/scripts/deploy-dev.sh
index 1e740264d..abacd70a4 100755
--- a/web/scripts/deploy-dev.sh
+++ b/web/scripts/deploy-dev.sh
@@ -10,6 +10,28 @@ fi
 # Set server name from command-line argument
 server_name="$1"
 
+# Common SSH options for reliability
+SSH_OPTS='-o ConnectTimeout=5 -o ConnectionAttempts=3 -o ServerAliveInterval=5 -o ServerAliveCountMax=2'
+
+# Simple retry helper: retry <attempts> <delay_seconds> <command...>
+retry() {
+  local attempts="$1"; shift
+  local delay_seconds="$1"; shift
+  local try=1
+  while true; do
+    "$@"
+    local exit_code=$?
+    if [ $exit_code -eq 0 ]; then
+      return 0
+    fi
+    if [ $try -ge $attempts ]; then
+      return $exit_code
+    fi
+    sleep "$delay_seconds"
+    try=$((try + 1))
+  done
+}
+
 # Source directory paths
 standalone_directory="dist/"
 
@@ -33,11 +55,11 @@ exit_code=0
 if [ "$has_standalone" = true ]; then
   echo "Deploying standalone apps..."
   # Ensure remote directory exists
-  ssh root@"${server_name}" "mkdir -p /usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/standalone/"
+  retry 3 2 ssh $SSH_OPTS root@"${server_name}" "mkdir -p /usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/standalone/"
   # Clear the remote standalone directory before rsyncing
-  ssh root@"${server_name}" "rm -rf /usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/*"
+  retry 3 2 ssh $SSH_OPTS root@"${server_name}" "rm -rf /usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/*"
   # Run rsync with proper quoting
-  rsync -avz --delete -e "ssh" "$standalone_directory" "root@${server_name}:/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/standalone/"
+  retry 3 2 rsync -avz --delete --timeout=20 -e "ssh $SSH_OPTS" "$standalone_directory" "root@${server_name}:/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/standalone/"
   standalone_exit_code=$?
   # If standalone rsync failed, update exit_code
   if [ "$standalone_exit_code" -ne 0 ]; then
@@ -49,7 +71,7 @@ fi
 update_auth_request() {
   local server_name="$1"
   # SSH into server and update auth-request.php
-  ssh "root@${server_name}" /bin/bash -s << 'EOF'
+  retry 3 2 ssh $SSH_OPTS "root@${server_name}" /bin/bash -s << 'EOF'
     set -euo pipefail
     set -o errtrace
     AUTH_REQUEST_FILE='/usr/local/emhttp/auth-request.php'