nstantpage-agent 0.3.3 → 0.3.5

package/dist/commands/start.js

@@ -19,6 +19,7 @@ import chalk from 'chalk';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
+import { execSync } from 'child_process';
 import { getConfig } from '../config.js';
 import { TunnelClient } from '../tunnel.js';
 import { LocalServer } from '../localServer.js';
@@ -97,6 +98,54 @@ async function fetchProjectFiles(backendUrl, projectId, projectDir, token) {
     console.log(chalk.green(`  ✓ ${written} files downloaded (version ${data.version})`));
     return { fileCount: written, isNew: true };
 }
+/**
+ * Kill any process listening on the given port.
+ */
+function killPort(port) {
+    try {
+        // Works on macOS and Linux
+        const pids = execSync(`lsof -ti :${port} 2>/dev/null`, { encoding: 'utf-8' }).trim();
+        if (pids) {
+            for (const pid of pids.split('\n')) {
+                const p = parseInt(pid.trim(), 10);
+                if (p && p !== process.pid) {
+                    try {
+                        process.kill(p, 'SIGTERM');
+                    }
+                    catch { }
+                }
+            }
+        }
+    }
+    catch {
+        // lsof not available or no process found — that's fine
+        try {
+            // Fallback for systems without lsof
+            execSync(`fuser -k ${port}/tcp 2>/dev/null`, { encoding: 'utf-8' });
+        }
+        catch { }
+    }
+}
+/**
+ * Clean up any previous agent instance (kill old PID + free ports).
+ */
+function cleanupPreviousAgent(conf, apiPort, devPort) {
+    // 1. Try to kill the previously stored agent PID
+    const oldPid = conf.get('agentPid');
+    if (oldPid && oldPid !== process.pid) {
+        try {
+            process.kill(oldPid, 'SIGTERM');
+            console.log(chalk.gray(`  Stopped previous agent (PID ${oldPid})`));
+        }
+        catch {
+            // Already dead
+        }
+        conf.delete('agentPid');
+    }
+    // 2. Free the ports in case orphaned processes are still holding them
+    killPort(apiPort);
+    killPort(devPort);
+}
 export async function startCommand(directory, options) {
     const conf = getConfig();
     // If --token was passed, persist it
@@ -134,6 +183,10 @@ export async function startCommand(directory, options) {
     // Save project ID
     conf.set('projectId', projectId);
     const backendUrl = resolveBackendUrl(options);
+    // Kill any leftover agent / free ports from a previous run
+    cleanupPreviousAgent(conf, apiPort, devPort);
+    // Small delay to let ports release
+    await new Promise(r => setTimeout(r, 300));
     console.log(chalk.blue(`\n🚀 nstantpage agent v${VERSION}\n`));
     console.log(chalk.gray(`  Project ID:   ${projectId}`));
     console.log(chalk.gray(`  Directory:    ${projectDir}`));

package/dist/localServer.js

@@ -290,6 +290,8 @@ export class LocalServer {
     async handleContainerStatus(_req, res, _body, url) {
         this.json(res, {
             running: this.devServer.isRunning,
+            status: this.devServer.isRunning ? 'running' : 'stopped',
+            projectId: this.options.projectId,
             mode: 'agent',
             agentMode: true,
             hostname: os.hostname(),
@@ -298,32 +300,45 @@ export class LocalServer {
     }
     // ─── /live/container-stats ───────────────────────────────────
     async handleContainerStats(_req, res) {
-        const stats = this.devServer.getStats();
-        const totalMem = os.totalmem() / (1024 * 1024);
-        const freeMem = os.freemem() / (1024 * 1024);
+        const devStats = this.devServer.getStats();
+        const totalMemMb = Math.round(os.totalmem() / (1024 * 1024));
+        const freeMemMb = Math.round(os.freemem() / (1024 * 1024));
+        const usedMemMb = totalMemMb - freeMemMb;
+        const memPercent = totalMemMb > 0 ? Math.round((usedMemMb / totalMemMb) * 100) : 0;
+        // Return in the same format as the container stats (ContainerStatsSnapshot)
+        // so the frontend terminal panel can display it unchanged.
         this.json(res, {
             success: true,
+            running: this.devServer.isRunning,
             agentMode: true,
-            cpu: { percent: stats.cpuPercent, cores: os.cpus().length },
-            memory: {
-                usedMb: stats.memoryMb,
-                totalMb: Math.round(totalMem),
-                freeMb: Math.round(freeMem),
-                percent: totalMem > 0 ? Math.round((stats.memoryMb / totalMem) * 100) : 0,
+            stats: {
+                cpuPercent: devStats.cpuPercent,
+                memoryUsageBytes: usedMemMb * 1024 * 1024,
+                memoryLimitBytes: totalMemMb * 1024 * 1024,
+                memoryUsageMb: usedMemMb,
+                memoryLimitMb: totalMemMb,
+                memoryPercent: memPercent,
+                diskUsageMb: null,
+                diskUsageBytes: null,
+            },
+            agentInfo: {
+                hostname: os.hostname(),
+                platform: `${os.platform()} ${os.arch()}`,
+                cpuCores: os.cpus().length,
+                pid: devStats.pid,
+                uptime: this.devServer.uptime,
             },
-            pid: stats.pid,
-            uptime: this.devServer.uptime,
         });
     }
     // ─── /live/logs ──────────────────────────────────────────────
     async handleLogs(_req, res, _body, url) {
-        const limit = parseInt(url.searchParams.get('limit') || '100', 10);
+        const limit = parseInt(url.searchParams.get('limit') || url.searchParams.get('tail') || '100', 10);
         const logs = this.devServer.getLogs(limit);
         this.json(res, {
             success: true,
             logs: logs.map(l => ({
                 timestamp: new Date(l.timestamp).toISOString(),
-                type: l.type,
+                stream: l.type, // 'stdout' | 'stderr' — matches what the terminal panel expects
                 message: l.message,
                 source: 'frontend',
             })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nstantpage-agent",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Local development agent for nstantpage.com — run your projects locally, preview in the cloud. Replaces cloud containers for faster builds.",
   "type": "module",
   "bin": {