diff --git a/universal_config.sh b/universal_config.sh index 2fecfb2..1a199e5 100644 --- a/universal_config.sh +++ b/universal_config.sh @@ -143,6 +143,26 @@ checkPackageAndInstall() } requestConfWARP1() +{ + #запрос конфигурации WARP + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt?dns=1.1.1.1%2C%201.0.0.1%2C%202606%3A4700%3A4700%3A%3A1111%2C%202606%3A4700%3A4700%3A%3A1001&allowedIPs=0.0.0.0%2F0%2C%20%3A%3A%2F0' \ + -H 'accept: */*' \ + -H 'accept-language: ru-RU,ru;q=0.9' \ + -H 'referer: https://config-generator-warp.vercel.app/') + echo "$result" +} + +requestConfWARP2() +{ + #запрос конфигурации WARP без параметров + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt' \ + -H 'accept: */*' \ + -H 'accept-language: ru-RU,ru;q=0.9' \ + -H 'referer: https://config-generator-warp.vercel.app/') + echo "$result" +} + +requestConfWARP3() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-gen.vercel.app/generate-config' \ @@ -154,7 +174,7 @@ requestConfWARP1() } -requestConfWARP2() +requestConfWARP4() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/warp' \ @@ -166,26 +186,6 @@ requestConfWARP2() echo "$result" } -requestConfWARP3() -{ - #запрос конфигурации WARP - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt?dns=1.1.1.1%2C%201.0.0.1%2C%202606%3A4700%3A4700%3A%3A1111%2C%202606%3A4700%3A4700%3A%3A1001&allowedIPs=0.0.0.0%2F0%2C%20%3A%3A%2F0' \ - -H 'accept: */*' \ - -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') - echo "$result" -} - -requestConfWARP4() -{ - #запрос конфигурации WARP без параметров - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt' \ - -H 'accept: */*' \ - -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') - echo "$result" -} - # Функция для обработки выполнения запроса check_request() { local response="$1" @@ -200,23 +200,23 @@ check_request() { if [ "$response_code" -eq 200 ]; then case $choice in 1) - content=$(echo $response_body | jq -r '.config') - #content=$(echo "$content" | sed 's/\\n/\012/g') - echo "$content" - ;; - 2) - content=$(echo $response_body | jq -r '.content') - content=$(echo $content | jq -r '.configBase64') - warp_config=$(echo "$content" | base64 -d) - echo "$warp_config" - ;; - 3) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" + ;; + 2) + content=$(echo $response_body | jq -r '.content') + warp_config=$(echo "$content" | base64 -d) + echo "$warp_config" + ;; + 3) + content=$(echo $response_body | jq -r '.config') + #content=$(echo "$content" | sed 's/\\n/\012/g') + echo "$content" ;; 4) content=$(echo $response_body | jq -r '.content') + content=$(echo $content | jq -r '.configBase64') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;; diff --git a/universal_config_new_podkop.sh b/universal_config_new_podkop.sh index 464dbb1..cd96131 100644 --- a/universal_config_new_podkop.sh +++ b/universal_config_new_podkop.sh @@ -156,6 +156,26 @@ checkPackageAndInstall() { } requestConfWARP1() +{ + #запрос конфигурации WARP + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt?dns=1.1.1.1%2C%201.0.0.1%2C%202606%3A4700%3A4700%3A%3A1111%2C%202606%3A4700%3A4700%3A%3A1001&allowedIPs=0.0.0.0%2F0%2C%20%3A%3A%2F0' \ + -H 'accept: */*' \ + -H 'accept-language: ru-RU,ru;q=0.9' \ + -H 'referer: https://config-generator-warp.vercel.app/') + echo "$result" +} + +requestConfWARP2() +{ + #запрос конфигурации WARP без параметров + local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt' \ + -H 'accept: */*' \ + -H 'accept-language: ru-RU,ru;q=0.9' \ + -H 'referer: https://config-generator-warp.vercel.app/') + echo "$result" +} + +requestConfWARP3() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-gen.vercel.app/generate-config' \ @@ -167,7 +187,7 @@ requestConfWARP1() } -requestConfWARP2() +requestConfWARP4() { #запрос конфигурации WARP local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://warp-generator.vercel.app/api/warp' \ @@ -179,26 +199,6 @@ requestConfWARP2() echo "$result" } -requestConfWARP3() -{ - #запрос конфигурации WARP - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt?dns=1.1.1.1%2C%201.0.0.1%2C%202606%3A4700%3A4700%3A%3A1111%2C%202606%3A4700%3A4700%3A%3A1001&allowedIPs=0.0.0.0%2F0%2C%20%3A%3A%2F0' \ - -H 'accept: */*' \ - -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') - echo "$result" -} - -requestConfWARP4() -{ - #запрос конфигурации WARP без параметров - local result=$(curl --connect-timeout 20 --max-time 60 -w "%{http_code}" 'https://config-generator-warp.vercel.app/warpt' \ - -H 'accept: */*' \ - -H 'accept-language: ru-RU,ru;q=0.9' \ - -H 'referer: https://config-generator-warp.vercel.app/') - echo "$result" -} - # Функция для обработки выполнения запроса check_request() { local response="$1" @@ -213,23 +213,23 @@ check_request() { if [ "$response_code" -eq 200 ]; then case $choice in 1) - content=$(echo $response_body | jq -r '.config') - #content=$(echo "$content" | sed 's/\\n/\012/g') - echo "$content" - ;; - 2) - content=$(echo $response_body | jq -r '.content') - content=$(echo $content | jq -r '.configBase64') - warp_config=$(echo "$content" | base64 -d) - echo "$warp_config" - ;; - 3) content=$(echo $response_body | jq -r '.content') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" + ;; + 2) + content=$(echo $response_body | jq -r '.content') + warp_config=$(echo "$content" | base64 -d) + echo "$warp_config" + ;; + 3) + content=$(echo $response_body | jq -r '.config') + #content=$(echo "$content" | sed 's/\\n/\012/g') + echo "$content" ;; 4) content=$(echo $response_body | jq -r '.content') + content=$(echo $content | jq -r '.configBase64') warp_config=$(echo "$content" | base64 -d) echo "$warp_config" ;;