servctl 1.0.1__tar.gz → 1.0.2__tar.gz

{servctl-1.0.1 → servctl-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: servctl
-Version: 1.0.1
+Version: 1.0.2
 Summary: Unprivileged background server and localhost proxy CLI manager
 Author: avevall
 Keywords: cli,devops,dns,doh,ftp,localhost,proxy,server

{servctl-1.0.1 → servctl-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "servctl"
-version = "1.0.1"
+version = "1.0.2"
 description = "Unprivileged background server and localhost proxy CLI manager"
 readme = "README.md"
 requires-python = ">=3.8"

{servctl-1.0.1 → servctl-1.0.2}/src/servctl/main.py

@@ -995,7 +995,7 @@ def run_worker(args):
         server.serve_forever()
 
 # ---------------------------------------------------------------------------
-# CLI Command Implementations
+# CLI Commands
 # ---------------------------------------------------------------------------
 
 def cmd_start(args):
@@ -1131,7 +1131,7 @@ def cmd_list(args):
     print(sep)
     print("Tip: Run 'servctl status show <ID>' to view full connection URLs and configuration.\n")
 
-def cmd_status(args):
+def cmd_status_show(args):
     reg = clean_registry()
     if not reg:
         print("No servers running. Start one using: servctl start")
@@ -1139,97 +1139,120 @@ def cmd_status(args):
 
     lan_ip = get_local_ip()
 
-    # Subcommand: status show
-    if args.status_cmd == "show":
-        if args.all or not args.target:
-            print("\nDetailed Server Configurations & Status:")
-            for sid, meta in reg.items():
-                print_server_status_card(meta, lan_ip)
-            print()
-        else:
-            matched = False
-            for sid, meta in reg.items():
-                if sid == args.target or str(meta["port"]) == args.target:
-                    print(f"\nConfiguration & Runtime for '{sid}':")
-                    print_server_status_card(meta, lan_ip)
-                    print()
-                    matched = True
-                    break
-            if not matched:
-                print(f"Error: No running server matching '{args.target}'.")
-
-    # Subcommand: status change
-    elif args.status_cmd == "change":
-        target_id = None
+    if getattr(args, "all", False) or not getattr(args, "target", None):
+        print("\nDetailed Server Configurations & Status:")
+        for sid, meta in reg.items():
+            print_server_status_card(meta, lan_ip)
+        print()
+    else:
+        matched = False
         for sid, meta in reg.items():
             if sid == args.target or str(meta["port"]) == args.target:
-                target_id = sid
+                print(f"\nConfiguration & Runtime for '{sid}':")
+                print_server_status_card(meta, lan_ip)
+                print()
+                matched = True
                 break
-
-        if not target_id:
+        if not matched:
             print(f"Error: No running server matching '{args.target}'.")
-            return
 
-        old_meta = reg[target_id]
-        new_port = args.port if args.port is not None else old_meta["port"]
-        new_access = args.access if args.access is not None else old_meta["access"]
-        new_root = str(Path(args.root).expanduser().resolve()) if args.root is not None else old_meta["root"]
-        new_target = args.target_url if args.target_url is not None else old_meta.get("target")
-
-        # Check if anything changed
-        if (new_port == old_meta["port"] and
-            new_access == old_meta["access"] and
-            new_root == old_meta["root"] and
-            new_target == old_meta.get("target") and
-            not args.name):
-            print("Notice: No property changes specified. Use -p, -r, -a, or --target to modify properties.")
-            return
+def cmd_status_change(args):
+    reg = clean_registry()
+    if not reg:
+        print("No servers running. Start one using: servctl start")
+        return
 
-        # Check port conflicts
-        new_host = "0.0.0.0" if new_access == "network" else "127.0.0.1"
-        is_udp = (old_meta["type"] == "dns")
-        if new_port != old_meta["port"] and is_port_in_use(new_port, new_host, udp=is_udp):
-            print(f"Error: New port {new_port} is already in use on {new_host}.")
-            return
+    target_id = None
+    for sid, meta in reg.items():
+        if sid == args.target or str(meta["port"]) == args.target:
+            target_id = sid
+            break
 
-        # Check privilege
-        if new_port < 1024 and os.name != "nt" and os.geteuid() != 0:
-            print(f"Error: Port {new_port} is a privileged port (< 1024) requiring root/sudo.")
-            return
+    if not target_id:
+        print(f"Error: No running server matching '{args.target}'.")
+        return
 
-        # Determine new ID
-        if args.name:
-            new_id = args.name
-        elif old_meta["id"] == f"{old_meta['type']}-{old_meta['port']}":
-            new_id = f"{old_meta['type']}-{new_port}"
-        else:
-            new_id = old_meta["id"]
+    old_meta = reg[target_id]
+
+    # Resolve optional positional extra (could be port or root directory)
+    parsed_port = args.port
+    parsed_root = args.root
+    if getattr(args, "extra", None):
+        if args.extra.isdigit() and not parsed_port:
+            parsed_port = int(args.extra)
+        elif not parsed_root:
+            parsed_root = args.extra
+
+    # Target new properties
+    new_type = args.type if getattr(args, "type", None) else old_meta["type"]
+    if new_type in ("websecure", "https"):
+        new_type = "websecure"
+
+    new_port = parsed_port if parsed_port is not None else old_meta["port"]
+    new_access = args.access if args.access is not None else old_meta["access"]
+    new_root = str(Path(parsed_root).expanduser().resolve()) if parsed_root is not None else old_meta["root"]
+    new_target = args.target_url if getattr(args, "target_url", None) is not None else old_meta.get("target")
+
+    # Check if anything changed
+    if (new_port == old_meta["port"] and
+        new_access == old_meta["access"] and
+        new_root == old_meta["root"] and
+        new_type == old_meta["type"] and
+        new_target == old_meta.get("target") and
+        not getattr(args, "name", None)):
+        print("Notice: No property changes specified. Use -p, -r, -t, -a, or --target to modify properties.")
+        return
 
-        print(f"Applying property changes to '{old_meta['id']}'...")
-        stop_server_by_id(target_id, reg)
+    # Check directory
+    if new_type in ("web", "websecure", "ftp", "ftps", "webdav") and not Path(new_root).is_dir():
+        print(f"Error: Directory '{new_root}' does not exist.")
+        return
 
-        pid, log_path = spawn_server(new_id, old_meta["type"], new_port, new_host, new_root, new_target)
-        if not pid:
-            print(f"Error: Failed to re-launch server with new settings. Check ({log_path}).")
-            return
+    # Check port conflicts
+    new_host = "0.0.0.0" if new_access == "network" else "127.0.0.1"
+    is_udp = (new_type == "dns")
+    if new_port != old_meta["port"] and is_port_in_use(new_port, new_host, udp=is_udp):
+        print(f"Error: Port {new_port} ({'UDP' if is_udp else 'TCP'}) is already in use on {new_host}.")
+        return
 
-        reg[new_id] = {
-            "id": new_id,
-            "type": old_meta["type"],
-            "port": new_port,
-            "host": new_host,
-            "access": new_access,
-            "root": new_root,
-            "target": new_target,
-            "pid": pid,
-            "started_at": time.time(),
-            "log_file": str(log_path)
-        }
-        write_registry(reg)
-
-        print(f"✔ Successfully updated '{old_meta['id']}' -> '{new_id}'!")
-        print_server_status_card(reg[new_id])
-        print()
+    # Check privilege
+    if new_port < 1024 and os.name != "nt" and os.geteuid() != 0:
+        print(f"Error: Port {new_port} is a privileged port (< 1024) requiring root/sudo.")
+        return
+
+    # Determine new ID
+    if getattr(args, "name", None):
+        new_id = args.name
+    elif old_meta["id"] == f"{old_meta['type']}-{old_meta['port']}":
+        new_id = f"{new_type}-{new_port}"
+    else:
+        new_id = old_meta["id"]
+
+    print(f"Applying property changes to '{old_meta['id']}'...")
+    stop_server_by_id(target_id, reg)
+
+    pid, log_path = spawn_server(new_id, new_type, new_port, new_host, new_root, new_target)
+    if not pid:
+        print(f"Error: Failed to re-launch server with new settings. Check log ({log_path}).")
+        return
+
+    reg[new_id] = {
+        "id": new_id,
+        "type": new_type,
+        "port": new_port,
+        "host": new_host,
+        "access": new_access,
+        "root": new_root,
+        "target": new_target,
+        "pid": pid,
+        "started_at": time.time(),
+        "log_file": str(log_path)
+    }
+    write_registry(reg)
+
+    print(f"\n✔ Successfully updated '{old_meta['id']}' -> '{new_id}'!")
+    print_server_status_card(reg[new_id])
+    print()
 
 def cmd_logs(args):
     reg = read_registry()
@@ -1272,7 +1295,7 @@ SYNOPSIS
        servctl stop [PORT | ID ...] [--all]
        servctl list
        servctl status show [PORT | ID | --all]
-       servctl status change <PORT | ID> [-p PORT] [-r ROOT] [-a ACCESS] [--target TARGET] [-n NAME]
+       servctl status change <PORT | ID> [-p PORT] [-r ROOT] [-t TYPE] [-a ACCESS] [--target TARGET] [-n NAME]
        servctl logs [PORT | ID] [-f] [-n LINES]
        servctl man
 
@@ -1325,8 +1348,8 @@ STATUS & CONFIGURATION MANAGEMENT
               Displays detailed status cards for all active servers.
 
        servctl status change <ID/PORT> [OPTIONS...]
-              Dynamically changes running server properties (port, root, access,
-              target) and restarts it seamlessly in the background.
+              Dynamically changes running server properties (port, root, type,
+              access, target) and restarts it seamlessly in the background.
 
 EXAMPLES
        1. Start a default HTTP web server:
@@ -1341,6 +1364,7 @@ EXAMPLES
 
        4. Change a running server's properties on the fly:
               $ servctl status change web-8080 -p 8085 -a network
+              $ servctl status change web-8080 -t websecure
 
        5. Stop multiple servers at once:
               $ servctl stop 8080 8443
@@ -1368,6 +1392,16 @@ def normalize_status_argv(argv):
     else:
         return argv[:idx + 1] + ["show"] + args_after
 
+def setup_change_parser(p):
+    p.add_argument("target", help="Server ID or Port to modify")
+    p.add_argument("extra", nargs="?", default=None, help="Optional new port or root directory")
+    p.add_argument("-p", "--port", type=int, default=None, help="New port number")
+    p.add_argument("-r", "--root", default=None, help="New root directory")
+    p.add_argument("-t", "--type", choices=["web", "websecure", "https", "webdav", "ftp", "ftps", "dns", "proxy"], default=None, help="Change server type")
+    p.add_argument("-a", "--access", choices=["local", "network"], default=None, help="New access scope")
+    p.add_argument("--target", dest="target_url", default=None, help="New upstream target URL")
+    p.add_argument("-n", "--name", default=None, help="Rename server ID")
+
 def main():
     parser = argparse.ArgumentParser(prog="servctl", description="Unprivileged background server and proxy manager")
     subparsers = parser.add_subparsers(dest="command")
@@ -1406,12 +1440,11 @@ def main():
 
     # status change
     p_change = sub_status.add_parser("change", help="Change properties of a running server")
-    p_change.add_argument("target", help="Server ID or Port to modify")
-    p_change.add_argument("-p", "--port", type=int, default=None, help="New port number")
-    p_change.add_argument("-r", "--root", default=None, help="New root directory")
-    p_change.add_argument("-a", "--access", choices=["local", "network"], default=None, help="New access scope")
-    p_change.add_argument("--target", dest="target_url", default=None, help="New upstream target URL")
-    p_change.add_argument("-n", "--name", default=None, help="Rename server ID")
+    setup_change_parser(p_change)
+
+    # Top-level direct 'servctl change'
+    p_top_change = subparsers.add_parser("change", help="Change properties of a running server")
+    setup_change_parser(p_top_change)
 
     # LOGS
     p_logs = subparsers.add_parser("logs", help="View server logs")
@@ -1444,7 +1477,12 @@ def main():
     elif args.command == "list":
         cmd_list(args)
     elif args.command == "status":
-        cmd_status(args)
+        if getattr(args, "status_cmd", None) == "change":
+            cmd_status_change(args)
+        else:
+            cmd_status_show(args)
+    elif args.command == "change":
+        cmd_status_change(args)
     elif args.command == "logs":
         cmd_logs(args)
     elif args.command == "man":