Version bump

Small service fixes
Services merge
2025-12-12 14:29:54 +05:00 · 2025-04-30 13:45:46 +03:00 · 2025-04-30 13:45:31 +03:00 · 2025-04-30 13:41:12 +03:00 · 2025-04-26 21:01:41 +03:00 · 2025-04-26 21:00:09 +03:00
27 changed files with 755 additions and 1087 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,60 @@
+name: 🐛 Проблема
+title: '[Проблема] '
+description: Сообщить о проблеме
+labels: ['type: проблема', 'status: нуждается в сортировке']
+
+body:
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: ⚠️ Чеклист
+      description: Перед созданием нового Issue, удостоверьтесь что выполнили следующие пункты
+      options:
+        - label: Я искал решение проблемы в [README](https://github.com/Flowseal/zapret-discord-youtube/blob/main/README.md) и среди [Issues](https://github.com/Flowseal/zapret-discord-youtube/issues)
+        - label: Я скачал ``zapret-discord-youtube`` из [релизов официального репозитория](https://github.com/Flowseal/zapret-discord-youtube/releases)
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Опишите вашу проблему
+      description: Чётко опишите проблему с которой вы столкнулись
+      placeholder: Описание проблемы
+    validations:
+      required: true
+
+  - type: textarea
+    id: version
+    attributes:
+      label: Версия zapret-discord-youtube
+      description: Версия zapret-discord-youtube на которой вы словили проблему
+      placeholder: Версия
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Шаги воспроизведения проблемы
+      description: Шаги по воспроизведению поведения (вашей проблемы).
+      placeholder: |
+        Напишите здесь шаги, с помощью которых можно повторить вашу проблему
+        на других компьютерах
+
+  - type: textarea
+    id: bat-name
+    attributes:
+      label: Какой .bat файл вы используете?
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-bat
+    attributes:
+      label: Использовали ли вы другие .bat?
+      description: Пробовали ли вы использовать другой .bat для устранения проблемы? Если использовали, то какие?
+
+  - type: textarea
+    id: additions
+    attributes:
+      label: Дополнительные детали
+      description: Дополнительные детали о которых нам нужно знать
--- a/.service/version.txt
+++ b/.service/version.txt
@@ -1 +1 @@
-1.6.4
+1.7.2
--- a/README.md
+++ b/README.md
@@ -37,6 +37,8 @@

 - [**`general.bat`**](./general.bat) - запуск со стратегией для обхода блокировок <img src="https://cdn-icons-png.flaticon.com/128/5968/5968756.png" height=15 /> Discord и <img src="https://cdn-icons-png.flaticon.com/128/1384/1384060.png" height=12 /> YouTube

+- [**`cloudflare_switch.bat`**](./cloudflare_switch.bat) - включение/выключение обхода Cloudflare *(на деле перетирает список `ipset-cloudflare`, перезапуск после изменения не нужен)*
+
 - [**`service_install.bat`**](./service_install.bat) - установка на автозапуск (как службы Windows: `zapret`, `WinDivert`), можно выбрать любую стратегию (название файла стратегии **НЕ** должно начинаться со слова `service`)

 - [**`service_remove.bat`**](./service_remove.bat) - остановка и удаление служб `zapret` и `WinDivert`
--- a/bin/tls_clienthello_www_google_com.bin
+++ b/bin/tls_clienthello_www_google_com.bin
--- a/bin/winws.exe
+++ b/bin/winws.exe
--- a/check_updates.bat
+++ b/check_updates.bat
@@ -1,37 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-chcp 437 > nul
-
-:: Set current version and URLs
-set "LOCAL_VERSION=1.6.4"
-set "GITHUB_VERSION_URL=https://raw.githubusercontent.com/Flowseal/zapret-discord-youtube/main/.service/version.txt"
-set "GITHUB_RELEASE_URL=https://github.com/Flowseal/zapret-discord-youtube/releases/tag/"
-set "GITHUB_DOWNLOAD_URL=https://github.com/Flowseal/zapret-discord-youtube/releases/latest/download/zapret-discord-youtube-"
-
-:: Get the latest version from GitHub
-for /f "delims=" %%A in ('powershell -command "(Invoke-WebRequest -Uri \"%GITHUB_VERSION_URL%\" -Headers @{\"Cache-Control\"=\"no-cache\"} -TimeoutSec 5).Content.Trim()" 2^>nul') do set "GITHUB_VERSION=%%A"
-
-:: Error handling
-if not defined GITHUB_VERSION (
-    echo Error: Failed to fetch the latest version. Check your internet connection
-    goto :EOF
-)
-
-:: Version comparison
-if "%LOCAL_VERSION%"=="%GITHUB_VERSION%" (
-    echo Latest version installed: %LOCAL_VERSION%
-) else (
-    echo New version available: %GITHUB_VERSION%
-    echo Release page: %GITHUB_RELEASE_URL%%GITHUB_VERSION%
-    
-    set /p "CHOICE=Do you want to automatically download the new version? (y/n, default: y): "
-
-    if "!CHOICE!"=="" set "CHOICE=y"
-
-    if /i "!CHOICE!"=="y" (
-        echo Opening the download page...
-        start "" "%GITHUB_DOWNLOAD_URL%%GITHUB_VERSION%.rar"
-    )
-)
-if not "%1"=="soft" pause
-endlocal
--- a/cloudflare_switch.bat
+++ b/cloudflare_switch.bat
@@ -0,0 +1,50 @@
+@echo off
+chcp 65001 > nul
+:: 65001 - UTF-8
+
+:: Admin rights check
+if "%1"=="admin" (
+    echo Started with admin rights
+) else (
+    echo Requesting admin rights...
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c \"\"%~f0\" admin\"' -Verb RunAs"
+    exit /b
+)
+
+set "LISTS=%~dp0lists\"
+set "FILE=%LISTS%ipset-cloudflare.txt"
+
+if not exist "%FILE%" (
+    echo Error! ipset-cloudflare.txt not found, path: %FILE%
+    goto :eof
+)
+
+findstr /C:"0.0.0.0" "%FILE%" >nul
+if %ERRORLEVEL%==0 (
+    echo Enabling cloudflare bypass...
+    >"%FILE%" (
+        echo 173.245.48.0/20
+        echo 103.21.244.0/22
+        echo 103.22.200.0/22
+        echo 103.31.4.0/22
+        echo 141.101.64.0/18
+        echo 108.162.192.0/18
+        echo 190.93.240.0/20
+        echo 188.114.96.0/20
+        echo 197.234.240.0/22
+        echo 198.41.128.0/17
+        echo 162.158.0.0/15
+        echo 104.16.0.0/13
+        echo 104.24.0.0/14
+        echo 172.64.0.0/13
+        echo 131.0.72.0/22
+    )
+) else (
+    echo Disabling cloudflare bypass...
+    >"%FILE%" (
+        echo 0.0.0.0/32
+    )
+)
+
+echo Done.
+pause
--- a/discord.bat
+++ b/discord.bat
@@ -3,13 +3,14 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

 start "zapret: discord" /min "%BIN%winws.exe" --wf-tcp=443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-discord.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=443 --hostlist="list-discord.txt" --dpi-desync=fake,split --dpi-desync-autottl=2 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
+--filter-udp=443 --hostlist="%LISTS%list-discord.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-discord.txt" --dpi-desync=split --dpi-desync-split-pos=1 --dpi-desync-autottl --dpi-desync-fooling=badseq --dpi-desync-repeats=8
--- a/(ALT).bat
+++ b/(ALT).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=fake,split --dpi-desync-autottl=5 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
+start "zapret: general (ALT)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split --dpi-desync-autottl=5 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin" --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split --dpi-desync-autottl=5 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
--- a/(ALT2).bat
+++ b/(ALT2).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=split2 --dpi-desync-split-seqovl=652 --dpi-desync-split-pos=2 --dpi-desync-split-seqovl-pattern="%BIN%tls_clienthello_www_google_com.bin"
+start "zapret: general (ALT2)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=split2 --dpi-desync-split-seqovl=652 --dpi-desync-split-pos=2 --dpi-desync-split-seqovl-pattern="%BIN%tls_clienthello_www_google_com.bin" --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=split2 --dpi-desync-split-seqovl=652 --dpi-desync-split-pos=2 --dpi-desync-split-seqovl-pattern="%BIN%tls_clienthello_www_google_com.bin"
--- a/(ALT3).bat
+++ b/(ALT3).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=split --dpi-desync-split-pos=1 --dpi-desync-autottl --dpi-desync-fooling=badseq --dpi-desync-repeats=8
+start "zapret: general (ALT3)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=split --dpi-desync-split-pos=1 --dpi-desync-autottl --dpi-desync-fooling=badseq --dpi-desync-repeats=8 --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=split --dpi-desync-split-pos=1 --dpi-desync-autottl --dpi-desync-fooling=badseq --dpi-desync-repeats=8
--- a/(ALT4).bat
+++ b/(ALT4).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=8 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
+start "zapret: general (ALT4)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin" --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
--- a/(ALT5).bat
+++ b/(ALT5).bat
@@ -4,14 +4,17 @@ chcp 65001 > nul
 :: NOT RECOMMENDED

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-l3=ipv4 --filter-tcp=443 --dpi-desync=syndata
+start "zapret: general (ALT5)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-l3=ipv4 --filter-tcp=443 --dpi-desync=syndata --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--- a/ALT).bat
+++ b/ALT).bat
@@ -0,0 +1,20 @@
+@echo off
+chcp 65001 > nul
+:: 65001 - UTF-8
+
+cd /d "%~dp0"
+call service.bat status_zapret
+call service.bat check_updates
+echo:
+
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"
+
+start "zapret: general (FAKE TLS MOD ALT)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-fooling=md5sig --dpi-desync-fake-tls-mod=rnd,rndsni,padencap --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-fooling=md5sig --dpi-desync-fake-tls-mod=rnd,rndsni,padencap
--- a/AUTO).bat
+++ b/AUTO).bat
@@ -0,0 +1,20 @@
+@echo off
+chcp 65001 > nul
+:: 65001 - UTF-8
+
+cd /d "%~dp0"
+call service.bat status_zapret
+call service.bat check_updates
+echo:
+
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"
+
+start "zapret: general (FAKE TLS MOD AUTO)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,fakedsplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=11 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,fakedsplit --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,multidisorder --dpi-desync-split-pos=1,midsld --dpi-desync-repeats=11 --dpi-desync-fooling=md5sig
--- a/MOD).bat
+++ b/MOD).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=8 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d4 --dpi-desync-repeats=8 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=3 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-ttl=4 --dpi-desync-fake-tls-mod=rnd,rndsni,padencap
+start "zapret: general (FAKE TLS MOD)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=8 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=3 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-ttl=4 --dpi-desync-fake-tls-mod=rnd,rndsni,padencap --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=8 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=3 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-ttl=4 --dpi-desync-fake-tls-mod=rnd,rndsni,padencap
--- a/(МГТС).bat
+++ b/(МГТС).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-autottl=2 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
+start "zapret: general (MGTS)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-autottl=2 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin" --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-autottl=2 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
--- a/(МГТС2).bat
+++ b/(МГТС2).bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

-start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
+start "zapret: general (MGTS2)" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin" --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
--- a/general.bat
+++ b/general.bat
@@ -3,14 +3,18 @@ chcp 65001 > nul
 :: 65001 - UTF-8

 cd /d "%~dp0"
-call service_status.bat zapret
-call check_updates.bat soft
+call service.bat status_zapret
+call service.bat check_updates
 echo:

-set BIN=%~dp0bin\
+set "BIN=%~dp0bin\"
+set "LISTS=%~dp0lists\"

 start "zapret: general" /min "%BIN%winws.exe" --wf-tcp=80,443 --wf-udp=443,50000-50100 ^
--filter-udp=443 --hostlist="list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
--filter-udp=50000-50100 --ipset="ipset-discord.txt" --dpi-desync=fake --dpi-desync-any-protocol --dpi-desync-cutoff=d3 --dpi-desync-repeats=6 --new ^
--filter-tcp=80 --hostlist="list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
--filter-tcp=443 --hostlist="list-general.txt" --dpi-desync=fake,split --dpi-desync-autottl=2 --dpi-desync-repeats=6 --dpi-desync-fooling=badseq --dpi-desync-fake-tls="%BIN%tls_clienthello_www_google_com.bin"
+--filter-udp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-udp=50000-50100 --filter-l7=discord,stun --dpi-desync=fake --dpi-desync-repeats=6 --new ^
+--filter-tcp=80 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --hostlist="%LISTS%list-general.txt" --dpi-desync=fake,multidisorder --dpi-desync-split-pos=midsld --dpi-desync-repeats=8 --dpi-desync-fooling=md5sig,badseq --new ^
+--filter-udp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake --dpi-desync-repeats=6 --dpi-desync-fake-quic="%BIN%quic_initial_www_google_com.bin" --new ^
+--filter-tcp=80 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,split2 --dpi-desync-autottl=2 --dpi-desync-fooling=md5sig --new ^
+--filter-tcp=443 --ipset="%LISTS%ipset-cloudflare.txt" --dpi-desync=fake,multidisorder --dpi-desync-split-pos=midsld --dpi-desync-repeats=6 --dpi-desync-fooling=md5sig,badseq
--- a/ipset-discord.txt
+++ b/ipset-discord.txt
@@ -1,722 +0,0 @@
-5.200.14.249
-18.165.140.0/25
-23.227.38.74
-34.0.48.0/24
-34.0.49.64/26
-34.0.50.0/25
-34.0.51.0/24
-34.0.52.0/22
-34.0.56.0/23
-34.0.59.0/24
-34.0.60.0/24
-34.0.62.128/25
-34.0.63.228
-34.0.64.0/23
-34.0.66.130
-34.0.82.140
-34.0.129.128/25
-34.0.130.0/24
-34.0.131.130
-34.0.132.139
-34.0.133.75
-34.0.134.0/24
-34.0.135.251
-34.0.136.51
-34.0.137.0/24
-34.0.139.0/24
-34.0.140.0/23
-34.0.142.0/25
-34.0.144.0/23
-34.0.146.0/24
-34.0.148.25
-34.0.149.101
-34.0.151.0/25
-34.0.153.0/24
-34.0.155.0/24
-34.0.156.101
-34.0.157.0/25
-34.0.158.247
-34.0.159.188
-34.0.192.0/25
-34.0.193.0/24
-34.0.194.0/24
-34.0.195.172
-34.0.196.200/29
-34.0.197.81
-34.0.198.25
-34.0.199.0/24
-34.0.200.0/24
-34.0.201.81
-34.0.202.34
-34.0.203.0/24
-34.0.204.0/23
-34.0.206.0/25
-34.0.207.0/25
-34.0.208.195
-34.0.209.0/24
-34.0.210.20
-34.0.211.0/26
-34.0.212.0/24
-34.0.213.64/26
-34.0.215.128/25
-34.0.216.238
-34.0.217.0/24
-34.0.218.83
-34.0.220.103
-34.0.221.0/24
-34.0.222.193
-34.0.223.68
-34.0.227.0/24
-34.0.240.0/21
-34.0.248.0/23
-34.0.250.0/24
-34.0.251.0/25
-34.1.216.0/24
-34.1.221.166
-35.207.64.0/23
-35.207.67.116
-35.207.71.0/24
-35.207.72.32
-35.207.73.0/24
-35.207.74.0/24
-35.207.75.128/25
-35.207.76.128/26
-35.207.77.0/24
-35.207.78.129
-35.207.79.0/24
-35.207.80.76
-35.207.81.248/30
-35.207.82.0/23
-35.207.84.0/24
-35.207.85.160
-35.207.86.41
-35.207.87.184
-35.207.89.188
-35.207.91.146
-35.207.92.230
-35.207.95.0/24
-35.207.97.174
-35.207.99.134
-35.207.100.64/26
-35.207.101.130
-35.207.103.64/26
-35.207.104.0/24
-35.207.106.128/26
-35.207.107.19
-35.207.108.192/27
-35.207.109.185
-35.207.110.0/24
-35.207.111.174
-35.207.114.16
-35.207.115.163
-35.207.116.51
-35.207.117.0/24
-35.207.121.204
-35.207.122.0/25
-35.207.124.145
-35.207.125.116
-35.207.126.30
-35.207.129.0/24
-35.207.131.128/27
-35.207.132.247
-35.207.135.147
-35.207.136.69
-35.207.137.0/24
-35.207.139.0/24
-35.207.140.241
-35.207.141.119
-35.207.142.0/24
-35.207.143.96/27
-35.207.144.0/25
-35.207.145.0/24
-35.207.146.89
-35.207.147.0/24
-35.207.149.0/24
-35.207.150.0/24
-35.207.151.61
-35.207.153.117
-35.207.154.0/24
-35.207.155.128/25
-35.207.156.254
-35.207.157.7
-35.207.158.192
-35.207.160.160
-35.207.162.239
-35.207.163.0/24
-35.207.164.0/25
-35.207.165.147
-35.207.166.0/25
-35.207.167.0/24
-35.207.168.116
-35.207.170.0/23
-35.207.172.0/24
-35.207.174.55
-35.207.176.128/25
-35.207.178.0/24
-35.207.180.152
-35.207.181.76
-35.207.182.125
-35.207.184.101
-35.207.185.192
-35.207.186.128/25
-35.207.187.228
-35.207.188.0/24
-35.207.189.0/25
-35.207.190.194
-35.207.191.64/26
-35.207.193.165
-35.207.195.75
-35.207.196.0/24
-35.207.198.0/23
-35.207.201.186
-35.207.202.169
-35.207.205.211
-35.207.207.4
-35.207.209.0/25
-35.207.210.191
-35.207.211.253
-35.207.213.97
-35.207.214.0/24
-35.207.220.147
-35.207.221.58
-35.207.222.105
-35.207.224.151
-35.207.225.210
-35.207.227.0/24
-35.207.229.212
-35.207.232.26
-35.207.234.182
-35.207.238.0/24
-35.207.240.0/24
-35.207.245.0/24
-35.207.249.0/24
-35.207.250.212
-35.207.251.0/27
-35.212.4.134
-35.212.12.148
-35.212.88.11
-35.212.102.50
-35.212.111.0/26
-35.212.117.247
-35.212.120.122
-35.213.0.0/24
-35.213.2.8
-35.213.4.185
-35.213.6.118
-35.213.7.128/25
-35.213.8.168
-35.213.10.0/24
-35.213.11.21
-35.213.12.224/27
-35.213.13.19
-35.213.14.217
-35.213.16.67
-35.213.17.235
-35.213.23.166
-35.213.25.164
-35.213.26.62
-35.213.27.252
-35.213.32.0/24
-35.213.33.74
-35.213.34.204
-35.213.37.81
-35.213.38.186
-35.213.39.253
-35.213.42.0/24
-35.213.43.79
-35.213.45.0/24
-35.213.46.136
-35.213.49.17
-35.213.50.0/24
-35.213.51.213
-35.213.52.0/25
-35.213.53.0/24
-35.213.54.0/24
-35.213.56.0/25
-35.213.59.0/24
-35.213.61.58
-35.213.65.0/24
-35.213.67.0/24
-35.213.68.192/26
-35.213.70.151
-35.213.72.128/25
-35.213.73.245
-35.213.74.131
-35.213.78.0/24
-35.213.79.137
-35.213.80.0/25
-35.213.83.128/25
-35.213.84.245
-35.213.85.0/24
-35.213.88.145
-35.213.89.80/28
-35.213.90.0/24
-35.213.91.195
-35.213.92.0/24
-35.213.93.254
-35.213.94.78
-35.213.95.145
-35.213.96.87
-35.213.98.0/24
-35.213.99.126
-35.213.101.214
-35.213.102.0/24
-35.213.105.0/24
-35.213.106.128/25
-35.213.107.158
-35.213.109.0/24
-35.213.110.40
-35.213.111.0/25
-35.213.115.0/25
-35.213.120.0/24
-35.213.122.0/24
-35.213.124.89
-35.213.125.40
-35.213.126.185
-35.213.127.0/24
-35.213.128.0/22
-35.213.132.0/23
-35.213.134.140
-35.213.135.0/24
-35.213.136.0/23
-35.213.138.128/25
-35.213.139.0/24
-35.213.140.0/25
-35.213.141.164
-35.213.142.128/25
-35.213.143.0/24
-35.213.144.0/22
-35.213.148.0/23
-35.213.150.0/24
-35.213.152.0/23
-35.213.154.137
-35.213.155.134
-35.213.156.144
-35.213.157.0/24
-35.213.158.64/26
-35.213.160.90
-35.213.161.253
-35.213.162.0/25
-35.213.163.0/24
-35.213.164.0/23
-35.213.166.106
-35.213.167.160/27
-35.213.168.0/24
-35.213.169.179
-35.213.170.0/24
-35.213.171.201
-35.213.172.159
-35.213.173.0/24
-35.213.174.128/25
-35.213.175.128/26
-35.213.176.0/24
-35.213.177.0/25
-35.213.179.139
-35.213.180.0/24
-35.213.181.0/25
-35.213.182.0/23
-35.213.184.0/23
-35.213.186.70
-35.213.187.0/24
-35.213.188.128/25
-35.213.190.158
-35.213.191.0/24
-35.213.192.240/31
-35.213.193.74
-35.213.194.0/25
-35.213.195.178
-35.213.196.38
-35.213.197.68
-35.213.198.0/23
-35.213.200.0/23
-35.213.202.0/25
-35.213.203.195
-35.213.204.32/27
-35.213.205.170
-35.213.207.128/25
-35.213.208.85
-35.213.210.0/24
-35.213.211.176/29
-35.213.212.0/24
-35.213.213.225
-35.213.214.0/25
-35.213.215.255
-35.213.217.0/24
-35.213.218.248
-35.213.219.0/25
-35.213.220.211
-35.213.221.0/24
-35.213.222.215
-35.213.223.0/24
-35.213.225.0/24
-35.213.227.227
-35.213.229.17
-35.213.230.89
-35.213.231.0/24
-35.213.233.0/24
-35.213.234.134
-35.213.236.0/24
-35.213.237.212
-35.213.238.0/24
-35.213.240.212
-35.213.241.0/24
-35.213.242.10
-35.213.243.219
-35.213.244.146
-35.213.245.119
-35.213.246.0/23
-35.213.249.79
-35.213.250.0/24
-35.213.251.74
-35.213.252.0/24
-35.213.253.155
-35.213.254.89
-35.214.128.248
-35.214.129.220
-35.214.130.217
-35.214.131.144
-35.214.132.189
-35.214.133.0/24
-35.214.134.163
-35.214.137.0/24
-35.214.138.0/25
-35.214.140.0/24
-35.214.142.0/24
-35.214.143.41
-35.214.144.26
-35.214.145.200
-35.214.146.9
-35.214.147.135
-35.214.148.89
-35.214.149.110
-35.214.151.128/25
-35.214.152.0/24
-35.214.156.115
-35.214.158.181
-35.214.159.128/25
-35.214.160.128/25
-35.214.161.217
-35.214.162.0/24
-35.214.163.28
-35.214.165.102
-35.214.167.77
-35.214.169.0/24
-35.214.170.2
-35.214.171.0/25
-35.214.172.128/25
-35.214.173.0/24
-35.214.175.0/24
-35.214.177.183
-35.214.179.46
-35.214.180.0/23
-35.214.184.179
-35.214.185.28
-35.214.186.3
-35.214.187.0/24
-35.214.191.0/24
-35.214.192.128/25
-35.214.193.0/24
-35.214.194.128/25
-35.214.195.0/25
-35.214.196.64/26
-35.214.197.0/24
-35.214.198.7
-35.214.199.224
-35.214.201.0/25
-35.214.203.155
-35.214.204.0/23
-35.214.207.0/24
-35.214.208.128/25
-35.214.209.64
-35.214.210.0/24
-35.214.211.3
-35.214.212.64/26
-35.214.213.0/25
-35.214.214.0/24
-35.214.215.64/26
-35.214.216.0/23
-35.214.218.140
-35.214.219.0/24
-35.214.220.149
-35.214.221.0/24
-35.214.222.149
-35.214.223.0/24
-35.214.224.71
-35.214.225.0/24
-35.214.226.0/23
-35.214.228.0/23
-35.214.231.187
-35.214.233.8
-35.214.235.38
-35.214.237.0/24
-35.214.238.0/25
-35.214.239.0/24
-35.214.240.87
-35.214.241.0/24
-35.214.243.21
-35.214.244.0/24
-35.214.245.16/28
-35.214.246.106
-35.214.248.119
-35.214.249.154
-35.214.250.0/24
-35.214.251.128/25
-35.214.252.187
-35.214.253.0/24
-35.214.255.154
-35.215.72.85
-35.215.73.65
-35.215.83.0
-35.215.108.111
-35.215.115.120
-35.215.126.35
-35.215.127.34
-35.215.128.0/21
-35.215.136.0/26
-35.215.137.0/24
-35.215.138.0/23
-35.215.140.0/24
-35.215.141.64/27
-35.215.142.0/24
-35.215.143.83
-35.215.144.128/25
-35.215.145.0/24
-35.215.146.0/24
-35.215.147.86
-35.215.148.0/23
-35.215.150.0/26
-35.215.151.0/24
-35.215.152.0/24
-35.215.153.128/25
-35.215.154.240/28
-35.215.155.20
-35.215.156.0/24
-35.215.158.0/23
-35.215.160.192/26
-35.215.161.0/24
-35.215.163.0/24
-35.215.164.0/24
-35.215.165.236
-35.215.166.128/25
-35.215.167.128/25
-35.215.168.0/24
-35.215.169.12
-35.215.170.0/23
-35.215.172.0/22
-35.215.176.0/24
-35.215.177.72
-35.215.178.0/24
-35.215.179.161
-35.215.180.0/22
-35.215.184.253
-35.215.185.64/26
-35.215.186.0/25
-35.215.187.0/24
-35.215.188.0/23
-35.215.190.0/24
-35.215.191.61
-35.215.192.0/23
-35.215.194.192/28
-35.215.195.0/24
-35.215.196.0/25
-35.215.197.0/25
-35.215.198.230
-35.215.199.204
-35.215.200.0/23
-35.215.202.0/24
-35.215.203.0/25
-35.215.204.128/25
-35.215.205.0/25
-35.215.206.0/23
-35.215.208.0/24
-35.215.209.0/25
-35.215.210.0/23
-35.215.212.0/22
-35.215.216.0/22
-35.215.221.0/24
-35.215.222.128/25
-35.215.223.126
-35.215.224.0/23
-35.215.226.0/24
-35.215.227.0/25
-35.215.228.0/24
-35.215.229.64
-35.215.230.89
-35.215.231.0/24
-35.215.232.0/24
-35.215.233.0/25
-35.215.234.37
-35.215.235.0/24
-35.215.238.0/25
-35.215.239.119
-35.215.240.0/24
-35.215.241.128/25
-35.215.242.0/25
-35.215.243.0/24
-35.215.244.0/23
-35.215.246.222
-35.215.247.0/24
-35.215.248.0/22
-35.215.252.0/24
-35.215.253.118
-35.215.254.0/23
-35.217.0.0/24
-35.217.1.64/26
-35.217.2.5
-35.217.3.0/24
-35.217.4.72
-35.217.5.0/25
-35.217.6.0/24
-35.217.8.0/25
-35.217.9.0/24
-35.217.11.186
-35.217.12.0/24
-35.217.14.192/26
-35.217.15.65
-35.217.16.75
-35.217.17.128/25
-35.217.18.0/24
-35.217.19.183
-35.217.20.0/24
-35.217.21.128/25
-35.217.22.128/25
-35.217.23.128/25
-35.217.24.0/24
-35.217.25.81
-35.217.26.0/24
-35.217.27.128/25
-35.217.28.128/25
-35.217.29.0/24
-35.217.30.0/25
-35.217.31.0/25
-35.217.32.128/25
-35.217.33.0/24
-35.217.35.128/25
-35.217.36.0/23
-35.217.38.179
-35.217.39.186
-35.217.40.176
-35.217.41.204
-35.217.43.0/24
-35.217.45.248
-35.217.46.0/24
-35.217.47.128/25
-35.217.48.195
-35.217.49.160/27
-35.217.50.0/25
-35.217.51.0/24
-35.217.52.117
-35.217.53.128/25
-35.217.54.0/25
-35.217.55.96/27
-35.217.56.6
-35.217.57.184
-35.217.58.0/24
-35.217.59.64/26
-35.217.60.0/24
-35.217.61.128/25
-35.217.62.0/24
-35.217.63.128/25
-35.219.225.149
-35.219.226.57
-35.219.227.0/24
-35.219.228.37
-35.219.229.128/25
-35.219.230.0/23
-35.219.235.0/24
-35.219.236.198
-35.219.238.115
-35.219.239.0/24
-35.219.241.0/24
-35.219.242.221
-35.219.243.191
-35.219.244.1
-35.219.245.0/24
-35.219.246.159
-35.219.247.0/26
-35.219.248.0/24
-35.219.249.126
-35.219.251.186
-35.219.252.0/23
-35.219.254.0/24
-64.233.161.207
-64.233.162.207
-64.233.163.207
-64.233.164.207
-64.233.165.207
-66.22.196.0/26
-66.22.197.0/24
-66.22.198.0/26
-66.22.199.0/24
-66.22.200.0/26
-66.22.202.0/26
-66.22.204.0/24
-66.22.206.0/24
-66.22.208.0/25
-66.22.210.0/26
-66.22.212.0/24
-66.22.214.0/24
-66.22.216.0/23
-66.22.220.0/25
-66.22.221.0/24
-66.22.222.0/23
-66.22.224.0/25
-66.22.225.0/26
-66.22.226.0/25
-66.22.227.0/25
-66.22.228.0/22
-66.22.233.0/24
-66.22.234.0/24
-66.22.236.0/23
-66.22.238.0/24
-66.22.240.0/22
-66.22.244.0/23
-66.22.248.0/24
-74.125.131.207
-74.125.205.207
-104.17.51.93
-104.17.117.93
-104.18.4.161
-104.18.5.161
-104.18.8.105
-104.18.9.105
-104.18.30.128
-104.18.31.128
-104.21.2.204
-104.21.25.51
-104.21.40.151
-104.21.59.128
-104.21.72.221
-104.21.82.160
-108.177.14.207
-138.128.140.240/28
-142.250.150.207
-142.251.1.207
-162.159.128.232/30
-162.159.129.232/30
-162.159.130.232/30
-162.159.133.232/30
-162.159.134.232/30
-162.159.135.232/30
-162.159.136.232/30
-162.159.137.232/30
-162.159.138.232/30
-172.65.202.19
-172.66.41.34
-172.66.42.222
-172.67.152.224/28
-172.67.155.163
-172.67.159.89
-172.67.177.131
-172.67.222.182
-173.194.73.207
-173.194.220.207
-173.194.221.207
-173.194.222.207
-188.114.96.2
-188.114.97.2
-188.114.98.224
-188.114.99.224
-204.11.56.48
-209.85.233.207
-34.126.226.51
--- a/lists/ipset-cloudflare.txt
+++ b/lists/ipset-cloudflare.txt
@@ -0,0 +1,15 @@
+173.245.48.0/20
+103.21.244.0/22
+103.22.200.0/22
+103.31.4.0/22
+141.101.64.0/18
+108.162.192.0/18
+190.93.240.0/20
+188.114.96.0/20
+197.234.240.0/22
+198.41.128.0/17
+162.158.0.0/15
+104.16.0.0/13
+104.24.0.0/14
+172.64.0.0/13
+131.0.72.0/22
--- a/lists/list-discord.txt
+++ b/lists/list-discord.txt
@@ -1,25 +1,25 @@
-cloudflare-ech.com
-dis.gd
-discord-attachments-uploads-prd.storage.googleapis.com
-discord.app
-discord.co
-discord.com
-discord.design
-discord.dev
-discord.gift
-discord.gifts
-discord.gg
-discord.media
-discord.new
-discord.status
-discord.store
-discordapp.com
-discordapp.net
-discordcdn.com
-discordmerch.com
-discordpartygames.com
-discordsays.com
-discordsez.com
-discord-activities.com
-discordactivities.com
-stable.dl2.discordapp.net
+cloudflare-ech.com
+dis.gd
+discord-attachments-uploads-prd.storage.googleapis.com
+discord.app
+discord.co
+discord.com
+discord.design
+discord.dev
+discord.gift
+discord.gifts
+discord.gg
+discord.media
+discord.new
+discord.status
+discord.store
+discordapp.com
+discordapp.net
+discordcdn.com
+discordmerch.com
+discordpartygames.com
+discordsays.com
+discordsez.com
+discord-activities.com
+discordactivities.com
+stable.dl2.discordapp.net
--- a/lists/list-general.txt
+++ b/lists/list-general.txt
@@ -1,45 +1,44 @@
-10tv.app
-7tv.app
-7tv.io
-cloudflare-ech.com
-dis.gd
-discord-attachments-uploads-prd.storage.googleapis.com
-discord.app
-discord.co
-discord.com
-discord.design
-discord.dev
-discord.gift
-discord.gifts
-discord.gg
-discord.media
-discord.new
-discord.store
-discord.status
-discord-activities.com
-discordactivities.com
-discordapp.com
-discordapp.net
-discordcdn.com
-discordmerch.com
-discordpartygames.com
-discordsays.com
-discordsez.com
-ggpht.com
-googlevideo.com
-jnn-pa.googleapis.com
-stable.dl2.discordapp.net
-wide-youtube.l.google.com
-youtube-nocookie.com
-youtube-ui.l.google.com
-youtube.com
-youtubeembeddedplayer.googleapis.com
-youtubekids.com
-youtubei.googleapis.com
-youtu.be
-yt-video-upload.l.google.com
-ytimg.com
-ytimg.l.google.com
-frankerfacez.com
-betterttv.net
-betterttv.com
+cloudflare-ech.com
+dis.gd
+discord-attachments-uploads-prd.storage.googleapis.com
+discord.app
+discord.co
+discord.com
+discord.design
+discord.dev
+discord.gift
+discord.gifts
+discord.gg
+discord.media
+discord.new
+discord.store
+discord.status
+discord-activities.com
+discordactivities.com
+discordapp.com
+discordapp.net
+discordcdn.com
+discordmerch.com
+discordpartygames.com
+discordsays.com
+discordsez.com
+ggpht.com
+googlevideo.com
+jnn-pa.googleapis.com
+stable.dl2.discordapp.net
+wide-youtube.l.google.com
+youtube-nocookie.com
+youtube-ui.l.google.com
+youtube.com
+youtubeembeddedplayer.googleapis.com
+youtubekids.com
+youtubei.googleapis.com
+youtu.be
+yt-video-upload.l.google.com
+ytimg.com
+ytimg.l.google.com
+frankerfacez.com
+ffzap.com
+betterttv.net
+7tv.app
+7tv.io
--- a/service.bat
+++ b/service.bat
@@ -0,0 +1,405 @@
+@echo off
+setlocal EnableDelayedExpansion
+set "LOCAL_VERSION=1.7.2"
+
+:: External commands
+if "%~1"=="status_zapret" (
+    call :test_service zapret soft
+    exit /b
+)
+
+if "%~1"=="check_updates" (
+    call :service_check_updates soft
+    exit /b
+)
+
+if "%1"=="admin" (
+    echo Started with admin rights
+) else (
+    echo Requesting admin rights...
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c \"\"%~f0\" admin\"' -Verb RunAs"
+    exit /b
+)
+
+
+:: MENU ================================
+:menu
+cls
+set "menu_choice=null"
+echo =======================
+echo 1. Install Service
+echo 2. Remove Services
+echo 3. Check Service Status
+echo 4. Run Diagnostics
+echo 5. Check Updates
+echo 0. Exit
+set /p menu_choice=Enter choice (0-5): 
+
+if "%menu_choice%"=="1" goto service_install
+if "%menu_choice%"=="2" goto service_remove
+if "%menu_choice%"=="3" goto service_status
+if "%menu_choice%"=="4" goto service_diagnostics
+if "%menu_choice%"=="5" goto service_check_updates
+if "%menu_choice%"=="0" exit /b
+goto menu
+
+
+:: STATUS ==============================
+:service_status
+cls
+chcp 65001 > nul
+echo Checking services and tasks...
+call :test_service zapret
+call :test_service WinDivert
+
+tasklist /FI "IMAGENAME eq winws.exe" | find /I "winws.exe" > nul
+if !errorlevel!==0 (
+    echo Bypass is ACTIVE
+) else (
+    echo Bypass NOT FOUND
+)
+
+pause
+goto menu
+
+:test_service
+set "ServiceName=%~1"
+set "ServiceStatus="
+
+for /f "tokens=3 delims=: " %%A in ('sc query "%ServiceName%" ^| findstr /i "STATE"') do set "ServiceStatus=%%A"
+set "ServiceStatus=%ServiceStatus: =%"
+
+if "%ServiceStatus%"=="RUNNING" (
+    if "%~2"=="soft" (
+        echo "%ServiceName%" is ALREADY RUNNING as service, use "service.bat" and choose "Remove Services" first if you want to run standalone bat.
+        pause
+        exit /b
+    ) else (
+        echo "%ServiceName%" service is RUNNING.
+    )
+) else if not "%~2"=="soft" (
+    echo "%ServiceName%" is NOT running.
+)
+
+exit /b
+
+
+:: REMOVE ==============================
+:service_remove
+cls
+chcp 65001 > nul
+
+set SRVCNAME=zapret
+net stop %SRVCNAME%
+sc delete %SRVCNAME%
+
+net stop "WinDivert"
+sc delete "WinDivert"
+net stop "WinDivert14"
+sc delete "WinDivert14"
+
+pause
+goto menu
+
+
+:: INSTALL =============================
+:service_install
+cls
+chcp 65001 > nul
+
+:: Main
+cd /d "%~dp0"
+set "BIN_PATH=%~dp0bin\"
+set "LISTS_PATH=%~dp0lists\"
+
+:: Searching for .bat files in current folder, except files that start with "service"
+echo Pick one of the options:
+set "count=0"
+for %%f in (*.bat) do (
+    set "filename=%%~nxf"
+    if /i not "!filename:~0,7!"=="service" if /i not "!filename:~0,17!"=="cloudflare_switch" (
+        set /a count+=1
+        echo !count!. %%f
+        set "file!count!=%%f"
+    )
+)
+
+:: Choosing file
+set "choice="
+set /p "choice=Input file index (number): "
+if "!choice!"=="" goto :eof
+
+set "selectedFile=!file%choice%!"
+if not defined selectedFile (
+    echo Invalid choice, exiting...
+    pause
+    goto menu
+)
+
+:: Args that should be followed by value
+set "args_with_value=sni"
+
+:: Parsing args (mergeargs: 2=start param|3=arg with value|1=params args|0=default)
+set "args="
+set "capture=0"
+set "mergeargs=0"
+set QUOTE="
+
+for /f "tokens=*" %%a in ('type "!selectedFile!"') do (
+    set "line=%%a"
+
+    echo !line! | findstr /i "%BIN%winws.exe" >nul
+    if not errorlevel 1 (
+        set "capture=1"
+    )
+
+    if !capture!==1 (
+        if not defined args (
+            set "line=!line:*%BIN%winws.exe"=!"
+        )
+
+        set "temp_args="
+        for %%i in (!line!) do (
+            set "arg=%%i"
+
+            if not "!arg!"=="^" (
+                if "!arg:~0,2!" EQU "--" if not !mergeargs!==0 (
+                    set "mergeargs=0"
+                )
+
+                if "!arg:~0,1!" EQU "!QUOTE!" (
+                    set "arg=!arg:~1,-1!"
+
+                    echo !arg! | findstr ":" >nul
+                    if !errorlevel!==0 (
+                        set "arg=\!QUOTE!!arg!\!QUOTE!"
+                    ) else if "!arg:~0,1!"=="@" (
+                        set "arg=\!QUOTE!@%~dp0!arg:~1!\!QUOTE!"
+                    ) else if "!arg:~0,5!"=="%%BIN%%" (
+                        set "arg=\!QUOTE!!BIN_PATH!!arg:~5!\!QUOTE!"
+                    ) else if "!arg:~0,7!"=="%%LISTS%%" (
+                        set "arg=\!QUOTE!!LISTS_PATH!!arg:~7!\!QUOTE!"
+                    ) else (
+                        set "arg=\!QUOTE!%~dp0!arg!\!QUOTE!"
+                    )
+                )
+                
+                if !mergeargs!==1 (
+                    set "temp_args=!temp_args!,!arg!"
+                ) else if !mergeargs!==3 (
+                    set "temp_args=!temp_args!=!arg!"
+                    set "mergeargs=1"
+                ) else (
+                    set "temp_args=!temp_args! !arg!"
+                )
+
+                if "!arg:~0,2!" EQU "--" (
+                    set "mergeargs=2"
+                ) else if !mergeargs!==2 (
+                    set "mergeargs=1"
+                ) else if !mergeargs!==1 (
+                    for %%x in (!args_with_value!) do (
+                        if /i "%%x"=="!arg!" (
+                            set "mergeargs=3"
+                        )
+                    )
+                )
+            )
+        )
+
+        if not "!temp_args!"=="" (
+            set "args=!args! !temp_args!"
+        )
+    )
+)
+
+:: Creating service with parsed args
+set ARGS=%args%
+echo Final args: !ARGS!
+set SRVCNAME=zapret
+
+net stop %SRVCNAME% >nul 2>&1
+sc delete %SRVCNAME% >nul 2>&1
+sc create %SRVCNAME% binPath= "\"%BIN_PATH%winws.exe\" %ARGS%" DisplayName= "zapret" start= auto
+sc description %SRVCNAME% "Zapret DPI bypass software"
+sc start %SRVCNAME%
+
+pause
+goto menu
+
+
+:: CHECK UPDATES =======================
+:service_check_updates
+chcp 437 > nul
+
+:: Set current version and URLs
+set "GITHUB_VERSION_URL=https://raw.githubusercontent.com/Flowseal/zapret-discord-youtube/main/.service/version.txt"
+set "GITHUB_RELEASE_URL=https://github.com/Flowseal/zapret-discord-youtube/releases/tag/"
+set "GITHUB_DOWNLOAD_URL=https://github.com/Flowseal/zapret-discord-youtube/releases/latest/download/zapret-discord-youtube-"
+
+:: Get the latest version from GitHub
+for /f "delims=" %%A in ('powershell -command "(Invoke-WebRequest -Uri \"%GITHUB_VERSION_URL%\" -Headers @{\"Cache-Control\"=\"no-cache\"} -TimeoutSec 5).Content.Trim()" 2^>nul') do set "GITHUB_VERSION=%%A"
+
+:: Error handling
+if not defined GITHUB_VERSION (
+    echo Error: Failed to fetch the latest version. Check your internet connection
+    pause
+    goto menu
+)
+
+:: Version comparison
+if "%LOCAL_VERSION%"=="%GITHUB_VERSION%" (
+    echo Latest version installed: %LOCAL_VERSION%
+) else (
+    echo New version available: %GITHUB_VERSION%
+    echo Release page: %GITHUB_RELEASE_URL%%GITHUB_VERSION%
+    
+    set "CHOICE="
+    set /p "CHOICE=Do you want to automatically download the new version? (Y/N) (default: Y) "
+    if "!CHOICE!"=="" set "CHOICE=Y"
+    if "!CHOICE!"=="y" set "CHOICE=Y"
+
+    if /i "!CHOICE!"=="Y" (
+        echo Opening the download page...
+        start "" "%GITHUB_DOWNLOAD_URL%%GITHUB_VERSION%.rar"
+    )
+)
+
+if "%1"=="soft" exit /b 
+pause
+goto menu
+
+
+:: DIAGNOSTICS =========================
+:service_diagnostics
+chcp 437 > nul
+cls
+
+:: AdguardSvc.exe
+tasklist /FI "IMAGENAME eq AdguardSvc.exe" | find /I "AdguardSvc.exe" > nul
+if !errorlevel!==0 (
+    call :PrintRed "[X] Adguard process found. Adguard may cause problems with Discord"
+    call :PrintRed "https://github.com/Flowseal/zapret-discord-youtube/issues/417"
+) else (
+    call :PrintGreen "Adguard check passed"
+) 
+echo:
+
+:: Killer
+sc query | findstr /I "Killer" > nul
+if !errorlevel!==0 (
+    call :PrintRed "[X] Killer services found. Killer conflicts with zapret"
+    call :PrintRed "https://github.com/Flowseal/zapret-discord-youtube/issues/2512#issuecomment-2821119513"
+) else (
+    call :PrintGreen "Killer check passed"
+)
+echo:
+
+:: Check Point
+set "checkpointFound=0"
+sc query | findstr /I "TracSrvWrapper" > nul
+if !errorlevel!==0 (
+    set "checkpointFound=1"
+)
+
+sc query | findstr /I "EPWD" > nul
+if !errorlevel!==0 (
+    set "checkpointFound=1"
+)
+
+if !checkpointFound!==1 (
+    call :PrintRed "[X] Check Point services found. Check Point conflicts with zapret"
+    call :PrintRed "Try to uninstall Check Point"
+) else (
+    call :PrintGreen "Check Point check passed"
+)
+echo:
+
+:: SmartByte
+sc query | findstr /I "SmartByte" > nul
+if !errorlevel!==0 (
+    call :PrintRed "[X] SmartByte services found. SmartByte conflicts with zapret"
+    call :PrintRed "Try to uninstall or disable SmartByte through services.msc"
+) else (
+    call :PrintGreen "SmartByte check passed"
+)
+echo:
+
+:: VPN
+sc query | findstr /I "VPN" > nul
+if !errorlevel!==0 (
+    call :PrintYellow "[?] Some VPN services found. Some VPNs can conflict with zapret"
+    call :PrintYellow "Make sure that all VPNs are disabled"
+) else (
+    call :PrintGreen "VPN check passed"
+)
+echo:
+
+:: DNS
+set "dnsfound=0"
+for /f "skip=1 tokens=*" %%a in ('wmic nicconfig where "IPEnabled=true" get DNSServerSearchOrder /format:table') do (
+    echo %%a | findstr /i "192.168." >nul
+    if !errorlevel!==0 (
+        set "dnsfound=1"
+    )
+)
+if !dnsfound!==1 (
+    call :PrintYellow "[?] DNS servers are probably not specified."
+    call :PrintYellow "Provider's DNS servers are automatically used, which may affect zapret. It is recommended to install well-known DNS servers and setup DoH"
+) else (
+    call :PrintGreen "DNS check passed"
+)
+echo:
+
+:: Discord cache clearing
+set "CHOICE="
+set /p "CHOICE=Do you want to clear the Discord cache? (Y/N) (default: Y)  "
+if "!CHOICE!"=="" set "CHOICE=Y"
+if "!CHOICE!"=="y" set "CHOICE=Y"
+
+if /i "!CHOICE!"=="Y" (
+    tasklist /FI "IMAGENAME eq Discord.exe" | findstr /I "Discord.exe" > nul
+    if !errorlevel!==0 (
+        echo Discord is running, closing...
+        taskkill /IM Discord.exe /F > nul
+        if !errorlevel! == 0 (
+            call :PrintGreen "Discord was successfully closed"
+        ) else (
+            call :PrintRed "Unable to close Discord"
+        )
+    )
+
+    set "discordCacheDir=%appdata%\discord"
+
+    for %%d in ("Cache" "Code Cache" "GPUCache") do (
+        set "dirPath=!discordCacheDir!\%%~d"
+        if exist "!dirPath!" (
+            rd /s /q "!dirPath!"
+            if !errorlevel!==0 (
+                call :PrintGreen "Successfully deleted !dirPath!"
+            ) else (
+                call :PrintRed "Failed to delete !dirPath!"
+            )
+        ) else (
+            call :PrintRed "!dirPath! does not exist"
+        )
+    )
+)
+echo:
+
+pause
+goto menu
+
+:: Utility functions
+
+:PrintGreen
+powershell -Command "Write-Host \"%~1\" -ForegroundColor Green"
+exit /b
+
+:PrintRed
+powershell -Command "Write-Host \"%~1\" -ForegroundColor Red"
+exit /b
+
+:PrintYellow
+powershell -Command "Write-Host \"%~1\" -ForegroundColor Yellow"
+exit /b
--- a/service_install.bat
+++ b/service_install.bat
@@ -1,122 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-chcp 65001 > nul
-:: 65001 - UTF-8
-
-:: Admin rights check
-if "%1"=="admin" (
-    echo Started with admin rights
-) else (
-    echo Requesting admin rights...
-    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/k \"\"%~f0\" admin\"' -Verb RunAs"
-    exit /b
-)
-
-:: Main
-cd /d "%~dp0"
-set BIN_PATH=%~dp0bin\
-
-:: Checking for updates
-call check_updates.bat soft
-echo:
-
-:: Searching for .bat files in current folder, except files that start with "service"
-echo Pick one of the options:
-set "count=0"
-for %%f in (*.bat) do (
-    set "filename=%%~nxf"
-    if /i not "!filename:~0,7!"=="service" if /i not "!filename:~0,13!"=="check_updates" (
-        set /a count+=1
-        echo !count!. %%f
-        set "file!count!=%%f"
-    )
-)
-
-:: Choosing file
-set "choice="
-set /p "choice=Input file index (number): "
-if "!choice!"=="" goto :eof
-
-set "selectedFile=!file%choice%!"
-if not defined selectedFile (
-    echo Wrong choice, exiting...
-    pause
-    goto :eof
-)
-
-:: Parsing args (mergeargs: 2=start param|1=params args|0=default)
-set "args="
-set "capture=0"
-set "mergeargs=0"
-set QUOTE="
-
-for /f "tokens=*" %%a in ('type "!selectedFile!"') do (
-    set "line=%%a"
-
-    echo !line! | findstr /i "%BIN%winws.exe" >nul
-    if not errorlevel 1 (
-        set "capture=1"
-    )
-
-    if !capture!==1 (
-        if not defined args (
-            set "line=!line:*%BIN%winws.exe"=!"
-        )
-
-        set "temp_args="
-        for %%i in (!line!) do (
-            set "arg=%%i"
-
-            if not "!arg!"=="^" (
-                if "!arg:~0,2!" EQU "--" if not !mergeargs!==0 (
-                    set "mergeargs=0"
-                )
-
-                if "!arg:~0,1!" EQU "!QUOTE!" (
-                    set "arg=!arg:~1,-1!"
-
-                    echo !arg! | findstr ":" >nul
-                    if !errorlevel!==0 (
-                        set "arg=\!QUOTE!!arg!\!QUOTE!"
-                    ) else if "!arg:~0,1!"=="@" (
-                        set "arg=\!QUOTE!@%~dp0!arg:~1!\!QUOTE!"
-                    ) else if "!arg:~0,5!"=="%%BIN%%" (
-                        set "arg=\!QUOTE!!BIN_PATH!!arg:~5!\!QUOTE!"
-                    ) else (
-                        set "arg=\!QUOTE!%~dp0!arg!\!QUOTE!"
-                    )
-                )
-                
-                if !mergeargs!==1 (
-                    set "temp_args=!temp_args!,!arg!"
-                ) else (
-                    set "temp_args=!temp_args! !arg!"
-                )
-
-                if "!arg:~0,2!" EQU "--" (
-                    set "mergeargs=2"
-                ) else if !mergeargs!==2 (
-                    set "mergeargs=1"
-                )
-            )
-        )
-
-        if not "!temp_args!"=="" (
-            set "args=!args! !temp_args!"
-        )
-    )
-)
-
-:: Creating service with parsed args
-set ARGS=%args%
-echo Final args: !ARGS!
-set SRVCNAME=zapret
-
-net stop %SRVCNAME% >nul 2>&1
-sc delete %SRVCNAME% >nul 2>&1
-sc create %SRVCNAME% binPath= "\"%BIN_PATH%winws.exe\" %ARGS%" DisplayName= "zapret" start= auto
-sc description %SRVCNAME% "Zapret DPI bypass software"
-sc start %SRVCNAME%
-
-pause
-endlocal
--- a/service_remove.bat
+++ b/service_remove.bat
@@ -1,24 +0,0 @@
-@echo off
-chcp 65001 > nul
-:: 65001 - UTF-8
-
-if "%1"=="admin" (
-    echo Started with admin rights
-) else (
-    echo Requesting admin rights...
-    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/k \"\"%~f0\" admin\"' -Verb RunAs"
-    exit /b
-)
-
-set SRVCNAME=zapret
-
-net stop %SRVCNAME%
-sc delete %SRVCNAME%
-
-net stop "WinDivert"
-sc delete "WinDivert"
-net stop "WinDivert14"
-sc delete "WinDivert14"
-
-pause
-endlocal
--- a/service_status.bat
+++ b/service_status.bat
@@ -1,34 +0,0 @@
-@echo off
-chcp 65001 > nul
-:: 65001 - UTF-8
-
-if "%~1"=="" (
-    call :test_service zapret
-    call :test_service WinDivert
-    pause
-) else (
-    call :test_service "%~1" "soft"
-)
-
-exit /b
-
-:test_service
-set "ServiceName=%~1"
-set "ServiceStatus="
-
-for /f "tokens=3 delims=: " %%A in ('sc query "%ServiceName%" ^| findstr /i "STATE"') do set "ServiceStatus=%%A"
-
-set "ServiceStatus=%ServiceStatus: =%"
-
-if "%ServiceStatus%"=="RUNNING" (
-    if "%~2"=="soft" (
-        echo "%ServiceName%" is ALREADY RUNNING as service! Use "serivce_remove.bat" first if you want to run standalone bat.
-        pause
-    ) else (
-        echo "%ServiceName%" service is RUNNING.
-    )
-) else if not "%~2"=="soft" (
-    echo "%ServiceName%" is NOT running.
-)
-
-exit /b
Author	SHA1	Message	Date
Flowseal	27d47f3bdd	Version bump	2025-04-30 13:45:46 +03:00
Flowseal	d86df6be35	Small service fixes	2025-04-30 13:45:31 +03:00
Flowseal	b5b331e822	Services merge	2025-04-30 13:41:12 +03:00
Flowseal	755353ecd7	Diagnostics for common problems	2025-04-26 21:01:41 +03:00
Flowseal	a7edae47bc	Added winws.exe check for service_status	2025-04-26 21:00:09 +03:00
Flowseal	127a19effe	Update bug_report.yml	2025-04-20 13:53:12 +03:00
Flowseal	383410f6fa	Fixed discord strategy and removed unused ipset	2025-04-18 17:11:03 +03:00
golang developer	feb4a69c99	Дополнительное отображение имени в имени окна cmd (#2233 ) update name display in cmd	2025-04-18 16:48:14 +03:00
Flowseal	4b27f7713e	Merge pull request #2229 from smokingplaya/main Заготовка для написания Issue	2025-04-17 12:48:42 +03:00
smokingplaya	199829795c	maybe так?	2025-04-15 20:39:35 +03:00
smokingplaya	aaac27e74e	Update bug_report.yml	2025-04-14 10:59:21 +03:00
smokingplaya	4166c5cf19	Update bug_report.yml	2025-04-14 10:56:50 +03:00
smokingplaya	96d14286c7	add bug_report.yml	2025-04-14 10:45:32 +03:00
Flowseal	c6bdc104d8	service_install fix for args with value	2025-04-13 21:29:40 +03:00
Flowseal	0f4591d813	Added quotes for escaping for new strategy	2025-04-13 00:22:41 +03:00
lxstwxrden	3da7c54ec3	Update discord strategy, winws, new TLS MOD AUTO	2025-04-13 00:17:42 +03:00
duh-git	2ed3c1e279	Added quotes for escaping	2025-04-13 00:17:42 +03:00
Flowseal	0360ff318b	Version bump	2025-04-13 00:17:42 +03:00
Flowseal	ccd2839bdc	Added cloudflare bypass switcher	2025-04-13 00:17:42 +03:00
Flowseal	475cfd99c6	Lists moved to separate folder	2025-04-13 00:17:42 +03:00
Flowseal	e2a5649180	Version bump	2025-04-13 00:17:42 +03:00
Flowseal	3911688102	Removed extra paddings	2025-04-13 00:17:42 +03:00
Flowseal	6ea2950d13	Auto close cmd after finish	2025-04-13 00:17:42 +03:00
Flowseal	c00943cb8b	Default strategies update	2025-04-13 00:17:42 +03:00
Flowseal	05b5433209	Functional fix for service statuses	2025-04-13 00:17:42 +03:00
Flowseal	cf02ce7791	Cosmetic fixes	2025-04-13 00:17:42 +03:00
serpen7	0c59a9c45c	Update ipset-discord.txt from original repository https://github.com/bol-van/zapret-win-bundle/blob/master/zapret-winws/files/ipset-discord.txt Апдейт сету IP адресов дискорда из оригинального репозитория. Чтобы уменьшить влияние запрета на сторонние сервисы, которые находятся на смежных IP адресах. Возможно отпустит некоторые игровые сервисы где люди жалуются на пинги и прочее якобы из-за запрета.	2025-04-13 00:17:42 +03:00
ZmrdWeders	09ea8c907d	Adds output for more info	2025-04-13 00:17:42 +03:00
ZmrdWeders	75a96d90f2	Fixes mistype	2025-04-13 00:17:42 +03:00
ZmrdWeders	fc30567558	Adds output for services status check	2025-04-13 00:17:42 +03:00
lxstwxrden	559f48c3d2	Idk why it disappeared	2025-04-13 00:17:42 +03:00
lxstwxrden	565e294599	Add FAKE TLS MOD ALT	2025-04-13 00:17:42 +03:00
Flowseal	50b6e1a819	Version bump	2025-04-13 00:17:42 +03:00
fridorin	30a7ac4e9b	Update winws.exe new version from `5a60c54094`	2025-04-13 00:17:42 +03:00
fridorin	6718d597bf	Update tls_clienthello_www_google_com.bin new version from `5a60c54094`	2025-04-13 00:17:42 +03:00
lxstwxrden	6334bbd284	fix mistake	2025-04-13 00:17:42 +03:00
lxstwxrden	daac2bb681	Cloudflare Fix	2025-04-13 00:17:42 +03:00
Flowseal	dcdb0a3dce	Update list-general.txt	2025-04-13 00:17:42 +03:00
burnedoutman	6d526e5e51	Update ipset-discord.txt сегодня не подключалось аудио, нашёл в логах что ломилось на [2025-03-28 21:57:43.658] [info] [Connection(default)] Creating connection to 35.217.63.43:50007 with audio ssrc: 208916	2025-04-13 00:17:42 +03:00
@@ -1 +1 @@
 .6.4
 .7.2