diff --git a/universal_config.sh b/universal_config.sh index f45b3fb..cfcb503 100644 --- a/universal_config.sh +++ b/universal_config.sh @@ -155,17 +155,17 @@ requestConfWARP1() requestConfWARP2() { #запрос конфигурации 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://valokda-amnezia.vercel.app/api/warp' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') + -H 'referer: https://valokda-amnezia.vercel.app/api/warp') echo "$result" } requestConfWARP3() { - #запрос конфигурации 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/') @@ -175,7 +175,7 @@ requestConfWARP3() requestConfWARP4() { #запрос конфигурации 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/') @@ -183,6 +183,16 @@ requestConfWARP4() } requestConfWARP5() +{ + #запрос конфигурации 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" +} + +requestConfWARP6() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/warp' \ @@ -217,16 +227,21 @@ check_request() { echo "$warp_config" ;; 3) - content=$(echo $response_body | jq -r '.content') + content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; 4) + content=$(echo $response_body | jq -r '.content') + warp_config=$(echo "$content" | base64 -d) + echo "$warp_config" + ;; + 5) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 5) + 6) content=$(echo $response_body | jq -r '.content') content=$(echo $content | jq -r '.configBase64') warp_config=$(echo "$content" | base64 -d) @@ -730,7 +745,15 @@ do warpGen=$(check_request "$result" 5) if [ "$warpGen" = "Error" ] then - warp_config="Error" + printf "\033[32;1mRequest WARP config... Attempt #6\033[0m\n" + result=$(requestConfWARP6) + warpGen=$(check_request "$result" 6) + 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 e9e1626..3d3acfc 100644 --- a/universal_config_new_podkop.sh +++ b/universal_config_new_podkop.sh @@ -168,17 +168,17 @@ requestConfWARP1() requestConfWARP2() { #запрос конфигурации 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://valokda-amnezia.vercel.app/api/warp' \ -H 'accept: */*' \ -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') + -H 'referer: https://valokda-amnezia.vercel.app/api/warp') echo "$result" } requestConfWARP3() { - #запрос конфигурации 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/') @@ -188,7 +188,7 @@ requestConfWARP3() requestConfWARP4() { #запрос конфигурации 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/') @@ -196,6 +196,16 @@ requestConfWARP4() } requestConfWARP5() +{ + #запрос конфигурации 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" +} + +requestConfWARP6() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/warp' \ @@ -230,16 +240,21 @@ check_request() { echo "$warp_config" ;; 3) - content=$(echo $response_body | jq -r '.content') + content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; 4) + content=$(echo $response_body | jq -r '.content') + warp_config=$(echo "$content" | base64 -d) + echo "$warp_config" + ;; + 5) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; - 5) + 6) content=$(echo $response_body | jq -r '.content') content=$(echo $content | jq -r '.configBase64') warp_config=$(echo "$content" | base64 -d)