@kaynooo/cli-docker 0.8.0 → 0.8.1

package/dist/dx-cli.js

@@ -1878,14 +1878,24 @@ function up(lines) {
   return lines > 0 ? `\x1B[${lines}A` : "";
 }
 function openTerminal() {
-  let input;
+  let mode;
   try {
-    input = new tty.ReadStream(openSync("/dev/tty", "r"));
+    mode = new tty.ReadStream(openSync("/dev/tty", "r"));
   } catch {
     return fail("no terminal to read keys from (/dev/tty)");
   }
+  const keys = Bun.file("/dev/tty").stream().getReader();
   const out = process14.stderr;
   let resize;
+  async function read(onChunk) {
+    const decoder = new TextDecoder;
+    try {
+      for (let chunk = await keys.read();!chunk.done; chunk = await keys.read())
+        onChunk(decoder.decode(chunk.value, { stream: true }));
+    } catch {
+      onChunk("\x03");
+    }
+  }
   return {
     get columns() {
       return out.columns || 80;
@@ -1897,17 +1907,18 @@ function openTerminal() {
     write: (text) => void out.write(text),
     listen(onChunk, onResize) {
       resize = onResize;
-      input.setRawMode(true);
+      mode.setRawMode(true);
       out.on("resize", onResize);
-      input.on("data", (chunk) => onChunk(chunk.toString()));
+      read(onChunk);
     },
     close() {
       if (resize !== undefined)
         out.off("resize", resize);
       try {
-        input.setRawMode(false);
+        mode.setRawMode(false);
       } finally {
-        input.destroy();
+        mode.destroy();
+        keys.cancel();
       }
     }
   };

package/dist/sf-cli.js

@@ -1531,14 +1531,24 @@ function up(lines) {
   return lines > 0 ? `\x1B[${lines}A` : "";
 }
 function openTerminal() {
-  let input;
+  let mode;
   try {
-    input = new tty.ReadStream(openSync("/dev/tty", "r"));
+    mode = new tty.ReadStream(openSync("/dev/tty", "r"));
   } catch {
     return fail("no terminal to read keys from (/dev/tty)");
   }
+  const keys = Bun.file("/dev/tty").stream().getReader();
   const out = process14.stderr;
   let resize;
+  async function read(onChunk) {
+    const decoder = new TextDecoder;
+    try {
+      for (let chunk = await keys.read();!chunk.done; chunk = await keys.read())
+        onChunk(decoder.decode(chunk.value, { stream: true }));
+    } catch {
+      onChunk("\x03");
+    }
+  }
   return {
     get columns() {
       return out.columns || 80;
@@ -1550,17 +1560,18 @@ function openTerminal() {
     write: (text) => void out.write(text),
     listen(onChunk, onResize) {
       resize = onResize;
-      input.setRawMode(true);
+      mode.setRawMode(true);
       out.on("resize", onResize);
-      input.on("data", (chunk) => onChunk(chunk.toString()));
+      read(onChunk);
     },
     close() {
       if (resize !== undefined)
         out.off("resize", resize);
       try {
-        input.setRawMode(false);
+        mode.setRawMode(false);
       } finally {
-        input.destroy();
+        mode.destroy();
+        keys.cancel();
       }
     }
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaynooo/cli-docker",
   "type": "module",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "dc, dx, dlog and sf: docker compose on the stack found here, including one only its containers tell of, a compose service's shell, logs, restart, stop or rebuild, every service's health and recent errors in one call, and a Symfony console command picked and run.",
   "author": "Kaynooo <contact@kaynooo.fr>",
   "license": "MIT",
@@ -38,6 +38,6 @@
   },
   "devDependencies": {
     "@kaynooo/cli-env": "0.12.0",
-    "@kaynooo/cli-kit": "0.26.0"
+    "@kaynooo/cli-kit": "0.27.1"
   }
 }