Change default Inspector Proxy port to 8081

Reviewed By: cwdick

Differential Revision: D14745974

fbshipit-source-id: f4b3b158f55c6f5f1b3d9cc2528c5ddb59774a8b

Author: Hypuk

packages/metro-inspector-proxy/src/InspectorProxy.js

@@ -42,7 +42,7 @@ class InspectorProxy {
   // Internal counter for device IDs -- just gets incremented for each new device.
   _deviceCounter: number = 0;
 
-  // We store server's address with port (like '127.0.0.1:8082') to be able to build URLs
+  // We store server's address with port (like '127.0.0.1:8081') to be able to build URLs
   // (devtoolsFrontendUrl and webSocketDebuggerUrl) for page descriptions. These URLs are used
   // by debugger to know where to connect.
   _serverAddressWithPort: string = '';

packages/metro-inspector-proxy/src/cli.js

@@ -18,7 +18,7 @@ yargs.option('port', {
   alias: 'p',
   describe: 'port to run inspector proxy on',
   type: 'number',
-  default: 8082,
+  default: 8081,
 });
 
 runInspectorProxy((yargs.argv.port: any));

packages/metro/src/index.js

@@ -24,7 +24,7 @@ const outputBundle = require('./shared/output/bundle');
 
 const {readFile} = require('fs-extra');
 const {loadConfig, mergeConfig, getDefaultConfig} = require('metro-config');
-const {runInspectorProxy} = require('metro-inspector-proxy');
+const {InspectorProxy} = require('metro-inspector-proxy');
 
 import type {Graph} from './DeltaBundler';
 import type {CustomTransformOptions} from './JSTransformer/worker';
@@ -154,13 +154,9 @@ exports.runServer = async (
     }
   }
 
+  let inspectorProxy: ?InspectorProxy = null;
   if (config.server.runInspectorProxy) {
-    // Port number is hardcoded here now for a transition state.
-    // When Inspector Proxy will be ready to use we will change
-    // this to use the same port as Metro (this will require
-    // creating new InspectorProxy and attaching it to httpServer
-    // instead of creating new HTTP Server).
-    runInspectorProxy(8082);
+    inspectorProxy = new InspectorProxy();
   }
 
   let httpServer;
@@ -192,6 +188,16 @@ exports.runServer = async (
         if (hmrEnabled) {
           attachHmrServer(httpServer);
         }
+
+        if (inspectorProxy) {
+          inspectorProxy.addWebSocketListener(httpServer);
+
+          // TODO(hypuk): Refactor inspectorProxy.processRequest into separate request handlers
+          // so that we could provide routes (/json/list and /json/version) here.
+          // Currently this causes Metro to give warning about T31407894.
+          serverApp.use(inspectorProxy.processRequest.bind(inspectorProxy));
+        }
+
         resolve(httpServer);
       });