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

remoteRF_server/server/direct_path.py

@@ -74,6 +74,21 @@ async def close_ice(ice) -> None:
     await ice.close()
 
 
+async def cancel_tasks(tasks) -> None:
+    """Cancel these tasks and wait for them to finish.
+
+    A task that is cancelled but never awaited can be collected while still
+    pending, and Python prints a traceback for it that nobody can act on.
+    The caller's own task is never cancelled, so this is safe to call from
+    inside one of the tasks being torn down."""
+    current = asyncio.current_task()
+    tasks = [task for task in tasks if task is not None and task is not current and not task.done()]
+    for task in tasks:
+        task.cancel()
+    if tasks:
+        await asyncio.gather(*tasks, return_exceptions=True)
+
+
 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."""
@@ -248,6 +263,7 @@ class _Path:
         self.calls = 0
         self.task: Optional[asyncio.Task] = None
         self.transport: Optional[_IceTransport] = None
+        self.streams: set[asyncio.Task] = set()
 
     async def run(self) -> None:
         protocol = None
@@ -266,8 +282,7 @@ class _Path:
                 printf(f"Direct path open: {self.user} from {self.peer[0]}:{self.peer[1]} ({where})", Sty.GRAY)
                 await asyncio.wait({pump, closed}, return_when=asyncio.FIRST_COMPLETED)
             finally:
-                pump.cancel()
-                closed.cancel()
+                await cancel_tasks((pump, closed))
         except Exception as exc:  # noqa: BLE001 - a failed punch is expected on some networks
             printf(f"Direct path failed: {self.user}: {type(exc).__name__}: {exc}", Sty.GRAY)
         finally:
@@ -308,7 +323,11 @@ class _Path:
                 protocol.datagram_received(data, self.peer)
 
     def _stream(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
-        asyncio.ensure_future(self._serve(reader, writer))
+        # Tracked, not fire-and-forget: a stream holds a device call, and the
+        # path may close under it.
+        task = asyncio.ensure_future(self._serve(reader, writer))
+        self.streams.add(task)
+        task.add_done_callback(self.streams.discard)
 
     async def _serve(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
         bad_frame = None
@@ -344,6 +363,7 @@ class _Path:
             task.cancel()
             with contextlib.suppress(asyncio.CancelledError):
                 await task
+        await cancel_tasks(list(self.streams))
         await close_ice(self.ice)
 
 

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

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

{remoterf_server-1.1.0.dev49.dist-info → remoterf_server-1.1.0.dev50.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=VNujG1xMc5dj8xkZJG9AXyV0FzIyEo3OsUv7AVPu1Qo,16959
+remoteRF_server/server/direct_path.py,sha256=TrL0aWCUXN9Lmuww-v_AXtLIOqTkckm2vPW91xcnOLI,17875
 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.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,,
+remoterf_server-1.1.0.dev50.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev50.dist-info/METADATA,sha256=jy_xvhBrCSFGJ5x5I_ZBgDynd1Hwe7uFv-1KaC-Fs60,42069
+remoterf_server-1.1.0.dev50.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev50.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev50.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev50.dist-info/RECORD,,