bmweb-cli 0.1.2 → 0.1.4

package/dist/bmweb.js

@@ -814,6 +814,7 @@ import { createInterface } from "node:readline";
 
 // src/serial.ts
 import { readdirSync as readdirSync2 } from "node:fs";
+var RX_KICK_MS = 4;
 var PORT_PATTERNS = [
   /^cu\.usbserial/i,
   /^cu\.SLAB/i,
@@ -827,8 +828,12 @@ var NodeSerialPort = class {
   binding = null;
   /** chunks heard and not yet read */
   chunks = [];
-  /** the one read waiting for bytes, when the queue is empty */
-  waiter = null;
+  /** reads waiting for bytes, oldest first, when the queue is empty */
+  waiters = [];
+  /** the receive kick, running while a read waits (see startKick) */
+  kick = null;
+  /** a kick ioctl in flight, so they never pile up */
+  kicking = false;
   /** the lines as last set, so a partial setSignals keeps the others */
   lines = { dtr: false, rts: false, brk: false };
   /** the wire trace sink, when the CLI wants one */
@@ -864,23 +869,25 @@ var NodeSerialPort = class {
   async close() {
     const b = this.binding;
     this.binding = null;
-    if (this.waiter) {
-      const w = this.waiter;
-      this.waiter = null;
-      w({ value: void 0, done: true });
-    }
+    this.stopKick();
+    this.wakeAll();
     this.chunks = [];
     if (b) await b.close();
   }
+  /** Tell every waiting read the port is done, and forget them. */
+  wakeAll() {
+    const ws = this.waiters;
+    this.waiters = [];
+    for (const w of ws) w({ value: void 0, done: true });
+  }
   /**
    * Bytes the binding heard: to the waiting read, else queued.
    * @param chunk - the bytes
    */
   push(chunk) {
     if (!chunk.length) return;
-    if (this.waiter) {
-      const w = this.waiter;
-      this.waiter = null;
+    const w = this.waiters.shift();
+    if (w) {
       w({ value: chunk, done: false });
       return;
     }
@@ -916,19 +923,54 @@ var NodeSerialPort = class {
     if (next) return Promise.resolve({ value: next, done: false });
     if (!this.binding) return Promise.resolve({ value: void 0, done: true });
     return new Promise((resolve2) => {
-      this.waiter = resolve2;
+      this.waiters.push(resolve2);
+      this.startKick();
     });
   }
+  /**
+   * Make the driver deliver what it has heard.
+   *
+   * THE BUG THIS FIXES. On macOS the built-in FTDI driver does not wake the
+   * reader when bytes arrive: with a read armed and the process simply
+   * waiting, an ECU's answer sat in the driver until some OTHER call touched
+   * the device (the next write, a modem-line change, close), and only then
+   * came out -- measured on a real car as 0 bytes for the first exchange
+   * after open and every later exchange delivering the PREVIOUS one's bytes
+   * at its start. Polling the modem lines (a TIOCMGET, no wire traffic)
+   * every few milliseconds while a read waits makes each answer arrive
+   * within the poll interval, first exchange included. The interval never
+   * holds the process open and stops itself once no read is waiting.
+   */
+  startKick() {
+    if (this.kick) return;
+    const tick = () => {
+      const b = this.binding;
+      if (!b || !this.waiters.length) {
+        this.stopKick();
+        return;
+      }
+      if (this.kicking) return;
+      this.kicking = true;
+      b.get().catch(() => null).then(() => {
+        this.kicking = false;
+      });
+    };
+    this.kick = setInterval(tick, RX_KICK_MS);
+    if (typeof this.kick === "object" && "unref" in this.kick)
+      this.kick.unref();
+  }
+  /** Stop the receive kick. */
+  stopKick() {
+    if (!this.kick) return;
+    clearInterval(this.kick);
+    this.kick = null;
+  }
   /**
    * Cancel the reader: a waiting read is told `done`, buffered bytes go.
    */
   cancel() {
     this.chunks = [];
-    if (this.waiter) {
-      const w = this.waiter;
-      this.waiter = null;
-      w({ value: void 0, done: true });
-    }
+    this.wakeAll();
   }
   /**
    * Write bytes. Resolves when the OS has them, not when they have left the
@@ -1867,6 +1909,7 @@ function terminalHomeHost(api, status) {
 var SHIFTED_DIGITS = "!@#$%^&*()";
 var DIGITS = "1234567890";
 var GAUGE_WIDTH = 12;
+var QUIT_MS = 4e3;
 function keyToPress(k) {
   if (k.ctrl && k.name === "c") return "quit";
   if (k.name === "escape") return "back";
@@ -1941,6 +1984,7 @@ function nodeTerminal() {
         });
       } finally {
         rl.close();
+        input.resume();
         raw(true);
         paused = false;
       }
@@ -2576,16 +2620,27 @@ async function tuiCommand(chassis, sgbd, opts = {}) {
       if (opts.menu !== p.menu) await p.openMenu(opts.menu);
     }
     const program = p;
+    let leaving = false;
     const unsubscribe = term.onKey((k) => {
       if (ui.modal) return;
       const what = keyToPress(k);
       if (what === null) return;
       if (what === "quit") {
-        unsubscribe();
-        program.leaveModule().catch(() => {
+        if (leaving) {
+          if (k.ctrl && !opts.term) {
+            term.close();
+            process.exit(130);
+          }
+          return;
+        }
+        leaving = true;
+        const done = program.leaveModule().catch(() => {
         });
+        const late = new Promise((r2) => setTimeout(r2, QUIT_MS));
+        Promise.race([done, late]).then(() => ui.left());
         return;
       }
+      if (leaving) return;
       if (what === "back") {
         ui.requestStop();
         program.back().catch(() => {
@@ -2607,7 +2662,7 @@ async function tuiCommand(chassis, sgbd, opts = {}) {
 }
 
 // src/bmweb.ts
-var VERSION = true ? "0.1.2" : "0.0.0-dev";
+var VERSION = true ? "0.1.4" : "0.0.0-dev";
 var INCLUDE = {
   include: {
     kind: "list",
@@ -2940,6 +2995,7 @@ async function main(argv, out = (l) => process.stdout.write(l + "\n"), err = (l)
 if (typeof process !== "undefined" && process.argv[1] && /bmweb(\.js)?$/.test(process.argv[1])) {
   main(process.argv.slice(2)).then((code) => {
     process.exitCode = code;
+    process.stdout.write("", () => process.exit(code));
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bmweb-cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "BMWeb's tools as a command line: read INPA .IPO scripts, compile .IPS sources, search the corpus job index, decode and diff shared Garage reports, and, over a K+DCAN cable, run jobs, whole-car scans and INPA screens in the terminal.",
   "license": "GPL-3.0-only",
   "type": "module",