From 17092088acec5956ec655ea64a90b1449408c424 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:09:07 +0330
Subject: [PATCH 01/17] Manage obfs (cli.py)

---
 core/cli.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/core/cli.py b/core/cli.py
index 408740c..32dcb68 100644
--- a/core/cli.py
+++ b/core/cli.py
@@ -29,6 +29,7 @@ class Command(Enum):
     RESET_USER = os.path.join(SCRIPT_DIR, 'hysteria2', 'reset_user.sh')
     REMOVE_USER = os.path.join(SCRIPT_DIR, 'hysteria2', 'remove_user.sh')
     SHOW_USER_URI = os.path.join(SCRIPT_DIR, 'hysteria2', 'show_user_uri.sh')
+    REMOVE_OBFS = os.path.join(SCRIPT_DIR, 'hysteria2', 'remove_obfs.sh')
     TRAFFIC_STATUS = 'traffic.py'  # won't be call directly (it's a python module)
     LIST_USERS = os.path.join(SCRIPT_DIR, 'hysteria2', 'list_users.sh')
     SERVER_INFO = os.path.join(SCRIPT_DIR, 'hysteria2', 'server_info.sh')
@@ -247,6 +248,23 @@ def backup_hysteria():
     except subprocess.CalledProcessError as e:
         click.echo(f"Backup failed: {e.output.decode()}", err=True)
 
+@cli.command('manage_obfs')
+@click.option('--remove', '-r', is_flag=True, help="Remove 'obfs' from config.json.")
+@click.option('--generate', '-g', is_flag=True, help="Generate new 'obfs' in config.json.")
+def manage_obfs(remove, generate):
+    """Manage 'obfs' in Hysteria2 configuration."""
+    if remove and generate:
+        click.echo("Error: You cannot use both --remove and --generate at the same time.")
+        return
+    elif remove:
+        click.echo("Removing 'obfs' from config.json...")
+        run_cmd(['bash', Command.REMOVE_OBFS.value, '--remove'])
+    elif generate:
+        click.echo("Generating 'obfs' in config.json...")
+        run_cmd(['bash', Command.REMOVE_OBFS.value, '--generate'])
+    else:
+        click.echo("Error: Please specify either --remove or --generate.")
+
 # endregion
 
 # region advanced menu

From a219f9aaa2bb98c90598dfce4e3edd18987ada6f Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:12:06 +0330
Subject: [PATCH 02/17] Create manage_obfs.sh

---
 core/scripts/hysteria2/manage_obfs.sh | 42 +++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 core/scripts/hysteria2/manage_obfs.sh

diff --git a/core/scripts/hysteria2/manage_obfs.sh b/core/scripts/hysteria2/manage_obfs.sh
new file mode 100644
index 0000000..0d7ef95
--- /dev/null
+++ b/core/scripts/hysteria2/manage_obfs.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+source /etc/hysteria/core/scripts/path.sh
+
+remove_obfs() {
+    if jq 'has("obfs")' "$CONFIG_FILE" | grep -q true; then
+        jq 'del(.obfs)' "$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
+        echo "Successfully removed 'obfs' from config.json."
+    else
+        echo "'obfs' section not found in config.json."
+    fi
+    
+    python3 "$CLI_PATH" restart-hysteria2 > /dev/null 2>&1
+}
+
+generate_obfs() {
+    obfspassword=$(pwgen -s 32 1)
+
+    if jq 'has("obfs")' "$CONFIG_FILE" | grep -q true; then
+        echo "'obfs' section already exists. Replacing it with a new one."
+        jq 'del(.obfs)' "$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
+    fi
+
+    jq '. + {obfs: {type: "salamander", salamander: {password: "'"$obfspassword"'"}}}' "$CONFIG_FILE" > temp_config.json && mv temp_config.json "$CONFIG_FILE"
+    
+    if [ $? -eq 0 ]; then
+        echo "Successfully added 'obfs' to config.json with password: $obfspassword"
+    else
+        echo "Error: Failed to add 'obfs' to config.json."
+    fi
+    
+    python3 "$CLI_PATH" restart-hysteria2 > /dev/null 2>&1
+}
+
+if [[ $1 == "--remove" || $1 == "-r" ]]; then
+    remove_obfs
+elif [[ $1 == "--generate" || $1 == "-g" ]]; then
+    generate_obfs
+else
+    echo "Usage: $0 --remove|-r | --generate|-g"
+    exit 1
+fi

From ab54291a25e9280de014e7b4016925ae8eeaf39e Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:13:04 +0330
Subject: [PATCH 03/17] Fix Manage obfs

---
 core/cli.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/cli.py b/core/cli.py
index 32dcb68..bbf3775 100644
--- a/core/cli.py
+++ b/core/cli.py
@@ -29,7 +29,7 @@ class Command(Enum):
     RESET_USER = os.path.join(SCRIPT_DIR, 'hysteria2', 'reset_user.sh')
     REMOVE_USER = os.path.join(SCRIPT_DIR, 'hysteria2', 'remove_user.sh')
     SHOW_USER_URI = os.path.join(SCRIPT_DIR, 'hysteria2', 'show_user_uri.sh')
-    REMOVE_OBFS = os.path.join(SCRIPT_DIR, 'hysteria2', 'remove_obfs.sh')
+    MANAGE_OBFS = os.path.join(SCRIPT_DIR, 'hysteria2', 'manage_obfs.sh')
     TRAFFIC_STATUS = 'traffic.py'  # won't be call directly (it's a python module)
     LIST_USERS = os.path.join(SCRIPT_DIR, 'hysteria2', 'list_users.sh')
     SERVER_INFO = os.path.join(SCRIPT_DIR, 'hysteria2', 'server_info.sh')
@@ -258,10 +258,10 @@ def manage_obfs(remove, generate):
         return
     elif remove:
         click.echo("Removing 'obfs' from config.json...")
-        run_cmd(['bash', Command.REMOVE_OBFS.value, '--remove'])
+        run_cmd(['bash', Command.MANAGE_OBFS.value, '--remove'])
     elif generate:
         click.echo("Generating 'obfs' in config.json...")
-        run_cmd(['bash', Command.REMOVE_OBFS.value, '--generate'])
+        run_cmd(['bash', Command.MANAGE_OBFS.value, '--generate'])
     else:
         click.echo("Error: Please specify either --remove or --generate.")
 

From a4f831c4c431054906f6c76646be64918c742ecd Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:30:08 +0330
Subject: [PATCH 04/17] Check obfs

---
 core/scripts/hysteria2/show_user_uri.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/scripts/hysteria2/show_user_uri.sh b/core/scripts/hysteria2/show_user_uri.sh
index c8c6bbf..5761a7d 100644
--- a/core/scripts/hysteria2/show_user_uri.sh
+++ b/core/scripts/hysteria2/show_user_uri.sh
@@ -25,7 +25,6 @@ get_normalsub_domain_and_port() {
     fi
 }
 
-
 show_uri() {
     if [ -f "$USERS_FILE" ]; then
         if systemctl is-active --quiet hysteria-server.service; then
@@ -60,15 +59,23 @@ show_uri() {
                 authpassword=$(jq -r ".\"$username\".password" "$USERS_FILE")
                 port=$(jq -r '.listen' "$CONFIG_FILE" | cut -d':' -f2)
                 sha256=$(jq -r '.tls.pinSHA256' "$CONFIG_FILE")
-                obfspassword=$(jq -r '.obfs.salamander.password' "$CONFIG_FILE")
+                obfspassword=$(jq -r '.obfs.salamander.password // empty' "$CONFIG_FILE")
 
                 generate_uri() {
                     local ip_version=$1
                     local ip=$2
-                    if [ "$ip_version" -eq 4 ]; then
-                        echo "hy2://$username%3A$authpassword@$ip:$port?obfs=salamander&obfs-password=$obfspassword&pinSHA256=$sha256&insecure=1&sni=$SNI#$username-IPv4"
-                    elif [ "$ip_version" -eq 6 ]; then
-                        echo "hy2://$username%3A$authpassword@[$ip]:$port?obfs=salamander&obfs-password=$obfspassword&pinSHA256=$sha256&insecure=1&sni=$SNI#$username-IPv6"
+                    if [ -n "$obfspassword" ]; then
+                        if [ "$ip_version" -eq 4 ]; then
+                            echo "hy2://$username%3A$authpassword@$ip:$port?obfs=salamander&obfs-password=$obfspassword&pinSHA256=$sha256&insecure=1&sni=$SNI#$username-IPv4"
+                        elif [ "$ip_version" -eq 6 ]; then
+                            echo "hy2://$username%3A$authpassword@[$ip]:$port?obfs=salamander&obfs-password=$obfspassword&pinSHA256=$sha256&insecure=1&sni=$SNI#$username-IPv6"
+                        fi
+                    else
+                        if [ "$ip_version" -eq 4 ]; then
+                            echo "hy2://$username%3A$authpassword@$ip:$port?pinSHA256=$sha256&insecure=1&sni=$SNI#$username-IPv4"
+                        elif [ "$ip_version" -eq 6 ]; then
+                            echo "hy2://$username%3A$authpassword@[$ip]:$port?pinSHA256=$sha256&insecure=1&sni=$SNI#$username-IPv6"
+                        fi
                     fi
                 }
 

From 05e89843685b82c4e4262a1ef2c059b5ef9a0758 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:39:50 +0330
Subject: [PATCH 05/17] Add OBFS Manager

---
 menu.sh | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/menu.sh b/menu.sh
index df177ad..e5e2738 100644
--- a/menu.sh
+++ b/menu.sh
@@ -465,6 +465,31 @@ normalsub_handler() {
     done
 }
 
+
+obfs_handler() {
+    while true; do
+        echo -e "${cyan}1.${NC} Remove Obfs"
+        echo -e "${red}2.${NC} Generating new Obfs"
+        echo "0. Back"
+        read -p "Choose an option: " option
+
+        case $option in
+            1)
+            python3 $CLI_PATH manage_obfs -r
+                ;;
+            2)
+            python3 $CLI_PATH manage_obfs -g
+                ;;
+            0)
+                break
+                ;;
+            *)
+                echo "Invalid option. Please try again."
+                ;;
+        esac
+    done
+}
+
 # Function to display the main menu
 display_main_menu() {
     clear
@@ -578,8 +603,9 @@ display_advance_menu() {
     echo -e "${green}[7] ${NC}↝ Normal-SUB SubLink"
     echo -e "${cyan}[8] ${NC}↝ Change Port Hysteria2"
     echo -e "${cyan}[9] ${NC}↝ Change SNI Hysteria2"
-    echo -e "${cyan}[10] ${NC}↝ Update Core Hysteria2"
-    echo -e "${red}[11] ${NC}↝ Uninstall Hysteria2"
+    echo -e "${cyan}[10] ${NC}↝ Manage OBFS"
+    echo -e "${cyan}[11] ${NC}↝ Update Core Hysteria2"
+    echo -e "${red}[12] ${NC}↝ Uninstall Hysteria2"
     echo -e "${red}[0] ${NC}↝ Back to Main Menu"
     echo -e "${LPurple}◇──────────────────────────────────────────────────────────────────────◇${NC}"
     echo -ne "${yellow}➜ Enter your option: ${NC}"
@@ -602,8 +628,9 @@ advance_menu() {
             7) normalsub_handler ;;
             8) hysteria2_change_port_handler ;;
             9) hysteria2_change_sni_handler ;;
-            10) python3 $CLI_PATH update-hysteria2 ;;
-            11) python3 $CLI_PATH uninstall-hysteria2 ;;
+            10) obfs_handler ;;
+            11) python3 $CLI_PATH update-hysteria2 ;;
+            12) python3 $CLI_PATH uninstall-hysteria2 ;;
             0) return ;;
             *) echo "Invalid option. Please try again." ;;
         esac

From 4fc32ef1610143cf987f546cd23c787cf8f05236 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:44:41 +0330
Subject: [PATCH 06/17] Clone Dev

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

diff --git a/install.sh b/install.sh
index f95bacf..50e07fe 100644
--- a/install.sh
+++ b/install.sh
@@ -53,7 +53,7 @@ else
     echo "All required packages are already installed."
 fi
 
-git clone https://github.com/ReturnFI/Hysteria2 /etc/hysteria
+git clone -b Dev https://github.com/ReturnFI/Hysteria2 /etc/hysteria
 
 cd /etc/hysteria
 python3 -m venv hysteria2_venv

From feae2afdbb0b62b0fa4ca8d521820a95854699c5 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 12:36:08 +0330
Subject: [PATCH 07/17] checks the status of the services

---
 core/scripts/utils.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/scripts/utils.sh b/core/scripts/utils.sh
index 8cfa96b..287929d 100644
--- a/core/scripts/utils.sh
+++ b/core/scripts/utils.sh
@@ -60,4 +60,22 @@ load_hysteria2_env() {
         echo "Error: configs.env file not found. Using default SNI 'bts.com'."
         SNI="bts.com"
     fi
-}
\ No newline at end of file
+}
+
+check_services() {
+    declare -A service_names=(
+        ["hysteria-server.service"]="Hysteria"
+        ["normalsub.service"]="Normal Subscription"
+        ["singbox.service"]="Singbox Subscription"
+        ["hysteria-bot.service"]="Hysteria Telegram Bot"
+        ["wg-quick@wgcf.service"]="WireGuard (WARP)"
+    )
+
+    for service in "${!service_names[@]}"; do
+        if systemctl is-active --quiet "$service"; then
+            echo -e "${NC}${service_names[$service]}:${green} Active${NC}"
+        else
+            echo -e "${NC}${service_names[$service]}:${red} Not Active${NC}"
+        fi
+    done
+}

From f8130b2e649a5f426c9b357f749d1839ded3362f Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 12:36:54 +0330
Subject: [PATCH 08/17] Added check services

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

diff --git a/menu.sh b/menu.sh
index e5e2738..8d18de3 100644
--- a/menu.sh
+++ b/menu.sh
@@ -503,6 +503,7 @@ display_main_menu() {
     echo -e "${LPurple}◇──────────────────────────────────────────────────────────────────────◇${NC}"
 
         check_version
+        check_services
         
     echo -e "${LPurple}◇──────────────────────────────────────────────────────────────────────◇${NC}"
     echo -e "${yellow}                   ☼ Main Menu ☼                   ${NC}"

From 489666bdd2b78eaed5758c368b4e3369d6aa230a Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:11:22 +0330
Subject: [PATCH 09/17] Create status.sh

---
 core/scripts/warp/status.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 core/scripts/warp/status.sh

diff --git a/core/scripts/warp/status.sh b/core/scripts/warp/status.sh
new file mode 100644
index 0000000..6888eee
--- /dev/null
+++ b/core/scripts/warp/status.sh
@@ -0,0 +1,34 @@
+source /etc/hysteria/core/scripts/utils.sh
+source /etc/hysteria/core/scripts/path.sh
+
+check_warp_configuration() {
+    echo "${yellow}Current WARP Configuration:${NC}"
+    echo "--------------------------------"
+
+    if jq -e '.acl.inline[]? | select(test("warps\\(all\\)"))' "$CONFIG_FILE" > /dev/null; then
+        echo -e "${cyan}All traffic:${NC} ${green}Active${NC}"
+    else
+        echo -e "${cyan}All traffic:${NC} ${red}Inactive${NC}"
+    fi
+
+    if jq -e '.acl.inline[]? | select(test("warps\\(geosite:google\\)")) or select(test("warps\\(geoip:google\\)")) or select(test("warps\\(geosite:netflix\\)")) or select(test("warps\\(geosite:spotify\\)")) or select(test("warps\\(geosite:openai\\)")) or select(test("warps\\(geoip:openai\\)"))' "$CONFIG_FILE" > /dev/null; then
+        echo -e "${cyan}Popular sites (Google, Netflix, etc.):${NC} ${green}Active${NC}"
+    else
+        echo -e "${cyan}Popular sites (Google, Netflix, etc.):${NC} ${red}Inactive${NC}"
+    fi
+
+    if jq -e '.acl.inline[]? | select(test("warps\\(geosite:ir\\)")) or select(test("warps\\(geoip:ir\\)"))' "$CONFIG_FILE" > /dev/null; then
+        echo -e "${cyan}Domestic sites (geosite:ir, geoip:ir):${NC} ${green}Active${NC}"
+    else
+        echo -e "${cyan}Domestic sites (geosite:ir, geoip:ir):${NC} ${red}Inactive${NC}"
+    fi
+
+    if jq -e '.acl.inline[]? | select(test("reject\\(geosite:category-porn\\)"))' "$CONFIG_FILE" > /dev/null; then
+        echo -e "${cyan}Block adult content:${NC} ${green}Active${NC}"
+    else
+        echo -e "${cyan}Block adult content:${NC} ${red}Inactive${NC}"
+    fi
+    echo "--------------------------------"
+}
+define_colors
+check_warp_configuration

From 71d555538ac002adecf29413c826fbe374a151f4 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:12:17 +0330
Subject: [PATCH 10/17] Added WARP status

---
 core/cli.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/cli.py b/core/cli.py
index bbf3775..2b6312a 100644
--- a/core/cli.py
+++ b/core/cli.py
@@ -41,6 +41,7 @@ class Command(Enum):
     INSTALL_WARP = os.path.join(SCRIPT_DIR, 'warp', 'install.sh')
     UNINSTALL_WARP = os.path.join(SCRIPT_DIR, 'warp', 'uninstall.sh')
     CONFIGURE_WARP = os.path.join(SCRIPT_DIR, 'warp', 'configure.sh')
+    STATUS_WARP = os.path.join(SCRIPT_DIR, 'warp', 'status.sh')
 
 
 # region utils
@@ -320,6 +321,12 @@ def configure_warp(all: bool, popular_sites: bool, domestic_sites: bool, block_a
 
     run_cmd(cmd_args)
 
+@cli.command('warp-status')
+def warp_status():
+    output = run_cmd(['bash', Command.STATUS_WARP.value])
+    if output:
+        print(output)
+
 @cli.command('telegram')
 @click.option('--action', '-a', required=True, help='Action to perform: start or stop', type=click.Choice(['start', 'stop'], case_sensitive=False))
 @click.option('--token', '-t', required=False, help='Token for running the telegram bot', type=str)

From 4da1adb64d4f775291884845af41856174fb3ebd Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:13:21 +0330
Subject: [PATCH 11/17] Check WARP status

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

diff --git a/menu.sh b/menu.sh
index 8d18de3..027e16b 100644
--- a/menu.sh
+++ b/menu.sh
@@ -262,6 +262,7 @@ warp_configure_handler() {
     local service_name="wg-quick@wgcf.service"
 
     if systemctl is-active --quiet "$service_name"; then
+    python3 $CLI_PATH warp-status
         echo "Configure WARP Options:"
         echo "1. Use WARP for all traffic"
         echo "2. Use WARP for popular sites"

From 67336aeb295d7f6eb56ef676641c7558294c544a Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:15:02 +0330
Subject: [PATCH 12/17] typo

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

diff --git a/core/scripts/utils.sh b/core/scripts/utils.sh
index 287929d..696adbc 100644
--- a/core/scripts/utils.sh
+++ b/core/scripts/utils.sh
@@ -75,7 +75,7 @@ check_services() {
         if systemctl is-active --quiet "$service"; then
             echo -e "${NC}${service_names[$service]}:${green} Active${NC}"
         else
-            echo -e "${NC}${service_names[$service]}:${red} Not Active${NC}"
+            echo -e "${NC}${service_names[$service]}:${red} Inactive${NC}"
         fi
     done
 }

From 833186eec733b5e91d4eaee27a8c92ae14e0b164 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:18:05 +0330
Subject: [PATCH 13/17] Fix color

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

diff --git a/core/scripts/warp/status.sh b/core/scripts/warp/status.sh
index 6888eee..18a13f2 100644
--- a/core/scripts/warp/status.sh
+++ b/core/scripts/warp/status.sh
@@ -2,8 +2,8 @@ source /etc/hysteria/core/scripts/utils.sh
 source /etc/hysteria/core/scripts/path.sh
 
 check_warp_configuration() {
-    echo "${yellow}Current WARP Configuration:${NC}"
     echo "--------------------------------"
+    echo -e "${LPurple}Current WARP Configuration: ${NC}"
 
     if jq -e '.acl.inline[]? | select(test("warps\\(all\\)"))' "$CONFIG_FILE" > /dev/null; then
         echo -e "${cyan}All traffic:${NC} ${green}Active${NC}"

From 24891ddd93518a6be59bb765a9ac9c5a6d552b1f Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:22:24 +0330
Subject: [PATCH 14/17] Restart Hysteria

---
 menu.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/menu.sh b/menu.sh
index 027e16b..c81c816 100644
--- a/menu.sh
+++ b/menu.sh
@@ -606,8 +606,9 @@ display_advance_menu() {
     echo -e "${cyan}[8] ${NC}↝ Change Port Hysteria2"
     echo -e "${cyan}[9] ${NC}↝ Change SNI Hysteria2"
     echo -e "${cyan}[10] ${NC}↝ Manage OBFS"
-    echo -e "${cyan}[11] ${NC}↝ Update Core Hysteria2"
-    echo -e "${red}[12] ${NC}↝ Uninstall Hysteria2"
+    echo -e "${cyan}[11] ${NC}↝ Restart Hysteria2"
+    echo -e "${cyan}[12] ${NC}↝ Update Core Hysteria2"
+    echo -e "${red}[13] ${NC}↝ Uninstall Hysteria2"
     echo -e "${red}[0] ${NC}↝ Back to Main Menu"
     echo -e "${LPurple}◇──────────────────────────────────────────────────────────────────────◇${NC}"
     echo -ne "${yellow}➜ Enter your option: ${NC}"
@@ -631,8 +632,9 @@ advance_menu() {
             8) hysteria2_change_port_handler ;;
             9) hysteria2_change_sni_handler ;;
             10) obfs_handler ;;
-            11) python3 $CLI_PATH update-hysteria2 ;;
-            12) python3 $CLI_PATH uninstall-hysteria2 ;;
+            11) python3 $CLI_PATH RESTART_HYSTERIA2 ;;
+            12) python3 $CLI_PATH update-hysteria2 ;;
+            13) python3 $CLI_PATH uninstall-hysteria2 ;;
             0) return ;;
             *) echo "Invalid option. Please try again." ;;
         esac

From e411ac0130497256f7b358b338038318a4096db9 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:35:01 +0330
Subject: [PATCH 15/17] typo

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

diff --git a/core/scripts/utils.sh b/core/scripts/utils.sh
index 696adbc..cbb1893 100644
--- a/core/scripts/utils.sh
+++ b/core/scripts/utils.sh
@@ -64,7 +64,7 @@ load_hysteria2_env() {
 
 check_services() {
     declare -A service_names=(
-        ["hysteria-server.service"]="Hysteria"
+        ["hysteria-server.service"]="Hysteria2"
         ["normalsub.service"]="Normal Subscription"
         ["singbox.service"]="Singbox Subscription"
         ["hysteria-bot.service"]="Hysteria Telegram Bot"

From 013e5a92b2af0c67020851e296d4228e383056c3 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:35:24 +0330
Subject: [PATCH 16/17] Update VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b003284..a45be46 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.7
+0.2.8

From 1be9327d4a76a32add5fda5498f1733b3745cd61 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:36:51 +0330
Subject: [PATCH 17/17] Clone Main

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

diff --git a/install.sh b/install.sh
index 50e07fe..f95bacf 100644
--- a/install.sh
+++ b/install.sh
@@ -53,7 +53,7 @@ else
     echo "All required packages are already installed."
 fi
 
-git clone -b Dev https://github.com/ReturnFI/Hysteria2 /etc/hysteria
+git clone https://github.com/ReturnFI/Hysteria2 /etc/hysteria
 
 cd /etc/hysteria
 python3 -m venv hysteria2_venv