Fascinated/Minetrack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

3.0.0

Browse Source
This commit is contained in:
Cryptkeeper!
2017-03-11 17:44:21 -06:00
committed by GitHub
parent b973968eca
commit 2c4f3e0865
11 changed files with 104 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/server.js
View File

@ -8,6 +8,7 @@ var util = require('./util');
var logger = require('./logger');
var config = require('../config.json');
var minecraft = require('../minecraft.json');
var servers = require('../servers.json');
var urlMapping = [];
@ -68,7 +69,9 @@ function handleRequest(req, res) {
graphDuration: config.graphDuration,
servers: servers,
bootTime: util.getBootTime(),
categoriesVisible: config.categoriesVisible || false
categoriesVisible: config.categoriesVisible || false,
serverTypesVisible: config.serverTypesVisible || false,
minecraftVersions: minecraft.versions
};
res.write('setPublicConfig(' + JSON.stringify(publicConfig) + ');');
@ -78,7 +81,7 @@ function handleRequest(req, res) {
var file = urlMapping[requestUrl];
res.setHeader('Content-Type', mime.lookup(file));
fs.createReadStream(file).pipe(res);
} else {
res.statusCode = 404;
@ -102,4 +105,4 @@ exports.start = function() {
// Since everything is loaded, let's celebrate!
logger.log('info', 'Started on %s:%d', config.site.ip, config.site.port);
};
};

24
lib/util.js
View File

@ -108,26 +108,25 @@ exports.setIntervalNoDelay = function(func, delay) {
return task;
};
exports.convertPingsToGraph = function(sqlData) {
exports.convertServerHistory = function(sqlData) {
var serverIps = getServerIps();
var graphData = {};
var highestPlayerCount = {};
var startTime = exports.getCurrentTimeMs();
for (var i = 0; i < sqlData.length; i++) {
var entry = sqlData[i];
if (serverIps.indexOf(entry.ip) === -1) {
continue;
}
if (serverIps.indexOf(entry.ip) === -1) continue;
var name = getServerNameByIp(entry.ip);
if (!graphData[name]) {
graphData[name] = [];
}
if (!graphData[name]) graphData[name] = [];
graphData[name].push([entry.timestamp, entry.playerCount]);
if (!highestPlayerCount[entry.ip]) highestPlayerCount[entry.ip] = 0;
if (entry.playerCount > highestPlayerCount[entry.ip]) highestPlayerCount[entry.ip] = entry.playerCount;
}
// Break it into minutes.
@ -136,9 +135,12 @@ exports.convertPingsToGraph = function(sqlData) {
// Drop old data.
exports.trimOldPings(graphData);
logger.info('Converted data structure in ' + (exports.getCurrentTimeMs() - startTime) + 'ms');
logger.info('Parsed ' + sqlData.length + ' ping records in ' + (exports.getCurrentTimeMs() - startTime) + 'ms');
return graphData;
return {
graphData: graphData,
highestPlayerCount: highestPlayerCount
};
};
exports.getBootTime = function() {
@ -166,4 +168,4 @@ exports.unfurlSRV = function(hostname, port, callback) {
}
callback(records[0].name, records[0].port);
})
};
};