From b11eac277d32e3f9f0e98698386ac58f74d2ef9d Mon Sep 17 00:00:00 2001
From: Michael Morrison <517502+mmorrisontx@users.noreply.github.com>
Date: Sat, 5 Feb 2022 19:24:15 -0600
Subject: [PATCH] Improve dayz mod parsing with more random reverse engineering
 guesses

---
 lib/reader.js      |  4 ++++
 protocols/valve.js | 34 ++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/lib/reader.js b/lib/reader.js
index 0ab184e..309ea6b 100644
--- a/lib/reader.js
+++ b/lib/reader.js
@@ -28,6 +28,10 @@ class Reader {
         this.i = 0;
     }
 
+    setOffset(offset) {
+        this.i = offset;
+    }
+
     offset() {
         return this.i;
     }
diff --git a/protocols/valve.js b/protocols/valve.js
index bffc8e3..3aa23e4 100644
--- a/protocols/valve.js
+++ b/protocols/valve.js
@@ -1,6 +1,7 @@
-const Bzip2 = require('compressjs').Bzip2,
-    Core = require('./core'),
-    Results = require('../lib/Results');
+const Bzip2 = require('compressjs').Bzip2;
+const Core = require('./core');
+const Results = require('../lib/Results');
+const Reader = require('../lib/reader');
 
 const AppId = {
     Squad: 393380,
@@ -318,26 +319,39 @@ class Valve extends Core {
         this.logger.debug("overflow " + overflow);
         this.logger.debug("dlc1 " + dlc1);
         this.logger.debug("dlc2 " + dlc2);
+        if (dlc1) {
+            const unknown = this.readDayzUint(reader, 4); // ?
+            this.logger.debug("unknown " + unknown);
+        }
+        if (dlc2) {
+            const unknown = this.readDayzUint(reader, 4); // ?
+            this.logger.debug("unknown " + unknown);
+        }
         const mods = [];
         mods.push(...this.readDayzModsSection(reader, true));
         mods.push(...this.readDayzModsSection(reader, false));
+        this.logger.debug("dayz buffer rest:", reader.rest());
         return mods;
     }
-    readDayzModsSection(reader, withHeader) {
+    readDayzModsSection(/** Reader */ reader, withHeader) {
         const out = [];
         const count = this.readDayzByte(reader);
+        this.logger.debug("dayz mod section withHeader:" + withHeader + " count:" + count);
         for(let i = 0; i < count; i++) {
+            if (reader.done()) break;
             const mod = {};
             if (withHeader) {
-                const unknown = this.readDayzUint(reader, 4); // mod hash?
-                if (i !== count - 1) {
-                    // For some reason this is 4 on all of them, but doesn't exist on the last one?
-                    const flag = this.readDayzByte(reader);
-                    //mod.flag = flag;
-                }
+                mod.unknown = this.readDayzUint(reader, 4); // ?
+
+                // For some reason this is 4 on all of them, but doesn't exist on the last one? but only sometimes?
+                const offset = reader.offset();
+                const flag = this.readDayzByte(reader);
+                if (flag !== 4) reader.setOffset(offset);
+
                 mod.workshopId = this.readDayzUint(reader, 4);
             }
             mod.title = this.readDayzString(reader);
+            this.logger.debug(mod);
             out.push(mod);
         }
         return out;