sing-box-cli 0.1.6__tar.gz → 0.1.7__tar.gz

{sing_box_cli-0.1.6 → sing_box_cli-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sing-box-cli
-Version: 0.1.6
+Version: 0.1.7
 Summary: cross-platform sing-box 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.1.6 → sing_box_cli-0.1.7}/docs/config-serve.md

@@ -33,9 +33,9 @@ every token for that file without affecting other files. Multiple tokens may
 authorize the same file, so rotation can create a replacement before revoking the
 old token. Revocation never prints the secret.
 
-The longer `config serve token -l/-c/-r` forms remain supported. The previous
-`config serve token create/list/revoke` subcommands remain hidden compatibility
-aliases; the legacy `revoke NAME` form still accepts a token name.
+Token management uses only the top-level `sbc token` options. The previous
+`config serve token` entry point and `token create/list/revoke` subcommands have
+been removed.
 
 Clients can send the token as a Bearer header using `-t` / `--token`, or use the
 printed URL with `?token=...` in applications that cannot set headers:

{sing_box_cli-0.1.6 → sing_box_cli-0.1.7}/pyproject.toml

@@ -215,7 +215,7 @@ topo_order = false
 sort_commits = "oldest"
 
 [tool.bumpversion]
-current_version        = "0.1.6"
+current_version        = "0.1.7"
 parse                  = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize              = ["{major}.{minor}.{patch}"]
 search                 = "{current_version}"

{sing_box_cli-0.1.6 → sing_box_cli-0.1.7}/src/sing_box_cli/__init__.py

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

{sing_box_cli-0.1.6 → sing_box_cli-0.1.7}/src/sing_box_cli/config/serve.py

@@ -25,17 +25,10 @@ from .serve_backend import (
     state_directory,
     validate_config,
 )
-from .serve_tokens import (
-    create_token,
-    load_tokens,
-    revoke_subscription_tokens,
-    revoke_token,
-)
+from .serve_tokens import create_token, load_tokens, revoke_subscription_tokens
 
 WORKER_MODULE = "sing_box_cli.config._serve_worker"
 serve = typer.Typer(help="Serve private GitHub configurations through your own domain.")
-tokens = typer.Typer(help="Create, list and revoke independent subscription tokens.")
-serve.add_typer(tokens, name="token")
 
 
 class ProcessState(BaseModel):
@@ -278,7 +271,6 @@ def start(
         print(f"Log: {directory / 'serve.log'}")
 
 
-@tokens.callback(invoke_without_command=True)
 def token_options(
     ctx: typer.Context,
     list_: Annotated[
@@ -310,12 +302,8 @@ def token_options(
         str | None, typer.Option("--name", "-n", help="Optional name for a new token.")
     ] = None,
 ) -> None:
-    """Manage subscription tokens with -l, -c FILE or -r TOKEN_OR_FILE."""
+    """Create, list and revoke independent subscription tokens."""
     actions = int(list_) + int(create is not None) + int(revoke is not None)
-    if ctx.invoked_subcommand is not None:
-        if actions or domain is not None or name is not None:
-            raise typer.BadParameter("Use options or a legacy subcommand, not both.")
-        return
     if actions == 0 and domain is None and name is None:
         print(ctx.get_help())
         return
@@ -348,18 +336,7 @@ def token_options(
             print(f"Revoked {count} subscription token(s).")
 
 
-@tokens.command("create", hidden=True)
-def token_create(
-    name: Annotated[
-        str, typer.Argument(help="Unique name for this subscription token.")
-    ],
-    domain: Annotated[
-        str, typer.Option("--domain", help="Registered subscription domain.")
-    ],
-    filename: Annotated[
-        str, typer.Option("--file", help="Root configuration filename.")
-    ],
-) -> None:
+def token_create(name: str, domain: str, filename: str) -> None:
     """Generate a file-scoped token and print its secret and URL once."""
     with command_errors():
         domain = normalize_domain(domain)
@@ -379,7 +356,6 @@ def token_create(
         print("Save the token now; only its hash is stored on the server.")
 
 
-@tokens.command("list", hidden=True)
 def token_list() -> None:
     """List token names and scopes without displaying their secrets."""
     with command_errors():
@@ -390,20 +366,6 @@ def token_list() -> None:
             print(f"{item.name}\t{item.domain}\t{item.filename}\t{item.created_at}")
 
 
-@tokens.command("revoke", hidden=True)
-def token_revoke(
-    name: Annotated[
-        str, typer.Argument(help="Name of the subscription token to revoke.")
-    ],
-) -> None:
-    """Revoke a token; the next request is denied without a service restart."""
-    with command_errors():
-        directory = state_directory()
-        with control_lock(directory):
-            revoke_token(directory, name)
-        print(f"Revoked subscription token: {name}")
-
-
 @serve.command("stop")
 def stop() -> None:
     """Stop this user's background configuration service."""

{sing_box_cli-0.1.6 → sing_box_cli-0.1.7}/src/sing_box_cli/main.py

@@ -9,7 +9,7 @@ from sing_box_cli.api import api as api_app
 from sing_box_cli.common import ClearCacheOption, UpdateConfigOption, ensure_root
 from sing_box_cli.config import config as config_app
 from sing_box_cli.config.config import get_config, run_args
-from sing_box_cli.config.serve import tokens as token_app
+from sing_box_cli.config.serve import token_options
 from sing_box_cli.installation import install_launchers
 from sing_box_cli.service import SharedContext, get_context_obj, service as service_app
 from sing_box_cli.service.manager import create_service
@@ -18,7 +18,7 @@ app = typer.Typer(help="sing-box manager.")
 app.add_typer(api_app)
 app.add_typer(service_app, name="service")
 app.add_typer(config_app, name="config")
-app.add_typer(token_app, name="token")
+app.command("token")(token_options)
 
 
 @app.callback(invoke_without_command=False)