bug fix for 2 connections

Author: Fabian Schmidt

backend/messageHandler.ts

@@ -8,18 +8,16 @@ export class MessageHandler{
 
     constructor(socket : WSocketServer, messageFactory : MessageFactory){
         this.messageFactory = messageFactory;
-        socket.addTextMessageHandler((message) => {
-            this.handleMessages(message);
-        });
+        socket.addTextMessageHandler(this.handleMessages);
     }
 
-    handleMessages(message) {
+    handleMessages = (message, connection) => {
         if (message.utf8Data) {
             Server.log("Client Got message " + message.utf8Data);
             try {
                 var messageObj = this.messageFactory.getMessage(message.utf8Data);
                 for(let handler of this.handler[messageObj.type]){
-                    handler(messageObj);
+                    handler(messageObj, connection);
                 }
             } catch (err) {
                 Server.log( "ERROR: " + err);

backend/server.ts

@@ -55,28 +55,28 @@ export class Server {
         return true;
     }  
 
-    handleSongRequest = (messageObj) => {
+    handleSongRequest = (messageObj, connection) => {
         var passed = (Date.now() - this.timeInMs) / 1000;
         var json = {} as any;
         console.log(SONG_REQUEST);                    
         json.source = this.currSong;
         json.time = passed;
         json.type = SONG_REQUEST;
-        this.wSocket.send(json);
+        connection.send(JSON.stringify(json));
     }
 
-    handleRTT = (messageObj) => {
+    handleRTT = (messageObj, connection) => {
         console.log(RTT);
         var json = messageObj;
-        this.wSocket.send(json);
+        connection.send(JSON.stringify(json));
     }
 
-    handlePlayerDelay = (messageObj) => {
+    handlePlayerDelay = (messageObj, connection) => {
         console.log(PLAYER_DELAY);
         var json = {} as any;
         json.source = this.currSong;
         json.type = PLAYER_DELAY;
-        this.wSocket.send(json);
+        connection.send(JSON.stringify(json));
     }
 
     public static log(message : string) {

backend/wSocketServer.ts

@@ -1,7 +1,6 @@
 
 export class WSocketServer{
     callbackFunction : Function;
-    connection;
     constructor(httpServer){
         var WebSocketServer = require('websocket').server;
         var server = new WebSocketServer({
@@ -13,16 +12,13 @@ export class WSocketServer{
 
 
     handleRequest = (request) => {
-        this.connection = request.accept('echo-protocol', request.origin);
-        this.connection.on('message',this.callbackFunction);
+        var connection = request.accept('echo-protocol', request.origin);
+        connection.on('message',(messageObj) => {
+            this.callbackFunction(messageObj, connection);
+        });
     }
 
     addTextMessageHandler(handler : Function){
     	this.callbackFunction = handler;
-    }
-
-    send(obj)
-    {
-    	this.connection.send(JSON.stringify(obj));
-    }    
+    }  
 }