Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevents JS Debugger issues with CORS #17720

Closed
wants to merge 11 commits into from
Closed

Prevents JS Debugger issues with CORS #17720

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
24c3c78
Prevents JS Debugger issues with CORS
Jan 23, 2018
23217a8
Remove rogue host declaration
Jan 23, 2018
acdb88c
Fixes issue with incorrect parameters
Jan 24, 2018
5dfbcca
Merge branch 'master' into fix/debugger-cors
Jan 24, 2018
977f7f2
Prevents JS Debugger issues with CORS
Jan 23, 2018
ca28ffe
Remove rogue host declaration
Jan 23, 2018
501edf6
Fix permissions on test script
mzlee Jan 24, 2018
aa1d00d
Backed out changeset 409acf8d3356
elicwhite Jan 24, 2018
3c7c4cc
The New <Text> on iOS
shergin Jan 24, 2018
ec8b69e
Fixes issue with incorrect parameters
Jan 24, 2018
c117098
Merge branch 'fix/debugger-cors' of https://github.com/njbmartin/reac…
Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions local-cli/server/middleware/getDevToolsMiddleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const launchChrome = require('../util/launchChrome');

const {exec} = require('child_process');

function launchChromeDevTools(port, args = '') {
var debuggerURL = 'http://localhost:' + port + '/debugger-ui' + args;
function launchChromeDevTools(host, args = '') {
var debuggerURL = 'http://' + host + '/debugger-ui' + args;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why eslint does not throw error when using "var" ?

Copy link
Contributor

@janicduplessis janicduplessis Jan 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are still a lot of files that are not converted to es6 so the rule is not enabled.

console.log('Launching Dev Tools...');
launchChrome(debuggerURL);
}
Expand All @@ -25,7 +25,7 @@ function escapePath(pathname) {
return '"' + pathname + '"';
}

function launchDevTools({port, projectRoots}, isChromeConnected) {
function launchDevTools({host, projectRoots}, isChromeConnected) {
// Explicit config always wins
var customDebugger = process.env.REACT_DEBUGGER;
if (customDebugger) {
Expand All @@ -39,12 +39,13 @@ function launchDevTools({port, projectRoots}, isChromeConnected) {
});
} else if (!isChromeConnected()) {
// Dev tools are not yet open; we need to open a session
launchChromeDevTools(port);
launchChromeDevTools(host);
}
}

module.exports = function(options, isChromeConnected) {
return function(req, res, next) {
var host = req.headers.host;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. https://github.com/facebook/react-native/pull/17720/files#r163449140

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Later it might be nice to honor the protocol too (ex: setting up an HTTPS reverse proxy in front of the packager server) and to use something like Express’s approach to inferring the protocol: https://github.com/expressjs/express/blob/master/lib/request.js#L306

if (req.url === '/launch-safari-devtools') {
// TODO: remove `console.log` and dev tools binary
console.log(
Expand All @@ -62,7 +63,7 @@ module.exports = function(options, isChromeConnected) {
launchDevTools(options, isChromeConnected);
res.end('OK');
} else if (req.url === '/launch-js-devtools') {
launchDevTools(options, isChromeConnected);
launchDevTools(host, options, isChromeConnected);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think maybe here should be

      launchDevTools({...options, host}, isChromeConnected);

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR works here after this modify.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. Messed up the copy pasta

res.end('OK');
} else {
next();
Expand Down