Begin work on frontend!

lib/mojang_services.js

@@ -1,10 +1,9 @@
 var request = require('request');
 
 var logger = require('./logger');
-var profiler = require('./profiler');
+var util = require('./util');
 
 var serviceNameLookup = {
-	'minecraft.net': 'Website',
 	'sessionserver.mojang.com': 'Sessions',
 	'authserver.mojang.com': 'Auth',
 	'textures.minecraft.net': 'Skins',
@@ -25,7 +24,7 @@ function updateService(name, status) {
 
 		// If it's an outage, track when it started.
 		if (status === 'yellow'|| status === 'red') {
-			newEntry.startTime = profiler.getCurrentTimeMs();
+			newEntry.startTime = util.getCurrentTimeMs();
 		}
 
 		// Generate a nice title from the color.

lib/ping.js

@@ -1,11 +1,11 @@
 var mcpe_ping = require('mcpe-ping');
 var mcpc_ping = require('mc-ping-updated');
 
-var profiler = require('./profiler');
+var util = require('./util');
 
 // This is a wrapper function for mc-ping-updated, mainly used to convert the data structure of the result.
 function pingMinecraftPC(host, port, timeout, callback) {
-    profiler.track(host);
+    var startTime = util.getCurrentTimeMs();
 
 	// Try catch incase the down stream module is bad at handling exceptions.
 	try {
@@ -20,7 +20,8 @@ function pingMinecraftPC(host, port, timeout, callback) {
 						max: res.players.max
 					},
 					version: res.version.protocol,
-					latency: profiler.untrack(host)
+					latency: util.getCurrentTimeMs() - startTime,
+					favicon: res.favicon
 				});
 		    }
 		}, timeout);	
@@ -31,7 +32,7 @@ function pingMinecraftPC(host, port, timeout, callback) {
 
 // This is a wrapper function for mcpe-ping, mainly used to convert the data structure of the result.
 function pingMinecraftPE(host, port, timeout, callback) {
-	profiler.track(host);
+	var startTime = util.getCurrentTimeMs();
 		
 	// Try catch incase the down stream module is bad at handling exceptions.
 	try {
@@ -42,11 +43,11 @@ function pingMinecraftPE(host, port, timeout, callback) {
 				// Remap our JSON into our custom structure.
 				callback(err, {
 					players: {
-						online: res.currentPlayers,
-						max: res.maxPlayers
+						online: parseInt(res.currentPlayers),
+						max: parseInt(res.maxPlayers)
 					},
 					version: res.version,
-					latency: profiler.untrack(host)
+					latency: util.getCurrentTimeMs() - startTime
 				});
 			}
 		}, timeout);

lib/profiler.js

@@ -1,31 +0,0 @@
-var logger = require('./logger');
-
-var timestamps = {};
-
-function getCurrentTimeMs() {
-    return (new Date).getTime();
-};
-
-exports.track = function(name) {
-    if (timestamps[name]) {
-        throw new Error(name + ' is already being profiled!');
-    }
-
-    timestamps[name] = getCurrentTimeMs();
-};
-
-exports.untrack = function(name) {
-    if (!timestamps[name]) {
-        throw new Error(name + ' isn\'t being profiled!');
-    }
-
-    var timestamp = getCurrentTimeMs() - timestamps[name];
-
-    delete timestamps[name];
-
-    logger.log('debug', name + ' took ' + timestamp + 'ms');
-
-    return timestamp;
-};
-
-exports.getCurrentTimeMs = getCurrentTimeMs;

lib/util.js

@@ -0,0 +1,3 @@
+exports.getCurrentTimeMs = function() {
+    return new Date().getTime();
+};