Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-13 18:13:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

partially working autorevive

Browse Source
This commit is contained in:
Amish Shah
2015-12-06 19:30:32 +00:00
parent 41efef750f
commit d504406cfc
5 changed files with 81 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Client/Client.js
View File

@@ -33,11 +33,15 @@ var Client = (function (_EventEmitter) {
client.
*/
function Client(options) {
function Client() {
var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
_classCallCheck(this, Client);
_EventEmitter.call(this);
this.options = options || {};
this.options.compress = options.compress || true;
this.options.autoRevive = options.autoRevive || false;
this.internal = new _InternalClient2["default"](this);
}
@@ -60,6 +64,18 @@ var Client = (function (_EventEmitter) {
return this.internal.logout().then(callback, errCB(callback));
};
// def destroy
Client.prototype.destroy = function destroy() {
var _this = this;
var callback = arguments.length <= 0 || arguments[0] === undefined ? function () /*err*/{} : arguments[0];
this.internal.logout().then(function () {
_this.internal.disconnected(true);
});
};
// def sendMessage
Client.prototype.sendMessage = function sendMessage(where, content) {
@@ -551,7 +567,7 @@ var Client = (function (_EventEmitter) {
Client.prototype.awaitResponse = function awaitResponse(msg) {
var toSend = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
var _this = this;
var _this2 = this;
var options = arguments.length <= 2 || arguments[2] === undefined ? null : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function () /*e, newMsg*/{} : arguments[3];
@@ -585,7 +601,7 @@ var Client = (function (_EventEmitter) {
}
// (msg) promise
return ret.then(function () {
return _this.internal.awaitResponse(msg);
return _this2.internal.awaitResponse(msg);
}).then(function (newMsg) {
callback(null, newMsg);
return newMsg;

28
lib/Client/InternalClient.js
View File

@@ -125,6 +125,11 @@ var InternalClient = (function () {
function InternalClient(discordClient) {
_classCallCheck(this, InternalClient);
this.setup(discordClient);
}
InternalClient.prototype.setup = function setup(discordClient) {
discordClient = discordClient || this.client;
this.client = discordClient;
this.state = _ConnectionState2["default"].IDLE;
this.websocket = null;
@@ -149,7 +154,7 @@ var InternalClient = (function () {
this.resolver = new _ResolverResolver2["default"](this);
this.readyTime = null;
this.messageAwaits = {};
}
};
InternalClient.prototype.cleanIntervals = function cleanIntervals() {
for (var _iterator = this.intervals.typing.concat(this.intervals.misc).concat(this.intervals.kai), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
@@ -172,6 +177,21 @@ var InternalClient = (function () {
}
};
InternalClient.prototype.disconnected = function disconnected() {
var forced = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
this.cleanIntervals();
this.leaveVoiceChannel();
if (this.client.options.autoRevive && !forced) {
this.setup();
this.login(this.email, this.password);
}
this.client.emit("disconnected");
};
//def leaveVoiceChannel
InternalClient.prototype.leaveVoiceChannel = function leaveVoiceChannel() {
@@ -1137,11 +1157,7 @@ var InternalClient = (function () {
this.websocket.onclose = function () {
self.websocket = null;
self.state = _ConnectionState2["default"].DISCONNECTED;
client.emit("disconnected");
self.cleanIntervals();
if (self.voiceConnection) {
self.leaveVoiceChannel();
}
self.disconnected();
};
this.websocket.onerror = function (e) {