@sensebox/flash-tool 1.1.0 → 1.1.1

package/dist/index.cjs

@@ -9,6 +9,132 @@ var _proptypes = require('prop-types'); var _proptypes2 = _interopRequireDefault
 // src/react/useFlashDevice.js
 
 
+// src/core/md5.js
+var S = [
+  7,
+  12,
+  17,
+  22,
+  7,
+  12,
+  17,
+  22,
+  7,
+  12,
+  17,
+  22,
+  7,
+  12,
+  17,
+  22,
+  5,
+  9,
+  14,
+  20,
+  5,
+  9,
+  14,
+  20,
+  5,
+  9,
+  14,
+  20,
+  5,
+  9,
+  14,
+  20,
+  4,
+  11,
+  16,
+  23,
+  4,
+  11,
+  16,
+  23,
+  4,
+  11,
+  16,
+  23,
+  4,
+  11,
+  16,
+  23,
+  6,
+  10,
+  15,
+  21,
+  6,
+  10,
+  15,
+  21,
+  6,
+  10,
+  15,
+  21,
+  6,
+  10,
+  15,
+  21
+];
+var K = Array.from(
+  { length: 64 },
+  (_, i) => Math.floor(Math.abs(Math.sin(i + 1)) * 2 ** 32) >>> 0
+);
+function md5Hex(data) {
+  const length = data.length;
+  const paddedLength = (length + 8 >> 6) + 1 << 6;
+  const buffer = new Uint8Array(paddedLength);
+  buffer.set(data);
+  buffer[length] = 128;
+  const view = new DataView(buffer.buffer);
+  view.setUint32(paddedLength - 8, length << 3 >>> 0, true);
+  view.setUint32(paddedLength - 4, Math.floor(length / 536870912), true);
+  let a0 = 1732584193;
+  let b0 = 4023233417;
+  let c0 = 2562383102;
+  let d0 = 271733878;
+  const M = new Uint32Array(16);
+  for (let offset = 0; offset < paddedLength; offset += 64) {
+    for (let j = 0; j < 16; j++) M[j] = view.getUint32(offset + j * 4, true);
+    let a = a0;
+    let b = b0;
+    let c = c0;
+    let d = d0;
+    for (let i = 0; i < 64; i++) {
+      let f;
+      let g;
+      if (i < 16) {
+        f = b & c | ~b & d;
+        g = i;
+      } else if (i < 32) {
+        f = d & b | ~d & c;
+        g = 5 * i + 1 & 15;
+      } else if (i < 48) {
+        f = b ^ c ^ d;
+        g = 3 * i + 5 & 15;
+      } else {
+        f = c ^ (b | ~d);
+        g = 7 * i & 15;
+      }
+      const sum = a + f + K[i] + M[g] >>> 0;
+      a = d;
+      d = c;
+      c = b;
+      b = b + (sum << S[i] | sum >>> 32 - S[i]) >>> 0;
+    }
+    a0 = a0 + a >>> 0;
+    b0 = b0 + b >>> 0;
+    c0 = c0 + c >>> 0;
+    d0 = d0 + d >>> 0;
+  }
+  const out = new DataView(new ArrayBuffer(16));
+  [a0, b0, c0, d0].forEach((word, i) => out.setUint32(i * 4, word, true));
+  return Array.from(
+    new Uint8Array(out.buffer),
+    (byte) => byte.toString(16).padStart(2, "0")
+  ).join("");
+}
+
 // src/core/esptool.js
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var DEFAULT_USB_VENDOR_ID = 12346;
@@ -189,6 +315,9 @@ async function flashBinary({
         `Expected ${expectedChip}, but connected to ${loader.chip.CHIP_NAME}. Check the selected board.`
       );
     }
+    const sizes = fileArray.map((file) => file.data.length);
+    const totalSize = sizes.reduce((sum, size) => sum + size, 0);
+    const doneBefore = (index) => sizes.slice(0, index).reduce((sum, size) => sum + size, 0);
     await loader.writeFlash({
       fileArray,
       flashSize,
@@ -196,9 +325,14 @@ async function flashBinary({
       flashFreq,
       eraseAll,
       compress: true,
-      reportProgress: (_fileIndex, written, total) => {
-        if (total > 0) {
-          onProgress == null ? void 0 : onProgress(Math.round(written / total * 100));
+      // Read the MD5 back from the chip after each file, so a write that
+      // did not stick fails the upload instead of reporting success. Only
+      // with the stub: esptool-js parses the ROM's MD5 reply differently.
+      calculateMD5Hash: loader.IS_STUB ? md5Hex : void 0,
+      reportProgress: (fileIndex, written, total) => {
+        if (total > 0 && totalSize > 0) {
+          const done = doneBefore(fileIndex) + written / total * sizes[fileIndex];
+          onProgress == null ? void 0 : onProgress(Math.round(done / totalSize * 100));
         }
       }
     });
@@ -218,6 +352,9 @@ var esp = {
   vendorId: ESPRESSIF_VENDOR_ID,
   bootloaderProductId: 2,
   address: 65536,
+  // otadata partition in the senseBox TinyUF2 partition tables (MCU-S2 and
+  // MCU Eye). Rewritten on every sketch upload to select ota_0, see flash.js.
+  otadataAddress: 57344,
   flashMode: "dio",
   flashFreq: "80m",
   backend: "esp"
@@ -471,13 +608,28 @@ async function flashSamdBinary({ port, firmware, onLog, onProgress }) {
 }
 
 // src/core/flash.js
+var OTADATA_SIZE = 8192;
+function createOtadataBootOta0() {
+  const otadata = new Uint8Array(OTADATA_SIZE).fill(255);
+  otadata.set([1, 0, 0, 0], 0);
+  otadata.set([154, 152, 67, 71], 28);
+  return otadata;
+}
 function flashWithProfile({ profile, port, binary, options = {}, onLog, onProgress }, deps = { flashBinary, flashSamdBinary }) {
   if (profile.backend === "samd") {
     return deps.flashSamdBinary({ port, firmware: binary, onLog, onProgress });
   }
+  const address = _nullishCoalesce(options.address, () => ( profile.address));
+  const fileArray = [{ data: binary, address }];
+  if (options.writeOtadata !== false && profile.otadataAddress !== void 0 && address === profile.address) {
+    fileArray.push({
+      data: createOtadataBootOta0(),
+      address: profile.otadataAddress
+    });
+  }
   return deps.flashBinary({
     port,
-    fileArray: [{ data: binary, address: _nullishCoalesce(options.address, () => ( profile.address)) }],
+    fileArray,
     baudrate: options.baudrate,
     flashMode: options.flashMode,
     flashFreq: options.flashFreq,