feat: make direct Douyin traffic the branch default

DouYinSparkFlow/core/browser.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from playwright.async_api import async_playwright
 from rich.console import Console
 
-from utils.config import DEBUG, Environment, get_environment
+from utils.config import DEBUG, Environment, get_app_settings, get_environment
 
 
 console = Console()
@@ -52,6 +52,30 @@ def _browser_args():
     ]
 
 
+def _douyin_browser_proxy():
+    """Return an explicit proxy for Douyin browser traffic, or None for direct."""
+    settings = get_app_settings(force_reload=True)
+    mode = str(
+        os.getenv("SPARKFLOW_DOUYIN_NETWORK_MODE")
+        or settings.get("douyin_network_mode", "direct")
+    ).strip().lower()
+    if mode != "mihomo":
+        return None
+    return str(
+        os.getenv("SPARKFLOW_DOUYIN_PROXY_URL")
+        or settings.get("douyin_proxy_url", "http://proxy:7890")
+    ).strip() or None
+
+
+def _browser_launch_options(GUI=False):
+    args = _browser_args()
+    proxy = _douyin_browser_proxy()
+    if proxy:
+        return {"headless": _headless_for(GUI), "args": args, "proxy": {"server": proxy}}
+    args.append("--no-proxy-server")
+    return {"headless": _headless_for(GUI), "args": args}
+
+
 def sanitize_profile_name(value):
     raw = str(value or "").strip()
     if not raw:
@@ -83,10 +107,7 @@ async def get_browser(GUI=False):
 
     try:
         playwright = await async_playwright().start()
-        browser = await playwright.chromium.launch(
-            headless=_headless_for(GUI),
-            args=_browser_args(),
-        )
+        browser = await playwright.chromium.launch(**_browser_launch_options(GUI))
         return playwright, browser
     except Exception as exc:
         if "Executable doesn't exist" in str(exc) and get_environment() != Environment.GITHUBACTION:
@@ -105,11 +126,11 @@ async def get_persistent_browser_context(profile_name, GUI=False, root=None):
 
     try:
         playwright = await async_playwright().start()
+        launch_options = _browser_launch_options(GUI)
+        launch_options["viewport"] = {"width": 1600, "height": 1000}
         context = await playwright.chromium.launch_persistent_context(
             str(profile_dir),
-            headless=_headless_for(GUI),
-            viewport={"width": 1600, "height": 1000},
-            args=_browser_args(),
+            **launch_options,
         )
         return playwright, context, profile_dir
     except Exception as exc:

DouYinSparkFlow/tests/test_deployment_contract.py

@@ -72,9 +72,14 @@ class DeploymentContractTests(unittest.TestCase):
         compose = (REPO_ROOT / "docker-compose.yml").read_text(encoding="utf-8")
         self.assertIn("# Build proxies must never leak", dockerfile)
         self.assertIn("http_proxy=", dockerfile)
-        self.assertGreaterEqual(compose.count("http_proxy: http://proxy:7890"), 3)
-        self.assertGreaterEqual(compose.count("https_proxy: http://proxy:7890"), 3)
-        self.assertGreaterEqual(compose.count("no_proxy:"), 3)
+        self.assertIn("HTTP_PROXY: ${HTTP_PROXY_BUILD:-}", compose)
+        self.assertIn("HTTPS_PROXY: ${HTTPS_PROXY_BUILD:-}", compose)
+        self.assertIn("ALL_PROXY: ${ALL_PROXY_BUILD:-}", compose)
+        for service in ("web", "scheduler", "task"):
+            block = compose.split(f"  {service}:", 1)[1]
+            block = block.split("\n  ", 1)[0]
+            self.assertNotIn("HTTP_PROXY: http://proxy:7890", block)
+            self.assertNotIn("http_proxy: http://proxy:7890", block)
 
     def test_sensitive_ports_bind_to_loopback_by_default(self):
         text = (REPO_ROOT / "docker-compose.yml").read_text(encoding="utf-8")
@@ -119,14 +124,21 @@ class DeploymentContractTests(unittest.TestCase):
         env_example = (REPO_ROOT / ".env.example").read_text(encoding="utf-8")
         server = (SOURCE_ROOT / "login_desktop_server.py").read_text(encoding="utf-8")
         login_block = compose.split("  login-desktop:", 1)[1].split("  scheduler:", 1)[0]
-        self.assertIn("LOGIN_DESKTOP_PROXY_MODE: ${LOGIN_DESKTOP_PROXY_MODE:-auto}", login_block)
+        self.assertIn("LOGIN_DESKTOP_PROXY_MODE: ${LOGIN_DESKTOP_PROXY_MODE:-direct}", login_block)
         self.assertIn("LOGIN_DESKTOP_PROXY: ${LOGIN_DESKTOP_PROXY:-http://proxy:7890}", login_block)
         self.assertNotIn("HTTP_PROXY: http://proxy:7890", login_block)
-        self.assertIn("LOGIN_DESKTOP_PROXY_MODE=auto", env_example)
+        self.assertIn("LOGIN_DESKTOP_PROXY_MODE=direct", env_example)
         self.assertIn('candidates.append(("direct", None))', server)
         self.assertIn('candidates.append(("proxy", LOGIN_PROXY_SERVER))', server)
         self.assertIn('"--no-proxy-server"', server)
         self.assertIn('"/preflight"', server)
+        self.assertIn('LOGIN_DESKTOP_PROXY_MODE: ${LOGIN_DESKTOP_PROXY_MODE:-direct}', login_block)
+        dashboard = (SOURCE_ROOT / "webui" / "templates" / "dashboard.html").read_text(encoding="utf-8")
+        self.assertIn('name="douyin_network_mode"', dashboard)
+        self.assertIn('name="douyin_proxy_url"', dashboard)
+        browser = (SOURCE_ROOT / "core" / "browser.py").read_text(encoding="utf-8")
+        self.assertIn("--no-proxy-server", browser)
+        self.assertIn("SPARKFLOW_DOUYIN_NETWORK_MODE", browser)
 
     def test_login_desktop_resource_controls_are_configured(self):
         compose = (REPO_ROOT / "docker-compose.yml").read_text(encoding="utf-8")

DouYinSparkFlow/tests/test_douyin_network.py

@@ -0,0 +1,38 @@
+import unittest
+from unittest.mock import patch
+
+from core import browser
+from utils import config as config_module
+
+
+class DouyinNetworkRouteTests(unittest.TestCase):
+    def test_default_route_is_direct(self):
+        with patch.object(browser, "get_app_settings", return_value={}):
+            with patch.dict(browser.os.environ, {}, clear=False):
+                browser.os.environ.pop("SPARKFLOW_DOUYIN_NETWORK_MODE", None)
+                browser.os.environ.pop("SPARKFLOW_DOUYIN_PROXY_URL", None)
+                options = browser._browser_launch_options(False)
+        self.assertNotIn("proxy", options)
+        self.assertIn("--no-proxy-server", options["args"])
+
+    def test_mihomo_route_is_explicit(self):
+        with patch.object(browser, "get_app_settings", return_value={}):
+            with patch.dict(
+                browser.os.environ,
+                {
+                    "SPARKFLOW_DOUYIN_NETWORK_MODE": "mihomo",
+                    "SPARKFLOW_DOUYIN_PROXY_URL": "http://127.0.0.1:7890",
+                },
+                clear=False,
+            ):
+                options = browser._browser_launch_options(False)
+        self.assertEqual({"server": "http://127.0.0.1:7890"}, options["proxy"])
+        self.assertNotIn("--no-proxy-server", options["args"])
+
+    def test_default_app_settings_keep_direct_route(self):
+        self.assertEqual("direct", config_module.DEFAULT_APP_SETTINGS["douyin_network_mode"])
+        self.assertEqual("http://proxy:7890", config_module.DEFAULT_APP_SETTINGS["douyin_proxy_url"])
+
+
+if __name__ == "__main__":
+    unittest.main()

DouYinSparkFlow/utils/config.py

@@ -85,6 +85,8 @@ DEFAULT_APP_SETTINGS = {
     "proxy_refresh_script": "/opt/douyin-sparkflow/refresh_proxy.sh",
     "local_login_helper_url": "http://127.0.0.1:18765",
     "login_desktop_api_url": "http://127.0.0.1:18090",
+    "douyin_network_mode": "direct",
+    "douyin_proxy_url": "http://proxy:7890",
     "login_desktop_public_url": "",
     "login_desktop_public_scheme": "http",
     "login_desktop_public_port": 8788,

DouYinSparkFlow/webui/app.py

@@ -1035,6 +1035,9 @@ def create_app():
         settings["login_desktop_api_url"] = str(
             form.get("login_desktop_api_url", settings.get("login_desktop_api_url", "http://127.0.0.1:18090"))
         ).strip()
+        network_mode = str(form.get("douyin_network_mode", settings.get("douyin_network_mode", "direct"))).strip().lower()
+        settings["douyin_network_mode"] = network_mode if network_mode in {"direct", "mihomo"} else "direct"
+        settings["douyin_proxy_url"] = str(form.get("douyin_proxy_url", settings.get("douyin_proxy_url", "http://proxy:7890"))).strip()
         settings["ui_port"] = int(form.get("ui_port", settings.get("ui_port", 8787)))
         save_app_settings(settings)
 

DouYinSparkFlow/webui/templates/dashboard.html

@@ -578,6 +578,8 @@
             <label><span>任务日志文件</span><input type="text" name="ops_log_file" value="{{ app_settings.ops_log_file }}"></label>
             <label><span>代理刷新脚本</span><input type="text" name="proxy_refresh_script" value="{{ app_settings.proxy_refresh_script }}"></label>
             <label><span>登录桌面 API</span><input type="text" name="login_desktop_api_url" value="{{ app_settings.login_desktop_api_url }}"></label>
+            <label><span>抖音业务网络出口</span><select name="douyin_network_mode"><option value="direct" {% if app_settings.douyin_network_mode|default("direct") == "direct" %}selected{% endif %}>直连（默认）</option><option value="mihomo" {% if app_settings.douyin_network_mode == "mihomo" %}selected{% endif %}>Mihomo（高级）</option></select></label>
+            <label><span>Mihomo 代理地址</span><input type="text" name="douyin_proxy_url" value="{{ app_settings.douyin_proxy_url|default("http://proxy:7890") }}" placeholder="http://proxy:7890"><small>仅在选择 Mihomo 时使用；默认不启用。</small></label>
             <label><span>Web UI 端口</span><input type="number" min="1" max="65535" name="ui_port" value="{{ app_settings.ui_port }}"></label>
           </div>
           <div class="form-grid">