bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: enhance upgrade script with backup, color UI, service checks, and error handling

Browse Source
This commit is contained in:
Whispering Wind
2025-05-16 00:42:02 +03:30
committed by GitHub
parent cfd29c458d
commit 37aafa8c61
3 changed files with 114 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/scripts/scheduler.sh
View File

@ -38,7 +38,7 @@ EOF
check_scheduler_service() { check_scheduler_service() {
if systemctl is-active --quiet hysteria-scheduler.service; then if systemctl is-active --quiet hysteria-scheduler.service; then
echo "Hysteria scheduler service is already active." # echo "Hysteria scheduler service is already active."
return 0 return 0
else else
return 1 return 1

2
install.sh
View File

@ -123,7 +123,7 @@ clone_repository() {
fi fi
fi fi
if git clone -b beta https://github.com/ReturnFI/Blitz /etc/hysteria &> /dev/null; then if git clone https://github.com/ReturnFI/Blitz /etc/hysteria &> /dev/null; then
log_success "Repository cloned successfully" log_success "Repository cloned successfully"
else else
log_error "Failed to clone repository" log_error "Failed to clone repository"

216
upgrade.sh
View File

@ -1,132 +1,138 @@
#!/bin/bash #!/bin/bash
cd /root/ set -euo pipefail
TEMP_DIR=$(mktemp -d) trap 'echo -e "\n❌ An error occurred. Aborting."; exit 1' ERR
# ========== Variables ==========
HYSTERIA_INSTALL_DIR="/etc/hysteria"
HYSTERIA_VENV_DIR="$HYSTERIA_INSTALL_DIR/hysteria2_venv"
REPO_URL="https://github.com/ReturnFI/Blitz"
REPO_BRANCH="beta"
GEOSITE_URL="https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat"
GEOIP_URL="https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geoip.dat"
# ========== Color Setup ==========
GREEN=$(tput setaf 2)
RED=$(tput setaf 1)
YELLOW=$(tput setaf 3)
BLUE=$(tput setaf 4)
RESET=$(tput sgr0)
info() { echo -e "${BLUE}[$(date '+%Y-%m-%d %H:%M:%S')] [INFO] - ${RESET} $1"; }
success() { echo -e "${GREEN}[$(date '+%Y-%m-%d %H:%M:%S')] [OK] - ${RESET} $1"; }
warn() { echo -e "${YELLOW}[$(date '+%Y-%m-%d %H:%M:%S')] [WARN] - ${RESET} $1"; }
error() { echo -e "${RED}[$(date '+%Y-%m-%d %H:%M:%S')] [ERROR] - ${RESET} $1"; }
# ========== Backup Files ==========
cd /root
TEMP_DIR=$(mktemp -d)
FILES=( FILES=(
"/etc/hysteria/ca.key" "$HYSTERIA_INSTALL_DIR/ca.key"
"/etc/hysteria/ca.crt" "$HYSTERIA_INSTALL_DIR/ca.crt"
"/etc/hysteria/users.json" "$HYSTERIA_INSTALL_DIR/users.json"
"/etc/hysteria/config.json" "$HYSTERIA_INSTALL_DIR/config.json"
"/etc/hysteria/.configs.env" "$HYSTERIA_INSTALL_DIR/.configs.env"
"/etc/hysteria/core/scripts/telegrambot/.env" "$HYSTERIA_INSTALL_DIR/core/scripts/telegrambot/.env"
"/etc/hysteria/core/scripts/singbox/.env" "$HYSTERIA_INSTALL_DIR/core/scripts/singbox/.env"
"/etc/hysteria/core/scripts/normalsub/.env" "$HYSTERIA_INSTALL_DIR/core/scripts/normalsub/.env"
"/etc/hysteria/core/scripts/webpanel/.env" "$HYSTERIA_INSTALL_DIR/core/scripts/webpanel/.env"
"/etc/hysteria/core/scripts/webpanel/Caddyfile" "$HYSTERIA_INSTALL_DIR/core/scripts/webpanel/Caddyfile"
) )
echo "Backing up files to $TEMP_DIR" info "Backing up configuration files to: $TEMP_DIR"
for FILE in "${FILES[@]}"; do for FILE in "${FILES[@]}"; do
if [[ -f "$FILE" ]]; then
mkdir -p "$TEMP_DIR/$(dirname "$FILE")" mkdir -p "$TEMP_DIR/$(dirname "$FILE")"
cp "$FILE" "$TEMP_DIR/$FILE" cp -p "$FILE" "$TEMP_DIR/$FILE"
success "Backed up: $FILE"
else
warn "File not found: $FILE"
fi
done done
echo "Removing /etc/hysteria directory" # ========== Replace Installation ==========
rm -rf /etc/hysteria/ info "Removing old hysteria directory..."
rm -rf "$HYSTERIA_INSTALL_DIR"
echo "Cloning Blitz repository" info "Cloning Blitz repository (branch: $REPO_BRANCH)..."
git clone -b beta https://github.com/ReturnFI/Blitz /etc/hysteria git clone -q -b "$REPO_BRANCH" "$REPO_URL" "$HYSTERIA_INSTALL_DIR"
echo "Downloading geosite.dat and geoip.dat" # ========== Download Geo Data ==========
wget -O /etc/hysteria/geosite.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat >/dev/null 2>&1 info "Downloading geosite.dat and geoip.dat..."
wget -O /etc/hysteria/geoip.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geoip.dat >/dev/null 2>&1 wget -q -O "$HYSTERIA_INSTALL_DIR/geosite.dat" "$GEOSITE_URL"
wget -q -O "$HYSTERIA_INSTALL_DIR/geoip.dat" "$GEOIP_URL"
success "Geo data downloaded."
echo "Restoring backup files" # ========== Restore Backup ==========
info "Restoring configuration files..."
for FILE in "${FILES[@]}"; do for FILE in "${FILES[@]}"; do
cp "$TEMP_DIR/$FILE" "$FILE" BACKUP="$TEMP_DIR/$FILE"
if [[ -f "$BACKUP" ]]; then
cp -p "$BACKUP" "$FILE"
success "Restored: $FILE"
else
warn "Missing backup file: $BACKUP"
fi
done done
CONFIG_ENV="/etc/hysteria/.configs.env" # ========== Permissions ==========
if [ ! -f "$CONFIG_ENV" ]; then info "Setting ownership and permissions..."
echo ".configs.env not found, creating it with default values." chown hysteria:hysteria "$HYSTERIA_INSTALL_DIR/ca.key" "$HYSTERIA_INSTALL_DIR/ca.crt"
echo "SNI=bts.com" > "$CONFIG_ENV" chmod 640 "$HYSTERIA_INSTALL_DIR/ca.key" "$HYSTERIA_INSTALL_DIR/ca.crt"
fi
export $(grep -v '^#' "$CONFIG_ENV" | xargs 2>/dev/null) chown -R hysteria:hysteria "$HYSTERIA_INSTALL_DIR/core/scripts/singbox"
chown -R hysteria:hysteria "$HYSTERIA_INSTALL_DIR/core/scripts/telegrambot"
if [[ -z "$IP4" ]]; then chmod +x "$HYSTERIA_INSTALL_DIR/core/scripts/hysteria2/user.sh"
echo "IP4 not found, fetching from ip.gs..." chmod +x "$HYSTERIA_INSTALL_DIR/core/scripts/hysteria2/kick.py"
IP4=$(curl -s -4 ip.gs || echo "")
echo "IP4=${IP4:-}" >> "$CONFIG_ENV"
fi
if [[ -z "$IP6" ]]; then # ========== Virtual Environment ==========
echo "IP6 not found, fetching from ip.gs..." info "Setting up virtual environment and installing dependencies..."
IP6=$(curl -s -6 ip.gs || echo "") cd "$HYSTERIA_INSTALL_DIR"
echo "IP6=${IP6:-}" >> "$CONFIG_ENV" python3 -m venv "$HYSTERIA_VENV_DIR"
fi source "$HYSTERIA_VENV_DIR/bin/activate"
pip install --upgrade pip >/dev/null
pip install -r requirements.txt >/dev/null
success "Python environment ready."
NORMALSUB_ENV="/etc/hysteria/core/scripts/normalsub/.env" # ========== Scheduler ==========
info "Ensuring scheduler is set..."
if [[ -f "$NORMALSUB_ENV" ]]; then source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
echo "Checking if SUBPATH exists in $NORMALSUB_ENV..."
if ! grep -q '^SUBPATH=' "$NORMALSUB_ENV"; then
echo "SUBPATH not found, generating a new one..."
SUBPATH=$(pwgen -s 32 1)
echo -e "\nSUBPATH=$SUBPATH" >> "$NORMALSUB_ENV"
else
echo "SUBPATH already exists, no changes made."
fi
else
echo "$NORMALSUB_ENV not found. Skipping SUBPATH check."
fi
CONFIG_FILE="/etc/hysteria/config.json"
if [ -f "$CONFIG_FILE" ]; then
echo "Checking and converting pinSHA256 format in config.json"
if grep -q "pinSHA256.*=" "$CONFIG_FILE"; then
echo "Converting pinSHA256 from base64 to hex format"
HEX_FINGERPRINT=$(openssl x509 -noout -fingerprint -sha256 -inform pem -in /etc/hysteria/ca.crt | sed 's/.*=//;s///g')
sed -i "s|\"pinSHA256\": \"sha256/.*\"|\"pinSHA256\": \"$HEX_FINGERPRINT\"|" "$CONFIG_FILE"
echo "pinSHA256 converted to hex format: $HEX_FINGERPRINT"
else
echo "pinSHA256 appears to already be in hex format or not present, no conversion needed"
fi
fi
echo "Setting ownership and permissions"
chown hysteria:hysteria /etc/hysteria/ca.key /etc/hysteria/ca.crt
chmod 640 /etc/hysteria/ca.key /etc/hysteria/ca.crt
chown -R hysteria:hysteria /etc/hysteria/core/scripts/singbox
chown -R hysteria:hysteria /etc/hysteria/core/scripts/telegrambot
echo "Setting execute permissions for user.sh and kick.py"
chmod +x /etc/hysteria/core/scripts/hysteria2/user.sh
chmod +x /etc/hysteria/core/scripts/hysteria2/kick.py
cd /etc/hysteria
python3 -m venv hysteria2_venv
source /etc/hysteria/hysteria2_venv/bin/activate
pip install -r requirements.txt
source /etc/hysteria/core/scripts/scheduler.sh
if ! check_scheduler_service; then if ! check_scheduler_service; then
setup_hysteria_scheduler setup_hysteria_scheduler
fi success "Scheduler service configured."
echo "Restarting hysteria-caddy service"
systemctl restart hysteria-caddy.service
echo "Restarting other hysteria services"
systemctl restart hysteria-server.service
systemctl restart hysteria-telegram-bot.service
systemctl restart hysteria-normal-sub.service
systemctl restart hysteria-webpanel.service
echo "Checking hysteria-server.service status"
if systemctl is-active --quiet hysteria-server.service; then
echo "Upgrade completed successfully"
else else
echo "Upgrade failed: hysteria-server.service is not active" success "Scheduler already set."
fi fi
sleep 10 # ========== Restart Services ==========
SERVICES=(
hysteria-caddy.service
hysteria-server.service
hysteria-scheduler.service
hysteria-telegram-bot.service
hysteria-normal-sub.service
hysteria-webpanel.service
hysteria-ip-limit.service
)
info "Restarting available services..."
for SERVICE in "${SERVICES[@]}"; do
if systemctl status "$SERVICE" &>/dev/null; then
systemctl restart "$SERVICE" && success "$SERVICE restarted." || warn "$SERVICE failed to restart."
else
warn "$SERVICE not found or not installed. Skipping..."
fi
done
# ========== Final Check ==========
if systemctl is-active --quiet hysteria-server.service; then
success "🎉 Upgrade completed successfully!"
else
warn "⚠️ hysteria-server.service is not active. Check logs if needed."
fi
# ========== Launch Menu ==========
sleep 20
chmod +x menu.sh chmod +x menu.sh
./menu.sh ./menu.sh