sing-box-cli 0.0.12__tar.gz → 0.0.13__tar.gz

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
         files: \.(py|sh|json|yml|yaml|md)$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.4
+    rev: v0.9.9
     hooks:
       - id: ruff
         args: [--fix]
@@ -37,7 +37,7 @@ repos:
 
   - repo: https://github.com/astral-sh/uv-pre-commit
     # uv version.
-    rev: 0.5.27
+    rev: 0.6.3
     hooks:
       # Update the uv lockfile
       - id: uv-lock

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.0.13 - 2025-03-08
+
+### 🚀 Features
+
+- Show diff after updating config
+
+### 📚 Documentation
+
+- Add sniff action
+- Update cloudflare ip
+- Client-server config
+- Update config
+- Update ntp server
+
+### 🧪 Testing
+
+- Add tests as scripts target
+
 ## 0.0.12 - 2025-02-28
 
 ### 🐛 Bug Fixes

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sing-box-cli
-Version: 0.0.12
+Version: 0.0.13
 Summary: cross-platform sing-box-service manager.
 Project-URL: Homepage, https://github.com/aittcuszz/sing-box-service
 Project-URL: Issues, https://github.com/atticuszz/sing-box-service/issues

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/config/client-android.json

@@ -6,14 +6,20 @@
   "dns": {
     "servers": [
       {
-        "tag": "dns_direct",
+        "tag": "dns_resolver",
         "address": "h3://223.6.6.6/dns-query",
         "detour": "direct"
       },
+      {
+        "tag": "dns_direct",
+        "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
+        "address_resolver": "dns_resolver",
+        "detour": "direct"
+      },
       {
         "tag": "dns_proxy",
         "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
-        "address_resolver": "dns_direct",
+        "address_resolver": "dns_resolver",
         "client_subnet": "137.184.125.132",
         "detour": "proxy"
       },
@@ -51,6 +57,7 @@
     "reverse_mapping": true,
     "cache_capacity": 4096,
     "strategy": "prefer_ipv4",
+    "client_subnet": "180.110.148.0/24",
     "fakeip": {
       "enabled": true,
       "inet4_range": "198.18.0.0/15",
@@ -109,7 +116,7 @@
       "tag": "🌟San Francisco WS",
       "tcp_fast_open": true,
       "udp_fragment": true,
-      "server": "172.66.45.88",
+      "server": "104.19.255.210",
       "server_port": 2053,
       "uuid": "6a5f528d-1641-406f-95b8-ee9c574d79b3",
       "tls": {
@@ -130,7 +137,7 @@
     {
       "type": "vless",
       "tag": "🌩️San Francisco WS",
-      "server": "104.23.96.99",
+      "server": "104.24.13.124",
       "server_port": 443,
       "uuid": "717f9e5c-9922-49a0-aa12-3fa17d63a7a8",
       "tls": {

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/config/client-linux.json

@@ -6,14 +6,20 @@
   "dns": {
     "servers": [
       {
-        "tag": "dns_direct",
+        "tag": "dns_resolver",
         "address": "h3://223.6.6.6/dns-query",
         "detour": "direct"
       },
+      {
+        "tag": "dns_direct",
+        "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
+        "address_resolver": "dns_resolver",
+        "detour": "direct"
+      },
       {
         "tag": "dns_proxy",
         "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
-        "address_resolver": "dns_direct",
+        "address_resolver": "dns_resolver",
         "client_subnet": "137.184.125.132",
         "detour": "proxy"
       },
@@ -51,6 +57,7 @@
     "reverse_mapping": true,
     "cache_capacity": 4096,
     "strategy": "prefer_ipv4",
+    "client_subnet": "180.110.148.0/24",
     "fakeip": {
       "enabled": true,
       "inet4_range": "198.18.0.0/15",
@@ -61,7 +68,7 @@
   "ntp": {
     "enabled": true,
     "interval": "30m0s",
-    "server": "time.tencent.com",
+    "server": "time.cloudflare.com",
     "write_to_system": true,
     "server_port": 123
   },
@@ -102,7 +109,7 @@
       "tag": "🌟San Francisco WS",
       "tcp_fast_open": true,
       "udp_fragment": true,
-      "server": "172.66.45.88",
+      "server": "104.19.255.210",
       "server_port": 2053,
       "uuid": "6a5f528d-1641-406f-95b8-ee9c574d79b3",
       "tls": {
@@ -123,7 +130,7 @@
     {
       "type": "vless",
       "tag": "🌩️San Francisco WS",
-      "server": "104.23.96.99",
+      "server": "104.24.13.124",
       "server_port": 443,
       "uuid": "717f9e5c-9922-49a0-aa12-3fa17d63a7a8",
       "tls": {

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/config/client-server.json

@@ -6,16 +6,22 @@
   "dns": {
     "servers": [
       {
-        "tag": "dns_direct",
+        "tag": "dns_resolver",
         "address": "h3://223.6.6.6/dns-query",
         "detour": "direct"
       },
+      {
+        "tag": "dns_direct",
+        "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
+        "address_resolver": "dns_resolver",
+        "detour": "direct"
+      },
       {
         "tag": "dns_proxy",
         "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
-        "address_resolver": "dns_direct",
+        "address_resolver": "dns_resolver",
         "client_subnet": "137.184.125.132",
-        "detour": "⚡San Francisco Hy2"
+        "detour": "proxy"
       },
       {
         "tag": "dns_fakeip",
@@ -51,6 +57,7 @@
     "reverse_mapping": true,
     "cache_capacity": 4096,
     "strategy": "prefer_ipv4",
+    "client_subnet": "180.110.148.0/24",
     "fakeip": {
       "enabled": true,
       "inet4_range": "198.18.0.0/15",
@@ -90,7 +97,7 @@
       "tag": "🌟San Francisco WS",
       "tcp_fast_open": true,
       "udp_fragment": true,
-      "server": "104.23.96.99",
+      "server": "104.19.255.210",
       "server_port": 2053,
       "uuid": "6a5f528d-1641-406f-95b8-ee9c574d79b3",
       "tls": {
@@ -111,7 +118,7 @@
     {
       "type": "vless",
       "tag": "🌩️San Francisco WS",
-      "server": "104.23.96.99",
+      "server": "104.24.13.124",
       "server_port": 443,
       "uuid": "717f9e5c-9922-49a0-aa12-3fa17d63a7a8",
       "tls": {

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/config/client-win.json

@@ -6,14 +6,20 @@
   "dns": {
     "servers": [
       {
-        "tag": "dns_direct",
+        "tag": "dns_resolver",
         "address": "h3://223.6.6.6/dns-query",
         "detour": "direct"
       },
+      {
+        "tag": "dns_direct",
+        "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
+        "address_resolver": "dns_resolver",
+        "detour": "direct"
+      },
       {
         "tag": "dns_proxy",
         "address": "h3://dns.atticux.me/dns-query/asfljsndfaoifa",
-        "address_resolver": "dns_direct",
+        "address_resolver": "dns_resolver",
         "client_subnet": "137.184.125.132",
         "detour": "proxy"
       },
@@ -51,6 +57,7 @@
     "reverse_mapping": true,
     "cache_capacity": 4096,
     "strategy": "prefer_ipv4",
+    "client_subnet": "180.110.148.0/24",
     "fakeip": {
       "enabled": true,
       "inet4_range": "198.18.0.0/15",
@@ -61,7 +68,7 @@
   "ntp": {
     "enabled": true,
     "interval": "30m0s",
-    "server": "time.tencent.com",
+    "server": "time.cloudflare.com",
     "write_to_system": true,
     "server_port": 123
   },
@@ -101,7 +108,7 @@
       "tag": "🌟San Francisco WS",
       "tcp_fast_open": true,
       "udp_fragment": true,
-      "server": "172.66.45.88",
+      "server": "104.19.255.210",
       "server_port": 2053,
       "uuid": "6a5f528d-1641-406f-95b8-ee9c574d79b3",
       "tls": {
@@ -122,7 +129,7 @@
     {
       "type": "vless",
       "tag": "🌩️San Francisco WS",
-      "server": "104.23.96.99",
+      "server": "104.24.13.124",
       "server_port": 443,
       "uuid": "717f9e5c-9922-49a0-aa12-3fa17d63a7a8",
       "tls": {

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/config/server.json

@@ -87,6 +87,9 @@
   ],
   "route": {
     "rules": [
+      {
+        "action": "sniff"
+      },
       {
         "domain_suffix": [
           "kaggle.com",

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/pyproject.toml

@@ -58,6 +58,7 @@ dev = [
     "typos>=1.26.8",
     "types-psutil>=6.1.0.20241221",
     "types-requests>=2.32.0.20241016",
+    "pytest>=8.3.5",
 ]
 
 [tool.hatch.version]
@@ -209,7 +210,7 @@ sort_commits = "oldest"
 
 
 [tool.bumpversion]
-current_version = "0.0.12"
+current_version = "0.0.13"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

sing_box_cli-0.0.13/scripts/format.sh

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+set -x
+
+ruff check src tests --fix
+ruff format src tests

sing_box_cli-0.0.13/scripts/pre-commit.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+
+pre-commit run --all-files
+bash scripts/format.sh
+bash scripts/lint.sh
+pytest

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/src/sing_box_service/__init__.py

@@ -2,4 +2,4 @@ from .main import main
 
 __all__ = ["main"]
 
-__version__ = "0.0.12"
+__version__ = "0.0.13"

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/src/sing_box_service/config.py

@@ -59,18 +59,31 @@ class Config:
         return self.subscription_file.read_text().strip()
 
     def update_config(self) -> bool:
+        """download configuration from subscription URL and show differences"""
         if not self.sub_url:
             print("❌ No valid subscription URL found.")
             return False
 
+        current_config = (
+            self.config_file.read_text(encoding="utf-8")
+            if self.config_file.exists()
+            else "{}"
+        )
         print(f"⌛ Updating configuration from {self.sub_url}")
         try:
             response = requests.get(self.sub_url)
             response.raise_for_status()
-            self.config_file.write_text(response.text, encoding="utf-8")
+            new_config = response.text
+            self.config_file.write_text(new_config, encoding="utf-8")
             if not self.is_windows:
                 shutil.chown(self.config_file, user=self.user, group=self.user)
-            print("✅ Configuration updated successfully.")
+
+            if current_config == new_config:
+                print("📄 Configuration is up to date.")
+            else:
+                show_diff_config(current_config, new_config)
+                print("🔄 Configuration updated successfully")
+
             return True
         except Exception as e:
             print(f"❌ Failed to update configuration: {e}")
@@ -101,3 +114,30 @@ class Config:
             print("🗑️ Cache database removed.")
         else:
             print("❌ Cache database not found.")
+
+
+def show_diff_config(current_config: str, new_config: str) -> None:
+    print("📄 Configuration differences:")
+    from difflib import unified_diff
+
+    diff = list(
+        unified_diff(
+            current_config.splitlines(),
+            new_config.splitlines(),
+            fromfile="old",
+            tofile="new",
+            lineterm="",
+        )
+    )
+
+    for line in diff:
+        if line.startswith("+"):
+            print(f"[green]{line}[/green]")
+        elif line.startswith("-"):
+            print(f"[red]{line}[/red]")
+        elif line.startswith("@@"):
+            print(f"[blue]{line}[/blue]")
+        elif line.startswith(("---", "+++")):
+            print(f"[dim]{line}[/dim]")
+        else:
+            print(f"[white]{line}[/white]")

sing_box_cli-0.0.13/tests/test_config.py

@@ -0,0 +1,72 @@
+import pytest
+
+from sing_box_service.config import show_diff_config
+
+
+def test_show_diff_config(capsys: pytest.CaptureFixture[str]) -> None:
+    # Test with complex configs and sensitive data changes
+    current = """{
+      "outbounds": [
+        {
+          "type": "vless",
+          "tag": "🌟Server WS",
+          "server": "104.19.255.210",
+          "uuid": "old-uuid-value",
+          "tls": {
+            "server_name": "cdn.example.com"
+          }
+        }
+      ]
+    }"""
+
+    new = """{
+      "outbounds": [
+        {
+          "type": "vless",
+          "tag": "🌟Server WS",
+          "server": "104.19.255.210",
+          "uuid": "new-uuid-value",
+          "tls": {
+            "server_name": "cdn.example.com"
+          }
+        }
+      ]
+    }"""
+
+    # Call function
+    show_diff_config(current, new)
+
+    # Get printed output
+    captured = capsys.readouterr()
+    output = captured.out
+
+    # Verify output contains key elements
+    assert "📄 Configuration differences:" in output
+    assert "---" in output  # unified diff header
+    assert "+++" in output  # unified diff header
+    assert '-          "uuid": "old-uuid-value",' in output
+    assert '+          "uuid": "new-uuid-value",' in output
+
+
+def test_show_diff_config_no_changes(capsys: pytest.CaptureFixture[str]) -> None:
+    # Test with identical configs
+    config = """{"key": "value"}"""
+
+    show_diff_config(config, config)
+
+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "📄 Configuration differences:" in output
+    assert len(output.splitlines()) == 1  # Only header line
+
+
+def test_show_diff_config_empty(capsys: pytest.CaptureFixture[str]) -> None:
+    # Test with empty configs
+    show_diff_config("", "")
+
+    captured = capsys.readouterr()
+    output = captured.out
+
+    assert "📄 Configuration differences:" in output
+    assert len(output.splitlines()) == 1  # Only header line

{sing_box_cli-0.0.12 → sing_box_cli-0.0.13}/uv.lock

@@ -1,4 +1,5 @@
 version = 1
+revision = 1
 requires-python = ">=3.10"
 resolution-markers = [
     "sys_platform == 'win32'",
@@ -151,6 +152,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/91/a1/cf2472db20f7ce4a6be1253a81cfdf85ad9c7885ffbed7047fb72c24cf87/distlib-0.3.9-py2.py3-none-any.whl", hash = "sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87", size = 468973 },
 ]
 
+[[package]]
+name = "exceptiongroup"
+version = "1.2.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/09/35/2495c4ac46b980e4ca1f6ad6db102322ef3ad2410b79fdde159a4b0f3b92/exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc", size = 28883 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", size = 16453 },
+]
+
 [[package]]
 name = "filelock"
 version = "3.16.1"
@@ -193,6 +203,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442 },
 ]
 
+[[package]]
+name = "iniconfig"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913/iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", size = 4646 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374", size = 5892 },
+]
+
 [[package]]
 name = "markdown-it-py"
 version = "3.0.0"
@@ -262,6 +281,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d2/1d/1b658dbd2b9fa9c4c9f32accbfc0205d532c8c6194dc0f2a4c0428e7128a/nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9", size = 22314 },
 ]
 
+[[package]]
+name = "packaging"
+version = "24.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da/packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f", size = 163950 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759", size = 65451 },
+]
+
 [[package]]
 name = "platformdirs"
 version = "4.3.6"
@@ -271,6 +299,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/3c/a6/bc1012356d8ece4d66dd75c4b9fc6c1f6650ddd5991e421177d9f8f671be/platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb", size = 18439 },
 ]
 
+[[package]]
+name = "pluggy"
+version = "1.5.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6/pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", size = 67955 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669", size = 20556 },
+]
+
 [[package]]
 name = "pre-commit"
 version = "4.0.1"
@@ -413,6 +450,23 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293 },
 ]
 
+[[package]]
+name = "pytest"
+version = "8.3.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "exceptiongroup", marker = "(python_full_version < '3.11' and sys_platform == 'linux') or (python_full_version < '3.11' and sys_platform == 'win32')" },
+    { name = "iniconfig", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
+    { name = "packaging", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
+    { name = "pluggy", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
+    { name = "tomli", marker = "(python_full_version < '3.11' and sys_platform == 'linux') or (python_full_version < '3.11' and sys_platform == 'win32')" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ae/3c/c9d525a414d506893f0cd8a8d0de7706446213181570cdbd766691164e40/pytest-8.3.5.tar.gz", hash = "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845", size = 1450891 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/30/3d/64ad57c803f1fa1e963a7946b6e0fea4a70df53c1a7fed304586539c2bac/pytest-8.3.5-py3-none-any.whl", hash = "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", size = 343634 },
+]
+
 [[package]]
 name = "python-dotenv"
 version = "1.0.1"
@@ -560,6 +614,7 @@ dev = [
     { name = "git-cliff", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
     { name = "mypy", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
     { name = "pre-commit", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
+    { name = "pytest", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
     { name = "ruff", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
     { name = "types-psutil", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
     { name = "types-requests", marker = "sys_platform == 'linux' or sys_platform == 'win32'" },
@@ -579,6 +634,7 @@ dev = [
     { name = "git-cliff", specifier = ">=2.6.1" },
     { name = "mypy", specifier = ">=1.11.2" },
     { name = "pre-commit", specifier = ">=3.8.0" },
+    { name = "pytest", specifier = ">=8.3.5" },
     { name = "ruff", specifier = ">=0.6.3" },
     { name = "types-psutil", specifier = ">=6.1.0.20241221" },
     { name = "types-requests", specifier = ">=2.32.0.20241016" },

sing_box_cli-0.0.12/scripts/format.sh

@@ -1,5 +0,0 @@
-#!/bin/sh -e
-set -x
-
-ruff check src --fix
-ruff format src