From c8c3cc1939879f85b7a4b7e407ab749045a8c232 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 25 Oct 2019 18:55:29 -0700 Subject: [PATCH 1/2] Properly handle --host param for remote debugging --- .../server/middleware/getDevToolsMiddleware.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts b/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts index 9f13b2ba5..a3c56fca7 100644 --- a/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts +++ b/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts @@ -9,8 +9,9 @@ import {logger} from '@react-native-community/cli-tools'; import {exec} from 'child_process'; import launchDebugger from '../launchDebugger'; -function launchDefaultDebugger(port: number, args = '') { - const debuggerURL = `http://localhost:${port}/debugger-ui${args}`; +function launchDefaultDebugger(host: string, port: number, args = '') { + const hostname = host || "localhost"; + const debuggerURL = `http://${hostname}:${port}/debugger-ui${args}`; logger.info('Launching Dev Tools...'); launchDebugger(debuggerURL); } @@ -20,10 +21,10 @@ function escapePath(pathname: string) { return `"${pathname}"`; } -type LaunchDevToolsOptions = {port: number; watchFolders: Array}; +type LaunchDevToolsOptions = {host: string, port: number; watchFolders: Array}; function launchDevTools( - {port, watchFolders}: LaunchDevToolsOptions, + {host, port, watchFolders}: LaunchDevToolsOptions, isDebuggerConnected: () => boolean, ) { // Explicit config always wins @@ -32,7 +33,7 @@ function launchDevTools( startCustomDebugger({watchFolders, customDebugger}); } else if (!isDebuggerConnected()) { // Debugger is not yet open; we need to open a session - launchDefaultDebugger(port); + launchDefaultDebugger(host, port); } } From b40044d2e4b72689bcc3b4867ebaa4b6283732d5 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 25 Oct 2019 19:55:51 -0700 Subject: [PATCH 2/2] linting --- .../commands/server/middleware/getDevToolsMiddleware.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts b/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts index a3c56fca7..9e2df8b67 100644 --- a/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts +++ b/packages/cli/src/commands/server/middleware/getDevToolsMiddleware.ts @@ -10,7 +10,7 @@ import {exec} from 'child_process'; import launchDebugger from '../launchDebugger'; function launchDefaultDebugger(host: string, port: number, args = '') { - const hostname = host || "localhost"; + const hostname = host || 'localhost'; const debuggerURL = `http://${hostname}:${port}/debugger-ui${args}`; logger.info('Launching Dev Tools...'); launchDebugger(debuggerURL); @@ -21,7 +21,11 @@ function escapePath(pathname: string) { return `"${pathname}"`; } -type LaunchDevToolsOptions = {host: string, port: number; watchFolders: Array}; +type LaunchDevToolsOptions = { + host: string; + port: number; + watchFolders: Array; +}; function launchDevTools( {host, port, watchFolders}: LaunchDevToolsOptions,