v0.3.50 Adde Google AI, Play, HTZ, OVH of list

⚡️ perf(dns): improve DNS query performance and error handling

luci-app-podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.3.49
+PKG_VERSION:=0.3.50
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app

luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js

@@ -300,7 +300,7 @@ function createConfigSection(section, map, network) {
     o.value('russia_inside', 'Russia inside');
     o.value('russia_outside', 'Russia outside');
     o.value('ukraine_inside', 'Ukraine');
-    o.value('geoblock', 'GEO Block');
+    o.value('geoblock', 'Geo Block');
     o.value('block', 'Block');
     o.value('porn', 'Porn');
     o.value('news', 'News');
@@ -313,6 +313,11 @@ function createConfigSection(section, map, network) {
     o.value('tiktok', 'Tik-Tok');
     o.value('telegram', 'Telegram');
     o.value('cloudflare', 'Cloudflare');
+    o.value('google_ai', 'Google AI');
+    o.value('google_play', 'Google Play');
+    o.value('hetzner', 'Hetzner ASN');
+    o.value('ovh', 'OVH ASN');
+
     o.depends('domain_list_enabled', '1');
     o.rmempty = false;
     o.ucisection = s.section;
@@ -344,13 +349,13 @@ function createConfigSection(section, map, network) {
             }
 
             if (newValues.includes('russia_inside')) {
-                const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram', 'cloudflare'];
+                const allowedWithRussiaInside = ['russia_inside', 'meta', 'twitter', 'discord', 'telegram', 'cloudflare', 'google_ai', 'google_play', 'hetzner', 'ovh'];
                 const removedServices = newValues.filter(v => !allowedWithRussiaInside.includes(v));
                 if (removedServices.length > 0) {
                     newValues = newValues.filter(v => allowedWithRussiaInside.includes(v));
                     notifications.push(E('p', { class: 'alert-message warning' }, [
                         E('strong', {}, _('Russia inside restrictions')), E('br'),
-                        _('Warning: Russia inside can only be used with Meta, Twitter, Discord, Cloudflare and Telegram. %s already in Russia inside and have been removed from selection.')
+                        _('Warning: Russia inside can only be used with Meta, Twitter, Discord, Cloudflare, Google AI, Google Play, Hetzner, OVH and Telegram. %s already in Russia inside and have been removed from selection.')
                             .format(removedServices.join(', '))
                     ]));
                 }

podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.3.49
+PKG_VERSION:=0.3.50
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>

podkop/files/usr/bin/podkop

@@ -16,9 +16,11 @@ SUBNETS_META="${GITHUB_RAW_URL}/Subnets/IPv4/meta.lst"
 SUBNETS_DISCORD="${GITHUB_RAW_URL}/Subnets/IPv4/discord.lst"
 SUBNETS_TELERAM="${GITHUB_RAW_URL}/Subnets/IPv4/telegram.lst"
 SUBNETS_CLOUDFLARE="${GITHUB_RAW_URL}/Subnets/IPv4/cloudflare.lst"
+SUBNETS_HETZNER="${GITHUB_RAW_URL}/Subnets/IPv4/hetzner.lst"
+SUBNETS_OVH="${GITHUB_RAW_URL}/Subnets/IPv4/ovh.lst"
 SING_BOX_CONFIG="/etc/sing-box/config.json"
 FAKEIP="198.18.0.0/15"
-VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare"
+VALID_SERVICES="russia_inside russia_outside ukraine_inside geoblock block porn news anime youtube discord meta twitter hdrezka tiktok telegram cloudflare google_ai google_play hetzner ovh"
 DNS_RESOLVERS="1.1.1.1 1.0.0.1 8.8.8.8 8.8.4.4 9.9.9.9 9.9.9.11 94.140.14.14 94.140.15.15 208.67.220.220 208.67.222.222 77.88.8.1 77.88.8.8"
 TEST_DOMAIN="fakeip.podkop.fyi"
 INTERFACES_LIST=""
@@ -1448,6 +1450,12 @@ list_subnets_download() {
         "cloudflare")
             URL=$SUBNETS_CLOUDFLARE
             ;;
+        "hetzner")
+            URL=$SUBNETS_HETZNER
+            ;;
+        "ovh")
+            URL=$SUBNETS_OVH
+            ;;
         "discord")
             URL=$SUBNETS_DISCORD
             nft add set inet $table podkop_discord_subnets { type ipv4_addr\; flags interval\; auto-merge\; }
@@ -2212,30 +2220,45 @@ check_dns_available() {
 
     if [ "$dns_type" = "doh" ]; then
         # Generate random DNS query ID (2 bytes)
-        local random_id=$(head -c2 /dev/urandom | hexdump -ve '1/1 "%.2x"')
+        local random_id=$(head -c2 /dev/urandom | hexdump -ve '1/1 "%.2x"' 2>/dev/null)
-        # Create DNS wire format query for google.com A record with random ID
+        if [ $? -ne 0 ]; then
-        local dns_query=$(printf "\x${random_id:0:2}\x${random_id:2:2}\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00\x03www\x06google\x03com\x00\x00\x01\x00\x01" | base64)
+            error_message="Failed to generate random ID"
-        
+            status="internal error"
-        # Try POST method first (RFC 8484 compliant)
-        local result=$(echo "$dns_query" | base64 -d | curl -H "Content-Type: application/dns-message" \
-            -H "Accept: application/dns-message" \
-            --data-binary @- \
-            --connect-timeout 5 -s \
-            "https://$dns_server/dns-query" 2>/dev/null)
-        
-        if [ $? -eq 0 ] && [ -n "$result" ]; then
-            is_available=1
-            status="available"
         else
-            # Try GET method as fallback, remove padding from base64
+            # Create DNS wire format query for google.com A record with random ID
-            local dns_query_no_padding=$(echo "$dns_query" | tr -d '=')
+            local dns_query=$(printf "\x${random_id:0:2}\x${random_id:2:2}\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00\x03www\x06google\x03com\x00\x00\x01\x00\x01" | base64 2>/dev/null)
-            result=$(curl -H "accept: application/dns-message" \
+            if [ $? -ne 0 ]; then
-                --connect-timeout 5 -s \
+                error_message="Failed to generate DNS query"
-                "https://$dns_server/dns-query?dns=$dns_query_no_padding" 2>/dev/null)
+                status="internal error"
+            else
+                # Try POST method first (RFC 8484 compliant) with shorter timeout
+                local result=$(echo "$dns_query" | base64 -d 2>/dev/null | curl -H "Content-Type: application/dns-message" \
+                    -H "Accept: application/dns-message" \
+                    --data-binary @- \
+                    --max-time 2 \
+                    --connect-timeout 1 \
+                    -s \
+                    "https://$dns_server/dns-query" 2>/dev/null)
                 
-            if [ $? -eq 0 ] && [ -n "$result" ]; then
+                if [ $? -eq 0 ] && [ -n "$result" ]; then
-                is_available=1
+                    is_available=1
-                status="available"
+                    status="available"
+                else
+                    # Try GET method as fallback with shorter timeout
+                    local dns_query_no_padding=$(echo "$dns_query" | tr -d '=' 2>/dev/null)
+                    result=$(curl -H "accept: application/dns-message" \
+                        --max-time 2 \
+                        --connect-timeout 1 \
+                        -s \
+                        "https://$dns_server/dns-query?dns=$dns_query_no_padding" 2>/dev/null)
+                    
+                    if [ $? -eq 0 ] && [ -n "$result" ]; then
+                        is_available=1
+                        status="available"
+                    else
+                        error_message="DoH server not responding"
+                    fi
+                fi
             fi
         fi
     elif [ "$dns_type" = "dot" ]; then