fix awg warp generator

This commit is contained in:
CodeRoK7
2025-10-02 12:30:04 +00:00
parent 1f150b93df
commit b8e3b09ad9
2 changed files with 62 additions and 18 deletions

View File

@@ -145,17 +145,17 @@ checkPackageAndInstall()
requestConfWARP1() requestConfWARP1()
{ {
#запрос конфигурации WARP #запрос конфигурации 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: */*' \
-H 'accept-language: ru-RU,ru;q=0.9' \ -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" echo "$result"
} }
requestConfWARP2() requestConfWARP2()
{ {
#запрос конфигурации WARP без параметров #запрос конфигурации WARP
local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp6t' \ local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpd' \
-H 'accept: */*' \ -H 'accept: */*' \
-H 'accept-language: ru-RU,ru;q=0.9' \ -H 'accept-language: ru-RU,ru;q=0.9' \
-H 'referer: https://config-generator-warp.vercel.app/') -H 'referer: https://config-generator-warp.vercel.app/')
@@ -165,7 +165,7 @@ requestConfWARP2()
requestConfWARP3() requestConfWARP3()
{ {
#запрос конфигурации WARP без параметров #запрос конфигурации 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: */*' \
-H 'accept-language: ru-RU,ru;q=0.9' \ -H 'accept-language: ru-RU,ru;q=0.9' \
-H 'referer: https://config-generator-warp.vercel.app/') -H 'referer: https://config-generator-warp.vercel.app/')
@@ -173,6 +173,16 @@ requestConfWARP3()
} }
requestConfWARP4() 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 #запрос конфигурации WARP
local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/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 if [ "$response_code" -eq 200 ]; then
case $choice in case $choice in
1) 1)
content=$(echo $response_body | jq -r '.config')
echo "$content"
;;
2)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
echo "$warp_config" echo "$warp_config"
;; ;;
2) 3)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
echo "$warp_config" echo "$warp_config"
;; ;;
3) 4)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
echo "$warp_config" echo "$warp_config"
;; ;;
4) 5)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
content=$(echo $content | jq -r '.configBase64') content=$(echo $content | jq -r '.configBase64')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
@@ -711,7 +725,15 @@ do
warpGen=$(check_request "$result" 4) warpGen=$(check_request "$result" 4)
if [ "$warpGen" = "Error" ] if [ "$warpGen" = "Error" ]
then 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 else
warp_config=$warpGen warp_config=$warpGen
fi fi

View File

@@ -158,17 +158,17 @@ checkPackageAndInstall() {
requestConfWARP1() requestConfWARP1()
{ {
#запрос конфигурации WARP #запрос конфигурации 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: */*' \
-H 'accept-language: ru-RU,ru;q=0.9' \ -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" echo "$result"
} }
requestConfWARP2() requestConfWARP2()
{ {
#запрос конфигурации WARP без параметров #запрос конфигурации WARP
local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warp6t' \ local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpd' \
-H 'accept: */*' \ -H 'accept: */*' \
-H 'accept-language: ru-RU,ru;q=0.9' \ -H 'accept-language: ru-RU,ru;q=0.9' \
-H 'referer: https://config-generator-warp.vercel.app/') -H 'referer: https://config-generator-warp.vercel.app/')
@@ -178,7 +178,7 @@ requestConfWARP2()
requestConfWARP3() requestConfWARP3()
{ {
#запрос конфигурации WARP без параметров #запрос конфигурации 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: */*' \
-H 'accept-language: ru-RU,ru;q=0.9' \ -H 'accept-language: ru-RU,ru;q=0.9' \
-H 'referer: https://config-generator-warp.vercel.app/') -H 'referer: https://config-generator-warp.vercel.app/')
@@ -186,6 +186,16 @@ requestConfWARP3()
} }
requestConfWARP4() 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 #запрос конфигурации WARP
local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/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 if [ "$response_code" -eq 200 ]; then
case $choice in case $choice in
1) 1)
content=$(echo $response_body | jq -r '.config')
echo "$content"
;;
2)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
echo "$warp_config" echo "$warp_config"
;; ;;
2) 3)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
echo "$warp_config" echo "$warp_config"
;; ;;
3) 4)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
echo "$warp_config" echo "$warp_config"
;; ;;
4) 5)
content=$(echo $response_body | jq -r '.content') content=$(echo $response_body | jq -r '.content')
content=$(echo $content | jq -r '.configBase64') content=$(echo $content | jq -r '.configBase64')
warp_config=$(echo "$content" | base64 -d) warp_config=$(echo "$content" | base64 -d)
@@ -760,7 +774,15 @@ do
warpGen=$(check_request "$result" 4) warpGen=$(check_request "$result" 4)
if [ "$warpGen" = "Error" ] if [ "$warpGen" = "Error" ]
then 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 else
warp_config=$warpGen warp_config=$warpGen
fi fi