oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00
Code Wiki Activity

Cycle socket servers when connection fails

Browse source
This commit is contained in:
Kane York 2015-10-24 16:04:27 -07:00
parent a2116591bc
commit dfcd6bf413
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/socket.js
View file

@ -4,6 +4,7 @@ var FFZ = window.FrankerFaceZ,
FFZ.prototype._ws_open = false;
FFZ.prototype._ws_delay = 0;
FFZ.prototype._ws_last_iframe = 0;
FFZ.prototype._ws_host_idx = 0;
FFZ.ws_commands = {};
FFZ.ws_on_close = [];
@ -39,7 +40,7 @@ FFZ.prototype.ws_create = function() {
this._ws_pending = this._ws_pending || [];
try {
ws = this._ws_sock = new WebSocket("ws://" + constants.WS_SERVER + "/");
ws = this._ws_sock = new WebSocket("ws://" + constants.WS_SERVERs[this._ws_host_idx] + "/");
} catch(err) {
this._ws_exists = false;
return this.log("Error Creating WebSocket: " + err);
@ -119,7 +120,7 @@ FFZ.prototype.ws_create = function() {
f._ws_open = false;
// When the connection closes, run our callbacks.
for(var i=0; i < FFZ.ws_on_close.length; i++) {
for (var i=0; i < FFZ.ws_on_close.length; i++) {
try {
FFZ.ws_on_close[i].bind(f)();
} catch(err) {
@ -127,6 +128,9 @@ FFZ.prototype.ws_create = function() {
}
}
// Attempt to cycle to backup server
f._ws_host_idx = (f._ws_host_idx + 1) % constants.WS_SERVERS.length;
if ( f._ws_delay > 10000 ) {
var ua = navigator.userAgent.toLowerCase();
if ( Date.now() - f._ws_last_iframe > 1800000 && !(ua.indexOf('chrome') === -1 && ua.indexOf('safari') !== -1) )