From b29ced9d5275ee6e77b4b3db6e0385808acf3d12 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Thu, 8 Jun 2023 11:03:44 -0700 Subject: [PATCH] Refactor open functionality into function Summary: ^ Reviewed By: passy Differential Revision: D46557867 fbshipit-source-id: b741288d38c96288b41d201ac9c229176b9eb197 --- desktop/flipper-server/src/index.tsx | 56 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx index 6c6ac7d47..fd8927f4c 100644 --- a/desktop/flipper-server/src/index.tsx +++ b/desktop/flipper-server/src/index.tsx @@ -234,6 +234,34 @@ async function start() { await attachDevServer(app, server, socket, rootPath); } await readyForIncomingConnections(flipperServer, companionEnv); + + console.log('[flipper-server] listening at port ' + chalk.green(argv.port)); +} + +async function launch() { + if (!argv.tcp) { + return; + } + + let token: string | undefined; + if (await hasAuthToken()) { + token = await getAuthToken(); + } + + const searchParams = new URLSearchParams({token: token ?? ''}); + const url = new URL(`http://localhost:${argv.port}?${searchParams}`); + + console.log('Go to: ' + chalk.green(chalk.bold(url))); + if (!argv.open) { + return; + } + + if (argv.bundler) { + open(url.toString()); + } else { + const path = await findInstallation(); + open(path ?? url.toString()); + } } process.on('uncaughtException', (error) => { @@ -254,33 +282,7 @@ process.on('unhandledRejection', (reason, promise) => { }); start() - .then(async () => { - if (!argv.tcp) { - return; - } - - console.log('[flipper-server] listening at port ' + chalk.green(argv.port)); - - let token: string | undefined; - if (await hasAuthToken()) { - token = await getAuthToken(); - } - - const searchParams = new URLSearchParams({token: token ?? ''}); - const url = new URL(`http://localhost:${argv.port}?${searchParams}`); - - console.log('[flipper-server] Go to: ' + chalk.green(chalk.bold(url))); - if (!argv.open) { - return; - } - - if (argv.bundler) { - open(url.toString()); - } else { - const path = await findInstallation(); - open(path ?? url.toString()); - } - }) + .then(launch) .catch((e) => { console.error(chalk.red('Server startup error: '), e); process.exit(1);