Implemented queuing

This commit is contained in:
hydrabolt
2015-08-29 19:47:11 +01:00
parent b45d60eee8
commit bb53b65cf5
3 changed files with 106 additions and 95 deletions

View File

@@ -19,7 +19,7 @@ var WebSocket = require("ws");
var fs = require("fs");
var defaultOptions = {
queue: false
queue: []
};
var Client = (function () {
@@ -35,7 +35,7 @@ var Client = (function () {
further efforts will be made to connect.
*/
this.options = options;
this.options.queue = this.options.queue || false;
this.options.queue = this.options.queue || [];
this.token = token;
this.state = 0;
this.websocket = null;
@@ -605,14 +605,14 @@ var Client = (function () {
}
function send(destination) {
if (self.options.queue) {
if (~self.options.queue.indexOf("sendMessage")) {
//we're QUEUEING messages, so sending them sequentially based on servers.
if (!self.messageQueue[destination]) {
self.messageQueue[destination] = [];
}
self.messageQueue[destination].push({
action: "sendMessage",
content: message,
mentions: mentions,
then: [resolve, callback],
@@ -1405,18 +1405,26 @@ var Client = (function () {
done();
return;
}
var msgToSend = self.messageQueue[channelID][0];
self._sendMessage(channelID, msgToSend.content, msgToSend.mentions).then(function (msg) {
msgToSend.then[0](msg);
msgToSend.then[1](null, msg);
self.messageQueue[channelID].shift();
doNext();
})["catch"](function (err) {
msgToSend["catch"][0](err);
msgToSend["catch"][1](err);
self.messageQueue[channelID].shift();
doNext();
});
var queuedEvent = self.messageQueue[channelID][0];
switch (queuedEvent.action) {
case "sendMessage":
var msgToSend = queuedEvent;
self._sendMessage(channelID, msgToSend.content, msgToSend.mentions).then(function (msg) {
msgToSend.then[0](msg);
msgToSend.then[1](null, msg);
self.messageQueue[channelID].shift();
doNext();
})["catch"](function (err) {
msgToSend["catch"][0](err);
msgToSend["catch"][1](err);
self.messageQueue[channelID].shift();
doNext();
});
break;
default:
done();
break;
}
};
var done = function done() {