Fix name youtubeunblock files

config_files/youtubeUnblock

@@ -95,3 +95,39 @@ config section
 	list sni_domains 'twitteroauth.com'
 	list sni_domains 'twitterstat.us'
 
+config section
+	option name 'CallsWhatsAppTelegram'
+	option tls_enabled '0'
+	option all_domains '0'
+	list sni_domains 'cdn-telegram.org'
+	list sni_domains 'comments.app'
+	list sni_domains 'contest.com'
+	list sni_domains 'fragment.com'
+	list sni_domains 'graph.org'
+	list sni_domains 'quiz.directory'
+	list sni_domains 't.me'
+	list sni_domains 'tdesktop.com'
+	list sni_domains 'telega.one'
+	list sni_domains 'telegra.ph'
+	list sni_domains 'telegram-cdn.org'
+	list sni_domains 'telegram.dog'
+	list sni_domains 'telegram.me'
+	list sni_domains 'telegram.org'
+	list sni_domains 'telegram.space'
+	list sni_domains 'telesco.pe'
+	list sni_domains 'tg.dev'
+	list sni_domains 'tx.me'
+	list sni_domains 'usercontent.dev'
+	list sni_domains 'graph.facebook.com'
+	list sni_domains 'whatsapp.biz'
+	list sni_domains 'whatsapp.com'
+	list sni_domains 'whatsapp.net'
+	option sni_detection 'parse'
+	option quic_drop '0'
+	option udp_mode 'fake'
+	option udp_faking_strategy 'none'
+	option udp_fake_seq_len '6'
+	option udp_fake_len '64'
+	option udp_filter_quic 'disabled'
+	option enabled '1'
+	option udp_stun_filter '1'

config_files/youtubeUnblockCalls

@@ -0,0 +1,75 @@
+
+config youtubeUnblock 'youtubeUnblock'
+	option conf_strat 'ui_flags'
+	option packet_mark '32768'
+	option queue_num '537'
+	option silent '1'
+	option no_ipv6 '1'
+
+config section
+	option name 'Youtube'
+	option enabled '0'
+	option tls_enabled '1'
+	option fake_sni '1'
+	option faking_strategy 'pastseq'
+	option fake_sni_seq_len '1'
+	option fake_sni_type 'default'
+	option frag 'tcp'
+	option frag_sni_reverse '1'
+	option frag_sni_faked '0'
+	option frag_middle_sni '1'
+	option frag_sni_pos '1'
+	option seg2delay '0'
+	option fk_winsize '0'
+	option synfake '0'
+	option sni_detection 'parse'
+	option all_domains '0'
+	list sni_domains 'googlevideo.com'
+	list sni_domains 'ggpht.com'
+	list sni_domains 'ytimg.com'
+	list sni_domains 'youtube.com'
+	list sni_domains 'play.google.com'
+	list sni_domains 'youtu.be'
+	list sni_domains 'googleapis.com'
+	list sni_domains 'googleusercontent.com'
+	list sni_domains 'gstatic.com'
+	list sni_domains 'l.google.com'
+	option quic_drop '1'
+
+config section
+	option name 'CallsWhatsAppTelegram'
+	option tls_enabled '0'
+	option all_domains '0'
+	list sni_domains 'cdn-telegram.org'
+	list sni_domains 'comments.app'
+	list sni_domains 'contest.com'
+	list sni_domains 'fragment.com'
+	list sni_domains 'graph.org'
+	list sni_domains 'quiz.directory'
+	list sni_domains 't.me'
+	list sni_domains 'tdesktop.com'
+	list sni_domains 'telega.one'
+	list sni_domains 'telegra.ph'
+	list sni_domains 'telegram-cdn.org'
+	list sni_domains 'telegram.dog'
+	list sni_domains 'telegram.me'
+	list sni_domains 'telegram.org'
+	list sni_domains 'telegram.space'
+	list sni_domains 'telesco.pe'
+	list sni_domains 'tg.dev'
+	list sni_domains 'tx.me'
+	list sni_domains 'usercontent.dev'
+	list sni_domains 'graph.facebook.com'
+	list sni_domains 'whatsapp.biz'
+	list sni_domains 'whatsapp.com'
+	list sni_domains 'whatsapp.net'
+	option sni_detection 'parse'
+	option quic_drop '0'
+	option udp_mode 'fake'
+	option udp_faking_strategy 'none'
+	option udp_fake_seq_len '6'
+	option udp_fake_len '64'
+	option udp_filter_quic 'disabled'
+	option enabled '1'
+	option udp_stun_filter '1'
+

config_files/youtubeUnblockSecond

@@ -65,4 +65,41 @@ config section
 	list sni_domains 'discordapp.com'
 	list sni_domains 'discord.gg'
 	list sni_domains 'discordapp.net'
-	list sni_domains 'discord.media'
+	list sni_domains 'discord.media'
+
+config section
+	option name 'CallsWhatsAppTelegram'
+	option tls_enabled '0'
+	option all_domains '0'
+	list sni_domains 'cdn-telegram.org'
+	list sni_domains 'comments.app'
+	list sni_domains 'contest.com'
+	list sni_domains 'fragment.com'
+	list sni_domains 'graph.org'
+	list sni_domains 'quiz.directory'
+	list sni_domains 't.me'
+	list sni_domains 'tdesktop.com'
+	list sni_domains 'telega.one'
+	list sni_domains 'telegra.ph'
+	list sni_domains 'telegram-cdn.org'
+	list sni_domains 'telegram.dog'
+	list sni_domains 'telegram.me'
+	list sni_domains 'telegram.org'
+	list sni_domains 'telegram.space'
+	list sni_domains 'telesco.pe'
+	list sni_domains 'tg.dev'
+	list sni_domains 'tx.me'
+	list sni_domains 'usercontent.dev'
+	list sni_domains 'graph.facebook.com'
+	list sni_domains 'whatsapp.biz'
+	list sni_domains 'whatsapp.com'
+	list sni_domains 'whatsapp.net'
+	option sni_detection 'parse'
+	option quic_drop '0'
+	option udp_mode 'fake'
+	option udp_faking_strategy 'none'
+	option udp_fake_seq_len '6'
+	option udp_fake_len '64'
+	option udp_filter_quic 'disabled'
+	option enabled '1'
+	option udp_stun_filter '1'

universal_config.sh

@@ -120,25 +120,39 @@ manage_package() {
     fi
 }
 
-checkPackageAndInstall()
+
-{
+checkPackageAndInstall() {
     local name="$1"
-    local isRequried="$2"
+    local isRequired="$2"
-    #проверяем установлени ли библиотека $name
+    local alt=""
-    if opkg list-installed | grep -q $name; then
+
-        echo "$name already installed..."
+    if [ "$name" = "https-dns-proxy" ]; then
+        alt="luci-app-doh-proxy"
+    fi
+
+    if [ -n "$alt" ]; then
+        if opkg list-installed | grep -qE "^($name|$alt) "; then
+            echo "$name or $alt already installed..."
+            return 0
+        fi
     else
-        echo "$name not installed. Installed $name..."
+        if opkg list-installed | grep -q "^$name "; then
-        opkg install $name
+            echo "$name already installed..."
-		res=$?
+            return 0
-		if [ "$isRequried" = "1" ]; then
+        fi
-			if [ $res -eq 0 ]; then
+    fi
-				echo "$name insalled successfully"
+
-			else
+    echo "$name not installed. Installing $name..."
-				echo "Error installing $name. Please, install $name manually and run the script again"
+    opkg install "$name"
-				exit 1
+    res=$?
-			fi
+
-		fi
+    if [ "$isRequired" = "1" ]; then
+        if [ $res -eq 0 ]; then
+            echo "$name installed successfully"
+        else
+            echo "Error installing $name. Please, install $name manually$( [ -n "$alt" ] && echo " or $alt") and run the script again."
+            exit 1
+        fi
     fi
 }
 
@@ -284,7 +298,7 @@ checkAndAddDomainPermanentName()
 install_youtubeunblock_packages() {
     PKGARCH=$(opkg print-architecture | awk 'BEGIN {max=0} {if ($3 > max) {max = $3; arch = $2}} END {print arch}')
     VERSION=$(ubus call system board | jsonfilter -e '@.release.version')
-    BASE_URL="https://github.com/Waujito/youtubeUnblock/releases/download/v1.0.0/"
+    BASE_URL="https://github.com/Waujito/youtubeUnblock/releases/download/v1.1.0/"
   	PACK_NAME="youtubeUnblock"
 
     AWG_DIR="/tmp/$PACK_NAME"
@@ -312,7 +326,7 @@ install_youtubeunblock_packages() {
 			fi
 		done
 
-        YOUTUBEUNBLOCK_FILENAME="youtubeUnblock-1.0.0-10-f37c3dd-${PKGARCH}-openwrt-23.05.ipk"
+        YOUTUBEUNBLOCK_FILENAME="youtubeUnblock-1.1.0-2-2d579d5-${PKGARCH}-openwrt-23.05.ipk"
         DOWNLOAD_URL="${BASE_URL}${YOUTUBEUNBLOCK_FILENAME}"
 		echo $DOWNLOAD_URL
         wget -O "$AWG_DIR/$YOUTUBEUNBLOCK_FILENAME" "$DOWNLOAD_URL"
@@ -339,7 +353,7 @@ install_youtubeunblock_packages() {
         echo "$PACK_NAME already installed"
     else
 		PACK_NAME="luci-app-youtubeUnblock"
-		YOUTUBEUNBLOCK_FILENAME="luci-app-youtubeUnblock-1.0.0-10-f37c3dd.ipk"
+		YOUTUBEUNBLOCK_FILENAME="luci-app-youtubeUnblock-1.1.0-1-473af29.ipk"
         DOWNLOAD_URL="${BASE_URL}${YOUTUBEUNBLOCK_FILENAME}"
 		echo $DOWNLOAD_URL
         wget -O "$AWG_DIR/$YOUTUBEUNBLOCK_FILENAME" "$DOWNLOAD_URL"
@@ -379,6 +393,11 @@ checkPackageAndInstall "jq" "1"
 checkPackageAndInstall "curl" "1"
 checkPackageAndInstall "unzip" "1"
 checkPackageAndInstall "sing-box" "1"
+checkPackageAndInstall "opera-proxy" "1"
+checkPackageAndInstall "youtubeUnblock" "1"
+opkg upgrade youtubeUnblock
+opkg upgrade luci-app-youtubeUnblock
+manage_package "youtubeUnblock" "enable" "start"
 
 #проверяем установлени ли пакет dnsmasq-full
 if opkg list-installed | grep -q dnsmasq-full; then
@@ -402,7 +421,7 @@ firewall
 https-dns-proxy
 youtubeUnblock
 dhcp"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/test_main"
 
 checkPackageAndInstall "https-dns-proxy" "0"
 
@@ -422,6 +441,10 @@ then
 		then 
 		  wget -O "$DIR/$file" "$URL/config_files/$file" 
 		fi
+		if [ "$file" == "youtubeUnblock" ] 
+		then 
+		  wget -O "$DIR/$file" "$URL/config_files/youtubeUnblockCalls" 
+		fi
 	done
 fi
 
@@ -431,18 +454,6 @@ uci set dhcp.cfg01411c.strictorder='1'
 uci set dhcp.cfg01411c.filter_aaaa='1'
 uci commit dhcp
 
-echo "Install opera-proxy client..."
-service stop vpn > /dev/null
-rm -f /usr/bin/vpns /etc/init.d/vpn
-
-url="https://github.com/NitroOxid/openwrt-opera-proxy-bin/releases/download/1.8.0/opera-proxy_1.8.0-1_aarch64_cortex-a53.ipk"
-destination_file="/tmp/opera-proxy.ipk"
-
-echo "Downloading opera-proxy..."
-wget "$url" -O "$destination_file" || { echo "Failed to download the file"; exit 1; }
-echo "Installing opera-proxy..."
-opkg install $destination_file
-
 cat <<EOF > /etc/sing-box/config.json
   {
     "log": {
@@ -716,10 +727,6 @@ then
 	varByPass=1
 else
     printf "\033[32;1mAWG WARP not work...Try work youtubeunblock...Please wait...\033[0m\n"
-	install_youtubeunblock_packages
-	opkg upgrade youtubeUnblock
-	opkg upgrade luci-app-youtubeUnblock
-    manage_package "youtubeUnblock" "enable" "start"
 	wget -O "/etc/config/youtubeUnblock" "$URL/config_files/youtubeUnblockSecond"
 	service youtubeUnblock restart
 	curl -f -o /dev/null -k --connect-to ::google.com -L -H "Host: mirror.gcr.io" --max-time 360 https://test.googlevideo.com/v2/cimg/android/blobs/sha256:6fd8bdac3da660bde7bd0b6f2b6a46e1b686afb74b9a4614def32532b73f5eaa
@@ -749,13 +756,13 @@ service odhcpd restart
 
 path_podkop_config="/etc/config/podkop"
 path_podkop_config_backup="/root/podkop"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/main"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/test_main"
 
 case $varByPass in
 1)
 	nameFileReplacePodkop="podkop"
 	printf  "\033[32;1mStop and disabled service 'youtubeUnblock' and 'ruantiblock'...\033[0m\n"
-	manage_package "youtubeUnblock" "disable" "stop"
+	#manage_package "youtubeUnblock" "disable" "stop"
 	manage_package "ruantiblock" "disable" "stop"
 	;;
 2)