From 08f90a3246f92f41365b37625a8218e844f32732 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 21:18:23 +0330
Subject: [PATCH 01/20] Implement robust scheduler for traffic monitoring and
 backups

- Replace cron jobs with a systemd service for better reliability
- Add file locking mechanism to prevent conflicts on users.json
- Schedule traffic status updates every minute with proper error handling
- Maintain 6-hour backup schedule with independent lock management
- Add comprehensive logging for easier troubleshooting

This change resolves issues where system updates or other programs
would cause conflicts with the traffic monitoring process accessing
the users.json file simultaneously.
---
 core/scripts/scheduler.py | 111 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 core/scripts/scheduler.py

diff --git a/core/scripts/scheduler.py b/core/scripts/scheduler.py
new file mode 100644
index 0000000..a733a1c
--- /dev/null
+++ b/core/scripts/scheduler.py
@@ -0,0 +1,111 @@
+#!/usr/bin/env python3
+import os
+import sys
+import time
+import schedule
+import logging
+import subprocess
+import fcntl
+import datetime
+from pathlib import Path
+from paths import *
+
+logging.basicConfig(
+    level=logging.WARNING,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+    handlers=[
+        logging.FileHandler("/var/log/hysteria_scheduler.log"),
+        logging.StreamHandler()
+    ]
+)
+logger = logging.getLogger("HysteriaScheduler")
+
+# Constants
+BASE_DIR = Path("/etc/hysteria")
+VENV_ACTIVATE = BASE_DIR / "hysteria2_venv/bin/activate"
+# CLI_PATH = BASE_DIR / "core/cli.py"
+LOCK_FILE = "/tmp/hysteria_scheduler.lock"
+
+def acquire_lock():
+    try:
+        lock_fd = open(LOCK_FILE, 'w')
+        fcntl.flock(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
+        return lock_fd
+    except IOError:
+        logger.warning("Another process is already running and has the lock")
+        return None
+
+def release_lock(lock_fd):
+    if lock_fd:
+        fcntl.flock(lock_fd, fcntl.LOCK_UN)
+        lock_fd.close()
+
+def run_command(command, log_success=False):
+
+    activate_cmd = f"source {VENV_ACTIVATE}"
+    full_cmd = f"{activate_cmd} && {command}"
+    
+    try:
+        result = subprocess.run(
+            full_cmd, 
+            shell=True, 
+            executable="/bin/bash",
+            capture_output=True, 
+            text=True
+        )
+        
+        if result.returncode != 0:
+            logger.error(f"Command failed: {full_cmd}")
+            logger.error(f"Error: {result.stderr}")
+        elif log_success:
+            logger.info(f"Command executed successfully: {full_cmd}")
+            
+        return result.returncode == 0
+    except Exception as e:
+        logger.exception(f"Exception running command: {full_cmd}")
+        return False
+
+def check_traffic_status():
+    lock_fd = acquire_lock()
+    if not lock_fd:
+        return
+        
+    try:
+        success = run_command(f"python3 {CLI_PATH} traffic-status --no-gui", log_success=False)
+        if not success:
+            pass
+    finally:
+        release_lock(lock_fd)
+
+def backup_hysteria():
+    lock_fd = acquire_lock()
+    if not lock_fd:
+        logger.warning("Skipping backup due to lock")
+        return
+        
+    try:
+        run_command(f"python3 {CLI_PATH} backup-hysteria", log_success=True)
+    finally:
+        release_lock(lock_fd)
+
+def main():
+    logger.info("Starting Hysteria Scheduler")
+    
+    schedule.every(1).minutes.do(check_traffic_status)
+    schedule.every(6).hours.do(backup_hysteria)
+    
+    backup_hysteria()
+    
+    while True:
+        try:
+            schedule.run_pending()
+            time.sleep(1)
+        except KeyboardInterrupt:
+            logger.info("Shutting down scheduler")
+            break
+        except Exception as e:
+            logger.exception("Error in main loop")
+            time.sleep(60)
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file

From 61874a4acc0216249ed109165c3b52bd0a80012a Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 23:10:08 +0330
Subject: [PATCH 02/20] hysteria-scheduler service setup

- Create installation script to automate setup and migration from cron
- Update both install.sh and upgrade.sh to use the shared functions
---
 core/scripts/hysteria2/install.sh |  9 +++---
 core/scripts/scheduler.sh         | 50 +++++++++++++++++++++++++++++++
 upgrade.sh                        | 38 +++++------------------
 3 files changed, 61 insertions(+), 36 deletions(-)
 create mode 100644 core/scripts/scheduler.sh

diff --git a/core/scripts/hysteria2/install.sh b/core/scripts/hysteria2/install.sh
index 761ed4d..f4b64a4 100644
--- a/core/scripts/hysteria2/install.sh
+++ b/core/scripts/hysteria2/install.sh
@@ -2,6 +2,7 @@
 
 source /etc/hysteria/core/scripts/path.sh
 source /etc/hysteria/core/scripts/utils.sh
+source /etc/hysteria/core/scripts/scheduler_setup.sh
 define_colors
 
 install_hysteria() {
@@ -82,11 +83,9 @@ install_hysteria() {
     chmod +x /etc/hysteria/core/scripts/hysteria2/user.sh
     chmod +x /etc/hysteria/core/scripts/hysteria2/kick.py
 
-    (crontab -l ; echo "*/1 * * * * /bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py traffic-status --no-gui'") | crontab -
-    # (crontab -l ; echo "0 3 */3 * * /bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py restart-hysteria2' >/dev/null 2>&1") | crontab -
-    (crontab -l ; echo "0 */6 * * * /bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py backup-hysteria' >/dev/null 2>&1") | crontab -
-    # (crontab -l ; echo "*/1 * * * * /bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/scripts/hysteria2/kick.py' >/dev/null 2>&1") | crontab -
-
+    if ! check_scheduler_service; then
+        setup_hysteria_scheduler
+    fi
 }
 
 if systemctl is-active --quiet hysteria-server.service; then
diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
new file mode 100644
index 0000000..1e2bb1d
--- /dev/null
+++ b/core/scripts/scheduler.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+setup_hysteria_scheduler() {
+    echo "Setting up Hysteria scheduler service..."
+    
+    chmod +x /etc/hysteria/core/scripts/scheduler.py
+
+    cat > /etc/systemd/system/hysteria-scheduler.service << 'EOF'
+[Unit]
+Description=Hysteria2 Scheduler Service
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/etc/hysteria
+ExecStart=/etc/hysteria/hysteria2_venv/bin/python3 /etc/hysteria/core/scripts/scheduler.py
+Restart=always
+RestartSec=10
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=hysteria-scheduler
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+    systemctl daemon-reload
+    systemctl enable hysteria-scheduler.service
+    systemctl start hysteria-scheduler.service
+
+    (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab -
+
+    echo "Hysteria scheduler service has been installed and started."
+    echo "You can check the status with: systemctl status hysteria-scheduler"
+    echo "Logs are available at: journalctl -u hysteria-scheduler"
+}
+
+check_scheduler_service() {
+    if systemctl is-active --quiet hysteria-scheduler.service; then
+        echo "Hysteria scheduler service is already active."
+        return 0
+    else
+        return 1
+    fi
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    setup_hysteria_scheduler
+fi
\ No newline at end of file
diff --git a/upgrade.sh b/upgrade.sh
index 908838b..d99afd0 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -16,21 +16,6 @@ FILES=(
     "/etc/hysteria/core/scripts/webpanel/Caddyfile"
 )
 
-if crontab -l 2>/dev/null | grep -q "source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py" || \
-   crontab -l 2>/dev/null | grep -q "/etc/hysteria/core/scripts/hysteria2/kick.sh"; then
-    
-    echo "Removing existing Hysteria cronjobs..."
-    crontab -l | grep -v "source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py traffic-status" | \
-    grep -v "source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py restart-hysteria2" | \
-    grep -v "source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py backup-hysteria" | \
-    grep -v "/etc/hysteria/core/scripts/hysteria2/kick.sh" | \
-    crontab -
-    echo "Old Hysteria cronjobs removed successfully."
-else
-    echo "No existing Hysteria cronjobs found. Skipping removal."
-fi
-
-
 echo "Backing up files to $TEMP_DIR"
 for FILE in "${FILES[@]}"; do
     mkdir -p "$TEMP_DIR/$(dirname "$FILE")"
@@ -41,7 +26,7 @@ echo "Removing /etc/hysteria directory"
 rm -rf /etc/hysteria/
 
 echo "Cloning Blitz repository"
-git clone https://github.com/ReturnFI/Blitz /etc/hysteria
+git clone -b beta https://github.com/ReturnFI/Blitz /etc/hysteria
 
 echo "Downloading geosite.dat and geoip.dat"
 wget -O /etc/hysteria/geosite.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat >/dev/null 2>&1
@@ -120,6 +105,11 @@ python3 -m venv hysteria2_venv
 source /etc/hysteria/hysteria2_venv/bin/activate
 pip install -r requirements.txt
 
+source /etc/hysteria/core/scripts/scheduler_setup.sh
+if ! check_scheduler_service; then
+    setup_hysteria_scheduler
+fi
+
 echo "Restarting hysteria-caddy service"
 systemctl restart hysteria-caddy.service
 
@@ -137,20 +127,6 @@ else
     echo "Upgrade failed: hysteria-server.service is not active"
 fi
 
-echo "Adding new Hysteria cronjobs..."
-if ! crontab -l 2>/dev/null | grep -q "python3 /etc/hysteria/core/cli.py traffic-status --no-gui"; then
-    echo "Adding traffic-status cronjob..."
-    (crontab -l ; echo "*/1 * * * * /bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py traffic-status --no-gui'") | crontab -
-else
-    echo "Traffic-status cronjob already exists. Skipping."
-fi
-
-if ! crontab -l 2>/dev/null | grep -q "python3 /etc/hysteria/core/cli.py backup-hysteria"; then
-    echo "Adding backup-hysteria cronjob..."
-    (crontab -l ; echo "0 */6 * * * /bin/bash -c 'source /etc/hysteria/hysteria2_venv/bin/activate && python3 /etc/hysteria/core/cli.py backup-hysteria' >/dev/null 2>&1") | crontab -
-else
-    echo "Backup-hysteria cronjob already exists. Skipping."
-fi
-
+sleep 10
 chmod +x menu.sh
 ./menu.sh

From 1e94e08ffbf5378277dbf69644db9a5d7420dd00 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 23:25:54 +0330
Subject: [PATCH 03/20]  Improve uninstall script

---
 core/scripts/hysteria2/uninstall.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/scripts/hysteria2/uninstall.py b/core/scripts/hysteria2/uninstall.py
index 81f1e18..5ea2767 100644
--- a/core/scripts/hysteria2/uninstall.py
+++ b/core/scripts/hysteria2/uninstall.py
@@ -12,6 +12,7 @@ SERVICES = [
     "hysteria-normal-sub.service",
     "hysteria-singbox.service",
     "hysteria-ip-limit.service",
+    "hysteria-scheduler.service",
 ]
 
 def run_command(command, error_message):

From eeec0e4250fa78bfb94ee5230edd0e22bb5756dd Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 23:28:27 +0330
Subject: [PATCH 04/20] Clone Beta

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 0f6b5442a6e5d8032c9bb00902c3f552a73fb52c Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 23:31:13 +0330
Subject: [PATCH 05/20] Update requirements (schedule)

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 54ba0ed..411400c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,7 @@ typing_extensions==4.13.2
 urllib3==2.4.0
 yarl==1.20.0
 hysteria2-api==0.1.2
+schedule==1.2.2
 
 # webpanel
 annotated-types==0.7.0

From ec81500e854410a8999ed01a6e85cad9fcf51e6c Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 23:40:41 +0330
Subject: [PATCH 06/20] typo

---
 core/scripts/hysteria2/install.sh | 2 +-
 upgrade.sh                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/scripts/hysteria2/install.sh b/core/scripts/hysteria2/install.sh
index f4b64a4..9c61b4c 100644
--- a/core/scripts/hysteria2/install.sh
+++ b/core/scripts/hysteria2/install.sh
@@ -2,7 +2,7 @@
 
 source /etc/hysteria/core/scripts/path.sh
 source /etc/hysteria/core/scripts/utils.sh
-source /etc/hysteria/core/scripts/scheduler_setup.sh
+source /etc/hysteria/core/scripts/scheduler.sh
 define_colors
 
 install_hysteria() {
diff --git a/upgrade.sh b/upgrade.sh
index d99afd0..0c2ee13 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -105,7 +105,7 @@ python3 -m venv hysteria2_venv
 source /etc/hysteria/hysteria2_venv/bin/activate
 pip install -r requirements.txt
 
-source /etc/hysteria/core/scripts/scheduler_setup.sh
+source /etc/hysteria/core/scripts/scheduler.sh
 if ! check_scheduler_service; then
     setup_hysteria_scheduler
 fi

From cfd29c458d53feae0d8aefeaac2ade09542f9502 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Thu, 15 May 2025 23:50:09 +0330
Subject: [PATCH 07/20] Add service status for scheduler Add a default user

---
 core/scripts/hysteria2/install.sh | 1 +
 core/scripts/services_status.sh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/scripts/hysteria2/install.sh b/core/scripts/hysteria2/install.sh
index 9c61b4c..bea3751 100644
--- a/core/scripts/hysteria2/install.sh
+++ b/core/scripts/hysteria2/install.sh
@@ -99,6 +99,7 @@ else
 
     if systemctl is-active --quiet hysteria-server.service; then
         echo "Installation and configuration complete."
+        python3 $CLI_PATH add-user --username default --traffic-limit 30 --expiration-days 30
     else
         echo -e "${red}Error:${NC} Hysteria2 service is not active. Please check the logs for more details."
     fi
diff --git a/core/scripts/services_status.sh b/core/scripts/services_status.sh
index f9b0679..a5cdbee 100644
--- a/core/scripts/services_status.sh
+++ b/core/scripts/services_status.sh
@@ -2,6 +2,7 @@
 
 declare -a services=(
     "hysteria-server.service"
+    "hysteria-scheduler.service"
     "hysteria-webpanel.service"
     "hysteria-caddy.service"
     "hysteria-telegram-bot.service"

From 37aafa8c612e2f5bc19070e1bd8116cbe3cc81fb Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 00:42:02 +0330
Subject: [PATCH 08/20] refactor: enhance upgrade script with backup, color UI,
 service checks, and error handling

---
 core/scripts/scheduler.sh |   2 +-
 install.sh                |   2 +-
 upgrade.sh                | 218 ++++++++++++++++++++------------------
 3 files changed, 114 insertions(+), 108 deletions(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index 1e2bb1d..6b551d5 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -38,7 +38,7 @@ EOF
 
 check_scheduler_service() {
     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
     else
         return 1
diff --git a/install.sh b/install.sh
index f7a2cef..bf6a652 100644
--- a/install.sh
+++ b/install.sh
@@ -123,7 +123,7 @@ clone_repository() {
         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"
     else
         log_error "Failed to clone repository"
diff --git a/upgrade.sh b/upgrade.sh
index 0c2ee13..b4d6270 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,132 +1,138 @@
 #!/bin/bash
 
-cd /root/
-TEMP_DIR=$(mktemp -d)
+set -euo pipefail
+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=(
-    "/etc/hysteria/ca.key"
-    "/etc/hysteria/ca.crt"
-    "/etc/hysteria/users.json"
-    "/etc/hysteria/config.json"
-    "/etc/hysteria/.configs.env"
-    "/etc/hysteria/core/scripts/telegrambot/.env"
-    "/etc/hysteria/core/scripts/singbox/.env"
-    "/etc/hysteria/core/scripts/normalsub/.env"
-    "/etc/hysteria/core/scripts/webpanel/.env"
-    "/etc/hysteria/core/scripts/webpanel/Caddyfile"
+    "$HYSTERIA_INSTALL_DIR/ca.key"
+    "$HYSTERIA_INSTALL_DIR/ca.crt"
+    "$HYSTERIA_INSTALL_DIR/users.json"
+    "$HYSTERIA_INSTALL_DIR/config.json"
+    "$HYSTERIA_INSTALL_DIR/.configs.env"
+    "$HYSTERIA_INSTALL_DIR/core/scripts/telegrambot/.env"
+    "$HYSTERIA_INSTALL_DIR/core/scripts/singbox/.env"
+    "$HYSTERIA_INSTALL_DIR/core/scripts/normalsub/.env"
+    "$HYSTERIA_INSTALL_DIR/core/scripts/webpanel/.env"
+    "$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
-    mkdir -p "$TEMP_DIR/$(dirname "$FILE")"
-    cp "$FILE" "$TEMP_DIR/$FILE"
+    if [[ -f "$FILE" ]]; then
+        mkdir -p "$TEMP_DIR/$(dirname "$FILE")"
+        cp -p "$FILE" "$TEMP_DIR/$FILE"
+        success "Backed up: $FILE"
+    else
+        warn "File not found: $FILE"
+    fi
 done
 
-echo "Removing /etc/hysteria directory"
-rm -rf /etc/hysteria/
+# ========== Replace Installation ==========
+info "Removing old hysteria directory..."
+rm -rf "$HYSTERIA_INSTALL_DIR"
 
-echo "Cloning Blitz repository"
-git clone -b beta https://github.com/ReturnFI/Blitz /etc/hysteria
+info "Cloning Blitz repository (branch: $REPO_BRANCH)..."
+git clone -q -b "$REPO_BRANCH" "$REPO_URL" "$HYSTERIA_INSTALL_DIR"
 
-echo "Downloading geosite.dat and geoip.dat"
-wget -O /etc/hysteria/geosite.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat >/dev/null 2>&1
-wget -O /etc/hysteria/geoip.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geoip.dat >/dev/null 2>&1
+# ========== Download Geo Data ==========
+info "Downloading geosite.dat and geoip.dat..."
+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
-    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
 
-CONFIG_ENV="/etc/hysteria/.configs.env"
-if [ ! -f "$CONFIG_ENV" ]; then
-    echo ".configs.env not found, creating it with default values."
-    echo "SNI=bts.com" > "$CONFIG_ENV"
-fi
+# ========== Permissions ==========
+info "Setting ownership and permissions..."
+chown hysteria:hysteria "$HYSTERIA_INSTALL_DIR/ca.key" "$HYSTERIA_INSTALL_DIR/ca.crt"
+chmod 640 "$HYSTERIA_INSTALL_DIR/ca.key" "$HYSTERIA_INSTALL_DIR/ca.crt"
 
-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
-    echo "IP4 not found, fetching from ip.gs..."
-    IP4=$(curl -s -4 ip.gs || echo "")
-    echo "IP4=${IP4:-}" >> "$CONFIG_ENV"
-fi
+chmod +x "$HYSTERIA_INSTALL_DIR/core/scripts/hysteria2/user.sh"
+chmod +x "$HYSTERIA_INSTALL_DIR/core/scripts/hysteria2/kick.py"
 
-if [[ -z "$IP6" ]]; then
-    echo "IP6 not found, fetching from ip.gs..."
-    IP6=$(curl -s -6 ip.gs || echo "")
-    echo "IP6=${IP6:-}" >> "$CONFIG_ENV"
-fi
+# ========== Virtual Environment ==========
+info "Setting up virtual environment and installing dependencies..."
+cd "$HYSTERIA_INSTALL_DIR"
+python3 -m venv "$HYSTERIA_VENV_DIR"
+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"
-
-if [[ -f "$NORMALSUB_ENV" ]]; then
-    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
+# ========== Scheduler ==========
+info "Ensuring scheduler is set..."
+source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
 if ! check_scheduler_service; then
     setup_hysteria_scheduler
-fi
-
-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"
+    success "Scheduler service configured."
 else
-    echo "Upgrade failed: hysteria-server.service is not active"
+    success "Scheduler already set."
 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
 ./menu.sh

From 1a257fe02765007c62d025099dcfdf37b3111420 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 00:44:44 +0330
Subject: [PATCH 09/20] less sleep better life :)

---
 upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upgrade.sh b/upgrade.sh
index b4d6270..355bcc9 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -133,6 +133,6 @@ else
 fi
 
 # ========== Launch Menu ==========
-sleep 20
+sleep 10
 chmod +x menu.sh
 ./menu.sh

From 2e35c62c4898017fe23d5007fba4bc372d470e1c Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 11:36:47 +0330
Subject: [PATCH 10/20] Fix scheduler service installation to ensure stable
 upgrade process

---
 core/scripts/scheduler.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index 6b551d5..ccc5ceb 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -34,6 +34,8 @@ EOF
     echo "Hysteria scheduler service has been installed and started."
     echo "You can check the status with: systemctl status hysteria-scheduler"
     echo "Logs are available at: journalctl -u hysteria-scheduler"
+
+    return 0
 }
 
 check_scheduler_service() {

From fe7fa3cd2d7b117bee269cd60a28acebe01b22fe Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 11:42:22 +0330
Subject: [PATCH 11/20] Add service verification to confirm successful
 installation

---
 core/scripts/scheduler.sh | 14 ++++++++++++--
 upgrade.sh                |  9 +++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index ccc5ceb..290768a 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -34,19 +34,29 @@ EOF
     echo "Hysteria scheduler service has been installed and started."
     echo "You can check the status with: systemctl status hysteria-scheduler"
     echo "Logs are available at: journalctl -u hysteria-scheduler"
-
     return 0
 }
 
 check_scheduler_service() {
     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
     else
         return 1
     fi
 }
 
+verify_scheduler_service() {
+    if systemctl is-active --quiet hysteria-scheduler.service; then
+        echo "Verified: Hysteria scheduler service is running correctly."
+        return 0
+    else
+        echo "Error: Hysteria scheduler service failed to start properly."
+        return 1
+    fi
+}
+
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     setup_hysteria_scheduler
+    verify_scheduler_service
 fi
\ No newline at end of file
diff --git a/upgrade.sh b/upgrade.sh
index 355bcc9..8594860 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -97,12 +97,13 @@ success "Python environment ready."
 
 # ========== Scheduler ==========
 info "Ensuring scheduler is set..."
-source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
 if ! check_scheduler_service; then
+    info "Installing Hysteria scheduler service..."
     setup_hysteria_scheduler
-    success "Scheduler service configured."
-else
-    success "Scheduler already set."
+    
+    if ! verify_scheduler_service; then
+        error "Warning: Scheduler service installation may have issues"
+    fi
 fi
 
 # ========== Restart Services ==========

From 9926021ed45f1a06a5509b42dfc6335eabe2d52d Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 11:43:33 +0330
Subject: [PATCH 12/20] fix scheduler

---
 upgrade.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upgrade.sh b/upgrade.sh
index 8594860..c0f61d8 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -97,6 +97,7 @@ success "Python environment ready."
 
 # ========== Scheduler ==========
 info "Ensuring scheduler is set..."
+source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
 if ! check_scheduler_service; then
     info "Installing Hysteria scheduler service..."
     setup_hysteria_scheduler

From 8c43375519b474f17fd0c8262c71621298b83ab2 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 11:54:45 +0330
Subject: [PATCH 13/20] Fix(upgrade): Improve scheduler setup

---
 core/scripts/scheduler.sh | 17 +++++------------
 upgrade.sh                |  4 ----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index 290768a..360080d 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 setup_hysteria_scheduler() {
-    echo "Setting up Hysteria scheduler service..."
-    
+  
     chmod +x /etc/hysteria/core/scripts/scheduler.py
 
     cat > /etc/systemd/system/hysteria-scheduler.service << 'EOF'
@@ -31,15 +30,11 @@ EOF
 
     (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab -
 
-    echo "Hysteria scheduler service has been installed and started."
-    echo "You can check the status with: systemctl status hysteria-scheduler"
-    echo "Logs are available at: journalctl -u hysteria-scheduler"
     return 0
 }
 
 check_scheduler_service() {
     if systemctl is-active --quiet hysteria-scheduler.service; then
-        echo "Hysteria scheduler service is already active."
         return 0
     else
         return 1
@@ -48,15 +43,13 @@ check_scheduler_service() {
 
 verify_scheduler_service() {
     if systemctl is-active --quiet hysteria-scheduler.service; then
-        echo "Verified: Hysteria scheduler service is running correctly."
         return 0
     else
-        echo "Error: Hysteria scheduler service failed to start properly."
         return 1
     fi
 }
 
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    setup_hysteria_scheduler
-    verify_scheduler_service
-fi
\ No newline at end of file
+# if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+#     setup_hysteria_scheduler
+#     verify_scheduler_service
+# fi
\ No newline at end of file
diff --git a/upgrade.sh b/upgrade.sh
index c0f61d8..3e63fb9 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -101,10 +101,6 @@ source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
 if ! check_scheduler_service; then
     info "Installing Hysteria scheduler service..."
     setup_hysteria_scheduler
-    
-    if ! verify_scheduler_service; then
-        error "Warning: Scheduler service installation may have issues"
-    fi
 fi
 
 # ========== Restart Services ==========

From b759f986201215532b50ee8473b20b3458968357 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 12:10:00 +0330
Subject: [PATCH 14/20] Refactor hysteria scheduler setup: consolidate
 functions and add automatic execution

---
 core/scripts/scheduler.sh | 19 +++----------------
 upgrade.sh                |  2 ++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index 360080d..0d3d712 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -30,26 +30,13 @@ EOF
 
     (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab -
 
-    return 0
-}
-
-check_scheduler_service() {
     if systemctl is-active --quiet hysteria-scheduler.service; then
+        echo "Hysteria scheduler service is running successfully."
         return 0
     else
+        echo "Failed to start Hysteria scheduler service."
         return 1
     fi
 }
 
-verify_scheduler_service() {
-    if systemctl is-active --quiet hysteria-scheduler.service; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-#     setup_hysteria_scheduler
-#     verify_scheduler_service
-# fi
\ No newline at end of file
+setup_hysteria_scheduler
\ No newline at end of file
diff --git a/upgrade.sh b/upgrade.sh
index 3e63fb9..14c1b1c 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -101,6 +101,8 @@ source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
 if ! check_scheduler_service; then
     info "Installing Hysteria scheduler service..."
     setup_hysteria_scheduler
+else
+    error "Hysteria scheduler configuration failed critically. Upgrade cannot proceed."
 fi
 
 # ========== Restart Services ==========

From 3680117f2458131448c95ca68d7be2d58e60b87e Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 12:19:20 +0330
Subject: [PATCH 15/20] revert changes

---
 core/scripts/scheduler.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index 0d3d712..91a510b 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -30,13 +30,13 @@ EOF
 
     (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab -
 
+    return 0
+}
+
+check_scheduler_service() {
     if systemctl is-active --quiet hysteria-scheduler.service; then
-        echo "Hysteria scheduler service is running successfully."
         return 0
     else
-        echo "Failed to start Hysteria scheduler service."
         return 1
     fi
 }
-
-setup_hysteria_scheduler
\ No newline at end of file

From 94842aa2dce631099a9380392d90bdf172ba37a9 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 12:26:04 +0330
Subject: [PATCH 16/20] wait process

---
 core/scripts/scheduler.sh |  4 ++--
 upgrade.sh                | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index 91a510b..de12795 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -27,10 +27,10 @@ EOF
     systemctl daemon-reload
     systemctl enable hysteria-scheduler.service
     systemctl start hysteria-scheduler.service
-
+    wait 2
     (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab -
 
-    return 0
+    # return 0
 }
 
 check_scheduler_service() {
diff --git a/upgrade.sh b/upgrade.sh
index 14c1b1c..2c498f7 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -97,12 +97,18 @@ success "Python environment ready."
 
 # ========== Scheduler ==========
 info "Ensuring scheduler is set..."
-source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"
-if ! check_scheduler_service; then
-    info "Installing Hysteria scheduler service..."
-    setup_hysteria_scheduler
+if source "$HYSTERIA_INSTALL_DIR/core/scripts/scheduler.sh"; then
+    if ! check_scheduler_service; then
+        if setup_hysteria_scheduler; then
+            success "Scheduler service configured."
+        else
+            warn "Scheduler setup failed, but continuing upgrade..."
+        fi
+    else
+        success "Scheduler already set."
+    fi
 else
-    error "Hysteria scheduler configuration failed critically. Upgrade cannot proceed."
+    warn "Failed to source scheduler.sh, continuing without scheduler setup..."
 fi
 
 # ========== Restart Services ==========

From 8de1bedb34f886874a658db7f085554e62194a13 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 12:28:23 +0330
Subject: [PATCH 17/20] Remove wait

---
 core/scripts/scheduler.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/scripts/scheduler.sh b/core/scripts/scheduler.sh
index de12795..95dbc8a 100644
--- a/core/scripts/scheduler.sh
+++ b/core/scripts/scheduler.sh
@@ -27,7 +27,7 @@ EOF
     systemctl daemon-reload
     systemctl enable hysteria-scheduler.service
     systemctl start hysteria-scheduler.service
-    wait 2
+    # wait 2
     (crontab -l | grep -v "hysteria2_venv.*traffic-status" | grep -v "hysteria2_venv.*backup-hysteria") | crontab -
 
     # return 0

From c42bf83b34ce9edf8add29f6701a05bbe6e1b3e6 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 13:07:15 +0330
Subject: [PATCH 18/20] Update changelog

---
 changelog | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/changelog b/changelog
index ae2988a..96c203d 100644
--- a/changelog
+++ b/changelog
@@ -1,20 +1,24 @@
-# [1.9.2] - 2025-05-10
+# [1.9.3] - 2025-05-16
 
 ## ✨ Changed
 
-### ✨ Features
-🔄 feat: Merge traffic collection with user kicking for efficient enforcement
-🧪 feat(api): Add user existence validation to `add-user` endpoint
-🖥️ feat(frontend): Improve user management UI and error feedback in `users.html`
+### 🔧 System Improvements
 
-### 🧠 Refactors
-📦 refactor: Migrate Hysteria restore functionality to Python
-🌐 refactor: Implement SNI changer in Python
-🛠️ refactor: Port TCP Brutal installation to Python
-🎭 refactor: Rewrite masquerade management in Python3
-⚙️ refactor(cli): Enhance error propagation and handling in CLI scripts
+* 🕒 **feat:** Replace unreliable cron jobs with a systemd-based `HysteriaScheduler` service
+* 🔐 **feat:** Add file locking to prevent concurrent access issues with `users.json`
+* ⏱️ **feat:** Schedule:
 
-### 🛠️ System Enhancements
-🧩 update: Improve upgrade script with better cronjob management
-🛠️ enhance: Setup script with robust error handling and cleaner UX
-📦 update: Drop Debian 11 support to focus on supported OS versions
\ No newline at end of file
+  * Traffic updates every 1 minute
+  * Backups every 6 hours with isolated lock management
+* 📝 **feat:** Add detailed logging for easier troubleshooting and monitoring
+
+### 🛠️ Script Enhancements
+
+* 📦 **refactor:** Create shared scheduler install function (used in both `install.sh` & `upgrade.sh`)
+* ⚙️ **enhance:** Improve `upgrade.sh`:
+
+  * Add service checks
+  * Backup handling
+  * Color UI
+  * Robust error handling
+* 🧼 **fix:** Improve uninstall script to clean up `HysteriaScheduler` service completely

From 1084b891831adc4b65c7d44ef5579c8b7de2fc2b Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 13:08:34 +0330
Subject: [PATCH 19/20] Clone main

---
 upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upgrade.sh b/upgrade.sh
index 2c498f7..b96893a 100644
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -7,7 +7,7 @@ trap 'echo -e "\n❌ An error occurred. Aborting."; exit 1' ERR
 HYSTERIA_INSTALL_DIR="/etc/hysteria"
 HYSTERIA_VENV_DIR="$HYSTERIA_INSTALL_DIR/hysteria2_venv"
 REPO_URL="https://github.com/ReturnFI/Blitz"
-REPO_BRANCH="beta"
+REPO_BRANCH="main"
 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"
 

From ceeea306fc4d16393ba9bf63a511c46de00d833f Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 16 May 2025 13:22:56 +0330
Subject: [PATCH 20/20] Update changelog

---
 changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog b/changelog
index 96c203d..0b75cf7 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,7 @@
   * Traffic updates every 1 minute
   * Backups every 6 hours with isolated lock management
 * 📝 **feat:** Add detailed logging for easier troubleshooting and monitoring
+* 👤 **feat:** Automatically add a default user after fresh installation
 
 ### 🛠️ Script Enhancements