From b8e3b09ad9c09cf728125fc57c7b2dabe0172f34 Mon Sep 17 00:00:00 2001 From: CodeRoK7 <58553260+CodeRoK7@users.noreply.github.com> Date: Thu, 2 Oct 2025 12:30:04 +0000 Subject: [PATCH] fix awg warp generator --- universal_config.sh | 40 ++++++++++++++++++++++++++-------- universal_config_new_podkop.sh | 40 ++++++++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 18 deletions(-) diff --git a/universal_config.sh b/universal_config.sh index 275eb33..f45b3fb 100644 --- a/universal_config.sh +++ b/universal_config.sh @@ -145,17 +145,17 @@ checkPackageAndInstall() requestConfWARP1() { #запрос конфигурации WARP - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpd' \ + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-gen.vercel.app/generate-config' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') + -H 'referer: https://warp-gen.vercel.app/generate-config') echo "$result" } requestConfWARP2() { - #запрос конфигурации WARP без параметров - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp6t' \ + #запрос конфигурации WARP + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpd' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ -H 'referer: https://config-generator-warp.vercel.app/') @@ -165,7 +165,7 @@ requestConfWARP2() requestConfWARP3() { #запрос конфигурации WARP без параметров - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp4t' \ + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp6t' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ -H 'referer: https://config-generator-warp.vercel.app/') @@ -173,6 +173,16 @@ requestConfWARP3() } requestConfWARP4() +{ + #запрос конфигурации WARP без параметров + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp4t' \ + -H 'accept: */*' \ + -H 'accept-language: ru-RU,ru;q=0.9' \ + -H 'referer: https://config-generator-warp.vercel.app/') + echo "$result" +} + +requestConfWARP5() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/warp' \ @@ -198,21 +208,25 @@ check_request() { if [ "$response_code" -eq 200 ]; then case $choice in 1) + content=$(echo $response_body | jq -r '.config') + echo "$content" + ;; + 2) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 2) + 3) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 3) + 4) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 4) + 5) content=$(echo $response_body | jq -r '.content') content=$(echo $content | jq -r '.configBase64') warp_config=$(echo "$content" | base64 -d) @@ -711,7 +725,15 @@ do warpGen=$(check_request "$result" 4) if [ "$warpGen" = "Error" ] then - warp_config="Error" + printf "\033[32;1mRequest WARP config... Attempt #5\033[0m\n" + result=$(requestConfWARP5) + warpGen=$(check_request "$result" 5) + if [ "$warpGen" = "Error" ] + then + warp_config="Error" + else + warp_config=$warpGen + fi else warp_config=$warpGen fi diff --git a/universal_config_new_podkop.sh b/universal_config_new_podkop.sh index 153e935..e9e1626 100644 --- a/universal_config_new_podkop.sh +++ b/universal_config_new_podkop.sh @@ -158,17 +158,17 @@ checkPackageAndInstall() { requestConfWARP1() { #запрос конфигурации WARP - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpd' \ + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-gen.vercel.app/generate-config' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') + -H 'referer: https://warp-gen.vercel.app/generate-config') echo "$result" } requestConfWARP2() { - #запрос конфигурации WARP без параметров - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp6t' \ + #запрос конфигурации WARP + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpd' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ -H 'referer: https://config-generator-warp.vercel.app/') @@ -178,7 +178,7 @@ requestConfWARP2() requestConfWARP3() { #запрос конфигурации WARP без параметров - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp4t' \ + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp6t' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ -H 'referer: https://config-generator-warp.vercel.app/') @@ -186,6 +186,16 @@ requestConfWARP3() } requestConfWARP4() +{ + #запрос конфигурации WARP без параметров + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp4t' \ + -H 'accept: */*' \ + -H 'accept-language: ru-RU,ru;q=0.9' \ + -H 'referer: https://config-generator-warp.vercel.app/') + echo "$result" +} + +requestConfWARP5() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/warp' \ @@ -211,21 +221,25 @@ check_request() { if [ "$response_code" -eq 200 ]; then case $choice in 1) + content=$(echo $response_body | jq -r '.config') + echo "$content" + ;; + 2) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 2) + 3) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 3) + 4) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 4) + 5) content=$(echo $response_body | jq -r '.content') content=$(echo $content | jq -r '.configBase64') warp_config=$(echo "$content" | base64 -d) @@ -760,7 +774,15 @@ do warpGen=$(check_request "$result" 4) if [ "$warpGen" = "Error" ] then - warp_config="Error" + printf "\033[32;1mRequest WARP config... Attempt #5\033[0m\n" + result=$(requestConfWARP5) + warpGen=$(check_request "$result" 5) + if [ "$warpGen" = "Error" ] + then + warp_config="Error" + else + warp_config=$warpGen + fi else warp_config=$warpGen fi