remoteRF-server 0.1.73__tar.gz → 0.1.74__tar.gz

{remoterf_server-0.1.73 → remoterf_server-0.1.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.73
+Version: 0.1.74
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf

{remoterf_server-0.1.73 → remoterf_server-0.1.74}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "0.1.73"
+version = "0.1.74"
 dependencies = [
   "grpcio",
   "protobuf",

{remoterf_server-0.1.73 → remoterf_server-0.1.74}/src/remoteRF_server/server/grpc_server.py

@@ -445,6 +445,187 @@ def _cmd_devices_status() -> None:
             "  online=", Sty.DEFAULT, f"{ds.online}", Sty.GREEN if ds.online else Sty.RED,
             "  last_seen=", Sty.DEFAULT, f"{_fmt_ms_ago(ds.last_seen_ms)} ago", Sty.BLUE
         )
+        
+from typing import Iterable
+import contextlib
+
+def _repo_root_guess() -> Path:
+    """
+    Best-effort: find <repo>/src/... and return <repo>.
+    Fallback: walk up a few levels from this file.
+    """
+    p = Path(__file__).resolve()
+    for parent in p.parents:
+        if parent.name == "src":
+            return parent.parent
+    # fallback
+    return p.parents[3] if len(p.parents) >= 4 else p.parent
+
+def _host_state_dirs() -> list[Path]:
+    """
+    Places host-directory persistence might live in your codebase:
+      - User config dir: ~/.config/remoterf (REMOTERF_CONFIG_DIR override)
+      - Repo-local: <repo>/.config
+      - Server config dir you referenced: <repo>/src/remoteRF_server/config (because of .env.host_directory)
+    """
+    cands = [
+        _cfg_dir(),
+        _repo_root_guess() / ".config",
+        (Path(__file__).resolve().parent.parent / "config"),  # <repo>/src/remoteRF_server/config
+    ]
+
+    out: list[Path] = []
+    seen: set[str] = set()
+    for d in cands:
+        try:
+            rp = str(d.resolve())
+        except Exception:
+            rp = str(d)
+        if rp not in seen:
+            seen.add(rp)
+            out.append(d)
+    return out
+
+def _host_state_files() -> list[Path]:
+    """
+    Exact files your HostTunnelRegistry has historically used.
+    Also includes a conservative glob for future additions.
+    """
+    files: list[Path] = []
+    for d in _host_state_dirs():
+        files.append(d / "host_directory.env")
+        files.append(d / "host_directory_meta.env")
+        # If you later add more persisted host-dir files, keep them discoverable.
+        try:
+            for p in sorted(d.glob("host_directory*.env")):
+                files.append(p)
+        except Exception:
+            pass
+
+    out: list[Path] = []
+    seen: set[str] = set()
+    for p in files:
+        try:
+            rp = str(p.resolve())
+        except Exception:
+            rp = str(p)
+        if rp not in seen:
+            seen.add(rp)
+            out.append(p)
+    return out
+
+def _cmd_hosts_persisted() -> None:
+    files = _host_state_files()
+    found_any = False
+    printf("Host directory (persisted) state files:", Sty.BOLD)
+    for p in files:
+        if p.exists():
+            found_any = True
+            try:
+                size = p.stat().st_size
+            except Exception:
+                size = -1
+            printf("  - ", Sty.DEFAULT, f"{p}", Sty.MAGENTA, f" ({size} bytes)", Sty.GRAY)
+        else:
+            printf("  - ", Sty.DEFAULT, f"{p}", Sty.GRAY, " (missing)", Sty.GRAY)
+    if not found_any:
+        printf("  (none found)", Sty.GRAY)
+
+def _try_clear_registry_in_memory(reg: object) -> list[str]:
+    """
+    Best-effort in-memory wipe without knowing exact internals.
+    Uses registry lock if present.
+    """
+    cleared: list[str] = []
+
+    lock = getattr(reg, "_lock", None)
+    acquired = False
+    try:
+        if lock is not None and hasattr(lock, "acquire") and hasattr(lock, "release"):
+            lock.acquire()
+            acquired = True
+
+        # common private dict fields
+        for attr in (
+            "_hosts",
+            "_devices",
+            "_host_by_id",
+            "_device_by_id",
+            "_device_routes",
+            "_routes",
+            "_sessions",
+            "_host_sessions",
+        ):
+            d = getattr(reg, attr, None)
+            if isinstance(d, dict):
+                d.clear()
+                cleared.append(attr)
+
+        # common private sets/lists
+        for attr in ("_connected", "_online_hosts"):
+            s = getattr(reg, attr, None)
+            if isinstance(s, set):
+                s.clear()
+                cleared.append(attr)
+
+        # if there is an explicit method, prefer it (won’t hurt if absent)
+        for meth in ("clear", "reset", "wipe", "wipe_all", "wipe_state"):
+            fn = getattr(reg, meth, None)
+            if callable(fn):
+                try:
+                    fn()
+                    cleared.append(f"{meth}()")
+                except Exception:
+                    pass
+
+    finally:
+        if acquired:
+            try:
+                lock.release()
+            except Exception:
+                pass
+
+    return cleared
+
+def _cmd_hosts_wipe(*, yes: bool = False) -> None:
+    # confirm
+    if not yes:
+        try:
+            resp = session.prompt(stylize("Type 'wipe-hosts' to confirm wiping persisted host state: ", Sty.RED))
+        except KeyboardInterrupt:
+            printf("Cancelled.", Sty.GRAY)
+            return
+        if (resp or "").strip().lower() != "wipe-hosts":
+            printf("Wipe aborted.", Sty.GRAY)
+            return
+
+    # delete persisted files
+    files = [p for p in _host_state_files() if p.exists()]
+    if not files:
+        printf("No persisted host directory files found to wipe.", Sty.GRAY)
+    else:
+        for p in files:
+            try:
+                p.unlink()
+                printf("Deleted: ", Sty.DEFAULT, f"{p}", Sty.MAGENTA)
+            except Exception as e:
+                printf("ERROR deleting: ", Sty.RED, f"{p} -> {e}", Sty.DEFAULT)
+                return
+
+    # clear in-memory registry (so you don’t have to restart for live state)
+    global TUNNEL_REGISTRY
+    reg = TUNNEL_REGISTRY
+    if reg is None:
+        printf("Host tunnel registry not initialized; persisted files wiped only.", Sty.GRAY)
+    else:
+        cleared = _try_clear_registry_in_memory(reg)
+        if cleared:
+            printf("Cleared in-memory registry fields: ", Sty.DEFAULT, ", ".join(cleared), Sty.GRAY)
+        else:
+            printf("WARNING: Could not confirm in-memory registry clear (unknown internals). Restart server if needed.", Sty.YELLOW)
+
+    printf("Host state wipe complete.", Sty.GREEN)
+    printf("NOTE: If hosts reconnect, persisted files will be recreated.", Sty.GRAY)
 
 # def help():
 #     printf("/------- HELP -------/", Sty.BOLD)
@@ -571,6 +752,7 @@ def help() -> None:
     
     printf("Host Tunnel (live):", Sty.BOLD)
     printf("  hosts status            ", Sty.MAGENTA, "- Live host online/last_seen/devices", Sty.DEFAULT)
+    printf("  hosts wipe              ", Sty.MAGENTA, "- Wipe persisted host directory state (and clear in-memory)", Sty.DEFAULT)
     printf("  devices status          ", Sty.MAGENTA, "- Live device online/last_seen/route", Sty.DEFAULT)
     print()
 
@@ -669,7 +851,6 @@ def server_input(inpu: str) -> bool:
         # ---- host tunnel ----
         "hosts status": lambda: _stay(_cmd_hosts_status),
         "host status": lambda: _stay(_cmd_hosts_status),
-        "tunnel hosts": lambda: _stay(_cmd_hosts_status),
 
         "devices status": lambda: _stay(_cmd_devices_status),
         "tunnel devices": lambda: _stay(_cmd_devices_status),
@@ -679,6 +860,12 @@ def server_input(inpu: str) -> bool:
 
     fn = DISPATCH.get(cmd)
     if fn is None:
+        # allow: "hosts wipe" and "hosts wipe -y"
+        if cmd.startswith("hosts wipe"):
+            yes = ("-y" in cmd.split()) or ("--yes" in cmd.split())
+            _cmd_hosts_wipe(yes=yes)
+            return True
+
         printf("Unknown command: ", Sty.RED, f"{inpu}", Sty.DEFAULT)
         printf("Type ", Sty.DEFAULT, "help", Sty.MAGENTA, " to see commands.", Sty.DEFAULT)
         return True

{remoterf_server-0.1.73 → remoterf_server-0.1.74}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.73
+Version: 0.1.74
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf