@within-7/jetr 0.4.2 → 0.4.3

package/dist/cli.js

@@ -493,32 +493,7 @@ program.command("login").description("Login with username and password").argumen
     });
   }
   if (!password) {
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
-    process.stdout.write("Password: ");
-    const stdin = process.stdin;
-    const wasRaw = stdin.isRaw;
-    if (stdin.isTTY) stdin.setRawMode(true);
-    password = await new Promise((res) => {
-      let buf = "";
-      const onData = (ch) => {
-        const c = ch.toString();
-        if (c === "\n" || c === "\r" || c === "") {
-          if (stdin.isTTY) stdin.setRawMode(wasRaw ?? false);
-          stdin.removeListener("data", onData);
-          process.stdout.write("\n");
-          rl.close();
-          res(buf);
-        } else if (c === "") {
-          if (stdin.isTTY) stdin.setRawMode(wasRaw ?? false);
-          process.exit(1);
-        } else if (c === "\x7F" || c === "\b") {
-          buf = buf.slice(0, -1);
-        } else {
-          buf += c;
-        }
-      };
-      stdin.on("data", onData);
-    });
+    password = await readSecret("Password: ");
   }
   if (!user || !password) {
     console.error(chalk2.red("Username and password required"));
@@ -693,6 +668,34 @@ tokenCmd.command("revoke").description("Revoke a share token").argument("<site>"
     process.exit(1);
   }
 });
+function readSecret(prompt) {
+  return new Promise((resolve3) => {
+    process.stdout.write(prompt);
+    const stdin = process.stdin;
+    stdin.resume();
+    stdin.setRawMode(true);
+    stdin.setEncoding("utf8");
+    let buf = "";
+    const onData = (ch) => {
+      if (ch === "\n" || ch === "\r" || ch === "") {
+        stdin.setRawMode(false);
+        stdin.pause();
+        stdin.removeListener("data", onData);
+        process.stdout.write("\n");
+        resolve3(buf);
+      } else if (ch === "") {
+        stdin.setRawMode(false);
+        process.stdout.write("\n");
+        process.exit(1);
+      } else if (ch === "\x7F" || ch === "\b") {
+        buf = buf.slice(0, -1);
+      } else {
+        buf += ch;
+      }
+    };
+    stdin.on("data", onData);
+  });
+}
 function formatBytes(bytes) {
   if (bytes === 0) return "0 B";
   const units = ["B", "KB", "MB", "GB"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@within-7/jetr",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "CLI for Jetr static site hosting",
   "type": "module",
   "bin": {