devconfig-gen-singbox 2.1.2__tar.gz → 2.1.3__tar.gz

{devconfig_gen_singbox-2.1.2/src/devconfig_gen_singbox.egg-info → devconfig_gen_singbox-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devconfig_gen_singbox
-Version: 2.1.2
+Version: 2.1.3
 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.2-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.3-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.2 → devconfig_gen_singbox-2.1.3}/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.2-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.3-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.2 → devconfig_gen_singbox-2.1.3}/pyproject.toml

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

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/devconfig_gen/__init__.py

@@ -66,4 +66,4 @@ __all__ = [
     "loads",
     "validate_request",
 ]
-__version__ = "2.1.2"
+__version__ = "2.1.3"

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3/src/devconfig_gen_singbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devconfig_gen_singbox
-Version: 2.1.2
+Version: 2.1.3
 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.2-blue.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.1.3-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.2 → devconfig_gen_singbox-2.1.3}/src/devconfig_gen_singbox.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ src/singbox_ops/adapters/dns/cloudflare.py
 src/singbox_ops/adapters/export/__init__.py
 src/singbox_ops/adapters/export/local_files.py
 src/singbox_ops/adapters/runtime/__init__.py
+src/singbox_ops/adapters/runtime/auto_update.py
 src/singbox_ops/adapters/runtime/nftables.py
 src/singbox_ops/adapters/runtime/packages.py
 src/singbox_ops/adapters/runtime/systemd.py

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/adapters/export/local_files.py

@@ -56,6 +56,12 @@ class LocalFilesExport:
             destination = outputs.get(key)
             if not destination:
                 continue
+            # Single-file model: never write *through* a legacy symlink (for
+            # example config.json -> profiles/config.direct.json). Replace the
+            # link with a real file so the old profile-switching scheme cannot
+            # silently redirect our write.
+            if not dry_run and self.runner.islink(destination):
+                self.runner.unlink(destination)
             text = serialize_artifact(artifact)
             self.runner.write_text(destination, text, mode=0o600)
             written[key] = destination

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/adapters/runtime/__init__.py

@@ -2,16 +2,19 @@
 
 from __future__ import annotations
 
+from .auto_update import AutoUpdateRuntime, build_auto_update_script
 from .nftables import NftablesFirewall, build_nftables_conf, detect_ssh_port
 from .packages import DebianPackagesRuntime
 from .systemd import SystemdRuntime
 from .warp_watchdog import WarpWatchdogRuntime
 
 __all__ = [
+    "AutoUpdateRuntime",
     "DebianPackagesRuntime",
     "NftablesFirewall",
     "SystemdRuntime",
     "WarpWatchdogRuntime",
+    "build_auto_update_script",
     "build_nftables_conf",
     "detect_ssh_port",
 ]

devconfig_gen_singbox-2.1.3/src/singbox_ops/adapters/runtime/auto_update.py

@@ -0,0 +1,47 @@
+"""Daily sing-box auto-update job (copied verbatim from the legacy deployment).
+
+The script is shipped as a template and installed as-is, then scheduled through
+``/etc/cron.d`` so no interactive crontab editing is needed.
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Mapping, Optional
+
+from ...core.command import CommandRunner, LocalCommandRunner
+
+SCRIPT_PATH = "/usr/local/bin/singbox_auto_update.py"
+CRON_PATH = "/etc/cron.d/singbox-auto-update"
+LOG_PATH = "/var/log/singbox-auto-update.log"
+CRON_SCHEDULE = "17 4 * * *"
+
+_TEMPLATE = Path(__file__).resolve().parents[2] / "templates" / "singbox_auto_update.py.template"
+
+
+def build_auto_update_script() -> str:
+    return _TEMPLATE.read_text(encoding="utf-8")
+
+
+def build_cron_entry(script_path: str = SCRIPT_PATH, log_path: str = LOG_PATH) -> str:
+    return f"{CRON_SCHEDULE} root /usr/bin/env python3 {script_path} >> {log_path} 2>&1\n"
+
+
+class AutoUpdateRuntime:
+    def __init__(
+        self,
+        runner: Optional[CommandRunner] = None,
+        script_path: str = SCRIPT_PATH,
+        cron_path: str = CRON_PATH,
+    ):
+        self.runner = runner or LocalCommandRunner()
+        self.script_path = script_path
+        self.cron_path = cron_path
+
+    def apply(self, plan, hosts: Mapping[str, str], *, dry_run: bool = False) -> None:
+        self.runner.write_text(self.script_path, build_auto_update_script(), mode=0o755)
+        self.runner.write_text(self.cron_path, build_cron_entry(self.script_path), mode=0o644)
+
+    def destroy(self, plan, hosts: Mapping[str, str], *, dry_run: bool = False) -> None:
+        self.runner.unlink(self.cron_path, missing_ok=True)
+        self.runner.unlink(self.script_path, missing_ok=True)

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/adapters/runtime/nftables.py

@@ -90,6 +90,10 @@ class NftablesFirewall:
         ports = protocol_ports(plan.protocols)
         ssh_port = detect_ssh_port(self.runner)
         conf = build_nftables_conf(ports["tcp"], ports["udp"], ssh_port)
+        # Takeover: drop any previous table (legacy included) before applying
+        # ours, so chains never stack up and ``destroy`` cannot half-remove a
+        # foreign ruleset.
+        self.runner.run(["nft", "delete", "table", "inet", "singbox_guard"], check=False)
         self.runner.mkdir("/etc/nftables.d", mode=0o755)
         self.runner.write_text(self.conf_path, conf, mode=0o644)
         self.runner.run(["nft", "-f", self.conf_path], check=True)

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/adapters/runtime/warp_watchdog.py

@@ -62,11 +62,18 @@ class WarpWatchdogRuntime:
         self.cron_path = cron_path
 
     def apply(self, plan, hosts: Mapping[str, str], *, dry_run: bool = False) -> None:
-        if plan.tunnel_mode not in ("proxy", "tun"):
+        if plan.tunnel_mode in ("proxy", "tun"):
+            script = build_watchdog_script(plan.tunnel_mode)
+            self.runner.write_text(self.script_path, script, mode=0o755)
+            self.runner.write_text(self.cron_path, build_cron_entry(self.script_path), mode=0o644)
             return
-        script = build_watchdog_script(plan.tunnel_mode)
-        self.runner.write_text(self.script_path, script, mode=0o755)
-        self.runner.write_text(self.cron_path, build_cron_entry(self.script_path), mode=0o644)
+
+        # ``direct`` / ``none``: the server does not use WARP, so cancel the
+        # watchdog and stop the WARP daemon instead of babysitting it forever.
+        self.runner.unlink(self.cron_path, missing_ok=True)
+        self.runner.unlink(self.script_path, missing_ok=True)
+        self.runner.run(["pkill", "-9", "-x", "warp-svc"], check=False)
+        self.runner.run(["systemctl", "disable", "warp-svc"], check=False)
 
     def destroy(self, plan, hosts: Mapping[str, str], *, dry_run: bool = False) -> None:
         self.runner.unlink(self.cron_path, missing_ok=True)

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/cli.py

@@ -120,6 +120,7 @@ def interactive_plan(domain=None, protocols=None, reader=None, writer=None) -> d
                 "systemd": "systemd" if use_runtime else None,
                 "firewall": "nftables-basic" if use_runtime else None,
                 "watchdog": "warp" if use_runtime else None,
+                "auto_update": "auto-update" if use_runtime else None,
             },
         },
         "outputs": {

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/core/orchestrator.py

@@ -15,6 +15,7 @@ from devconfig_gen import formats
 from ..adapters.acme.cloudflare_dns01 import CloudflareDNS01ACME
 from ..adapters.dns.cloudflare import CloudflareDNS
 from ..adapters.export.local_files import LocalFilesExport
+from ..adapters.runtime.auto_update import AutoUpdateRuntime
 from ..adapters.runtime.nftables import NftablesFirewall
 from ..adapters.runtime.packages import DebianPackagesRuntime
 from ..adapters.runtime.systemd import SystemdRuntime
@@ -44,6 +45,7 @@ RUNTIME_FACTORIES = {
     "systemd": SystemdRuntime,
     "nftables-basic": NftablesFirewall,
     "warp": WarpWatchdogRuntime,
+    "auto-update": AutoUpdateRuntime,
 }
 STATE_FACTORIES = {"local-json": LocalJsonState}
 
@@ -59,6 +61,7 @@ class AdapterSuite:
     systemd: Optional[Any] = None
     firewall: Optional[Any] = None
     watchdog: Optional[Any] = None
+    auto_update: Optional[Any] = None
 
 
 @dataclass
@@ -126,6 +129,7 @@ def build_suite(plan: DeployPlan, runner: CommandRunner) -> AdapterSuite:
     systemd = _runtime(plan, "systemd", runtime_kwargs)
     firewall = _runtime(plan, "firewall", runtime_kwargs)
     watchdog = _runtime(plan, "watchdog", runtime_kwargs)
+    auto_update = _runtime(plan, "auto_update", runtime_kwargs)
 
     return AdapterSuite(
         secrets=secrets,
@@ -137,6 +141,7 @@ def build_suite(plan: DeployPlan, runner: CommandRunner) -> AdapterSuite:
         systemd=systemd,
         firewall=firewall,
         watchdog=watchdog,
+        auto_update=auto_update,
     )
 
 
@@ -204,6 +209,7 @@ def deploy(
         ("systemd", suite.systemd),
         ("firewall", suite.firewall),
         ("watchdog", suite.watchdog),
+        ("auto_update", suite.auto_update),
     ):
         if adapter is None:
             continue
@@ -257,6 +263,7 @@ def destroy(
 
     for key, adapter in (
         ("watchdog", suite.watchdog),
+        ("auto_update", suite.auto_update),
         ("firewall", suite.firewall),
         ("systemd", suite.systemd),
         ("packages", suite.packages),

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/src/singbox_ops/core/plan.py

@@ -40,6 +40,7 @@ DEFAULT_ADAPTERS: Mapping[str, Any] = {
         "systemd": "systemd",
         "firewall": "nftables-basic",
         "watchdog": "warp",
+        "auto_update": "auto-update",
     },
 }
 

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/tests/test_singbox_ops_runtime.py

@@ -1,5 +1,6 @@
 import unittest
 
+from singbox_ops.adapters.runtime.auto_update import AutoUpdateRuntime
 from singbox_ops.adapters.runtime.nftables import (
     NftablesFirewall,
     build_nftables_conf,
@@ -44,10 +45,12 @@ class NftablesTests(unittest.TestCase):
     def test_detect_ssh_port_default(self):
         self.assertEqual(detect_ssh_port(FakeRunner()), 22)
 
-    def test_apply_writes_and_loads(self):
+    def test_apply_deletes_legacy_table_then_loads(self):
         runner = FakeRunner()
         NftablesFirewall(runner=runner).apply(plan_for(), {})
-        self.assertTrue(any(cmd[0] == "run" and cmd[1][0] == "nft" for cmd in runner.commands))
+        runs = [cmd[1] for cmd in runner.commands if cmd[0] == "run"]
+        self.assertIn(("nft", "delete", "table", "inet", "singbox_guard"), runs)
+        self.assertTrue(any(item[0] == "nft" and item[1] == "-f" for item in runs))
         self.assertTrue(runner.writes)
 
 
@@ -80,10 +83,33 @@ class WatchdogTests(unittest.TestCase):
         self.assertIn("/root/warp_lazy_watchdog.sh", paths)
         self.assertIn("/etc/cron.d/singbox-warp-watchdog", paths)
 
-    def test_skips_for_none_mode(self):
+    def test_direct_mode_cancels_watchdog_and_kills_warp(self):
         runner = FakeRunner()
         WarpWatchdogRuntime(runner=runner).apply(plan_for("none"), {})
         self.assertEqual(runner.writes, [])
+        self.assertIn("/etc/cron.d/singbox-warp-watchdog", runner.removed)
+        self.assertIn("/root/warp_lazy_watchdog.sh", runner.removed)
+        runs = [cmd[1] for cmd in runner.commands if cmd[0] == "run"]
+        self.assertIn(("pkill", "-9", "-x", "warp-svc"), runs)
+
+
+class AutoUpdateTests(unittest.TestCase):
+    def test_apply_writes_script_and_cron(self):
+        runner = FakeRunner()
+        AutoUpdateRuntime(runner=runner).apply(plan_for("none"), {})
+        paths = [path for path, _, _ in runner.writes]
+        self.assertIn("/usr/local/bin/singbox_auto_update.py", paths)
+        self.assertIn("/etc/cron.d/singbox-auto-update", paths)
+        cron = next(text for path, text, _ in runner.writes if path.endswith("singbox-auto-update"))
+        self.assertIn("17 4 * * *", cron)
+        script = next(text for path, text, _ in runner.writes if path.endswith("singbox_auto_update.py"))
+        self.assertIn("SagerNet/sing-box", script)
+
+    def test_destroy_removes_both(self):
+        runner = FakeRunner()
+        AutoUpdateRuntime(runner=runner).destroy(plan_for("none"), {})
+        self.assertIn("/etc/cron.d/singbox-auto-update", runner.removed)
+        self.assertIn("/usr/local/bin/singbox_auto_update.py", runner.removed)
 
 
 class PackagesTests(unittest.TestCase):

{devconfig_gen_singbox-2.1.2 → devconfig_gen_singbox-2.1.3}/tests/test_singbox_ops_state_export.py

@@ -42,6 +42,16 @@ class ExportTests(unittest.TestCase):
         self.assertEqual(match_output_key("sing-box-links.txt"), "links")
         self.assertIsNone(match_output_key("unknown.txt"))
 
+    def test_replaces_symlink_destination(self):
+        runner = FakeRunner(links=["/etc/sing-box/config.json"])
+        artifacts = [
+            GeneratedArtifact("sing-box.server.json", {"a": 1}, "application/json"),
+        ]
+        LocalFilesExport(runner=runner).write(artifacts, {"server_config": "/etc/sing-box/config.json"})
+        # the legacy symlink is removed, then a real file is written
+        self.assertIn("/etc/sing-box/config.json", runner.removed)
+        self.assertTrue(any(path == "/etc/sing-box/config.json" for path, _, _ in runner.writes))
+
     def test_writes_artifacts(self):
         runner = FakeRunner()
         artifacts = [