Finishes basic websocket-handler.service.ts

web/src/app/services/websocket-handler/websocket-handler.service.ts

@@ -10,30 +10,20 @@ export interface Message {
 	data:object,
 }
 
-
 @Injectable()
 export class WebsocketHandlerService {
   public messages: Subject<Message>;
-  
-   private authenticateMessage = {
-    Event:'auth',
-    data:{"username":"Username","password":"e7cf3ef4f17c3999a94f2c6f612e8a888e5b1026878e4e19398b23bd38ec221a"},
-  }
 
-	constructor(wsService: WebsocketService) {
+  constructor(wsService: WebsocketService) {
 		this.messages = <Subject<Message>>wsService
 			.connect(WEBSOCKET_URL) 
 			.map((response: MessageEvent): Message => {
         let data = JSON.parse(response.data);
-        console.log('Recieved response from websocket. Event: '+ data.Event)
-        
+        console.log('Recieved response from websocket. Event: ' + data.Event)
 				return {
 					Event: data.Event,
 					data: data.data,
 				}
       });
-      //Auth straight away!
-      console.log('Sending message to websocket. Event:'+this.authenticateMessage.Event+'. Message: ' + JSON.stringify(this.authenticateMessage.data));
-      this.messages.next(this.authenticateMessage);
-	}
-}
+    }
+  }

web/src/app/services/websocket/websocket.service.ts

@@ -10,11 +10,17 @@ export class WebsocketService {
   public connect(url): Rx.Subject<MessageEvent> {
     if (!this.subject) {
       this.subject = this.create(url);
-      console.log("Successfully connected: " + url);
     } 
     return this.subject;
   }
 
+  private authenticateMessage = {
+    Event:'auth',
+    data:{"username":"Username","password":"e7cf3ef4f17c3999a94f2c6f612e8a888e5b1026878e4e19398b23bd38ec221a"},
+  }
+
+  private isAuth = false;
+
   private create(url): Rx.Subject<MessageEvent> {
     let ws = new WebSocket(url);
     
@@ -27,12 +33,16 @@ export class WebsocketService {
 	})
 let observer = {
 		next: (data: Object) => {
-			if (ws.readyState === WebSocket.OPEN) {
+    if (ws.readyState === WebSocket.OPEN) {
+        if(!this.isAuth) {
+          //This is a shit initial way to be able to authenticate
+          ws.send(JSON.stringify(this.authenticateMessage));
+          this.isAuth = true;
+        }
 				ws.send(JSON.stringify(data));
-			}
-		}
-	}
+      }
+  }
+  }
 	return Rx.Subject.create(observer, observable);
   }
-
 }