remoteRF-server 0.1.85__tar.gz → 0.1.87__tar.gz

{remoterf_server-0.1.85 → remoterf_server-0.1.87}/PKG-INFO

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

{remoterf_server-0.1.85 → remoterf_server-0.1.87}/pyproject.toml

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

{remoterf_server-0.1.85 → remoterf_server-0.1.87}/src/remoteRF_server/host/host_tunnel_server.py

@@ -1258,7 +1258,11 @@ def start_host_tunnel_server(
     registry: Optional[HostTunnelRegistry] = None,
     max_workers: int = 32,
 ) -> Tuple[grpc.Server, threading.Thread, HostTunnelRegistry]:
-    reg = registry or HostTunnelRegistry()
+    if registry is not None:
+        reg = set_tunnel_registry(registry)
+    else:
+        reg = get_tunnel_registry(create=True)
+        assert reg is not None
 
     options = [
         ("grpc.max_send_message_length", 100 * 1024 * 1024),
@@ -1301,4 +1305,38 @@ def start_host_tunnel_server(
     th.start()
     return server, th, reg
 
-TUNNEL_REGISTRY = None
+# -----------------------------------------------------------------------------
+# Singleton registry (process-wide)
+# -----------------------------------------------------------------------------
+
+_TUNNEL_REGISTRY_LOCK = threading.Lock()
+TUNNEL_REGISTRY: Optional["HostTunnelRegistry"] = None
+
+def get_tunnel_registry(*, create: bool = True) -> Optional["HostTunnelRegistry"]:
+    """
+    Returns the process-wide HostTunnelRegistry instance.
+
+    IMPORTANT: Import the MODULE (e.g. `import ... as hts`) and access
+    `hts.get_tunnel_registry()` or `hts.TUNNEL_REGISTRY`.
+
+    Avoid `from host_tunnel_server import TUNNEL_REGISTRY` if you ever plan
+    to replace it, because that snapshots the value at import time.
+    """
+    global TUNNEL_REGISTRY
+
+    if TUNNEL_REGISTRY is not None:
+        return TUNNEL_REGISTRY
+    if not create:
+        return None
+
+    with _TUNNEL_REGISTRY_LOCK:
+        if TUNNEL_REGISTRY is None:
+            TUNNEL_REGISTRY = HostTunnelRegistry()
+        return TUNNEL_REGISTRY
+
+def set_tunnel_registry(reg: "HostTunnelRegistry") -> "HostTunnelRegistry":
+    """Force the singleton to a specific instance."""
+    global TUNNEL_REGISTRY
+    with _TUNNEL_REGISTRY_LOCK:
+        TUNNEL_REGISTRY = reg
+    return reg

{remoterf_server-0.1.85 → remoterf_server-0.1.87}/src/remoteRF_server/server/device_manager.py

@@ -41,8 +41,7 @@ _devices: Dict[int, _DeviceState] = {}
 # -----------------------------
 
 def _get_host_registry():
-    # host_tunnel_server sets this when the tunnel server starts
-    return getattr(hts, "TUNNEL_REGISTRY", None)
+    return hts.get_tunnel_registry()
 
 def _local_devices_str_snapshot() -> Dict[int, str]:
     """
@@ -71,13 +70,6 @@ def _local_devices_str_snapshot() -> Dict[int, str]:
     return out
 
 def _host_devices_str_snapshot() -> Dict[int, str]:
-    """
-    Pull a FRESH host-device directory snapshot every call.
-
-    Includes:
-      - devices on currently connected hosts (online)
-      - devices on disconnected hosts that were previously seen/persisted (offline)
-    """
     reg = _get_host_registry()
     if reg is None:
         return {}
@@ -405,6 +397,24 @@ def get_all_devices_str() -> Dict[int, str]:
     # host snapshot (includes online + offline-but-known host devices)
     host_out = _host_devices_str_snapshot()
 
+    # ---- DEBUG: print full host_out ----
+    try:
+        from ..host import host_tunnel_server as hts  # adjust if your canonical import differs
+        reg = hts.get_tunnel_registry(create=False) if hasattr(hts, "get_tunnel_registry") else None
+        print("\n[device_manager] host_out dump")
+        print(f"  hts module: {getattr(hts, '__name__', '<?>')}")
+        print(f"  registry id: {id(reg) if reg is not None else None}")
+        print(f"  host_out count: {len(host_out)}")
+
+        if not host_out:
+            print("  (empty)")
+        else:
+            for gid, s in sorted(host_out.items(), key=lambda kv: int(kv[0])):
+                print(f"  {gid}: {s}")
+        print()
+    except Exception as e:
+        print(f"[device_manager] host_out dump failed: {e}")
+
     # merge with collision handling
     for gid, s in host_out.items():
         if gid in out:

{remoterf_server-0.1.85 → remoterf_server-0.1.87}/src/remoteRF_server/server/grpc_server.py

@@ -207,7 +207,8 @@ def serve():
     server_credentials = grpc.ssl_server_credentials(
         ((private_key, certificate_chain,),))
 
-    reg = HostTunnelRegistry()
+    reg = hts.get_tunnel_registry()
+    assert reg is not None
 
     # publish registry where device_manager expects it
     hts.TUNNEL_REGISTRY = reg
@@ -387,10 +388,8 @@ def _fmt_ms_ago(ms: int) -> str:
     return f"{dt/60_000:.1f}m"
 
 def _cmd_hosts_status() -> None:
-    reg = getattr(hts, "TUNNEL_REGISTRY", None)
-    if reg is None:
-        printf("Host tunnel registry not initialized yet.", Sty.RED)
-        return
+    reg = hts.get_tunnel_registry()
+    assert reg is not None
 
     hosts = reg.list_hosts()     # host_id -> HostStatus
     devices = reg.list_devices() # device_id -> DeviceStatus
@@ -427,10 +426,8 @@ def _cmd_hosts_status() -> None:
             )
 
 def _cmd_devices_status() -> None:
-    reg = getattr(hts, "TUNNEL_REGISTRY", None)
-    if reg is None:
-        printf("Host tunnel registry not initialized yet.", Sty.RED)
-        return
+    reg = hts.get_tunnel_registry()
+    assert reg is not None
 
     devices = reg.list_devices()
     printf("Devices (live):", Sty.BOLD)
@@ -747,7 +744,7 @@ def _cmd_hosts_wipe(*, yes: bool = False) -> None:
                 return
 
     # 2) clear in-memory registry (THIS is what drives `hosts status`)
-    reg = getattr(hts, "TUNNEL_REGISTRY", None)
+    reg = hts.get_tunnel_registry()
     if reg is None:
         printf("Host tunnel registry not initialized; only persisted wipe attempted.", Sty.GRAY)
     else:

{remoterf_server-0.1.85 → remoterf_server-0.1.87}/src/remoteRF_server.egg-info/PKG-INFO

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