work on bulking updateServer payloads and single timestamps

lib/ping.js

@@ -97,6 +97,40 @@ class PingController {
   }
 
   pingAll = () => {
+    const timestamp = new Date().getTime()
+
+    this.startPingTasks(results => {
+      const updates = []
+
+      for (const serverRegistration of this._app.serverRegistrations) {
+        const result = results[serverRegistration.serverId]
+
+        // Log to database if enabled
+        if (config.logToDatabase) {
+          const playerCount = result.resp ? result.resp.players.online : 0
+          this._app.database.insertPing(serverRegistration.data.ip, timestamp, playerCount)
+        }
+
+        // Generate a combined update payload
+        // This includes any modified fields and flags used by the frontend
+        // This will not be cached and can contain live metadata
+        const update = serverRegistration.handlePing(timestamp, result.resp, result.err, result.version)
+        updates[serverRegistration.serverId] = update
+      }
+
+      // Send object since updates uses serverIds as keys
+      // Send a single timestamp entry since it is shared
+      this._app.server.broadcast(MessageOf('updateServers', {
+        timestamp,
+        updates
+      }))
+    })
+  }
+
+  startPingTasks = (callback) => {
+    const results = []
+    let remainingTasks = this._app.serverRegistrations.length
+
     for (const serverRegistration of this._app.serverRegistrations) {
       const version = serverRegistration.getNextProtocolVersion()
 
@@ -105,36 +139,18 @@ class PingController {
           logger.log('error', 'Failed to ping %s: %s', serverRegistration.data.ip, err.message)
         }
 
-        this.handlePing(serverRegistration, resp, err, version)
+        results[serverRegistration.serverId] = {
+          resp,
+          err,
+          version
+        }
+
+        if (--remainingTasks === 0) {
+          callback(results)
+        }
       }, version.protocolId)
     }
   }
-
-  handlePing (serverRegistration, resp, err, version) {
-    const timestamp = new Date().getTime()
-
-    serverRegistration.addPing(timestamp, resp)
-
-    let updateHistoryGraph = false
-
-    if (config.logToDatabase) {
-      const playerCount = resp ? resp.players.online : 0
-
-      // Log to database
-      this._app.database.insertPing(serverRegistration.data.ip, timestamp, playerCount)
-
-      if (serverRegistration.addGraphPoint(resp !== undefined, playerCount, timestamp)) {
-        updateHistoryGraph = true
-      }
-    }
-
-    // Generate a combined update payload
-    // This includes any modified fields and flags used by the frontend
-    // This will not be cached and can contain live metadata
-    const updateMessage = serverRegistration.getUpdate(timestamp, resp, err, version, updateHistoryGraph)
-
-    this._app.server.broadcast(MessageOf('updateServer', updateMessage))
-  }
 }
 
 module.exports = PingController

lib/servers.js

@@ -14,12 +14,30 @@ class ServerRegistration {
     this._pingHistory = []
   }
 
-  getUpdate (timestamp, resp, err, version, updateHistoryGraph) {
-    const update = {
-      serverId: this.serverId,
-      timestamp: timestamp
+  handlePing (timestamp, resp, err, version) {
+    // Store into in-memory ping data
+    this.addPing(timestamp, resp)
+
+    // Only notify the frontend to append to the historical graph
+    // if both the graphing behavior is enabled and the backend agrees
+    // that the ping is eligible for addition
+    let updateHistoryGraph = false
+
+    if (config.logToDatabase) {
+      const playerCount = resp ? resp.players.online : 0
+
+      if (this.addGraphPoint(resp !== undefined, playerCount, timestamp)) {
+        updateHistoryGraph = true
+      }
     }
 
+    // Delegate out update payload generation
+    return this.getUpdate(timestamp, resp, err, version, updateHistoryGraph)
+  }
+
+  getUpdate (timestamp, resp, err, version, updateHistoryGraph) {
+    const update = {}
+
     if (resp) {
       if (resp.version && this.updateProtocolVersionCompat(resp.version, version.protocolId, version.protocolIndex)) {
         // Append an updated version listing