@socket-mesh/server 17.3.5 → 17.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@socket-mesh/server",
-  "version": "17.3.5",
+  "version": "17.3.6",
   "description": "Server module for SocketMesh",
   "main": "index.js",
   "type": "module",

package/server-options.d.ts

@@ -7,9 +7,6 @@ import { AuthEngine } from "@socket-mesh/server-auth";
 export type ProtocolVersions = 1 | 2;
 export interface ServerOptions {
     httpServer?: HttpServer;
-    wsEngine?: string | {
-        Server: ws.Server;
-    };
     wsEngineServerOptions?: ws.ServerOptions;
     authKey?: jwt.Secret;
     perMessageDeflate?: boolean | ws.PerMessageDeflateOptions;

package/server.js

@@ -22,6 +22,7 @@ import { InvalidArgumentsError, InvalidOptionsError, InvalidActionError, ServerP
 import { MiddlewareType } from "./middleware-type";
 import { MiddlewareStream } from "./middleware-stream";
 import { ActionHandshakeWS } from "./action";
+import ws from "ws";
 import base64id from 'base64id';
 import { ServerSocket } from "./serversocket";
 import url from "url";
@@ -151,12 +152,14 @@ export class Server extends AsyncStreamEmitter {
                 this.emit('ready', {});
             }))();
         }
-        let wsEngine = typeof opts.wsEngine === 'string' ? require(opts.wsEngine) : opts.wsEngine;
-        if (!wsEngine || !wsEngine.Server) {
-            throw new InvalidOptionsError('The wsEngine option must be a path or module name which points ' +
-                'to a valid WebSocket engine module with a compatible interface');
-        }
-        let WSServer = wsEngine.Server;
+        //		let wsEngine = typeof opts.wsEngine === 'string' ? require(opts.wsEngine) : opts.wsEngine;
+        //		if (!wsEngine || !wsEngine.Server) {
+        //			throw new InvalidOptionsError(
+        //				'The wsEngine option must be a path or module name which points ' +
+        //				'to a valid WebSocket engine module with a compatible interface'
+        //			);
+        //		}
+        //		let WSServer = wsEngine.Server;
         if (opts.authPrivateKey != null || opts.authPublicKey != null) {
             if (opts.authPrivateKey == null) {
                 throw new InvalidOptionsError('The authPrivateKey option must be specified if authPublicKey is specified');
@@ -207,7 +210,7 @@ export class Server extends AsyncStreamEmitter {
         this.clientsCount = 0;
         this.pendingClients = {};
         this.pendingClientsCount = 0;
-        let wsServerOptions = opts.wsEngineServerOptions || {};
+        const wsServerOptions = opts.wsEngineServerOptions || {};
         wsServerOptions.server = this.httpServer;
         wsServerOptions.verifyClient = this._verifyHandshake.bind(this);
         if (wsServerOptions.path == null && this._path != null) {
@@ -225,7 +228,7 @@ export class Server extends AsyncStreamEmitter {
         if (wsServerOptions.clientTracking == null) {
             wsServerOptions.clientTracking = false;
         }
-        this.wsServer = new WSServer(wsServerOptions);
+        this.wsServer = new ws.Server(wsServerOptions);
         this.wsServer.on('error', this._handleServerError.bind(this));
         this.wsServer.on('connection', this._handleSocketConnection.bind(this));
     }