Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web

1 files changed, 7 insertions, 3 deletions

diff --git a/src/server/Websocket/Websocket.ts b/src/server/Websocket/Websocket.ts
index e1e157fc4..578147d60 100644
--- a/src/server/Websocket/Websocket.ts
+++ b/src/server/Websocket/Websocket.ts
@@ -13,21 +13,24 @@ import { green } from "colors";
 
 export namespace WebSocket {
 
+    export let _socket: Socket;
     const clients: { [key: string]: Client } = {};
     export const socketMap = new Map<SocketIO.Socket, string>();
     export let disconnect: Function;
 
-    export async function start(serverPort: number, isRelease: boolean) {
+    export async function start(isRelease: boolean) {
         await preliminaryFunctions();
-        initialize(serverPort, isRelease);
+        initialize(isRelease);
     }
 
     async function preliminaryFunctions() {
     }
 
-    export function initialize(socketPort: number, isRelease: boolean) {
+    function initialize(isRelease: boolean) {
         const endpoint = io();
         endpoint.on("connection", function (socket: Socket) {
+            _socket = socket;
+
             socket.use((_packet, next) => {
                 const userEmail = socketMap.get(socket);
                 if (userEmail) {
@@ -60,6 +63,7 @@ export namespace WebSocket {
             };
         });
 
+        const socketPort = isRelease ? Number(process.env.socketPort) : 4321;
         endpoint.listen(socketPort);
         logPort("websocket", socketPort);
     }