lunel-cli 0.1.16 → 0.1.18

package/dist/index.js

@@ -9,14 +9,18 @@ import * as path from "path";
 import * as os from "os";
 import { spawn, execSync } from "child_process";
 import { createServer, createConnection } from "net";
+import { createInterface } from "readline";
 const PROXY_URL = process.env.LUNEL_PROXY_URL || "https://gateway.lunel.dev";
 import { createRequire } from "module";
 const __require = createRequire(import.meta.url);
 const VERSION = __require("../package.json").version;
 // Root directory - sandbox all file operations to this
 const ROOT_DIR = process.cwd();
-// Terminal sessions
-const terminals = new Map();
+// Terminal sessions (managed by Rust PTY binary)
+const terminals = new Set();
+// PTY binary process
+let ptyProcess = null;
+const ptyPendingSpawns = new Map();
 const processes = new Map();
 const processOutputBuffers = new Map();
 // CPU usage tracking
@@ -534,53 +538,113 @@ async function handleGitDiscard(payload) {
     return {};
 }
 // ============================================================================
-// Terminal Handlers
+// Terminal Handlers (delegates to Rust PTY binary)
 // ============================================================================
 let dataChannel = null;
-function handleTerminalSpawn(payload) {
-    const shell = payload.shell || process.env.SHELL || "/bin/sh";
-    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, [], {
+function getPtyBinaryPath() {
+    // TODO: Switch to GitHub releases download for production
+    return path.join(os.homedir(), "lunel-pty");
+}
+function ensurePtyProcess() {
+    if (ptyProcess && ptyProcess.exitCode === null)
+        return;
+    const binPath = getPtyBinaryPath();
+    ptyProcess = spawn(binPath, [], {
         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));
+    ptyProcess.stderr?.on("data", (data) => {
+        console.error("[pty]", data.toString().trim());
+    });
+    ptyProcess.on("exit", (code) => {
+        console.log(`[pty] PTY process exited with code ${code}`);
+        ptyProcess = null;
+        // Reject all pending spawns
+        for (const [id, pending] of ptyPendingSpawns) {
+            pending.reject(new Error("PTY process exited"));
         }
-    };
-    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));
+        ptyPendingSpawns.clear();
+    });
+    // Parse stdout line by line for events from the Rust binary
+    const rl = createInterface({ input: ptyProcess.stdout });
+    rl.on("line", (line) => {
+        let event;
+        try {
+            event = JSON.parse(line);
+        }
+        catch {
+            return;
         }
+        if (event.event === "spawned") {
+            const pending = ptyPendingSpawns.get(event.id);
+            if (pending) {
+                pending.resolve();
+                ptyPendingSpawns.delete(event.id);
+            }
+        }
+        else if (event.event === "state") {
+            // Forward screen state to app via data channel
+            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+                const msg = {
+                    v: 1,
+                    id: `evt-${Date.now()}`,
+                    ns: "terminal",
+                    action: "state",
+                    payload: {
+                        terminalId: event.id,
+                        cells: event.cells,
+                        cursorX: event.cursorX,
+                        cursorY: event.cursorY,
+                        cols: event.cols,
+                        rows: event.rows,
+                    },
+                };
+                dataChannel.send(JSON.stringify(msg));
+            }
+        }
+        else if (event.event === "exit") {
+            terminals.delete(event.id);
+            if (dataChannel && dataChannel.readyState === WebSocket.OPEN) {
+                const msg = {
+                    v: 1,
+                    id: `evt-${Date.now()}`,
+                    ns: "terminal",
+                    action: "exit",
+                    payload: { terminalId: event.id, code: event.code },
+                };
+                dataChannel.send(JSON.stringify(msg));
+            }
+        }
+        else if (event.event === "error") {
+            console.error(`[pty] Error for ${event.id}: ${event.message}`);
+        }
+    });
+}
+function sendToPty(cmd) {
+    if (!ptyProcess || !ptyProcess.stdin) {
+        throw Object.assign(new Error("PTY process not running"), { code: "ENOPTY" });
+    }
+    ptyProcess.stdin.write(JSON.stringify(cmd) + "\n");
+}
+async function handleTerminalSpawn(payload) {
+    ensurePtyProcess();
+    const shell = payload.shell || process.env.SHELL || "/bin/sh";
+    const cols = payload.cols || 80;
+    const rows = payload.rows || 24;
+    const terminalId = `term-${Date.now()}-${Math.random().toString(36).substring(2, 8)}`;
+    // Wait for the Rust binary to confirm spawn
+    const spawnPromise = new Promise((resolve, reject) => {
+        ptyPendingSpawns.set(terminalId, { resolve, reject });
+        setTimeout(() => {
+            if (ptyPendingSpawns.has(terminalId)) {
+                ptyPendingSpawns.delete(terminalId);
+                reject(new Error("Spawn timed out"));
+            }
+        }, 10000);
     });
+    sendToPty({ cmd: "spawn", id: terminalId, shell, cols, rows });
+    await spawnPromise;
+    terminals.add(terminalId);
     return { terminalId };
 }
 function handleTerminalWrite(payload) {
@@ -590,10 +654,9 @@ 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)
+    if (!terminals.has(terminalId))
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    proc.stdin?.write(data);
+    sendToPty({ cmd: "write", id: terminalId, data });
     return {};
 }
 function handleTerminalResize(payload) {
@@ -602,21 +665,18 @@ 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 (!terminals.has(terminalId))
         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
+    sendToPty({ cmd: "resize", id: terminalId, cols, 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)
+    if (!terminals.has(terminalId))
         throw Object.assign(new Error("Terminal not found"), { code: "ENOTERM" });
-    proc.kill();
+    sendToPty({ cmd: "kill", id: terminalId });
     terminals.delete(terminalId);
     return {};
 }
@@ -1457,7 +1517,7 @@ async function processMessage(message) {
             case "terminal":
                 switch (action) {
                     case "spawn":
-                        result = handleTerminalSpawn(payload);
+                        result = await handleTerminalSpawn(payload);
                         break;
                     case "write":
                         result = handleTerminalWrite(payload);
@@ -1752,9 +1812,10 @@ function connectWebSocket(code) {
     // Handle graceful shutdown
     process.on("SIGINT", () => {
         console.log("\nShutting down...");
-        // Kill all terminals
-        for (const [id, proc] of terminals) {
-            proc.kill();
+        // Kill PTY process (kills all terminals)
+        if (ptyProcess) {
+            ptyProcess.kill();
+            ptyProcess = null;
         }
         terminals.clear();
         // Kill all managed processes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunel-cli",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "author": [
     {
       "name": "Soham Bharambe",
@@ -17,7 +17,8 @@
     "lunel-cli": "./dist/index.js"
   },
   "files": [
-    "dist"
+    "dist",
+    "bin"
   ],
   "scripts": {
     "build": "tsc",