postforme-terminal 1.0.0 → 1.0.2

package/dist/index.js

@@ -3,9 +3,31 @@ import { WebSocketServer, WebSocket } from 'ws';
 import * as pty from 'node-pty';
 import { homedir } from 'os';
 import { createServer } from 'http';
+import { spawn, execSync } from 'child_process';
+import { createConnection } from 'net';
+import { existsSync } from 'fs';
+import { resolve } from 'path';
 const PORT = parseInt(process.env.TERMINAL_PORT || '5101', 10);
+const STUDIO_PORT = parseInt(process.env.REMOTION_STUDIO_PORT || '3100', 10);
 const CWD = process.cwd();
 const MAX_BUFFER = 100_000;
+// --- Locate render project ---
+function findRenderProject() {
+    const candidates = [
+        process.env.POSTFORME_RENDER_PATH,
+        resolve(CWD, 'postforme-render'),
+        resolve(CWD, '../postforme-render'),
+        resolve(CWD, '../../postforme-render'),
+        resolve(homedir(), 'postforme-render'),
+    ].filter(Boolean);
+    for (const p of candidates) {
+        if (existsSync(resolve(p, 'package.json')) && existsSync(resolve(p, 'src'))) {
+            return p;
+        }
+    }
+    return null;
+}
+const RENDER_PROJECT = findRenderProject();
 const state = {
     process: null,
     buffer: '',
@@ -28,13 +50,20 @@ function spawnClaude() {
     const shell = process.env.SHELL || '/bin/zsh';
     console.log(`[postforme] Starting Claude Code in ${CWD}`);
     try {
+        // Build a clean env: strip CLAUDECODE so Claude Code doesn't think it's nested
+        const cleanEnv = {};
+        for (const [k, v] of Object.entries(process.env)) {
+            if (v !== undefined && k !== 'CLAUDECODE' && !k.startsWith('CLAUDE_')) {
+                cleanEnv[k] = v;
+            }
+        }
         const proc = pty.spawn(shell, [], {
             name: 'xterm-256color',
             cols: 120,
             rows: 30,
             cwd: CWD,
             env: {
-                ...process.env,
+                ...cleanEnv,
                 TERM: 'xterm-256color',
                 HOME: homedir(),
                 PATH: `${homedir()}/.local/bin:/opt/homebrew/bin:${process.env.PATH || ''}`,
@@ -77,9 +106,79 @@ function stopClaude() {
     state.buffer = '';
     broadcast({ type: 'status', running: false });
 }
-// --- HTTP handler (health check + CORS) ---
-function handleHttp(_req, res) {
-    const origin = _req.headers.origin || '';
+// --- Remotion Studio Management ---
+let studioProcess = null;
+async function checkPort(port) {
+    return new Promise((ok) => {
+        const socket = createConnection(port, 'localhost');
+        socket.setTimeout(1500);
+        socket.on('connect', () => { socket.destroy(); ok(true); });
+        socket.on('error', () => ok(false));
+        socket.on('timeout', () => { socket.destroy(); ok(false); });
+    });
+}
+async function isStudioRunning() {
+    if (studioProcess && studioProcess.exitCode === null)
+        return true;
+    // Also check if something external is listening on the studio port
+    return checkPort(STUDIO_PORT);
+}
+function startStudio(res) {
+    if (!RENDER_PROJECT) {
+        res.writeHead(404, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: false, error: 'Render project not found. Set POSTFORME_RENDER_PATH or place postforme-render next to your project.' }));
+        return;
+    }
+    if (studioProcess && studioProcess.exitCode === null) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: true, message: 'Remotion Studio is already running' }));
+        return;
+    }
+    console.log(`[postforme] Starting Remotion Studio on port ${STUDIO_PORT}...`);
+    console.log(`[postforme]   render project: ${RENDER_PROJECT}`);
+    studioProcess = spawn('npx', ['remotion', 'studio', '--port', String(STUDIO_PORT)], {
+        cwd: RENDER_PROJECT,
+        stdio: 'pipe',
+        env: { ...process.env, FORCE_COLOR: '0' },
+        detached: false,
+    });
+    studioProcess.stdout?.on('data', (data) => {
+        const line = data.toString().trim();
+        if (line)
+            console.log(`[remotion-studio] ${line}`);
+    });
+    studioProcess.stderr?.on('data', (data) => {
+        const line = data.toString().trim();
+        if (line)
+            console.log(`[remotion-studio] ${line}`);
+    });
+    studioProcess.on('exit', (code) => {
+        console.log(`[postforme] Remotion Studio exited with code ${code}`);
+        studioProcess = null;
+    });
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ ok: true, message: 'Remotion Studio starting', port: STUDIO_PORT }));
+}
+function stopStudio(res) {
+    if (!studioProcess || studioProcess.exitCode !== null) {
+        try {
+            execSync(`lsof -ti:${STUDIO_PORT} | xargs kill -9 2>/dev/null || true`);
+        }
+        catch { /* ignore */ }
+        studioProcess = null;
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: true, message: 'Remotion Studio stopped' }));
+        return;
+    }
+    console.log('[postforme] Stopping Remotion Studio...');
+    studioProcess.kill('SIGTERM');
+    studioProcess = null;
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ ok: true, message: 'Remotion Studio stopped' }));
+}
+// --- HTTP handler ---
+async function handleHttp(req, res) {
+    const origin = req.headers.origin || '';
     const allowed = [
         'http://localhost:5100',
         'http://localhost:3000',
@@ -88,16 +187,41 @@ function handleHttp(_req, res) {
     if (allowed.includes(origin)) {
         res.setHeader('Access-Control-Allow-Origin', origin);
     }
-    res.setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS');
-    res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
-    if (_req.method === 'OPTIONS') {
+    res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
+    if (req.method === 'OPTIONS') {
         res.writeHead(204);
         res.end();
         return;
     }
-    if (_req.url === '/status') {
+    // GET /status — full service status (matches LocalServicesGuard expectations)
+    if (req.method === 'GET' && req.url === '/status') {
+        const studioRunning = await isStudioRunning();
+        // Clean up dead studio process reference
+        if (studioProcess && studioProcess.exitCode !== null) {
+            studioProcess = null;
+        }
         res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ ok: true, claudeCode: state.process !== null }));
+        res.end(JSON.stringify({
+            terminalServer: true,
+            claudeCode: state.process !== null,
+            remotionStudio: studioRunning,
+            renderProject: RENDER_PROJECT || null,
+            ports: {
+                terminalServer: PORT,
+                remotionStudio: STUDIO_PORT,
+            },
+        }));
+        return;
+    }
+    // POST /services/studio/start
+    if (req.method === 'POST' && req.url === '/services/studio/start') {
+        startStudio(res);
+        return;
+    }
+    // POST /services/studio/stop
+    if (req.method === 'POST' && req.url === '/services/studio/stop') {
+        stopStudio(res);
         return;
     }
     res.writeHead(200, { 'Content-Type': 'text/plain' });
@@ -154,6 +278,12 @@ httpServer.listen(PORT, () => {
     console.log('');
     console.log('  PostForMe Terminal Server running');
     console.log(`  → ws://localhost:${PORT}`);
+    if (RENDER_PROJECT) {
+        console.log(`  → Remotion render project: ${RENDER_PROJECT}`);
+    }
+    else {
+        console.log('  → Remotion: not found (set POSTFORME_RENDER_PATH or place postforme-render nearby)');
+    }
     console.log('');
     console.log('  Open postforme.ca and click the Terminal button.');
     console.log('  Press Ctrl+C to stop.');
@@ -166,6 +296,10 @@ function shutdown(signal) {
         state.process.kill();
         state.process = null;
     }
+    if (studioProcess && studioProcess.exitCode === null) {
+        studioProcess.kill('SIGTERM');
+        studioProcess = null;
+    }
     for (const client of state.clients) {
         client.close();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postforme-terminal",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "PostForMe terminal server — connects your browser to Claude Code",
   "type": "module",
   "bin": {