pymobiledevice3 4.25.1__tar.gz → 4.26.0__tar.gz

{pymobiledevice3-4.25.1 → pymobiledevice3-4.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.25.1
+Version: 4.26.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.25.1 → pymobiledevice3-4.26.0}/pymobiledevice3/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.25.1'
-__version_tuple__ = version_tuple = (4, 25, 1)
+__version__ = version = '4.26.0'
+__version_tuple__ = version_tuple = (4, 26, 0)
 
-__commit_id__ = commit_id = 'g386b7f461'
+__commit_id__ = commit_id = 'g3d245807a'

{pymobiledevice3-4.25.1 → pymobiledevice3-4.26.0}/pymobiledevice3/bonjour.py

@@ -131,8 +131,10 @@ async def browse_remoted(timeout: float = DEFAULT_BONJOUR_TIMEOUT) -> list[Bonjo
     return await browse_ipv6(REMOTED_SERVICE_NAMES, timeout=timeout)
 
 
-async def browse_mobdev2(timeout: float = DEFAULT_BONJOUR_TIMEOUT) -> list[BonjourAnswer]:
-    return await browse(MOBDEV2_SERVICE_NAMES, get_ipv4_addresses() + OSUTILS.get_ipv6_ips(), timeout=timeout)
+async def browse_mobdev2(timeout: float = DEFAULT_BONJOUR_TIMEOUT, ips: Optional[list[str]] = None) -> list[BonjourAnswer]:
+    if ips is None:
+        ips = get_ipv4_addresses() + OSUTILS.get_ipv6_ips()
+    return await browse(MOBDEV2_SERVICE_NAMES, ips, timeout=timeout)
 
 
 async def browse_remotepairing(timeout: float = DEFAULT_BONJOUR_TIMEOUT) -> list[BonjourAnswer]:

{pymobiledevice3-4.25.1 → pymobiledevice3-4.26.0}/pymobiledevice3/cli/bonjour.py

@@ -1,6 +1,5 @@
 import asyncio
-import plistlib
-from pathlib import Path
+from typing import Optional
 
 import click
 
@@ -21,13 +20,9 @@ def bonjour_cli() -> None:
     pass
 
 
-async def cli_mobdev2_task(timeout: float, pair_records: str) -> None:
-    records = []
-    if pair_records is not None:
-        for record in Path(pair_records).glob('*.plist'):
-            records.append(plistlib.loads(record.read_bytes()))
+async def cli_mobdev2_task(timeout: float, pair_records: Optional[str]) -> None:
     output = []
-    async for ip, lockdown in get_mobdev2_lockdowns(timeout=timeout):
+    async for ip, lockdown in get_mobdev2_lockdowns(timeout=timeout, pair_records=pair_records):
         short_info = lockdown.short_info
         short_info['ip'] = ip
         output.append(short_info)
@@ -38,7 +33,7 @@ async def cli_mobdev2_task(timeout: float, pair_records: str) -> None:
 @click.option('--timeout', default=DEFAULT_BONJOUR_TIMEOUT, type=click.INT)
 @click.option('--pair-records', type=click.Path(dir_okay=True, file_okay=False, exists=True),
               help='pair records to attempt validation with')
-def cli_mobdev2(timeout: float, pair_records: str) -> None:
+def cli_mobdev2(timeout: float, pair_records: Optional[str]) -> None:
     """ browse for mobdev2 devices over bonjour """
     asyncio.run(cli_mobdev2_task(timeout, pair_records))
 

{pymobiledevice3-4.25.1 → pymobiledevice3-4.26.0}/pymobiledevice3/cli/cli_common.py

@@ -17,7 +17,7 @@ from inquirer3.themes import GreenPassion
 from pygments import formatters, highlight, lexers
 
 from pymobiledevice3.exceptions import AccessDeniedError, DeviceNotFoundError, NoDeviceConnectedError
-from pymobiledevice3.lockdown import LockdownClient, create_using_usbmux
+from pymobiledevice3.lockdown import LockdownClient, TcpLockdownClient, create_using_usbmux, get_mobdev2_lockdowns
 from pymobiledevice3.osu.os_utils import get_os_utils
 from pymobiledevice3.remote.remote_service_discovery import RemoteServiceDiscoveryService
 from pymobiledevice3.tunneld.api import TUNNELD_DEFAULT_ADDRESS, async_get_tunneld_devices
@@ -189,7 +189,11 @@ class LockdownCommand(BaseServiceProviderCommand):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.usbmux_address = None
+        self.mobdev2_option = None
         self.params[:0] = [
+            click.Option(('mobdev2', '--mobdev2'), callback=self.mobdev2, expose_value=False, default=None,
+                         help='Use bonjour browse for mobdev2 devices. Expected value IP address of the interface to '
+                              'use. Leave empty to browse through all interfaces'),
             click.Option(('usbmux', '--usbmux'), callback=self.usbmux, expose_value=False,
                          envvar=USBMUX_ENV_VAR, help=USBMUX_OPTION_HELP),
             click.Option(('lockdown_service_provider', '--udid'), envvar=UDID_ENV_VAR, callback=self.udid,
@@ -197,12 +201,22 @@ class LockdownCommand(BaseServiceProviderCommand):
                               f' option as well'),
         ]
 
+    async def get_mobdev2_devices(self, udid: Optional[str] = None, ips: Optional[list[str]] = None) \
+            -> list[TcpLockdownClient]:
+        result = []
+        async for ip, lockdown in get_mobdev2_lockdowns(udid=udid, ips=ips):
+            result.append(lockdown)
+        return result
+
+    def mobdev2(self, ctx, param: str, value: Optional[str] = None) -> None:
+        self.mobdev2_option = value
+
     def usbmux(self, ctx, param: str, value: Optional[str] = None) -> None:
         if value is None:
             return
         self.usbmux_address = value
 
-    def udid(self, ctx, param: str, value: str) -> Optional[LockdownClient]:
+    def udid(self, ctx, param: str, value: Optional[str]) -> Optional[LockdownClient]:
         if is_invoked_for_completion():
             # prevent lockdown connection establishment when in autocomplete mode
             return
@@ -210,6 +224,19 @@ class LockdownCommand(BaseServiceProviderCommand):
         if self.service_provider is not None:
             return self.service_provider
 
+        if self.mobdev2_option is not None:
+            devices = asyncio.run(self.get_mobdev2_devices(
+                udid=value if value else None, ips=[self.mobdev2_option] if self.mobdev2_option else None))
+            if not devices:
+                raise NoDeviceConnectedError()
+
+            if len(devices) == 1:
+                self.service_provider = devices[0]
+                return self.service_provider
+
+            self.service_provider = prompt_device_list(devices)
+            return self.service_provider
+
         if value is not None:
             return create_using_usbmux(serial=value)
 

{pymobiledevice3-4.25.1 → pymobiledevice3-4.26.0}/pymobiledevice3/lockdown.py

@@ -682,6 +682,7 @@ class TcpLockdownClient(LockdownClient):
                          port)
         self._keep_alive = keep_alive
         self.hostname = hostname
+        self.identifier = hostname
 
     def _create_service_connection(self, port: int) -> ServiceConnection:
         return ServiceConnection.create_using_tcp(self.hostname, port, keep_alive=self._keep_alive)
@@ -842,7 +843,7 @@ def create_using_remote(service: ServiceConnection, identifier: str = None, labe
 
 async def get_mobdev2_lockdowns(
         udid: Optional[str] = None, pair_records: Optional[Path] = None, only_paired: bool = False,
-        timeout: float = DEFAULT_BONJOUR_TIMEOUT) \
+        timeout: float = DEFAULT_BONJOUR_TIMEOUT, ips: Optional[list[str]] = None) \
         -> AsyncIterable[tuple[str, TcpLockdownClient]]:
     records = {}
     if pair_records is None:
@@ -858,7 +859,7 @@ async def get_mobdev2_lockdowns(
         records[record['WiFiMACAddress']] = record
 
     iterated_ips = set()
-    for answer in await browse_mobdev2(timeout=timeout):
+    for answer in await browse_mobdev2(timeout=timeout, ips=ips):
         if '@' not in answer.name:
             continue
         wifi_mac_address = answer.name.split('@', 1)[0]

{pymobiledevice3-4.25.1 → pymobiledevice3-4.26.0}/pymobiledevice3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.25.1
+Version: 4.26.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>