KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix dead listeners with connection options

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-06-29 17:37:17 +02:00
parent 62b74bdaee
commit 7bbf09e697
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
server/server.js
View File

@@ -34,7 +34,7 @@ var db = mongojs.connect('mydb');
var crypto = require('crypto'); var crypto = require('crypto');
var port = 3000; var port = 3000;
var lists = []; var lists = {};
var unique_ids = []; var unique_ids = [];
server.listen(port, function () { server.listen(port, function () {
@@ -507,17 +507,17 @@ io.on('connection', function(socket){
socket.on('disconnect', function() socket.on('disconnect', function()
{ {
left_channel(in_list, coll, guid, name, short_id); left_channel(coll, guid, name, short_id);
}); });
socket.on('reconnect_failed', function() socket.on('reconnect_failed', function()
{ {
left_channel(in_list, coll, guid, name, short_id); left_channel(coll, guid, name, short_id);
}); });
socket.on('connect_timeout', function() socket.on('connect_timeout', function()
{ {
left_channel(in_list, coll, guid, name, short_id); left_channel(coll, guid, name, short_id);
}); });
socket.on('pos', function() socket.on('pos', function()
@@ -527,29 +527,26 @@ io.on('connection', function(socket){
}); });
}); });
function left_channel(in_list, coll, guid, name, short_id) function left_channel(coll, guid, name, short_id)
{ {
if(in_list) if(lists[coll] !== undefined && contains(lists[coll], guid))
{
var index = lists[coll].indexOf(guid);
if(index != -1)
{ {
if(contains(lists[coll], guid)) lists[coll].splice(index, 1);
{ io.to(coll).emit("viewers", lists[coll].length);
var index = lists[coll].indexOf(guid); io.to(coll).emit('chat', [name, " left"]);
if(index != -1)
{
lists[coll].splice(index, 1);
io.to(coll).emit("viewers", lists[coll].length);
io.to(coll).emit('chat', [name, " left"]);
}
}
if(contains(unique_ids, short_id))
{
var index = unique_ids.indexOf(guid);
if(index != -1)
lists[coll].splice(index, 1);
}
} }
}
if(contains(unique_ids, short_id))
{
var index = unique_ids.indexOf(guid);
if(index != -1)
lists[coll].splice(index, 1);
}
} }
function del(params, socket) function del(params, socket)

4
static/dist/main-min.js vendored
View File

File diff suppressed because one or more lines are too long

7
static/js/listeners.js
View File

@@ -36,7 +36,12 @@ var lastSample = Date.now();
var began = false; var began = false;
var id; var id;
var socket = io.connect('//'+window.location.hostname+':3000'); var connection_options = {
'sync disconnect on unload':true,
transports: ['websocket', 'xhr-polling', 'polling', 'htmlfile', 'flashsocket']
};
var socket = io.connect('//'+window.location.hostname+':3000', connection_options);
socket.on("get_list", function(){ socket.on("get_list", function(){
socket.emit('list', chan.toLowerCase()); socket.emit('list', chan.toLowerCase());
}); });