feat: refine settings and module surfaces

scripts/update-thirdparty.py

@@ -1,11 +1,14 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import fnmatch
 import hashlib
+import io
 import json
 import urllib.request
 from urllib.parse import urlparse
 from pathlib import Path
+from zipfile import ZipFile
 
 REPO_ROOT = Path(__file__).resolve().parents[1]
 THIRDPARTY_DIR = REPO_ROOT / "thirdparty"
@@ -63,6 +66,11 @@
     "zapret-ip-user.txt",
 ]
 
+MODULE_FILES = [
+    "dnscrypt-proxy/dnscrypt-proxy.exe",
+    "tg-ws-proxy-rs/tg-ws-proxy.exe",
+]
+
 UPSTREAMS = [
     (
         "https://raw.githubusercontent.com/StressOzz/Zapret-Manager/refs/heads/main/zapret-hosts-user-exclude.txt",
@@ -90,6 +98,21 @@
     ),
 ]
 
+GITHUB_RELEASE_ZIP_UPSTREAMS = [
+    {
+        "repo": "DNSCrypt/dnscrypt-proxy",
+        "asset_pattern": "dnscrypt-proxy-win64-*.zip",
+        "member_pattern": "*/dnscrypt-proxy.exe",
+        "destination": THIRDPARTY_DIR / "modules" / "dnscrypt-proxy" / "dnscrypt-proxy.exe",
+    },
+    {
+        "repo": "valnesfjord/tg-ws-proxy-rs",
+        "asset_pattern": "tg-ws-proxy-x86_64-pc-windows-gnu.zip",
+        "member_pattern": "tg-ws-proxy.exe",
+        "destination": THIRDPARTY_DIR / "modules" / "tg-ws-proxy-rs" / "tg-ws-proxy.exe",
+    },
+]
+
 
 def sha256_bytes(data: bytes) -> str:
     return hashlib.sha256(data).hexdigest()
@@ -116,6 +139,43 @@ def download(url: str) -> bytes:
         return response.read()
 
 
+def download_json(url: str) -> dict:
+    return json.loads(download(url).decode("utf-8"))
+
+
+def fetch_latest_release_asset(repo: str, asset_pattern: str) -> bytes:
+    release = download_json(f"https://api.github.com/repos/{repo}/releases/latest")
+    assets = release.get("assets", [])
+    for asset in assets:
+        asset_name = asset.get("name", "")
+        if fnmatch.fnmatch(asset_name, asset_pattern):
+            asset_url = asset.get("browser_download_url")
+            if not asset_url:
+                raise ValueError(
+                    f"Latest release asset {asset_name} for {repo} has no browser_download_url"
+                )
+            return download(asset_url)
+
+    available_assets = ", ".join(
+        sorted(asset.get("name", "<unnamed>") for asset in assets)
+    )
+    raise FileNotFoundError(
+        f"Latest release asset for {repo} matching {asset_pattern!r} not found. "
+        f"Available assets: {available_assets}"
+    )
+
+
+def extract_zip_member(data: bytes, member_pattern: str) -> bytes:
+    with ZipFile(io.BytesIO(data)) as archive:
+        for member_name in archive.namelist():
+            normalized_name = member_name.replace("\\", "/")
+            if fnmatch.fnmatch(normalized_name, member_pattern):
+                with archive.open(member_name) as handle:
+                    return handle.read()
+
+    raise FileNotFoundError(f"Zip member matching {member_pattern!r} not found")
+
+
 def normalize_download(destination: Path, data: bytes) -> bytes:
     if destination.name != "zapret-hosts-user-exclude.txt":
         return data
@@ -169,6 +229,12 @@ def build_hash_manifest() -> dict[str, str]:
             raise FileNotFoundError(f"Missing managed list: {path}")
         manifest[f"lists:{name}"] = sha256_file(path)
 
+    for name in MODULE_FILES:
+        path = THIRDPARTY_DIR / "modules" / name
+        if not path.is_file():
+            raise FileNotFoundError(f"Missing managed module binary: {path}")
+        manifest[f"modules:{name}"] = sha256_file(path)
+
     return manifest
 
 
@@ -180,6 +246,15 @@ def main() -> None:
         if write_if_changed(destination, data):
             changed_paths.append(destination.relative_to(REPO_ROOT).as_posix())
 
+    for upstream in GITHUB_RELEASE_ZIP_UPSTREAMS:
+        archive_bytes = fetch_latest_release_asset(
+            upstream["repo"],
+            upstream["asset_pattern"],
+        )
+        extracted_bytes = extract_zip_member(archive_bytes, upstream["member_pattern"])
+        if write_if_changed(upstream["destination"], extracted_bytes):
+            changed_paths.append(upstream["destination"].relative_to(REPO_ROOT).as_posix())
+
     manifest = build_hash_manifest()
     hashes_payload = json.dumps(manifest, ensure_ascii=False, indent=2, sort_keys=True) + "\n"
     if write_if_changed(HASHES_PATH, hashes_payload.encode("utf-8")):

scripts/verify-thirdparty-hashes.py

@@ -33,6 +33,8 @@ def resolve_manifest_path(key: str) -> Path:
         return THIRDPARTY_DIR / "fake" / name
     if group == "lists":
         return THIRDPARTY_DIR / "lists" / name
+    if group == "modules":
+        return THIRDPARTY_DIR / "modules" / name
     raise ValueError(f"Unsupported manifest group: {group}")
 
 
@@ -54,6 +56,7 @@ def build_expected_keys() -> set[str]:
     binary_files = getattr(update_module, "BINARY_FILES", None)
     fake_files = getattr(update_module, "FAKE_FILES", None)
     list_files = getattr(update_module, "LIST_FILES", None)
+    module_files = getattr(update_module, "MODULE_FILES", None)
 
     if binary_files is None:
         missing_constants.append("BINARY_FILES")
@@ -64,6 +67,9 @@ def build_expected_keys() -> set[str]:
     if list_files is None:
         missing_constants.append("LIST_FILES")
         list_files = []
+    if module_files is None:
+        missing_constants.append("MODULE_FILES")
+        module_files = []
 
     if missing_constants:
         raise RuntimeError(
@@ -80,6 +86,9 @@ def build_expected_keys() -> set[str]:
     for name in list_files:
         expected_keys.add(f"lists:{name}")
 
+    for name in module_files:
+        expected_keys.add(f"modules:{name}")
+
     return expected_keys
 
 

src-tauri/Cargo.toml

@@ -49,6 +49,7 @@ surge-ping = "0.8.4"
 toml = "1.1.2"
 duct = "1.1.1"
 sysinfo = "0.38.4"
+discord-rich-presence = "1.1.0"
 
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.62.2", features = ["Win32_Foundation", "Win32_Security", "Win32_Security_Authentication_Identity", "Win32_System_Threading", "Win32_System_Services", "Win32_System_Registry", "Win32_System_Diagnostics_ToolHelp", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"] }

src-tauri/default-config.json

@@ -15,6 +15,7 @@
   "tgWsProxyPort": 1443,
   "tgWsProxySecret": "",
   "tgWsProxyModuleEnabled": false,
+  "discordPresenceEnabled": false,
   "categories": [
     {
       "id": "preset-http",
@@ -489,5 +490,5 @@
   "connectOnAutostart": false,
   "coreFileUpdatePromptsEnabled": true,
   "appAutoUpdatesEnabled": true,
-  "windowMaterial": "acrylic"
+  "windowMaterial": "none"
 }