devconfig-gen-singbox 2.1.7__tar.gz → 2.1.8__tar.gz

{devconfig_gen_singbox-2.1.7/src/devconfig_gen_singbox.egg-info → devconfig_gen_singbox-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devconfig_gen_singbox
-Version: 2.1.7
+Version: 2.1.8
 Summary: Provider-based developer configuration generation engine and CLI
 Author-email: henryliu443 <henryliu443@gmail.com>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Dynamic: license-file
 > **A sing-box domain implementation built on top of DevConfig-Gen.**
 > **构建在 `DevConfig-Gen` 之上的 sing-box 领域实现（child / fork）。**
 
-[![Version](https://img.shields.io/badge/version-2.1.7-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.8-blue.svg)](CHANGELOG.md)
 [![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
 ![Python 3.8+](https://img.shields.io/badge/python-3.8%2B-blue.svg)
 ![Tests](https://img.shields.io/badge/tests-136%20passing-brightgreen.svg)

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/README.md

@@ -3,7 +3,7 @@
 > **A sing-box domain implementation built on top of DevConfig-Gen.**
 > **构建在 `DevConfig-Gen` 之上的 sing-box 领域实现（child / fork）。**
 
-[![Version](https://img.shields.io/badge/version-2.1.7-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.8-blue.svg)](CHANGELOG.md)
 [![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
 ![Python 3.8+](https://img.shields.io/badge/python-3.8%2B-blue.svg)
 ![Tests](https://img.shields.io/badge/tests-136%20passing-brightgreen.svg)

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devconfig_gen_singbox"
-version = "2.1.7"
+version = "2.1.8"
 authors = [
   { name = "henryliu443", email = "henryliu443@gmail.com" },
 ]

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/src/devconfig_gen/__init__.py

@@ -66,4 +66,4 @@ __all__ = [
     "loads",
     "validate_request",
 ]
-__version__ = "2.1.7"
+__version__ = "2.1.8"

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8/src/devconfig_gen_singbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devconfig_gen_singbox
-Version: 2.1.7
+Version: 2.1.8
 Summary: Provider-based developer configuration generation engine and CLI
 Author-email: henryliu443 <henryliu443@gmail.com>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Dynamic: license-file
 > **A sing-box domain implementation built on top of DevConfig-Gen.**
 > **构建在 `DevConfig-Gen` 之上的 sing-box 领域实现（child / fork）。**
 
-[![Version](https://img.shields.io/badge/version-2.1.7-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.8-blue.svg)](CHANGELOG.md)
 [![License: Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
 ![Python 3.8+](https://img.shields.io/badge/python-3.8%2B-blue.svg)
 ![Tests](https://img.shields.io/badge/tests-136%20passing-brightgreen.svg)

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/src/singbox_ops/cli.py

@@ -25,7 +25,12 @@ from .core.context_builder import build_context
 from .core.exceptions import OpsError
 from .core.plan import DeployPlan, load_plan
 from .core.orchestrator import DRY_RUN_IP, build_suite, deploy, destroy, make_runner
-from .core.protocols import PROTOCOLS
+from .core.protocols import (
+    DEFAULT_ANYTLS_DECOY_PORT,
+    DEFAULT_ANYTLS_DECOY_SERVER,
+    DEFAULT_HY2_MASQUERADE,
+    PROTOCOLS,
+)
 from .core.ui import UI
 
 PROG = "devconfig_gen_singbox"
@@ -151,7 +156,7 @@ def interactive_plan(domain=None, protocols=None, reader=None, writer=None, ui=N
     ui = ui or UI(writer)
     ui.banner(f"{PROG} · 交互式部署向导", "逐项回答；回车使用默认值。Ctrl-C 可随时退出。")
 
-    ui.section("1/4 基础")
+    ui.section("1/5 基础")
     while not domain:
         domain = _ask(ui, "主域名", "例如 example.com；协议主机名 = <前缀>.<主域名>",
                       required=True, reader=reader, writer=writer)
@@ -167,7 +172,32 @@ def interactive_plan(domain=None, protocols=None, reader=None, writer=None, ui=N
     )
     server_ip = _ask(ui, "服务器公网 IP", "留空=自动探测", reader=reader, writer=writer)
 
-    ui.section("2/4 Cloudflare（DNS 必填）")
+    protocol_list = [item.strip() for item in str(protocols).split(",") if item.strip()]
+    protocol_params: dict = {}
+    if "anytls" in protocol_list or "hysteria2" in protocol_list:
+        ui.section("2/5 协议参数")
+    if "anytls" in protocol_list:
+        protocol_params["anytls"] = {
+            "decoy_server": _ask(
+                ui, "REALITY 伪装站 (decoy server)",
+                f"REALITY 握手伪装的目标站点；证书 SNI 也用这个（默认 {DEFAULT_ANYTLS_DECOY_SERVER}）",
+                default=DEFAULT_ANYTLS_DECOY_SERVER, reader=reader, writer=writer,
+            ),
+            "decoy_port": _ask(
+                ui, "REALITY 伪装端口", f"通常 {DEFAULT_ANYTLS_DECOY_PORT}",
+                default=str(DEFAULT_ANYTLS_DECOY_PORT), reader=reader, writer=writer,
+            ),
+        }
+    if "hysteria2" in protocol_list:
+        protocol_params["hysteria2"] = {
+            "masquerade": _ask(
+                ui, "Hysteria2 伪装网址 (masquerade)",
+                f"HTTP 伪装目标 URL（默认 {DEFAULT_HY2_MASQUERADE}）",
+                default=DEFAULT_HY2_MASQUERADE, reader=reader, writer=writer,
+            ),
+        }
+
+    ui.section("3/5 Cloudflare（DNS 必填）")
     ui.warn("DNS A 记录由 Cloudflare 管理，因此 CF 凭据必填（仅本次内存使用，不写盘）")
     env = {
         "CF_Token": _ask_secret(
@@ -185,23 +215,24 @@ def interactive_plan(domain=None, protocols=None, reader=None, writer=None, ui=N
         default=True, reader=reader, writer=writer,
     )
 
-    ui.section("3/4 运行时")
+    ui.section("4/5 运行时")
     use_runtime = _ask_yes_no(
         ui, "启用运行时适配器？",
         "systemd / nftables / watchdog / 每日自动升级（生产建议 Y）",
         default=True, reader=reader, writer=writer,
     )
 
-    ui.section("4/4 产物路径")
+    ui.section("5/5 产物路径")
     server_out = _ask(ui, "服务端配置", "sing-box 主配置", default=DEFAULT_SERVER_OUT, reader=reader, writer=writer)
     client_out = _ask(ui, "客户端配置", "可导入 GUI 的完整客户端配置", default=DEFAULT_CLIENT_OUT, reader=reader, writer=writer)
     links_out = _ask(ui, "分享链接", "anytls:// tuic:// hy2:// 文本", default=DEFAULT_LINKS_OUT, reader=reader, writer=writer)
 
     plan = {
         "domain_root": domain,
-        "protocols": [item.strip() for item in str(protocols).split(",") if item.strip()],
+        "protocols": protocol_list,
         "tunnel_mode": tunnel_mode,
         "server_ip": server_ip or "auto",
+        "protocol_params": protocol_params,
         "adapters": {
             "secrets": "singbox-subprocess",
             "dns": "cloudflare",
@@ -235,6 +266,12 @@ def _confirm(ui: UI, plan, dry_run: bool, reader=None, writer=None) -> bool:
     ui.kv("DNS", adapters.get("dns") or "跳过（自己管理）")
     ui.kv("证书", adapters.get("acme") or "跳过（自己管理）")
     ui.kv("运行时", ", ".join(f"{k}={v}" for k, v in runtime.items() if v) or "关闭")
+    params = plan.protocol_params or {}
+    if params.get("anytls"):
+        anytls = params["anytls"]
+        ui.kv("REALITY decoy", f"{anytls.get('decoy_server')}:{anytls.get('decoy_port', 443)}")
+    if params.get("hysteria2"):
+        ui.kv("HY2 masquerade", params["hysteria2"].get("masquerade"))
     ui.kv("服务端配置", plan.outputs.get("server_config", "?"))
     if dry_run:
         ui.warn("DRY-RUN：只打印将执行的步骤，不改动系统")

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/src/singbox_ops/core/context_builder.py

@@ -12,19 +12,24 @@ from .exceptions import AdapterError
 from .plan import DeployPlan
 from .protocols import (
     CERT_PATHS,
+    DEFAULT_ANYTLS_DECOY_PORT,
+    DEFAULT_ANYTLS_DECOY_SERVER,
+    DEFAULT_HY2_CLIENT_DOWN_MBPS,
+    DEFAULT_HY2_CLIENT_UP_MBPS,
+    DEFAULT_HY2_MASQUERADE,
+    DEFAULT_HY2_SERVER_DOWN_MBPS,
+    DEFAULT_HY2_SERVER_UP_MBPS,
     HOST_KEYS,
     PROTOCOL_PORTS,
     TLS_PROTOCOLS,
     requires_tls,
 )
 
-DEFAULT_ANYTLS_DECOY_SERVER = "www.cloudflare.com"
-DEFAULT_ANYTLS_DECOY_PORT = 443
-DEFAULT_MASQUERADE = "https://www.cloudflare.com"
-DEFAULT_SERVER_UP_MBPS = 500
-DEFAULT_SERVER_DOWN_MBPS = 500
-DEFAULT_CLIENT_UP_MBPS = 50
-DEFAULT_CLIENT_DOWN_MBPS = 200
+DEFAULT_MASQUERADE = DEFAULT_HY2_MASQUERADE
+DEFAULT_SERVER_UP_MBPS = DEFAULT_HY2_SERVER_UP_MBPS
+DEFAULT_SERVER_DOWN_MBPS = DEFAULT_HY2_SERVER_DOWN_MBPS
+DEFAULT_CLIENT_UP_MBPS = DEFAULT_HY2_CLIENT_UP_MBPS
+DEFAULT_CLIENT_DOWN_MBPS = DEFAULT_HY2_CLIENT_DOWN_MBPS
 
 
 def _require(secrets: Mapping[str, Any], path: str, context_name: str) -> Any:
@@ -59,7 +64,8 @@ def build_context(
     protocols = []
     for protocol in plan.protocols:
         credentials = secrets.get(protocol) or {}
-        entry = _build_protocol(protocol, credentials, prefixes, cert_paths)
+        params = dict(plan.protocol_params.get(protocol) or {})
+        entry = _build_protocol(protocol, credentials, prefixes, cert_paths, params)
         protocols.append(entry)
 
     client = {"fingerprint": plan.fingerprint}
@@ -97,7 +103,9 @@ def _build_protocol(
     credentials: Mapping[str, Any],
     prefixes: Mapping[str, str],
     cert_paths: Optional[Mapping[str, str]],
+    params: Optional[Mapping[str, Any]] = None,
 ) -> dict:
+    params = params or {}
     host_key = HOST_KEYS[protocol]
     if host_key not in prefixes:
         raise AdapterError(f"subdomain prefix for {host_key!r} is required ({protocol})")
@@ -111,8 +119,11 @@ def _build_protocol(
     if protocol == "anytls":
         entry["auth"] = {"password": _require(credentials, "password", protocol)}
         entry["reality"] = {
-            "decoy_server": credentials.get("decoy_server", DEFAULT_ANYTLS_DECOY_SERVER),
-            "decoy_port": int(credentials.get("decoy_port", DEFAULT_ANYTLS_DECOY_PORT)),
+            "decoy_server": params.get("decoy_server")
+            or credentials.get("decoy_server", DEFAULT_ANYTLS_DECOY_SERVER),
+            "decoy_port": int(
+                params.get("decoy_port") or credentials.get("decoy_port", DEFAULT_ANYTLS_DECOY_PORT)
+            ),
             "private_key": _require(credentials, "private_key", protocol),
             "public_key": _require(credentials, "public_key", protocol),
             "short_id": _require(credentials, "short_id", protocol),
@@ -130,10 +141,14 @@ def _build_protocol(
             "obfs_password": _require(credentials, "obfs_password", protocol),
         }
         entry["bandwidth"] = {
-            "up_mbps": int(credentials.get("up_mbps", DEFAULT_SERVER_UP_MBPS)),
-            "down_mbps": int(credentials.get("down_mbps", DEFAULT_SERVER_DOWN_MBPS)),
+            "up_mbps": int(params.get("up_mbps") or credentials.get("up_mbps", DEFAULT_SERVER_UP_MBPS)),
+            "down_mbps": int(
+                params.get("down_mbps") or credentials.get("down_mbps", DEFAULT_SERVER_DOWN_MBPS)
+            ),
         }
-        entry["masquerade"] = credentials.get("masquerade", DEFAULT_MASQUERADE)
+        entry["masquerade"] = (
+            params.get("masquerade") or credentials.get("masquerade", DEFAULT_MASQUERADE)
+        )
         cert, key = _resolve_cert(protocol, cert_paths)
         entry["tls"] = {"cert_path": cert, "key_path": key}
     else:  # pragma: no cover - guarded by DeployPlan validation

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/src/singbox_ops/core/plan.py

@@ -106,6 +106,7 @@ class DeployPlan:
     subdomain_prefixes: Mapping[str, str] = field(default_factory=dict)
     routing: Mapping[str, Any] = field(default_factory=dict)
     dns: Mapping[str, Any] = field(default_factory=dict)
+    protocol_params: Mapping[str, Mapping[str, Any]] = field(default_factory=dict)
     fingerprint: str = DEFAULT_FINGERPRINT
     target: str = "both"
     output_format: str = DEFAULT_FORMAT
@@ -150,6 +151,8 @@ class DeployPlan:
             data["subdomain_prefixes"] = dict(self.subdomain_prefixes)
         data.setdefault("routing", dict(self.routing))
         data.setdefault("dns", dict(self.dns))
+        if self.protocol_params:
+            data["protocol_params"] = {key: dict(value) for key, value in self.protocol_params.items()}
         client = dict(data.get("client") or {})
         client.setdefault("fingerprint", self.fingerprint)
         if self.server_ip:
@@ -231,6 +234,11 @@ class DeployPlan:
             subdomain_prefixes=prefixes,
             routing=dict(_as_mapping(raw.get("routing"), "routing")),
             dns=dict(_as_mapping(raw.get("dns"), "dns")),
+            protocol_params={
+                str(proto): dict(value)
+                for proto, value in _as_mapping(raw.get("protocol_params"), "protocol_params").items()
+                if isinstance(value, Mapping)
+            },
             fingerprint=_as_str(client.get("fingerprint"), "client.fingerprint")
             or DEFAULT_FINGERPRINT,
             target=target,

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/src/singbox_ops/core/protocols.py

@@ -36,6 +36,17 @@ DEFAULT_FINGERPRINT = "chrome"
 DEFAULT_TUNNEL_MODE = "proxy"
 DEFAULT_FORMAT = "json"
 
+# Single source of truth for protocol-level defaults. Anything that wants a
+# fallback (context builder, wizard prompts, docs) reads these, so nothing is
+# hard-coded in more than one place and operators can reason about one value.
+DEFAULT_ANYTLS_DECOY_SERVER = "www.cloudflare.com"
+DEFAULT_ANYTLS_DECOY_PORT = 443
+DEFAULT_HY2_MASQUERADE = "https://www.cloudflare.com"
+DEFAULT_HY2_SERVER_UP_MBPS = 500
+DEFAULT_HY2_SERVER_DOWN_MBPS = 500
+DEFAULT_HY2_CLIENT_UP_MBPS = 50
+DEFAULT_HY2_CLIENT_DOWN_MBPS = 200
+
 #: TCP / UDP classification, used for firewall rules.
 UDP_PROTOCOLS: Tuple[str, ...] = ("tuic", "hysteria2")
 

{devconfig_gen_singbox-2.1.7 → devconfig_gen_singbox-2.1.8}/tests/test_singbox_ops_context_builder.py

@@ -49,6 +49,29 @@ class ContextBuilderTests(unittest.TestCase):
         needed = needed_certificates(self.plan)
         self.assertEqual(needed, {"tuic": "tuic", "hysteria2": "hy2"})
 
+    def test_protocol_params_override_defaults(self):
+        plan = DeployPlan.from_mapping(
+            {
+                "domain_root": "example.com",
+                "protocols": ["anytls", "hysteria2"],
+                "protocol_params": {
+                    "anytls": {"decoy_server": "react.dev", "decoy_port": 8443},
+                    "hysteria2": {"masquerade": "https://react.dev"},
+                },
+            }
+        )
+        secrets = static_secrets(("anytls", "hysteria2"))
+        context = build_context(
+            plan,
+            secrets["credentials"],
+            "203.0.113.10",
+            subdomain_prefixes=secrets["subdomain_prefixes"],
+        )
+        protos = {item["type"]: item for item in context["network"]["protocols"]}
+        self.assertEqual(protos["anytls"]["reality"]["decoy_server"], "react.dev")
+        self.assertEqual(protos["anytls"]["reality"]["decoy_port"], 8443)
+        self.assertEqual(protos["hysteria2"]["masquerade"], "https://react.dev")
+
     def test_missing_prefix_raises(self):
         from singbox_ops.core.exceptions import AdapterError
 

devconfig_gen_singbox-2.1.8/tests/test_singbox_ops_wizard.py

@@ -0,0 +1,71 @@
+import io
+import unittest
+
+from singbox_ops.cli import interactive_plan
+from singbox_ops.core.ui import UI
+
+
+def run_wizard(inputs):
+    reader = io.StringIO(inputs)
+    writer = io.StringIO()
+    return interactive_plan(reader=reader, writer=writer, ui=UI(writer))
+
+
+class WizardTests(unittest.TestCase):
+    def test_collects_dns_creds_and_protocol_params(self):
+        inputs = (
+            "example.com\n"          # domain
+            "\n"                     # protocols (default: all)
+            "none\n"                 # tunnel mode
+            "\n"                     # server ip (auto)
+            "react.dev\n"            # anytls decoy server
+            "443\n"                  # anytls decoy port
+            "https://react.dev\n"    # hy2 masquerade
+            "tok123\n"               # CF token
+            "zone456\n"              # CF zone
+            "y\n"                    # acme
+            "y\n"                    # runtime
+            "\n\n\n"                 # outputs
+        )
+        plan, env = run_wizard(inputs)
+        self.assertEqual(plan["domain_root"], "example.com")
+        self.assertEqual(plan["adapters"]["dns"], "cloudflare")
+        self.assertEqual(env["CF_Token"], "tok123")
+        self.assertEqual(plan["protocol_params"]["anytls"]["decoy_server"], "react.dev")
+        self.assertEqual(plan["protocol_params"]["anytls"]["decoy_port"], "443")
+        self.assertEqual(plan["protocol_params"]["hysteria2"]["masquerade"], "https://react.dev")
+
+    def test_acme_can_be_skipped_but_dns_cannot(self):
+        inputs = (
+            "example.com\n\nnone\n\n"
+            "\n443\n\n"              # decoy defaults, masquerade default
+            "tok\nzone\n"
+            "n\n"                    # no acme
+            "y\n"                    # runtime
+            "\n\n\n"
+        )
+        plan, env = run_wizard(inputs)
+        self.assertEqual(plan["adapters"]["dns"], "cloudflare")
+        self.assertIsNone(plan["adapters"]["acme"])
+        self.assertEqual(plan["protocol_params"]["anytls"]["decoy_server"], "www.cloudflare.com")
+
+    def test_domain_is_required(self):
+        inputs = (
+            "\n"                     # empty domain -> rejected
+            "example.com\n"
+            "\n"                     # protocols
+            "\n"                     # tunnel (default proxy)
+            "\n"                     # ip
+            "\n443\n\n"              # protocol params defaults
+            "tok\nzone\n"
+            "n\nn\n"                 # no acme, no runtime
+            "\n\n\n"
+        )
+        plan, env = run_wizard(inputs)
+        self.assertEqual(plan["domain_root"], "example.com")
+        self.assertEqual(plan["tunnel_mode"], "proxy")
+        self.assertIsNone(plan["adapters"]["runtime"]["systemd"])
+
+
+if __name__ == "__main__":
+    unittest.main()

devconfig_gen_singbox-2.1.7/tests/test_singbox_ops_wizard.py

@@ -1,67 +0,0 @@
-import io
-import unittest
-
-from singbox_ops.cli import interactive_plan
-from singbox_ops.core.ui import UI
-
-
-def run_wizard(inputs):
-    reader = io.StringIO(inputs)
-    writer = io.StringIO()
-    return interactive_plan(reader=reader, writer=writer, ui=UI(writer))
-
-
-class WizardTests(unittest.TestCase):
-    def test_dns_is_always_cloudflare_and_creds_are_collected(self):
-        inputs = (
-            "example.com\n"   # domain
-            "\n"              # protocols (default)
-            "none\n"          # tunnel mode
-            "\n"              # server ip (auto)
-            "tok123\n"        # CF token
-            "zone456\n"       # CF zone
-            "y\n"             # acme
-            "y\n"             # runtime adapters
-            "\n\n\n"          # output paths
-        )
-        plan, env = run_wizard(inputs)
-        self.assertEqual(plan["domain_root"], "example.com")
-        self.assertEqual(plan["tunnel_mode"], "none")
-        # DNS is mandatory, never optional
-        self.assertEqual(plan["adapters"]["dns"], "cloudflare")
-        self.assertEqual(env["CF_Token"], "tok123")
-        self.assertEqual(env["CF_Zone_ID"], "zone456")
-        self.assertEqual(plan["adapters"]["acme"], "cloudflare-dns01")
-
-    def test_acme_can_be_skipped_but_dns_cannot(self):
-        inputs = (
-            "example.com\n\nnone\n\n"
-            "tok\nzone\n"
-            "n\n"             # no acme
-            "y\n"             # runtime
-            "\n\n\n"
-        )
-        plan, env = run_wizard(inputs)
-        self.assertEqual(plan["adapters"]["dns"], "cloudflare")
-        self.assertIsNone(plan["adapters"]["acme"])
-        self.assertEqual(plan["adapters"]["runtime"]["auto_update"], "auto-update")
-
-    def test_domain_is_required(self):
-        inputs = (
-            "\n"              # empty domain -> rejected
-            "example.com\n"
-            "\n"              # protocols
-            "\n"              # tunnel (default proxy)
-            "\n"              # ip
-            "tok\nzone\n"
-            "n\nn\n"          # no acme, no runtime
-            "\n\n\n"
-        )
-        plan, env = run_wizard(inputs)
-        self.assertEqual(plan["domain_root"], "example.com")
-        self.assertEqual(plan["tunnel_mode"], "proxy")
-        self.assertIsNone(plan["adapters"]["runtime"]["systemd"])
-
-
-if __name__ == "__main__":
-    unittest.main()