Merge pull request #18 from discord-js/apichanges

Added the new gateway capability

lib/Client.js

@@ -120,7 +120,6 @@ var Client = (function () {
 
 			var self = this;
 
-			this.createws();
 			return new Promise(function (resolve, reject) {
 				if (self.state === 0 || self.state === 4) {
 
@@ -143,9 +142,15 @@ var Client = (function () {
 						} else {
 							self.state = 2; //set state to logged in (not yet ready)
 							self.token = res.body.token; //set our token
-							self.trySendConnData();
-							callback(null, self.token);
-							resolve(self.token);
+
+							getGateway().then(function (url) {
+								self.createws(url);
+								callback(null, self.token);
+								resolve(self.token);
+							})["catch"](function (err) {
+								callback(err);
+								reject(err);
+							});
 						}
 					});
 				} else {
@@ -687,13 +692,13 @@ var Client = (function () {
 		//def createws
 	}, {
 		key: "createws",
-		value: function createws() {
+		value: function createws(url) {
 			if (this.websocket) return false;
 
 			var self = this;
 
 			//good to go
-			this.websocket = new WebSocket(Endpoints.WEBSOCKET_HUB);
+			this.websocket = new WebSocket(url);
 
 			//open
 			this.websocket.onopen = function () {
@@ -1413,4 +1418,19 @@ var Client = (function () {
 	return Client;
 })();
 
+function getGateway() {
+
+	var self = this;
+
+	return new Promise(function (resolve, reject) {
+		request.get(Endpoints.API + "/gateway").end(function (err, res) {
+			if (err) {
+				reject(err);
+			} else {
+				resolve(res.body.url);
+			}
+		});
+	});
+}
+
 module.exports = Client;

src/Client.js

@@ -132,7 +132,6 @@ class Client {
 
 		var self = this;
 
-		this.createws();
 		return new Promise(function (resolve, reject) {
 			if (self.state === 0 || self.state === 4) {
 
@@ -157,9 +156,16 @@ class Client {
 						} else {
 							self.state = 2; //set state to logged in (not yet ready)
 							self.token = res.body.token; //set our token
-							self.trySendConnData();
-							callback(null, self.token);
-							resolve(self.token);
+							
+							getGateway().then(function (url) {
+								self.createws(url);
+								callback(null, self.token);
+								resolve(self.token);
+							}).catch(function (err) {
+								callback(err);
+								reject(err);
+							});
+
 						}
 
 					});
@@ -666,14 +672,14 @@ class Client {
 	}
 	
 	//def createws
-	createws() {
+	createws(url) {
 		if (this.websocket)
 			return false;
 
 		var self = this;
 		
 		//good to go
-		this.websocket = new WebSocket(Endpoints.WEBSOCKET_HUB);
+		this.websocket = new WebSocket(url);
 		
 		//open
 		this.websocket.onopen = function () {
@@ -1106,4 +1112,22 @@ class Client {
 
 }
 
+function getGateway() {
+
+	var self = this;
+
+	return new Promise(function (resolve, reject) {
+		request
+			.get(`${Endpoints.API}/gateway`)
+			.end(function (err, res) {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(res.body.url);
+				}
+			});
+	});
+
+}
+
 module.exports = Client;

test/bot.js

@@ -7,8 +7,16 @@ var mybot = new Discord.Client();
 
 var server, channel, message, sentMessage = false;
 
-function success1(){ //make server
+function init(){
 	console.log("preparing...");
+}
+
+mybot.on("ready", function(){
+	console.log("ready! beginning tests");
+	success1();
+});
+
+function success1(){ //make server
 	mybot.createServer("test-server", "london").then(success2).catch(error);
 }
 
@@ -123,4 +131,4 @@ mybot.on("message", function(message){
 	
 });
 
-mybot.login(process.env["ds_email"], process.env["ds_password"]).then(success1).catch(error);
+mybot.login(process.env["ds_email"], process.env["ds_password"]).then(init).catch(error);