From f68f8b2fbca0f954895a5d1f6f25e9b1073d485f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Petra=C5=A1inovi=C4=87?=
 <petrasinovicmp@gmail.com>
Date: Sat, 4 May 2024 16:55:07 +0200
Subject: [PATCH 1/2] Example fix

---
 index.html |  2 +-
 parser.js  | 52 ++++++++++++++++++++++++++++------------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/index.html b/index.html
index b7cdaa1..77b95c6 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 
 <script>
     // We use a worker because it is asynchronous, which means the ui doesn't freeze while parsing
-    const worker = new Worker('parser.js');
+    const worker = new Worker('parser.js', {type: 'module'});
 
     // output messages from worker
     worker.onmessage = (event) => {
diff --git a/parser.js b/parser.js
index f0d94bb..1b63d69 100644
--- a/parser.js
+++ b/parser.js
@@ -769,21 +769,23 @@ class DataflashParser {
         let mavtype
         const msgs = this.messages.MSG
         for (const i in msgs.Message) {
-            if (msgs.Message[i].toLowerCase().includes('arduplane')) {
-                mavtype = MAV_TYPE_FIXED_WING
-                return getModeMap(mavtype)[cmode]
-            } else if (msgs.Message[i].toLowerCase().includes('arducopter')) {
-                mavtype = MAV_TYPE_QUADROTOR
-                return getModeMap(mavtype)[cmode]
-            } else if (msgs.Message[i].toLowerCase().includes('ardusub')) {
-                mavtype = MAV_TYPE_SUBMARINE
-                return getModeMap(mavtype)[cmode]
-            } else if (msgs.Message[i].toLowerCase().includes('rover')) {
-                mavtype = MAV_TYPE_GROUND_ROVER
-                return getModeMap(mavtype)[cmode]
-            } else if (msgs.Message[i].toLowerCase().includes('tracker')) {
-                mavtype = MAV_TYPE_ANTENNA_TRACKER
-                return getModeMap(mavtype)[cmode]
+            if (msgs.Message.hasOwnProperty(i)) {
+                if (msgs.Message[i].toLowerCase().includes('arduplane')) {
+                    mavtype = MAV_TYPE_FIXED_WING
+                    return getModeMap(mavtype)[cmode]
+                } else if (msgs.Message[i].toLowerCase().includes('arducopter')) {
+                    mavtype = MAV_TYPE_QUADROTOR
+                    return getModeMap(mavtype)[cmode]
+                } else if (msgs.Message[i].toLowerCase().includes('ardusub')) {
+                    mavtype = MAV_TYPE_SUBMARINE
+                    return getModeMap(mavtype)[cmode]
+                } else if (msgs.Message[i].toLowerCase().includes('rover')) {
+                    mavtype = MAV_TYPE_GROUND_ROVER
+                    return getModeMap(mavtype)[cmode]
+                } else if (msgs.Message[i].toLowerCase().includes('tracker')) {
+                    mavtype = MAV_TYPE_ANTENNA_TRACKER
+                    return getModeMap(mavtype)[cmode]
+                }
             }
         }
         console.log('defaulting to quadcopter')
@@ -811,14 +813,16 @@ class DataflashParser {
             return
         }
         for (const i in this.messages.FILE.FileName) {
-            const name = this.messages.FILE.FileName[i]
-            const Data = this.messages.FILE.Data[i]
-            if (!this.files.hasOwnProperty(name)) {
-                this.files[name] = this.createUint8ArrayFromString(Data)
-            } else {
-                this.files[name] = this.concatTypedArrays(
-                    this.files[name], this.createUint8ArrayFromString(Data)
-                )
+            if (this.messages.FILE.FileName.hasOwnProperty(i)) {
+                const name = this.messages.FILE.FileName[i]
+                const Data = this.messages.FILE.Data[i]
+                if (!this.files.hasOwnProperty(name)) {
+                    this.files[name] = this.createUint8ArrayFromString(Data)
+                } else {
+                    this.files[name] = this.concatTypedArrays(
+                        this.files[name], this.createUint8ArrayFromString(Data)
+                    )
+                }
             }
         }
         if (this.send_postMessage) {
@@ -1086,7 +1090,7 @@ self.addEventListener('message', function (event) {
     if (event.data === null) {
         console.log('got bad file message!')
     } else if (event.data.action === 'parse') {
-        parser = new DataflashParser()
+        parser = new DataflashParser(true)
         const data = event.data.file
         parser.processData(data)
     } else if (event.data.action === 'loadType') {

From c5fc5bb763f5a6cbab517f8fb021c9ac9cdc2ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Petra=C5=A1inovi=C4=87?=
 <petrasinovicmp@gmail.com>
Date: Tue, 3 Dec 2024 20:07:45 +0100
Subject: [PATCH 2/2] Fix for require

---
 parser.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/parser.js b/parser.js
index 4de992d..82c6d54 100644
--- a/parser.js
+++ b/parser.js
@@ -597,7 +597,7 @@ class DataflashParser {
         }
 
         const has_instance = "InstancesOffsetArray" in msg_FMT
-        console.log(name, has_instance ? 'has instances' : 'has no instances')
+        //console.log(name, has_instance ? 'has instances' : 'has no instances')
 
         if (has_instance) {
             // Parse instances
@@ -1105,4 +1105,8 @@ self.addEventListener('message', function (event) {
     }
 })
 
-export default DataflashParser
+if (typeof module !== 'undefined' && module.exports) {
+  module.exports = DataflashParser;
+} else {
+  export default DataflashParser;
+}