jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reconnect when adb server gets killed

Browse Source 
Summary:
Flipper tracks devices on an adb connection. If the adb server gets killed, it deletes all devices, but doesn't attempt to reconnect.
This gets it to rety after 500ms.

Reviewed By: priteshrnandgaonkar

Differential Revision: D10526974

fbshipit-source-id: a2101067f2245b728f458fc5e06dc68833c5e772
This commit is contained in:
John Knox
2018-10-24 08:10:26 -07:00
committed by Facebook Github Bot
parent bd25e5e97c
commit d1a1c299dc
1 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/dispatcher/androidDevice.js
View File

@@ -12,7 +12,7 @@ import type BaseDevice from '../devices/BaseDevice';
import type Logger from '../fb-stubs/Logger.js'; import type Logger from '../fb-stubs/Logger.js';
const adb = require('adbkit-fb'); const adb = require('adbkit-fb');
function createDecive(client, device): Promise<AndroidDevice> { function createDevice(client, device): Promise<AndroidDevice> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const type = const type =
device.type !== 'device' || device.id.startsWith('emulator') device.type !== 'device' || device.id.startsWith('emulator')
@@ -56,80 +56,85 @@ function getRunningEmulatorName(id: string): Promise<?string> {
export default (store: Store, logger: Logger) => { export default (store: Store, logger: Logger) => {
const client = adb.createClient(); const client = adb.createClient();
// get emulators const watchAndroidDevices = () => {
child_process.exec( // get emulators
'$ANDROID_HOME/tools/emulator -list-avds', child_process.exec(
(error: ?Error, data: ?string) => { '$ANDROID_HOME/tools/emulator -list-avds',
if (error == null && data != null) { (error: ?Error, data: ?string) => {
if (error != null || data == null) {
console.error(error || 'Failed to list AVDs');
return;
}
const payload = data.split('\n').filter(Boolean); const payload = data.split('\n').filter(Boolean);
store.dispatch({ store.dispatch({
type: 'REGISTER_ANDROID_EMULATORS', type: 'REGISTER_ANDROID_EMULATORS',
payload, payload,
}); });
} },
}, );
);
client client
.trackDevices() .trackDevices()
.then(tracker => { .then(tracker => {
tracker.on('error', err => { tracker.on('error', err => {
if (err.message === 'Connection closed') { if (err.message === 'Connection closed') {
// adb server has shutdown, remove all android devices // adb server has shutdown, remove all android devices
const {connections} = store.getState(); const {connections} = store.getState();
const deviceIDsToRemove: Array<string> = connections.devices const deviceIDsToRemove: Array<string> = connections.devices
.filter((device: BaseDevice) => device instanceof AndroidDevice) .filter((device: BaseDevice) => device instanceof AndroidDevice)
.map((device: BaseDevice) => device.serial); .map((device: BaseDevice) => device.serial);
store.dispatch({ store.dispatch({
type: 'UNREGISTER_DEVICES', type: 'UNREGISTER_DEVICES',
payload: new Set(deviceIDsToRemove), payload: new Set(deviceIDsToRemove),
}); });
console.error( console.error('adb server was shutdown');
'adb server shutdown. Run `adb start-server` and restart Flipper.', setTimeout(watchAndroidDevices, 500);
); } else {
} else { throw err;
throw err; }
} });
});
tracker.on('add', async device => { tracker.on('add', async device => {
if (device.type !== 'offline') { if (device.type !== 'offline') {
const androidDevice = await createDecive(client, device); const androidDevice = await createDevice(client, device);
store.dispatch({ store.dispatch({
type: 'REGISTER_DEVICE', type: 'REGISTER_DEVICE',
payload: androidDevice, payload: androidDevice,
}); });
} }
}); });
tracker.on('change', async device => { tracker.on('change', async device => {
if (device.type === 'offline') { if (device.type === 'offline') {
store.dispatch({
type: 'UNREGISTER_DEVICES',
payload: new Set([device.id]),
});
} else {
const androidDevice = await createDevice(client, device);
store.dispatch({
type: 'REGISTER_DEVICE',
payload: androidDevice,
});
}
});
tracker.on('remove', device => {
store.dispatch({ store.dispatch({
type: 'UNREGISTER_DEVICES', type: 'UNREGISTER_DEVICES',
payload: new Set([device.id]), payload: new Set([device.id]),
}); });
});
})
.catch(err => {
if (err.code === 'ECONNREFUSED') {
// adb server isn't running
} else { } else {
const androidDevice = await createDecive(client, device); throw err;
store.dispatch({
type: 'REGISTER_DEVICE',
payload: androidDevice,
});
} }
}); });
};
tracker.on('remove', device => { watchAndroidDevices();
store.dispatch({
type: 'UNREGISTER_DEVICES',
payload: new Set([device.id]),
});
});
})
.catch(err => {
if (err.code === 'ECONNREFUSED') {
// adb server isn't running
} else {
throw err;
}
});
}; };