remoteRF-server-testing 0.0.8__tar.gz → 0.0.11__tar.gz

{remoterf_server_testing-0.0.8 → remoterf_server_testing-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server-testing
-Version: 0.0.8
+Version: 0.0.11
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{remoterf_server_testing-0.0.8 → remoterf_server_testing-0.0.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server-testing"
-version = "0.0.8"
+version = "0.0.11"
 description = "RemoteRF server-side control package"
 requires-python = ">=3.8"
 dependencies = [

{remoterf_server_testing-0.0.8 → remoterf_server_testing-0.0.11}/src/remoteRF_server/server/device_manager.py

@@ -229,6 +229,21 @@ def _host_devices_str_snapshot() -> Dict[int, str]:
 def _cfg_dir() -> Path:
     return Path(os.getenv("REMOTERF_CONFIG_DIR", get_remoterf_root()))
 
+def _super_token_path() -> Path:
+    path = _cfg_dir() / "super_token.txt"
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.touch(exist_ok=True)
+    return path
+
+def _get_master_token() -> str:
+    """Read the configured super token; blank file means the override is disabled."""
+    path = _super_token_path()
+    try:
+        return path.read_text(encoding="utf-8").strip()
+    except OSError as e:
+        print(f"Warning: could not read super token file {path}: {e}")
+        return ""
+
 def _devices_yaml_path() -> Path:
     p1 = _cfg_dir() / "devices.yml"
     if p1.exists():
@@ -316,9 +331,6 @@ def _connect_from_record(rec: Dict[str, Any]):
 devices_info: Dict[int, str] = {}
 device_serialization: Dict[int, str] = {}
 
-# master token (overrideable)
-master_token = os.getenv("REMOTERF_MASTER_TOKEN", "SuperCoolTokenForIan")
-
 def _init_from_env() -> None:
     records = _load_device_records()
 
@@ -378,13 +390,15 @@ def _load_all_drivers() -> None:
 
 _load_all_drivers()
 _init_from_env()
+_super_token_path()
 
 # Legacy reservation helpers (master token parsing)
 
-def parse_mastertoken(token: str):
-    if not token:
+def parse_mastertoken(token: str, configured_token: Optional[str] = None):
+    configured_token = _get_master_token() if configured_token is None else configured_token
+    if not token or not configured_token:
         return None
-    prefix = re.escape(master_token)
+    prefix = re.escape(configured_token)
     pattern = re.compile(rf"^{prefix}[_-](\d+)(?:_force)?$")
     m = pattern.match(token)
     if not m:
@@ -528,15 +542,16 @@ def get_schema_by_token(api_token: str):
 
     _sync_host_devices()
     gid: Optional[int] = None
+    configured_token = _get_master_token()
 
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         with _state_lock:
             for k, st in _devices.items():
                 if st.origin == "local" and _is_connected(st) and st.salt == "" and st.hsh == "":
                     gid = k
                     break
     else:
-        parsed = parse_mastertoken(api_token)
+        parsed = parse_mastertoken(api_token, configured_token=configured_token)
         if parsed:
             cand, _ = parsed
             with _state_lock:
@@ -577,9 +592,10 @@ def resolve_gid_for_token(api_token: str) -> Optional[int]:
         return None
 
     _sync_host_devices()
+    configured_token = _get_master_token()
 
     # Parsed master-token: resolves any device directly by gid (local or host).
-    parsed = parse_mastertoken(api_token)
+    parsed = parse_mastertoken(api_token, configured_token=configured_token)
     if parsed:
         cand, _ = parsed
         with _state_lock:
@@ -589,7 +605,7 @@ def resolve_gid_for_token(api_token: str) -> Optional[int]:
         return None
 
     # Raw master token — prefer local, fall back to any connected device.
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         with _state_lock:
             # local first
             for k, st in _devices.items():
@@ -630,6 +646,7 @@ def get_device(*, api_token: str):
         return None
 
     _sync_host_devices()
+    configured_token = _get_master_token()
 
     with _state_lock:
         snapshot: List[Tuple[int, object, str, str, str]] = [
@@ -639,7 +656,7 @@ def get_device(*, api_token: str):
         ]
 
     # Preserve "master prefers local" behavior
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         # local first
         for _, dev, salt, hsh, origin in snapshot:
             if origin == "local" and dev is not None and salt == "" and hsh == "":
@@ -650,7 +667,7 @@ def get_device(*, api_token: str):
                 return dev
         return None
 
-    parsed = parse_mastertoken(api_token)
+    parsed = parse_mastertoken(api_token, configured_token=configured_token)
     if parsed:
         device_id, force = parsed
         with _state_lock:
@@ -679,8 +696,9 @@ def acquire_device(api_token: str) -> Iterator[Tuple[int, object]]:
     _sync_host_devices()
 
     gid: Optional[int] = None
+    configured_token = _get_master_token()
 
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         with _state_lock:
             # prefer local first
             for k, st in _devices.items():
@@ -693,7 +711,7 @@ def acquire_device(api_token: str) -> Iterator[Tuple[int, object]]:
                         gid = k
                         break
     else:
-        parsed = parse_mastertoken(api_token)
+        parsed = parse_mastertoken(api_token, configured_token=configured_token)
         if parsed:
             cand, force = parsed
             with _state_lock:
@@ -790,4 +808,4 @@ def reload_devices() -> None:
 
 def set_pluto(ip: str = "192.168.2.1"):
     # kept for compatibility (no-op)
-    pass
+    pass

{remoterf_server_testing-0.0.8 → remoterf_server_testing-0.0.11}/src/remoteRF_server/server/rpc_manager.py

@@ -52,7 +52,8 @@
 
 from .reservation import reservation_handler
 from ..common.utils import *
-from .device_manager import acquire_device, VirtualDevice, get_device_schema, find_device_id_by_name, get_schema_by_token, resolve_gid_for_token
+from ..common.grpc import grpc_pb2 as generic_pb2
+from .device_manager import acquire_device, VirtualDevice, get_device_schema, find_device_id_by_name, get_device_by_id, resolve_gid_for_token
 from ..host import host_tunnel_server as hts
 
 
@@ -181,6 +182,71 @@ class RpcManager:
 
         raise ValueError(f"Unknown verb {verb!r} in {function_name!r}")
 
+    def _resolve_idl_target(self, args: dict) -> tuple[int | None, str | None]:
+        if 'token' in args:
+            api_token = str(unmap_arg(args['token']))
+            gid = resolve_gid_for_token(api_token)
+            if gid is None:
+                return None, 'No schema available for this token (invalid token or device offline)'
+            return gid, None
+
+        if 'device_id' in args:
+            try:
+                return int(unmap_arg(args['device_id'])), None
+            except (ValueError, TypeError):
+                return None, 'device_id must be an integer'
+
+        if 'device_name' in args:
+            name = str(unmap_arg(args['device_name']))
+            gid = find_device_id_by_name(name)
+            if gid is None:
+                return None, f'No device found with name {name!r}'
+            return gid, None
+
+        return None, 'IDL:get_drivers requires token, device_id, or device_name'
+
+    def _fetch_host_idl(self, *, gid: int, dev: VirtualDevice, args: dict) -> dict:
+        registry = hts.get_tunnel_registry(create=False)
+        if registry is None:
+            return {'error': map_arg('Host tunnel registry unavailable')}
+
+        req = generic_pb2.GenericRPCRequest(function_name="IDL:get_drivers")
+        for key, value in dict(args).items():
+            if str(key) == "token":
+                continue
+            req.args[str(key)].CopyFrom(value)
+        req.args["device_id"].CopyFrom(map_arg(int(gid)))
+        req.args["g"].CopyFrom(map_arg(int(gid)))
+
+        try:
+            resp = hts.handle_host_device_request(
+                registry,
+                host_id=dev.host_id,
+                device_id=dev.device_id,
+                request=req,
+                timeout_sec=10.0,
+            )
+        except Exception as e:
+            return {'error': map_arg(str(e))}
+
+        results = dict(resp.results)
+        if 'error' in results:
+            return results
+
+        err = results.get('Error')
+        if err is not None:
+            return {'error': map_arg(str(unmap_arg(err)))}
+
+        ok = results.get('Ok')
+        if ok is not None:
+            try:
+                if not bool(unmap_arg(ok)):
+                    return {'error': map_arg('Host schema fetch failed')}
+            except Exception:
+                return {'error': map_arg('Host schema fetch failed')}
+
+        return results
+
     def _handle_idl(self, sub: str, args: dict) -> dict:
         """
         IDL:get_drivers  →  schema + driver metadata for a device.
@@ -196,42 +262,19 @@ class RpcManager:
             device_type     str   e.g. "pluto"
         """
         if sub == "get_drivers":
-            # Resolve device by token (preferred), device_id, or device_name.
-            schema = None
-
-            if 'token' in args:
-                api_token = str(unmap_arg(args['token']))
-                schema = get_schema_by_token(api_token)
-                if schema is None:
-                    # get_schema_by_token returns None for host (VirtualDevice) entries
-                    # because they carry no salt/hsh.  Fall through via gid resolution
-                    # which uses get_device_schema and handles host devices correctly.
-                    gid = resolve_gid_for_token(api_token)
-                    if gid is not None:
-                        schema = get_device_schema(gid)
-                if schema is None:
-                    return {'error': map_arg('No schema available for this token (invalid token or device offline)')}
-
-            elif 'device_id' in args:
-                try:
-                    gid = int(unmap_arg(args['device_id']))
-                except (ValueError, TypeError):
-                    return {'error': map_arg('device_id must be an integer')}
-                schema = get_device_schema(gid)
-                if schema is None:
-                    return {'error': map_arg(f'No schema available for device {gid} (offline or host device)')}
-
-            elif 'device_name' in args:
-                name = str(unmap_arg(args['device_name']))
-                gid = find_device_id_by_name(name)
-                if gid is None:
-                    return {'error': map_arg(f'No device found with name {name!r}')}
-                schema = get_device_schema(gid)
-                if schema is None:
-                    return {'error': map_arg(f'No schema available for device {name!r} (offline or host device)')}
-
-            else:
-                return {'error': map_arg('IDL:get_drivers requires token, device_id, or device_name')}
+            gid, err = self._resolve_idl_target(args)
+            if err is not None or gid is None:
+                return {'error': map_arg(err or 'Unable to resolve device')}
+
+            resolved = get_device_by_id(gid)
+            dev = resolved[0] if resolved is not None else None
+
+            if isinstance(dev, VirtualDevice):
+                return self._fetch_host_idl(gid=gid, dev=dev, args=args)
+
+            schema = get_device_schema(gid)
+            if schema is None:
+                return {'error': map_arg(f'No schema available for device {gid} (offline)')}
 
             return {
                 'schema':         map_arg(schema.get_idl_json()),

{remoterf_server_testing-0.0.8 → remoterf_server_testing-0.0.11}/src/remoteRF_server/serverrf_cli.py

@@ -186,13 +186,13 @@ def print_help() -> None:
         "  serverrf --host --show\n"
         "  serverrf --host --delete lab-host-01\n"
         "  serverrf --host --wipe -y\n"
-        "\n"
-        "  serverrf --device --add --pluto 0:pluto_aaa:123123\n"
-        "  serverrf --device --edit-name 0 \"New Pluto Name\"\n"
-        "  serverrf --device --remove 0\n"
-        "  serverrf --device --show\n"
-        "  serverrf --device --wipe -y\n"
-        "\n"
+        # "\n"
+        # "  serverrf --device --add --pluto 0:pluto_aaa:123123\n"
+        # "  serverrf --device --edit-name 0 \"New Pluto Name\"\n"
+        # "  serverrf --device --remove 0\n"
+        # "  serverrf --device --show\n"
+        # "  serverrf --device --wipe -y\n"
+        # "\n"
         "  serverrf -s\n"
         "  serverrf --serve\n"
         "\n"

{remoterf_server_testing-0.0.8 → remoterf_server_testing-0.0.11}/src/remoteRF_server_testing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server-testing
-Version: 0.0.8
+Version: 0.0.11
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown