Move debugger client code to its own folder

Reviewed By: davidaurelio

Differential Revision: D5899764

fbshipit-source-id: 3498dd71a11b47841a492cf77df7c887404c1719
This commit is contained in:
Rafael Oleza 2017-09-26 05:07:57 -07:00 committed by Facebook Github Bot
parent 31904d523d
commit e6596dc102
4 changed files with 17 additions and 19 deletions

View File

@ -5,12 +5,12 @@
* This source code is licensed under the BSD-style license found in the * This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant * LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory. * of patent rights can be found in the PATENTS file in the same directory.
*
* @format
*/ */
'use strict'; 'use strict';
const fs = require('fs');
const launchChrome = require('../util/launchChrome'); const launchChrome = require('../util/launchChrome');
const path = require('path');
const {exec} = require('child_process'); const {exec} = require('child_process');
@ -21,7 +21,8 @@ function launchChromeDevTools(port) {
} }
function escapePath(pathname) { function escapePath(pathname) {
return '"' + pathname + '"'; // " Can escape paths with spaces in OS X, Windows, and *nix // " Can escape paths with spaces in OS X, Windows, and *nix
return '"' + pathname + '"';
} }
function launchDevTools({port, projectRoots}, isChromeConnected) { function launchDevTools({port, projectRoots}, isChromeConnected) {
@ -31,7 +32,7 @@ function launchDevTools({port, projectRoots}, isChromeConnected) {
var projects = projectRoots.map(escapePath).join(' '); var projects = projectRoots.map(escapePath).join(' ');
var command = customDebugger + ' ' + projects; var command = customDebugger + ' ' + projects;
console.log('Starting custom debugger by executing: ' + command); console.log('Starting custom debugger by executing: ' + command);
exec(command, function (error, stdout, stderr) { exec(command, function(error, stdout, stderr) {
if (error !== null) { if (error !== null) {
console.log('Error while starting custom debugger: ' + error); console.log('Error while starting custom debugger: ' + error);
} }
@ -44,29 +45,22 @@ function launchDevTools({port, projectRoots}, isChromeConnected) {
module.exports = function(options, isChromeConnected) { module.exports = function(options, isChromeConnected) {
return function(req, res, next) { return function(req, res, next) {
if (req.url === '/debugger-ui') { if (req.url === '/launch-safari-devtools') {
var debuggerPath = path.join(__dirname, '..', 'util', 'debugger.html');
res.writeHead(200, {'Content-Type': 'text/html'});
fs.createReadStream(debuggerPath).pipe(res);
} else if (req.url === '/debuggerWorker.js') {
var workerPath = path.join(__dirname, '..', 'util', 'debuggerWorker.js');
res.writeHead(200, {'Content-Type': 'application/javascript'});
fs.createReadStream(workerPath).pipe(res);
} else if (req.url === '/launch-safari-devtools') {
// TODO: remove `console.log` and dev tools binary // TODO: remove `console.log` and dev tools binary
console.log( console.log(
'We removed support for Safari dev-tools. ' + 'We removed support for Safari dev-tools. ' +
'If you still need this, please let us know.' 'If you still need this, please let us know.',
); );
} else if (req.url === '/launch-chrome-devtools') { } else if (req.url === '/launch-chrome-devtools') {
// TODO: Remove this case in the future // TODO: Remove this case in the future
console.log( console.log(
'The method /launch-chrome-devtools is deprecated. You are ' + 'The method /launch-chrome-devtools is deprecated. You are ' +
' probably using an application created with an older CLI with the ' + ' probably using an application created with an older CLI with the ' +
' packager of a newer CLI. Please upgrade your application: ' + ' packager of a newer CLI. Please upgrade your application: ' +
'https://facebook.github.io/react-native/docs/upgrading.html'); 'https://facebook.github.io/react-native/docs/upgrading.html',
launchDevTools(options, isChromeConnected); );
res.end('OK'); launchDevTools(options, isChromeConnected);
res.end('OK');
} else if (req.url === '/launch-js-devtools') { } else if (req.url === '/launch-js-devtools') {
launchDevTools(options, isChromeConnected); launchDevTools(options, isChromeConnected);
res.end('OK'); res.end('OK');

View File

@ -97,6 +97,10 @@ function runServer(
const app = connect() const app = connect()
.use(loadRawBodyMiddleware) .use(loadRawBodyMiddleware)
.use(connect.compress()) .use(connect.compress())
.use(
'/debugger-ui',
connect.static(path.join(__dirname, 'util', 'debugger-ui')),
)
.use( .use(
getDevToolsMiddleware(args, () => wsProxy && wsProxy.isChromeConnected()), getDevToolsMiddleware(args, () => wsProxy && wsProxy.isChromeConnected()),
) )