add serverGraphDuration config option

lib/app.js

@@ -15,7 +15,7 @@ class App {
     this.mojangUpdater = new MojangUpdater(this)
     this.pingController = new PingController(this)
     this.server = new Server(this.handleClientConnection)
-    this.timeTracker = new TimeTracker()
+    this.timeTracker = new TimeTracker(this)
   }
 
   loadDatabase (callback) {
@@ -24,7 +24,7 @@ class App {
     // Setup database instance
     this.database.ensureIndexes()
 
-    this.database.loadGraphPoints(config.graphDuration, () => {
+    this.database.loadGraphPoints(this.pingController.getMaxGraphDataLength(), () => {
       this.database.loadRecords(callback)
     })
   }
@@ -68,7 +68,9 @@ class App {
 
         // Send configuration data for rendering the page
         return {
-          graphDuration: config.graphDuration,
+          graphDurationLabel: config.graphDurationLabel || (Math.floor(config.graphDuration / (60 * 60 * 1000)) + 'h'),
+          graphMaxLength: this.pingController.getMaxGraphDataLength(),
+          serverGraphMaxLength: this.pingController.getMaxServerGraphDataLength(),
           servers: this.serverRegistrations.map(serverRegistration => serverRegistration.data),
           minecraftVersions: minecraftVersionNames,
           isGraphVisible: config.logToDatabase

lib/database.js

@@ -14,27 +14,19 @@ class Database {
     })
   }
 
-  loadGraphPoints (graphDuration, callback) {
-    // Query recent pings
-    const endTime = new Date().getTime()
-    const startTime = endTime - graphDuration
-
-    this.getRecentPings(startTime, endTime, pingData => {
+  loadGraphPoints (length, callback) {
+    this.getRecentPings(length, pingData => {
       const graphPointsByIp = []
 
       for (const row of pingData) {
-        // Avoid loading outdated records
-        // This shouldn't happen and is mostly a sanity measure
-        if (startTime - row.timestamp <= graphDuration) {
-          // Load into temporary array
-          // This will be culled prior to being pushed to the serverRegistration
-          let graphPoints = graphPointsByIp[row.ip]
-          if (!graphPoints) {
-            graphPoints = graphPointsByIp[row.ip] = []
-          }
-
-          graphPoints.push([row.timestamp, row.playerCount])
+        // Load into temporary array
+        // This will be culled prior to being pushed to the serverRegistration
+        let graphPoints = graphPointsByIp[row.ip]
+        if (!graphPoints) {
+          graphPoints = graphPointsByIp[row.ip] = []
         }
+
+        graphPoints.push([row.timestamp, row.playerCount])
       }
 
       Object.keys(graphPointsByIp).forEach(ip => {
@@ -80,10 +72,9 @@ class Database {
     })
   }
 
-  getRecentPings (startTime, endTime, callback) {
-    this._sql.all('SELECT * FROM pings WHERE timestamp >= ? AND timestamp <= ?', [
-      startTime,
-      endTime
+  getRecentPings (length, callback) {
+    this._sql.all('SELECT * FROM pings WHERE 1 LIMIT ?', [
+      length
     ], (_, data) => callback(data))
   }
 

lib/ping.js

@@ -151,6 +151,14 @@ class PingController {
       }, version.protocolId)
     }
   }
+
+  getMaxServerGraphDataLength () {
+    return Math.ceil(config.serverGraphDuration / config.rates.pingAll)
+  }
+
+  getMaxGraphDataLength () {
+    return Math.ceil(config.graphDuration / config.rates.pingAll)
+  }
 }
 
 module.exports = PingController

lib/servers.js

@@ -1,8 +1,6 @@
 const config = require('../config')
 const minecraftVersions = require('../minecraft_versions')
 
-const SERVER_GRAPH_DATA_MAX_LENGTH = 72
-
 class ServerRegistration {
   serverId
   lastFavicon
@@ -10,7 +8,8 @@ class ServerRegistration {
   recordData
   graphData = []
 
-  constructor (serverId, data) {
+  constructor (app, serverId, data) {
+    this._app = app
     this.serverId = serverId
     this.data = data
     this._pingHistory = []
@@ -107,7 +106,7 @@ class ServerRegistration {
     this._pingHistory.push(ping)
 
     // Trim pingHistory to avoid memory leaks
-    if (this._pingHistory.length > SERVER_GRAPH_DATA_MAX_LENGTH) {
+    if (this._pingHistory.length > this._app.pingController.getMaxServerGraphDataLength()) {
       this._pingHistory.shift()
     }
   }
@@ -203,9 +202,10 @@ class ServerRegistration {
     this.graphData.push([timestamp, playerCount])
     this._lastGraphDataPush = timestamp
 
-    // Trim old graphPoints according to graphDuration
-    const filterTimestamp = new Date().getTime() - config.graphDuration
-    this.graphData = this.graphData.filter(point => point[0] >= filterTimestamp)
+    // Trim old graphPoints according to #getMaxGraphDataLength
+    if (this.graphData.length > this._app.pingController.getMaxGraphDataLength()) {
+      this.graphData.shift()
+    }
 
     return true
   }

lib/time.js

@@ -1,7 +1,6 @@
-const SERVER_GRAPH_DATA_MAX_LENGTH = require('./servers').SERVER_GRAPH_DATA_MAX_LENGTH
-
 class TimeTracker {
-  constructor () {
+  constructor (app) {
+    this._app = app
     this._points = []
   }
 
@@ -10,7 +9,7 @@ class TimeTracker {
 
     this._points.push(timestamp)
 
-    if (this._points.length > SERVER_GRAPH_DATA_MAX_LENGTH) {
+    if (this._points.length > this._app.pingController.getMaxServerGraphDataLength()) {
       this._points.shift()
     }