fix(): fixed issue with client indexes

bleenco · Oct 13, 2017 · 6ae0a0a · 6ae0a0a
1 parent f08d586
commit 6ae0a0a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/api/socket.ts b/src/api/socket.ts
@@ -78,8 +78,6 @@ export class SocketServer {
           };
           logger.next(msg);
 
-          const clientIndex = this.clients.length - 1;
-
           // send server time for sync
           conn.next({ type: 'time', data: new Date().getTime() });
 
@@ -90,11 +88,11 @@ export class SocketServer {
           let imageBuilderSub: Subscription;
 
           conn.subscribe(event => {
+            const clientIndex = this.clients.findIndex(client => client.connection === conn);
             if (event.type === 'disconnected') {
-              const index = this.clients.findIndex(client => client.connection === conn);
-              const session = this.clients[index].session;
-              const username = this.clients[index].username;
-              this.clients.splice(index, 1);
+              const session = this.clients[clientIndex].session;
+              const username = this.clients[clientIndex].username;
+              this.clients.splice(clientIndex, 1);
 
               const msg: LogMessageType = {
                 message: `[socket]: user ${session.userId} (${username}) disconnected`,