@take-out/scripts 0.1.26 → 0.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -30,11 +30,11 @@
   "dependencies": {
     "@clack/prompts": "^0.8.2",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@take-out/helpers": "0.1.26",
+    "@take-out/helpers": "0.1.28",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {
-    "vxrn": "^1.6.16"
+    "vxrn": "^1.9.5"
   },
   "peerDependenciesMeta": {
     "vxrn": {
@@ -42,6 +42,6 @@
     }
   },
   "devDependencies": {
-    "vxrn": "1.6.16"
+    "vxrn": "1.9.5"
   }
 }

package/src/helpers/handleProcessExit.ts

@@ -5,6 +5,18 @@ import {
   type ProcessType,
 } from './run'
 
+// reset terminal to sane state
+function resetTerminal() {
+  try {
+    // restore cooked mode if we have a TTY
+    if (process.stdin.isTTY && process.stdin.setRawMode) {
+      process.stdin.setRawMode(false)
+    }
+  } catch {}
+  // reset ANSI attributes
+  process.stdout.write('\x1b[0m')
+}
+
 type ExitCallback = (info: { signal: NodeJS.Signals | string }) => void | Promise<void>
 
 interface HandleProcessExitReturn {
@@ -128,6 +140,8 @@ export function handleProcessExit({
   }
 
   const sigintHandler = () => {
+    // restore terminal to sane state
+    resetTerminal()
     // immediately print newline and reset cursor for clean terminal
     process.stdout.write('\n')
     // reset terminal attributes

package/src/run-pty.mjs

@@ -15,8 +15,6 @@ const colors = [
 ]
 const reset = '\x1b[0m'
 const dim = '\x1b[2m'
-const bold = '\x1b[1m'
-const inverse = '\x1b[7m'
 
 const args = process.argv.slice(2)
 const ownFlags = ['--no-root', '--bun', '--watch', '--flags=last']
@@ -289,7 +287,15 @@ function handleInput(data) {
 }
 
 function cleanup() {
-  console.log()
+  // restore terminal to cooked mode before exiting
+  if (process.stdin.isTTY && process.stdin.setRawMode) {
+    try {
+      process.stdin.setRawMode(false)
+    } catch {}
+  }
+  // reset terminal attributes (colors, etc)
+  process.stdout.write('\x1b[0m\n')
+
   for (const p of processes) {
     if (!p.killed) {
       p.killed = true
@@ -360,7 +366,24 @@ async function main() {
   process.on('SIGTERM', cleanup)
 }
 
+// restore terminal on any unexpected exit
+function restoreTerminal() {
+  if (process.stdin.isTTY && process.stdin.setRawMode) {
+    try {
+      process.stdin.setRawMode(false)
+    } catch {}
+  }
+  process.stdout.write('\x1b[0m')
+}
+
+process.on('uncaughtException', (e) => {
+  restoreTerminal()
+  console.error(e)
+  process.exit(1)
+})
+
 main().catch((e) => {
+  restoreTerminal()
   console.error(e)
   process.exit(1)
 })