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

Jump to bottom

Fix Broken Socket on Client for Custom/Random Port Numbers #1060

Merged
merged 2 commits into from
Aug 30, 2017
Merged

Fix Broken Socket on Client for Custom/Random Port Numbers #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b41898
moving polyfills to the top, sockjs should init only after server has…
shellscape Aug 29, 2017
514b188
fixes #1059: custom/random ports break sockjs url in the client
shellscape Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/webpack-dev-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
'use strict';

/* eslint global-require: off, import/order: off, no-console: off */
require('../lib/polyfills');

const fs = require('fs');
const net = require('net');
Expand Down
6 changes: 5 additions & 1 deletion client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ if (typeof __resourceQuery === 'string' && __resourceQuery) {
urlParts = url.parse((scriptHost || '/'), false, true);
}

if (!urlParts.port || urlParts.port === '0') {
urlParts.port = self.location.port;
}

let hot = false;
let initial = true;
let currentHash = '';
Expand Down Expand Up @@ -176,7 +180,7 @@ const socketUrl = url.format({
protocol,
auth: urlParts.auth,
hostname,
port: (urlParts.port === '0') ? self.location.port : urlParts.port,
port: urlParts.port,
pathname: urlParts.path == null || urlParts.path === '/' ? '/sockjs-node' : urlParts.path
});

Expand Down
76 changes: 42 additions & 34 deletions lib/Server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

/* eslint no-console: off, func-names: off */
require('./polyfills');

const fs = require('fs');
const http = require('http');
Expand All @@ -22,8 +23,6 @@ const webpackDevMiddleware = require('webpack-dev-middleware');
const OptionsValidationError = require('./OptionsValidationError');
const optionsSchema = require('./optionsSchema.json');

require('./polyfills');

const clientStats = { errorDetails: false };

function Server(compiler, options) {
Expand Down Expand Up @@ -483,49 +482,58 @@ Server.prototype.checkHost = function (headers) {
};

// delegate listen call and init sockjs
Server.prototype.listen = function (port, hostname) {
Server.prototype.listen = function (port, hostname, fn) {
this.listenHostname = hostname;
// eslint-disable-next-line
const returnValue = this.listeningApp.listen.apply(this.listeningApp, arguments);
const sockServer = sockjs.createServer({
// Use provided up-to-date sockjs-client
sockjs_url: '/__webpack_dev_server__/sockjs.bundle.js',
// Limit useless logs
log(severity, line) {
if (severity === 'error') {
console.log(line);
}
}
});
sockServer.on('connection', (conn) => {
if (!conn) return;
if (!this.checkHost(conn.headers)) {
this.sockWrite([conn], 'error', 'Invalid Host header');
conn.close();
return;
}
this.sockets.push(conn);

conn.on('close', () => {
const connIndex = this.sockets.indexOf(conn);
if (connIndex >= 0) {
this.sockets.splice(connIndex, 1);
const returnValue = this.listeningApp.listen(port, hostname, (err) => {
const sockServer = sockjs.createServer({
// Use provided up-to-date sockjs-client
sockjs_url: '/__webpack_dev_server__/sockjs.bundle.js',
// Limit useless logs
log(severity, line) {
if (severity === 'error') {
console.log(line);
}
}
});

if (this.clientLogLevel) { this.sockWrite([conn], 'log-level', this.clientLogLevel); }
sockServer.on('connection', (conn) => {
console.log('connection.remotePort', conn.remotePort);
if (!conn) return;
if (!this.checkHost(conn.headers)) {
this.sockWrite([conn], 'error', 'Invalid Host header');
conn.close();
return;
}
this.sockets.push(conn);

if (this.clientOverlay) { this.sockWrite([conn], 'overlay', this.clientOverlay); }
conn.on('close', () => {
const connIndex = this.sockets.indexOf(conn);
if (connIndex >= 0) {
this.sockets.splice(connIndex, 1);
}
});

if (this.hot) this.sockWrite([conn], 'hot');
if (this.clientLogLevel) { this.sockWrite([conn], 'log-level', this.clientLogLevel); }

if (!this._stats) return;
this._sendStats([conn], this._stats.toJson(clientStats), true);
});
if (this.clientOverlay) { this.sockWrite([conn], 'overlay', this.clientOverlay); }

if (this.hot) this.sockWrite([conn], 'hot');

if (!this._stats) return;
this._sendStats([conn], this._stats.toJson(clientStats), true);
});

sockServer.installHandlers(this.listeningApp, {
prefix: '/sockjs-node'
sockServer.installHandlers(this.listeningApp, {
prefix: '/sockjs-node'
});

if (fn) {
fn.call(this.listeningApp, err);
}
});

return returnValue;
};

Expand Down