fix(ios): prefer USB entries for duplicate usbmux devices - #3191
Conversation
Co-authored-by: Suyash Bansal <139199337+suyash-ls@users.noreply.github.com> Signed-off-by: Arthur031221 <levi74108520963@gmail.com>
|
The change in 054390e looks correct: the usbmux ListDevices parser now prefers the USB entry when a device shows up twice, and the unit test covers it. The one reported check is green and no checks are failing. There are no conflicts. I did not run the tests locally. I took the Connect DeviceID recording in One thing is still needed before this is ready: a run on a physical iPhone that is cabled with Wi-Fi sync on, showing that the USB entry is now selected and the reported timeouts are gone. @suyash-ls, could you try this branch on your setup? |
|
Thanks for the fix, @Arthur031221, and for the review, @thymikee. I tested this branch on a physical iPhone. Setup
Results
What I did not check
On my Mac this fixes the problem from #3149. |
|
Thanks, @suyash-ls. Your run on a cabled iPhone with Wi-Fi sync on is the validation I asked for at 054390e. With the Network entry listed first, |
Summary
With Wi-Fi sync enabled, a cabled iPhone's Network entry could be selected before its USB entry. Prefer the matching USB entry, keeping the first match as a fallback.
Builds on the code @suyash-ls posted in #3149. Two files changed. Closes #3149.
Validation
At
249adafd, added socket tests for duplicate entries and fallback selection.pnpm check:affected --runpasses. CI results are not verified. No physical iPhone run on this Linux host, so the reported Wi-Fi timeouts remain unverified locally.Co-authored-by: Suyash Bansal 139199337+suyash-ls@users.noreply.github.com