fix cli in non-tty

Author: cubicap

packages/tools/src/commands/monitor.ts

@@ -12,10 +12,6 @@ const cmd = new Command("Monitor program output", {
     ) => {
         const echo = !(options["no-echo"] as boolean);
 
-        const rl = readline.createInterface({ input: process.stdin });
-        readline.emitKeypressEvents(process.stdin, rl);
-        process.stdin.setRawMode(true);
-
         const port = options["port"] as string;
         const baudrate = options["baudrate"] as string;
         const socket = options["socket"] as string;
@@ -29,30 +25,51 @@ const cmd = new Command("Monitor program output", {
             stdout.write(chalk.red(new TextDecoder().decode(data)));
         });
 
-        await new Promise((resolve) => {
-            process.stdin.on("keypress", (str, key) => {
-                if (key.ctrl && key.name === "c") {
-                    device.programOutput.onData(undefined);
-                    device.programError.onData(undefined);
-                    process.stdin.setRawMode(false);
-                    rl.close();
-                    resolve(null);
-                } else {
-                    if (echo) {
-                        if (key.sequence === "\r") {
-                            stdout.write("\r\n");
-                        } else if (str) {
-                            stdout.write(str);
+        const cleanup = () => {
+            device.programOutput.onData(undefined);
+            device.programError.onData(undefined);
+        };
+
+        if (process.stdin.isTTY) {
+            const rl = readline.createInterface({ input: process.stdin });
+            readline.emitKeypressEvents(process.stdin, rl);
+            process.stdin.setRawMode(true);
+
+            await new Promise((resolve) => {
+                process.stdin.on("keypress", (str, key) => {
+                    if (key.ctrl && key.name === "c") {
+                        cleanup();
+                        process.stdin.setRawMode(false);
+                        rl.close();
+                        resolve(null);
+                    } else {
+                        if (echo) {
+                            if (key.sequence === "\r") {
+                                stdout.write("\r\n");
+                            } else if (str) {
+                                stdout.write(str);
+                            }
                         }
+                        let out = key.sequence;
+                        if (out === "\r") {
+                            out = "\n";
+                        }
+                        device.programInput.write(new TextEncoder().encode(out));
                     }
-                    let out = key.sequence;
-                    if (out === "\r") {
-                        out = "\n";
-                    }
-                    device.programInput.write(new TextEncoder().encode(out));
-                }
+                });
             });
-        });
+        } else {
+            const rl = readline.createInterface({ input: process.stdin });
+            rl.on("line", (line) => {
+                device.programInput.write(new TextEncoder().encode(line + "\n"));
+            });
+            await new Promise((resolve) => {
+                rl.on("close", () => {
+                    cleanup();
+                    resolve(null);
+                });
+            });
+        }
     },
     options: {
         "no-echo": new Opt("Echo input", { isFlag: true }),

packages/tools/src/commands/util.ts

@@ -169,41 +169,63 @@ export async function withDevice(
 }
 
 export async function readPassword(prompt: string): Promise<string> {
+    stdout.write(prompt);
+
+    const password = process.stdin.isTTY ? await readPasswordTty() : await readPasswordNonTty();
+
+    if (password.length >= 8 || password.length === 0) {
+        return password;
+    }
+
+    stderr.write("Password too short\n");
+    throw 1;
+}
+
+async function readPasswordTty(): Promise<string> {
     const rl = readline.createInterface({ input: process.stdin });
     readline.emitKeypressEvents(process.stdin, rl);
     process.stdin.setRawMode(true);
 
-    stdout.write(prompt);
-
-    let stringPassword = "";
-    await new Promise((resolve, reject) => {
-        process.stdin.on("keypress", (str, key) => {
-            if (key.ctrl && key.name === "c") {
-                process.stdin.setRawMode(false);
-                rl.close();
-                reject(1);
-                return;
-            }
-            if (key.sequence === "\r") {
-                if (stringPassword.length >= 8 || stringPassword.length === 0) {
-                    stdout.write("\n");
-                    resolve(null);
-                } else {
-                    stdout.write("\n");
-                    stderr.write("Password too short\n");
+    let password = "";
+    try {
+        await new Promise<void>((resolve, reject) => {
+            process.stdin.on("keypress", (str, key) => {
+                if (key.ctrl && key.name === "c") {
                     reject(1);
+                    return;
                 }
-            } else if (key.sequence === "\b" || key.sequence === "\x7f") {
-                if (stringPassword.length === 0) {
+                if (key.sequence === "\r") {
+                    stdout.write("\n");
+                    resolve();
                     return;
                 }
-                stdout.write("\b \b");
-                stringPassword = stringPassword.slice(0, -1);
-            } else {
-                stringPassword += key.sequence;
+                if (key.sequence === "\b" || key.sequence === "\x7f") {
+                    if (password.length === 0) {
+                        return;
+                    }
+                    stdout.write("\b \b");
+                    password = password.slice(0, -1);
+                    return;
+                }
+                password += key.sequence;
                 stdout.write("*");
-            }
+            });
         });
-    });
-    return stringPassword;
+    } finally {
+        process.stdin.setRawMode(false);
+        rl.close();
+    }
+    return password;
+}
+
+async function readPasswordNonTty(): Promise<string> {
+    const rl = readline.createInterface({ input: process.stdin, terminal: false });
+    try {
+        for await (const line of rl) {
+            return line;
+        }
+    } finally {
+        rl.close();
+    }
+    throw 1;
 }