refactor(join): clearify code

coast-team · Feb 1, 2017 · d546298 · d546298
1 parent b825f91
commit d546298
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/server.js b/server.js
@@ -197,10 +197,6 @@ const openers = new Map();
 
 class WSServer {
 
-  constructor () {
-    this.server = null;
-  }
-
   static start (options, cb = () => {}, extraOptions) {
     let WebSocket = {};
     try {
@@ -228,7 +224,11 @@ class WSServer {
           if (ioMsg.isToOpen()) {
             open(socket, ioMsg);
           } else if (ioMsg.isToJoin()) {
-            join(socket, ioMsg);
+            if (openers.has(ioMsg.key)) {
+              join(socket, ioMsg);
+            } else {
+              open(socket, ioMsg);
+            }
           } else if (ioMsg.isToTransmitToOpener()) {
             transmitToOpener(socket, ioMsg);
           } else if (ioMsg.isToTransmitToJoining()) {
@@ -250,7 +250,6 @@ class WSServer {
     console.log('Server has stopped successfully');
     this.server.close(cb);
   }
-
 }
 
 function errorOnSendCB (err) {
@@ -279,12 +278,8 @@ function open (socket, ioMsg) {
 }
 
 function join (socket, ioMsg) {
-  if (openers.has(ioMsg.key)) {
-    openers.get(ioMsg.key).values().next().value.addJoining(socket);
-    socket.send(IOJsonString.msgOpened(false), errorOnSendCB);
-  } else {
-    open(socket, ioMsg);
-  }
+  openers.get(ioMsg.key).values().next().value.addJoining(socket);
+  socket.send(IOJsonString.msgOpened(false), errorOnSendCB);
 }
 
 function transmitToJoining (socket, ioMsg) {

diff --git a/src/WSServer.js b/src/WSServer.js
@@ -7,10 +7,6 @@ const openers = new Map()
 
 export default class WSServer {
 
-  constructor () {
-    this.server = null
-  }
-
   static start (options, cb = () => {}, extraOptions) {
     let WebSocket = {}
     try {
@@ -38,7 +34,11 @@ export default class WSServer {
           if (ioMsg.isToOpen()) {
             open(socket, ioMsg)
           } else if (ioMsg.isToJoin()) {
-            join(socket, ioMsg)
+            if (openers.has(ioMsg.key)) {
+              join(socket, ioMsg)
+            } else {
+              open(socket, ioMsg)
+            }
           } else if (ioMsg.isToTransmitToOpener()) {
             transmitToOpener(socket, ioMsg)
           } else if (ioMsg.isToTransmitToJoining()) {
@@ -60,7 +60,6 @@ export default class WSServer {
     console.log('Server has stopped successfully')
     this.server.close(cb)
   }
-
 }
 
 function errorOnSendCB (err) {
@@ -89,12 +88,8 @@ function open (socket, ioMsg) {
 }
 
 function join (socket, ioMsg) {
-  if (openers.has(ioMsg.key)) {
-    openers.get(ioMsg.key).values().next().value.addJoining(socket)
-    socket.send(IOJsonString.msgOpened(false), errorOnSendCB)
-  } else {
-    open(socket, ioMsg)
-  }
+  openers.get(ioMsg.key).values().next().value.addJoining(socket)
+  socket.send(IOJsonString.msgOpened(false), errorOnSendCB)
 }
 
 function transmitToJoining (socket, ioMsg) {