pymobiledevice3 4.27.4__py3-none-any.whl → 5.1.2__py3-none-any.whl

pymobiledevice3/remote/tunnel_service.py

@@ -21,9 +21,8 @@ from socket import create_connection
 from ssl import VerifyMode
 from typing import Optional, TextIO, cast
 
-from construct import Const, Container
+from construct import Const, Container, GreedyBytes, GreedyRange, Int8ul, Int16ub, Int64ul, Prefixed, Struct
 from construct import Enum as ConstructEnum
-from construct import GreedyBytes, GreedyRange, Int8ul, Int16ub, Int64ul, Prefixed, Struct
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives._serialization import Encoding, NoEncryption, PrivateFormat, PublicFormat
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -55,10 +54,20 @@ except ImportError:
 
 from pymobiledevice3.bonjour import DEFAULT_BONJOUR_TIMEOUT, browse_remotepairing
 from pymobiledevice3.ca import make_cert
-from pymobiledevice3.exceptions import PairingError, PyMobileDevice3Exception, QuicProtocolNotSupportedError, \
-    RemotePairingCompletedError, UserDeniedPairingError
-from pymobiledevice3.pair_records import PAIRING_RECORD_EXT, create_pairing_records_cache_folder, generate_host_id, \
-    get_remote_pairing_record_filename, iter_remote_paired_identifiers
+from pymobiledevice3.exceptions import (
+    PairingError,
+    PyMobileDevice3Exception,
+    QuicProtocolNotSupportedError,
+    RemotePairingCompletedError,
+    UserDeniedPairingError,
+)
+from pymobiledevice3.pair_records import (
+    PAIRING_RECORD_EXT,
+    create_pairing_records_cache_folder,
+    generate_host_id,
+    get_remote_pairing_record_filename,
+    iter_remote_paired_identifiers,
+)
 from pymobiledevice3.remote.common import TunnelProtocol
 from pymobiledevice3.remote.remote_service import RemoteService
 from pymobiledevice3.remote.remote_service_discovery import RemoteServiceDiscoveryService
@@ -67,7 +76,7 @@ from pymobiledevice3.remote.xpc_message import XpcInt64Type, XpcUInt64Type
 from pymobiledevice3.service_connection import ServiceConnection
 from pymobiledevice3.utils import asyncio_print_traceback
 
-DEFAULT_INTERFACE_NAME = 'pymobiledevice3-tunnel'
+DEFAULT_INTERFACE_NAME = "pymobiledevice3-tunnel"
 TIMEOUT = 1
 
 OSUTIL = get_os_utils()
@@ -81,58 +90,60 @@ UDP_HEADER_SIZE = 8
 IOS_DEVICE_MTU_SIZE = 1500
 packet_builder.PACKET_MAX_SIZE = IOS_DEVICE_MTU_SIZE - IPV6_HEADER_SIZE - UDP_HEADER_SIZE
 
-PairingDataComponentType = ConstructEnum(Int8ul,
-                                         METHOD=0x00,
-                                         IDENTIFIER=0x01,
-                                         SALT=0x02,
-                                         PUBLIC_KEY=0x03,
-                                         PROOF=0x04,
-                                         ENCRYPTED_DATA=0x05,
-                                         STATE=0x06,
-                                         ERROR=0x07,
-                                         RETRY_DELAY=0x08,
-                                         CERTIFICATE=0x09,
-                                         SIGNATURE=0x0a,
-                                         PERMISSIONS=0x0b,
-                                         FRAGMENT_DATA=0x0c,
-                                         FRAGMENT_LAST=0x0d,
-                                         SESSION_ID=0x0e,
-                                         TTL=0x0f,
-                                         EXTRA_DATA=0x10,
-                                         INFO=0x11,
-                                         ACL=0x12,
-                                         FLAGS=0x13,
-                                         VALIDATION_DATA=0x14,
-                                         MFI_AUTH_TOKEN=0x15,
-                                         MFI_PRODUCT_TYPE=0x16,
-                                         SERIAL_NUMBER=0x17,
-                                         MFI_AUTH_TOKEN_UUID=0x18,
-                                         APP_FLAGS=0x19,
-                                         OWNERSHIP_PROOF=0x1a,
-                                         SETUP_CODE_TYPE=0x1b,
-                                         PRODUCTION_DATA=0x1c,
-                                         APP_INFO=0x1d,
-                                         SEPARATOR=0xff)
+PairingDataComponentType = ConstructEnum(
+    Int8ul,
+    METHOD=0x00,
+    IDENTIFIER=0x01,
+    SALT=0x02,
+    PUBLIC_KEY=0x03,
+    PROOF=0x04,
+    ENCRYPTED_DATA=0x05,
+    STATE=0x06,
+    ERROR=0x07,
+    RETRY_DELAY=0x08,
+    CERTIFICATE=0x09,
+    SIGNATURE=0x0A,
+    PERMISSIONS=0x0B,
+    FRAGMENT_DATA=0x0C,
+    FRAGMENT_LAST=0x0D,
+    SESSION_ID=0x0E,
+    TTL=0x0F,
+    EXTRA_DATA=0x10,
+    INFO=0x11,
+    ACL=0x12,
+    FLAGS=0x13,
+    VALIDATION_DATA=0x14,
+    MFI_AUTH_TOKEN=0x15,
+    MFI_PRODUCT_TYPE=0x16,
+    SERIAL_NUMBER=0x17,
+    MFI_AUTH_TOKEN_UUID=0x18,
+    APP_FLAGS=0x19,
+    OWNERSHIP_PROOF=0x1A,
+    SETUP_CODE_TYPE=0x1B,
+    PRODUCTION_DATA=0x1C,
+    APP_INFO=0x1D,
+    SEPARATOR=0xFF,
+)
 
 PairingDataComponentTLV8 = Struct(
-    'type' / PairingDataComponentType,
-    'data' / Prefixed(Int8ul, GreedyBytes),
+    "type" / PairingDataComponentType,
+    "data" / Prefixed(Int8ul, GreedyBytes),
 )
 
 PairingDataComponentTLVBuf = GreedyRange(PairingDataComponentTLV8)
 
-PairConsentResult = namedtuple('PairConsentResult', 'public_key salt pin')
+PairConsentResult = namedtuple("PairConsentResult", "public_key salt pin")
 
 CDTunnelPacket = Struct(
-    'magic' / Const(b'CDTunnel'),
-    'body' / Prefixed(Int16ub, GreedyBytes),
+    "magic" / Const(b"CDTunnel"),
+    "body" / Prefixed(Int16ub, GreedyBytes),
 )
 
-REPAIRING_PACKET_MAGIC = b'RPPairing'
+REPAIRING_PACKET_MAGIC = b"RPPairing"
 
 RPPairingPacket = Struct(
-    'magic' / Const(REPAIRING_PACKET_MAGIC),
-    'body' / Prefixed(Int16ub, GreedyBytes),
+    "magic" / Const(REPAIRING_PACKET_MAGIC),
+    "body" / Prefixed(Int16ub, GreedyBytes),
 )
 
 
@@ -140,7 +151,7 @@ class RemotePairingTunnel(ABC):
     def __init__(self):
         self._queue = asyncio.Queue()
         self._tun_read_task = None
-        self._logger = logging.getLogger(f'{__name__}.{self.__class__.__name__}')
+        self._logger = logging.getLogger(f"{__name__}.{self.__class__.__name__}")
         self.tun = None
 
     @abstractmethod
@@ -159,11 +170,11 @@ class RemotePairingTunnel(ABC):
     async def tun_read_task(self) -> None:
         read_size = self.tun.mtu + len(LOOPBACK_HEADER)
         try:
-            if sys.platform != 'win32':
+            if sys.platform != "win32":
                 while True:
                     packet = await asyncio.to_thread(self.tun.read, read_size)
                     assert packet.startswith(LOOPBACK_HEADER)
-                    packet = packet[len(LOOPBACK_HEADER):]
+                    packet = packet[len(LOOPBACK_HEADER) :]
                     await self.send_packet_to_device(packet)
             else:
                 while True:
@@ -174,12 +185,12 @@ class RemotePairingTunnel(ABC):
                             continue
                         await self.send_packet_to_device(packet)
         except ConnectionResetError:
-            self._logger.warning(f'got connection reset in {asyncio.current_task().get_name()}')
+            self._logger.warning(f"got connection reset in {asyncio.current_task().get_name()}")
         except OSError:
-            self._logger.warning(f'got oserror in {asyncio.current_task().get_name()}')
+            self._logger.warning(f"got oserror in {asyncio.current_task().get_name()}")
 
     def start_tunnel(self, address: str, mtu: int, interface_name=DEFAULT_INTERFACE_NAME) -> None:
-        if 'win32' == sys.platform:
+        if sys.platform == "win32":
             # Only win32 tunnel implementation supports interface name
             self.tun = TunTapDevice(interface_name)
         else:
@@ -187,10 +198,10 @@ class RemotePairingTunnel(ABC):
         self.tun.addr = address
         self.tun.mtu = mtu
         self.tun.up()
-        self._tun_read_task = asyncio.create_task(self.tun_read_task(), name=f'tun-read-{address}')
+        self._tun_read_task = asyncio.create_task(self.tun_read_task(), name=f"tun-read-{address}")
 
     async def stop_tunnel(self) -> None:
-        self._logger.debug('stopping tunnel')
+        self._logger.debug(f"[{asyncio.current_task().get_name()}] stopping tunnel")
         self._tun_read_task.cancel()
         with suppress(CancelledError):
             await self._tun_read_task
@@ -200,7 +211,7 @@ class RemotePairingTunnel(ABC):
 
     @staticmethod
     def _encode_cdtunnel_packet(data: dict) -> bytes:
-        return CDTunnelPacket.build({'body': json.dumps(data).encode()})
+        return CDTunnelPacket.build({"body": json.dumps(data).encode()})
 
 
 class RemotePairingQuicTunnel(RemotePairingTunnel, QuicConnectionProtocol):
@@ -214,21 +225,23 @@ class RemotePairingQuicTunnel(RemotePairingTunnel, QuicConnectionProtocol):
         self._keep_alive_task = None
 
     async def wait_closed(self) -> None:
-        try:
+        with suppress(asyncio.CancelledError):
             await QuicConnectionProtocol.wait_closed(self)
-        except asyncio.CancelledError:
-            pass
 
     async def send_packet_to_device(self, packet: bytes) -> None:
         self._quic.send_datagram_frame(packet)
         self.transmit()
 
+        # Allow other tasks to run
+        await asyncio.sleep(0)
+
     async def request_tunnel_establish(self) -> dict:
         stream_id = self._quic.get_next_available_stream_id()
         # pad the data with random data to force the MTU size correctly
-        self._quic.send_datagram_frame(b'x' * 1024)
-        self._quic.send_stream_data(stream_id, self._encode_cdtunnel_packet(
-            {'type': 'clientHandshakeRequest', 'mtu': self.REQUESTED_MTU}))
+        self._quic.send_datagram_frame(b"x" * 1024)
+        self._quic.send_stream_data(
+            stream_id, self._encode_cdtunnel_packet({"type": "clientHandshakeRequest", "mtu": self.REQUESTED_MTU})
+        )
         self.transmit()
         return await self._queue.get()
 
@@ -258,7 +271,7 @@ class RemotePairingQuicTunnel(RemotePairingTunnel, QuicConnectionProtocol):
 
     @staticmethod
     def _encode_cdtunnel_packet(data: dict) -> bytes:
-        return CDTunnelPacket.build({'body': json.dumps(data).encode()})
+        return CDTunnelPacket.build({"body": json.dumps(data).encode()})
 
 
 class RemotePairingTcpTunnel(RemotePairingTunnel):
@@ -280,30 +293,27 @@ class RemotePairingTcpTunnel(RemotePairingTunnel):
             while True:
                 try:
                     ipv6_header = await self._reader.readexactly(IPV6_HEADER_SIZE)
-                    ipv6_length = struct.unpack('>H', ipv6_header[4:6])[0]
+                    ipv6_length = struct.unpack(">H", ipv6_header[4:6])[0]
                     ipv6_body = await self._reader.readexactly(ipv6_length)
                     self.tun.write(LOOPBACK_HEADER + ipv6_header + ipv6_body)
                 except asyncio.exceptions.IncompleteReadError:
                     await asyncio.sleep(1)
         except OSError as e:
-            self._logger.warning(f'got {e.__class__.__name__} in {asyncio.current_task().get_name()}')
+            self._logger.warning(f"got {e.__class__.__name__} in {asyncio.current_task().get_name()}")
             await self.wait_closed()
 
     async def wait_closed(self) -> None:
-        try:
+        with suppress(OSError):
             await self._writer.wait_closed()
-        except OSError:
-            pass
 
     async def request_tunnel_establish(self) -> dict:
-        self._writer.write(self._encode_cdtunnel_packet(
-            {'type': 'clientHandshakeRequest', 'mtu': self.REQUESTED_MTU}))
+        self._writer.write(self._encode_cdtunnel_packet({"type": "clientHandshakeRequest", "mtu": self.REQUESTED_MTU}))
         await self._writer.drain()
         return json.loads(CDTunnelPacket.parse(await self._reader.read(self.REQUESTED_MTU)).body)
 
     def start_tunnel(self, address: str, mtu: int, interface_name=DEFAULT_INTERFACE_NAME) -> None:
         super().start_tunnel(address, mtu, interface_name=interface_name)
-        self._sock_read_task = asyncio.create_task(self.sock_read_task(), name=f'sock-read-task-{address}')
+        self._sock_read_task = asyncio.create_task(self.sock_read_task(), name=f"sock-read-task-{address}")
 
     async def stop_tunnel(self) -> None:
         self._sock_read_task.cancel()
@@ -312,10 +322,8 @@ class RemotePairingTcpTunnel(RemotePairingTunnel):
         await super().stop_tunnel()
         if not self._writer.is_closing():
             self._writer.close()
-            try:
+            with suppress(OSError):
                 await self._writer.wait_closed()
-            except OSError:
-                pass
 
 
 @dataclasses.dataclass
@@ -389,112 +397,143 @@ class RemotePairingProtocol(StartTcpTunnel):
             raise RemotePairingCompletedError()
 
     async def create_quic_listener(self, private_key: RSAPrivateKey) -> dict:
-        request = {'request': {'_0': {'createListener': {
-            'key': base64.b64encode(
-                private_key.public_key().public_bytes(Encoding.DER, PublicFormat.SubjectPublicKeyInfo)
-            ).decode(),
-            'peerConnectionsInfo': [{'owningPID': os.getpid(), 'owningProcessName': 'CoreDeviceService'}],
-            'transportProtocolType': 'quic'}}}}
+        request = {
+            "request": {
+                "_0": {
+                    "createListener": {
+                        "key": base64.b64encode(
+                            private_key.public_key().public_bytes(Encoding.DER, PublicFormat.SubjectPublicKeyInfo)
+                        ).decode(),
+                        "peerConnectionsInfo": [{"owningPID": os.getpid(), "owningProcessName": "CoreDeviceService"}],
+                        "transportProtocolType": "quic",
+                    }
+                }
+            }
+        }
 
         response = await self._send_receive_encrypted_request(request)
-        return response['createListener']
+        return response["createListener"]
 
     async def create_tcp_listener(self) -> dict:
-        request = {'request': {'_0': {'createListener': {
-            'key': base64.b64encode(self.encryption_key).decode(),
-            'peerConnectionsInfo': [{'owningPID': os.getpid(), 'owningProcessName': 'CoreDeviceService'}],
-            'transportProtocolType': 'tcp'}}}}
+        request = {
+            "request": {
+                "_0": {
+                    "createListener": {
+                        "key": base64.b64encode(self.encryption_key).decode(),
+                        "peerConnectionsInfo": [{"owningPID": os.getpid(), "owningProcessName": "CoreDeviceService"}],
+                        "transportProtocolType": "tcp",
+                    }
+                }
+            }
+        }
         response = await self._send_receive_encrypted_request(request)
-        return response['createListener']
+        return response["createListener"]
 
     @asynccontextmanager
     async def start_quic_tunnel(
-            self, secrets_log_file: Optional[TextIO] = None,
-            max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT) -> AsyncGenerator[TunnelResult, None]:
+        self,
+        secrets_log_file: Optional[TextIO] = None,
+        max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
+    ) -> AsyncGenerator[TunnelResult, None]:
         private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
         parameters = await self.create_quic_listener(private_key)
         cert = make_cert(private_key, private_key.public_key())
         configuration = QuicConfiguration(
-            alpn_protocols=['RemotePairingTunnelProtocol'],
+            alpn_protocols=["RemotePairingTunnelProtocol"],
             is_client=True,
             verify_mode=VerifyMode.CERT_NONE,
             verify_hostname=False,
             max_datagram_frame_size=RemotePairingQuicTunnel.MAX_QUIC_DATAGRAM,
-            idle_timeout=max_idle_timeout
+            idle_timeout=max_idle_timeout,
+        )
+        configuration.load_cert_chain(
+            cert.public_bytes(Encoding.PEM),
+            private_key.private_bytes(Encoding.PEM, PrivateFormat.TraditionalOpenSSL, NoEncryption()).decode(),
         )
-        configuration.load_cert_chain(cert.public_bytes(Encoding.PEM),
-                                      private_key.private_bytes(Encoding.PEM, PrivateFormat.TraditionalOpenSSL,
-                                                                NoEncryption()).decode())
         configuration.secrets_log_file = secrets_log_file
 
         host = self.hostname
-        port = parameters['port']
+        port = parameters["port"]
 
-        self.logger.debug(f'Connecting to {host}:{port}')
+        self.logger.debug(f"Connecting to {host}:{port}")
         try:
             async with aioquic_connect(
-                    host,
-                    port,
-                    configuration=configuration,
-                    create_protocol=RemotePairingQuicTunnel,
+                host,
+                port,
+                configuration=configuration,
+                create_protocol=RemotePairingQuicTunnel,
             ) as client:
-                self.logger.debug('quic connected')
+                self.logger.debug("quic connected")
                 client = cast(RemotePairingQuicTunnel, client)
                 await client.wait_connected()
                 handshake_response = await client.request_tunnel_establish()
-                client.start_tunnel(handshake_response['clientParameters']['address'],
-                                    handshake_response['clientParameters']['mtu'],
-                                    interface_name=f'{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}')
+                client.start_tunnel(
+                    handshake_response["clientParameters"]["address"],
+                    handshake_response["clientParameters"]["mtu"],
+                    interface_name=f"{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}",
+                )
                 try:
                     yield TunnelResult(
-                        client.tun.name, handshake_response['serverAddress'], handshake_response['serverRSDPort'],
-                        TunnelProtocol.QUIC, client)
+                        client.tun.name,
+                        handshake_response["serverAddress"],
+                        handshake_response["serverRSDPort"],
+                        TunnelProtocol.QUIC,
+                        client,
+                    )
                 finally:
                     await client.stop_tunnel()
-        except ConnectionError:
+        except ConnectionError as e:
             raise QuicProtocolNotSupportedError(
-                'iOS 18.2+ removed QUIC protocol support. Use TCP instead (requires python3.13+)')
+                "iOS 18.2+ removed QUIC protocol support. Use TCP instead (requires python3.13+)"
+            ) from e
 
     @asynccontextmanager
     async def start_tcp_tunnel(self) -> AsyncGenerator[TunnelResult, None]:
         parameters = await self.create_tcp_listener()
         host = self.hostname
-        port = parameters['port']
+        port = parameters["port"]
         sock = create_connection((host, port))
         OSUTIL.set_keepalive(sock)
         if sys.version_info >= (3, 13):
             ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
             ctx.check_hostname = False
             ctx.verify_mode = ssl.CERT_NONE
-            ctx.set_ciphers('PSK')
+            ctx.set_ciphers("PSK")
             ctx.set_psk_client_callback(lambda hint: (None, self.encryption_key))
         else:
             # TODO: remove this when python3.12 becomes deprecated
             ctx = SSLPSKContext(ssl.PROTOCOL_TLSv1_2)
             ctx.psk = self.encryption_key
-            ctx.set_ciphers('PSK')
-        reader, writer = await asyncio.open_connection(sock=sock, ssl=ctx, server_hostname='')
+            ctx.set_ciphers("PSK")
+        reader, writer = await asyncio.open_connection(sock=sock, ssl=ctx, server_hostname="")
         tunnel = RemotePairingTcpTunnel(reader, writer)
         handshake_response = await tunnel.request_tunnel_establish()
 
-        tunnel.start_tunnel(handshake_response['clientParameters']['address'],
-                            handshake_response['clientParameters']['mtu'],
-                            interface_name=f'{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}')
+        tunnel.start_tunnel(
+            handshake_response["clientParameters"]["address"],
+            handshake_response["clientParameters"]["mtu"],
+            interface_name=f"{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}",
+        )
 
         try:
             yield TunnelResult(
-                tunnel.tun.name, handshake_response['serverAddress'], handshake_response['serverRSDPort'],
-                TunnelProtocol.TCP, tunnel)
+                tunnel.tun.name,
+                handshake_response["serverAddress"],
+                handshake_response["serverRSDPort"],
+                TunnelProtocol.TCP,
+                tunnel,
+            )
         finally:
             await tunnel.stop_tunnel()
 
     def save_pair_record(self) -> None:
         self.pair_record_path.write_bytes(
             plistlib.dumps({
-                'public_key': self.ed25519_private_key.public_key().public_bytes_raw(),
-                'private_key': self.ed25519_private_key.private_bytes_raw(),
-                'remote_unlock_host_key': self.remote_unlock_host_key
-            }))
+                "public_key": self.ed25519_private_key.public_key().public_bytes_raw(),
+                "private_key": self.ed25519_private_key.private_bytes_raw(),
+                "remote_unlock_host_key": self.remote_unlock_host_key,
+            })
+        )
         OSUTIL.chown_to_non_sudo_if_needed(self.pair_record_path)
 
     @property
@@ -505,17 +544,19 @@ class RemotePairingProtocol(StartTcpTunnel):
 
     @property
     def remote_identifier(self) -> str:
-        return self.handshake_info['peerDeviceInfo']['identifier']
+        return self.handshake_info["peerDeviceInfo"]["identifier"]
 
     @property
     def remote_device_model(self) -> str:
-        return self.handshake_info['peerDeviceInfo']['model']
+        return self.handshake_info["peerDeviceInfo"]["model"]
 
     @property
     def pair_record_path(self) -> Path:
         pair_records_cache_directory = create_pairing_records_cache_folder()
-        return (pair_records_cache_directory /
-                f'{get_remote_pairing_record_filename(self.remote_identifier)}.{PAIRING_RECORD_EXT}')
+        return (
+            pair_records_cache_directory
+            / f"{get_remote_pairing_record_filename(self.remote_identifier)}.{PAIRING_RECORD_EXT}"
+        )
 
     async def _pair(self) -> None:
         pairing_consent_result = await self._request_pair_consent()
@@ -527,47 +568,49 @@ class RemotePairingProtocol(StartTcpTunnel):
         self.save_pair_record()
 
     async def _request_pair_consent(self) -> PairConsentResult:
-        """ Display a Trust / Don't Trust dialog """
+        """Display a Trust / Don't Trust dialog"""
 
         tlv = PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.METHOD, 'data': b'\x00'},
-            {'type': PairingDataComponentType.STATE, 'data': b'\x01'},
+            {"type": PairingDataComponentType.METHOD, "data": b"\x00"},
+            {"type": PairingDataComponentType.STATE, "data": b"\x01"},
         ])
 
-        await self._send_pairing_data({'data': tlv,
-                                       'kind': 'setupManualPairing',
-                                       'sendingHost': platform.node(),
-                                       'startNewSession': True})
-        self.logger.info('Waiting user pairing consent')
+        await self._send_pairing_data({
+            "data": tlv,
+            "kind": "setupManualPairing",
+            "sendingHost": platform.node(),
+            "startNewSession": True,
+        })
+        self.logger.info("Waiting user pairing consent")
         response = await self._receive_plain_response()
-        response = response['event']['_0']
+        response = response["event"]["_0"]
 
         pin = None
-        if 'pairingRejectedWithError' in response:
+        if "pairingRejectedWithError" in response:
             raise PairingError(
-                response['pairingRejectedWithError']['wrappedError']['userInfo']['NSLocalizedDescription'])
-        elif 'awaitingUserConsent' in response:
+                response["pairingRejectedWithError"]["wrappedError"]["userInfo"]["NSLocalizedDescription"]
+            )
+        elif "awaitingUserConsent" in response:
             pairing_data = await self._receive_pairing_data()
         else:
             # On tvOS no consent is needed and pairing data is returned immediately.
-            pairing_data = self._decode_bytes_if_needed(response['pairingData']['_0']['data'])
+            pairing_data = self._decode_bytes_if_needed(response["pairingData"]["_0"]["data"])
             # On tvOS we need pin to setup pairing.
-            if 'AppleTV' in self.remote_device_model:
-                pin = input('Enter PIN: ')
+            if "AppleTV" in self.remote_device_model:
+                pin = input("Enter PIN: ")
 
         data = self.decode_tlv(PairingDataComponentTLVBuf.parse(pairing_data))
-        return PairConsentResult(public_key=data[PairingDataComponentType.PUBLIC_KEY],
-                                 salt=data[PairingDataComponentType.SALT],
-                                 pin=pin)
+        return PairConsentResult(
+            public_key=data[PairingDataComponentType.PUBLIC_KEY], salt=data[PairingDataComponentType.SALT], pin=pin
+        )
 
     def _init_srp_context(self, pairing_consent_result: PairConsentResult) -> None:
         # Receive server public and salt and process them.
-        pin = pairing_consent_result.pin or '000000'
+        pin = pairing_consent_result.pin or "000000"
         client_session = SRPClientSession(
-            SRPContext('Pair-Setup', password=pin, prime=PRIME_3072, generator=PRIME_3072_GEN,
-                       hash_func=hashlib.sha512))
-        client_session.process(pairing_consent_result.public_key.hex(),
-                               pairing_consent_result.salt.hex())
+            SRPContext("Pair-Setup", password=pin, prime=PRIME_3072, generator=PRIME_3072_GEN, hash_func=hashlib.sha512)
+        )
+        client_session.process(pairing_consent_result.public_key.hex(), pairing_consent_result.salt.hex())
         self.srp_context = client_session
         self.encryption_key = binascii.unhexlify(self.srp_context.key)
 
@@ -576,17 +619,18 @@ class RemotePairingProtocol(StartTcpTunnel):
         client_session_key_proof = binascii.unhexlify(self.srp_context.key_proof)
 
         tlv = PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.STATE, 'data': b'\x03'},
-            {'type': PairingDataComponentType.PUBLIC_KEY, 'data': client_public[:255]},
-            {'type': PairingDataComponentType.PUBLIC_KEY, 'data': client_public[255:]},
-            {'type': PairingDataComponentType.PROOF, 'data': client_session_key_proof},
+            {"type": PairingDataComponentType.STATE, "data": b"\x03"},
+            {"type": PairingDataComponentType.PUBLIC_KEY, "data": client_public[:255]},
+            {"type": PairingDataComponentType.PUBLIC_KEY, "data": client_public[255:]},
+            {"type": PairingDataComponentType.PROOF, "data": client_session_key_proof},
         ])
 
         response = await self._send_receive_pairing_data({
-            'data': tlv,
-            'kind': 'setupManualPairing',
-            'sendingHost': platform.node(),
-            'startNewSession': False})
+            "data": tlv,
+            "kind": "setupManualPairing",
+            "sendingHost": platform.node(),
+            "startNewSession": False,
+        })
         data = self.decode_tlv(PairingDataComponentTLVBuf.parse(response))
         assert self.srp_context.verify_proof(data[PairingDataComponentType.PROOF].hex().encode())
 
@@ -596,8 +640,8 @@ class RemotePairingProtocol(StartTcpTunnel):
         setup_encryption_key = HKDF(
             algorithm=hashes.SHA512(),
             length=32,
-            salt=b'Pair-Setup-Encrypt-Salt',
-            info=b'Pair-Setup-Encrypt-Info',
+            salt=b"Pair-Setup-Encrypt-Salt",
+            info=b"Pair-Setup-Encrypt-Info",
         ).derive(self.encryption_key)
 
         self.ed25519_private_key = Ed25519PrivateKey.generate()
@@ -607,8 +651,8 @@ class RemotePairingProtocol(StartTcpTunnel):
         signbuf = HKDF(
             algorithm=hashes.SHA512(),
             length=32,
-            salt=b'Pair-Setup-Controller-Sign-Salt',
-            info=b'Pair-Setup-Controller-Sign-Info',
+            salt=b"Pair-Setup-Controller-Sign-Salt",
+            info=b"Pair-Setup-Controller-Sign-Info",
         ).derive(self.encryption_key)
 
         signbuf += self.identifier.encode()
@@ -617,41 +661,45 @@ class RemotePairingProtocol(StartTcpTunnel):
         self.signature = self.ed25519_private_key.sign(signbuf)
 
         device_info = dumps({
-            'altIRK': b'\xe9\xe8-\xc0jIykVoT\x00\x19\xb1\xc7{',
-            'btAddr': '11:22:33:44:55:66',
-            'mac': b'\x11\x22\x33\x44\x55\x66',
-            'remotepairing_serial_number': 'AAAAAAAAAAAA',
-            'accountID': self.identifier,
-            'model': 'computer-model',
-            'name': platform.node()
+            "altIRK": b"\xe9\xe8-\xc0jIykVoT\x00\x19\xb1\xc7{",
+            "btAddr": "11:22:33:44:55:66",
+            "mac": b"\x11\x22\x33\x44\x55\x66",
+            "remotepairing_serial_number": "AAAAAAAAAAAA",
+            "accountID": self.identifier,
+            "model": "computer-model",
+            "name": platform.node(),
         })
 
         tlv = PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.IDENTIFIER, 'data': self.identifier.encode()},
-            {'type': PairingDataComponentType.PUBLIC_KEY,
-             'data': self.ed25519_private_key.public_key().public_bytes_raw()},
-            {'type': PairingDataComponentType.SIGNATURE, 'data': self.signature},
-            {'type': PairingDataComponentType.INFO, 'data': device_info},
+            {"type": PairingDataComponentType.IDENTIFIER, "data": self.identifier.encode()},
+            {
+                "type": PairingDataComponentType.PUBLIC_KEY,
+                "data": self.ed25519_private_key.public_key().public_bytes_raw(),
+            },
+            {"type": PairingDataComponentType.SIGNATURE, "data": self.signature},
+            {"type": PairingDataComponentType.INFO, "data": device_info},
         ])
 
         cip = ChaCha20Poly1305(setup_encryption_key)
-        encrypted_data = cip.encrypt(b'\x00\x00\x00\x00PS-Msg05', tlv, b'')
+        encrypted_data = cip.encrypt(b"\x00\x00\x00\x00PS-Msg05", tlv, b"")
 
         tlv = PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.ENCRYPTED_DATA, 'data': encrypted_data[:255]},
-            {'type': PairingDataComponentType.ENCRYPTED_DATA, 'data': encrypted_data[255:]},
-            {'type': PairingDataComponentType.STATE, 'data': b'\x05'},
+            {"type": PairingDataComponentType.ENCRYPTED_DATA, "data": encrypted_data[:255]},
+            {"type": PairingDataComponentType.ENCRYPTED_DATA, "data": encrypted_data[255:]},
+            {"type": PairingDataComponentType.STATE, "data": b"\x05"},
         ])
 
         response = await self._send_receive_pairing_data({
-            'data': tlv,
-            'kind': 'setupManualPairing',
-            'sendingHost': platform.node(),
-            'startNewSession': False})
+            "data": tlv,
+            "kind": "setupManualPairing",
+            "sendingHost": platform.node(),
+            "startNewSession": False,
+        })
         data = self.decode_tlv(PairingDataComponentTLVBuf.parse(response))
 
-        tlv = PairingDataComponentTLVBuf.parse(cip.decrypt(
-            b'\x00\x00\x00\x00PS-Msg06', data[PairingDataComponentType.ENCRYPTED_DATA], b''))
+        tlv = PairingDataComponentTLVBuf.parse(
+            cip.decrypt(b"\x00\x00\x00\x00PS-Msg06", data[PairingDataComponentType.ENCRYPTED_DATA], b"")
+        )
 
         return tlv
 
@@ -660,7 +708,7 @@ class RemotePairingProtocol(StartTcpTunnel):
             algorithm=hashes.SHA512(),
             length=32,
             salt=None,
-            info=b'ClientEncrypt-main',
+            info=b"ClientEncrypt-main",
         ).derive(self.encryption_key)
         self.client_cip = ChaCha20Poly1305(client_key)
 
@@ -668,22 +716,23 @@ class RemotePairingProtocol(StartTcpTunnel):
             algorithm=hashes.SHA512(),
             length=32,
             salt=None,
-            info=b'ServerEncrypt-main',
+            info=b"ServerEncrypt-main",
         ).derive(self.encryption_key)
         self.server_cip = ChaCha20Poly1305(server_key)
 
     async def _create_remote_unlock(self) -> None:
         try:
-            response = await self._send_receive_encrypted_request({'request': {'_0': {'createRemoteUnlockKey': {}}}})
-            self.remote_unlock_host_key = response['createRemoteUnlockKey']['hostKey']
+            response = await self._send_receive_encrypted_request({"request": {"_0": {"createRemoteUnlockKey": {}}}})
+            self.remote_unlock_host_key = response["createRemoteUnlockKey"]["hostKey"]
         except PyMobileDevice3Exception:
             # tvOS does not support remote unlock.
-            self.remote_unlock_host_key = ''
+            self.remote_unlock_host_key = ""
 
     async def _attempt_pair_verify(self) -> None:
         self.handshake_info = await self._send_receive_handshake({
-            'hostOptions': {'attemptPairVerify': True},
-            'wireProtocolVersion': XpcInt64Type(self.WIRE_PROTOCOL_VERSION)})
+            "hostOptions": {"attemptPairVerify": True},
+            "wireProtocolVersion": XpcInt64Type(self.WIRE_PROTOCOL_VERSION),
+        })
 
     @staticmethod
     def _decode_bytes_if_needed(data: bytes) -> bytes:
@@ -691,13 +740,17 @@ class RemotePairingProtocol(StartTcpTunnel):
 
     async def _validate_pairing(self) -> bool:
         pairing_data = PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.STATE, 'data': b'\x01'},
-            {'type': PairingDataComponentType.PUBLIC_KEY,
-             'data': self.x25519_private_key.public_key().public_bytes_raw()},
+            {"type": PairingDataComponentType.STATE, "data": b"\x01"},
+            {
+                "type": PairingDataComponentType.PUBLIC_KEY,
+                "data": self.x25519_private_key.public_key().public_bytes_raw(),
+            },
         ])
-        response = await self._send_receive_pairing_data({'data': pairing_data,
-                                                          'kind': 'verifyManualPairing',
-                                                          'startNewSession': True})
+        response = await self._send_receive_pairing_data({
+            "data": pairing_data,
+            "kind": "verifyManualPairing",
+            "startNewSession": True,
+        })
         data = self.decode_tlv(PairingDataComponentTLVBuf.parse(response))
 
         if PairingDataComponentType.ERROR in data:
@@ -710,8 +763,8 @@ class RemotePairingProtocol(StartTcpTunnel):
         derived_key = HKDF(
             algorithm=hashes.SHA512(),
             length=32,
-            salt=b'Pair-Verify-Encrypt-Salt',
-            info=b'Pair-Verify-Encrypt-Info',
+            salt=b"Pair-Verify-Encrypt-Salt",
+            info=b"Pair-Verify-Encrypt-Info",
         ).derive(self.encryption_key)
         cip = ChaCha20Poly1305(derived_key)
 
@@ -720,31 +773,36 @@ class RemotePairingProtocol(StartTcpTunnel):
         #   do so. instead, we verify using the next stage
 
         if self.pair_record is None:
-            private_key = Ed25519PrivateKey.from_private_bytes(b'\x00' * 0x20)
+            private_key = Ed25519PrivateKey.from_private_bytes(b"\x00" * 0x20)
         else:
-            private_key = Ed25519PrivateKey.from_private_bytes(self.pair_record['private_key'])
+            private_key = Ed25519PrivateKey.from_private_bytes(self.pair_record["private_key"])
 
-        signbuf = b''
+        signbuf = b""
         signbuf += self.x25519_private_key.public_key().public_bytes_raw()
         signbuf += self.identifier.encode()
         signbuf += peer_public_key.public_bytes_raw()
 
         signature = private_key.sign(signbuf)
 
-        encrypted_data = cip.encrypt(b'\x00\x00\x00\x00PV-Msg03', PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.IDENTIFIER, 'data': self.identifier.encode()},
-            {'type': PairingDataComponentType.SIGNATURE, 'data': signature},
-        ]), b'')
+        encrypted_data = cip.encrypt(
+            b"\x00\x00\x00\x00PV-Msg03",
+            PairingDataComponentTLVBuf.build([
+                {"type": PairingDataComponentType.IDENTIFIER, "data": self.identifier.encode()},
+                {"type": PairingDataComponentType.SIGNATURE, "data": signature},
+            ]),
+            b"",
+        )
 
         pairing_data = PairingDataComponentTLVBuf.build([
-            {'type': PairingDataComponentType.STATE, 'data': b'\x03'},
-            {'type': PairingDataComponentType.ENCRYPTED_DATA, 'data': encrypted_data},
+            {"type": PairingDataComponentType.STATE, "data": b"\x03"},
+            {"type": PairingDataComponentType.ENCRYPTED_DATA, "data": encrypted_data},
         ])
 
         response = await self._send_receive_pairing_data({
-            'data': pairing_data,
-            'kind': 'verifyManualPairing',
-            'startNewSession': False})
+            "data": pairing_data,
+            "kind": "verifyManualPairing",
+            "startNewSession": False,
+        })
         data = self.decode_tlv(PairingDataComponentTLVBuf.parse(response))
 
         if PairingDataComponentType.ERROR in data:
@@ -754,66 +812,68 @@ class RemotePairingProtocol(StartTcpTunnel):
         return True
 
     async def _send_pair_verify_failed(self) -> None:
-        await self._send_plain_request({'event': {'_0': {'pairVerifyFailed': {}}}})
+        await self._send_plain_request({"event": {"_0": {"pairVerifyFailed": {}}}})
 
     async def _send_receive_encrypted_request(self, request: dict) -> dict:
-        nonce = Int64ul.build(self._encrypted_sequence_number) + b'\x00' * 4
-        encrypted_data = self.client_cip.encrypt(
-            nonce,
-            json.dumps(request).encode(),
-            b'')
-
-        response = await self.send_receive_request({'message': {
-            'streamEncrypted': {'_0': encrypted_data}},
-            'originatedBy': 'host',
-            'sequenceNumber': XpcUInt64Type(self._sequence_number)})
+        nonce = Int64ul.build(self._encrypted_sequence_number) + b"\x00" * 4
+        encrypted_data = self.client_cip.encrypt(nonce, json.dumps(request).encode(), b"")
+
+        response = await self.send_receive_request({
+            "message": {"streamEncrypted": {"_0": encrypted_data}},
+            "originatedBy": "host",
+            "sequenceNumber": XpcUInt64Type(self._sequence_number),
+        })
         self._encrypted_sequence_number += 1
 
-        encrypted_data = self._decode_bytes_if_needed(response['message']['streamEncrypted']['_0'])
+        encrypted_data = self._decode_bytes_if_needed(response["message"]["streamEncrypted"]["_0"])
         plaintext = self.server_cip.decrypt(nonce, encrypted_data, None)
-        response = json.loads(plaintext)['response']['_1']
+        response = json.loads(plaintext)["response"]["_1"]
 
-        if 'errorExtended' in response:
-            raise PyMobileDevice3Exception(response['errorExtended']['_0']['userInfo']['NSLocalizedDescription'])
+        if "errorExtended" in response:
+            raise PyMobileDevice3Exception(response["errorExtended"]["_0"]["userInfo"]["NSLocalizedDescription"])
 
         return response
 
     async def _send_receive_handshake(self, handshake_data: dict) -> dict:
-        response = await self._send_receive_plain_request({'request': {'_0': {'handshake': {'_0': handshake_data}}}})
-        return response['response']['_1']['handshake']['_0']
+        response = await self._send_receive_plain_request({"request": {"_0": {"handshake": {"_0": handshake_data}}}})
+        return response["response"]["_1"]["handshake"]["_0"]
 
     async def _send_receive_pairing_data(self, pairing_data: dict) -> bytes:
         await self._send_pairing_data(pairing_data)
         return await self._receive_pairing_data()
 
     async def _send_pairing_data(self, pairing_data: dict) -> None:
-        await self._send_plain_request({'event': {'_0': {'pairingData': {'_0': pairing_data}}}})
+        await self._send_plain_request({"event": {"_0": {"pairingData": {"_0": pairing_data}}}})
 
     async def _receive_pairing_data(self) -> bytes:
         response = await self._receive_plain_response()
-        response = response['event']['_0']
-        if 'pairingData' in response:
-            return self._decode_bytes_if_needed(response['pairingData']['_0']['data'])
-        if 'pairingRejectedWithError' in response:
-            raise UserDeniedPairingError(response['pairingRejectedWithError']
-                                         .get('wrappedError', {})
-                                         .get('userInfo', {})
-                                         .get('NSLocalizedDescription'))
-        raise PyMobileDevice3Exception(f'Got an unknown state message: {response}')
+        response = response["event"]["_0"]
+        if "pairingData" in response:
+            return self._decode_bytes_if_needed(response["pairingData"]["_0"]["data"])
+        if "pairingRejectedWithError" in response:
+            raise UserDeniedPairingError(
+                response["pairingRejectedWithError"]
+                .get("wrappedError", {})
+                .get("userInfo", {})
+                .get("NSLocalizedDescription")
+            )
+        raise PyMobileDevice3Exception(f"Got an unknown state message: {response}")
 
     async def _send_receive_plain_request(self, plain_request: dict):
         await self._send_plain_request(plain_request)
         return await self._receive_plain_response()
 
     async def _send_plain_request(self, plain_request: dict) -> None:
-        await self.send_request({'message': {'plain': {'_0': plain_request}},
-                                 'originatedBy': 'host',
-                                 'sequenceNumber': XpcUInt64Type(self._sequence_number)})
+        await self.send_request({
+            "message": {"plain": {"_0": plain_request}},
+            "originatedBy": "host",
+            "sequenceNumber": XpcUInt64Type(self._sequence_number),
+        })
         self._sequence_number += 1
 
     async def _receive_plain_response(self) -> dict:
         response = await self.receive_response()
-        return response['message']['plain']['_0']
+        return response["message"]["plain"]["_0"]
 
     @staticmethod
     def decode_tlv(tlv_list: list[Container]) -> dict:
@@ -825,7 +885,7 @@ class RemotePairingProtocol(StartTcpTunnel):
                 result[tlv.type] = tlv.data
         return result
 
-    async def __aenter__(self) -> 'CoreDeviceTunnelService':
+    async def __aenter__(self) -> "CoreDeviceTunnelService":
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb) -> None:
@@ -833,7 +893,7 @@ class RemotePairingProtocol(StartTcpTunnel):
 
 
 class CoreDeviceTunnelService(RemotePairingProtocol, RemoteService):
-    SERVICE_NAME = 'com.apple.internal.dt.coredevice.untrusted.tunnelservice'
+    SERVICE_NAME = "com.apple.internal.dt.coredevice.untrusted.tunnelservice"
 
     def __init__(self, rsd: RemoteServiceDiscoveryService):
         RemoteService.__init__(self, rsd, self.SERVICE_NAME)
@@ -845,12 +905,12 @@ class CoreDeviceTunnelService(RemotePairingProtocol, RemoteService):
         await RemoteService.connect(self)
         try:
             response = await self.service.receive_response()
-            self.version = response['ServiceVersion']
+            self.version = response["ServiceVersion"]
 
             # Perform pairing if necessary and start a trusted RemoteXPC connection
             await RemotePairingProtocol.connect(self, autopair=autopair)
             self.hostname = self.service.address[0]
-        except Exception:  # noqa: E722
+        except Exception:
             await self.service.close()
             raise
 
@@ -860,11 +920,13 @@ class CoreDeviceTunnelService(RemotePairingProtocol, RemoteService):
 
     async def receive_response(self) -> dict:
         response = await self.service.receive_response()
-        return response['value']
+        return response["value"]
 
     async def send_request(self, data: dict) -> None:
         return await self.service.send_request({
-            'mangledTypeName': 'RemotePairing.ControlChannelMessageEnvelope', 'value': data})
+            "mangledTypeName": "RemotePairing.ControlChannelMessageEnvelope",
+            "value": data,
+        })
 
 
 class RemotePairingTunnelService(RemotePairingProtocol):
@@ -889,7 +951,7 @@ class RemotePairingTunnelService(RemotePairingProtocol):
             if not await self._validate_pairing():
                 raise ConnectionAbortedError()
             self._init_client_server_main_encryption_keys()
-        except:  # noqa: E722
+        except Exception:
             await self.close()
             raise
 
@@ -897,21 +959,20 @@ class RemotePairingTunnelService(RemotePairingProtocol):
         if self._writer is None:
             return
         self._writer.close()
-        try:
+        with suppress(ssl.SSLError):
             await self._writer.wait_closed()
-        except ssl.SSLError:
-            pass
         self._writer = None
         self._reader = None
 
     async def receive_response(self) -> dict:
         await self._reader.readexactly(len(REPAIRING_PACKET_MAGIC))
-        size = struct.unpack('>H', await self._reader.readexactly(2))[0]
+        size = struct.unpack(">H", await self._reader.readexactly(2))[0]
         return json.loads(await self._reader.readexactly(size))
 
     async def send_request(self, data: dict) -> None:
         self._writer.write(
-            RPPairingPacket.build({'body': json.dumps(data, default=self._default_json_encoder).encode()}))
+            RPPairingPacket.build({"body": json.dumps(data, default=self._default_json_encoder).encode()})
+        )
         await self._writer.drain()
 
     @staticmethod
@@ -925,8 +986,9 @@ class RemotePairingTunnelService(RemotePairingProtocol):
         return base64.b64decode(data)
 
     def __repr__(self) -> str:
-        return (f'<{self.__class__.__name__} IDENTIFIER:{self.remote_identifier} HOSTNAME:{self.hostname} '
-                f'PORT:{self.port}>')
+        return (
+            f"<{self.__class__.__name__} IDENTIFIER:{self.remote_identifier} HOSTNAME:{self.hostname} PORT:{self.port}>"
+        )
 
 
 class RemotePairingManualPairingService(RemotePairingTunnelService):
@@ -937,28 +999,38 @@ class RemotePairingManualPairingService(RemotePairingTunnelService):
 
 
 class CoreDeviceTunnelProxy(StartTcpTunnel):
-    SERVICE_NAME = 'com.apple.internal.devicecompute.CoreDeviceProxy'
+    SERVICE_NAME = "com.apple.internal.devicecompute.CoreDeviceProxy"
 
-    def __init__(self, lockdown: LockdownServiceProvider) -> None:
-        self._lockdown = lockdown
-        self._service: Optional[ServiceConnection] = None
+    @classmethod
+    async def create(cls, lockdown: LockdownServiceProvider) -> "CoreDeviceTunnelProxy":
+        return cls(await lockdown.aio_start_lockdown_service(cls.SERVICE_NAME), lockdown.udid)
+
+    def __init__(self, service: ServiceConnection, remote_identifier: str) -> None:
+        self._service: ServiceConnection = service
+        self._remote_identifier: str = remote_identifier
 
     @property
     def remote_identifier(self) -> str:
-        return self._lockdown.udid
+        return self._remote_identifier
 
     @asynccontextmanager
-    async def start_tcp_tunnel(self) -> AsyncGenerator['TunnelResult', None]:
-        self._service = await self._lockdown.aio_start_lockdown_service(self.SERVICE_NAME)
+    async def start_tcp_tunnel(self) -> AsyncGenerator["TunnelResult", None]:
+        assert self._service is not None, "service must be connected first"
         tunnel = RemotePairingTcpTunnel(self._service.reader, self._service.writer)
         handshake_response = await tunnel.request_tunnel_establish()
-        tunnel.start_tunnel(handshake_response['clientParameters']['address'],
-                            handshake_response['clientParameters']['mtu'],
-                            interface_name=f'{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}')
+        tunnel.start_tunnel(
+            handshake_response["clientParameters"]["address"],
+            handshake_response["clientParameters"]["mtu"],
+            interface_name=f"{DEFAULT_INTERFACE_NAME}-{self.remote_identifier}",
+        )
         try:
             yield TunnelResult(
-                tunnel.tun.name, handshake_response['serverAddress'], handshake_response['serverRSDPort'],
-                TunnelProtocol.TCP, tunnel)
+                tunnel.tun.name,
+                handshake_response["serverAddress"],
+                handshake_response["serverRSDPort"],
+                TunnelProtocol.TCP,
+                tunnel,
+            )
         finally:
             await tunnel.stop_tunnel()
 
@@ -968,7 +1040,8 @@ class CoreDeviceTunnelProxy(StartTcpTunnel):
 
 
 async def create_core_device_tunnel_service_using_rsd(
-        rsd: RemoteServiceDiscoveryService, autopair: bool = True) -> CoreDeviceTunnelService:
+    rsd: RemoteServiceDiscoveryService, autopair: bool = True
+) -> CoreDeviceTunnelService:
     service = CoreDeviceTunnelService(rsd)
     try:
         await service.connect(autopair=autopair)
@@ -977,21 +1050,23 @@ async def create_core_device_tunnel_service_using_rsd(
         await service.close()
         service = CoreDeviceTunnelService(rsd)
         await service.connect(autopair=autopair)
-    except Exception:  # noqa: E722
+    except Exception:
         await service.close()
         raise
     return service
 
 
 async def create_core_device_tunnel_service_using_remotepairing(
-        remote_identifier: str, hostname: str, port: int, autopair: bool = True) -> RemotePairingTunnelService:
+    remote_identifier: str, hostname: str, port: int, autopair: bool = True
+) -> RemotePairingTunnelService:
     service = RemotePairingTunnelService(remote_identifier, hostname, port)
     await service.connect(autopair=autopair)
     return service
 
 
 async def create_core_device_service_using_remotepairing_manual_pairing(
-        remote_identifier: str, hostname: str, port: int, autopair: bool = True) -> RemotePairingTunnelService:
+    remote_identifier: str, hostname: str, port: int, autopair: bool = True
+) -> RemotePairingTunnelService:
     service = RemotePairingManualPairingService(remote_identifier, hostname, port)
     await service.connect(autopair=autopair)
     return service
@@ -999,14 +1074,16 @@ async def create_core_device_service_using_remotepairing_manual_pairing(
 
 @asynccontextmanager
 async def start_tunnel_over_remotepairing(
-        remote_pairing: RemotePairingTunnelService, secrets: Optional[TextIO] = None,
-        max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
-        protocol: TunnelProtocol = TunnelProtocol.QUIC) \
-        -> AsyncGenerator[TunnelResult, None]:
+    remote_pairing: RemotePairingTunnelService,
+    secrets: Optional[TextIO] = None,
+    max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
+    protocol: TunnelProtocol = TunnelProtocol.QUIC,
+) -> AsyncGenerator[TunnelResult, None]:
     async with remote_pairing:
         if protocol == TunnelProtocol.QUIC:
             async with remote_pairing.start_quic_tunnel(
-                    secrets_log_file=secrets, max_idle_timeout=max_idle_timeout) as tunnel_result:
+                secrets_log_file=secrets, max_idle_timeout=max_idle_timeout
+            ) as tunnel_result:
                 yield tunnel_result
         elif protocol == TunnelProtocol.TCP:
             async with remote_pairing.start_tcp_tunnel() as tunnel_result:
@@ -1015,15 +1092,17 @@ async def start_tunnel_over_remotepairing(
 
 @asynccontextmanager
 async def start_tunnel_over_core_device(
-        service_provider: CoreDeviceTunnelService, secrets: Optional[TextIO] = None,
-        max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
-        protocol: TunnelProtocol = TunnelProtocol.QUIC) \
-        -> AsyncGenerator[TunnelResult, None]:
+    service_provider: CoreDeviceTunnelService,
+    secrets: Optional[TextIO] = None,
+    max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
+    protocol: TunnelProtocol = TunnelProtocol.QUIC,
+) -> AsyncGenerator[TunnelResult, None]:
     stop_remoted_if_required()
     async with service_provider:
         if protocol == TunnelProtocol.QUIC:
             async with service_provider.start_quic_tunnel(
-                    secrets_log_file=secrets, max_idle_timeout=max_idle_timeout) as tunnel_result:
+                secrets_log_file=secrets, max_idle_timeout=max_idle_timeout
+            ) as tunnel_result:
                 resume_remoted_if_required()
                 yield tunnel_result
         elif protocol == TunnelProtocol.TCP:
@@ -1034,57 +1113,64 @@ async def start_tunnel_over_core_device(
 
 @asynccontextmanager
 async def start_tunnel(
-        protocol_handler: RemotePairingProtocol, secrets: Optional[TextIO] = None,
-        max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
-        protocol: TunnelProtocol = TunnelProtocol.QUIC) -> AsyncGenerator[TunnelResult, None]:
+    protocol_handler: RemotePairingProtocol,
+    secrets: Optional[TextIO] = None,
+    max_idle_timeout: float = RemotePairingQuicTunnel.MAX_IDLE_TIMEOUT,
+    protocol: TunnelProtocol = TunnelProtocol.QUIC,
+) -> AsyncGenerator[TunnelResult, None]:
     if isinstance(protocol_handler, CoreDeviceTunnelService):
         async with start_tunnel_over_core_device(
-                protocol_handler, secrets=secrets, max_idle_timeout=max_idle_timeout, protocol=protocol) as service:
+            protocol_handler, secrets=secrets, max_idle_timeout=max_idle_timeout, protocol=protocol
+        ) as service:
             yield service
     elif isinstance(protocol_handler, RemotePairingTunnelService):
         async with start_tunnel_over_remotepairing(
-                protocol_handler, secrets=secrets, max_idle_timeout=max_idle_timeout, protocol=protocol) as service:
+            protocol_handler, secrets=secrets, max_idle_timeout=max_idle_timeout, protocol=protocol
+        ) as service:
             yield service
     elif isinstance(protocol_handler, CoreDeviceTunnelProxy):
         if protocol != TunnelProtocol.TCP:
-            raise ValueError('CoreDeviceTunnelProxy protocol can only be TCP')
+            raise ValueError("CoreDeviceTunnelProxy protocol can only be TCP")
         async with protocol_handler.start_tcp_tunnel() as service:
             yield service
     else:
-        raise Exception(f'Bad value for protocol_handler: {protocol_handler}')
+        raise TypeError(f"Bad value for protocol_handler: {protocol_handler}")
 
 
 async def get_core_device_tunnel_services(
-        bonjour_timeout: float = DEFAULT_BONJOUR_TIMEOUT,
-        udid: Optional[str] = None) -> list[CoreDeviceTunnelService]:
+    bonjour_timeout: float = DEFAULT_BONJOUR_TIMEOUT, udid: Optional[str] = None
+) -> list[CoreDeviceTunnelService]:
     result = []
     for rsd in await get_rsds(bonjour_timeout=bonjour_timeout, udid=udid):
-        if udid is None and ((Version(rsd.product_version) < Version('17.0'))
-                             and not rsd.product_type.startswith('RealityDevice')):
-            logger.debug(f'Skipping {rsd.udid}:, iOS {rsd.product_version} < 17.0')
+        if udid is None and (
+            (Version(rsd.product_version) < Version("17.0")) and not rsd.product_type.startswith("RealityDevice")
+        ):
+            logger.debug(f"Skipping {rsd.udid}:, iOS {rsd.product_version} < 17.0")
             await rsd.close()
             continue
         try:
             result.append(await create_core_device_tunnel_service_using_rsd(rsd))
-        except Exception as e:
-            logger.error(f'Failed to start service: {rsd}: {e}')
+        except Exception:
+            logger.exception(f"Failed to start service: {rsd}")
             await rsd.close()
             raise
     return result
 
 
 async def get_remote_pairing_tunnel_services(
-        bonjour_timeout: float = DEFAULT_BONJOUR_TIMEOUT,
-        udid: Optional[str] = None) -> list[RemotePairingTunnelService]:
+    bonjour_timeout: float = DEFAULT_BONJOUR_TIMEOUT, udid: Optional[str] = None
+) -> list[RemotePairingTunnelService]:
     result = []
     for answer in await browse_remotepairing(timeout=bonjour_timeout):
-        for ip in answer.ips:
+        for address in answer.addresses:
             for identifier in iter_remote_paired_identifiers():
                 if udid is not None and identifier != udid:
                     continue
                 conn = None
                 try:
-                    conn = await create_core_device_tunnel_service_using_remotepairing(identifier, ip, answer.port)
+                    conn = await create_core_device_tunnel_service_using_remotepairing(
+                        identifier, address.full_ip, answer.port
+                    )
                     result.append(conn)
                     break
                 except ConnectionAbortedError: