Merge pull request #1422 from doronz88/bugfix/tunnel-service-bugs

Bugfix/tunnel service bugs

Author: doronz88

pymobiledevice3/remote/tunnel_service.py

@@ -21,7 +21,6 @@
 from ssl import VerifyMode
 from typing import Optional, TextIO, cast
 
-import aiofiles
 from construct import Const, Container
 from construct import Enum as ConstructEnum
 from construct import GreedyBytes, GreedyRange, Int8ul, Int16ub, Int64ul, Prefixed, Struct
@@ -161,12 +160,11 @@ async def tun_read_task(self) -> None:
         read_size = self.tun.mtu + len(LOOPBACK_HEADER)
         try:
             if sys.platform != 'win32':
-                async with aiofiles.open(self.tun.fileno(), 'rb', opener=lambda path, flags: path, buffering=0) as f:
-                    while True:
-                        packet = await f.read(read_size)
-                        assert packet.startswith(LOOPBACK_HEADER)
-                        packet = packet[len(LOOPBACK_HEADER):]
-                        await self.send_packet_to_device(packet)
+                while True:
+                    packet = await asyncio.to_thread(self.tun.read, read_size)
+                    assert packet.startswith(LOOPBACK_HEADER)
+                    packet = packet[len(LOOPBACK_HEADER):]
+                    await self.send_packet_to_device(packet)
             else:
                 while True:
                     packet = await self.tun.async_read()
@@ -311,13 +309,13 @@ async def stop_tunnel(self) -> None:
         self._sock_read_task.cancel()
         with suppress(CancelledError):
             await self._sock_read_task
+        await super().stop_tunnel()
         if not self._writer.is_closing():
             self._writer.close()
             try:
                 await self._writer.wait_closed()
             except OSError:
                 pass
-        await super().stop_tunnel()
 
 
 @dataclasses.dataclass

requirements.txt

@@ -37,7 +37,6 @@ developer_disk_image>=0.0.2
 opack2
 psutil
 pytun-pmd3>=2.1.0
-aiofiles
 prompt_toolkit
 sslpsk-pmd3>=1.0.3;python_version<'3.13'
 python-pcapng>=2.1.1