Previous worked but sometimes stalled

Author: ctzsnooze

src/js/tabs/onboard_logging.js

@@ -490,45 +490,37 @@ onboard_logging.initialize = function (callback) {
                     show_saving_dialog();
 
 function onChunkRead(chunkAddress, chunkDataView, bytesCompressed) {
-    if (chunkDataView !== null && chunkDataView.byteLength > 0) {
-        // Write whatever we received, even if the block had CRC issues
+    if (chunkDataView && chunkDataView.byteLength > 0) {
+        // Always write non-empty data, even if CRC mismatch
+        const blob = new Blob([chunkDataView]);
+        FileSystem.writeChunck(openedFile, blob);
+
         nextAddress += chunkDataView.byteLength;
 
-        if (isNaN(bytesCompressed) || isNaN(totalBytesCompressed)) {
-            totalBytesCompressed = null;
-        } else {
+        if (!isNaN(bytesCompressed) && !isNaN(totalBytesCompressed)) {
             totalBytesCompressed += bytesCompressed;
+        } else {
+            totalBytesCompressed = null;
         }
 
         $(".dataflash-saving progress").attr("value", (nextAddress / maxBytes) * 100);
 
-        const blob = new Blob([chunkDataView]);
-        FileSystem.writeChunck(openedFile, blob).then(() => {
-            if (saveCancelled || nextAddress >= maxBytes) {
-                mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
-                FileSystem.closeFile(openedFile);
-            } else {
-                mspHelper.dataflashRead(nextAddress, self.blockSize, onChunkRead);
-            }
-        });
+        if (saveCancelled || nextAddress >= maxBytes) {
+            mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
+            FileSystem.closeFile(openedFile);
+        } else {
+            mspHelper.dataflashRead(nextAddress, self.blockSize, onChunkRead);
+        }
 
-    } else if (chunkDataView !== null && chunkDataView.byteLength === 0) {
-        // Zero-byte block → end-of-file
+    } else if (chunkDataView && chunkDataView.byteLength === 0) {
+        // Zero-length block → EOF
         mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
         FileSystem.closeFile(openedFile);
 
     } else {
-        // CRC or address mismatch
-        console.warn(`Skipping block at address ${nextAddress} due to CRC or mismatch`);
-
-        // If some data arrived (chunkDataView not null), write it anyway
-        if (chunkDataView && chunkDataView.byteLength > 0) {
-            const blob = new Blob([chunkDataView]);
-            FileSystem.writeChunck(openedFile, blob);
-            nextAddress += chunkDataView.byteLength;
-        } else {
-            nextAddress += self.blockSize;
-        }
+        // Null block → skip ahead (hard error)
+        console.warn(`Skipping null block at address ${nextAddress}`);
+        nextAddress += self.blockSize;
 
         if (nextAddress >= maxBytes) {
             mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);