@em-foundation/emscope 25.4.0 → 25.4.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## VERSION-25-4.1
+
+* more robust port enumeration fix for PPK
+
 ## VERSION-25-4.0
 
 * added `--json` option

package/dist/emscope

@@ -13158,18 +13158,57 @@ async function powerOn(voltage) {
   progress.done();
 }
 async function findDevices() {
-  let res = new Array();
+  let candidates = new Array();
   for (const port of await import_serialport.SerialPort.list()) {
     const vid = port.vendorId;
     const pid = port.productId;
     if (vid == "1915" && pid.toLowerCase() == "c00a") {
-      res.push(port.path);
+      candidates.push(port.path);
+    }
+  }
+  fail("no PPK2 analyzer found", candidates.length == 0);
+  if (candidates.length == 1) return candidates;
+  const res = new Array();
+  for (const path of candidates) {
+    if (await probeDataPort(path)) {
+      res.push(path);
     }
   }
-  fail("no PPK2 analyzer found", res.length == 0);
-  res.sort();
+  fail("no PPK2 data port found (tried probing all candidates)", res.length == 0);
   return res;
 }
+async function probeDataPort(path, timeoutMs = 500) {
+  let port;
+  try {
+    port = new import_serialport.SerialPort({ path, baudRate: 9600, autoOpen: false });
+    await new Promise((resolve, reject) => {
+      port.open((err) => err ? reject(err) : resolve());
+    });
+    return await new Promise((resolve) => {
+      let responded = false;
+      const onData = () => {
+        if (!responded) {
+          responded = true;
+          resolve(true);
+        }
+      };
+      port.on("data", onData);
+      port.write([25 /* GET_META_DATA */]);
+      setTimeout(() => {
+        if (!responded) {
+          responded = true;
+          resolve(false);
+        }
+      }, timeoutMs);
+    });
+  } catch {
+    return false;
+  } finally {
+    if (port?.isOpen) {
+      await new Promise((resolve) => port.close(() => resolve()));
+    }
+  }
+}
 function parseMods(mods) {
   mods = mods.replace("END", "").trim().toLowerCase().replace(/-nan/g, "null").replace(/\n/g, ',\n"').replace(/: /g, '": ');
   let res;
@@ -13687,4 +13726,3 @@ try {
 js-yaml/dist/js-yaml.mjs:
   (*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT *)
 */
-//# sourceMappingURL=emscope.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@em-foundation/emscope",
-    "version": "25.4.0",
+    "version": "25.4.1",
     "description": "benchmark energy efficiency in resource-constrained embedded systems",
     "bin": {
         "emscope": "dist/emscope"