sketchboard-app 1.0.7 → 1.0.8

package/bin/uninstall.js

@@ -19,59 +19,59 @@ try {
   }
 } catch { /* ignore */ }
 
-// ── Banner ────────────────────────────────────────────────────────────────────
 const shortPath = DATA_DIR.length > 48 ? "..." + DATA_DIR.slice(-45) : DATA_DIR;
 
+// ── Banner ────────────────────────────────────────────────────────────────────
 process.stdout.write("\n");
 process.stdout.write("  ╔════════════════════════════════════════════════════╗\n");
 process.stdout.write("  ║            SketchBoard Uninstaller                 ║\n");
 process.stdout.write("  ╠════════════════════════════════════════════════════╣\n");
 
 if (exists && drawingCount > 0) {
-  process.stdout.write(`  ║  You have ${String(drawingCount)} saved drawing(s) stored at:         ║\n`);
+  const label = `  ║  ${drawingCount} drawing(s) saved at:`;
+  process.stdout.write(label.padEnd(54) + "║\n");
   process.stdout.write(`  ║  ${shortPath.padEnd(50)}  ║\n`);
 } else if (exists) {
-  process.stdout.write(`  ║  Data folder exists (no drawings yet):             ║\n`);
-  process.stdout.write(`  ║  ${shortPath.padEnd(50)}  ║\n`);
+  process.stdout.write(`  ║  Data folder: ${shortPath.padEnd(37)}║\n`);
 } else {
   process.stdout.write("  ║  No data folder found — nothing to delete.         ║\n");
 }
 
 process.stdout.write("  ╚════════════════════════════════════════════════════╝\n");
 process.stdout.write("\n");
-process.stdout.write("  How would you like to uninstall?\n\n");
-process.stdout.write("    [1]  Soft uninstall  — remove the app, keep your drawings  (default)\n");
-process.stdout.write("    [2]  Full uninstall  — remove the app AND delete all drawings\n\n");
-process.stdout.write("  Your choice (1 or 2, press Enter for 1): ");
+process.stdout.write("  [1]  Soft uninstall — keep your drawings  (default)\n");
+process.stdout.write("  [2]  Full uninstall — delete all drawings\n");
+process.stdout.write("\n");
+process.stdout.write("  Press 1 or 2 (auto-selects 1 after 30 s): ");
 
-// ── Read from the real console (works even when npm pipes stdin) ──────────────
-function readFromConsole() {
+// ── Read a single keypress from the real console ──────────────────────────────
+// `choice` on Windows reads directly from CONIN$ (bypasses npm's stdin pipe).
+// `bash /dev/tty` on Unix does the same.
+function readChoice() {
   if (process.platform === "win32") {
-    // On Windows, PowerShell's $Host.UI.ReadLine() reads directly from the
-    // console window regardless of stdin redirection by npm.
-    const result = spawnSync(
-      "powershell.exe",
-      ["-NoProfile", "-Command", "$Host.UI.ReadLine()"],
-      { stdio: ["inherit", "pipe", "inherit"], timeout: 30_000 },
+    const r = spawnSync(
+      "choice",
+      ["/c", "12", "/n", "/t", "30", "/d", "1"],
+      { stdio: ["inherit", "pipe", "inherit"], timeout: 35_000 },
     );
-    if (result.error || result.status !== 0) return "";
-    return (result.stdout || "").toString().trim();
-  } else {
-    // On Unix, read directly from /dev/tty (bypasses piped stdin).
-    const result = spawnSync(
-      "bash",
-      ["-c", "read -r ans </dev/tty && printf '%s' \"$ans\""],
-      { stdio: ["inherit", "pipe", "inherit"], timeout: 30_000 },
-    );
-    if (result.error || result.status !== 0) return "";
-    return (result.stdout || "").toString().trim();
+    // choice exits with code 1 for key '1', code 2 for key '2'
+    return r.status === 2 ? "2" : "1";
   }
+
+  // Unix: read one char directly from /dev/tty
+  const r = spawnSync(
+    "bash",
+    ["-c", "IFS= read -r -n1 ans </dev/tty && printf '%s' \"$ans\""],
+    { stdio: ["inherit", "pipe", "inherit"], timeout: 35_000 },
+  );
+  const ch = (r.stdout || "").toString().trim();
+  return ch === "2" ? "2" : "1";
 }
 
-const answer = readFromConsole();
-process.stdout.write("\n");
+const answer = readChoice();
+process.stdout.write(answer + "\n\n");
 
-// ── Act on the answer ─────────────────────────────────────────────────────────
+// ── Act on choice ─────────────────────────────────────────────────────────────
 if (answer === "2") {
   if (exists) {
     try {
@@ -82,7 +82,7 @@ if (answer === "2") {
       }
     } catch (err) {
       process.stderr.write(`  ✗ Could not delete ${DATA_DIR}: ${err.message}\n`);
-      process.stderr.write("    You can delete it manually in File Explorer.\n");
+      process.stderr.write("    Delete it manually in File Explorer.\n");
     }
   } else {
     process.stdout.write("  (No data folder to delete)\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sketchboard-app",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "SketchBoard — local-first whiteboard app. Run with: npx sketchboard-app",
   "main": "server.js",
   "bin": {