Skip to content
Open
Changes from all commits
Commits
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
42 changes: 42 additions & 0 deletions packages/android/src/scrcpy-device-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,48 @@ export class ScrcpyDeviceAdapter {
const adbClient = new AdbServerClient(
new AdbServerNodeTcpConnector({ host: '127.0.0.1', port: 5037 }),
);

// Workaround for @yume-chan/adb multi-device bug:
// getDeviceFeatures() uses a two-step protocol that fails when multiple
// devices are connected. Override it to use the one-shot format.
// See: https://github.com/yume-chan/ya-webadb/pull/849
const deviceId = this.deviceId;
const originalGetDeviceFeatures =
adbClient.getDeviceFeatures.bind(adbClient);
adbClient.getDeviceFeatures = async function (device: unknown) {
try {
return await originalGetDeviceFeatures(device);
} catch (error) {
if (
error instanceof Error &&
/more than one device\/emulator/i.test(error.message)
) {
const service = AdbServerClient.formatDeviceService(
device as Parameters<
typeof AdbServerClient.formatDeviceService
>[0],
'features',
);
const connection = await adbClient.createConnection(service);
try {
const featuresString = await connection.readString();
const features = featuresString.split(',');
const devices = await adbClient.getDevices();
const info = devices.find(
(d: { serial: string }) => d.serial === deviceId,
);
return {
transportId: info?.transportId,
features,
};
} finally {
await connection.dispose();
}
}
throw error;
}
};

const adb = new Adb(
await adbClient.createTransport({ serial: this.deviceId }),
);
Expand Down