Version bump

* Update ipset-all.txt.backup

* Update ipset-service.txt

.gitattributes

@@ -1,2 +1,3 @@
 *.bat text eol=crlf
-*.ps1 text eol=crlf
+*.ps1 text eol=crlf
+*.txt text eol=crlf

.github/github-bot.yml

@@ -1,6 +1,6 @@
 trusted_users:
   - Flowseal
-  - Kail-225
+  - ControlRe
   - ekungurov
   - V3nilla
   - serpen7
@@ -11,3 +11,4 @@ trusted_users:
   - prettyleaf
   - amozebus
   - fridorin
+  - kinlay0

.github/workflows/release.yml

@@ -26,18 +26,45 @@ jobs:
           fi
 
       - name: Install tools
-        run: sudo apt-get install -y rar p7zip-full
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y zip tar rar
+
+      - name: Prepare release bundle
+        run: |
+          NAME="zapret-discord-youtube-${{ github.event.inputs.tag }}"
+
+          mkdir "$NAME"
+
+          cp -r bin "$NAME/"
+          cp -r lists "$NAME/"
+          cp -r utils "$NAME/"
+          cp *.bat "$NAME/"
+
+          cp README.md "$NAME/"
+          cp LICENSE.txt "$NAME/"
+
+          (
+            cd "$NAME"
+            find . -type f -exec sha256sum {} \;
+          ) > "$NAME/SHA256SUMS.txt"
 
       - name: Create archives
         run: |
           NAME="zapret-discord-youtube-${{ github.event.inputs.tag }}"
-          7z a "${NAME}.zip" bin/ lists/ utils/ *.bat
-          rar a "${NAME}.rar" bin/ lists/ utils/ *.bat
+
+          zip -qr "${NAME}.zip" "$NAME"
+          rar a -idq "${NAME}.rar" "$NAME"
+          tar --owner=0 --group=0 -czf "${NAME}.tar.gz" "$NAME"
 
       - name: Print SHA256 checksums
         run: |
           NAME="zapret-discord-youtube-${{ github.event.inputs.tag }}"
-          sha256sum "${NAME}.zip" "${NAME}.rar"
+
+          sha256sum \
+            "${NAME}.zip" \
+            "${NAME}.rar" \
+            "${NAME}.tar.gz"
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
@@ -47,3 +74,4 @@ jobs:
           files: |
             zapret-discord-youtube-${{ github.event.inputs.tag }}.zip
             zapret-discord-youtube-${{ github.event.inputs.tag }}.rar
+            zapret-discord-youtube-${{ github.event.inputs.tag }}.tar.gz

.service/hosts

@@ -1,3 +1,10 @@
+185.199.109.133 objects.githubusercontent.com
+185.199.109.133 raw.githubusercontent.com
+185.199.109.133 release-assets.githubusercontent.com
+185.199.108.133 private-user-images.githubusercontent.com
+185.199.108.133 gist.githubusercontent.com
+185.199.108.133 avatars.githubusercontent.com
+
 149.154.167.220 my.telegram.org
 149.154.167.220 oauth.telegram.org
 149.154.167.220 cdn.telesco.pe
@@ -30,12 +37,6 @@
 149.154.167.220 zws2.web.telegram.org
 149.154.167.220 zws4-1.web.telegram.org
 
-185.199.109.133 raw.githubusercontent.com
-185.199.109.133 release-assets.githubusercontent.com
-185.199.108.133 private-user-images.githubusercontent.com
-185.199.108.133 gist.githubusercontent.com
-185.199.108.133 avatars.githubusercontent.com
-
 104.25.158.178 finland10000.discord.media
 104.25.158.178 finland10001.discord.media
 104.25.158.178 finland10002.discord.media

.service/version.txt

@@ -1 +1 @@
-1.9.9a
+1.9.9d

lists/list-exclude.txt

@@ -1,29 +1,47 @@
 pusher.com
-live-video.net
-ttvnw.net
 twitch.tv
 mail.ru
 citilink.ru
 yandex.com
+yandex.net
+yandex.org
+yandex.md
+yandex.ru
+yandexadexchange.net
+yandexcloud.net
+yandexcom.net
+yandexmetrica.com
+yandexwebcache.net
+yandexwebcache.org
+yastat.net
+yastatic-net.ru
+yastatic.net
+ya.ru
+adfox.ru
+admetrica.ru
+naydex.net
+rostaxi.org
+turbopages.org
+webvisor.com
+webvisor.org
 nvidia.com
 donationalerts.com
 vk.com
 yandex.kz
 mts.ru
 multimc.org
-ya.ru
 dns-shop.ru
 habr.com
 3dnews.ru
 microsoft.com
 microsoftonline.com
 live.com
+sharepoint.com
 minecraft.net
 xboxlive.com
 akamaitechnologies.com
 msi.com
 2ip.ru
-yandex.ru
 boosty.to
 tanki.su
 lesta.ru
@@ -45,7 +63,6 @@ gov.ru
 nalog.ru
 spb.ru
 mos.ru
-yandex.net
 vk.ru
 vk.me
 vkvideo.ru
@@ -88,6 +105,7 @@ sberbank.ru
 cdn-tinkoff.ru
 tbank-online.com
 tbank.ru
+t-bank-app.ru
 tochka-tech.com
 tochka.com
 vtb.ru

lists/list-general.txt

@@ -47,3 +47,4 @@ betterttv.net
 7tv.io
 localizeapi.com
 klipy.com
+live-video.net

lists/list-google.txt

@@ -10,9 +10,11 @@ youtube-ui.l.google.com
 youtube.com
 youtubeembeddedplayer.googleapis.com
 youtubekids.com
+youtube.googleapis.com
 youtubei.googleapis.com
 youtu.be
 yt-video-upload.l.google.com
 ytimg.com
 ytimg.l.google.com
 play.google.com
+google.ru

service.bat

@@ -1,5 +1,5 @@
 @echo off
-set "LOCAL_VERSION=1.9.9a"
+set "LOCAL_VERSION=1.9.9d"
 
 :: External commands
 if "%~1"=="status_zapret" (
@@ -53,8 +53,11 @@ if "%1"=="admin" (
 
 :: MENU ================================
 setlocal EnableDelayedExpansion
+title ZAPRET SERVICE MANAGER v!LOCAL_VERSION!
 :menu
+
 cls
+
 call :ipset_switch_status
 call :game_switch_status
 call :check_updates_switch_status
@@ -115,7 +118,8 @@ if not exist "%LISTS_PATH%ipset-exclude-user.txt" (
     echo 203.0.113.113/32>"%LISTS_PATH%ipset-exclude-user.txt"
 )
 if not exist "%LISTS_PATH%list-general-user.txt" (
-    echo domain.example.abc>"%LISTS_PATH%list-general-user.txt"
+    echo # Never leave this file empty>"%LISTS_PATH%list-general-user.txt"
+    echo domain.example.abc>>"%LISTS_PATH%list-general-user.txt"
 )
 if not exist "%LISTS_PATH%list-exclude-user.txt" (
     echo domain.example.abc>"%LISTS_PATH%list-exclude-user.txt"
@@ -234,16 +238,22 @@ echo Pick one of the options:
 set "count=0"
 for /f "delims=" %%F in ('powershell -NoProfile -Command "Get-ChildItem -LiteralPath '.' -Filter '*.bat' | Where-Object { $_.Name -notlike 'service*' } | Sort-Object { [Regex]::Replace($_.Name, '(\d+)', { $args[0].Value.PadLeft(8, '0') }) } | ForEach-Object { $_.Name }"') do (
     set /a count+=1
-    echo !count!. %%F
+    echo   !count!. %%F
     set "file!count!=%%F"
 )
 
+echo   0. Exit
+
+echo.
+
 :: Choosing file
 set "choice="
-set /p "choice=Input file index (number): "
+set /p "choice=Input option (0-!count!, default: 0): "
 if "!choice!"=="" (
-    echo The choice is empty, exiting...
-    pause
+    set "choice=0"
+)
+
+if "!choice!"=="0" (
     goto menu
 )
 
@@ -819,7 +829,7 @@ for /f %%i in ('type "%listFile%" 2^>nul ^| find /c /v ""') do set "lineCount=%%
 if !lineCount!==0 (
     set "IPsetStatus=any"
 ) else (
-    findstr /R "^203\.0\.113\.113/32$" "%listFile%" >nul
+    findstr /C:"203.0.113.113/32" "%listFile%" >nul
     if !errorlevel!==0 (
         set "IPsetStatus=none"
     ) else (

utils/test zapret.ps1

@@ -838,13 +838,18 @@ try {
 
     Write-Host ""
     Write-Host "=== ANALYTICS ===" -ForegroundColor Cyan
+    $maxConfigLen = ($analytics.Keys | ForEach-Object { $_.Length } | Measure-Object -Maximum).Maximum
     foreach ($config in $analytics.Keys) {
         $a = $analytics[$config]
+        $configPadded = $config.PadRight($maxConfigLen)
         if ($a.ContainsKey('PingOK')) {
-            Write-Host "$config : HTTP OK: $($a.OK), ERR: $($a.ERROR), UNSUP: $($a.UNSUP), Ping OK: $($a.PingOK), Fail: $($a.PingFail)" -ForegroundColor Yellow
+            $line = "{0} : HTTP OK: {1,3}, ERR: {2,3}, UNSUP: {3,3}, Ping OK: {4,3}, Fail: {5,3}" -f `
+                $configPadded, $a.OK, $a.ERROR, $a.UNSUP, $a.PingOK, $a.PingFail
         } else {
-            Write-Host "$config : OK: $($a.OK), FAIL: $($a.FAIL), UNSUP: $($a.UNSUPPORTED), BLOCKED: $($a.LIKELY_BLOCKED)" -ForegroundColor Yellow
+            $line = "{0} : OK: {1,3}, FAIL: {2,3}, UNSUP: {3,3}, BLOCKED: {4,3}" -f `
+                $configPadded, $a.OK, $a.FAIL, $a.UNSUPPORTED, $a.LIKELY_BLOCKED
         }
+        Write-Host $line -ForegroundColor Yellow
     }
 
     # Determine best strategy
@@ -916,13 +921,18 @@ try {
 
     # Add analytics
     Add-Content $resultFile "=== ANALYTICS ==="
+    $maxConfigLen = ($analytics.Keys | ForEach-Object { $_.Length } | Measure-Object -Maximum).Maximum
     foreach ($config in $analytics.Keys) {
         $a = $analytics[$config]
+        $configPadded = $config.PadRight($maxConfigLen)
         if ($a.ContainsKey('PingOK')) {
-            Add-Content $resultFile "$config : HTTP OK: $($a.OK), ERR: $($a.ERROR), UNSUP: $($a.UNSUP), Ping OK: $($a.PingOK), Fail: $($a.PingFail)"
+            $line = "{0} : HTTP OK: {1,3}, ERR: {2,3}, UNSUP: {3,3}, Ping OK: {4,3}, Fail: {5,3}" -f `
+                $configPadded, $a.OK, $a.ERROR, $a.UNSUP, $a.PingOK, $a.PingFail
         } else {
-            Add-Content $resultFile "$config : OK: $($a.OK), FAIL: $($a.FAIL), UNSUP: $($a.UNSUPPORTED), BLOCKED: $($a.LIKELY_BLOCKED)"
+            $line = "{0} : OK: {1,3}, FAIL: {2,3}, UNSUP: {3,3}, BLOCKED: {4,3}" -f `
+                $configPadded, $a.OK, $a.FAIL, $a.UNSUPPORTED, $a.LIKELY_BLOCKED
         }
+        Add-Content $resultFile $line
     }
 
     Add-Content $resultFile "Best strategy: $bestConfig"