From 4b5e229df9394531f90a80dfc0e439e14939e270 Mon Sep 17 00:00:00 2001
From: hydrabolt <amishshah.2k@gmail.com>
Date: Sat, 15 Aug 2015 23:14:40 +0100
Subject: [PATCH] websocket opened whilst logging in

---
 index.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/index.js b/index.js
index c306d84d9..ebd794bde 100644
--- a/index.js
+++ b/index.js
@@ -138,6 +138,8 @@ exports.Client.prototype.login = function( email, password ) {
 
 	var time = Date.now();
 
+	self.connectWebsocket();
+
 	Internal.XHR.login( email, password, function( err, token ) {
 
 		if ( err ) {
@@ -148,8 +150,8 @@ exports.Client.prototype.login = function( email, password ) {
 		} else {
 			self.token = token;
 			self.loggedIn = true;
-			self.connectWebsocket();
 			console.log("Took "+ (Date.now() - time) +" ms to login!");
+			self.websocket.sendData();
 		}
 
 	} );
@@ -173,6 +175,8 @@ exports.Client.prototype.connectWebsocket = function( cb ) {
 
 	var time = Date.now();
 
+	var sentInitData = false;
+
 	this.websocket = new WebSocket( Endpoints.WEBSOCKET_HUB );
 	this.websocket.onclose = function( e ) {
 		self.triggerEvent( "disconnected", [ {
@@ -347,20 +351,26 @@ exports.Client.prototype.connectWebsocket = function( cb ) {
 	}
 	this.websocket.onopen = function() {
 
-		var connDat = {
-			op: 2,
-			d: {
-				token: self.token,
-				v: 2
-			}
-		};
+		this.sendData();
 
-		connDat.d.properties = Internal.WebSocket.properties;
-
-		this.sendPacket( connDat );
 		console.log("Took "+ (Date.now() - time) +" ms to open WS connection!");
 		time = Date.now();
 	}
+	this.websocket.sendData = function(){
+		if(this.readyState == 1 && !sentInitData && self.token){
+			sentInitData = true;
+			var connDat = {
+				op: 2,
+				d: {
+					token: self.token,
+					v: 2
+				}
+			};
+
+			connDat.d.properties = Internal.WebSocket.properties;
+			this.sendPacket( connDat );
+		}
+	}
 }
 
 exports.Client.prototype.logout = function( callback ) {