Skip to content

Commit

Permalink
Fix local-cli assetRegistryPath and middlewares
Browse files Browse the repository at this point in the history
  • Loading branch information
janicduplessis committed Jul 13, 2018
1 parent 78137bc commit bb1acc3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
4 changes: 2 additions & 2 deletions local-cli/server/middleware/MiddlewareManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const indexPageMiddleware = require('./indexPage');
const copyToClipBoardMiddleware = require('./copyToClipBoardMiddleware');
const loadRawBodyMiddleware = require('./loadRawBodyMiddleware');
const openStackFrameInEditorMiddleware = require('./openStackFrameInEditorMiddleware');
const statusPageMiddleware = require('./statusPageMiddleware.js');
const systraceProfileMiddleware = require('./systraceProfileMiddleware.js');
const statusPageMiddleware = require('./statusPageMiddleware');
const systraceProfileMiddleware = require('./systraceProfileMiddleware');
const getDevToolsMiddleware = require('./getDevToolsMiddleware');

type Options = {
Expand Down
15 changes: 15 additions & 0 deletions local-cli/server/runServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ const Metro = require('metro');

const {Terminal} = require('metro-core');

const messageSocket = require('./util/messageSocket');
const morgan = require('morgan');
const path = require('path');
const webSocketProxy = require('./util/webSocketProxy');
const MiddlewareManager = require('./middleware/MiddlewareManager');

const {ASSET_REGISTRY_PATH} = require('../core/Constants');

import type {ConfigT} from 'metro';

export type Args = {|
Expand Down Expand Up @@ -55,6 +59,9 @@ async function runServer(args: Args, config: ConfigT) {
const serverInstance = await Metro.runServer({
config: {
...config,
assetRegistryPath: ASSET_REGISTRY_PATH,
enhanceMiddleware: middleware =>
middlewareManager.getConnectInstance().use(middleware),
hmrEnabled: true,
maxWorkers: args.maxWorkers,
reporter,
Expand All @@ -70,6 +77,14 @@ async function runServer(args: Args, config: ConfigT) {
port: args.port,
});

const wsProxy = webSocketProxy.attachToServer(
serverInstance,
'/debugger-proxy',
);
const ms = messageSocket.attachToServer(serverInstance, '/message');
middlewareManager.attachDevToolsSocket(wsProxy);
middlewareManager.attachDevToolsSocket(ms);

// In Node 8, the default keep-alive for an HTTP connection is 5 seconds. In
// early versions of Node 8, this was implemented in a buggy way which caused
// some HTTP responses (like those containing large JS bundles) to be
Expand Down

0 comments on commit bb1acc3

Please sign in to comment.