From 5a6b2a4fad1ca1ec2d8bb78abca88712cbe957cf Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Fri, 17 May 2019 01:36:35 -0500 Subject: [PATCH 1/6] refactor(server): encapsulated sockjs --- lib/Server.js | 47 +++++++++++++++++++------------- lib/utils/server/baseServer.js | 3 ++ lib/utils/server/sockjsServer.js | 45 ++++++++++++++++++++++++++++++ lib/utils/server/wsServer.js | 9 ++++++ package-lock.json | 29 ++++++-------------- package.json | 4 +-- 6 files changed, 95 insertions(+), 42 deletions(-) create mode 100644 lib/utils/server/baseServer.js create mode 100644 lib/utils/server/sockjsServer.js create mode 100644 lib/utils/server/wsServer.js diff --git a/lib/Server.js b/lib/Server.js index 5fe6bd5076..e573de99d8 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -12,7 +12,7 @@ const url = require('url'); const http = require('http'); const https = require('https'); const ip = require('ip'); -const sockjs = require('sockjs'); +// const sockjs = require('sockjs'); const semver = require('semver'); const killable = require('killable'); const chokidar = require('chokidar'); @@ -32,6 +32,7 @@ const createDomain = require('./utils/createDomain'); const runBonjour = require('./utils/runBonjour'); const routes = require('./utils/routes'); const schema = require('./options.json'); +const SockjsServer = require('./utils/server/sockjsServer'); // Workaround for sockjs@~0.3.19 // sockjs will remove Origin header, however Origin header is required for checking host. @@ -674,20 +675,27 @@ class Server { } createSocketServer() { - const socket = 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') { - this.log.error(line); - } else { - this.log.debug(line); - } - }, + const socket = new SockjsServer({ + error: this.log.error.bind(this), + debug: this.log.debug.bind(this), + server: this.listeningApp, + path: this.sockPath, }); - - socket.on('connection', (connection) => { + this.socketServer = socket; + // 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') { + // this.log.error(line); + // } else { + // this.log.debug(line); + // } + // }, + // }); + + socket.onConnection((connection) => { if (!connection) { return; } @@ -740,9 +748,9 @@ class Server { this._sendStats([connection], this.getStats(this._stats), true); }); - socket.installHandlers(this.listeningApp, { - prefix: this.sockPath, - }); + // socket.installHandlers(this.listeningApp, { + // prefix: this.sockPath, + // }); } listen(port, hostname, fn) { @@ -765,7 +773,7 @@ class Server { close(cb) { this.sockets.forEach((socket) => { - socket.close(); + this.socketServer.close(socket); }); this.sockets = []; @@ -926,7 +934,8 @@ class Server { // eslint-disable-next-line sockWrite(sockets, type, data) { sockets.forEach((socket) => { - socket.write(JSON.stringify({ type, data })); + this.socketServer.send(socket, JSON.stringify({ type, data })); + // socket.write(JSON.stringify({ type, data })); }); } diff --git a/lib/utils/server/baseServer.js b/lib/utils/server/baseServer.js new file mode 100644 index 0000000000..38f468f583 --- /dev/null +++ b/lib/utils/server/baseServer.js @@ -0,0 +1,3 @@ +'use strict'; + +module.exports = class BaseServer {}; diff --git a/lib/utils/server/sockjsServer.js b/lib/utils/server/sockjsServer.js new file mode 100644 index 0000000000..30fa9d7615 --- /dev/null +++ b/lib/utils/server/sockjsServer.js @@ -0,0 +1,45 @@ +'use strict'; + +/* eslint-disable + class-methods-use-this +*/ +const sockjs = require('sockjs'); +const BaseServer = require('./baseServer'); + +module.exports = class SockjsServer extends BaseServer { + // options has: error (function), debug (function), server (http/s server), path (string) + constructor(options) { + super(); + this.socket = 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') { + options.error(line); + // this.log.error(line); + } else { + options.debug(line); + // this.log.debug(line); + } + }, + }); + + this.socket.installHandlers(options.server, { + prefix: options.path, + }); + } + + send(connection, message) { + connection.write(message); + } + + close(connection) { + connection.close(); + } + + // f should return the resulting connection + onConnection(f) { + this.socket.on('connection', f); + } +}; diff --git a/lib/utils/server/wsServer.js b/lib/utils/server/wsServer.js new file mode 100644 index 0000000000..afba8c6086 --- /dev/null +++ b/lib/utils/server/wsServer.js @@ -0,0 +1,9 @@ +'use strict'; + +/* eslint-disable + no-unused-vars +*/ +const ws = require('ws'); +const BaseServer = require('./baseServer'); + +module.exports = class WSServer extends BaseServer {}; diff --git a/package-lock.json b/package-lock.json index a00516b92d..b2294a11b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5379,8 +5379,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -5417,8 +5416,7 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", @@ -5427,8 +5425,7 @@ }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -5531,8 +5528,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -5542,7 +5538,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5568,7 +5563,6 @@ "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5585,7 +5579,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5669,7 +5662,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5745,8 +5737,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -5776,7 +5767,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5794,7 +5784,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5833,13 +5822,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -9068,7 +9055,7 @@ }, "resolve-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "resolved": false, "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, diff --git a/package.json b/package.json index 918c9c2dc1..f112c627a7 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "url": "^0.11.0", "webpack-dev-middleware": "^3.7.0", "webpack-log": "^2.0.0", + "ws": "^6.2.1", "yargs": "12.0.5" }, "devDependencies": { @@ -101,8 +102,7 @@ "supertest": "^4.0.2", "url-loader": "^1.1.2", "webpack": "^4.31.0", - "webpack-cli": "^3.3.2", - "ws": "^6.2.1" + "webpack-cli": "^3.3.2" }, "peerDependencies": { "webpack": "^4.0.0" From 2f2284352d5d5f02d65e2698700472449e1db791 Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Fri, 17 May 2019 15:30:56 -0500 Subject: [PATCH 2/6] refactor(server): added some comments, removed commented out code --- lib/Server.js | 18 ------------------ lib/utils/server/baseServer.js | 2 ++ lib/utils/server/sockjsServer.js | 2 -- lib/utils/server/wsServer.js | 2 ++ 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/lib/Server.js b/lib/Server.js index e573de99d8..8cf3020a91 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -12,7 +12,6 @@ const url = require('url'); const http = require('http'); const https = require('https'); const ip = require('ip'); -// const sockjs = require('sockjs'); const semver = require('semver'); const killable = require('killable'); const chokidar = require('chokidar'); @@ -682,18 +681,6 @@ class Server { path: this.sockPath, }); this.socketServer = socket; - // 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') { - // this.log.error(line); - // } else { - // this.log.debug(line); - // } - // }, - // }); socket.onConnection((connection) => { if (!connection) { @@ -747,10 +734,6 @@ class Server { this._sendStats([connection], this.getStats(this._stats), true); }); - - // socket.installHandlers(this.listeningApp, { - // prefix: this.sockPath, - // }); } listen(port, hostname, fn) { @@ -935,7 +918,6 @@ class Server { sockWrite(sockets, type, data) { sockets.forEach((socket) => { this.socketServer.send(socket, JSON.stringify({ type, data })); - // socket.write(JSON.stringify({ type, data })); }); } diff --git a/lib/utils/server/baseServer.js b/lib/utils/server/baseServer.js index 38f468f583..dbc8862319 100644 --- a/lib/utils/server/baseServer.js +++ b/lib/utils/server/baseServer.js @@ -1,3 +1,5 @@ 'use strict'; +// base class that users should extend if they are making their own +// server implementation module.exports = class BaseServer {}; diff --git a/lib/utils/server/sockjsServer.js b/lib/utils/server/sockjsServer.js index 30fa9d7615..76aeb32bd4 100644 --- a/lib/utils/server/sockjsServer.js +++ b/lib/utils/server/sockjsServer.js @@ -17,10 +17,8 @@ module.exports = class SockjsServer extends BaseServer { log: (severity, line) => { if (severity === 'error') { options.error(line); - // this.log.error(line); } else { options.debug(line); - // this.log.debug(line); } }, }); diff --git a/lib/utils/server/wsServer.js b/lib/utils/server/wsServer.js index afba8c6086..c42a10e85d 100644 --- a/lib/utils/server/wsServer.js +++ b/lib/utils/server/wsServer.js @@ -6,4 +6,6 @@ const ws = require('ws'); const BaseServer = require('./baseServer'); +// ws server implementation under construction +// will need changes in the client as well to function module.exports = class WSServer extends BaseServer {}; From 62cc34c72a6669da6ea4d722d6b600ef0c2626ca Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Thu, 23 May 2019 16:40:47 -0500 Subject: [PATCH 3/6] refactor(server): moved server implementations, fix naming --- lib/Server.js | 27 +++---------------- lib/{utils/server => servers}/baseServer.js | 0 lib/{utils/server => servers}/sockjsServer.js | 25 +++++++++++++++-- lib/{utils/server => servers}/wsServer.js | 5 +--- package.json | 4 +-- 5 files changed, 29 insertions(+), 32 deletions(-) rename lib/{utils/server => servers}/baseServer.js (100%) rename lib/{utils/server => servers}/sockjsServer.js (52%) rename lib/{utils/server => servers}/wsServer.js (77%) diff --git a/lib/Server.js b/lib/Server.js index 8cf3020a91..794cabe093 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -31,27 +31,7 @@ const createDomain = require('./utils/createDomain'); const runBonjour = require('./utils/runBonjour'); const routes = require('./utils/routes'); const schema = require('./options.json'); -const SockjsServer = require('./utils/server/sockjsServer'); - -// Workaround for sockjs@~0.3.19 -// sockjs will remove Origin header, however Origin header is required for checking host. -// See https://github.com/webpack/webpack-dev-server/issues/1604 for more information -{ - // eslint-disable-next-line global-require - const SockjsSession = require('sockjs/lib/transport').Session; - const decorateConnection = SockjsSession.prototype.decorateConnection; - SockjsSession.prototype.decorateConnection = function(req) { - decorateConnection.call(this, req); - const connection = this.connection; - if ( - connection.headers && - !('origin' in connection.headers) && - 'origin' in req.headers - ) { - connection.headers.origin = req.headers.origin; - } - }; -} +const SockJSServer = require('./servers/sockjsServer'); // Workaround for node ^8.6.0, ^9.0.0 // DEFAULT_ECDH_CURVE is default to prime256v1 in these version @@ -674,15 +654,14 @@ class Server { } createSocketServer() { - const socket = new SockjsServer({ + this.socketServer = new SockJSServer({ error: this.log.error.bind(this), debug: this.log.debug.bind(this), server: this.listeningApp, path: this.sockPath, }); - this.socketServer = socket; - socket.onConnection((connection) => { + this.socketServer.onConnection((connection) => { if (!connection) { return; } diff --git a/lib/utils/server/baseServer.js b/lib/servers/baseServer.js similarity index 100% rename from lib/utils/server/baseServer.js rename to lib/servers/baseServer.js diff --git a/lib/utils/server/sockjsServer.js b/lib/servers/sockjsServer.js similarity index 52% rename from lib/utils/server/sockjsServer.js rename to lib/servers/sockjsServer.js index 76aeb32bd4..3a539ad2cc 100644 --- a/lib/utils/server/sockjsServer.js +++ b/lib/servers/sockjsServer.js @@ -1,12 +1,33 @@ 'use strict'; /* eslint-disable - class-methods-use-this + class-methods-use-this, + func-names */ const sockjs = require('sockjs'); const BaseServer = require('./baseServer'); -module.exports = class SockjsServer extends BaseServer { +// Workaround for sockjs@~0.3.19 +// sockjs will remove Origin header, however Origin header is required for checking host. +// See https://github.com/webpack/webpack-dev-server/issues/1604 for more information +{ + // eslint-disable-next-line global-require + const SockjsSession = require('sockjs/lib/transport').Session; + const decorateConnection = SockjsSession.prototype.decorateConnection; + SockjsSession.prototype.decorateConnection = function(req) { + decorateConnection.call(this, req); + const connection = this.connection; + if ( + connection.headers && + !('origin' in connection.headers) && + 'origin' in req.headers + ) { + connection.headers.origin = req.headers.origin; + } + }; +} + +module.exports = class SockJSServer extends BaseServer { // options has: error (function), debug (function), server (http/s server), path (string) constructor(options) { super(); diff --git a/lib/utils/server/wsServer.js b/lib/servers/wsServer.js similarity index 77% rename from lib/utils/server/wsServer.js rename to lib/servers/wsServer.js index c42a10e85d..61325beba8 100644 --- a/lib/utils/server/wsServer.js +++ b/lib/servers/wsServer.js @@ -1,9 +1,6 @@ 'use strict'; -/* eslint-disable - no-unused-vars -*/ -const ws = require('ws'); +// const ws = require('ws'); const BaseServer = require('./baseServer'); // ws server implementation under construction diff --git a/package.json b/package.json index f112c627a7..918c9c2dc1 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "url": "^0.11.0", "webpack-dev-middleware": "^3.7.0", "webpack-log": "^2.0.0", - "ws": "^6.2.1", "yargs": "12.0.5" }, "devDependencies": { @@ -102,7 +101,8 @@ "supertest": "^4.0.2", "url-loader": "^1.1.2", "webpack": "^4.31.0", - "webpack-cli": "^3.3.2" + "webpack-cli": "^3.3.2", + "ws": "^6.2.1" }, "peerDependencies": { "webpack": "^4.0.0" From f915ce58018eaa9db379931821c5d9901e01c6a3 Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Fri, 24 May 2019 15:09:38 -0500 Subject: [PATCH 4/6] refactor(server): rename files, pass in full server object --- lib/Server.js | 9 ++------- lib/servers/baseServer.js | 6 +++++- lib/servers/sockjsServer.js | 14 +++++++------- lib/servers/wsServer.js | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/Server.js b/lib/Server.js index 794cabe093..0ff7839310 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -31,7 +31,7 @@ const createDomain = require('./utils/createDomain'); const runBonjour = require('./utils/runBonjour'); const routes = require('./utils/routes'); const schema = require('./options.json'); -const SockJSServer = require('./servers/sockjsServer'); +const SockJSServer = require('./servers/SockJSServer'); // Workaround for node ^8.6.0, ^9.0.0 // DEFAULT_ECDH_CURVE is default to prime256v1 in these version @@ -654,12 +654,7 @@ class Server { } createSocketServer() { - this.socketServer = new SockJSServer({ - error: this.log.error.bind(this), - debug: this.log.debug.bind(this), - server: this.listeningApp, - path: this.sockPath, - }); + this.socketServer = new SockJSServer(this); this.socketServer.onConnection((connection) => { if (!connection) { diff --git a/lib/servers/baseServer.js b/lib/servers/baseServer.js index dbc8862319..e22bd2a058 100644 --- a/lib/servers/baseServer.js +++ b/lib/servers/baseServer.js @@ -2,4 +2,8 @@ // base class that users should extend if they are making their own // server implementation -module.exports = class BaseServer {}; +module.exports = class BaseServer { + constructor(server) { + this.server = server; + } +}; diff --git a/lib/servers/sockjsServer.js b/lib/servers/sockjsServer.js index 3a539ad2cc..8c67abd4e5 100644 --- a/lib/servers/sockjsServer.js +++ b/lib/servers/sockjsServer.js @@ -5,7 +5,7 @@ func-names */ const sockjs = require('sockjs'); -const BaseServer = require('./baseServer'); +const BaseServer = require('./BaseServer'); // Workaround for sockjs@~0.3.19 // sockjs will remove Origin header, however Origin header is required for checking host. @@ -29,23 +29,23 @@ const BaseServer = require('./baseServer'); module.exports = class SockJSServer extends BaseServer { // options has: error (function), debug (function), server (http/s server), path (string) - constructor(options) { - super(); + constructor(server) { + super(server); this.socket = 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') { - options.error(line); + this.server.log.error(line); } else { - options.debug(line); + this.server.log.debug(line); } }, }); - this.socket.installHandlers(options.server, { - prefix: options.path, + this.socket.installHandlers(this.server.listeningApp, { + prefix: this.server.sockPath, }); } diff --git a/lib/servers/wsServer.js b/lib/servers/wsServer.js index 61325beba8..ba0515b8e1 100644 --- a/lib/servers/wsServer.js +++ b/lib/servers/wsServer.js @@ -1,8 +1,8 @@ 'use strict'; // const ws = require('ws'); -const BaseServer = require('./baseServer'); +const BaseServer = require('./BaseServer'); // ws server implementation under construction // will need changes in the client as well to function -module.exports = class WSServer extends BaseServer {}; +module.exports = class WsServer extends BaseServer {}; From 8f6bd691df32324b15bbc1e9967106ce67a20d98 Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Fri, 24 May 2019 15:41:51 -0500 Subject: [PATCH 5/6] refactor(server): fixed capitalization --- lib/servers/BaseServer.js | 9 ++++++ lib/servers/SockJSServer.js | 64 +++++++++++++++++++++++++++++++++++++ lib/servers/WsServer.js | 8 +++++ 3 files changed, 81 insertions(+) create mode 100644 lib/servers/BaseServer.js create mode 100644 lib/servers/SockJSServer.js create mode 100644 lib/servers/WsServer.js diff --git a/lib/servers/BaseServer.js b/lib/servers/BaseServer.js new file mode 100644 index 0000000000..e22bd2a058 --- /dev/null +++ b/lib/servers/BaseServer.js @@ -0,0 +1,9 @@ +'use strict'; + +// base class that users should extend if they are making their own +// server implementation +module.exports = class BaseServer { + constructor(server) { + this.server = server; + } +}; diff --git a/lib/servers/SockJSServer.js b/lib/servers/SockJSServer.js new file mode 100644 index 0000000000..8c67abd4e5 --- /dev/null +++ b/lib/servers/SockJSServer.js @@ -0,0 +1,64 @@ +'use strict'; + +/* eslint-disable + class-methods-use-this, + func-names +*/ +const sockjs = require('sockjs'); +const BaseServer = require('./BaseServer'); + +// Workaround for sockjs@~0.3.19 +// sockjs will remove Origin header, however Origin header is required for checking host. +// See https://github.com/webpack/webpack-dev-server/issues/1604 for more information +{ + // eslint-disable-next-line global-require + const SockjsSession = require('sockjs/lib/transport').Session; + const decorateConnection = SockjsSession.prototype.decorateConnection; + SockjsSession.prototype.decorateConnection = function(req) { + decorateConnection.call(this, req); + const connection = this.connection; + if ( + connection.headers && + !('origin' in connection.headers) && + 'origin' in req.headers + ) { + connection.headers.origin = req.headers.origin; + } + }; +} + +module.exports = class SockJSServer extends BaseServer { + // options has: error (function), debug (function), server (http/s server), path (string) + constructor(server) { + super(server); + this.socket = 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') { + this.server.log.error(line); + } else { + this.server.log.debug(line); + } + }, + }); + + this.socket.installHandlers(this.server.listeningApp, { + prefix: this.server.sockPath, + }); + } + + send(connection, message) { + connection.write(message); + } + + close(connection) { + connection.close(); + } + + // f should return the resulting connection + onConnection(f) { + this.socket.on('connection', f); + } +}; diff --git a/lib/servers/WsServer.js b/lib/servers/WsServer.js new file mode 100644 index 0000000000..ba0515b8e1 --- /dev/null +++ b/lib/servers/WsServer.js @@ -0,0 +1,8 @@ +'use strict'; + +// const ws = require('ws'); +const BaseServer = require('./BaseServer'); + +// ws server implementation under construction +// will need changes in the client as well to function +module.exports = class WsServer extends BaseServer {}; From 11b65228615f3c6f839d68cf966d77c9bd922413 Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Mon, 27 May 2019 12:41:25 -0500 Subject: [PATCH 6/6] refactor(server): renamed ws server --- lib/servers/{WsServer.js => WebsocketServer.js} | 2 +- lib/servers/wsServer.js | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) rename lib/servers/{WsServer.js => WebsocketServer.js} (75%) delete mode 100644 lib/servers/wsServer.js diff --git a/lib/servers/WsServer.js b/lib/servers/WebsocketServer.js similarity index 75% rename from lib/servers/WsServer.js rename to lib/servers/WebsocketServer.js index ba0515b8e1..e95f088f56 100644 --- a/lib/servers/WsServer.js +++ b/lib/servers/WebsocketServer.js @@ -5,4 +5,4 @@ const BaseServer = require('./BaseServer'); // ws server implementation under construction // will need changes in the client as well to function -module.exports = class WsServer extends BaseServer {}; +module.exports = class WebsocketServer extends BaseServer {}; diff --git a/lib/servers/wsServer.js b/lib/servers/wsServer.js deleted file mode 100644 index ba0515b8e1..0000000000 --- a/lib/servers/wsServer.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -// const ws = require('ws'); -const BaseServer = require('./BaseServer'); - -// ws server implementation under construction -// will need changes in the client as well to function -module.exports = class WsServer extends BaseServer {};