Added the new gateway capability

This commit is contained in:
hydrabolt
2015-08-27 12:43:25 +01:00
parent 1176ca7022
commit 2137981bb9
3 changed files with 66 additions and 14 deletions

View File

@@ -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;