-
@@ -330,6 +435,7 @@
initUI();
fetchDecoyStatus();
+ fetchObfsStatus();
function isValidPath(path) {
if (!path) return false;
@@ -519,7 +625,8 @@
const servicesMap = {
"hysteria_telegram_bot": "#telegram_form",
"hysteria_normal_sub": "#normal_sub_service_form",
- "hysteria_iplimit": "#ip-limit-service"
+ "hysteria_iplimit": "#ip-limit-service",
+ "hysteria_warp": "warp_service"
};
Object.keys(servicesMap).forEach(service => {
@@ -575,7 +682,18 @@
$("#max_ips").val("");
$("#block_duration, #max_ips").removeClass('is-invalid');
}
- } else {
+ } else if (service === "hysteria_warp") {
+ const isWarpServiceRunning = data[service];
+ if (isWarpServiceRunning) {
+ $("#warp_initial_controls").hide();
+ $("#warp_active_controls").show();
+ fetchWarpFullStatusAndConfig();
+ } else {
+ $("#warp_initial_controls").show();
+ $("#warp_active_controls").hide();
+ $("#warp_config_form")[0].reset();
+ }
+ } else {
const $formSelector = $(targetSelector);
if (isRunning) {
$formSelector.find(".form-group").hide();
@@ -610,7 +728,7 @@
}
});
}
-
+
function fetchIpLimitConfig() {
$.ajax({
url: "{{ url_for('get_ip_limit_config_api') }}",
@@ -722,6 +840,68 @@
}
+ function fetchObfsStatus() {
+ $.ajax({
+ url: "{{ url_for('check_obfs') }}",
+ type: "GET",
+ success: function (data) {
+ updateObfsUI(data.obfs);
+ },
+ error: function (xhr, status, error) {
+ $("#obfs_status_message").html('
Failed to fetch OBFS status.');
+ console.error("Failed to fetch OBFS status:", error, xhr.responseText);
+ $("#obfs_enable_btn").hide();
+ $("#obfs_disable_btn").hide();
+ }
+ });
+ }
+
+ function updateObfsUI(statusMessage) {
+ $("#obfs_status_message").text(statusMessage);
+ if (statusMessage === "OBFS is active.") {
+ $("#obfs_enable_btn").hide();
+ $("#obfs_disable_btn").show();
+ $("#obfs_status_container").removeClass("border-danger border-warning alert-danger alert-warning").addClass("border-success alert-success");
+ } else if (statusMessage === "OBFS is not active.") {
+ $("#obfs_enable_btn").show();
+ $("#obfs_disable_btn").hide();
+ $("#obfs_status_container").removeClass("border-success border-danger alert-success alert-danger").addClass("border-warning alert-warning");
+ } else {
+ $("#obfs_enable_btn").hide();
+ $("#obfs_disable_btn").hide();
+ $("#obfs_status_container").removeClass("border-success border-warning alert-success alert-warning").addClass("border-danger alert-danger");
+ }
+ }
+
+ function enableObfs() {
+ confirmAction("enable OBFS", function () {
+ sendRequest(
+ "{{ url_for('enable_obfs') }}",
+ "GET",
+ null,
+ "OBFS enabled successfully!",
+ "#obfs_enable_btn",
+ false,
+ fetchObfsStatus
+ );
+ });
+ }
+
+ function disableObfs() {
+ confirmAction("disable OBFS", function () {
+ sendRequest(
+ "{{ url_for('disable_obfs') }}",
+ "GET",
+ null,
+ "OBFS disabled successfully!",
+ "#obfs_disable_btn",
+ false,
+ fetchObfsStatus
+ );
+ });
+ }
+
+
function startTelegram() {
if (!validateForm('telegram_form')) return;
const apiToken = $("#telegram_api_token").val();
@@ -927,6 +1107,84 @@
});
}
+ function fetchWarpFullStatusAndConfig() {
+ $.ajax({
+ url: "{{ url_for('status_warp') }}",
+ type: "GET",
+ success: function (data) {
+ $("#warp_all_traffic").prop('checked', data.all_traffic_via_warp || false);
+ $("#warp_popular_sites").prop('checked', data.popular_sites_via_warp || false);
+ $("#warp_domestic_sites").prop('checked', data.domestic_sites_via_warp || false);
+ $("#warp_block_adult_sites").prop('checked', data.block_adult_content || false);
+
+ $("#warp_initial_controls").hide();
+ $("#warp_active_controls").show();
+ },
+ error: function (xhr, status, error) {
+ let errorMsg = "Failed to fetch WARP configuration.";
+ if (xhr.responseJSON && xhr.responseJSON.detail) {
+ errorMsg = xhr.responseJSON.detail;
+ }
+ console.error("Error fetching WARP config:", errorMsg, xhr.responseText);
+
+ if (xhr.status === 404) {
+ $("#warp_initial_controls").show();
+ $("#warp_active_controls").hide();
+ $("#warp_config_form")[0].reset();
+ Swal.fire("Info", "WARP service might not be fully configured. Please try reinstalling if issues persist.", "info");
+ } else {
+ $("#warp_config_form")[0].reset();
+ Swal.fire("Warning", "Could not load current WARP configuration values. Please check manually or re-save.", "warning");
+ }
+ }
+ });
+ }
+
+ $("#warp_start_btn").on("click", function() {
+ confirmAction("install and start WARP", function () {
+ sendRequest(
+ "{{ url_for('install_warp') }}",
+ "POST",
+ null,
+ "WARP installation request sent. The page will reload.",
+ "#warp_start_btn",
+ true
+ );
+ });
+ });
+
+ $("#warp_stop_btn").on("click", function() {
+ confirmAction("stop and uninstall WARP", function () {
+ sendRequest(
+ "{{ url_for('uninstall_warp') }}",
+ "DELETE",
+ null,
+ "WARP uninstallation request sent. The page will reload.",
+ "#warp_stop_btn",
+ true
+ );
+ });
+ });
+
+ $("#warp_save_config_btn").on("click", function() {
+ const configData = {
+ all: $("#warp_all_traffic").is(":checked"),
+ popular_sites: $("#warp_popular_sites").is(":checked"),
+ domestic_sites: $("#warp_domestic_sites").is(":checked"),
+ block_adult_sites: $("#warp_block_adult_sites").is(":checked")
+ };
+ confirmAction("save WARP configuration", function () {
+ sendRequest(
+ "{{ url_for('configure_warp') }}",
+ "POST",
+ configData,
+ "WARP configuration saved successfully!",
+ "#warp_save_config_btn",
+ false,
+ fetchWarpFullStatusAndConfig
+ );
+ });
+ });
$("#telegram_start").on("click", startTelegram);
@@ -944,6 +1202,8 @@
$("#ip_limit_change_config").on("click", configIPLimit);
$("#decoy_setup").on("click", setupDecoy);
$("#decoy_stop").on("click", stopDecoy);
+ $("#obfs_enable_btn").on("click", enableObfs);
+ $("#obfs_disable_btn").on("click", disableObfs);
$('#normal_domain, #sni_domain, #decoy_domain').on('input', function () {
diff --git a/menu.sh b/menu.sh
index 9c13d39..5a8ec64 100644
--- a/menu.sh
+++ b/menu.sh
@@ -384,18 +384,17 @@ warp_configure_handler() {
if systemctl is-active --quiet "$service_name"; then
echo -e "${cyan}=== WARP Status ===${NC}"
-
status_json=$(python3 $CLI_PATH warp-status)
all_traffic=$(echo "$status_json" | grep -o '"all_traffic_via_warp": *[^,}]*' | cut -d':' -f2 | tr -d ' "')
popular_sites=$(echo "$status_json" | grep -o '"popular_sites_via_warp": *[^,}]*' | cut -d':' -f2 | tr -d ' "')
- domestic_sites=$(echo "$status_json" | grep -o '"domestic_sites_via_warp": *[^,}]*' | cut -d':' -f2 | tr -d ' "')
+ domestic_sites_via_warp=$(echo "$status_json" | grep -o '"domestic_sites_via_warp": *[^,}]*' | cut -d':' -f2 | tr -d ' "')
block_adult=$(echo "$status_json" | grep -o '"block_adult_content": *[^,}]*' | cut -d':' -f2 | tr -d ' "')
display_status() {
local label="$1"
- local status="$2"
- if [ "$status" = "true" ]; then
+ local status_val="$2"
+ if [ "$status_val" = "true" ]; then
echo -e " ${green}â${NC} $label: ${green}Enabled${NC}"
else
echo -e " ${red}â${NC} $label: ${red}Disabled${NC}"
@@ -404,38 +403,49 @@ warp_configure_handler() {
display_status "All Traffic via WARP" "$all_traffic"
display_status "Popular Sites via WARP" "$popular_sites"
- display_status "Domestic Sites via WARP" "$domestic_sites"
+ display_status "Domestic Sites via WARP" "$domestic_sites_via_warp"
display_status "Block Adult Content" "$block_adult"
echo -e "${cyan}==================${NC}"
echo
- echo "Configure WARP Options:"
- echo "1. Use WARP for all traffic"
- echo "2. Use WARP for popular sites"
- echo "3. Use WARP for domestic sites"
+ echo "Configure WARP Options (Toggle):"
+ echo "1. All traffic via WARP"
+ echo "2. Popular sites via WARP"
+ echo "3. Domestic sites (WARP/Reject)"
echo "4. Block adult content"
- echo "5. WARP Status Profile"
- echo "6. Change IP address"
+ echo "5. WARP Status Profile (IP etc.)"
+ echo "6. Change WARP IP address"
echo "0. Cancel"
- read -p "Select an option: " option
+ read -p "Select an option to toggle: " option
case $option in
- 1) python3 $CLI_PATH configure-warp --all ;;
- 2) python3 $CLI_PATH configure-warp --popular-sites ;;
- 3) python3 $CLI_PATH configure-warp --domestic-sites ;;
- 4) python3 $CLI_PATH configure-warp --block-adult-sites ;;
+ 1)
+ target_state=$([ "$all_traffic" = "true" ] && echo "off" || echo "on")
+ python3 $CLI_PATH configure-warp --set-all "$target_state" ;;
+ 2)
+ target_state=$([ "$popular_sites" = "true" ] && echo "off" || echo "on")
+ python3 $CLI_PATH configure-warp --set-popular-sites "$target_state" ;;
+ 3)
+ target_state=$([ "$domestic_sites_via_warp" = "true" ] && echo "off" || echo "on")
+ python3 $CLI_PATH configure-warp --set-domestic-sites "$target_state" ;;
+ 4)
+ target_state=$([ "$block_adult" = "true" ] && echo "off" || echo "on")
+ python3 $CLI_PATH configure-warp --set-block-adult-sites "$target_state" ;;
5)
- ip=$(curl -s --interface wgcf --connect-timeout 0.5 http://v4.ident.me)
+ current_ip=$(python3 $CLI_PATH warp-status | grep -o '"ip": *"[^"]*"' | cut -d':' -f2- | tr -d '" ')
+ if [ -z "$current_ip" ]; then
+ current_ip=$(curl -s --interface wgcf --connect-timeout 1 http://v4.ident.me || echo "N/A")
+ fi
cd /etc/warp/ && wgcf status
echo
- echo -e "${yellow}Warp IP:${NC} ${cyan}$ip${NC}"
+ echo -e "${yellow}Warp IP:${NC} ${cyan}${current_ip}${NC}"
;;
6)
- old_ip=$(curl -s --interface wgcf --connect-timeout 0.5 http://v4.ident.me)
+ old_ip=$(curl -s --interface wgcf --connect-timeout 1 http://v4.ident.me || echo "N/A")
echo -e "${yellow}Current IP:${NC} ${cyan}$old_ip${NC}"
- echo "Restarting $service_name..."
+ echo "Restarting $service_name to attempt IP change..."
systemctl restart "$service_name"
echo -n "Waiting for service to restart"
@@ -445,18 +455,22 @@ warp_configure_handler() {
done
echo
- new_ip=$(curl -s --interface wgcf --connect-timeout 0.5 http://v4.ident.me)
+ new_ip=$(curl -s --interface wgcf --connect-timeout 1 http://v4.ident.me || echo "N/A")
echo -e "${yellow}New IP:${NC} ${green}$new_ip${NC}"
- if [ "$old_ip" != "$new_ip" ]; then
+ if [ "$old_ip" != "N/A" ] && [ "$new_ip" != "N/A" ] && [ "$old_ip" != "$new_ip" ]; then
echo -e "${green}â IP address changed successfully${NC}"
- else
+ elif [ "$old_ip" = "$new_ip" ] && [ "$old_ip" != "N/A" ]; then
echo -e "${yellow}â IP address remained the same${NC}"
+ else
+ echo -e "${red}â Could not verify IP change.${NC}"
fi
;;
0) echo "WARP configuration canceled." ;;
*) echo -e "${red}Invalid option. Please try again.${NC}" ;;
esac
+ # echo "Command sent. Check status again to see changes."
+
else
echo -e "${red}$service_name is not active. Please start the service before configuring WARP.${NC}"
fi