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

pymobiledevice3/usbmux.py

@@ -5,76 +5,115 @@ import time
 from dataclasses import dataclass
 from typing import Optional
 
-from construct import Const, CString, Enum, FixedSized, GreedyBytes, Int16ul, Int32ul, Padding, Prefixed, StreamError, \
-    Struct, Switch, this
+from construct import (
+    Const,
+    CString,
+    Enum,
+    FixedSized,
+    GreedyBytes,
+    Int16ul,
+    Int32ul,
+    Padding,
+    Prefixed,
+    StreamError,
+    Struct,
+    Switch,
+    this,
+)
 
-from pymobiledevice3.exceptions import BadCommandError, BadDevError, ConnectionFailedError, \
-    ConnectionFailedToUsbmuxdError, MuxException, MuxVersionError, NotPairedError
+from pymobiledevice3.exceptions import (
+    BadCommandError,
+    BadDevError,
+    ConnectionFailedError,
+    ConnectionFailedToUsbmuxdError,
+    MuxException,
+    MuxVersionError,
+    NotPairedError,
+)
 from pymobiledevice3.osu.os_utils import get_os_utils
 
-usbmuxd_version = Enum(Int32ul,
-                       BINARY=0,
-                       PLIST=1,
-                       )
-
-usbmuxd_result = Enum(Int32ul,
-                      OK=0,
-                      BADCOMMAND=1,
-                      BADDEV=2,
-                      CONNREFUSED=3,
-                      NOSUCHSERVICE=4,
-                      BADVERSION=6,
-                      )
-
-usbmuxd_msgtype = Enum(Int32ul,
-                       RESULT=1,
-                       CONNECT=2,
-                       LISTEN=3,
-                       ADD=4,
-                       REMOVE=5,
-                       PAIRED=6,
-                       PLIST=8,
-                       )
+usbmuxd_version = Enum(
+    Int32ul,
+    BINARY=0,
+    PLIST=1,
+)
+
+usbmuxd_result = Enum(
+    Int32ul,
+    OK=0,
+    BADCOMMAND=1,
+    BADDEV=2,
+    CONNREFUSED=3,
+    NOSUCHSERVICE=4,
+    BADVERSION=6,
+)
+
+usbmuxd_msgtype = Enum(
+    Int32ul,
+    RESULT=1,
+    CONNECT=2,
+    LISTEN=3,
+    ADD=4,
+    REMOVE=5,
+    PAIRED=6,
+    PLIST=8,
+)
 
 usbmuxd_header = Struct(
-    'version' / usbmuxd_version,  # protocol version
-    'message' / usbmuxd_msgtype,  # message type
-    'tag' / Int32ul,  # responses to this query will echo back this tag
+    "version" / usbmuxd_version,  # protocol version
+    "message" / usbmuxd_msgtype,  # message type
+    "tag" / Int32ul,  # responses to this query will echo back this tag
 )
 
-usbmuxd_request = Prefixed(Int32ul, Struct(
-    'header' / usbmuxd_header,
-    'data' / Switch(this.header.message, {
-        usbmuxd_msgtype.CONNECT: Struct(
-            'device_id' / Int32ul,
-            'port' / Int16ul,  # TCP port number
-            'reserved' / Const(0, Int16ul),
+usbmuxd_request = Prefixed(
+    Int32ul,
+    Struct(
+        "header" / usbmuxd_header,
+        "data"
+        / Switch(
+            this.header.message,
+            {
+                usbmuxd_msgtype.CONNECT: Struct(
+                    "device_id" / Int32ul,
+                    "port" / Int16ul,  # TCP port number
+                    "reserved" / Const(0, Int16ul),
+                ),
+                usbmuxd_msgtype.PLIST: GreedyBytes,
+            },
         ),
-        usbmuxd_msgtype.PLIST: GreedyBytes,
-    }),
-), includelength=True)
+    ),
+    includelength=True,
+)
 
 usbmuxd_device_record = Struct(
-    'device_id' / Int32ul,
-    'product_id' / Int16ul,
-    'serial_number' / FixedSized(256, CString('ascii')),
+    "device_id" / Int32ul,
+    "product_id" / Int16ul,
+    "serial_number" / FixedSized(256, CString("ascii")),
     Padding(2),
-    'location' / Int32ul
+    "location" / Int32ul,
 )
 
-usbmuxd_response = Prefixed(Int32ul, Struct(
-    'header' / usbmuxd_header,
-    'data' / Switch(this.header.message, {
-        usbmuxd_msgtype.RESULT: Struct(
-            'result' / usbmuxd_result,
+usbmuxd_response = Prefixed(
+    Int32ul,
+    Struct(
+        "header" / usbmuxd_header,
+        "data"
+        / Switch(
+            this.header.message,
+            {
+                usbmuxd_msgtype.RESULT: Struct(
+                    "result" / usbmuxd_result,
+                ),
+                usbmuxd_msgtype.ADD: usbmuxd_device_record,
+                usbmuxd_msgtype.REMOVE: Struct(
+                    "device_id" / Int32ul,
+                ),
+                usbmuxd_msgtype.PLIST: GreedyBytes,
+            },
         ),
-        usbmuxd_msgtype.ADD: usbmuxd_device_record,
-        usbmuxd_msgtype.REMOVE: Struct(
-            'device_id' / Int32ul,
-        ),
-        usbmuxd_msgtype.PLIST: GreedyBytes,
-    }),
-), includelength=True)
+    ),
+    includelength=True,
+)
 
 
 @dataclass
@@ -87,24 +126,24 @@ class MuxDevice:
         mux = create_mux(usbmux_address=usbmux_address)
         try:
             return mux.connect(self, port)
-        except:  # noqa: E722
+        except:
             mux.close()
             raise
 
     @property
     def is_usb(self) -> bool:
-        return self.connection_type == 'USB'
+        return self.connection_type == "USB"
 
     @property
     def is_network(self) -> bool:
-        return self.connection_type == 'Network'
+        return self.connection_type == "Network"
 
     def matches_udid(self, udid: str) -> bool:
-        return self.serial.replace('-', '') == udid.replace('-', '')
+        return self.serial.replace("-", "") == udid.replace("-", "")
 
 
 class SafeStreamSocket:
-    """ wrapper to native python socket object to be used with construct as a stream """
+    """wrapper to native python socket object to be used with construct as a stream"""
 
     def __init__(self, address, family):
         self._offset = 0
@@ -117,12 +156,12 @@ class SafeStreamSocket:
         return len(msg)
 
     def recv(self, size: int) -> bytes:
-        msg = b''
+        msg = b""
         while len(msg) < size:
             chunk = self.sock.recv(size - len(msg))
             self._offset += len(chunk)
             if not chunk:
-                raise MuxException('socket connection broken')
+                raise MuxException("socket connection broken")
             msg += chunk
         return msg
 
@@ -144,18 +183,18 @@ class SafeStreamSocket:
 
 class MuxConnection:
     # used on Windows
-    ITUNES_HOST = ('127.0.0.1', 27015)
+    ITUNES_HOST = ("127.0.0.1", 27015)
 
     # used for macOS and Linux
-    USBMUXD_PIPE = '/var/run/usbmuxd'
+    USBMUXD_PIPE = "/var/run/usbmuxd"
 
     @staticmethod
     def create_usbmux_socket(usbmux_address: Optional[str] = None) -> SafeStreamSocket:
         try:
             if usbmux_address is not None:
-                if ':' in usbmux_address:
+                if ":" in usbmux_address:
                     # assume tcp address
-                    hostname, port = usbmux_address.split(':')
+                    hostname, port = usbmux_address.split(":")
                     port = int(port)
                     address = (hostname, port)
                     family = socket.AF_INET
@@ -166,23 +205,25 @@ class MuxConnection:
             else:
                 address, family = get_os_utils().usbmux_address
             return SafeStreamSocket(address, family)
-        except ConnectionRefusedError:
-            raise ConnectionFailedToUsbmuxdError()
+        except ConnectionRefusedError as e:
+            raise ConnectionFailedToUsbmuxdError() from e
 
     @staticmethod
     def create(usbmux_address: Optional[str] = None):
         # first attempt to connect with possibly the wrong version header (plist protocol)
         sock = MuxConnection.create_usbmux_socket(usbmux_address=usbmux_address)
 
-        message = usbmuxd_request.build({
-            'header': {'version': usbmuxd_version.PLIST, 'message': usbmuxd_msgtype.PLIST, 'tag': 1},
-            'data': plistlib.dumps({'MessageType': 'ReadBUID'})
-        })
-        sock.send(message)
-        response = usbmuxd_response.parse_stream(sock)
-
-        # if we sent a bad request, we should re-create the socket in the correct version this time
-        sock.close()
+        try:
+            message = usbmuxd_request.build({
+                "header": {"version": usbmuxd_version.PLIST, "message": usbmuxd_msgtype.PLIST, "tag": 1},
+                "data": plistlib.dumps({"MessageType": "ReadBUID"}),
+            })
+            sock.send(message)
+            response = usbmuxd_response.parse_stream(sock)
+
+        finally:
+            # If we sent a bad request, we should re-create the socket in the correct version this time
+            sock.close()
         sock = MuxConnection.create_usbmux_socket(usbmux_address=usbmux_address)
 
         if response.header.version == usbmuxd_version.BINARY:
@@ -190,7 +231,7 @@ class MuxConnection:
         elif response.header.version == usbmuxd_version.PLIST:
             return PlistMuxConnection(sock)
 
-        raise MuxVersionError(f'usbmuxd returned unsupported version: {response.version}')
+        raise MuxVersionError(f"usbmuxd returned unsupported version: {response.version}")
 
     def __init__(self, sock: SafeStreamSocket):
         self._sock = sock
@@ -207,30 +248,30 @@ class MuxConnection:
 
     @abc.abstractmethod
     def _connect(self, device_id: int, port: int):
-        """ initiate a "Connect" request to target port """
+        """initiate a "Connect" request to target port"""
         pass
 
     @abc.abstractmethod
-    def get_device_list(self, timeout: float = None):
+    def get_device_list(self, timeout: Optional[float] = None):
         """
         request an update to current device list
         """
         pass
 
     def connect(self, device: MuxDevice, port: int) -> socket.socket:
-        """ connect to a relay port on target machine and get a raw python socket object for the connection """
+        """connect to a relay port on target machine and get a raw python socket object for the connection"""
         self._connect(device.devid, socket.htons(port))
         self._connected = True
         return self._sock.sock
 
     def close(self):
-        """ close current socket """
+        """close current socket"""
         self._sock.close()
 
     def _assert_not_connected(self):
-        """ verify active state is in state for control messages """
+        """verify active state is in state for control messages"""
         if self._connected:
-            raise MuxException('Mux is connected, cannot issue control packets')
+            raise MuxException("Mux is connected, cannot issue control packets")
 
     def _raise_mux_exception(self, result: int, message: Optional[str] = None) -> None:
         exceptions = {
@@ -251,14 +292,14 @@ class MuxConnection:
 
 
 class BinaryMuxConnection(MuxConnection):
-    """ old binary protocol """
+    """old binary protocol"""
 
     def __init__(self, sock: SafeStreamSocket):
         super().__init__(sock)
         self._version = usbmuxd_version.BINARY
 
-    def get_device_list(self, timeout: float = None):
-        """ use timeout to wait for the device list to be fully populated """
+    def get_device_list(self, timeout: Optional[float] = None):
+        """use timeout to wait for the device list to be fully populated"""
         self._assert_not_connected()
         end = time.time() + timeout
         self.listen()
@@ -268,55 +309,54 @@ class BinaryMuxConnection(MuxConnection):
                 self._receive_device_state_update()
             except (BlockingIOError, StreamError):
                 continue
-            except IOError:
+            except OSError as e:
                 try:
                     self._sock.setblocking(True)
                     self.close()
                 except OSError:
                     pass
-                raise MuxException('Exception in listener socket')
+                raise MuxException("Exception in listener socket") from e
 
     def listen(self):
-        """ start listening for events of attached and detached devices """
+        """start listening for events of attached and detached devices"""
         self._send_receive(usbmuxd_msgtype.LISTEN)
 
     def _connect(self, device_id: int, port: int):
-        self._send({'header': {'version': self._version,
-                               'message': usbmuxd_msgtype.CONNECT,
-                               'tag': self._tag},
-                    'data': {'device_id': device_id, 'port': port},
-                    })
+        self._send({
+            "header": {"version": self._version, "message": usbmuxd_msgtype.CONNECT, "tag": self._tag},
+            "data": {"device_id": device_id, "port": port},
+        })
         response = self._receive()
         if response.header.message != usbmuxd_msgtype.RESULT:
-            raise MuxException(f'unexpected message type received: {response}')
+            raise MuxException(f"unexpected message type received: {response}")
 
         if response.data.result != usbmuxd_result.OK:
-            raise self._raise_mux_exception(int(response.data.result),
-                                            f'failed to connect to device: {device_id} at port: {port}. reason: '
-                                            f'{response.data.result}')
+            raise self._raise_mux_exception(
+                int(response.data.result),
+                f"failed to connect to device: {device_id} at port: {port}. reason: {response.data.result}",
+            )
 
     def _send(self, data: dict) -> None:
         self._assert_not_connected()
         self._sock.send(usbmuxd_request.build(data))
         self._tag += 1
 
-    def _receive(self, expected_tag: int = None):
+    def _receive(self, expected_tag: Optional[int] = None):
         self._assert_not_connected()
         response = usbmuxd_response.parse_stream(self._sock)
         if expected_tag and response.header.tag != expected_tag:
-            raise MuxException(f'Reply tag mismatch: expected {expected_tag}, got {response.header.tag}')
+            raise MuxException(f"Reply tag mismatch: expected {expected_tag}, got {response.header.tag}")
         return response
 
     def _send_receive(self, message_type: int):
-        self._send({'header': {'version': self._version, 'message': message_type, 'tag': self._tag},
-                    'data': b''})
+        self._send({"header": {"version": self._version, "message": message_type, "tag": self._tag}, "data": b""})
         response = self._receive(self._tag - 1)
         if response.header.message != usbmuxd_msgtype.RESULT:
-            raise MuxException(f'unexpected message type received: {response}')
+            raise MuxException(f"unexpected message type received: {response}")
 
         result = response.data.result
         if result != usbmuxd_result.OK:
-            raise self._raise_mux_exception(int(result), f'{message_type} failed: error {result}')
+            raise self._raise_mux_exception(int(result), f"{message_type} failed: error {result}")
 
     def _add_device(self, device: MuxDevice):
         self.devices.append(device)
@@ -328,11 +368,11 @@ class BinaryMuxConnection(MuxConnection):
         response = self._receive()
         if response.header.message == usbmuxd_msgtype.ADD:
             # old protocol only supported USB devices
-            self._add_device(MuxDevice(response.data.device_id, response.data.serial_number, 'USB'))
+            self._add_device(MuxDevice(response.data.device_id, response.data.serial_number, "USB"))
         elif response.header.message == usbmuxd_msgtype.REMOVE:
             self._remove_device(response.data.device_id)
         else:
-            raise MuxException(f'Invalid packet type received: {response}')
+            raise MuxException(f"Invalid packet type received: {response}")
 
 
 class PlistMuxConnection(BinaryMuxConnection):
@@ -341,71 +381,77 @@ class PlistMuxConnection(BinaryMuxConnection):
         self._version = usbmuxd_version.PLIST
 
     def listen(self) -> None:
-        self._send_receive({'MessageType': 'Listen'})
+        self._send_receive({"MessageType": "Listen"})
 
     def get_pair_record(self, serial: str) -> dict:
         # serials are saved inside usbmuxd without '-'
-        self._send({'MessageType': 'ReadPairRecord', 'PairRecordID': serial})
+        self._send({"MessageType": "ReadPairRecord", "PairRecordID": serial})
         response = self._receive(self._tag - 1)
-        pair_record = response.get('PairRecordData')
+        pair_record = response.get("PairRecordData")
         if pair_record is None:
-            raise NotPairedError('device should be paired first')
+            raise NotPairedError("device should be paired first")
         return plistlib.loads(pair_record)
 
-    def get_device_list(self, timeout: float = None) -> None:
-        """ get device list synchronously without waiting the timeout """
+    def get_device_list(self, timeout: Optional[float] = None) -> None:
+        """get device list synchronously without waiting the timeout"""
         self.devices = []
-        self._send({'MessageType': 'ListDevices'})
+        self._send({"MessageType": "ListDevices"})
         response = self._receive(self._tag - 1)
-        device_list = response.get('DeviceList')
+        device_list = response.get("DeviceList")
         if device_list is None:
-            raise MuxException(f'Got an invalid response from usbmux: {response}')
+            raise MuxException(f"Got an invalid response from usbmux: {response}")
         for response in device_list:
-            if response['MessageType'] == 'Attached':
-                super()._add_device(MuxDevice(response['DeviceID'], response['Properties']['SerialNumber'],
-                                              response['Properties']['ConnectionType']))
-            elif response['MessageType'] == 'Detached':
-                super()._remove_device(response['DeviceID'])
+            if response["MessageType"] == "Attached":
+                super()._add_device(
+                    MuxDevice(
+                        response["DeviceID"],
+                        response["Properties"]["SerialNumber"],
+                        response["Properties"]["ConnectionType"],
+                    )
+                )
+            elif response["MessageType"] == "Detached":
+                super()._remove_device(response["DeviceID"])
             else:
-                raise MuxException(f'Invalid packet type received: {response}')
+                raise MuxException(f"Invalid packet type received: {response}")
 
     def get_buid(self) -> str:
-        """ get SystemBUID """
-        self._send({'MessageType': 'ReadBUID'})
-        return self._receive(self._tag - 1)['BUID']
+        """get SystemBUID"""
+        self._send({"MessageType": "ReadBUID"})
+        return self._receive(self._tag - 1)["BUID"]
 
     def save_pair_record(self, serial: str, device_id: int, record_data: bytes):
         # serials are saved inside usbmuxd without '-'
-        self._send_receive({'MessageType': 'SavePairRecord',
-                            'PairRecordID': serial,
-                            'PairRecordData': record_data,
-                            'DeviceID': device_id})
+        self._send_receive({
+            "MessageType": "SavePairRecord",
+            "PairRecordID": serial,
+            "PairRecordData": record_data,
+            "DeviceID": device_id,
+        })
 
     def _connect(self, device_id: int, port: int):
-        self._send_receive({'MessageType': 'Connect', 'DeviceID': device_id, 'PortNumber': port})
+        self._send_receive({"MessageType": "Connect", "DeviceID": device_id, "PortNumber": port})
 
     def _send(self, data: dict):
-        request = {'ClientVersionString': 'qt4i-usbmuxd', 'ProgName': 'pymobiledevice3', 'kLibUSBMuxVersion': 3}
+        request = {"ClientVersionString": "qt4i-usbmuxd", "ProgName": "pymobiledevice3", "kLibUSBMuxVersion": 3}
         request.update(data)
-        super()._send({'header': {'version': self._version,
-                                  'message': usbmuxd_msgtype.PLIST,
-                                  'tag': self._tag},
-                       'data': plistlib.dumps(request),
-                       })
+        super()._send({
+            "header": {"version": self._version, "message": usbmuxd_msgtype.PLIST, "tag": self._tag},
+            "data": plistlib.dumps(request),
+        })
 
-    def _receive(self, expected_tag: int = None) -> dict:
+    def _receive(self, expected_tag: Optional[int] = None) -> dict:
         response = super()._receive(expected_tag=expected_tag)
         if response.header.message != usbmuxd_msgtype.PLIST:
-            raise MuxException(f'Received non-plist type {response}')
+            raise MuxException(f"Received non-plist type {response}")
         return plistlib.loads(response.data)
 
     def _send_receive(self, data: dict):
         self._send(data)
         response = self._receive(self._tag - 1)
-        if response['MessageType'] != 'Result':
-            raise MuxException(f'got an invalid message: {response}')
-        if response['Number'] != 0:
-            raise self._raise_mux_exception(response['Number'], f'got an error message: {response}')
+        if response["MessageType"] != "Result":
+            raise MuxException(f"got an invalid message: {response}")
+        if response["Number"] != 0:
+            raise self._raise_mux_exception(response["Number"], f"got an error message: {response}")
 
 
 def create_mux(usbmux_address: Optional[str] = None) -> MuxConnection:
@@ -414,14 +460,17 @@ def create_mux(usbmux_address: Optional[str] = None) -> MuxConnection:
 
 def list_devices(usbmux_address: Optional[str] = None) -> list[MuxDevice]:
     mux = create_mux(usbmux_address=usbmux_address)
-    mux.get_device_list(0.1)
-    devices = mux.devices
-    mux.close()
+    try:
+        mux.get_device_list(0.1)
+        devices = mux.devices
+    finally:
+        mux.close()
     return devices
 
 
-def select_device(udid: str = None, connection_type: str = None, usbmux_address: Optional[str] = None) \
-        -> Optional[MuxDevice]:
+def select_device(
+    udid: Optional[str] = None, connection_type: Optional[str] = None, usbmux_address: Optional[str] = None
+) -> Optional[MuxDevice]:
     """
     select a UsbMux device according to given arguments.
     if more than one device could be selected, always prefer the usb one.

pymobiledevice3/utils.py

@@ -15,16 +15,16 @@ def plist_access_path(d, path: tuple, type_=None, required=False):
         if d is None:
             break
 
-    if type_ == bool and isinstance(d, str):
-        if d.lower() not in ('true', 'false'):
+    if type_ is bool and isinstance(d, str):
+        if d.lower() not in ("true", "false"):
             raise ValueError()
-        d = 'true' == d.lower()
+        d = d.lower() == "true"
     elif type_ is not None and not isinstance(d, type_):
         # wrong type
         d = None
 
     if d is None and required:
-        raise KeyError(f'path: {path} doesn\'t exist in given plist object')
+        raise KeyError(f"path: {path} doesn't exist in given plist object")
 
     return d
 
@@ -35,7 +35,7 @@ def bytes_to_uint(b: bytes):
 
 def try_decode(s: bytes):
     try:
-        return s.decode('utf8')
+        return s.decode("utf8")
     except UnicodeDecodeError:
         return s
 
@@ -45,7 +45,7 @@ def asyncio_print_traceback(f: Callable):
     async def wrapper(*args, **kwargs):
         try:
             return await f(*args, **kwargs)
-        except Exception as e:  # noqa: E72
+        except (Exception, RuntimeError) as e:
             if not isinstance(e, asyncio.CancelledError):
                 traceback.print_exc()
             raise
@@ -57,7 +57,7 @@ def get_asyncio_loop() -> asyncio.AbstractEventLoop:
     try:
         loop = asyncio.get_running_loop()
         if loop.is_closed():
-            raise RuntimeError('The existing loop is closed.')
+            raise RuntimeError("The existing loop is closed.")
     except RuntimeError:
         # This happens when there is no current event loop
         loop = asyncio.new_event_loop()
@@ -67,14 +67,17 @@ def get_asyncio_loop() -> asyncio.AbstractEventLoop:
 
 def file_download(url: str, outfile: Path, chunk_size=1024) -> None:
     resp = requests.get(url, stream=True)
-    total = int(resp.headers.get('content-length', 0))
-    with outfile.open('wb') as file, tqdm(
+    total = int(resp.headers.get("content-length", 0))
+    with (
+        outfile.open("wb") as file,
+        tqdm(
             desc=outfile.name,
             total=total,
-            unit='iB',
+            unit="iB",
             unit_scale=True,
             unit_divisor=1024,
-    ) as bar:
+        ) as bar,
+    ):
         for data in resp.iter_content(chunk_size=chunk_size):
             size = file.write(data)
             bar.update(size)

{pymobiledevice3-4.27.4.dist-info → pymobiledevice3-5.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.27.4
+Version: 5.1.2
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
@@ -47,7 +47,6 @@ Requires-Dist: nest_asyncio>=1.5.5
 Requires-Dist: Pillow
 Requires-Dist: inquirer3>=0.6.0
 Requires-Dist: ipsw_parser>=1.3.4
-Requires-Dist: zeroconf>=0.132.2
 Requires-Dist: ifaddr
 Requires-Dist: hyperframe
 Requires-Dist: srptools