moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add new method for getting online/active node information 

* Use new online method for whos online
This commit is contained in:
Bryan Ashby 2016-01-30 15:18:55 -07:00
parent 6aabbb0548
commit 794c885ac1
2 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/client_connections.js
View File

@ -3,7 +3,11 @@
var logger = require('./logger.js');
var _ = require('lodash');
var moment = require('moment');
exports.getActiveConnections = getActiveConnections;
exports.getActiveNodeList = getActiveNodeList;
exports.addNewClient = addNewClient;
exports.removeClient = removeClient;
@ -14,6 +18,33 @@ function getActiveConnections() {
return clientConnections;
}
function getActiveNodeList() {
const now = moment();
return _.map(getActiveConnections(), ac => {
let entry = {
node : ac.node,
authenticated : ac.user.isAuthenticated(),
userId : ac.user.userId,
action : _.has(ac, 'currentMenuModule.menuConfig.desc') ? ac.currentMenuModule.menuConfig.desc : 'Unknown',
};
//
// There may be a connection, but not a logged in user as of yet
//
if(ac.user.isAuthenticated()) {
entry.userName = ac.user.username;
entry.realName = ac.user.properties.real_name;
entry.location = ac.user.properties.location;
entry.affils = ac.user.properties.affiliation;
const diff = now.diff(moment(ac.user.properties.last_login_timestamp), 'minutes');
entry.timeOn = moment.duration(diff, 'minutes');
}
return entry;
});
}
function addNewClient(client, clientSock) {
var id = client.session.id = clientConnections.push(client) - 1;

69
mods/whos_online.js
View File

@ -3,7 +3,7 @@
var MenuModule = require('../core/menu_module.js').MenuModule;
var ViewController = require('../core/view_controller.js').ViewController;
var getActiveConnections = require('../core/client_connections.js').getActiveConnections;
var getActiveNodeList = require('../core/client_connections.js').getActiveNodeList;
var moment = require('moment');
var async = require('async');
@ -67,60 +67,21 @@ WhosOnlineModule.prototype.mciReady = function(mciData, cb) {
function populateList(callback) {
var onlineListView = vc.getView(MciCodeIds.OnlineList);
var onlineList = getActiveConnections().slice(0, onlineListView.height);
var listFormat = self.menuConfig.config.listFormat || '{node} - {username} - {action} - {timeOn}';
var now = moment();
onlineListView.setItems(_.map(onlineList, function formatOnlineEntry(oe) {
var fmtObj = {
node : oe.node,
userId : oe.user.userId,
userName : oe.user.username,
realName : oe.user.properties.real_name,
timeOn : function getTimeOn() {
var diff = now.diff(moment(oe.user.properties.last_login_timestamp), 'minutes');
return _.capitalize(moment.duration(diff, 'minutes').humanize());
},
action : function getCurrentAction() {
var cmm = oe.currentMenuModule;
if(cmm) {
return cmm.menuConfig.desc || 'Unknown';
}
return 'Unknown';
//oe.currentMenuModule.menuConfig.desc || 'Unknown',
},
location : oe.user.properties.location,
affils : oe.user.properties.affiliation,
};
try {
return listFormat.format(fmtObj);
} catch(e) {
console.log('Exception caught formatting: ' + e.toString() + ':\n' + JSON.stringify(fmtObj));
const listFormat = self.menuConfig.config.listFormat || '{node} - {userName} - {action} - {timeOn}';
const nonAuthUser = self.menuConfig.config.nonAuthUser || 'Logging In';
const otherUnknown = self.menuConfig.config.otherUnknown || 'N/A';
const onlineList = getActiveNodeList().slice(0, onlineListView.height);
onlineListView.setItems(_.map(onlineList, oe => {
if(oe.authenticated) {
oe.timeOn = _.capitalize(oe.timeOn.humanize());
} else {
[ 'realName', 'location', 'affils', 'timeOn' ].forEach(m => {
oe[m] = otherUnknown;
});
oe.userName = nonAuthUser;
}
/*
return listFormat.format({
node : oe.node,
userId : oe.user.userId,
userName : oe.user.username,
realName : oe.user.properties.real_name,
timeOn : function getTimeOn() {
var diff = now.diff(moment(oe.user.properties.last_login_timestamp), 'minutes');
return _.capitalize(moment.duration(diff, 'minutes').humanize());
},
action : function getCurrentAction() {
var cmm = oe.currentMenuModule;
if(cmm) {
return cmm.menuConfig.desc || 'Unknown';
}
return 'Unknown';
//oe.currentMenuModule.menuConfig.desc || 'Unknown',
},
location : oe.user.properties.location,
affils : oe.user.properties.affiliation,
});
*/
return listFormat.format(oe);
}));
// :TODO: This is a hack until pipe codes are better implemented