Backend cleanup (#146)

* Add ServerRegistration, begin refactoring to match frontend

* move graphData logic into ServerRegistration

* move ping updates/history into ServerRegistration

* start updating main app entry methods

* fix default rates.updateMojangStatus

* fix record loading delays on freshly booted instances

* move database loading logic to method + callback

* use data in frontend for type lookup instead of ping

* cleanup app.js

* reorganize methods to improve flow

* avoid useless mojang updates, remove legacy fields

* rename legacy fields for consistency

* finish restructure around App model

* ensure versions are sorted by release order

* filter errors sent to frontend to avoid data leaks

* fix version listing behavior on frontend

* 5.1.0

assets/js/main.js

@@ -69,7 +69,7 @@ document.addEventListener('DOMContentLoaded', function () {
     const serverRegistration = app.serverRegistry.getServerRegistration(data.name)
 
     if (serverRegistration) {
-      app.graphDisplayManager.addGraphPoint(serverRegistration.serverId, data.timestamp, data.players)
+      app.graphDisplayManager.addGraphPoint(serverRegistration.serverId, data.timestamp, data.playerCount)
 
       // Only redraw the graph if not mutating hidden data
       if (serverRegistration.isVisible) {
@@ -94,7 +94,7 @@ document.addEventListener('DOMContentLoaded', function () {
   })
 
   socket.on('updateMojangServices', function (data) {
-    Object.values(data).forEach(app.mojangUpdater.updateServiceStatus)
+    app.mojangUpdater.updateStatus(data)
   })
 
   socket.on('setPublicConfig', function (data) {
@@ -125,7 +125,7 @@ document.addEventListener('DOMContentLoaded', function () {
     const serverRegistration = app.serverRegistry.getServerRegistration(data.name)
 
     if (serverRegistration) {
-      serverRegistration.updateServerPeak(data.timestamp, data.players)
+      serverRegistration.updateServerPeak(data.timestamp, data.playerCount)
     }
   })
 
@@ -134,10 +134,9 @@ document.addEventListener('DOMContentLoaded', function () {
       const serverRegistration = app.serverRegistry.getServerRegistration(serverName)
 
       if (serverRegistration) {
-        const graphData = data[serverName]
+        const graphPeak = data[serverName]
 
-        // [0] and [1] indexes correspond to flot.js' graphing data structure
-        serverRegistration.updateServerPeak(graphData[0], graphData[1])
+        serverRegistration.updateServerPeak(graphPeak.timestamp, graphPeak.playerCount)
       }
     })
   })

assets/js/mojang.js

@@ -1,10 +1,16 @@
 const MOJANG_STATUS_BASE_CLASS = 'header-button header-button-group'
 
 export class MojangUpdater {
-  updateServiceStatus (status) {
+  updateStatus (services) {
+    for (const name of Object.keys(services)) {
+      this.updateServiceStatus(name, services[name])
+    }
+  }
+
+  updateServiceStatus (name, title) {
     // HACK: ensure mojang-status is added for alignment, replace existing class to swap status color
-    document.getElementById('mojang-status_' + status.name).setAttribute('class', MOJANG_STATUS_BASE_CLASS + ' mojang-status-' + status.title.toLowerCase())
-    document.getElementById('mojang-status-text_' + status.name).innerText = status.title
+    document.getElementById('mojang-status_' + name).setAttribute('class', MOJANG_STATUS_BASE_CLASS + ' mojang-status-' + title.toLowerCase())
+    document.getElementById('mojang-status-text_' + name).innerText = title
   }
 
   reset () {

assets/js/servers.js

@@ -204,7 +204,7 @@ export class ServerRegistration {
       const versionsElement = document.getElementById('version_' + this.serverId)
 
       versionsElement.style.display = 'block'
-      versionsElement.innerText = formatMinecraftVersions(ping.versions, minecraftVersions[ping.info.type]) || ''
+      versionsElement.innerText = formatMinecraftVersions(ping.versions, minecraftVersions[this.data.type]) || ''
     }
 
     // Compare against a cached value to avoid empty updates
@@ -237,8 +237,7 @@ export class ServerRegistration {
       playerCountLabelElement.style.display = 'none'
       errorElement.style.display = 'block'
 
-      // Attempt to find an error cause from documented options
-      errorElement.innerText = ping.error.description || ping.error.errno || 'Unknown error'
+      errorElement.innerText = ping.error.message
     } else if (ping.result) {
       // Ensure the player-count element is visible and hide the error element
       playerCountLabelElement.style.display = 'block'

assets/js/util.js

@@ -64,16 +64,14 @@ export function formatMinecraftVersions (versions, knownVersions) {
   const versionGroups = []
 
   for (let i = 0; i < versions.length; i++) {
-    const versionIndex = versions[i]
-
     // Look for value mismatch between the previous index
     // Require i > 0 since lastVersionIndex is undefined for i === 0
-    if (i > 0 && versions[i] - 1 !== versionIndex - 1) {
+    if (i > 0 && versions[i] - versions[i - 1] !== 1) {
       versionGroups.push(currentVersionGroup)
       currentVersionGroup = []
     }
 
-    currentVersionGroup.push(versionIndex)
+    currentVersionGroup.push(versions[i])
   }
 
   // Ensure the last versionGroup is always pushed