fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2957 from ether/dependency_updates 

Dependency updates
This commit is contained in:
Stefan 2016-06-07 21:32:20 +02:00
parent 5a868254e3 2c177f553a
commit 44370f11be
2 changed files with 55 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/node/handler/PadMessageHandler.js
View File

@ -98,14 +98,7 @@ exports.kickSessionsFromPad = function(padID)
return; return;
//skip if there is nobody on this pad //skip if there is nobody on this pad
var roomClients = [], room = socketio.sockets.adapter.rooms[padID]; if(_getRoomClients(padID).length == 0)
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
if(roomClients.length == 0)
return; return;
//disconnect everyone from this pad //disconnect everyone from this pad
@ -519,21 +512,16 @@ function handleSuggestUserName(client, message)
} }
var padId = sessioninfos[client.id].padId; var padId = sessioninfos[client.id].padId;
var roomClients = [], room = socketio.sockets.adapter.rooms[padId]; var roomClients = _getRoomClients(padId);
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
//search the author and send him this message //search the author and send him this message
for(var i = 0; i < roomClients.length; i++) { roomClients.forEach(function(client) {
var session = sessioninfos[roomClients[i].id]; var session = sessioninfos[client.id];
if(session && session.author == message.data.payload.unnamedId) { if(session && session.author == message.data.payload.unnamedId) {
roomClients[i].json.send(message); client.json.send(message);
break; return;
} }
} });
} }
/** /**
@ -821,12 +809,7 @@ function handleUserChanges(data, cb)
exports.updatePadClients = function(pad, callback) exports.updatePadClients = function(pad, callback)
{ {
//skip this step if noone is on this pad //skip this step if noone is on this pad
var roomClients = [], room = socketio.sockets.adapter.rooms[pad.id]; var roomClients = _getRoomClients(pad.id);
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
if(roomClients.length==0) if(roomClients.length==0)
return callback(); return callback();
@ -952,21 +935,16 @@ function handleSwitchToPad(client, message)
// clear the session and leave the room // clear the session and leave the room
var currentSession = sessioninfos[client.id]; var currentSession = sessioninfos[client.id];
var padId = currentSession.padId; var padId = currentSession.padId;
var roomClients = [], room = socketio.sockets.adapter.rooms[padId]; var roomClients = _getRoomClients(padId);
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
for(var i = 0; i < roomClients.length; i++) { async.forEach(roomClients, function(client, callback) {
var sinfo = sessioninfos[roomClients[i].id]; var sinfo = sessioninfos[client.id];
if(sinfo && sinfo.author == currentSession.author) { if(sinfo && sinfo.author == currentSession.author) {
// fix user's counter, works on page refresh or if user closes browser window and then rejoins // fix user's counter, works on page refresh or if user closes browser window and then rejoins
sessioninfos[roomClients[i].id] = {}; sessioninfos[client.id] = {};
roomClients[i].leave(padId); client.leave(padId);
} }
} });
// start up the new pad // start up the new pad
createSessionInfo(client, message); createSessionInfo(client, message);
@ -1136,22 +1114,17 @@ function handleClientReady(client, message)
return callback(); return callback();
//Check if this author is already on the pad, if yes, kick the other sessions! //Check if this author is already on the pad, if yes, kick the other sessions!
var roomClients = [], room = socketio.sockets.adapter.rooms[pad.id]; var roomClients = _getRoomClients(pad.id);
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
for(var i = 0; i < roomClients.length; i++) { async.forEach(roomClients, function(client, callback) {
var sinfo = sessioninfos[roomClients[i].id]; var sinfo = sessioninfos[client.id];
if(sinfo && sinfo.author == author) { if(sinfo && sinfo.author == author) {
// fix user's counter, works on page refresh or if user closes browser window and then rejoins // fix user's counter, works on page refresh or if user closes browser window and then rejoins
sessioninfos[roomClients[i].id] = {}; sessioninfos[client.id] = {};
roomClients[i].leave(padIds.padId); client.leave(padIds.padId);
roomClients[i].json.send({disconnect:"userdup"}); client.json.send({disconnect:"userdup"});
} }
} });
//Save in sessioninfos that this session belonges to this pad //Save in sessioninfos that this session belonges to this pad
sessioninfos[client.id].padId = padIds.padId; sessioninfos[client.id].padId = padIds.padId;
@ -1295,13 +1268,8 @@ function handleClientReady(client, message)
// notify all existing users about new user // notify all existing users about new user
client.broadcast.to(padIds.padId).json.send(messageToTheOtherUsers); client.broadcast.to(padIds.padId).json.send(messageToTheOtherUsers);
//Run trough all sessions of this pad //Get sessions for this pad
var roomClients = [], room = socketio.sockets.adapter.rooms[pad.id]; var roomClients = _getRoomClients(pad.id);
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
async.forEach(roomClients, function(roomClient, callback) async.forEach(roomClients, function(roomClient, callback)
{ {
@ -1706,20 +1674,24 @@ function composePadChangesets(padId, startNum, endNum, callback)
}); });
} }
function _getRoomClients(padID) {
var roomClients = []; var room = socketio.sockets.adapter.rooms[padID];
if (room) {
for (var id in room.sockets) {
roomClients.push(socketio.sockets.sockets[id]);
}
}
return roomClients;
}
/** /**
* Get the number of users in a pad * Get the number of users in a pad
*/ */
exports.padUsersCount = function (padID, callback) { exports.padUsersCount = function (padID, callback) {
var roomClients = [], room = socketio.sockets.adapter.rooms[padID];
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
callback(null, { callback(null, {
padUsersCount: roomClients.length padUsersCount: _getRoomClients(padID).length
}); });
} }
@ -1729,12 +1701,7 @@ exports.padUsersCount = function (padID, callback) {
exports.padUsers = function (padID, callback) { exports.padUsers = function (padID, callback) {
var result = []; var result = [];
var roomClients = [], room = socketio.sockets.adapter.rooms[padID]; var roomClients = _getRoomClients(padID);
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
async.forEach(roomClients, function(roomClient, callback) { async.forEach(roomClients, function(roomClient, callback) {
var s = sessioninfos[roomClient.id]; var s = sessioninfos[roomClient.id];

32
src/package.json
View File

@ -15,35 +15,35 @@
"etherpad-yajsml" : "0.0.2", "etherpad-yajsml" : "0.0.2",
"request" : "2.55.0", "request" : "2.55.0",
"etherpad-require-kernel" : "1.0.9", "etherpad-require-kernel" : "1.0.9",
"resolve" : "1.1.6", "resolve" : "1.1.7",
"socket.io" : "1.3.7", "socket.io" : "1.4.5",
"ueberdb2" : "0.3.0", "ueberdb2" : "0.3.0",
"express" : "4.12.3", "express" : "4.13.4",
"express-session" : "1.11.1", "express-session" : "1.13.0",
"cookie-parser" : "1.3.4", "cookie-parser" : "1.3.4",
"async" : "0.9.0", "async" : "0.9.0",
"clean-css" : "3.1.9", "clean-css" : "3.4.12",
"uglify-js" : "2.4.19", "uglify-js" : "2.6.2",
"formidable" : "1.0.17", "formidable" : "1.0.17",
"log4js" : "0.6.22", "log4js" : "0.6.35",
"cheerio" : "0.19.0", "cheerio" : "0.20.0",
"async-stacktrace" : "0.0.2", "async-stacktrace" : "0.0.2",
"npm" : "2.7.6", "npm" : "2.7.6",
"ejs" : "2.3.1", "ejs" : "2.4.1",
"graceful-fs" : "3.0.6", "graceful-fs" : "4.1.3",
"slide" : "1.1.6", "slide" : "1.1.6",
"semver" : "4.3.3", "semver" : "5.1.0",
"security" : "1.0.0", "security" : "1.0.0",
"tinycon" : "0.0.1", "tinycon" : "0.0.1",
"underscore" : "1.8.3", "underscore" : "1.8.3",
"unorm" : "1.3.3", "unorm" : "1.4.1",
"languages4translatewiki" : "0.1.3", "languages4translatewiki" : "0.1.3",
"swagger-node-express" : "2.1.3", "swagger-node-express" : "2.1.3",
"channels" : "0.0.4", "channels" : "0.0.4",
"jsonminify" : "0.2.3", "jsonminify" : "0.4.1",
"measured" : "1.0.0", "measured" : "1.1.0",
"mocha" : "2.2.4", "mocha" : "2.4.5",
"supertest" : "0.15.0" "supertest" : "1.2.0"
}, },
"bin": { "etherpad-lite": "./node/server.js" }, "bin": { "etherpad-lite": "./node/server.js" },
"devDependencies": { "devDependencies": {