lunel-cli 0.1.12 → 0.1.13

package/dist/index.js

@@ -4,12 +4,17 @@ import qrcode from "qrcode-terminal";
 import Ignore from "ignore";
 const ignore = Ignore.default;
 import * as fs from "fs/promises";
+import * as fsSync from "fs";
 import * as path from "path";
 import * as os from "os";
 import { spawn, execSync } from "child_process";
+import * as pty from "node-pty";
 import { createServer } from "net";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
-const VERSION = "0.1.11";
+const VERSION = JSON.parse(fsSync.readFileSync(path.join(__dirname, "../package.json"), "utf-8")).version;
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = process.cwd();
 // Simple ANSI parser for terminal state
@@ -695,58 +700,20 @@ function handleTerminalSpawn(payload) {
         throw Object.assign(new Error('No valid shell found'), { code: 'ENOSHELL' });
     }
     const terminalId = `term-${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
-    // Clean environment
-    const cleanEnv = {};
-    for (const [key, value] of Object.entries(process.env)) {
-        if (value !== undefined) {
-            cleanEnv[key] = value;
-        }
-    }
-    cleanEnv['TERM'] = 'xterm-256color';
-    cleanEnv['COLUMNS'] = cols.toString();
-    cleanEnv['LINES'] = rows.toString();
+    console.log(`[Terminal] Spawning PTY shell: ${shell} (${cols}x${rows}) in ${ROOT_DIR}`);
     // Create ANSI parser for terminal state
     const parser = new AnsiParser(cols, rows);
-    // Spawn shell directly with interactive flag
-    let proc;
-    const isWindows = os.platform() === 'win32';
-    console.log(`[Terminal] Spawning shell: ${shell} in ${ROOT_DIR}`);
-    // Force a simple prompt and disable fancy terminal features
-    cleanEnv['PS1'] = '$ ';
-    cleanEnv['PROMPT'] = '$ ';
-    cleanEnv['TERM'] = 'dumb';
-    if (isWindows) {
-        proc = spawn(shell, [], {
-            cwd: ROOT_DIR,
-            env: cleanEnv,
-            stdio: ['pipe', 'pipe', 'pipe'],
-            shell: true,
-        });
-    }
-    else {
-        // Spawn shell with flags to disable rc files and work non-interactively
-        const shellName = path.basename(shell);
-        let args = [];
-        if (shellName === 'zsh') {
-            // -f: no rc files, -s: read from stdin
-            args = ['-f', '-s'];
-        }
-        else if (shellName === 'bash') {
-            // --norc --noprofile: no rc files, -s: read from stdin
-            args = ['--norc', '--noprofile', '-s'];
-        }
-        else {
-            args = ['-s'];
-        }
-        proc = spawn(shell, args, {
-            cwd: ROOT_DIR,
-            env: cleanEnv,
-            stdio: ['pipe', 'pipe', 'pipe'],
-        });
-    }
-    console.log(`[Terminal] Spawned with PID: ${proc.pid}`);
+    // Spawn PTY with node-pty
+    const ptyProcess = pty.spawn(shell, [], {
+        name: 'xterm-256color',
+        cols,
+        rows,
+        cwd: ROOT_DIR,
+        env: process.env,
+    });
+    console.log(`[Terminal] PTY spawned with PID: ${ptyProcess.pid}`);
     terminals.set(terminalId, {
-        proc,
+        ptyProcess,
         shell,
         cols,
         rows,
@@ -756,9 +723,8 @@ function handleTerminalSpawn(payload) {
         parser,
     });
     // Process output and send grid state
-    const processOutput = (data) => {
-        const str = data.toString();
-        parser.write(str);
+    ptyProcess.onData((data) => {
+        parser.write(data);
         const state = parser.getState();
         if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
             const msg = {
@@ -777,14 +743,9 @@ function handleTerminalSpawn(payload) {
             };
             dataChannel.send(JSON.stringify(msg));
         }
-    };
-    proc.stdout?.on('data', processOutput);
-    proc.stderr?.on('data', processOutput);
-    proc.on('error', (err) => {
-        console.error(`[Terminal] Process error:`, err);
     });
-    proc.on('close', (code) => {
-        console.log(`[Terminal] Process closed with code: ${code}`);
+    ptyProcess.onExit(({ exitCode }) => {
+        console.log(`[Terminal] PTY exited with code: ${exitCode}`);
         terminals.delete(terminalId);
         if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
             const msg = {
@@ -792,32 +753,11 @@ function handleTerminalSpawn(payload) {
                 id: `evt-${Date.now()}`,
                 ns: "terminal",
                 action: "exit",
-                payload: { terminalId, code: code || 0 },
+                payload: { terminalId, code: exitCode },
             };
             dataChannel.send(JSON.stringify(msg));
         }
     });
-    // Send initial state
-    setTimeout(() => {
-        const state = parser.getState();
-        if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-            const msg = {
-                v: 1,
-                id: `evt-${Date.now()}`,
-                ns: "terminal",
-                action: "state",
-                payload: {
-                    terminalId,
-                    buffer: state.buffer,
-                    cursorX: state.cursorX,
-                    cursorY: state.cursorY,
-                    cols: state.cols,
-                    rows: state.rows,
-                },
-            };
-            dataChannel.send(JSON.stringify(msg));
-        }
-    }, 100);
     return { terminalId, shell, cols, rows };
 }
 function handleTerminalWrite(payload) {
@@ -830,7 +770,7 @@ function handleTerminalWrite(payload) {
     const session = terminals.get(terminalId);
     if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    session.proc.stdin?.write(data);
+    session.ptyProcess.write(data);
     return {};
 }
 function handleTerminalResize(payload) {
@@ -844,31 +784,12 @@ function handleTerminalResize(payload) {
     const session = terminals.get(terminalId);
     if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
+    // Resize PTY (sends SIGWINCH)
+    session.ptyProcess.resize(cols, rows);
     // Resize parser buffer
     session.parser.resize(cols, rows);
     session.cols = cols;
     session.rows = rows;
-    // Send SIGWINCH to process (resize signal) - won't work without real PTY
-    // But we update our internal state
-    // Send updated state
-    const state = session.parser.getState();
-    if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-        const msg = {
-            v: 1,
-            id: `evt-${Date.now()}`,
-            ns: "terminal",
-            action: "state",
-            payload: {
-                terminalId,
-                buffer: state.buffer,
-                cursorX: state.cursorX,
-                cursorY: state.cursorY,
-                cols: state.cols,
-                rows: state.rows,
-            },
-        };
-        dataChannel.send(JSON.stringify(msg));
-    }
     return {};
 }
 function handleTerminalKill(payload) {
@@ -878,7 +799,7 @@ function handleTerminalKill(payload) {
     const session = terminals.get(terminalId);
     if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    session.proc.kill('SIGKILL');
+    session.ptyProcess.kill();
     terminals.delete(terminalId);
     return {};
 }
@@ -1675,7 +1596,7 @@ function connectWebSocket(code) {
         console.log("\nShutting down...");
         // Kill all terminals
         for (const [id, session] of terminals) {
-            session.proc.kill();
+            session.ptyProcess.kill();
         }
         terminals.clear();
         // Kill all managed processes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "author": [
     {
       "name": "Soham Bharambe",
@@ -25,10 +25,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@xterm/headless": "^5.5.0",
     "ignore": "^6.0.2",
+    "node-pty": "^1.1.0",
     "qrcode-terminal": "^0.12.0",
-    "ws": "^8.18.0",
-    "@xterm/headless": "^5.5.0"
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",