Skip to content

fix(ios): prefer USB entries for duplicate usbmux devices #3191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thymikee merged 1 commit into from
Oct 4, 2026
Merged

fix(ios): prefer USB entries for duplicate usbmux devices #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions packages/platform-apple/src/runner/__tests__/runner-usbmux.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,57 @@ test('never matches a different device whose UDID merely shares a prefix', async
assert.equal(server.connectedDeviceId(), undefined);
});

test.each([
{
name: 'prefers USB when Network is listed first',
devices: [
{ deviceId: 552, udid: DEVICE_UDID, connectionType: 'Network' },
{ deviceId: 551, udid: DEVICE_UDID, connectionType: 'USB' },
],
expectedDeviceId: 551,
},
{
name: 'prefers USB when USB is listed first',
devices: [
{ deviceId: 551, udid: DEVICE_UDID, connectionType: 'USB' },
{ deviceId: 552, udid: DEVICE_UDID, connectionType: 'Network' },
],
expectedDeviceId: 551,
},
{
name: 'uses the first Network match when USB is absent',
devices: [
{ deviceId: 552, udid: DEVICE_UDID, connectionType: 'Network' },
{ deviceId: 553, udid: DEVICE_UDID, connectionType: 'Network' },
],
expectedDeviceId: 552,
},
{
name: 'ignores USB entries for a different UDID',
devices: [
{ deviceId: 552, udid: DEVICE_UDID, connectionType: 'Network' },
{ deviceId: 551, udid: `${DEVICE_UDID}0`, connectionType: 'USB' },
],
expectedDeviceId: 552,
},
{
name: 'ignores USB entries with an invalid device ID',
devices: [
{ deviceId: 552, udid: DEVICE_UDID, connectionType: 'Network' },
{ deviceId: 0, udid: DEVICE_UDID, connectionType: 'USB' },
],
expectedDeviceId: 552,
},
])('$name', async ({ devices, expectedDeviceId }) => {
const socketPath = await createSocketPath(socketDirectories);
const server = await serveUsbmuxDevices(socketPath, devices, 3);

const error = await postThroughFakeUsbmux(socketPath, DEVICE_UDID);

assert.equal((error as AppError).code, 'COMMAND_FAILED');
assert.equal(server.connectedDeviceId(), expectedDeviceId);
});

test('treats a device usbmuxd no longer knows as unattached so a tunnel fallback can run', async () => {
const socketPath = await createSocketPath(socketDirectories);
// Result 2 is what the real daemon answers for an unknown DeviceID.
Expand Down
11 changes: 9 additions & 2 deletions packages/platform-apple/src/runner/runner-usbmux-protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,18 @@ function buildPlistMessage(
}

function readDeviceIdFromList(xml: string, udid: string): number | undefined {
let fallback: number | undefined;
for (const node of walkXmlNodes(parseXmlDocumentSync(xml))) {
const device = readListedDevice(node);
if (device?.udid === udid) return device.id;
if (device?.udid !== udid) continue;
const connectionType = readDictEntry(
readDictEntry(node, 'Properties')!,
'ConnectionType',
)?.text;
if (connectionType === 'USB') return device.id;
fallback ??= device.id;
}
return undefined;
return fallback;
}

function readListedDevice(node: XmlNode): { udid: string; id: number } | undefined {
Expand Down
Loading