remoteRF-server 0.1.83__tar.gz → 0.1.84__tar.gz

{remoterf_server-0.1.83 → remoterf_server-0.1.84}/PKG-INFO

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

{remoterf_server-0.1.83 → remoterf_server-0.1.84}/pyproject.toml

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

{remoterf_server-0.1.83 → remoterf_server-0.1.84}/src/remoteRF_server/host/host_tunnel_server.py

@@ -1299,4 +1299,6 @@ def start_host_tunnel_server(
 
     th = threading.Thread(target=run, daemon=True, name="host_tunnel_server")
     th.start()
-    return server, th, reg
+    return server, th, reg
+
+TUNNEL_REGISTRY = None

{remoterf_server-0.1.83 → remoterf_server-0.1.84}/src/remoteRF_server/server/device_manager.py

@@ -21,11 +21,25 @@ from ..host import host_tunnel_server as hts  # gives access to hts.TUNNEL_REGIS
 
 import time  # add near imports
 
+_state_lock = threading.RLock()
+
+@dataclass
+class _DeviceState:
+    dev: object
+    salt: str
+    hsh: str
+    name: str
+    ident: str
+    dtype: str
+    io_lock: threading.RLock
+
+# gid -> state
+_devices: Dict[int, _DeviceState] = {}
+
 # -----------------------------
 # Host device pulling/grabbing
 # -----------------------------
 
-
 def _get_host_registry():
     # host_tunnel_server sets this when the tunnel server starts
     return getattr(hts, "TUNNEL_REGISTRY", None)
@@ -278,21 +292,6 @@ def _connect_from_record(rec: Dict[str, str]):
 # Thread-safe runtime state
 # -----------------------------
 
-_state_lock = threading.RLock()
-
-@dataclass
-class _DeviceState:
-    dev: object
-    salt: str
-    hsh: str
-    name: str
-    ident: str
-    dtype: str
-    io_lock: threading.RLock
-
-# gid -> state
-_devices: Dict[int, _DeviceState] = {}
-
 # legacy maps (kept for your existing server calls/UI)
 devices_info: Dict[int, str] = {}
 device_serialization: Dict[int, str] = {}

{remoterf_server-0.1.83 → remoterf_server-0.1.84}/src/remoteRF_server/server/grpc_server.py

@@ -37,8 +37,9 @@ from .acc_perms import perms
 from ..common.utils import *
 from .device_manager import get_all_devices, get_all_devices_str
 from .user_group_cli import make_user_group_local, edit_user_group_local, list_user_groups_local, remove_user_group_local, make_enrollment_codes_local, remove_enrollment_code_local, list_enrollment_codes_local, export_user_groups_csv_local, export_enrollment_codes_csv_local
-from .user_group_handler import user_group_handler, start_usergroup_cleanup_loop
+from .user_group_handler import user_group_handler, start_usergroup_cleanup_loo
 
+from ..host import host_tunnel_server as hts
 from ..host.host_tunnel_server import HostTunnelRegistry, HostTunnelServicer
 from ..common.grpc import grpc_host_pb2_grpc as host_tunnel_pb2_grpc
 from ..common.grpc import grpc_host_pb2 as host_tunnel_pb2
@@ -48,7 +49,6 @@ from prompt_toolkit import PromptSession
 
 from pathlib import Path
 
-
 def _xdg_config_home() -> Path:
     return Path(os.getenv("XDG_CONFIG_HOME", Path.home() / ".config"))
 
@@ -92,8 +92,6 @@ def _get_port(name: str, *, default: int | None = None) -> int:
         raise SystemExit(f"{name} out of range (1..65535): {n}")
     return n
 
-TUNNEL_REGISTRY: HostTunnelRegistry | None = None
-
 session = PromptSession()
 
 from dotenv import load_dotenv, find_dotenv
@@ -208,16 +206,14 @@ def serve():
     # Create server credentials
     server_credentials = grpc.ssl_server_credentials(
         ((private_key, certificate_chain,),))
-    
-    # --- attach HostTunnel to the SAME grpc server/port/creds ---
-    directory_env = Path(__file__).resolve().parent.parent / "config" / ".env.host_directory"
-    
-        # --- attach HostTunnel to the SAME grpc server/port/creds ---
-    global TUNNEL_REGISTRY
-    TUNNEL_REGISTRY = HostTunnelRegistry()
+
+    reg = HostTunnelRegistry()
+
+    # publish registry where device_manager expects it
+    hts.TUNNEL_REGISTRY = reg
 
     host_tunnel_pb2_grpc.add_HostTunnelServicer_to_server(
-        HostTunnelServicer(TUNNEL_REGISTRY),
+        HostTunnelServicer(reg),
         server
     )
 
@@ -391,8 +387,7 @@ def _fmt_ms_ago(ms: int) -> str:
     return f"{dt/60_000:.1f}m"
 
 def _cmd_hosts_status() -> None:
-    global TUNNEL_REGISTRY
-    reg = TUNNEL_REGISTRY
+    reg = getattr(hts, "TUNNEL_REGISTRY", None)
     if reg is None:
         printf("Host tunnel registry not initialized yet.", Sty.RED)
         return
@@ -432,8 +427,7 @@ def _cmd_hosts_status() -> None:
             )
 
 def _cmd_devices_status() -> None:
-    global TUNNEL_REGISTRY
-    reg = TUNNEL_REGISTRY
+    reg = getattr(hts, "TUNNEL_REGISTRY", None)
     if reg is None:
         printf("Host tunnel registry not initialized yet.", Sty.RED)
         return
@@ -753,8 +747,7 @@ def _cmd_hosts_wipe(*, yes: bool = False) -> None:
                 return
 
     # 2) clear in-memory registry (THIS is what drives `hosts status`)
-    global TUNNEL_REGISTRY
-    reg = TUNNEL_REGISTRY
+    reg = getattr(hts, "TUNNEL_REGISTRY", None)
     if reg is None:
         printf("Host tunnel registry not initialized; only persisted wipe attempted.", Sty.GRAY)
     else:

{remoterf_server-0.1.83 → remoterf_server-0.1.84}/src/remoteRF_server.egg-info/PKG-INFO

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