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

Add client logs for different stages

Browse Source 
Summary: ^

Reviewed By: antonk52

Differential Revision: D49973541

fbshipit-source-id: 3bac97fb22586cc49e74dd5deceeb5310a1385bc
This commit is contained in:
Lorenzo Blasa
2023-10-05 22:42:37 -07:00
committed by Facebook GitHub Bot
parent 5b114524d9
commit 541570c8ab
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/flipper-server-client/src/FlipperServerClient.tsx
View File

@@ -69,19 +69,21 @@ export function createFlipperServerWithSocket(
let connected = false; let connected = false;
socket.addEventListener('open', () => { socket.addEventListener('open', () => {
connected = true;
onStateChange(FlipperServerState.CONNECTED);
if (initialConnectionTimeout) { if (initialConnectionTimeout) {
resolve(flipperServer);
clearTimeout(initialConnectionTimeout); clearTimeout(initialConnectionTimeout);
initialConnectionTimeout = undefined; initialConnectionTimeout = undefined;
}
onStateChange(FlipperServerState.CONNECTED); resolve(flipperServer);
connected = true; }
}); });
socket.addEventListener('close', () => { socket.addEventListener('close', () => {
onStateChange(FlipperServerState.DISCONNECTED);
connected = false; connected = false;
onStateChange(FlipperServerState.DISCONNECTED);
pendingRequests.forEach((r) => pendingRequests.forEach((r) =>
r.reject(new Error('flipper-server disconnected')), r.reject(new Error('flipper-server disconnected')),
); );

18
desktop/flipper-ui-browser/src/index.tsx
View File

@@ -43,7 +43,7 @@ async function start() {
console.info( console.info(
'[flipper-client][ui-browser] Token is available: ', '[flipper-client][ui-browser] Token is available: ',
token?.length, token?.length != 0,
); );
const openPlugin = params.get('open-plugin'); const openPlugin = params.get('open-plugin');
@@ -65,6 +65,7 @@ async function start() {
const searchParams = new URLSearchParams({token: token ?? ''}); const searchParams = new URLSearchParams({token: token ?? ''});
console.info('[flipper-client][ui-browser] Create WS client');
const flipperServer = await createFlipperServer( const flipperServer = await createFlipperServer(
location.hostname, location.hostname,
parseInt(location.port, 10), parseInt(location.port, 10),
@@ -72,18 +73,23 @@ async function start() {
(state: FlipperServerState) => { (state: FlipperServerState) => {
switch (state) { switch (state) {
case FlipperServerState.CONNECTING: case FlipperServerState.CONNECTING:
console.info('[flipper-client] Connecting to server');
window.flipperShowMessage?.('Connecting to server...'); window.flipperShowMessage?.('Connecting to server...');
break; break;
case FlipperServerState.CONNECTED: case FlipperServerState.CONNECTED:
console.info('[flipper-client] Connection established with server');
window.flipperHideMessage?.(); window.flipperHideMessage?.();
break; break;
case FlipperServerState.DISCONNECTED: case FlipperServerState.DISCONNECTED:
console.info('[flipper-client] Disconnected from server');
window.flipperShowMessage?.('Waiting for server...'); window.flipperShowMessage?.('Waiting for server...');
break; break;
} }
}, },
); );
console.info('[flipper-client][ui-browser] WS client connected');
flipperServer.on('server-log', (logEntry) => { flipperServer.on('server-log', (logEntry) => {
console[logEntry.type]( console[logEntry.type](
`[${logEntry.namespace}] (${new Date( `[${logEntry.namespace}] (${new Date(
@@ -92,9 +98,17 @@ async function start() {
); );
}); });
console.info('[flipper-client][ui-browser] Waiting for server connection');
await flipperServer.connect(); await flipperServer.connect();
console.info(
'[flipper-client][ui-browser] Connected to server, get configuration',
);
const flipperServerConfig = await flipperServer.exec('get-config'); const flipperServerConfig = await flipperServer.exec('get-config');
console.info(
'[flipper-client][ui-browser] Configuration obtained, initialise render host',
);
initializeRenderHost(flipperServer, flipperServerConfig); initializeRenderHost(flipperServer, flipperServerConfig);
initializePWA(); initializePWA();
@@ -102,6 +116,8 @@ async function start() {
// eslint-disable-next-line import/no-commonjs // eslint-disable-next-line import/no-commonjs
require('flipper-ui-core').startFlipperDesktop(flipperServer); require('flipper-ui-core').startFlipperDesktop(flipperServer);
window.flipperHideMessage?.(); window.flipperHideMessage?.();
console.info('[flipper-client][ui-browser] UI initialised');
} }
start().catch((e) => { start().catch((e) => {