Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
barisusakli
2014-11-28 14:35:21 -05:00
parent 1abe35092b 5ac5d20e4b
commit c213f77f91
7 changed files with 106 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
loader.js
View File

@@ -137,8 +137,8 @@ Loader.addClusterEvents = function(callback) {
Loader.primaryWorker = parseInt(worker.id, 10);
}
break;
case 'user:connect':
case 'user:disconnect':
// case 'user:connect':
// case 'user:disconnect':
case 'config:update':
Loader.notifyWorkers(message);
break;

3
src/controllers/users.js
View File

@@ -15,7 +15,8 @@ usersController.getOnlineUsers = function(req, res, next) {
user.getUsersFromSet('users:online', 0, 49, next);
},
count: function(next) {
next(null, websockets.getConnectedClients().length);
var now = Date.now();
db.sortedSetCount('users:online', now - 300000, now, next);
},
isAdministrator: function(next) {
user.isAdministrator(uid, next);

52
src/socket.io/index.js
View File

@@ -24,47 +24,6 @@ var SocketIO = require('socket.io'),
var io;
var onlineUsers = [];
process.on('message', onMessage);
function onMessage(msg) {
if (typeof msg !== 'object') {
return;
}
if (msg.action === 'user:connect') {
if (msg.uid && onlineUsers.indexOf(msg.uid) === -1) {
onlineUsers.push(msg.uid);
}
} else if(msg.action === 'user:disconnect') {
if (msg.uid && msg.socketCount <= 1) {
var index = onlineUsers.indexOf(msg.uid);
if (index !== -1) {
onlineUsers.splice(index, 1);
}
}
}
}
function onUserConnect(uid, socketid) {
var msg = {action: 'user:connect', uid: uid, socketid: socketid};
if (process.send) {
process.send(msg);
} else {
onMessage(msg);
}
}
function onUserDisconnect(uid, socketid, socketCount) {
var msg = {action: 'user:disconnect', uid: uid, socketid: socketid, socketCount: socketCount};
if (process.send) {
process.send(msg);
} else {
onMessage(msg);
}
}
Sockets.init = function(server) {
var config = {
transports: ['polling', 'websocket'],
@@ -131,7 +90,6 @@ Sockets.init = function(server) {
logger.io_one(socket, socket.uid);
if (socket.uid) {
onUserConnect(socket.uid, socket.id);
socket.join('uid_' + socket.uid);
socket.join('online_users');
@@ -174,8 +132,6 @@ Sockets.init = function(server) {
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: 'offline'});
}
onUserDisconnect(socket.uid, socket.id, socketCount);
// for(var roomName in io.sockets.manager.roomClients[socket.id]) {
// if (roomName.indexOf('topic') !== -1) {
// io.sockets.in(roomName.slice(1)).emit('event:user_leave', socket.uid);
@@ -291,10 +247,6 @@ Sockets.getSocketCount = function() {
return Array.isArray(clients) ? clients.length : 0;
};
Sockets.getConnectedClients = function() {
return onlineUsers;
};
Sockets.getUserSocketCount = function(uid) {
return 0;
@@ -305,10 +257,6 @@ Sockets.getUserSocketCount = function(uid) {
return roomClients.length;
};
Sockets.getOnlineUserCount = function () {
return onlineUsers.length;
};
Sockets.getOnlineAnonCount = function () {
return 0;

109
src/socket.io/meta.js
View File

@@ -86,62 +86,67 @@ SocketMeta.rooms.enter = function(socket, data, callback) {
};
SocketMeta.rooms.getAll = function(socket, data, callback) {
var rooms = {}; //websockets.server.sockets.manager.rooms; doesnt work in socket.io 1.x
var socketData = {
onlineGuestCount: websockets.getOnlineAnonCount(),
onlineRegisteredCount: websockets.getOnlineUserCount(),
socketCount: websockets.getSocketCount(),
users: {
home: rooms['/home'] ? rooms['/home'].length : 0,
topics: 0,
category: 0
},
topics: {}
};
var scores = {},
topTenTopics = [],
tid;
for (var room in rooms) {
if (rooms.hasOwnProperty(room)) {
if (tid = room.match(/^\/topic_(\d+)/)) {
var length = rooms[room].length;
socketData.users.topics += length;
if (scores[length]) {
scores[length].push(tid[1]);
} else {
scores[length] = [tid[1]];
}
} else if (room.match(/^\/category/)) {
socketData.users.category += rooms[room].length;
}
}
}
var scoreKeys = Object.keys(scores),
mostActive = scoreKeys.sort();
while(topTenTopics.length < 10 && mostActive.length > 0) {
topTenTopics = topTenTopics.concat(scores[mostActive.pop()]);
}
topTenTopics = topTenTopics.slice(0, 10);
topics.getTopicsFields(topTenTopics, ['title'], function(err, titles) {
db.sortedSetCount('users:online', now - 300000, now, function(err, onlineRegisteredCount) {
if (err) {
return callback(err);
}
topTenTopics.forEach(function(tid, id) {
socketData.topics[tid] = {
value: rooms['/topic_' + tid].length,
title: validator.escape(titles[id].title)
};
});
callback(null, socketData);
var rooms = {}; //websockets.server.sockets.manager.rooms; doesnt work in socket.io 1.x
var socketData = {
onlineGuestCount: websockets.getOnlineAnonCount(),
onlineRegisteredCount: onlineRegisteredCount,
socketCount: websockets.getSocketCount(),
users: {
home: rooms['/home'] ? rooms['/home'].length : 0,
topics: 0,
category: 0
},
topics: {}
};
var scores = {},
topTenTopics = [],
tid;
for (var room in rooms) {
if (rooms.hasOwnProperty(room)) {
if (tid = room.match(/^\/topic_(\d+)/)) {
var length = rooms[room].length;
socketData.users.topics += length;
if (scores[length]) {
scores[length].push(tid[1]);
} else {
scores[length] = [tid[1]];
}
} else if (room.match(/^\/category/)) {
socketData.users.category += rooms[room].length;
}
}
}
var scoreKeys = Object.keys(scores),
mostActive = scoreKeys.sort();
while(topTenTopics.length < 10 && mostActive.length > 0) {
topTenTopics = topTenTopics.concat(scores[mostActive.pop()]);
}
topTenTopics = topTenTopics.slice(0, 10);
topics.getTopicsFields(topTenTopics, ['title'], function(err, titles) {
if (err) {
return callback(err);
}
topTenTopics.forEach(function(tid, id) {
socketData.topics[tid] = {
value: rooms['/topic_' + tid].length,
title: validator.escape(titles[id].title)
};
});
callback(null, socketData);
});
});
};

25
src/socket.io/posts.js
View File

@@ -46,21 +46,24 @@ SocketPosts.reply = function(socket, data, callback) {
socket.emit('event:new_post', result);
var uids = websockets.getConnectedClients();
privileges.categories.filterUids('read', postData.topic.cid, uids, function(err, uids) {
user.getUidsFromSet('users:online', 0, -1, function(err, uids) {
if (err) {
return;
}
plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: "newPost"}, function(err, data) {
uids = data.uidsTo;
for(var i=0; i<uids.length; ++i) {
if (parseInt(uids[i], 10) !== socket.uid) {
websockets.in('uid_' + uids[i]).emit('event:new_post', result);
}
privileges.categories.filterUids('read', postData.topic.cid, uids, function(err, uids) {
if (err) {
return;
}
plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: "newPost"}, function(err, data) {
uids = data.uidsTo;
for(var i=0; i<uids.length; ++i) {
if (parseInt(uids[i], 10) !== socket.uid) {
websockets.in('uid_' + uids[i]).emit('event:new_post', result);
}
}
});
});
});
});

26
src/socket.io/topics.js
View File

@@ -41,22 +41,26 @@ SocketTopics.post = function(socket, data, callback) {
socket.emit('event:new_post', {posts: [result.postData]});
socket.emit('event:new_topic', result.topicData);
var uids = websockets.getConnectedClients();
privileges.categories.filterUids('read', result.topicData.cid, uids, function(err, uids) {
user.getUidsFromSet('users:online', 0, -1, function(err, uids) {
if (err) {
return;
}
plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: "newTopic"}, function(err, data) {
uids = data.uidsTo;
for(var i=0; i<uids.length; ++i) {
if (parseInt(uids[i], 10) !== socket.uid) {
websockets.in('uid_' + uids[i]).emit('event:new_post', {posts: [result.postData]});
websockets.in('uid_' + uids[i]).emit('event:new_topic', result.topicData);
}
privileges.categories.filterUids('read', result.topicData.cid, uids, function(err, uids) {
if (err) {
return;
}
plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: "newTopic"}, function(err, data) {
uids = data.uidsTo;
for(var i=0; i<uids.length; ++i) {
if (parseInt(uids[i], 10) !== socket.uid) {
websockets.in('uid_' + uids[i]).emit('event:new_post', {posts: [result.postData]});
websockets.in('uid_' + uids[i]).emit('event:new_topic', result.topicData);
}
}
});
});
});
});

24
src/user.js
View File

@@ -137,11 +137,14 @@ var async = require('async'),
User.updateLastOnlineTime = function(uid, callback) {
callback = callback || function() {};
User.getUserFields(uid, ['status', 'lastonline'], function(err, userData) {
if(err || userData.status === 'offline' || Date.now() - parseInt(userData.lastonline, 10) < 300000) {
var now = Date.now();
if(err || userData.status === 'offline' || now - parseInt(userData.lastonline, 10) < 300000) {
return callback(err);
}
User.setUserField(uid, 'lastonline', Date.now(), callback);
db.sortedSetAdd('users:online', now, uid);
User.setUserField(uid, 'lastonline', now, callback);
});
};
@@ -184,15 +187,20 @@ var async = require('async'),
});
};
User.getUidsFromSet = function(set, start, stop, callback) {
if (set === 'users:online') {
var count = parseInt(stop, 10) === -1 ? stop : stop - start + 1;
var now = Date.now();
db.getSortedSetRevRangeByScore(set, start, count, now, now - 300000, next);
} else {
db.getSortedSetRevRange(set, start, stop, next);
}
};
User.getUsersFromSet = function(set, start, stop, callback) {
async.waterfall([
function(next) {
if (set === 'users:online') {
var uids = require('./socket.io').getConnectedClients();
next(null, uids.slice(start, stop + 1));
} else {
db.getSortedSetRevRange(set, start, stop, next);
}
User.getUidsFromSet(set, start, stop, next);
},
function(uids, next) {
User.getUsers(uids, next);