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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.72
+Version: 0.1.74
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf
@@ -346,7 +346,9 @@ todo:
 <!-- Testing functionality (disregarding Host pipeline) -->
 <!-- Clean up serverrf CLI + basic documentation for all commands, usergroups, export codes by CSV. -->
 
-HostRF meta data -> push upon connection + retry connection on host side.
+<!-- HostRF meta data -> push upon connection + retry connection on host side. -->
+
+Host ID (NEEDS TO BE UNIQUE AND TELL THE HOST THAT) (or if device also does it as well.)
 
 ServerRF display meta data as part of devices list / reservation + online/activity status (appended into device name) + (plus host side warning if the device id is NOT globally unique!)
 

{remoterf_server-0.1.72 → remoterf_server-0.1.74}/README.md

@@ -335,7 +335,9 @@ todo:
 <!-- Testing functionality (disregarding Host pipeline) -->
 <!-- Clean up serverrf CLI + basic documentation for all commands, usergroups, export codes by CSV. -->
 
-HostRF meta data -> push upon connection + retry connection on host side.
+<!-- HostRF meta data -> push upon connection + retry connection on host side. -->
+
+Host ID (NEEDS TO BE UNIQUE AND TELL THE HOST THAT) (or if device also does it as well.)
 
 ServerRF display meta data as part of devices list / reservation + online/activity status (appended into device name) + (plus host side warning if the device id is NOT globally unique!)
 

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

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

{remoterf_server-0.1.72 → remoterf_server-0.1.74}/src/remoteRF_server/host/host_tunnel_server.py

@@ -51,6 +51,31 @@ LOG_MODE = "OFF"  # <-- change this
 
 _LOG_LOCK = threading.Lock()
 
+HOST_ID_RE = re.compile(r"^[A-Za-z0-9_.-]{1,64}$")  # adjust if you want
+
+class HostIdConflictError(RuntimeError):
+    def __init__(self, host_id: str, *, age_ms: int, replace_after_ms: int) -> None:
+        super().__init__(
+            f"host_id '{host_id}' already in use (last heartbeat {age_ms}ms ago). "
+            f"Try again after {replace_after_ms}ms or fix the conflicting host config."
+        )
+        self.host_id = host_id
+        self.age_ms = age_ms
+        self.replace_after_ms = replace_after_ms
+
+def _validate_host_id(raw: str) -> str:
+    hid = (raw or "").strip()
+    if not hid:
+        raise ValueError("Missing host_id (set HOST_ID in host.env; do not auto-generate).")
+    if hid == "unknown-host":
+        raise ValueError("host_id cannot be 'unknown-host' (set HOST_ID in host.env).")
+    if not HOST_ID_RE.fullmatch(hid):
+        raise ValueError(
+            "Invalid host_id. Allowed: 1..64 chars of [A-Za-z0-9_.-]. "
+            f"Got: {hid!r}"
+        )
+    return hid
+
 def _ts() -> str:
     t = time.time()
     sec = int(t)
@@ -387,12 +412,25 @@ class HostTunnelRegistry:
     # directory/status mutators
     # ---------------------------
 
-    def register_host(self, host_id: str, session: HostSession) -> None:
+    def register_host(
+        self,
+        host_id: str,
+        session: HostSession,
+        *,
+        replace_if_stale_ms: int = 15_000,  # tweak: how long without heartbeat before we allow replacement
+    ) -> None:
         info(f"[registry] register_host: host_id={host_id!r}")
+
         with self._lock:
             old = self._hosts.get(host_id)
-            if old is not None:
-                warn(f"[registry] register_host: replacing existing session host_id={host_id!r}")
+            if old is not None and old.alive:
+                age_ms = int(now_ms() - int(getattr(old, "last_heartbeat_ms", 0) or 0))
+                if age_ms < replace_if_stale_ms:
+                    # conflict: someone else is already using this host_id
+                    raise HostIdConflictError(host_id, age_ms=age_ms, replace_after_ms=replace_if_stale_ms)
+
+                # stale: allow replacement
+                warn(f"[registry] register_host: replacing STALE session host_id={host_id!r} age_ms={age_ms}")
                 old.close()
 
             self._hosts[host_id] = session
@@ -823,7 +861,28 @@ class HostTunnelServicer(host_tunnel_pb2_grpc.HostTunnelServicer):
 
                     if which == "hello":
                         hello = frame.hello
-                        host_id = str(getattr(hello, "host_id", "")).strip() or "unknown-host"
+                        raw = str(getattr(hello, "host_id", "") or "")
+                        try:
+                            host_id = _validate_host_id(raw)
+                        except ValueError as e:
+                            error(f"[inbound] invalid hello.host_id peer={peer} err={e}")
+                            fatal["code"] = "INVALID_ARGUMENT"
+                            fatal["details"] = str(e)
+                            stop.set()
+                            return
+
+                        ver = str(getattr(hello, "version", "") or "")
+                        info(f"[inbound] HELLO host_id={host_id!r} version={ver!r} peer={peer}")
+
+                        session = HostSession(host_id)
+                        try:
+                            self.registry.register_host(host_id, session, replace_if_stale_ms=15_000)
+                        except HostIdConflictError as e:
+                            error(f"[inbound] HostIdConflictError host_id={host_id!r} err={e}")
+                            fatal["code"] = "ALREADY_EXISTS"
+                            fatal["details"] = str(e)
+                            stop.set()
+                            return
                         ver = str(getattr(hello, "version", "") or "")
                         info(f"[inbound] HELLO host_id={host_id!r} version={ver!r} peer={peer}")
 
@@ -976,6 +1035,8 @@ class HostTunnelServicer(host_tunnel_pb2_grpc.HostTunnelServicer):
                 error(f"[Connect] aborting stream peer={peer} code={code} details={details}")
                 if code == "ALREADY_EXISTS":
                     context.abort(grpc.StatusCode.ALREADY_EXISTS, details)
+                if code == "INVALID_ARGUMENT":
+                    context.abort(grpc.StatusCode.INVALID_ARGUMENT, details)
                 context.abort(grpc.StatusCode.UNKNOWN, details)
 
             if session is None:

{remoterf_server-0.1.72 → 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.72 → 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.72
+Version: 0.1.74
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf
@@ -346,7 +346,9 @@ todo:
 <!-- Testing functionality (disregarding Host pipeline) -->
 <!-- Clean up serverrf CLI + basic documentation for all commands, usergroups, export codes by CSV. -->
 
-HostRF meta data -> push upon connection + retry connection on host side.
+<!-- HostRF meta data -> push upon connection + retry connection on host side. -->
+
+Host ID (NEEDS TO BE UNIQUE AND TELL THE HOST THAT) (or if device also does it as well.)
 
 ServerRF display meta data as part of devices list / reservation + online/activity status (appended into device name) + (plus host side warning if the device id is NOT globally unique!)