sing-box-cli 0.0.14__tar.gz → 0.0.15__tar.gz

{sing_box_cli-0.0.14 → sing_box_cli-0.0.15}/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.0.15 - 2025-03-10
+
+### 🚀 Features
+
+- Add version command
+- Show config file path while invoking command
+
+### 🐛 Bug Fixes
+
+- Remove service file while disable service
+- Potential crash while init directory
+- Redundant logs
+- Logs info
+
+### 🚜 Refactor
+
+- Remove update command
+- Config info
+
+### 📚 Documentation
+
+- Fix function docstring
+
 ## 0.0.14 - 2025-03-10
 
 ### 🐛 Bug Fixes

{sing_box_cli-0.0.14 → sing_box_cli-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sing-box-cli
-Version: 0.0.14
+Version: 0.0.15
 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.14 → sing_box_cli-0.0.15}/pyproject.toml

@@ -210,7 +210,7 @@ sort_commits = "oldest"
 
 
 [tool.bumpversion]
-current_version = "0.0.14"
+current_version = "0.0.15"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{sing_box_cli-0.0.14 → sing_box_cli-0.0.15}/src/sing_box_service/__init__.py

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

{sing_box_cli-0.0.14 → sing_box_cli-0.0.15}/src/sing_box_service/config.py

@@ -25,7 +25,6 @@ class Config:
             raise FileNotFoundError(f"❌ {bin_filename} not found in PATH")
 
         self.bin_path = Path(bin_path)
-        print(f"🔧 Using binary: {self.bin_path}")
 
         if self.is_windows:
             self.install_dir = Path(os.environ["ProgramFiles"]) / "sing-box"
@@ -37,20 +36,27 @@ class Config:
         self.subscription_file = self.install_dir / "subscription.txt"
         self.cache_db = self.install_dir / "cache.db"
 
-    def init_directories(self) -> None:
-        self.install_dir.mkdir(parents=True, exist_ok=True)
-        if not self.config_file.exists():
-            self.config_file.write_text("{}")
-            print(f"📁 Created empty config file: {self.config_file}")
+        print(self)
 
-        if not self.subscription_file.exists():
-            self.subscription_file.touch()
-            print(f"📁 Created subscription file: {self.subscription_file}")
+    def init_directories(self) -> bool:
+        try:
+            self.install_dir.mkdir(parents=True, exist_ok=True)
+            if not self.config_file.exists():
+                self.config_file.write_text("{}")
+                print(f"📁 Created empty config file: {self.config_file}")
+
+            if not self.subscription_file.exists():
+                self.subscription_file.touch()
+                print(f"📁 Created subscription file: {self.subscription_file}")
 
-        if not self.is_windows:
-            shutil.chown(self.install_dir, user=self.user, group=self.user)
-            shutil.chown(self.config_file, user=self.user, group=self.user)
-            shutil.chown(self.subscription_file, user=self.user, group=self.user)
+            if not self.is_windows:
+                shutil.chown(self.install_dir, user=self.user, group=self.user)
+                shutil.chown(self.config_file, user=self.user, group=self.user)
+                shutil.chown(self.subscription_file, user=self.user, group=self.user)
+        except Exception as e:
+            print(f"❌ Failed to initialize directories: {e}")
+            return False
+        return True
 
     @property
     def sub_url(self) -> str:
@@ -82,7 +88,6 @@ class 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:
@@ -93,18 +98,16 @@ class Config:
         if not url.startswith(("http://", "https://")):
             print("❌ Invalid URL format.")
             return False
-        self.subscription_file.write_text(url)
+        self.subscription_file.write_text(url.strip())
         print("📁 Subscription added successfully.")
         return True
 
     def show_config(self) -> None:
-        print(f"📄 Configuration file: {self.config_file}")
         print(self.config_file.read_text(encoding="utf-8"))
 
     def show_subscription(self) -> None:
         if self.sub_url:
-            print("🔗 Current subscription URL:")
-            print(self.sub_url)
+            print(f"🔗 Current subscription URL: {self.sub_url}")
         else:
             print("❌ No subscription URL found.")
 
@@ -115,6 +118,16 @@ class Config:
         else:
             print("❌ Cache database not found.")
 
+    def __str__(self) -> str:
+        info = (
+            f"🔧 Using binary: {self.bin_path}\n"
+            f"📄 Using configuration: {self.config_file}"
+        )
+
+        if self.is_windows:
+            info += f"\n📁 Using installation directory: {self.install_dir}"
+        return info
+
 
 def show_diff_config(current_config: str, new_config: str) -> None:
     print("📄 Configuration differences:")

{sing_box_cli-0.0.14 → sing_box_cli-0.0.15}/src/sing_box_service/main.py

@@ -24,6 +24,8 @@ class SingBoxCLI:
             if self.config.is_windows
             else LinuxServiceManager(self.config)
         )
+        if not self.config.init_directories():
+            typer.Exit(1)
 
     def ensure_root(self) -> None:
         """https://gist.github.com/RDCH106/fdd419ef7dd803932b16056aab1d2300"""
@@ -39,42 +41,54 @@ class SingBoxCLI:
                 sys.exit(1)
 
 
-@service.command("start")
-def service_start() -> None:
-    """Start sing-box service"""
+@service.command("enable")
+def service_enable() -> None:
+    """Create sing-box service, enable autostart and start service"""
     cli = SingBoxCLI()
     cli.ensure_root()
-    cli.config.init_directories()
     cli.service.create_service()
     cli.service.start()
-    print("✅ Service started.")
+    print("✔️  Service started.")
     print("🔗 Dashboard URL: https://metacubexd.atticux.me/")
     print("🔌 Default API: http://127.0.0.1:9090")
 
 
-@service.command("stop")
-def service_stop() -> None:
-    """Stop sing-box service"""
+@service.command("disable")
+def service_disable() -> None:
+    """Stop service, disable sing-box service autostart and remove service"""
     cli = SingBoxCLI()
     cli.ensure_root()
     cli.service.stop()
-    print("✋ Service stopped.")
+    cli.service.disable()
+    print("✋ Autostart disabled.")
 
 
 @service.command("restart")
 def service_restart() -> None:
-    """Restart sing-box service"""
+    """Restart sing-box service, update configuration if needed, create service if not exists"""
     cli = SingBoxCLI()
     cli.ensure_root()
     if not cli.service.check_service():
         cli.service.create_service()
-        print("⌛ Service created successfully.")
-    cli.service.restart()
-    print("✅ Service restarted.")
+    if cli.config.update_config():
+        cli.service.restart()
+    else:
+        print("❌ Failed to update configuration.")
+        typer.Exit(1)
+    print("✔️  Service restarted.")
     print("🔗 Dashboard URL: https://metacubexd.atticux.me/")
     print("🔌 Default API: http://127.0.0.1:9090")
 
 
+@service.command("stop")
+def service_stop() -> None:
+    """Stop sing-box service"""
+    cli = SingBoxCLI()
+    cli.ensure_root()
+    cli.service.stop()
+    print("✋ Service stopped.")
+
+
 @service.command("status")
 def service_status() -> None:
     """Check service status"""
@@ -84,14 +98,11 @@ def service_status() -> None:
     print(f"🏃 Service status: {status}")
 
 
-@service.command("disable")
-def service_disable() -> None:
-    """Disable sing-box service autostart"""
+@service.command("logs")
+def service_logs() -> None:
+    """Show sing-box service logs"""
     cli = SingBoxCLI()
-    cli.ensure_root()
-    cli.service.stop()
-    cli.service.disable()
-    print("✋ Autostart disabled.")
+    cli.service.logs()
 
 
 @config.command("add-sub")
@@ -100,17 +111,14 @@ def config_add_sub(url: str) -> None:
     cli = SingBoxCLI()
     cli.ensure_root()
     if cli.config.add_subscription(url):
+        # restart service if subscription is updated
+        if not cli.service.check_service():
+            cli.service.create_service()
+            print("⌛ Service created successfully.")
         if cli.config.update_config():
             cli.service.restart()
-
-
-@config.command("update")
-def config_update() -> None:
-    """Update configuration from subscription URL"""
-    cli = SingBoxCLI()
-    cli.ensure_root()
-    if cli.config.update_config():
-        cli.service.restart()
+        else:
+            typer.Exit(1)
 
 
 @config.command("show-sub")
@@ -122,7 +130,7 @@ def config_show_sub() -> None:
 
 @config.command("show")
 def config_show() -> None:
-    """Show configuration"""
+    """Show configuration file"""
     cli = SingBoxCLI()
     cli.config.show_config()
 
@@ -135,10 +143,13 @@ def config_clean_cache() -> None:
 
 
 @app.command()
-def logs() -> None:
-    """Show sing-box service logs"""
+def version() -> None:
+    """Show version"""
+    from . import __version__
+
     cli = SingBoxCLI()
-    cli.service.logs()
+    print(f"🔖 sing-box-cli {__version__}")
+    print(f"📦 {cli.service.version()}")
 
 
 def main() -> None:

{sing_box_cli-0.0.14 → sing_box_cli-0.0.15}/src/sing_box_service/service.py

@@ -32,6 +32,9 @@ class ServiceManager:
     def disable(self) -> None:
         raise NotImplementedError()
 
+    def version(self) -> str:
+        raise NotImplementedError()
+
 
 class WindowsServiceManager(ServiceManager):
     def __init__(self, config: Config):
@@ -150,6 +153,10 @@ if ($task) {{
             ]
         )
 
+    def version(self) -> str:
+        result = subprocess.run([self.config.bin_path, "version"], capture_output=True)
+        return result.stdout.decode("utf-8").strip()
+
 
 class LinuxServiceManager(ServiceManager):
     def __init__(self, config: Config):
@@ -222,3 +229,9 @@ WantedBy=multi-user.target
     def disable(self) -> None:
         self.stop()
         subprocess.run(["systemctl", "disable", self.service_name])
+        if self.service_file.exists():
+            self.service_file.unlink()
+
+    def version(self) -> str:
+        result = subprocess.run([self.config.bin_path, "version"], capture_output=True)
+        return result.stdout.decode("utf-8").strip()