pymobiledevice3 4.21.8__py3-none-any.whl → 4.22.0__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.8'
-__version_tuple__ = version_tuple = (4, 21, 8)
+__version__ = version = '4.22.0'
+__version_tuple__ = version_tuple = (4, 22, 0)

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/cli/mounter.py

@@ -135,8 +135,8 @@ async def mounter_auto_mount_task(service_provider: LockdownServiceProvider, xco
 @mounter.command('auto-mount', cls=Command)
 @click.option('-x', '--xcode', type=click.Path(exists=True, dir_okay=True, file_okay=False),
               help='Xcode application path used to figure out automatically the DeveloperDiskImage path')
-@click.option('-v', '--version', help='use a different DeveloperDiskImage version from the one retrieved by lockdown'
-                                      'connection')
+@click.option('--version', help='use a different DeveloperDiskImage version from the one retrieved by lockdown'
+                                'connection')
 def mounter_auto_mount(service_provider: LockdownServiceProvider, xcode: str, version: str) -> None:
     """ auto-detect correct DeveloperDiskImage and mount it """
     asyncio.run(mounter_auto_mount_task(service_provider, xcode, version), debug=True)

pymobiledevice3/cli/webinspector.py

@@ -105,7 +105,6 @@ def create_webinspector_and_launch_app(lockdown: LockdownClient, timeout: float,
 
 
 @webinspector.command(cls=Command)
-@click.option('-v', '--verbose', is_flag=True)
 @click.option('-t', '--timeout', default=3, show_default=True, type=float)
 @catch_errors
 def opened_tabs(service_provider: LockdownClient, verbose, timeout):

pymobiledevice3/restore/tss.py

@@ -56,7 +56,7 @@ class TSSResponse(dict):
 
 class TSSRequest:
     def __init__(self):
-        self._request = {
+        self._request: dict[str, typing.Any] = {
             '@HostPlatformInfo': 'mac',
             '@VersionInfo': TSS_CLIENT_VERSION_STRING,
             '@UUID': str(uuid4()).upper(),
@@ -361,16 +361,21 @@ class TSSRequest:
                     k = 'Ap,SikaFuse'
                 self._request[k] = v
 
-        uid_mode = parameters.get('UID_MODE', False)
+        uid_mode = parameters.get('UID_MODE')
 
         if 'NeRDEpoch' in parameters:
             self._request['PermitNeRDPivot'] = b''
 
-        self._request['UID_MODE'] = uid_mode
+        if uid_mode is not None:
+            self._request['UID_MODE'] = uid_mode
         self._request['@ApImg4Ticket'] = True
         self._request['@BBTicket'] = True
 
         if parameters.get('RequiresUIDMode'):
+            # The logic here is missing why this value is expected to be 'false'
+            self._request['UID_MODE'] = False
+
+            # Workaround: We have only seen Ap,SikaFuse together with UID_MODE
             self._request['Ap,SikaFuse'] = 0
 
     def add_se_tags(self, parameters: dict, overrides=None):

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,7 +16,9 @@ from pymobiledevice3.lockdown_service_provider import LockdownServiceProvider
 from pymobiledevice3.restore.tss import TSSRequest
 from pymobiledevice3.services.lockdown_service import LockdownService
 
-LATEST_DDI_BUILD_ID = '16A242d'
+logger = logging.getLogger(__name__)
+
+LATEST_DDI_BUILD_ID = '16E5121h'
 
 
 class MobileImageMounterService(LockdownService):
@@ -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.8.dist-info → pymobiledevice3-4.22.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.21.8
+Version: 4.22.0
 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.8.dist-info → pymobiledevice3-4.22.0.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=fN2o3W2zI_Gu2Ba3jnR9bIOjM9Nc67Zbt1_9YRVZe1s,513
+pymobiledevice3/_version.py,sha256=orvHwmO-r_x_VgHSM3aH7L9XDQWnlhDlDhFDhwlMiOk,513
 pymobiledevice3/bonjour.py,sha256=FXa_x0Zdo6ims7N7F61hnnZEyn1tc2it3mQpHRMY0Kk,5560
 pymobiledevice3/ca.py,sha256=Ho0NaOtATe5hdruUSlVDRpfR9ltEYXjL3MoKwEvEJjw,2296
 pymobiledevice3/common.py,sha256=-PG6oaUkNFlB3jb7E0finMrX8wqhkS-cuTAfmLvZUmc,329
@@ -34,9 +34,9 @@ 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=Z4nyh3vn1oFuQKaQfs3nFwqHP85uxEUmWD9TxazbMmk,7736
+pymobiledevice3/cli/mounter.py,sha256=AnNneNF_kW7XnBMe4V5cvlbLYd_mAP4tuB3PXLQpeiA,7724
 pymobiledevice3/cli/notification.py,sha256=vqn8uPslr7A9HiZ4yrs7YKF2VLS7Nk4G7ab5ELljpVQ,1962
 pymobiledevice3/cli/pcap.py,sha256=KzFxXWFRYWNOEJE1XAuMF2cG8I4k5wFVcMRhSdY4GQg,2188
 pymobiledevice3/cli/power_assertion.py,sha256=aTlesowRyrbd9JXebEZe9SomTkDkZaAXIOyTIitRJ0c,880
@@ -49,7 +49,7 @@ pymobiledevice3/cli/springboard.py,sha256=pYMqnD0zN_ETIASPqxBohi54F2HMC9jCILW4ep
 pymobiledevice3/cli/syslog.py,sha256=JfLhjyVAeRx16VC4BsAu308rABjcIQX8DB7vbVKGiic,7462
 pymobiledevice3/cli/usbmux.py,sha256=f8T6Xt4ym9wfnxFIAyJ1W76YI0h1hqrRfKj4PxCoNRc,2365
 pymobiledevice3/cli/version.py,sha256=OtvxHV8JjLFNaiA1Q5Qll3bsw__hrij-9FUmkDmNS40,346
-pymobiledevice3/cli/webinspector.py,sha256=aSZQxYGKXZMbfPGUFP37wDNR_2FL8bt88rKywCXwZ5Y,15575
+pymobiledevice3/cli/webinspector.py,sha256=BNXio0ATrpbMiLRLfrm9oq0pdGdbpH1QEZOzxy-PSgE,15528
 pymobiledevice3/osu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/osu/os_utils.py,sha256=YwMTUT6o67xa-la8ElxdHQ1hBJM_u2gsoKW5RNxCEEU,3272
 pymobiledevice3/osu/posix_util.py,sha256=YllI2PH2VngvLs273Hi05C2pHfvwx5NNPdtbrlNYxaI,3370
@@ -95,7 +95,7 @@ pymobiledevice3/restore/recovery.py,sha256=YB2wZST3uhQMO1DwewfHb2VdEb-gH8nW58RbT
 pymobiledevice3/restore/restore.py,sha256=GE86M79jd6nnd5GyY4ZLiEyhMKe0GxLTKe_bDcqtpJg,57479
 pymobiledevice3/restore/restore_options.py,sha256=qeh_wRa_bi0Ccl0p0JuX9EChEQBqwJt94EBImWcEJ3E,7255
 pymobiledevice3/restore/restored_client.py,sha256=h_yBZ_e1wfaIzi0f9-R8Ky2x6xFTkvDlpWIV561uxoU,3638
-pymobiledevice3/restore/tss.py,sha256=TzvA1_FVZSotHG_vZykKa8v9Ja8Som5zgMH7AY0wFis,29593
+pymobiledevice3/restore/tss.py,sha256=egguhU3aVt8yWba-MFa2aoL999bn61kty8ON0QcTKoE,29853
 pymobiledevice3/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymobiledevice3/services/accessibilityaudit.py,sha256=PtQujwFLL3E1OgOSUjkKHvgmk2e8Ij2XZIp8JicAphs,15547
 pymobiledevice3/services/afc.py,sha256=9Ddc0emUrwLPOi0DLy1MZ5w7zqotYNxBB2OU0WyIWsk,36244
@@ -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=SIibV5IoB570bqWoNwtYKmRTgXIuLUBaMJFlPwENbD4,14638
+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.8.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-pymobiledevice3-4.21.8.dist-info/METADATA,sha256=h_9eBcjfSZGl0bJX0v8IUvZ82Vqhei3jwImCKKWPRIM,17366
-pymobiledevice3-4.21.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymobiledevice3-4.21.8.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
-pymobiledevice3-4.21.8.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
-pymobiledevice3-4.21.8.dist-info/RECORD,,
+pymobiledevice3-4.22.0.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+pymobiledevice3-4.22.0.dist-info/METADATA,sha256=mm3AkE_Rn5KkOwr_RhT6qcMLTENzw--0VAycsdfQ0ic,17366
+pymobiledevice3-4.22.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymobiledevice3-4.22.0.dist-info/entry_points.txt,sha256=jJMlOanHlVwUxcY__JwvKeWPrvBJr_wJyEq4oHIZNKE,66
+pymobiledevice3-4.22.0.dist-info/top_level.txt,sha256=MjZoRqcWPOh5banG-BbDOnKEfsS3kCxqV9cv-nzyg2Q,21
+pymobiledevice3-4.22.0.dist-info/RECORD,,