Restore metro functionality [4/n]

Summary: Restored Metro functionality; progress reports, metro logs, RN/Hermes debugging, reload / dev menu button

Reviewed By: passy

Differential Revision: D31055958

fbshipit-source-id: c243035c343c14718a9afe275c8f5f36a1aa3a94
This commit is contained in:
Michel Weststrate
2021-09-22 09:01:29 -07:00
committed by Facebook GitHub Bot
parent 3428ce2968
commit 4463e7ede2
6 changed files with 32 additions and 21 deletions

View File

@@ -30,8 +30,7 @@ const CONNECTED = 'DevTools connected';
const DEV_TOOLS_PORT = 8097; // hardcoded in RN
interface MetroDevice {
ws?: WebSocket;
sendCommand(command: string, params?: any): void;
sendMetroCommand(command: string, params?: any): void;
}
function findGlobalDevTools(): Promise<string | undefined> {
@@ -66,7 +65,7 @@ enum ConnectionStatus {
export function devicePlugin(client: DevicePluginClient) {
const metroDevice: MetroDevice = client.device.realDevice;
if (!metroDevice.sendCommand || !('ws' in metroDevice)) {
if (!metroDevice.sendMetroCommand) {
throw new Error('Invalid metroDevice');
}
@@ -196,12 +195,12 @@ export function devicePlugin(client: DevicePluginClient) {
return;
// Waiting for connection, but we do have an active Metro connection, lets force a reload to enter Dev Mode on app
// prettier-ignore
case connectionStatus.get() === ConnectionStatus.Initializing && !!metroDevice?.ws:
case connectionStatus.get() === ConnectionStatus.Initializing:
setStatus(
ConnectionStatus.WaitingForReload,
"Sending 'reload' to Metro to force the DevTools to connect...",
);
metroDevice!.sendCommand('reload');
metroDevice!.sendMetroCommand('reload');
startPollForConnection(2000);
return;
// Waiting for initial connection, but no WS bridge available
@@ -295,12 +294,12 @@ export function Component() {
<Typography.Text type="secondary">{statusMessage}</Typography.Text>
) : null}
{(connectionStatus === ConnectionStatus.WaitingForReload &&
instance.metroDevice?.ws) ||
instance.metroDevice) ||
connectionStatus === ConnectionStatus.Error ? (
<Button
size="small"
onClick={() => {
instance.metroDevice?.sendCommand('reload');
instance.metroDevice?.sendMetroCommand('reload');
instance.bootDevTools();
}}>
Retry