fix awg warp generator

2025-12-31 21:58:47 +03:00 · 2025-10-02 16:04:12 +00:00
parent e1ee9830c5
commit cb656bf1ee
2 changed files with 54 additions and 38 deletions
--- a/universal_config.sh
+++ b/universal_config.sh
@@ -120,28 +120,6 @@ manage_package() {
    fi
 }

-checkPackageAndInstall()
-{
-    local name="$1"
-    local isRequried="$2"
-    #проверяем установлени ли библиотека $name
-    if opkg list-installed | grep -q $name; then
-        echo "$name already installed..."
-    else
-        echo "$name not installed. Installed $name..."
-        opkg install $name
-		res=$?
-		if [ "$isRequried" = "1" ]; then
-			if [ $res -eq 0 ]; then
-				echo "$name insalled successfully"
-			else
-				echo "Error installing $name. Please, install $name manually and run the script again"
-				exit 1
-			fi
-		fi
-    fi
-}
-
 requestConfWARP1()
 {
  #запрос конфигурации WARP
@@ -155,17 +133,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 +153,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 +161,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' \
@@ -223,10 +211,15 @@ check_request() {
            ;;
 		4)
 			content=$(echo $response_body | jq -r '.content')  
-			warp_config=$(echo "$content" | base64 -d)
+            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"
+            ;;
+		6)
 			content=$(echo $response_body | jq -r '.content')  
 			content=$(echo $content | jq -r '.configBase64')  
            warp_config=$(echo "$content" | base64 -d)
--- 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' \
@@ -236,10 +246,15 @@ check_request() {
            ;;
 		4)
 			content=$(echo $response_body | jq -r '.content')  
-			warp_config=$(echo "$content" | base64 -d)
+            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"
+            ;;
+		6)
 			content=$(echo $response_body | jq -r '.content')  
 			content=$(echo $content | jq -r '.configBase64')  
            warp_config=$(echo "$content" | base64 -d)
@@ -752,7 +767,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
@@ -828,7 +851,7 @@ do
 		then
 			I1="<b 0xc10000000114367096bb0fb3f58f3a3fb8aaacd61d63a1c8a40e14f7374b8a62dccba6431716c3abf6f5afbcfb39bd008000047c32e268567c652e6f4db58bff759bc8c5aaca183b87cb4d22938fe7d8dca22a679a79e4d9ee62e4bbb3a380dd78d4e8e48f26b38a1d42d76b371a5a9a0444827a69d1ab5872a85749f65a4104e931740b4dc1e2dd77733fc7fac4f93011cd622f2bb47e85f71992e2d585f8dc765a7a12ddeb879746a267393ad023d267c4bd79f258703e27345155268bd3cc0506ebd72e2e3c6b5b0f005299cd94b67ddabe30389c4f9b5c2d512dcc298c14f14e9b7f931e1dc397926c31fbb7cebfc668349c218672501031ecce151d4cb03c4c660b6c6fe7754e75446cd7de09a8c81030c5f6fb377203f551864f3d83e27de7b86499736cbbb549b2f37f436db1cae0a4ea39930f0534aacdd1e3534bc87877e2afabe959ced261f228d6362e6fd277c88c312d966c8b9f67e4a92e757773db0b0862fb8108d1d8fa262a40a1b4171961f0704c8ba314da2482ac8ed9bd28d4b50f7432d89fd800c25a50c5e2f5c0710544fef5273401116aa0572366d8e49ad758fcb29e6a92912e644dbe227c247cb3417eabfab2db16796b2fba420de3b1dc94e8361f1f324a331ddaf1e626553138860757fd0bf687566108b77b70fb9f8f8962eca599c4a70ed373666961a8cb506b96756d9e28b94122b20f16b54f118c0e603ce0b831efea614ad836df6cf9affbdd09596412547496967da758cec9080295d853b0861670b71d9abde0d562b1a6de82782a5b0c14d297f27283a895abc889a5f6703f0e6eb95f67b2da45f150d0d8ab805612d570c2d5cb6997ac3a7756226c2f5c8982ffbd480c5004b0660a3c9468945efde90864019a2b519458724b55d766e16b0da25c0557c01f3c11ddeb024b62e303640e17fdd57dedb3aeb4a2c1b7c93059f9c1d7118d77caac1cd0f6556e46cbc991c1bb16970273dea833d01e5090d061a0c6d25af2415cd2878af97f6d0e7f1f936247b394ecb9bd484da6be936dee9b0b92dc90101a1b4295e97a9772f2263eb09431995aa173df4ca2abd687d87706f0f93eaa5e13cbe3b574fa3cfe94502ace25265778da6960d561381769c24e0cbd7aac73c16f95ae74ff7ec38124f7c722b9cb151d4b6841343f29be8f35145e1b27021056820fed77003df8554b4155716c8cf6049ef5e318481460a8ce3be7c7bfac695255be84dc491c19e9dedc449dd3471728cd2a3ee51324ccb3eef121e3e08f8e18f0006ea8957371d9f2f739f0b89e4db11e5c6430ada61572e589519fbad4498b460ce6e4407fc2d8f2dd4293a50a0cb8fcaaf35cd9a8cc097e3603fbfa08d9036f52b3e7fcce11b83ad28a4ac12dba0395a0cc871cefd1a2856fffb3f28d82ce35cf80579974778bab13d9b3578d8c75a2d196087a2cd439aff2bb33f2db24ac175fff4ed91d36a4cdbfaf3f83074f03894ea40f17034629890da3efdbb41141b38368ab532209b69f057ddc559c19bc8ae62bf3fd564c9a35d9a83d14a95834a92bae6d9a29ae5e8ece07910d16433e4c6230c9bd7d68b47de0de9843988af6dc88b5301820443bd4d0537778bf6b4c1dd067fcf14b81015f2a67c7f2a28f9cb7e0684d3cb4b1c24d9b343122a086611b489532f1c3a26779da1706c6759d96d8ab>"
 		fi
-		uci set network.${INTERFACE_NAME}.awg_i1=$I1
+		uci set network.${INTERFACE_NAME}.awg_i1="$I1"
 		uci set network.${INTERFACE_NAME}.nohostroute='1'
 		
 		uci set network.@${CONFIG_NAME}[-1].description="${INTERFACE_NAME}_peer"