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

remoteRF_server/server/direct_path.py

@@ -54,22 +54,24 @@ 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
-
+    A cancelled ``connect()`` (a punch that timed out) never reaches aioice's
+    own "cancel remaining checks" loop, so its check tasks keep running and
+    its STUN timers stay armed against sockets close() is about to take. Stop
+    both before closing."""
+    # Cancel the connectivity checks first. Failing their STUN transactions
+    # instead only makes aioice start replacement checks, which then hang on
+    # a closed socket and die "pending" when they are collected.
+    checks = [pair.task for pair in list(getattr(ice, "_check_list", [])) if pair.task is not None]
+    for task in checks:
+        task.cancel()
+    if checks:
+        await asyncio.gather(*checks, return_exceptions=True)
     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())
+                handle.cancel()  # a retry would fire on the socket close() is about to take
     await ice.close()
-    await asyncio.sleep(0)  # let the check tasks see their failures and exit
 
 
 def quiet_aioice_errors(loop) -> None:

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

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

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

@@ -56,7 +56,7 @@ 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=ry4wRbqMQdSSh-HVFlbbMdTCNM0XksTl-h9MORJ0PLM,16781
+remoteRF_server/server/direct_path.py,sha256=VNujG1xMc5dj8xkZJG9AXyV0FzIyEo3OsUv7AVPu1Qo,16959
 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
@@ -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.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,,
+remoterf_server-1.1.0.dev49.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev49.dist-info/METADATA,sha256=bfmyOSKZdas4E-wiTwUyXzbhtVJfF9Ev4kVjHU3UXXI,42069
+remoterf_server-1.1.0.dev49.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev49.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev49.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev49.dist-info/RECORD,,