Encapsulate sockjs, introduce ws and build base for users to make own server implementation

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) {

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;
+  }
+};

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,
     });
   }
 

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 {};