remoteRF-server 1.1.0.dev46__py3-none-any.whl → 1.1.0.dev48__py3-none-any.whl

remoteRF_server/server/direct_path.py

@@ -50,6 +50,41 @@ from .global_onboarding import RELAYED, hostname, is_offsite
 
 logger = logging.getLogger("remoteRF_server.direct")
 
+
+async def close_ice(ice) -> None:
+    """Close an aioice Connection without the library's after-close noise.
+
+    aioice leaves STUN retry timers armed and connectivity-check tasks waiting
+    on futures nobody resolves; the timers then fire on closed sockets and the
+    tasks die "pending" when the loop stops. Fail those transactions first so
+    everything finishes cleanly, then close."""
+    from aioice import stun
+
+    for protocol in list(getattr(ice, "_protocols", [])):
+        for transaction in list(getattr(protocol, "transactions", {}).values()):
+            handle = getattr(transaction, "_Transaction__timeout_handle", None)
+            if handle is not None:
+                handle.cancel()
+            future = getattr(transaction, "_Transaction__future", None)
+            if future is not None and not future.done():
+                future.set_exception(stun.TransactionTimeout())
+    await ice.close()
+    await asyncio.sleep(0)  # let the check tasks see their failures and exit
+
+
+def quiet_aioice_errors(loop) -> None:
+    """A STUN retry on an already-closed socket is not an error worth a
+    traceback in someone's shell; everything else keeps the default handler."""
+    default = loop.default_exception_handler
+
+    def handler(loop, context):
+        exc = context.get("exception")
+        if isinstance(exc, (AttributeError, OSError)) and "Transaction" in repr(context.get("handle", "")):
+            return
+        default(context)
+
+    loop.set_exception_handler(handler)
+
 ALPN = "remoterf-direct/1"
 MAX_FRAME = 100 * 1024 * 1024  # the gRPC message ceiling
 IDLE_SECONDS = 600
@@ -307,7 +342,7 @@ class _Path:
             task.cancel()
             with contextlib.suppress(asyncio.CancelledError):
                 await task
-        await self.ice.close()
+        await close_ice(self.ice)
 
 
 async def _offer(key: str, user: str, remote: dict) -> dict:
@@ -327,7 +362,7 @@ async def _offer(key: str, user: str, remote: dict) -> dict:
             await ice.add_remote_candidate(Candidate.from_sdp(str(sdp)))
         await ice.add_remote_candidate(None)
     except Exception:
-        await ice.close()
+        await close_ice(ice)
         raise
     path = _paths[key] = _Path(key, user, ice)
     path.task = asyncio.ensure_future(path.run())
@@ -343,6 +378,7 @@ def _get_loop() -> asyncio.AbstractEventLoop:
     with _lock:
         if _loop is None:
             _loop = asyncio.new_event_loop()
+            quiet_aioice_errors(_loop)
             threading.Thread(
                 target=_loop.run_forever, name="remoterf-direct", daemon=True
             ).start()

remoteRF_server/server/user_group_cli.py

@@ -27,6 +27,19 @@ from .global_onboarding import invite, lan_endpoint
 from .user_group_handler import user_group_handler
 
 
+def _print_device_choices() -> None:
+    """The ids a whitelist can name, so nobody has to guess."""
+    from . import device_manager
+
+    devices = device_manager.get_all_devices_str()
+    if not devices:
+        print("No devices are configured yet (devices.yml).")
+        return
+    print("Devices on this server:")
+    for gid in sorted(devices):
+        print(f"  {gid:>4}  {devices[gid]}")
+
+
 def _invites(rows: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
     """Add the pasteable `invite` form to code rows (bare for LAN-only groups)."""
     lan_only = {
@@ -103,7 +116,8 @@ def make_user_group_local(session) -> None:
                 return None
 
             if not s or s.lower() in {"all", "*"}:
-                return []  # unrestricted: every device, including ones added later
+                print("List the device ids this group may use, e.g. '0,1,2'.")
+                continue
 
             # Allow both commas and whitespace
             parts = [p for p in s.replace(",", " ").split() if p]
@@ -136,7 +150,8 @@ def make_user_group_local(session) -> None:
         return
 
     # ---- Parameters ----
-    devices_whitelist = _prompt_int_list("Devices whitelist (e.g. 0,1,2) [all] (c to cancel): ")
+    _print_device_choices()
+    devices_whitelist = _prompt_int_list("Devices whitelist (e.g. 0,1,2) (c to cancel): ")
     if devices_whitelist is None:
         return
 
@@ -157,7 +172,7 @@ def make_user_group_local(session) -> None:
     lan_only = not _prompt_yes_no("Reachable from outside your network (via Global)? (Y/n): ", default_no=False)
 
     # ---- Final confirmation ----
-    wl_str = ",".join(map(str, devices_whitelist)) or "all"
+    wl_str = ",".join(map(str, devices_whitelist))
     print("\nAbout to create user group with:")
     print(f"  group_name               : {group_name}")
     print(f"  devices_whitelist        : {wl_str}")
@@ -270,7 +285,8 @@ def edit_user_group_local(session) -> None:
         if s == "":
             return ""    # unchanged
         if s.lower() in {"all", "*"}:
-            return []    # unrestricted: every device
+            print("List the device ids this group may use, e.g. '0,1,2'.")
+            return _prompt_devices_optional(msg)
         parts = [p for p in s.replace(",", " ").split() if p]
         try:
             vals = [int(p) for p in parts]
@@ -313,8 +329,9 @@ def edit_user_group_local(session) -> None:
     if group_name == "":
         group_name = None
 
+    _print_device_choices()
     devices_whitelist = _prompt_devices_optional(
-        "New devices whitelist (e.g. 0,1,2 | all | Enter unchanged, c cancel): "
+        "New devices whitelist (e.g. 0,1,2 | Enter unchanged, c cancel): "
     )
     if devices_whitelist is None:
         return

{remoterf_server-1.1.0.dev46.dist-info → remoterf_server-1.1.0.dev48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.1.0.dev46
+Version: 1.1.0.dev48
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.1.0.dev46.dist-info → remoterf_server-1.1.0.dev48.dist-info}/RECORD

@@ -56,14 +56,14 @@ remoteRF_server/server/commands.py,sha256=ccb_Ab1mbIkosBsFGJnDSccrjWtR_Lymvvn3Iq
 remoteRF_server/server/console.py,sha256=J91LfwPVmBgielOxfE740NOYduekggyZkqi-47y_A4w,4472
 remoteRF_server/server/control.py,sha256=Uq1Fk0zIoHHX_EXfz3OuNle8urvO_UhAiB5Lk5cs2e4,5177
 remoteRF_server/server/device_manager.py,sha256=PPuCwlPSmjfVpCqy_hCaOr9WvFgE8mqtLMhWOAgXNDA,39281
-remoteRF_server/server/direct_path.py,sha256=CQs0uPTANJq6Bn-TzsV0APmD3hYKH8xYvczXZZk1OXk,15229
+remoteRF_server/server/direct_path.py,sha256=ry4wRbqMQdSSh-HVFlbbMdTCNM0XksTl-h9MORJ0PLM,16781
 remoteRF_server/server/dynamic_v2.py,sha256=AMhQEFhNAvCNcF-PdfCCQQLmeoaR7s1Os8et1KFGn_8,70814
 remoteRF_server/server/global_onboarding.py,sha256=NcKG8TYhCJEiaCtdXL1jEgVm-R_xWpOIj5KI4bWfkr0,39942
 remoteRF_server/server/grpc_server.py,sha256=91FpJubzN_Wfuk6fW_owIEzNCukd333sAGW68FUU8pk,46787
 remoteRF_server/server/host_dynamic_v2.py,sha256=1rJQwP4knSd0EXkByrSn_ryjLx81f6sp6SNYr_aEass,8105
 remoteRF_server/server/reservation.py,sha256=BQJLGNVAdKMZu2Lg4DGO9UhuJ0b1GSF8K1DgIOFrYUg,67816
 remoteRF_server/server/rpc_manager.py,sha256=BDvsTSVRxwNF2ujuMbIb5TYNAUI6AH4xXBuXrb8lltM,17223
-remoteRF_server/server/user_group_cli.py,sha256=8W3BV-_Wcy3EKapjwNWow8y6xlZYP-y6Ckb2BA1sdR4,25735
+remoteRF_server/server/user_group_cli.py,sha256=0QbsGfeIqkyU6E1naGwR-i7BxptPMMTQCi1m7yM03JM,26259
 remoteRF_server/server/user_group_handler.py,sha256=1ax73W_P3H6GDxQS13evwA7G7skIElFVLuS0MFqsFyU,41780
 remoteRF_server/server/v2_errors.py,sha256=IS3hIhf5tDe7jaOrDAVQPjGBpqAjN7442BlJYgfJo7g,3331
 remoteRF_server/server/deployment/__init__.py,sha256=YV86uafd8XiGD7sLaqNfO5xxmt5te2R6DUhD-w1lZuY,77
@@ -90,9 +90,9 @@ remoteRF_server/tools/gen_certs.py,sha256=Vbyu8JjRu__UYPVmyCRXt5SOw0Za1HV7g1md3G
 remoteRF_server/tools/gist_status.py,sha256=SFv2iQgQrIKT9gxKrU-_Dr7S0p0rE4wQM6J3OC6FcoM,4649
 remoteRF_server/tools/gist_status_testing.py,sha256=IYw7UkPjAUpKDTtIlnYGb5g6SJkwz4TRGUfJJ6f4LhQ,2690
 remoteRF_server/tools/introspect_uhd.py,sha256=vUpPb0rM9tsHPxWadS3EfMDE-gMd-TvNV0TjrZOQqBY,4531
-remoterf_server-1.1.0.dev46.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf_server-1.1.0.dev46.dist-info/METADATA,sha256=OJ9-jeWed-pV98PI7BGqFv7mQBw5cw7yWCIuXvTG2Qg,42069
-remoterf_server-1.1.0.dev46.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf_server-1.1.0.dev46.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
-remoterf_server-1.1.0.dev46.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
-remoterf_server-1.1.0.dev46.dist-info/RECORD,,
+remoterf_server-1.1.0.dev48.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev48.dist-info/METADATA,sha256=ZhdOC9w67CZe59Nn38BVHXVFsnyGESpLxDE5izAzi5s,42069
+remoterf_server-1.1.0.dev48.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev48.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev48.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev48.dist-info/RECORD,,