Remove recreation of main log when live logging

CHANGELOG.md

@@ -1 +1 @@
-Added support for dragging fields on touch screens.
+Fixed a bug causing high memory usage and lag when connected to a live server for long periods.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "advantage-scope",
   "productName": "Advantage Scope",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "Logging tool from FRC Team 6328.",
   "main": "main.js",
   "scripts": {

www/decodeWorker.js

@@ -5,12 +5,18 @@ var log = new Log()
 var logRevision = null
 var keyIDs = {}
 
+var isLive = false
+var dataArray = null
+var dataBuffer = null
+var decoder = new TextDecoder("UTF-8")
+var offset = null
+
 // Decodes a series of bytes from an RLOG file and returns serializable data for a Log()
 onmessage = function (event) {
-  var dataArray = event.data
-  var dataBuffer = new DataView(dataArray.buffer)
-  var decoder = new TextDecoder("UTF-8")
-  var offset = 0
+  isLive = event.data.isLive
+  dataArray = event.data.bytes
+  dataBuffer = new DataView(dataArray.buffer)
+  offset = 0
 
   function shiftOffset(shift) {
     return (offset += shift) - shift
@@ -132,14 +138,21 @@ onmessage = function (event) {
             break;
         }
       }
-      log.add(entry)
+      if (isLive) { // If live, stop after one entry and send data back to index.js
+        this.postMessage({
+          status: "newLiveData",
+          data: entry
+        })
+      } else { // If not live, read all data and process log here
+        log.add(entry)
+      }
     }
   } catch (error) {
     console.error(error.message)
   }
   log.updateDisplayKeys()
   this.postMessage({
-    status: "newData",
+    status: "newLog",
     data: log.rawData
   })
 }

www/index.js

@@ -128,7 +128,7 @@ window.addEventListener("open-file", event => {
   var startTime = new Date().getTime()
 
   decodeWorker = new Worker("decodeWorker.js", { type: "module" })
-  decodeWorker.postMessage(event.detail.data)
+  decodeWorker.postMessage({ bytes: event.detail.data, isLive: false })
   decodeWorker.onmessage = event => {
     switch (event.data.status) {
       case "incompatible": // Failed to read log file
@@ -137,7 +137,7 @@ window.addEventListener("open-file", event => {
         }))
         break
 
-      case "newData": // New data to show, reset everything
+      case "newLog": // New data to show, reset everything
         var oldState = getWindowState()
         window.log = new Log()
         window.log.rawData = event.data.data
@@ -154,8 +154,8 @@ window.addEventListener("open-file", event => {
 })
 
 window.addEventListener("start-live", () => {
-  window.liveStart = null
   window.liveActive = true
+  window.liveStart = null
   window.dispatchEvent(new Event("stop-live-socket"))
   setTitle(prefs.address + ":" + prefs.port.toString() + " \u2014 Advantage Scope")
 
@@ -174,12 +174,14 @@ window.addEventListener("start-live", () => {
         window.dispatchEvent(new Event("stop-live-socket"))
         break
 
-      case "newData": // New data to show
+      case "newLiveData": // New data to show
         var oldFieldCount = window.log == null ? 0 : window.log.getFieldCount()
         var oldState = getWindowState()
 
-        window.log = new Log()
-        window.log.rawData = event.data.data
+        if (firstData) window.log = new Log()
+
+        window.log.add(event.data.data)
+        window.log.updateDisplayKeys()
 
         var timeRange = window.log.getTimestamps()[window.log.getTimestamps().length - 1] - window.log.getTimestamps()[0]
         window.liveStart = (new Date().getTime() / 1000) - timeRange
@@ -209,7 +211,7 @@ window.addEventListener("start-live", () => {
 
 window.addEventListener("live-data", event => {
   if (window.liveActive) {
-    decodeWorker.postMessage(event.detail)
+    decodeWorker.postMessage({ bytes: event.detail, isLive: true })
   }
 })