remoteRF-server 1.1.3__tar.gz → 1.4.2__tar.gz

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.1.3
+Version: 1.4.2
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3
@@ -9,7 +9,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: remoterf-federation-core==0.16.0
+Requires-Dist: remoterf-federation-core==0.21.0
 Requires-Dist: grpcio<2.0.0,>=1.81.1
 Requires-Dist: protobuf<7.0.0,>=6.33.5
 Requires-Dist: numpy
@@ -890,8 +890,7 @@ After running `serverrf --serve`, you’ll enter the **RemoteRF Server Shell**.
 
 ### Devices
 
-* `devices list` — List all devices
-* `devices status` — Show live device routing/online/last_seen from the Host Tunnel
+* `devices list` — List all devices, with the host each is on (`local` for this server's own) and when it was last seen
 
 ---
 

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/README.md

@@ -859,8 +859,7 @@ After running `serverrf --serve`, you’ll enter the **RemoteRF Server Shell**.
 
 ### Devices
 
-* `devices list` — List all devices
-* `devices status` — Show live device routing/online/last_seen from the Host Tunnel
+* `devices list` — List all devices, with the host each is on (`local` for this server's own) and when it was last seen
 
 ---
 

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.1.3"
+version = "1.4.2"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"
 dependencies = [
-    "remoterf-federation-core==0.16.0",
+    "remoterf-federation-core==0.21.0",
   "grpcio>=1.81.1,<2.0.0",
   "protobuf>=6.33.5,<7.0.0",
   "numpy",

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/common/grpc/federation.proto

@@ -11,10 +11,13 @@ message FederationRequest {
   string protocol_version = 1;
   string grant = 2;
   string request_json = 3;
+  bytes frame = 4;            // raw GenericRPCRequest when request_json is detached; else empty
+  bool accept_detached = 5;   // requester can take a detached result + frame
 }
 
 message FederationResponse {
   string protocol_version = 1;
   string signed_result = 2;
   ErrorEnvelope error = 3;
+  bytes frame = 4;            // raw GenericRPCResponse when signed_result is detached; else empty
 }

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/common/grpc/federation_pb2.py

@@ -25,7 +25,7 @@ _sym_db = _symbol_database.Default()
 from . import grpc_pb2 as grpc__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x66\x65\x64\x65ration.proto\x12\tremote_rf\x1a\ngrpc.proto\"R\n\x11\x46\x65\x64\x65rationRequest\x12\x18\n\x10protocol_version\x18\x01 \x01(\t\x12\r\n\x05grant\x18\x02 \x01(\t\x12\x14\n\x0crequest_json\x18\x03 \x01(\t\"n\n\x12\x46\x65\x64\x65rationResponse\x12\x18\n\x10protocol_version\x18\x01 \x01(\t\x12\x15\n\rsigned_result\x18\x02 \x01(\t\x12\'\n\x05\x65rror\x18\x03 \x01(\x0b\x32\x18.remote_rf.ErrorEnvelope2V\n\x0c\x46\x65\x64\x65rationV2\x12\x46\n\x07\x45xecute\x12\x1c.remote_rf.FederationRequest\x1a\x1d.remote_rf.FederationResponseb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10\x66\x65\x64\x65ration.proto\x12\tremote_rf\x1a\ngrpc.proto\"z\n\x11\x46\x65\x64\x65rationRequest\x12\x18\n\x10protocol_version\x18\x01 \x01(\t\x12\r\n\x05grant\x18\x02 \x01(\t\x12\x14\n\x0crequest_json\x18\x03 \x01(\t\x12\r\n\x05\x66rame\x18\x04 \x01(\x0c\x12\x17\n\x0f\x61\x63\x63\x65pt_detached\x18\x05 \x01(\x08\"}\n\x12\x46\x65\x64\x65rationResponse\x12\x18\n\x10protocol_version\x18\x01 \x01(\t\x12\x15\n\rsigned_result\x18\x02 \x01(\t\x12\'\n\x05\x65rror\x18\x03 \x01(\x0b\x32\x18.remote_rf.ErrorEnvelope\x12\r\n\x05\x66rame\x18\x04 \x01(\x0c\x32V\n\x0c\x46\x65\x64\x65rationV2\x12\x46\n\x07\x45xecute\x12\x1c.remote_rf.FederationRequest\x1a\x1d.remote_rf.FederationResponseb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -33,9 +33,9 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'federation_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
   _globals['_FEDERATIONREQUEST']._serialized_start=43
-  _globals['_FEDERATIONREQUEST']._serialized_end=125
-  _globals['_FEDERATIONRESPONSE']._serialized_start=127
-  _globals['_FEDERATIONRESPONSE']._serialized_end=237
-  _globals['_FEDERATIONV2']._serialized_start=239
-  _globals['_FEDERATIONV2']._serialized_end=325
+  _globals['_FEDERATIONREQUEST']._serialized_end=165
+  _globals['_FEDERATIONRESPONSE']._serialized_start=167
+  _globals['_FEDERATIONRESPONSE']._serialized_end=292
+  _globals['_FEDERATIONV2']._serialized_start=294
+  _globals['_FEDERATIONV2']._serialized_end=380
 # @@protoc_insertion_point(module_scope)

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/common/grpc/grpc_host.proto

@@ -31,6 +31,7 @@ message DeviceInfo {
   string device_id = 3;
   string serial = 4;
   string kind = 5;
+  string handle = 6;
 }
 
 message DeviceAnnounce {

remoterf_server-1.4.2/src/remoteRF_server/common/grpc/grpc_host_pb2.py

@@ -0,0 +1,78 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: grpc_host.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'grpc_host.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import grpc_pb2 as grpc__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fgrpc_host.proto\x12\x08remoterf\x1a\ngrpc.proto\"A\n\tHostHello\x12\x0f\n\x07host_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x12\n\nhost_token\x18\x03 \x01(\t\"n\n\nDeviceInfo\x12\x10\n\x08local_id\x18\x01 \x01(\r\x12\r\n\x05label\x18\x02 \x01(\t\x12\x11\n\tdevice_id\x18\x03 \x01(\t\x12\x0e\n\x06serial\x18\x04 \x01(\t\x12\x0c\n\x04kind\x18\x05 \x01(\t\x12\x0e\n\x06handle\x18\x06 \x01(\t\"_\n\x0e\x44\x65viceAnnounce\x12%\n\x07\x64\x65vices\x18\x01 \x03(\x0b\x32\x14.remoterf.DeviceInfo\x12\x0f\n\x07unix_ms\x18\x02 \x01(\x04\x12\x15\n\rfull_snapshot\x18\x03 \x01(\x08\"\xab\x01\n\nRpcRequest\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\x18\n\x10global_device_id\x18\x02 \x01(\r\x12\x17\n\x0flocal_device_id\x18\x03 \x01(\r\x12\x11\n\tdevice_id\x18\x04 \x01(\t\x12-\n\x07request\x18\x05 \x01(\x0b\x32\x1c.remote_rf.GenericRPCRequest\x12\x18\n\x10\x64\x65\x61\x64line_unix_ms\x18\x06 \x01(\x04\"i\n\x0bRpcResponse\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\n\n\x02ok\x18\x02 \x01(\x08\x12/\n\x08response\x18\x03 \x01(\x0b\x32\x1d.remote_rf.GenericRPCResponse\x12\r\n\x05\x65rror\x18\x04 \x01(\t\"\x1c\n\tHeartbeat\x12\x0f\n\x07unix_ms\x18\x01 \x01(\x04\"\x18\n\x06\x43\x61ncel\x12\x0e\n\x06req_id\x18\x01 \x01(\t\"e\n\x0bMetaRequest\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\x18\n\x10include_platform\x18\x02 \x01(\x08\x12\x13\n\x0binclude_env\x18\x03 \x01(\x08\x12\x17\n\x0finclude_devices\x18\x04 \x01(\x08\"\xb7\x01\n\x08HostMeta\x12\x0f\n\x07host_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x0f\n\x07unix_ms\x18\x03 \x01(\x04\x12&\n\x02kv\x18\x04 \x03(\x0b\x32\x1a.remoterf.HostMeta.KvEntry\x12%\n\x07\x64\x65vices\x18\x05 \x03(\x0b\x32\x14.remoterf.DeviceInfo\x1a)\n\x07KvEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"[\n\x0cMetaResponse\x12\x0e\n\x06req_id\x18\x01 \x01(\t\x12\n\n\x02ok\x18\x02 \x01(\x08\x12\r\n\x05\x65rror\x18\x03 \x01(\t\x12 \n\x04meta\x18\x04 \x01(\x0b\x32\x12.remoterf.HostMeta\"\xf7\x02\n\tHostFrame\x12$\n\x05hello\x18\x01 \x01(\x0b\x32\x13.remoterf.HostHelloH\x00\x12\x33\n\x0f\x64\x65vice_announce\x18\x02 \x01(\x0b\x32\x18.remoterf.DeviceAnnounceH\x00\x12+\n\x0brpc_request\x18\x03 \x01(\x0b\x32\x14.remoterf.RpcRequestH\x00\x12-\n\x0crpc_response\x18\x04 \x01(\x0b\x32\x15.remoterf.RpcResponseH\x00\x12(\n\theartbeat\x18\x05 \x01(\x0b\x32\x13.remoterf.HeartbeatH\x00\x12\"\n\x06\x63\x61ncel\x18\x06 \x01(\x0b\x32\x10.remoterf.CancelH\x00\x12-\n\x0cmeta_request\x18\x07 \x01(\x0b\x32\x15.remoterf.MetaRequestH\x00\x12/\n\rmeta_response\x18\x08 \x01(\x0b\x32\x16.remoterf.MetaResponseH\x00\x42\x05\n\x03msg2E\n\nHostTunnel\x12\x37\n\x07\x43onnect\x12\x13.remoterf.HostFrame\x1a\x13.remoterf.HostFrame(\x01\x30\x01\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'grpc_host_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_HOSTMETA_KVENTRY']._loaded_options = None
+  _globals['_HOSTMETA_KVENTRY']._serialized_options = b'8\001'
+  _globals['_HOSTHELLO']._serialized_start=41
+  _globals['_HOSTHELLO']._serialized_end=106
+  _globals['_DEVICEINFO']._serialized_start=108
+  _globals['_DEVICEINFO']._serialized_end=218
+  _globals['_DEVICEANNOUNCE']._serialized_start=220
+  _globals['_DEVICEANNOUNCE']._serialized_end=315
+  _globals['_RPCREQUEST']._serialized_start=318
+  _globals['_RPCREQUEST']._serialized_end=489
+  _globals['_RPCRESPONSE']._serialized_start=491
+  _globals['_RPCRESPONSE']._serialized_end=596
+  _globals['_HEARTBEAT']._serialized_start=598
+  _globals['_HEARTBEAT']._serialized_end=626
+  _globals['_CANCEL']._serialized_start=628
+  _globals['_CANCEL']._serialized_end=652
+  _globals['_METAREQUEST']._serialized_start=654
+  _globals['_METAREQUEST']._serialized_end=755
+  _globals['_HOSTMETA']._serialized_start=758
+  _globals['_HOSTMETA']._serialized_end=941
+  _globals['_HOSTMETA_KVENTRY']._serialized_start=900
+  _globals['_HOSTMETA_KVENTRY']._serialized_end=941
+  _globals['_METARESPONSE']._serialized_start=943
+  _globals['_METARESPONSE']._serialized_end=1034
+  _globals['_HOSTFRAME']._serialized_start=1037
+  _globals['_HOSTFRAME']._serialized_end=1412
+  _globals['_HOSTTUNNEL']._serialized_start=1414
+  _globals['_HOSTTUNNEL']._serialized_end=1483
+# @@protoc_insertion_point(module_scope)

{remoterf_server-1.1.3/src/remoteRF_server/drivers/adalm_pluto → remoterf_server-1.4.2/src/remoteRF_server/common/idl}/pluto_schema.py

@@ -89,6 +89,7 @@ class PlutoSchema(DeviceSchema):
     device_type = "adalm_pluto"
     client_class = "Pluto"
     driver_version = "0.0.3"
+    _fir_rate = None  # the rate whose pyadi FIR this schema last loaded
 
     @staticmethod
     def make_device(**kwargs):
@@ -106,6 +107,7 @@ class PlutoSchema(DeviceSchema):
 
     @idl_expose(kind="set")
     def set_filter(self, value):
+        self._fir_rate = None
         self.device.filter = value
 
     @idl_expose(kind="get")
@@ -164,7 +166,20 @@ class PlutoSchema(DeviceSchema):
 
     @idl_expose(kind="set")
     def set_sample_rate(self, value):
+        # pyadi reloads its FIR and re-runs the AD9361 rate chain (~0.8 s) even
+        # for an unchanged rate: skip only what our own last set left in place.
+        if value == self._fir_rate:
+            try:
+                if (
+                    self.device.sample_rate == value
+                    and self.device._get_iio_attr("out", "voltage_filter_fir_en", False) == 1
+                ):
+                    return
+            except Exception:
+                pass
+        self._fir_rate = None
         self.device.sample_rate = value
+        self._fir_rate = value
 
     @idl_expose(kind="get")
     def get_rx_lo(self):
@@ -222,12 +237,18 @@ class PlutoSchema(DeviceSchema):
     def reset_for_next_holder(self):
         """A reservation ended: a PoE Pluto powers off. Otherwise stop its cyclic
         transmission, and drop its RX buffer so the next holder's rx_buffer_size takes effect."""
+        self._fir_rate = None
         if isinstance(self.device, PoePluto):
             self.device.power_down()
         elif self.device is not None:
             self.device.tx_destroy_buffer()
             self.device.rx_destroy_buffer()
 
+    def prepare_for_holder(self):
+        """A reservation started: a PoE Pluto boots now, not at the holder's first command."""
+        if isinstance(self.device, PoePluto):
+            self.device.power_up()
+
     @idl_expose(kind="call")
     def call_disable_dds(self):
         """Disable the internal DDS tone generator."""
@@ -244,12 +265,14 @@ class PlutoSchema(DeviceSchema):
     @idl_expose(kind="call")
     def call_power_down(self):
         """PoE Plutos: cut power; the next command powers it back up. No-op on other Plutos."""
+        self._fir_rate = None
         if isinstance(self.device, PoePluto):
             self.device.power_down()
 
     @idl_expose(kind="call")
     def call_power_cycle(self):
         """PoE Plutos: power off, then on, and wait for boot. No-op on other Plutos."""
+        self._fir_rate = None
         if isinstance(self.device, PoePluto):
             self.device.power_cycle()
 

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/common/utils/__init__.py

@@ -13,9 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import re
+
 from .api_token import validate_token, generate_token, hash_token
 from .process_arg import unmap_arg, map_arg
 from .ansi_codes import printf, stylize, Sty
 from .list_string import list_to_str, str_to_list
 from .db_connection import db_connection
-from .db_location import get_db_dir, get_certs_dir, get_drivers_dir, get_remoterf_root
+from .db_location import get_db_dir, get_certs_dir, get_drivers_dir, get_remoterf_root
+
+
+def device_name_key(name: str) -> str:
+    """A device name as typed and matched: whitespace and '_' are interchangeable,
+    runs collapse and the ends are ignored ('pluto A' == 'pluto_A'). Case is kept."""
+    return re.sub(r"[\s_]+", "_", name).strip("_")

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/common/utils/process_arg.py

@@ -98,7 +98,7 @@ def _json_safe(value: Any):
         return _json_safe(value.as_payload())
     if isinstance(value, np.ndarray):
         if value.dtype == object:
-            raise ValueError(f"Cannot JSON-map object-dtype array: {value!r}")
+            return _json_safe(value.tolist())
         array = np.asarray(value)
         if np.iscomplexobj(array):
             data = [[float(num.real), float(num.imag)] for num in array.ravel()]
@@ -206,13 +206,15 @@ def map_arg(value: Any) -> grpc_pb2.Argument:
             try:
                 array = np.stack(value)
             except Exception:
-                arg.json_value = json.dumps(_json_safe(value), separators=(",", ":"))
-                return arg
+                pass
+        if array.dtype == object:
+            arg.json_value = json.dumps(_json_safe(value), separators=(",", ":"))
+            return arg
         return map_arg(array)
     elif isinstance(value, np.ndarray):
-        if value.dtype == object:
-            raise ValueError(f"Cannot map object-dtype array: {value!r}")
-        if value.dtype.kind not in _SUPPORTED_NDARRAY_KINDS:
+        # Object arrays (a list of dicts, say) and non-numeric dtypes go as
+        # JSON, which the client decodes back to lists.
+        if value.dtype == object or value.dtype.kind not in _SUPPORTED_NDARRAY_KINDS:
             arg.json_value = json.dumps(
                 _json_safe(value.tolist()), separators=(",", ":")
             )

{remoterf_server-1.1.3/src/remoteRF_server/common/idl → remoterf_server-1.4.2/src/remoteRF_server/drivers/adalm_pluto}/pluto_schema.py

@@ -89,6 +89,7 @@ class PlutoSchema(DeviceSchema):
     device_type = "adalm_pluto"
     client_class = "Pluto"
     driver_version = "0.0.3"
+    _fir_rate = None  # the rate whose pyadi FIR this schema last loaded
 
     @staticmethod
     def make_device(**kwargs):
@@ -106,6 +107,7 @@ class PlutoSchema(DeviceSchema):
 
     @idl_expose(kind="set")
     def set_filter(self, value):
+        self._fir_rate = None
         self.device.filter = value
 
     @idl_expose(kind="get")
@@ -164,7 +166,20 @@ class PlutoSchema(DeviceSchema):
 
     @idl_expose(kind="set")
     def set_sample_rate(self, value):
+        # pyadi reloads its FIR and re-runs the AD9361 rate chain (~0.8 s) even
+        # for an unchanged rate: skip only what our own last set left in place.
+        if value == self._fir_rate:
+            try:
+                if (
+                    self.device.sample_rate == value
+                    and self.device._get_iio_attr("out", "voltage_filter_fir_en", False) == 1
+                ):
+                    return
+            except Exception:
+                pass
+        self._fir_rate = None
         self.device.sample_rate = value
+        self._fir_rate = value
 
     @idl_expose(kind="get")
     def get_rx_lo(self):
@@ -222,12 +237,18 @@ class PlutoSchema(DeviceSchema):
     def reset_for_next_holder(self):
         """A reservation ended: a PoE Pluto powers off. Otherwise stop its cyclic
         transmission, and drop its RX buffer so the next holder's rx_buffer_size takes effect."""
+        self._fir_rate = None
         if isinstance(self.device, PoePluto):
             self.device.power_down()
         elif self.device is not None:
             self.device.tx_destroy_buffer()
             self.device.rx_destroy_buffer()
 
+    def prepare_for_holder(self):
+        """A reservation started: a PoE Pluto boots now, not at the holder's first command."""
+        if isinstance(self.device, PoePluto):
+            self.device.power_up()
+
     @idl_expose(kind="call")
     def call_disable_dds(self):
         """Disable the internal DDS tone generator."""
@@ -244,12 +265,14 @@ class PlutoSchema(DeviceSchema):
     @idl_expose(kind="call")
     def call_power_down(self):
         """PoE Plutos: cut power; the next command powers it back up. No-op on other Plutos."""
+        self._fir_rate = None
         if isinstance(self.device, PoePluto):
             self.device.power_down()
 
     @idl_expose(kind="call")
     def call_power_cycle(self):
         """PoE Plutos: power off, then on, and wait for boot. No-op on other Plutos."""
+        self._fir_rate = None
         if isinstance(self.device, PoePluto):
             self.device.power_cycle()
 

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/drivers/adalm_pluto/poe.py

@@ -32,6 +32,9 @@ IIOD_PORT = 30431
 BOOT_TIMEOUT_S = 45
 LINK_CHECK_S = 30  # no IIOD by then: ask the switch whether the port even has a link
 OFF_S = 3  # long enough for the Pluto to lose power before it is switched back on
+# Reservations starting together (the top of an hour) power every Pluto at
+# once: keep the switch's API logins to a few at a time.
+_SWITCH_SESSIONS = threading.BoundedSemaphore(4)
 
 
 class RouterOS:
@@ -85,20 +88,22 @@ class RouterOS:
 
 
 def set_poe(*, switch, user, password, port, on):
-    ros = RouterOS(switch, user, password)
-    try:
-        ros.cmd("/interface/ethernet/poe/set", f"=.id={port}", f"=poe-out={'auto-on' if on else 'off'}")
-    finally:
-        ros.close()
+    with _SWITCH_SESSIONS:
+        ros = RouterOS(switch, user, password)
+        try:
+            ros.cmd("/interface/ethernet/poe/set", f"=.id={port}", f"=poe-out={'auto-on' if on else 'off'}")
+        finally:
+            ros.close()
 
 
 def port_running(*, switch, user, password, port):
     """Whether the switch port has an Ethernet link (RouterOS 'running')."""
-    ros = RouterOS(switch, user, password)
-    try:
-        replies = ros.cmd("/interface/ethernet/print", f"?name={port}", "=.proplist=name,running")
-    finally:
-        ros.close()
+    with _SWITCH_SESSIONS:
+        ros = RouterOS(switch, user, password)
+        try:
+            replies = ros.cmd("/interface/ethernet/print", f"?name={port}", "=.proplist=name,running")
+        finally:
+            ros.close()
     for sentence in replies:
         if sentence[0] == "!re":
             return "=running=true" in sentence
@@ -133,7 +138,14 @@ class PoePluto:
         return f"<PoE Pluto {self.uri} on {self._port}, {'on' if self._pluto is not None else 'off'}>"
 
     def _poe(self, on):
-        set_poe(port=self._port, on=on, **self._switch)
+        # The switch API occasionally times out; a lost power-off leaves the Pluto on.
+        for attempt in range(3):
+            try:
+                return set_poe(port=self._port, on=on, **self._switch)
+            except OSError:
+                if attempt == 2:
+                    raise
+                time.sleep(2)
 
     @property
     def power_state(self):

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/drivers/rtl_sdr/rtl_sdr_schema.py

@@ -25,6 +25,13 @@ from remoteRF_server.common.idl import DeviceSchema, idl_expose, idl_register
 
 _MAX_REMOTE_PAYLOAD_BYTES = 4 * 1024 * 1024
 _MAX_COMPLEX64_SAMPLES = _MAX_REMOTE_PAYLOAD_BYTES // np.dtype(np.complex64).itemsize
+# librtlsdr's synchronous read fails on a partial USB packet, and pyrtlsdr then
+# closes the device but keeps its freed handle: read whole packets and slice.
+_USB_PACKET_BYTES = 512
+
+
+def _whole_packets(num_bytes: int) -> int:
+    return -(-num_bytes // _USB_PACKET_BYTES) * _USB_PACKET_BYTES
 
 def _require_rtlsdr():
     try:
@@ -151,7 +158,8 @@ class RtlSdrSchema(DeviceSchema):
     @property
     def _native(self):
         native = getattr(self.device, "native", None)
-        if native is None:
+        # pyrtlsdr closes itself on a failed read; its handle is freed then.
+        if native is None or getattr(native, "device_opened", True) is False:
             raise RuntimeError("RTL-SDR device is closed")
         return native
 
@@ -319,7 +327,8 @@ class RtlSdrSchema(DeviceSchema):
             label="num_samples",
             maximum=_MAX_COMPLEX64_SAMPLES,
         )
-        samples = np.asarray(self._native.read_samples(count), dtype=np.complex64)
+        read = _whole_packets(2 * count) // 2
+        samples = np.asarray(self._native.read_samples(read), dtype=np.complex64)[:count]
         if samples.size != count:
             raise RuntimeError(
                 f"short RTL-SDR read: requested {count}, received {samples.size}"
@@ -334,7 +343,7 @@ class RtlSdrSchema(DeviceSchema):
             label="num_bytes",
             maximum=_MAX_REMOTE_PAYLOAD_BYTES,
         )
-        payload = bytes(self._native.read_bytes(count))
+        payload = bytes(self._native.read_bytes(_whole_packets(count)))[:count]
         if len(payload) != count:
             raise RuntimeError(
                 f"short RTL-SDR byte read: requested {count}, received {len(payload)}"

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/drivers/usrp/usrp_schema.py

@@ -27,6 +27,9 @@ c = idl_client
 
 import itertools
 import os
+import subprocess
+import sys
+import threading
 
 
 def _configure_uhd_console_logging():
@@ -114,8 +117,7 @@ def _remote_transport_args(value):
     return f"{args},{setting}" if args else setting
 
 
-def _connect_usrp(args=None, serial=None, addr=None, **kwargs):
-    uhd_module = _require_uhd()
+def _usrp_args(args=None, serial=None, addr=None, **kwargs):
     args = args or kwargs.pop("device_args", None) or kwargs.pop("init_args", None)
     type_hint = kwargs.pop("type", None) or kwargs.pop("device_type", None)
     profile_name = kwargs.pop("profile", None)
@@ -165,8 +167,53 @@ def _connect_usrp(args=None, serial=None, addr=None, **kwargs):
         if profile.uhd_device_type and "type" not in arg_keys:
             args = f"type={profile.uhd_device_type},{arg_text}"
 
-    args = _remote_transport_args(args)
+    return _remote_transport_args(args)
+
+
+# A cold B2xx open (firmware + FPGA image) took ~68 s inside MultiUSRP(),
+# which holds the GIL, so the whole lab stopped answering. A child process
+# pays that instead while this one waits without the GIL; the open after it
+# is warm (~2.5 s).
+# ponytail: "warm" is per process; a USB replug while the Server runs makes
+# the next open cold in-process again. Clear the mark on hotplug if that bites.
+_PRELOAD_TIMEOUT = 180.0
+_preloaded = set()
+_preload_locks = {}
+_preload_guard = threading.Lock()
+
+
+def _preload_image(args):
+    if str(os.getenv("REMOTERF_USRP_PRELOAD", "1")).strip().lower() in {"0", "false", "no", "off"}:
+        return
+    with _preload_guard:
+        lock = _preload_locks.setdefault(args, threading.Lock())
+    # One device, one driver at a time: an open waits here for a pre-load.
+    with lock:
+        if args in _preloaded:
+            return
+        try:
+            done = subprocess.run(
+                [sys.executable, "-c", "import sys, uhd; uhd.usrp.MultiUSRP(sys.argv[1])", args],
+                stdin=subprocess.DEVNULL,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                timeout=_PRELOAD_TIMEOUT,
+            )
+        except (OSError, subprocess.TimeoutExpired) as exc:
+            print(f"Warning: USRP image pre-load for {args!r} failed: {exc}")
+            return
+        if done.returncode == 0:
+            _preloaded.add(args)
+        else:
+            print(f"Warning: USRP image pre-load for {args!r} exited {done.returncode}")
+
+
+def _connect_usrp(args=None, serial=None, addr=None, **kwargs):
+    uhd_module = _require_uhd()
+    args = _usrp_args(args, serial, addr, **kwargs)
+    _preload_image(args)
     dev = uhd_module.usrp.MultiUSRP(args)
+    _preloaded.add(args)
     return dev
 
 
@@ -618,6 +665,11 @@ class UsrpSchema(DeviceSchema):
     def open_native_device(self):
         return _connect_usrp(**self._inventory)
 
+    def prepare_for_holder(self):
+        """A reservation started: load a cold image now, not in the holder's open."""
+        if uhd is not None:
+            _preload_image(_usrp_args(**self._inventory))
+
     def create_session_schema(self):
         """Create an isolated, live adapter for one authenticated reservation."""
         clone = type(self)()

{remoterf_server-1.1.3 → remoterf_server-1.4.2}/src/remoteRF_server/host/host_directory_store.py

@@ -125,6 +125,31 @@ class EnvStore:
 
             self._write_lines(lines)
 
+    def remove_from_csv_list(self, key: str, value: str) -> None:
+        key = sanitize_env_key(key)
+        value = (value or "").strip()
+
+        with self._lock:
+            lines = self._read_lines()
+            for i, ln in enumerate(lines):
+                if ln.startswith(key + "="):
+                    existing = csv_split(ln[len(key) + 1:])
+                    if value not in existing:
+                        return
+                    existing.remove(value)
+                    lines[i] = f"{key}=" + ",".join(existing)
+                    self._write_lines(lines)
+                    return
+
+    def remove_keys(self, keys: List[str]) -> None:
+        prefixes = tuple(sanitize_env_key(k) + "=" for k in keys)
+
+        with self._lock:
+            lines = self._read_lines()
+            kept = [ln for ln in lines if not ln.startswith(prefixes)]
+            if len(kept) != len(lines):
+                self._write_lines(kept)
+
     def upsert_kv(self, key: str, value: str) -> None:
         key = sanitize_env_key(key)
         value = (value or "").strip()