pymobiledevice3 4.21.10__py3-none-any.whl → 4.22.1__py3-none-any.whl

pymobiledevice3/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.21.10'
-__version_tuple__ = version_tuple = (4, 21, 10)
+__version__ = version = '4.22.1'
+__version_tuple__ = version_tuple = (4, 22, 1)

pymobiledevice3/cli/diagnostics.py

@@ -4,7 +4,7 @@ import time
 import click
 
 from pymobiledevice3.cli.cli_common import Command, print_json
-from pymobiledevice3.lockdown import LockdownClient
+from pymobiledevice3.lockdown import LockdownClient, retry_create_using_usbmux
 from pymobiledevice3.lockdown_service_provider import LockdownServiceProvider
 from pymobiledevice3.services.diagnostics import DiagnosticsService
 
@@ -23,9 +23,15 @@ def diagnostics() -> None:
 
 
 @diagnostics.command('restart', cls=Command)
-def diagnostics_restart(service_provider: LockdownClient):
+@click.option('-r', '--reconnect', is_flag=True, default=False,
+              help='Wait until the device reconnects before finishing the operation.')
+def diagnostics_restart(service_provider: LockdownClient, reconnect):
     """ Restart device """
     DiagnosticsService(lockdown=service_provider).restart()
+    if reconnect:
+        # Wait for the device to be available again
+        with retry_create_using_usbmux(None, serial=service_provider.udid):
+            print(f'Device Reconnected ({service_provider.udid}).')
 
 
 @diagnostics.command('shutdown', cls=Command)

pymobiledevice3/service_connection.py

@@ -60,12 +60,12 @@ def parse_plist(payload: bytes) -> dict:
     :param payload: The plist-formatted byte string to parse.
     :return: The parsed dictionary.
     :raises PyMobileDevice3Exception: If the payload is invalid.
-    :retries with a filtered payload if plistlib compains about "not well-formed (invalid token)"
+    :retries with a filtered payload of only valid XML characters if plistlib compains about "not well-formed (invalid token)"
     """
     try:
         return plistlib.loads(payload)
     except xml.parsers.expat.ExpatError:
-        payload = bytes([b for b in payload if b not in (0x00, 0x10)])
+        payload = bytes([b for b in payload if b >= 0x20 or b in (0x09, 0x0a, 0x0d)])
         try:
             return plistlib.loads(payload)
         except plistlib.InvalidFileException:

pymobiledevice3/services/mobile_image_mounter.py

@@ -1,4 +1,5 @@
 import hashlib
+import logging
 import plistlib
 from pathlib import Path
 from typing import Optional
@@ -15,6 +16,8 @@ from pymobiledevice3.lockdown_service_provider import LockdownServiceProvider
 from pymobiledevice3.restore.tss import TSSRequest
 from pymobiledevice3.services.lockdown_service import LockdownService
 
+logger = logging.getLogger(__name__)
+
 LATEST_DDI_BUILD_ID = '16E5121h'
 
 
@@ -355,6 +358,10 @@ async def auto_mount_personalized(lockdown: LockdownServiceProvider) -> None:
         image.write_bytes(personalized_image.image)
         build_manifest.write_bytes(personalized_image.build_manifest)
         trustcache.write_bytes(personalized_image.trustcache)
+        downloaded_ddi_build_id = plistlib.loads(personalized_image.build_manifest).get('ProductBuildVersion')
+        if downloaded_ddi_build_id != LATEST_DDI_BUILD_ID:
+            logger.warning('Downloaded personalized image has unexpected ProductBuildVersion '
+                           f'{downloaded_ddi_build_id}. Please update pymobiledevice3!')
 
     await PersonalizedImageMounter(lockdown=lockdown).mount(image, build_manifest, trustcache)
 

{pymobiledevice3-4.21.10.dist-info → pymobiledevice3-4.22.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.21.10
+Version: 4.22.1
 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>

{pymobiledevice3-4.21.10.dist-info → pymobiledevice3-4.22.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ misc/understanding_idevice_protocol_layers.md,sha256=8tEqRXWOUPoxOJLZVh7C7H9JGCh
 misc/usbmux_sniff.sh,sha256=iWtbucOEQ9_UEFXk9x-2VNt48Jg5zrPsnUbZ_LfZxwA,212
 pymobiledevice3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/__main__.py,sha256=nwUgfXBMii2MSXLUls2uMTG88uC13s4haPBM4LuGcaU,11530
-pymobiledevice3/_version.py,sha256=34-YtMuzL3EQkm2AaoKfqzAIY7CtVkteSS5j-reKY8w,515
+pymobiledevice3/_version.py,sha256=SCBlFkpjZ96tcrOzsJReCr254lYbCqBh0gCXEu_s_eo,513
 pymobiledevice3/bonjour.py,sha256=FXa_x0Zdo6ims7N7F61hnnZEyn1tc2it3mQpHRMY0Kk,5560
 pymobiledevice3/ca.py,sha256=Ho0NaOtATe5hdruUSlVDRpfR9ltEYXjL3MoKwEvEJjw,2296
 pymobiledevice3/common.py,sha256=-PG6oaUkNFlB3jb7E0finMrX8wqhkS-cuTAfmLvZUmc,329
@@ -18,7 +18,7 @@ pymobiledevice3/irecv_devices.py,sha256=lTImsqVhFg1UdTdW2jn6bJLh15Nzh-z8E0WJk55D
 pymobiledevice3/lockdown.py,sha256=Skl3S8pCgEIWfU8XrYWxG0-uKN37-eWHg4tFTnYpGUg,38231
 pymobiledevice3/lockdown_service_provider.py,sha256=l5N72tiuI-2uowk8wu6B7qkjY2UmqQsnhdJqvJy3I8A,1744
 pymobiledevice3/pair_records.py,sha256=Tr28mlBWPXvOF7vdKBDOuw1rCRwm6RViDTGbikfP77I,6034
-pymobiledevice3/service_connection.py,sha256=V7HQogiE0v8o6eivwco_XCOI5SwxIuCEtJDas3Kj32I,14405
+pymobiledevice3/service_connection.py,sha256=yG_DOphuBvOxOfUOBdpsQwYJUmZh_L5Kiuodk-nGSmk,14449
 pymobiledevice3/tcp_forwarder.py,sha256=I1arSMXuIcMpeP6POk4CDDT5BlrIFBtQ4NfljO4Fqy0,8765
 pymobiledevice3/usbmux.py,sha256=CvJ_NgH77wcfF7ZAQuLGHTIYkuWvhXPYZNQNR7-Jf8A,16820
 pymobiledevice3/utils.py,sha256=ybli_l8JIG2usFiToAsVYe0Ymg3q0bcpKqmYUF_wpi8,2179
@@ -34,7 +34,7 @@ pymobiledevice3/cli/companion_proxy.py,sha256=ey0X3moJ49zVJoNCpRMMHmf9fBZfdqimhz
 pymobiledevice3/cli/completions.py,sha256=t8oryezQTcWDno_E2Cch7o1f-qURVL9M1Z4o6uLA_kM,1722
 pymobiledevice3/cli/crash.py,sha256=m1vs0_KUy4cxu8vHYjn7olay8oPQGTFZqMCHspnGpVs,3181
 pymobiledevice3/cli/developer.py,sha256=9ZAvy7nqX4vPjx-2peqjuhaeEK5iYHTmWgevcvglbXM,55075
-pymobiledevice3/cli/diagnostics.py,sha256=g22i0bRpfbrsFR0ql3fqTE65dw7qYfBhidoeCbO3mrg,3238
+pymobiledevice3/cli/diagnostics.py,sha256=VDWr41ryIZcpuQp47nQSzCiSuIILExqGSrwFizXCIkI,3641
 pymobiledevice3/cli/lockdown.py,sha256=498SgKdIC_YaoEjVtQQvo8bvv8GDeUTY8yWh4isy_qc,6941
 pymobiledevice3/cli/mounter.py,sha256=AnNneNF_kW7XnBMe4V5cvlbLYd_mAP4tuB3PXLQpeiA,7724
 pymobiledevice3/cli/notification.py,sha256=vqn8uPslr7A9HiZ4yrs7YKF2VLS7Nk4G7ab5ELljpVQ,1962
@@ -115,7 +115,7 @@ pymobiledevice3/services/lockdown_service.py,sha256=WP2l3qIdU7XtWDQMfNEPwSJZfS7D
 pymobiledevice3/services/misagent.py,sha256=YGLo2LhzyYWyICxKDhy3Ph7SewYk5I1VN3-LjKv_plo,2088
 pymobiledevice3/services/mobile_activation.py,sha256=NTxdiA39-XpN77OJAErVkGsxUZf_b1AOSd08URKu0MA,6139
 pymobiledevice3/services/mobile_config.py,sha256=Ev1AmJ6pzeZKnwMaSKIwWAOWVMqH2QgDbjD49Jc_l20,17419
-pymobiledevice3/services/mobile_image_mounter.py,sha256=jytO2wV8k7YozJ-PBdZtAadDCkOo55-iH9Xqb1rfG-s,14639
+pymobiledevice3/services/mobile_image_mounter.py,sha256=_XjVGfhv7g9Ils5Q9AGi6i-lgakmDdN4e79UPdCZ4xA,15046
 pymobiledevice3/services/mobilebackup2.py,sha256=1Wo4IpLG5HUfkGJustsv2SoTBBax30PZyKOtEOz5Eac,18217
 pymobiledevice3/services/notification_proxy.py,sha256=VCOG8G0HNn8_tFKUdLs5BFkshQCtI_LNH-w4MuNF2MM,2109
 pymobiledevice3/services/os_trace.py,sha256=Vi_KGWK8hsvk6eMNuv-ae-iEn3UlUk3SF_niC8yBEmU,6465
@@ -164,9 +164,9 @@ pymobiledevice3/services/web_protocol/switch_to.py,sha256=hDddJUEePbRN-8xlllOeGh
 pymobiledevice3/tunneld/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/tunneld/api.py,sha256=EfGKXEWhsMSB__menPmRmL9R6dpazVJDUy7B3pn05MM,2357
 pymobiledevice3/tunneld/server.py,sha256=SvC57AV_R8YQhA0fCwGNUdhfy8TKMFWwL_fp_FmXrBI,22715
-pymobiledevice3-4.21.10.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-pymobiledevice3-4.21.10.dist-info/METADATA,sha256=t-4FOeT2O5dSoav2Q3j6mwPzTzNtOKQ571ZXGf9a-_U,17367
-pymobiledevice3-4.21.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymobiledevice3-4.21.10.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
-pymobiledevice3-4.21.10.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
-pymobiledevice3-4.21.10.dist-info/RECORD,,
+pymobiledevice3-4.22.1.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+pymobiledevice3-4.22.1.dist-info/METADATA,sha256=FMEGO0bUfwpHasHiapCr-w0hYkME09vlL6TBeOnl3qE,17366
+pymobiledevice3-4.22.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymobiledevice3-4.22.1.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
+pymobiledevice3-4.22.1.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
+pymobiledevice3-4.22.1.dist-info/RECORD,,