lunel-cli 0.1.4 → 0.1.6

package/dist/index.js

@@ -8,11 +8,11 @@ import * as path from "path";
 import * as os from "os";
 import { spawn, execSync } from "child_process";
 import { createServer } from "net";
+import * as pty from "node-pty";
 const PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
-const VERSION = "0.1.3";
+const VERSION = "0.1.4";
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = process.cwd();
-// Terminal sessions
 const terminals = new Map();
 const processes = new Map();
 const processOutputBuffers = new Map();
@@ -481,49 +481,162 @@ async function handleGitDiscard(payload) {
 // ============================================================================
 let dataChannel = null;
 function handleTerminalSpawn(payload) {
-    const shell = payload.shell || process.env.SHELL || "/bin/sh";
+    // Determine shell - prefer user's shell, fallback to common defaults
+    let shell = payload.shell || process.env.SHELL;
+    // Validate and find a working shell
+    const possibleShells = os.platform() === 'win32'
+        ? ['powershell.exe', 'cmd.exe']
+        : [shell, '/bin/zsh', '/bin/bash', '/bin/sh'].filter(Boolean);
+    shell = '';
+    for (const candidate of possibleShells) {
+        if (!candidate)
+            continue;
+        try {
+            if (os.platform() === 'win32') {
+                // On Windows, just use the shell name
+                shell = candidate;
+                break;
+            }
+            else {
+                // On Unix, check if file exists and is executable
+                execSync(`test -x "${candidate}"`, { stdio: 'ignore' });
+                shell = candidate;
+                break;
+            }
+        }
+        catch {
+            // Try next shell
+        }
+    }
+    if (!shell) {
+        throw Object.assign(new Error('No valid shell found'), { code: 'ENOSHELL' });
+    }
     const cols = payload.cols || 80;
     const rows = payload.rows || 24;
     const terminalId = `term-${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
-    const proc = spawn(shell, [], {
-        cwd: ROOT_DIR,
-        env: {
-            ...process.env,
-            TERM: "xterm-256color",
-            COLUMNS: cols.toString(),
-            LINES: rows.toString(),
-        },
-        stdio: ["pipe", "pipe", "pipe"],
-    });
-    terminals.set(terminalId, proc);
-    // Stream output to app via data channel
-    const sendOutput = (data) => {
-        if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-            const msg = {
-                v: 1,
-                id: `evt-${Date.now()}`,
-                ns: "terminal",
-                action: "output",
-                payload: { terminalId, data: data.toString() },
-            };
-            dataChannel.send(JSON.stringify(msg));
+    // Filter out undefined values from env
+    const cleanEnv = {};
+    for (const [key, value] of Object.entries(process.env)) {
+        if (value !== undefined) {
+            cleanEnv[key] = value;
         }
-    };
-    proc.stdout?.on("data", sendOutput);
-    proc.stderr?.on("data", sendOutput);
-    proc.on("close", (code) => {
-        terminals.delete(terminalId);
-        if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
-            const msg = {
-                v: 1,
-                id: `evt-${Date.now()}`,
-                ns: "terminal",
-                action: "exit",
-                payload: { terminalId, code },
-            };
-            dataChannel.send(JSON.stringify(msg));
-        }
-    });
+    }
+    cleanEnv['TERM'] = 'xterm-256color';
+    // Try PTY first, fallback to regular spawn if PTY fails (e.g., Node 24 compatibility)
+    let ptyProcess = null;
+    let fallbackProc = null;
+    try {
+        ptyProcess = pty.spawn(shell, [], {
+            name: 'xterm-256color',
+            cols,
+            rows,
+            cwd: ROOT_DIR,
+            env: cleanEnv,
+        });
+    }
+    catch (ptyErr) {
+        console.warn('PTY spawn failed, falling back to regular spawn:', ptyErr.message);
+        // Fallback to regular child_process spawn
+        fallbackProc = spawn(shell, [], {
+            cwd: ROOT_DIR,
+            env: cleanEnv,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+    }
+    if (ptyProcess) {
+        terminals.set(terminalId, {
+            pty: ptyProcess,
+            cols,
+            rows,
+        });
+        // Stream output to app via data channel
+        ptyProcess.onData((data) => {
+            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+                const msg = {
+                    v: 1,
+                    id: `evt-${Date.now()}`,
+                    ns: "terminal",
+                    action: "output",
+                    payload: { terminalId, data },
+                };
+                dataChannel.send(JSON.stringify(msg));
+            }
+        });
+        ptyProcess.onExit(({ exitCode }) => {
+            terminals.delete(terminalId);
+            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+                const msg = {
+                    v: 1,
+                    id: `evt-${Date.now()}`,
+                    ns: "terminal",
+                    action: "exit",
+                    payload: { terminalId, code: exitCode },
+                };
+                dataChannel.send(JSON.stringify(msg));
+            }
+        });
+    }
+    else if (fallbackProc) {
+        // Store fallback process with a wrapper that mimics PTY interface
+        const wrapperPty = {
+            write: (data) => fallbackProc.stdin?.write(data),
+            resize: (_cols, _rows) => { },
+            kill: (signal) => fallbackProc.kill(signal),
+            pid: fallbackProc.pid || 0,
+            cols,
+            rows,
+            process: shell,
+            handleFlowControl: false,
+            onData: (cb) => {
+                fallbackProc.stdout?.on('data', (d) => cb(d.toString()));
+                fallbackProc.stderr?.on('data', (d) => cb(d.toString()));
+                return { dispose: () => { } };
+            },
+            onExit: (cb) => {
+                fallbackProc.on('close', (code) => cb({ exitCode: code || 0 }));
+                return { dispose: () => { } };
+            },
+            clear: () => { },
+            pause: () => { },
+            resume: () => { },
+        };
+        terminals.set(terminalId, {
+            pty: wrapperPty,
+            cols,
+            rows,
+        });
+        // Stream output
+        const sendOutput = (data) => {
+            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+                const msg = {
+                    v: 1,
+                    id: `evt-${Date.now()}`,
+                    ns: "terminal",
+                    action: "output",
+                    payload: { terminalId, data: data.toString() },
+                };
+                dataChannel.send(JSON.stringify(msg));
+            }
+        };
+        fallbackProc.stdout?.on('data', sendOutput);
+        fallbackProc.stderr?.on('data', sendOutput);
+        fallbackProc.on('close', (code) => {
+            terminals.delete(terminalId);
+            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+                const msg = {
+                    v: 1,
+                    id: `evt-${Date.now()}`,
+                    ns: "terminal",
+                    action: "exit",
+                    payload: { terminalId, code: code || 0 },
+                };
+                dataChannel.send(JSON.stringify(msg));
+            }
+        });
+    }
+    else {
+        throw Object.assign(new Error('Failed to spawn terminal'), { code: 'ESPAWN' });
+    }
     return { terminalId };
 }
 function handleTerminalWrite(payload) {
@@ -533,10 +646,10 @@ function handleTerminalWrite(payload) {
         throw Object.assign(new Error("terminalId is required"), { code: "EINVAL" });
     if (typeof data !== "string")
         throw Object.assign(new Error("data is required"), { code: "EINVAL" });
-    const proc = terminals.get(terminalId);
-    if (!proc)
+    const session = terminals.get(terminalId);
+    if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    proc.stdin?.write(data);
+    session.pty.write(data);
     return {};
 }
 function handleTerminalResize(payload) {
@@ -545,21 +658,25 @@ function handleTerminalResize(payload) {
     const rows = payload.rows;
     if (!terminalId)
         throw Object.assign(new Error("terminalId is required"), { code: "EINVAL" });
-    const proc = terminals.get(terminalId);
-    if (!proc)
+    if (!cols || !rows)
+        throw Object.assign(new Error("cols and rows are required"), { code: "EINVAL" });
+    const session = terminals.get(terminalId);
+    if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    // Note: For proper PTY resize, you'd need node-pty
-    // This is a simplified version
+    // Resize PTY
+    session.pty.resize(cols, rows);
+    session.cols = cols;
+    session.rows = rows;
     return {};
 }
 function handleTerminalKill(payload) {
     const terminalId = payload.terminalId;
     if (!terminalId)
         throw Object.assign(new Error("terminalId is required"), { code: "EINVAL" });
-    const proc = terminals.get(terminalId);
-    if (!proc)
+    const session = terminals.get(terminalId);
+    if (!session)
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    proc.kill();
+    session.pty.kill();
     terminals.delete(terminalId);
     return {};
 }
@@ -1355,8 +1472,8 @@ function connectWebSocket(code) {
     process.on("SIGINT", () => {
         console.log("\nShutting down...");
         // Kill all terminals
-        for (const [id, proc] of terminals) {
-            proc.kill();
+        for (const [id, session] of terminals) {
+            session.pty.kill();
         }
         terminals.clear();
         // Kill all managed processes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "author": [
     {
       "name": "Soham Bharambe",
@@ -26,6 +26,7 @@
   },
   "dependencies": {
     "ignore": "^6.0.2",
+    "node-pty": "^1.0.0",
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.18.0"
   },