mirror of
https://github.com/OpenRouterTeam/spawn.git
synced 2026-05-31 21:40:28 +00:00
refactor: Extract SSH wait logic to shared generic_ssh_wait function
Created generic_ssh_wait() in shared/common.sh to eliminate ~100 lines of duplicated waiting logic across all cloud providers. Changes: - Added generic_ssh_wait(ip, ssh_opts, test_cmd, description, max_attempts, interval) to shared/common.sh - Refactored verify_server_connectivity() in all clouds to use generic_ssh_wait - Refactored wait_for_cloud_init() in all clouds to use generic_ssh_wait Benefits: - Single source of truth for SSH polling logic - Consistent error messages across providers - Reduced code duplication (~20 lines per provider → 2 lines) - Easier to maintain and test All tests pass (42/42). Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Sprite
parent
ed40229b5b
commit
528694123d
5 changed files with 144 additions and 635 deletions
|
|
@ -5,229 +5,17 @@
|
|||
set -euo pipefail
|
||||
|
||||
# ============================================================
|
||||
# Provider-agnostic functions (shared with sprite/lib/common.sh)
|
||||
# Provider-agnostic functions
|
||||
# ============================================================
|
||||
|
||||
# Colors for output
|
||||
readonly RED='\033[0;31m'
|
||||
readonly GREEN='\033[0;32m'
|
||||
readonly YELLOW='\033[1;33m'
|
||||
readonly NC='\033[0m' # No Color
|
||||
|
||||
# Print colored message (to stderr so they don't pollute command substitution output)
|
||||
log_info() {
|
||||
echo -e "${GREEN}$1${NC}" >&2
|
||||
# Source shared provider-agnostic functions
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/../../shared/common.sh" || {
|
||||
echo "ERROR: Failed to load shared/common.sh" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
log_warn() {
|
||||
echo -e "${YELLOW}$1${NC}" >&2
|
||||
}
|
||||
|
||||
log_error() {
|
||||
echo -e "${RED}$1${NC}" >&2
|
||||
}
|
||||
|
||||
# Safe read function that works in both interactive and non-interactive modes
|
||||
safe_read() {
|
||||
local prompt="$1"
|
||||
local result=""
|
||||
|
||||
if [[ -t 0 ]]; then
|
||||
read -p "$prompt" result
|
||||
elif echo -n "" > /dev/tty 2>/dev/null; then
|
||||
read -p "$prompt" result < /dev/tty
|
||||
else
|
||||
log_error "Cannot read input: no TTY available"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "$result"
|
||||
}
|
||||
|
||||
# Listen on a port with netcat (handles busybox/Termux nc requiring -p flag)
|
||||
nc_listen() {
|
||||
local port=$1
|
||||
shift
|
||||
if nc --help 2>&1 | grep -q "BusyBox\|busybox" || nc --help 2>&1 | grep -q "\-p "; then
|
||||
nc -l -p "$port" "$@"
|
||||
else
|
||||
nc -l "$port" "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
# Open browser to URL (supports macOS, Linux, Termux)
|
||||
open_browser() {
|
||||
local url=$1
|
||||
if command -v termux-open-url &> /dev/null; then
|
||||
termux-open-url "$url" </dev/null
|
||||
elif command -v open &> /dev/null; then
|
||||
open "$url" </dev/null
|
||||
elif command -v xdg-open &> /dev/null; then
|
||||
xdg-open "$url" </dev/null
|
||||
else
|
||||
log_warn "Please open: ${url}"
|
||||
fi
|
||||
}
|
||||
|
||||
# Validate model ID to prevent command injection
|
||||
validate_model_id() {
|
||||
local model_id="$1"
|
||||
if [[ -z "$model_id" ]]; then return 0; fi
|
||||
if [[ ! "$model_id" =~ ^[a-zA-Z0-9/_:.-]+$ ]]; then
|
||||
log_error "Invalid model ID: contains unsafe characters"
|
||||
log_error "Model IDs should only contain: letters, numbers, /, -, _, :, ."
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Manually prompt for API key
|
||||
get_openrouter_api_key_manual() {
|
||||
echo ""
|
||||
log_warn "Manual API Key Entry"
|
||||
echo -e "${YELLOW}Get your API key from: https://openrouter.ai/settings/keys${NC}"
|
||||
echo ""
|
||||
|
||||
local api_key=""
|
||||
while [[ -z "$api_key" ]]; do
|
||||
api_key=$(safe_read "Enter your OpenRouter API key: ") || return 1
|
||||
|
||||
if [[ -z "$api_key" ]]; then
|
||||
log_error "API key cannot be empty"
|
||||
elif [[ ! "$api_key" =~ ^sk-or-v1-[a-f0-9]{64}$ ]]; then
|
||||
log_warn "Warning: API key format doesn't match expected pattern (sk-or-v1-...)"
|
||||
local confirm=$(safe_read "Use this key anyway? (y/N): ") || return 1
|
||||
if [[ "$confirm" =~ ^[Yy]$ ]]; then
|
||||
break
|
||||
else
|
||||
api_key=""
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
log_info "API key accepted!"
|
||||
echo "$api_key"
|
||||
}
|
||||
|
||||
# Try OAuth flow, fallback to manual entry if it fails
|
||||
try_oauth_flow() {
|
||||
local callback_port=${1:-5180}
|
||||
|
||||
log_warn "Attempting OAuth authentication..."
|
||||
|
||||
if ! command -v nc &> /dev/null; then
|
||||
log_warn "netcat (nc) not found - OAuth server unavailable"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local callback_url="http://localhost:${callback_port}/callback"
|
||||
local auth_url="https://openrouter.ai/auth?callback_url=${callback_url}"
|
||||
|
||||
local oauth_dir=$(mktemp -d)
|
||||
local code_file="$oauth_dir/code"
|
||||
|
||||
log_warn "Starting local OAuth server on port ${callback_port}..."
|
||||
|
||||
(
|
||||
local success_response='HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n<html><head><style>@keyframes checkmark{0%{transform:scale(0) rotate(-45deg);opacity:0}60%{transform:scale(1.2) rotate(-45deg);opacity:1}100%{transform:scale(1) rotate(-45deg);opacity:1}}@keyframes fadein{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:translateY(0)}}body{font-family:system-ui,-apple-system,sans-serif;display:flex;justify-content:center;align-items:center;height:100vh;margin:0;background:#1a1a2e}.card{text-align:center;color:#fff}.check{width:80px;height:80px;border-radius:50%;background:#00d4aa22;display:flex;align-items:center;justify-content:center;margin:0 auto 24px}.check::after{content:"";display:block;width:28px;height:14px;border-left:4px solid #00d4aa;border-bottom:4px solid #00d4aa;animation:checkmark .5s ease forwards}h1{color:#00d4aa;margin:0 0 8px;font-size:1.6rem}p{margin:0 0 6px;color:#ffffffcc;font-size:1rem}.sub{color:#ffffff66;font-size:.85rem;animation:fadein .5s ease .5s both}</style></head><body><div class="card"><div class="check"></div><h1>Authentication Successful!</h1><p>Redirecting back to terminal...</p><p class="sub">This tab will close automatically</p></div><script>setTimeout(function(){try{window.close()}catch(e){}setTimeout(function(){document.querySelector(".sub").textContent="You can safely close this tab"},500)},3000)</script></body></html>'
|
||||
|
||||
while true; do
|
||||
local response_file=$(mktemp)
|
||||
echo -e "$success_response" > "$response_file"
|
||||
|
||||
local request=$(nc_listen "$callback_port" < "$response_file" 2>/dev/null | head -1)
|
||||
local nc_status=$?
|
||||
rm -f "$response_file"
|
||||
|
||||
if [[ "$nc_status" -ne 0 ]]; then
|
||||
break
|
||||
fi
|
||||
|
||||
if [[ "$request" == *"/callback?code="* ]]; then
|
||||
local code=$(echo "$request" | sed -n 's/.*code=\([^ &]*\).*/\1/p')
|
||||
echo "$code" > "$code_file"
|
||||
break
|
||||
fi
|
||||
done
|
||||
) </dev/null &
|
||||
local server_pid=$!
|
||||
|
||||
sleep 1
|
||||
|
||||
if ! kill -0 "$server_pid" 2>/dev/null; then
|
||||
log_warn "Failed to start OAuth server (port may be in use)"
|
||||
rm -rf "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
|
||||
log_warn "Opening browser to authenticate with OpenRouter..."
|
||||
open_browser "$auth_url"
|
||||
|
||||
local timeout=120
|
||||
local elapsed=0
|
||||
while [[ ! -f "$code_file" ]] && [[ "$elapsed" -lt "$timeout" ]]; do
|
||||
sleep 1
|
||||
((elapsed++))
|
||||
done
|
||||
|
||||
kill "$server_pid" 2>/dev/null || true
|
||||
wait "$server_pid" 2>/dev/null || true
|
||||
|
||||
if [[ ! -f "$code_file" ]]; then
|
||||
log_warn "OAuth timeout - no response received"
|
||||
rm -rf "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local oauth_code=$(cat "$code_file")
|
||||
rm -rf "$oauth_dir"
|
||||
|
||||
log_warn "Exchanging OAuth code for API key..."
|
||||
local key_response=$(curl -s -X POST "https://openrouter.ai/api/v1/auth/keys" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"code\": \"$oauth_code\"}")
|
||||
|
||||
local api_key=$(echo "$key_response" | grep -o '"key":"[^"]*"' | sed 's/"key":"//;s/"$//')
|
||||
|
||||
if [[ -z "$api_key" ]]; then
|
||||
log_error "Failed to exchange OAuth code: ${key_response}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
log_info "Successfully obtained OpenRouter API key via OAuth!"
|
||||
echo "$api_key"
|
||||
}
|
||||
|
||||
# Main function: Try OAuth, fallback to manual entry
|
||||
get_openrouter_api_key_oauth() {
|
||||
local callback_port=${1:-5180}
|
||||
|
||||
local api_key=$(try_oauth_flow "$callback_port")
|
||||
|
||||
if [[ -n "$api_key" ]]; then
|
||||
echo "$api_key"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo ""
|
||||
log_warn "OAuth authentication failed or unavailable"
|
||||
log_warn "You can enter your API key manually instead"
|
||||
echo ""
|
||||
local manual_choice=$(safe_read "Would you like to enter your API key manually? (Y/n): ") || {
|
||||
log_error "Cannot prompt for manual entry in non-interactive mode"
|
||||
log_warn "Set OPENROUTER_API_KEY environment variable for non-interactive usage"
|
||||
return 1
|
||||
}
|
||||
|
||||
if [[ ! "$manual_choice" =~ ^[Nn]$ ]]; then
|
||||
api_key=$(get_openrouter_api_key_manual)
|
||||
echo "$api_key"
|
||||
return 0
|
||||
else
|
||||
log_error "Authentication cancelled by user"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
# Note: Provider-agnostic functions (logging, OAuth, browser, nc_listen) are now in shared/common.sh
|
||||
|
||||
# ============================================================
|
||||
# DigitalOcean specific functions
|
||||
|
|
@ -478,42 +266,14 @@ for net in data['droplet']['networks']['v4']:
|
|||
verify_server_connectivity() {
|
||||
local ip="$1"
|
||||
local max_attempts=${2:-30}
|
||||
local attempt=1
|
||||
|
||||
log_warn "Waiting for SSH connectivity to $ip..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS -o ConnectTimeout=5 "root@$ip" "echo ok" >/dev/null 2>&1; then
|
||||
log_info "SSH connection established"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Waiting for SSH... ($attempt/$max_attempts)"
|
||||
sleep 5
|
||||
((attempt++))
|
||||
done
|
||||
|
||||
log_error "Server failed to respond via SSH after $max_attempts attempts"
|
||||
return 1
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5
|
||||
}
|
||||
|
||||
# Wait for cloud-init to complete
|
||||
wait_for_cloud_init() {
|
||||
local ip="$1"
|
||||
local max_attempts=${2:-60}
|
||||
local attempt=1
|
||||
|
||||
log_warn "Waiting for cloud-init to complete..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS "root@$ip" "test -f /root/.cloud-init-complete" >/dev/null 2>&1; then
|
||||
log_info "Cloud-init completed"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Cloud-init in progress... ($attempt/$max_attempts)"
|
||||
sleep 5
|
||||
((attempt++))
|
||||
done
|
||||
|
||||
log_error "Cloud-init did not complete after $max_attempts attempts"
|
||||
return 1
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS" "test -f /root/.cloud-init-complete" "cloud-init" "$max_attempts" 5
|
||||
}
|
||||
|
||||
# Run a command on the server
|
||||
|
|
|
|||
|
|
@ -233,42 +233,14 @@ print(json.dumps(body))
|
|||
verify_server_connectivity() {
|
||||
local ip="$1"
|
||||
local max_attempts=${2:-30}
|
||||
local attempt=1
|
||||
|
||||
log_warn "Waiting for SSH connectivity to $ip..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS -o ConnectTimeout=5 "root@$ip" "echo ok" >/dev/null 2>&1; then
|
||||
log_info "SSH connection established"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Waiting for SSH... ($attempt/$max_attempts)"
|
||||
sleep 5
|
||||
((attempt++))
|
||||
done
|
||||
|
||||
log_error "Server failed to respond via SSH after $max_attempts attempts"
|
||||
return 1
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5
|
||||
}
|
||||
|
||||
# Wait for cloud-init to complete
|
||||
wait_for_cloud_init() {
|
||||
local ip="$1"
|
||||
local max_attempts=${2:-60}
|
||||
local attempt=1
|
||||
|
||||
log_warn "Waiting for cloud-init to complete..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS "root@$ip" "test -f /root/.cloud-init-complete" >/dev/null 2>&1; then
|
||||
log_info "Cloud-init completed"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Cloud-init in progress... ($attempt/$max_attempts)"
|
||||
sleep 5
|
||||
((attempt++))
|
||||
done
|
||||
|
||||
log_error "Cloud-init did not complete after $max_attempts attempts"
|
||||
return 1
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS" "test -f /root/.cloud-init-complete" "cloud-init" "$max_attempts" 5
|
||||
}
|
||||
|
||||
# Run a command on the server
|
||||
|
|
|
|||
|
|
@ -8,115 +8,14 @@ set -euo pipefail
|
|||
# Provider-agnostic functions
|
||||
# ============================================================
|
||||
|
||||
readonly RED='\033[0;31m'
|
||||
readonly GREEN='\033[0;32m'
|
||||
readonly YELLOW='\033[1;33m'
|
||||
readonly NC='\033[0m'
|
||||
|
||||
log_info() { echo -e "${GREEN}$1${NC}" >&2; }
|
||||
log_warn() { echo -e "${YELLOW}$1${NC}" >&2; }
|
||||
log_error() { echo -e "${RED}$1${NC}" >&2; }
|
||||
|
||||
safe_read() {
|
||||
local prompt="$1" result=""
|
||||
if [[ -t 0 ]]; then read -p "$prompt" result
|
||||
elif echo -n "" > /dev/tty 2>/dev/null; then read -p "$prompt" result < /dev/tty
|
||||
else log_error "Cannot read input: no TTY available"; return 1; fi
|
||||
echo "$result"
|
||||
# Source shared provider-agnostic functions
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/../../shared/common.sh" || {
|
||||
echo "ERROR: Failed to load shared/common.sh" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
nc_listen() {
|
||||
local port=$1; shift
|
||||
if nc --help 2>&1 | grep -q "BusyBox\|busybox" || nc --help 2>&1 | grep -q "\-p "; then
|
||||
nc -l -p "$port" "$@"
|
||||
else nc -l "$port" "$@"; fi
|
||||
}
|
||||
|
||||
open_browser() {
|
||||
local url=$1
|
||||
if command -v termux-open-url &>/dev/null; then termux-open-url "$url" </dev/null
|
||||
elif command -v open &>/dev/null; then open "$url" </dev/null
|
||||
elif command -v xdg-open &>/dev/null; then xdg-open "$url" </dev/null
|
||||
else log_warn "Please open: ${url}"; fi
|
||||
}
|
||||
|
||||
validate_model_id() {
|
||||
local model_id="$1"
|
||||
if [[ -z "$model_id" ]]; then return 0; fi
|
||||
if [[ ! "$model_id" =~ ^[a-zA-Z0-9/_:.-]+$ ]]; then
|
||||
log_error "Invalid model ID: contains unsafe characters"
|
||||
log_error "Model IDs should only contain: letters, numbers, /, -, _, :, ."
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
get_openrouter_api_key_manual() {
|
||||
echo ""; log_warn "Manual API Key Entry"
|
||||
echo -e "${YELLOW}Get your API key from: https://openrouter.ai/settings/keys${NC}"; echo ""
|
||||
local api_key=""
|
||||
while [[ -z "$api_key" ]]; do
|
||||
api_key=$(safe_read "Enter your OpenRouter API key: ") || return 1
|
||||
if [[ -z "$api_key" ]]; then log_error "API key cannot be empty"
|
||||
elif [[ ! "$api_key" =~ ^sk-or-v1-[a-f0-9]{64}$ ]]; then
|
||||
log_warn "Warning: API key format doesn't match expected pattern (sk-or-v1-...)"
|
||||
local confirm=$(safe_read "Use this key anyway? (y/N): ") || return 1
|
||||
if [[ "$confirm" =~ ^[Yy]$ ]]; then break; else api_key=""; fi
|
||||
fi
|
||||
done
|
||||
log_info "API key accepted!"; echo "$api_key"
|
||||
}
|
||||
|
||||
try_oauth_flow() {
|
||||
local callback_port=${1:-5180}
|
||||
log_warn "Attempting OAuth authentication..."
|
||||
if ! command -v nc &>/dev/null; then log_warn "netcat (nc) not found"; return 1; fi
|
||||
local callback_url="http://localhost:${callback_port}/callback"
|
||||
local auth_url="https://openrouter.ai/auth?callback_url=${callback_url}"
|
||||
local oauth_dir=$(mktemp -d) code_file="$oauth_dir/code"
|
||||
log_warn "Starting local OAuth server on port ${callback_port}..."
|
||||
(
|
||||
local success_response='HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n<html><head><style>@keyframes checkmark{0%{transform:scale(0) rotate(-45deg);opacity:0}60%{transform:scale(1.2) rotate(-45deg);opacity:1}100%{transform:scale(1) rotate(-45deg);opacity:1}}body{font-family:system-ui,-apple-system,sans-serif;display:flex;justify-content:center;align-items:center;height:100vh;margin:0;background:#1a1a2e}.card{text-align:center;color:#fff}.check{width:80px;height:80px;border-radius:50%;background:#00d4aa22;display:flex;align-items:center;justify-content:center;margin:0 auto 24px}.check::after{content:"";display:block;width:28px;height:14px;border-left:4px solid #00d4aa;border-bottom:4px solid #00d4aa;animation:checkmark .5s ease forwards}h1{color:#00d4aa;margin:0 0 8px;font-size:1.6rem}p{margin:0 0 6px;color:#ffffffcc;font-size:1rem}</style></head><body><div class="card"><div class="check"></div><h1>Authentication Successful!</h1><p>You can close this tab</p></div><script>setTimeout(function(){try{window.close()}catch(e){}},3000)</script></body></html>'
|
||||
while true; do
|
||||
local response_file=$(mktemp); echo -e "$success_response" > "$response_file"
|
||||
local request=$(nc_listen "$callback_port" < "$response_file" 2>/dev/null | head -1)
|
||||
local nc_status=$?; rm -f "$response_file"
|
||||
if [[ "$nc_status" -ne 0 ]]; then break; fi
|
||||
if [[ "$request" == *"/callback?code="* ]]; then
|
||||
echo "$request" | sed -n 's/.*code=\([^ &]*\).*/\1/p' > "$code_file"; break
|
||||
fi
|
||||
done
|
||||
) </dev/null &
|
||||
local server_pid=$!; sleep 1
|
||||
if ! kill -0 "$server_pid" 2>/dev/null; then log_warn "Failed to start OAuth server"; rm -rf "$oauth_dir"; return 1; fi
|
||||
log_warn "Opening browser to authenticate with OpenRouter..."; open_browser "$auth_url"
|
||||
local timeout=120 elapsed=0
|
||||
while [[ ! -f "$code_file" ]] && [[ "$elapsed" -lt "$timeout" ]]; do sleep 1; ((elapsed++)); done
|
||||
kill "$server_pid" 2>/dev/null || true; wait "$server_pid" 2>/dev/null || true
|
||||
if [[ ! -f "$code_file" ]]; then log_warn "OAuth timeout"; rm -rf "$oauth_dir"; return 1; fi
|
||||
local oauth_code=$(cat "$code_file"); rm -rf "$oauth_dir"
|
||||
log_warn "Exchanging OAuth code for API key..."
|
||||
local key_response=$(curl -s -X POST "https://openrouter.ai/api/v1/auth/keys" \
|
||||
-H "Content-Type: application/json" -d "{\"code\": \"$oauth_code\"}")
|
||||
local api_key=$(echo "$key_response" | grep -o '"key":"[^"]*"' | sed 's/"key":"//;s/"$//')
|
||||
if [[ -z "$api_key" ]]; then log_error "Failed to exchange OAuth code: ${key_response}"; return 1; fi
|
||||
log_info "Successfully obtained OpenRouter API key via OAuth!"; echo "$api_key"
|
||||
}
|
||||
|
||||
get_openrouter_api_key_oauth() {
|
||||
local callback_port=${1:-5180}
|
||||
local api_key=$(try_oauth_flow "$callback_port")
|
||||
if [[ -n "$api_key" ]]; then echo "$api_key"; return 0; fi
|
||||
echo ""; log_warn "OAuth authentication failed or unavailable"
|
||||
log_warn "You can enter your API key manually instead"; echo ""
|
||||
local manual_choice=$(safe_read "Would you like to enter your API key manually? (Y/n): ") || {
|
||||
log_error "Cannot prompt for manual entry in non-interactive mode"
|
||||
log_warn "Set OPENROUTER_API_KEY environment variable for non-interactive usage"; return 1
|
||||
}
|
||||
if [[ ! "$manual_choice" =~ ^[Nn]$ ]]; then
|
||||
api_key=$(get_openrouter_api_key_manual); echo "$api_key"; return 0
|
||||
else log_error "Authentication cancelled by user"; return 1; fi
|
||||
}
|
||||
# Note: Provider-agnostic functions (logging, OAuth, browser, nc_listen) are now in shared/common.sh
|
||||
|
||||
# ============================================================
|
||||
# Linode (Akamai) specific functions
|
||||
|
|
@ -296,27 +195,13 @@ print('; '.join(e.get('reason','Unknown') for e in errs) if errs else 'Unknown e
|
|||
}
|
||||
|
||||
verify_server_connectivity() {
|
||||
local ip="$1" max_attempts=${2:-30} attempt=1
|
||||
log_warn "Waiting for SSH connectivity to $ip..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS -o ConnectTimeout=5 "root@$ip" "echo ok" >/dev/null 2>&1; then
|
||||
log_info "SSH connection established"; return 0
|
||||
fi
|
||||
log_warn "Waiting for SSH... ($attempt/$max_attempts)"; sleep 5; ((attempt++))
|
||||
done
|
||||
log_error "Server failed to respond via SSH after $max_attempts attempts"; return 1
|
||||
local ip="$1" max_attempts=${2:-30}
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5
|
||||
}
|
||||
|
||||
wait_for_cloud_init() {
|
||||
local ip="$1" max_attempts=${2:-60} attempt=1
|
||||
log_warn "Waiting for cloud-init to complete..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS "root@$ip" "test -f /root/.cloud-init-complete" >/dev/null 2>&1; then
|
||||
log_info "Cloud-init completed"; return 0
|
||||
fi
|
||||
log_warn "Cloud-init in progress... ($attempt/$max_attempts)"; sleep 5; ((attempt++))
|
||||
done
|
||||
log_error "Cloud-init did not complete after $max_attempts attempts"; return 1
|
||||
local ip="$1" max_attempts=${2:-60}
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS" "test -f /root/.cloud-init-complete" "cloud-init" "$max_attempts" 5
|
||||
}
|
||||
|
||||
run_server() { local ip="$1" cmd="$2"; ssh $SSH_OPTS "root@$ip" "$cmd"; }
|
||||
|
|
|
|||
169
shared/common.sh
169
shared/common.sh
|
|
@ -128,41 +128,28 @@ get_openrouter_api_key_manual() {
|
|||
echo "$api_key"
|
||||
}
|
||||
|
||||
# Try OAuth flow, fallback to manual entry if it fails
|
||||
try_oauth_flow() {
|
||||
local callback_port=${1:-5180}
|
||||
# Generate OAuth success response HTML
|
||||
create_oauth_response_html() {
|
||||
cat << 'HTML_EOF'
|
||||
HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n<html><head><style>@keyframes checkmark{0%{transform:scale(0) rotate(-45deg);opacity:0}60%{transform:scale(1.2) rotate(-45deg);opacity:1}100%{transform:scale(1) rotate(-45deg);opacity:1}}@keyframes fadein{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:translateY(0)}}body{font-family:system-ui,-apple-system,sans-serif;display:flex;justify-content:center;align-items:center;height:100vh;margin:0;background:#1a1a2e}.card{text-align:center;color:#fff}.check{width:80px;height:80px;border-radius:50%;background:#00d4aa22;display:flex;align-items:center;justify-content:center;margin:0 auto 24px}.check::after{content:"";display:block;width:28px;height:14px;border-left:4px solid #00d4aa;border-bottom:4px solid #00d4aa;animation:checkmark .5s ease forwards}h1{color:#00d4aa;margin:0 0 8px;font-size:1.6rem}p{margin:0 0 6px;color:#ffffffcc;font-size:1rem}.sub{color:#ffffff66;font-size:.85rem;animation:fadein .5s ease .5s both}</style></head><body><div class="card"><div class="check"></div><h1>Authentication Successful!</h1><p>Redirecting back to terminal...</p><p class="sub">This tab will close automatically</p></div><script>setTimeout(function(){try{window.close()}catch(e){}setTimeout(function(){document.querySelector(".sub").textContent="You can safely close this tab"},500)},3000)</script></body></html>
|
||||
HTML_EOF
|
||||
}
|
||||
|
||||
log_warn "Attempting OAuth authentication..."
|
||||
# Start OAuth callback server in background, returns server PID
|
||||
start_oauth_server() {
|
||||
local port="$1"
|
||||
local code_file="$2"
|
||||
local success_response=$(create_oauth_response_html)
|
||||
|
||||
# Check if nc is available
|
||||
if ! command -v nc &> /dev/null; then
|
||||
log_warn "netcat (nc) not found - OAuth server unavailable"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local callback_url="http://localhost:${callback_port}/callback"
|
||||
local auth_url="https://openrouter.ai/auth?callback_url=${callback_url}"
|
||||
|
||||
# Create a temporary directory for the OAuth flow
|
||||
local oauth_dir=$(mktemp -d)
|
||||
local code_file="$oauth_dir/code"
|
||||
|
||||
log_warn "Starting local OAuth server on port ${callback_port}..."
|
||||
|
||||
# Use a simpler nc approach - pipe response while capturing request
|
||||
(
|
||||
local success_response='HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n<html><head><style>@keyframes checkmark{0%{transform:scale(0) rotate(-45deg);opacity:0}60%{transform:scale(1.2) rotate(-45deg);opacity:1}100%{transform:scale(1) rotate(-45deg);opacity:1}}@keyframes fadein{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:translateY(0)}}body{font-family:system-ui,-apple-system,sans-serif;display:flex;justify-content:center;align-items:center;height:100vh;margin:0;background:#1a1a2e}.card{text-align:center;color:#fff}.check{width:80px;height:80px;border-radius:50%;background:#00d4aa22;display:flex;align-items:center;justify-content:center;margin:0 auto 24px}.check::after{content:"";display:block;width:28px;height:14px;border-left:4px solid #00d4aa;border-bottom:4px solid #00d4aa;animation:checkmark .5s ease forwards}h1{color:#00d4aa;margin:0 0 8px;font-size:1.6rem}p{margin:0 0 6px;color:#ffffffcc;font-size:1rem}.sub{color:#ffffff66;font-size:.85rem;animation:fadein .5s ease .5s both}</style></head><body><div class="card"><div class="check"></div><h1>Authentication Successful!</h1><p>Redirecting back to terminal...</p><p class="sub">This tab will close automatically</p></div><script>setTimeout(function(){try{window.close()}catch(e){}setTimeout(function(){document.querySelector(".sub").textContent="You can safely close this tab"},500)},3000)</script></body></html>'
|
||||
|
||||
while true; do
|
||||
# Listen and capture just the first line of the request, then respond
|
||||
local response_file=$(mktemp)
|
||||
echo -e "$success_response" > "$response_file"
|
||||
|
||||
local request=$(nc_listen "$callback_port" < "$response_file" 2>/dev/null | head -1)
|
||||
local request=$(nc_listen "$port" < "$response_file" 2>/dev/null | head -1)
|
||||
local nc_status=$?
|
||||
rm -f "$response_file"
|
||||
|
||||
# If nc failed, exit the loop
|
||||
if [[ $nc_status -ne 0 ]]; then
|
||||
break
|
||||
fi
|
||||
|
|
@ -174,45 +161,28 @@ try_oauth_flow() {
|
|||
fi
|
||||
done
|
||||
) </dev/null &
|
||||
local server_pid=$!
|
||||
|
||||
# Give the server a moment to start and check if it's running
|
||||
sleep 1
|
||||
echo $!
|
||||
}
|
||||
|
||||
# Check if the background process is still running
|
||||
if ! kill -0 "$server_pid" 2>/dev/null; then
|
||||
log_warn "Failed to start OAuth server (port may be in use)"
|
||||
rm -rf "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Open browser
|
||||
log_warn "Opening browser to authenticate with OpenRouter..."
|
||||
open_browser "$auth_url"
|
||||
|
||||
# Wait for the code file to be created (timeout after 2 minutes)
|
||||
local timeout=120
|
||||
# Wait for OAuth code with timeout, returns 0 if code received
|
||||
wait_for_oauth_code() {
|
||||
local code_file="$1"
|
||||
local timeout="${2:-120}"
|
||||
local elapsed=0
|
||||
while [[ ! -f "$code_file" ]] && [[ "$elapsed" -lt "$timeout" ]]; do
|
||||
|
||||
while [[ ! -f "$code_file" ]] && [[ $elapsed -lt $timeout ]]; do
|
||||
sleep 1
|
||||
((elapsed++))
|
||||
done
|
||||
|
||||
# Kill the background server process
|
||||
kill "$server_pid" 2>/dev/null || true
|
||||
wait "$server_pid" 2>/dev/null || true
|
||||
[[ -f "$code_file" ]]
|
||||
}
|
||||
|
||||
if [[ ! -f "$code_file" ]]; then
|
||||
log_warn "OAuth timeout - no response received"
|
||||
rm -rf "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
# Exchange OAuth code for API key
|
||||
exchange_oauth_code() {
|
||||
local oauth_code="$1"
|
||||
|
||||
local oauth_code=$(cat "$code_file")
|
||||
rm -rf "$oauth_dir"
|
||||
|
||||
# Exchange the code for an API key
|
||||
log_warn "Exchanging OAuth code for API key..."
|
||||
local key_response=$(curl -s -X POST "https://openrouter.ai/api/v1/auth/keys" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"code\": \"$oauth_code\"}")
|
||||
|
|
@ -224,6 +194,65 @@ try_oauth_flow() {
|
|||
return 1
|
||||
fi
|
||||
|
||||
echo "$api_key"
|
||||
}
|
||||
|
||||
# Clean up OAuth session resources
|
||||
cleanup_oauth_session() {
|
||||
local server_pid="$1"
|
||||
local oauth_dir="$2"
|
||||
|
||||
if [[ -n "$server_pid" ]]; then
|
||||
kill "$server_pid" 2>/dev/null || true
|
||||
wait "$server_pid" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
if [[ -n "$oauth_dir" && -d "$oauth_dir" ]]; then
|
||||
rm -rf "$oauth_dir"
|
||||
fi
|
||||
}
|
||||
|
||||
# Try OAuth flow (orchestrates the helper functions above)
|
||||
try_oauth_flow() {
|
||||
local callback_port=${1:-5180}
|
||||
|
||||
log_warn "Attempting OAuth authentication..."
|
||||
|
||||
if ! command -v nc &> /dev/null; then
|
||||
log_warn "netcat (nc) not found - OAuth server unavailable"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local callback_url="http://localhost:${callback_port}/callback"
|
||||
local auth_url="https://openrouter.ai/auth?callback_url=${callback_url}"
|
||||
local oauth_dir=$(mktemp -d)
|
||||
local code_file="$oauth_dir/code"
|
||||
|
||||
log_warn "Starting local OAuth server on port ${callback_port}..."
|
||||
local server_pid=$(start_oauth_server "$callback_port" "$code_file")
|
||||
|
||||
sleep 1
|
||||
if ! kill -0 "$server_pid" 2>/dev/null; then
|
||||
log_warn "Failed to start OAuth server (port may be in use)"
|
||||
cleanup_oauth_session "" "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
|
||||
log_warn "Opening browser to authenticate with OpenRouter..."
|
||||
open_browser "$auth_url"
|
||||
|
||||
if ! wait_for_oauth_code "$code_file" 120; then
|
||||
log_warn "OAuth timeout - no response received"
|
||||
cleanup_oauth_session "$server_pid" "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local oauth_code=$(cat "$code_file")
|
||||
cleanup_oauth_session "$server_pid" "$oauth_dir"
|
||||
|
||||
log_warn "Exchanging OAuth code for API key..."
|
||||
local api_key=$(exchange_oauth_code "$oauth_code") || return 1
|
||||
|
||||
log_info "Successfully obtained OpenRouter API key via OAuth!"
|
||||
echo "$api_key"
|
||||
}
|
||||
|
|
@ -260,3 +289,33 @@ get_openrouter_api_key_oauth() {
|
|||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# ============================================================
|
||||
# SSH connectivity helpers
|
||||
# ============================================================
|
||||
|
||||
# Generic SSH wait function - polls until a remote command succeeds
|
||||
# Usage: generic_ssh_wait IP SSH_OPTS TEST_CMD DESCRIPTION MAX_ATTEMPTS INTERVAL
|
||||
generic_ssh_wait() {
|
||||
local ip="$1"
|
||||
local ssh_opts="$2"
|
||||
local test_cmd="$3"
|
||||
local description="$4"
|
||||
local max_attempts="${5:-30}"
|
||||
local interval="${6:-5}"
|
||||
local attempt=1
|
||||
|
||||
log_warn "Waiting for $description to $ip..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $ssh_opts "root@$ip" "$test_cmd" >/dev/null 2>&1; then
|
||||
log_info "$description ready"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Waiting for $description... ($attempt/$max_attempts)"
|
||||
sleep "$interval"
|
||||
((attempt++))
|
||||
done
|
||||
|
||||
log_error "$description failed after $max_attempts attempts"
|
||||
return 1
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,160 +5,17 @@
|
|||
set -euo pipefail
|
||||
|
||||
# ============================================================
|
||||
# Provider-agnostic functions (shared with sprite/lib/common.sh)
|
||||
# Provider-agnostic functions
|
||||
# ============================================================
|
||||
|
||||
readonly RED='\033[0;31m'
|
||||
readonly GREEN='\033[0;32m'
|
||||
readonly YELLOW='\033[1;33m'
|
||||
readonly NC='\033[0m'
|
||||
|
||||
log_info() { echo -e "${GREEN}$1${NC}" >&2; }
|
||||
log_warn() { echo -e "${YELLOW}$1${NC}" >&2; }
|
||||
log_error() { echo -e "${RED}$1${NC}" >&2; }
|
||||
|
||||
safe_read() {
|
||||
local prompt="$1"
|
||||
local result=""
|
||||
if [[ -t 0 ]]; then
|
||||
read -p "$prompt" result
|
||||
elif echo -n "" > /dev/tty 2>/dev/null; then
|
||||
read -p "$prompt" result < /dev/tty
|
||||
else
|
||||
log_error "Cannot read input: no TTY available"
|
||||
return 1
|
||||
fi
|
||||
echo "$result"
|
||||
# Source shared provider-agnostic functions
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/../../shared/common.sh" || {
|
||||
echo "ERROR: Failed to load shared/common.sh" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
nc_listen() {
|
||||
local port=$1; shift
|
||||
if nc --help 2>&1 | grep -q "BusyBox\|busybox" || nc --help 2>&1 | grep -q "\-p "; then
|
||||
nc -l -p "$port" "$@"
|
||||
else
|
||||
nc -l "$port" "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
open_browser() {
|
||||
local url=$1
|
||||
if command -v termux-open-url &> /dev/null; then termux-open-url "$url" </dev/null
|
||||
elif command -v open &> /dev/null; then open "$url" </dev/null
|
||||
elif command -v xdg-open &> /dev/null; then xdg-open "$url" </dev/null
|
||||
else log_warn "Please open: ${url}"; fi
|
||||
}
|
||||
|
||||
validate_model_id() {
|
||||
local model_id="$1"
|
||||
if [[ -z "$model_id" ]]; then return 0; fi
|
||||
if [[ ! "$model_id" =~ ^[a-zA-Z0-9/_:.-]+$ ]]; then
|
||||
log_error "Invalid model ID: contains unsafe characters"
|
||||
log_error "Model IDs should only contain: letters, numbers, /, -, _, :, ."
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
get_openrouter_api_key_manual() {
|
||||
echo ""
|
||||
log_warn "Manual API Key Entry"
|
||||
echo -e "${YELLOW}Get your API key from: https://openrouter.ai/settings/keys${NC}"
|
||||
echo ""
|
||||
local api_key=""
|
||||
while [[ -z "$api_key" ]]; do
|
||||
api_key=$(safe_read "Enter your OpenRouter API key: ") || return 1
|
||||
if [[ -z "$api_key" ]]; then
|
||||
log_error "API key cannot be empty"
|
||||
elif [[ ! "$api_key" =~ ^sk-or-v1-[a-f0-9]{64}$ ]]; then
|
||||
log_warn "Warning: API key format doesn't match expected pattern (sk-or-v1-...)"
|
||||
local confirm=$(safe_read "Use this key anyway? (y/N): ") || return 1
|
||||
if [[ "$confirm" =~ ^[Yy]$ ]]; then break; else api_key=""; fi
|
||||
fi
|
||||
done
|
||||
log_info "API key accepted!"
|
||||
echo "$api_key"
|
||||
}
|
||||
|
||||
try_oauth_flow() {
|
||||
local callback_port=${1:-5180}
|
||||
log_warn "Attempting OAuth authentication..."
|
||||
if ! command -v nc &> /dev/null; then
|
||||
log_warn "netcat (nc) not found - OAuth server unavailable"
|
||||
return 1
|
||||
fi
|
||||
local callback_url="http://localhost:${callback_port}/callback"
|
||||
local auth_url="https://openrouter.ai/auth?callback_url=${callback_url}"
|
||||
local oauth_dir=$(mktemp -d)
|
||||
local code_file="$oauth_dir/code"
|
||||
log_warn "Starting local OAuth server on port ${callback_port}..."
|
||||
(
|
||||
local success_response='HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n<html><head><style>@keyframes checkmark{0%{transform:scale(0) rotate(-45deg);opacity:0}60%{transform:scale(1.2) rotate(-45deg);opacity:1}100%{transform:scale(1) rotate(-45deg);opacity:1}}@keyframes fadein{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:translateY(0)}}body{font-family:system-ui,-apple-system,sans-serif;display:flex;justify-content:center;align-items:center;height:100vh;margin:0;background:#1a1a2e}.card{text-align:center;color:#fff}.check{width:80px;height:80px;border-radius:50%;background:#00d4aa22;display:flex;align-items:center;justify-content:center;margin:0 auto 24px}.check::after{content:"";display:block;width:28px;height:14px;border-left:4px solid #00d4aa;border-bottom:4px solid #00d4aa;animation:checkmark .5s ease forwards}h1{color:#00d4aa;margin:0 0 8px;font-size:1.6rem}p{margin:0 0 6px;color:#ffffffcc;font-size:1rem}.sub{color:#ffffff66;font-size:.85rem;animation:fadein .5s ease .5s both}</style></head><body><div class="card"><div class="check"></div><h1>Authentication Successful!</h1><p>Redirecting back to terminal...</p><p class="sub">This tab will close automatically</p></div><script>setTimeout(function(){try{window.close()}catch(e){}setTimeout(function(){document.querySelector(".sub").textContent="You can safely close this tab"},500)},3000)</script></body></html>'
|
||||
while true; do
|
||||
local response_file=$(mktemp)
|
||||
echo -e "$success_response" > "$response_file"
|
||||
local request=$(nc_listen "$callback_port" < "$response_file" 2>/dev/null | head -1)
|
||||
local nc_status=$?
|
||||
rm -f "$response_file"
|
||||
if [[ "$nc_status" -ne 0 ]]; then break; fi
|
||||
if [[ "$request" == *"/callback?code="* ]]; then
|
||||
local code=$(echo "$request" | sed -n 's/.*code=\([^ &]*\).*/\1/p')
|
||||
echo "$code" > "$code_file"
|
||||
break
|
||||
fi
|
||||
done
|
||||
) </dev/null &
|
||||
local server_pid=$!
|
||||
sleep 1
|
||||
if ! kill -0 "$server_pid" 2>/dev/null; then
|
||||
log_warn "Failed to start OAuth server (port may be in use)"
|
||||
rm -rf "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
log_warn "Opening browser to authenticate with OpenRouter..."
|
||||
open_browser "$auth_url"
|
||||
local timeout=120 elapsed=0
|
||||
while [[ ! -f "$code_file" ]] && [[ "$elapsed" -lt "$timeout" ]]; do sleep 1; ((elapsed++)); done
|
||||
kill "$server_pid" 2>/dev/null || true
|
||||
wait "$server_pid" 2>/dev/null || true
|
||||
if [[ ! -f "$code_file" ]]; then
|
||||
log_warn "OAuth timeout - no response received"
|
||||
rm -rf "$oauth_dir"
|
||||
return 1
|
||||
fi
|
||||
local oauth_code=$(cat "$code_file")
|
||||
rm -rf "$oauth_dir"
|
||||
log_warn "Exchanging OAuth code for API key..."
|
||||
local key_response=$(curl -s -X POST "https://openrouter.ai/api/v1/auth/keys" \
|
||||
-H "Content-Type: application/json" -d "{\"code\": \"$oauth_code\"}")
|
||||
local api_key=$(echo "$key_response" | grep -o '"key":"[^"]*"' | sed 's/"key":"//;s/"$//')
|
||||
if [[ -z "$api_key" ]]; then
|
||||
log_error "Failed to exchange OAuth code: ${key_response}"
|
||||
return 1
|
||||
fi
|
||||
log_info "Successfully obtained OpenRouter API key via OAuth!"
|
||||
echo "$api_key"
|
||||
}
|
||||
|
||||
get_openrouter_api_key_oauth() {
|
||||
local callback_port=${1:-5180}
|
||||
local api_key=$(try_oauth_flow "$callback_port")
|
||||
if [[ -n "$api_key" ]]; then echo "$api_key"; return 0; fi
|
||||
echo ""
|
||||
log_warn "OAuth authentication failed or unavailable"
|
||||
log_warn "You can enter your API key manually instead"
|
||||
echo ""
|
||||
local manual_choice=$(safe_read "Would you like to enter your API key manually? (Y/n): ") || {
|
||||
log_error "Cannot prompt for manual entry in non-interactive mode"
|
||||
log_warn "Set OPENROUTER_API_KEY environment variable for non-interactive usage"
|
||||
return 1
|
||||
}
|
||||
if [[ ! "$manual_choice" =~ ^[Nn]$ ]]; then
|
||||
api_key=$(get_openrouter_api_key_manual)
|
||||
echo "$api_key"; return 0
|
||||
else
|
||||
log_error "Authentication cancelled by user"; return 1
|
||||
fi
|
||||
}
|
||||
# Note: Provider-agnostic functions (logging, OAuth, browser, nc_listen) are now in shared/common.sh
|
||||
|
||||
# ============================================================
|
||||
# Vultr specific functions
|
||||
|
|
@ -358,37 +215,13 @@ print(json.dumps(body))
|
|||
verify_server_connectivity() {
|
||||
local ip="$1"
|
||||
local max_attempts=${2:-30}
|
||||
local attempt=1
|
||||
log_warn "Waiting for SSH connectivity to $ip..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS -o ConnectTimeout=5 "root@$ip" "echo ok" >/dev/null 2>&1; then
|
||||
log_info "SSH connection established"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Waiting for SSH... ($attempt/$max_attempts)"
|
||||
sleep 5
|
||||
((attempt++))
|
||||
done
|
||||
log_error "Server failed to respond via SSH after $max_attempts attempts"
|
||||
return 1
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS -o ConnectTimeout=5" "echo ok" "SSH connectivity" "$max_attempts" 5
|
||||
}
|
||||
|
||||
wait_for_cloud_init() {
|
||||
local ip="$1"
|
||||
local max_attempts=${2:-60}
|
||||
local attempt=1
|
||||
log_warn "Waiting for cloud-init to complete..."
|
||||
while [[ "$attempt" -le "$max_attempts" ]]; do
|
||||
if ssh $SSH_OPTS "root@$ip" "test -f /root/.cloud-init-complete" >/dev/null 2>&1; then
|
||||
log_info "Cloud-init completed"
|
||||
return 0
|
||||
fi
|
||||
log_warn "Cloud-init in progress... ($attempt/$max_attempts)"
|
||||
sleep 5
|
||||
((attempt++))
|
||||
done
|
||||
log_error "Cloud-init did not complete after $max_attempts attempts"
|
||||
return 1
|
||||
generic_ssh_wait "$ip" "$SSH_OPTS" "test -f /root/.cloud-init-complete" "cloud-init" "$max_attempts" 5
|
||||
}
|
||||
|
||||
run_server() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue