remoteRF-server 0.1.66__tar.gz → 0.1.68__tar.gz

{remoterf_server-0.1.66 → remoterf_server-0.1.68}/PKG-INFO

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

{remoterf_server-0.1.66 → remoterf_server-0.1.68}/pyproject.toml

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

{remoterf_server-0.1.66 → remoterf_server-0.1.68}/src/remoteRF_server/host/host_tunnel_server.py

@@ -18,6 +18,7 @@ from concurrent.futures import Future
 from concurrent import futures
 
 import grpc
+import os
 
 # Your existing GenericRPC schema compiled to python.
 from ..common.grpc import grpc_pb2 as generic_pb2  # type: ignore
@@ -38,9 +39,58 @@ from .host_directory_store import (
 )
 
 # =============================================================================
-# Always-on logging (INFO/WARN/ERROR always print; no config/levels)
+# Always-on logging with lightweight toggles (env + runtime)
 # =============================================================================
 
+_LOG_LOCK = threading.Lock()
+_LOG_LEVELS: set[str] = set()     # {"INFO","WARN","ERROR"}
+_LOG_SUPPRESS: set[str] = set()   # {"HEARTBEAT","OUTBOUND","INBOUND"}
+
+def _init_log_state_from_env() -> None:
+    """
+    Env knobs:
+      REMOTERF_LOG_LEVELS="INFO,WARN,ERROR"  (default: WARN,ERROR)
+      REMOTERF_LOG_SUPPRESS="HEARTBEAT"      (default: HEARTBEAT)
+    """
+    global _LOG_LEVELS, _LOG_SUPPRESS
+
+    levels = os.getenv("REMOTERF_LOG_LEVELS", "").strip()
+    suppress = os.getenv("REMOTERF_LOG_SUPPRESS", "").strip()
+
+    if not levels:
+        _LOG_LEVELS = {"WARN", "ERROR"}
+    else:
+        _LOG_LEVELS = {x.strip().upper() for x in levels.split(",") if x.strip()}
+
+    if not suppress:
+        _LOG_SUPPRESS = {"HEARTBEAT"}  # sane default: avoid spam
+    else:
+        _LOG_SUPPRESS = {x.strip().upper() for x in suppress.split(",") if x.strip()}
+
+_init_log_state_from_env()
+
+def set_log_levels(levels: str) -> None:
+    """Runtime: set levels, e.g. set_log_levels('INFO,WARN,ERROR')"""
+    global _LOG_LEVELS
+    with _LOG_LOCK:
+        _LOG_LEVELS = {x.strip().upper() for x in (levels or "").split(",") if x.strip()}
+
+def set_log_suppress(tags: str) -> None:
+    """Runtime: set suppressed tags, e.g. set_log_suppress('HEARTBEAT,OUTBOUND')"""
+    global _LOG_SUPPRESS
+    with _LOG_LOCK:
+        _LOG_SUPPRESS = {x.strip().upper() for x in (tags or "").split(",") if x.strip()}
+
+def _should_log(level: str, tag: str = "") -> bool:
+    lvl = (level or "").upper()
+    tg = (tag or "").upper()
+    with _LOG_LOCK:
+        if lvl not in _LOG_LEVELS:
+            return False
+        if tg and tg in _LOG_SUPPRESS:
+            return False
+        return True
+    
 def _ts() -> str:
     t = time.time()
     sec = int(t)
@@ -48,24 +98,25 @@ def _ts() -> str:
     lt = time.localtime(sec)
     return time.strftime("%H:%M:%S", lt) + f".{ms:03d}"
 
-def _log(level: str, msg: str) -> None:
+def _log(level: str, msg: str, *, tag: str = "") -> None:
+    if not _should_log(level, tag):
+        return
     tn = threading.current_thread().name
     print(f"{_ts()} {level:<5} [{tn}] hostrf.host_tunnel_server: {msg}", file=sys.stderr, flush=True)
 
-def info(msg: str) -> None:
-    _log("INFO", msg)
+def info(msg: str, *, tag: str = "") -> None:
+    _log("INFO", msg, tag=tag)
 
-def warn(msg: str) -> None:
-    _log("WARN", msg)
+def warn(msg: str, *, tag: str = "") -> None:
+    _log("WARN", msg, tag=tag)
 
-def error(msg: str) -> None:
-    _log("ERROR", msg)
+def error(msg: str, *, tag: str = "") -> None:
+    _log("ERROR", msg, tag=tag)
 
-def exception(msg: str) -> None:
-    _log("ERROR", msg)
+def exception(msg: str, *, tag: str = "") -> None:
+    _log("ERROR", msg, tag=tag)
     traceback.print_exc(limit=80, file=sys.stderr)
 
-
 # =============================================================================
 # Helpers
 # =============================================================================

{remoterf_server-0.1.66 → remoterf_server-0.1.68}/src/remoteRF_server/server/grpc_server.py

@@ -17,6 +17,8 @@ from datetime import datetime
 # os.environ.setdefault("GRPC_VERBOSITY", "ERROR")
 # os.environ.setdefault("GRPC_TRACE", "")
 
+TUNNEL_REGISTRY: HostTunnelRegistry | None = None
+
 import grpc
 
 import traceback
@@ -201,10 +203,13 @@ def serve():
     
     # --- attach HostTunnel to the SAME grpc server/port/creds ---
     directory_env = Path(__file__).resolve().parent.parent / "config" / ".env.host_directory"
-    registry = HostTunnelRegistry()
+    
+        # --- attach HostTunnel to the SAME grpc server/port/creds ---
+    global TUNNEL_REGISTRY
+    TUNNEL_REGISTRY = HostTunnelRegistry()
 
     host_tunnel_pb2_grpc.add_HostTunnelServicer_to_server(
-        HostTunnelServicer(registry),
+        HostTunnelServicer(TUNNEL_REGISTRY),
         server
     )
 
@@ -366,6 +371,81 @@ def get_devices():
     for key, value in data.items():
         printf(f"Device ID:", Sty.DEFAULT, f' {key}', Sty.MAGENTA, f" Device Name: ", Sty.DEFAULT, f"{(value)}", Sty.GRAY)
 
+def _fmt_ms_ago(ms: int) -> str:
+    if not ms:
+        return "-"
+    now = int(time.time() * 1000)
+    dt = max(0, now - int(ms))
+    if dt < 1000:
+        return f"{dt}ms"
+    if dt < 60_000:
+        return f"{dt/1000:.1f}s"
+    return f"{dt/60_000:.1f}m"
+
+def _cmd_hosts_status() -> None:
+    global TUNNEL_REGISTRY
+    reg = TUNNEL_REGISTRY
+    if reg is None:
+        printf("Host tunnel registry not initialized yet.", Sty.RED)
+        return
+
+    hosts = reg.list_hosts()     # host_id -> HostStatus
+    devices = reg.list_devices() # device_id -> DeviceStatus
+
+    # Build host -> device list
+    by_host: dict[str, list[str]] = {}
+    for did, ds in devices.items():
+        by_host.setdefault(ds.host_id or "-", []).append(did)
+
+    printf("Hosts (live):", Sty.BOLD)
+    if not hosts:
+        printf("  (none)", Sty.GRAY)
+        return
+
+    for hid, hs in sorted(hosts.items(), key=lambda kv: kv[0]):
+        dlist = sorted(by_host.get(hid, []))
+        printf(
+            "  ", Sty.DEFAULT,
+            f"{hid}", Sty.MAGENTA,
+            "  online=", Sty.DEFAULT, f"{hs.online}", Sty.GREEN if hs.online else Sty.RED,
+            "  last_seen=", Sty.DEFAULT, f"{_fmt_ms_ago(hs.last_seen_ms)} ago", Sty.BLUE,
+            "  devices=", Sty.DEFAULT, f"{len(dlist)}", Sty.GRAY
+        )
+        for did in dlist:
+            ds = devices.get(did)
+            if ds is None:
+                continue
+            printf(
+                "     - ", Sty.DEFAULT,
+                f"{did}", Sty.MAGENTA,
+                "  local_id=", Sty.DEFAULT, f"{ds.host_local_id}", Sty.GRAY,
+                "  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
+            )
+
+def _cmd_devices_status() -> None:
+    global TUNNEL_REGISTRY
+    reg = TUNNEL_REGISTRY
+    if reg is None:
+        printf("Host tunnel registry not initialized yet.", Sty.RED)
+        return
+
+    devices = reg.list_devices()
+    printf("Devices (live):", Sty.BOLD)
+    if not devices:
+        printf("  (none)", Sty.GRAY)
+        return
+
+    for did, ds in sorted(devices.items(), key=lambda kv: kv[0]):
+        printf(
+            "  ", Sty.DEFAULT,
+            f"{did}", Sty.MAGENTA,
+            "  host=", Sty.DEFAULT, f"{ds.host_id or '-'}", Sty.GRAY,
+            "  local_id=", Sty.DEFAULT, f"{ds.host_local_id}", Sty.GRAY,
+            "  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
+        )
+
 # def help():
 #     printf("/------- HELP -------/", Sty.BOLD)
 #     printf("'exit'          ", Sty.MAGENTA, " - Stop server.", Sty.DEFAULT)
@@ -488,6 +568,11 @@ def help() -> None:
     printf("  codes delete             ", Sty.MAGENTA, "- Delete an enrollment code (interactive)", Sty.DEFAULT)
     printf("  codes csv                ", Sty.MAGENTA, "- Export ALL enrollment codes as CSV to Downloads", Sty.DEFAULT)
     print()
+    
+    printf("Host Tunnel (live):", Sty.BOLD)
+    printf("  hosts status            ", Sty.MAGENTA, "- Live host online/last_seen/devices", Sty.DEFAULT)
+    printf("  devices status          ", Sty.MAGENTA, "- Live device online/last_seen/route", Sty.DEFAULT)
+    print()
 
     printf("Database:", Sty.BOLD)
     printf("  db purge                 ", Sty.MAGENTA, "- Remove all database entries", Sty.DEFAULT)
@@ -581,6 +666,14 @@ def server_input(inpu: str) -> bool:
         "rm code": lambda: _stay(lambda: remove_enrollment_code_local(session)),  # old
         "rm c": lambda: _stay(lambda: remove_enrollment_code_local(session)),     # old
         
+        # ---- 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),
+        
         "codes csv": lambda: _stay(export_enrollment_codes_csv_local),
     }
 

{remoterf_server-0.1.66 → remoterf_server-0.1.68}/src/remoteRF_server.egg-info/PKG-INFO

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