cloud-ide-cide 2.0.36 → 2.0.38

package/deployer/node/upload-api.js

@@ -121,63 +121,99 @@ function stopApp(appCode) {
 }
 
 function startApp(appCode) {
-  const appDir = path.join(SERVER_ROOT, appCode);
-  const entryFile = path.join(appDir, 'server.js');
+  return new Promise((resolve) => {
+    const appDir = path.join(SERVER_ROOT, appCode);
+    const entryFile = path.join(appDir, 'server.js');
 
-  if (!fs.existsSync(entryFile)) {
-    return { started: false, reason: `Entry file not found: ${entryFile}` };
-  }
+    if (!fs.existsSync(entryFile)) {
+      return resolve({ started: false, reason: `Entry file not found: ${entryFile}` });
+    }
 
-  // Stop existing process first
-  stopApp(appCode);
+    // Stop existing process first
+    stopApp(appCode);
 
-  const logFile = getAppLogFile(appCode);
-  fs.mkdirSync(path.dirname(logFile), { recursive: true });
-  const out = fs.openSync(logFile, 'a');
-  const err = fs.openSync(logFile, 'a');
-
-  const child = spawn('node', [entryFile], {
-    cwd: appDir,
-    detached: true,
-    stdio: ['ignore', out, err],
-    env: { ...process.env, NODE_ENV: 'production' },
-  });
+    const logFile = getAppLogFile(appCode);
+    fs.mkdirSync(path.dirname(logFile), { recursive: true });
+
+    // Truncate log so we capture only this run's output
+    fs.writeFileSync(logFile, '');
+
+    const out = fs.openSync(logFile, 'a');
+    const err = fs.openSync(logFile, 'a');
+
+    const child = spawn('node', [entryFile], {
+      cwd: appDir,
+      detached: true,
+      stdio: ['ignore', out, err],
+      env: { ...process.env, NODE_ENV: 'production' },
+    });
 
-  child.unref();
+    child.unref();
 
-  // Save PID
-  fs.writeFileSync(getAppPidFile(appCode), String(child.pid));
-  appendLog(`START   app=${appCode} pid=${child.pid} entry=${entryFile}`);
+    // Save PID
+    fs.writeFileSync(getAppPidFile(appCode), String(child.pid));
+    appendLog(`START   app=${appCode} pid=${child.pid} entry=${entryFile}`);
 
-  return { started: true, pid: child.pid, logFile };
+    // Wait 3 seconds then check if process is still alive & read its output
+    setTimeout(() => {
+      const alive = isProcessRunning(child.pid);
+      let output = '';
+      try { output = fs.readFileSync(logFile, 'utf8').slice(-2000); } catch {}
+
+      if (!alive) {
+        try { fs.unlinkSync(getAppPidFile(appCode)); } catch {}
+      }
+
+      resolve({
+        started: alive,
+        pid: alive ? child.pid : null,
+        logFile,
+        output,
+        reason: alive ? null : 'Process exited within 3s (see output)',
+      });
+    }, 3000);
+  });
 }
 
-function installAndStart(appCode) {
+function cleanDir(dir) {
+  if (!fs.existsSync(dir)) return;
+  for (const entry of fs.readdirSync(dir)) {
+    // preserve node_modules to speed up npm install
+    if (entry === 'node_modules') continue;
+    const fullPath = path.join(dir, entry);
+    fs.rmSync(fullPath, { recursive: true, force: true });
+  }
+}
+
+async function installAndStart(appCode) {
   const appDir = path.join(SERVER_ROOT, appCode);
   const steps = [];
+  let npmOutput = '';
 
   // npm install if package.json exists
   const pkgPath = path.join(appDir, 'package.json');
   if (fs.existsSync(pkgPath)) {
     try {
-      execSync('npm install --production', { cwd: appDir, stdio: 'pipe', shell: true, timeout: 120000 });
+      const out = execSync('npm install --production 2>&1', { cwd: appDir, encoding: 'utf8', shell: true, timeout: 120000 });
+      npmOutput = (out || '').slice(-1000);
       steps.push('npm install: ok');
       appendLog(`INSTALL app=${appCode} npm install ok`);
     } catch (e) {
-      steps.push(`npm install: failed (${e.message})`);
+      npmOutput = (e.stdout || '').slice(-500) + '\n' + (e.stderr || '').slice(-500);
+      steps.push(`npm install: failed`);
       appendLog(`INSTALL app=${appCode} npm install FAILED: ${e.message}`);
     }
   }
 
   // Start the app
-  const result = startApp(appCode);
+  const result = await startApp(appCode);
   if (result.started) {
     steps.push(`started: pid ${result.pid}`);
   } else {
     steps.push(`start failed: ${result.reason}`);
   }
 
-  return { steps, ...result };
+  return { steps, npmOutput, ...result };
 }
 
 // ── Auth middleware ───────────────────────────────────────────────────────────
@@ -196,7 +232,7 @@ function authGuard(req, res, next) {
 // ═══════════════════════════════════════════════════════════════════════════════
 // ── Upload ────────────────────────────────────────────────────────────────────
 // ═══════════════════════════════════════════════════════════════════════════════
-app.post('/upload', authGuard, upload.single('file'), (req, res) => {
+app.post('/upload', authGuard, upload.single('file'), async (req, res) => {
   try {
     if (!req.file) {
       return res.status(400).json({ status: 'FAILED', message: 'No file uploaded.' });
@@ -222,14 +258,15 @@ app.post('/upload', authGuard, upload.single('file'), (req, res) => {
     const releaseZipPath = path.join(releaseDir, `${version}.zip`);
     fs.copyFileSync(req.file.path, releaseZipPath);
 
-    // ── Extract directly to {server_root}/{appCode}/ ─────────────────────
+    // ── Clean old files & extract to {server_root}/{appCode}/ ─────────────
     fs.mkdirSync(appDir, { recursive: true });
+    cleanDir(appDir);
     const zip = new AdmZip(req.file.path);
     zip.extractAllTo(appDir, true);
     fs.unlinkSync(req.file.path);
 
     // ── Install dependencies & start the app ─────────────────────────────
-    const appResult = installAndStart(appCode);
+    const appResult = await installAndStart(appCode);
 
     // ── Track state ──────────────────────────────────────────────────────
     const deployments = loadDeployments();
@@ -298,7 +335,7 @@ app.get('/history', authGuard, (req, res) => {
 // ═══════════════════════════════════════════════════════════════════════════════
 // ── Rollback ──────────────────────────────────────────────────────────────────
 // ═══════════════════════════════════════════════════════════════════════════════
-app.post('/rollback', authGuard, (req, res) => {
+app.post('/rollback', authGuard, async (req, res) => {
   try {
     const appCode = (req.body.appCode || '').replace(/[^a-zA-Z0-9\-_]/g, '');
     const version = (req.body.version || '').replace(/[^a-zA-Z0-9\.\+\-_]/g, '');
@@ -316,13 +353,14 @@ app.post('/rollback', authGuard, (req, res) => {
     const deployments = loadDeployments();
     const previousVersion = deployments.apps?.[appCode]?.current?.version || null;
 
-    // Re-extract the zip to the app directory
+    // Clean old files & re-extract the zip
     fs.mkdirSync(appDir, { recursive: true });
+    cleanDir(appDir);
     const zip = new AdmZip(releaseZipPath);
     zip.extractAllTo(appDir, true);
 
     // Install dependencies & restart the app
-    const appResult = installAndStart(appCode);
+    const appResult = await installAndStart(appCode);
 
     const record = {
       version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-ide-cide",
-  "version": "2.0.36",
+  "version": "2.0.38",
   "description": "Cloud IDE CLI — create, build, publish, upload and deploy Cloud IDE projects.",
   "main": "cli.js",
   "bin": {

package/serverInit.js

@@ -256,6 +256,7 @@ function listenerStatus(cideDir) {
   }
 
   console.log('');
+  console.log('  ── Upload Listener ──────────────────────────');
   console.log(`  Server type : ${config.serverType}`);
   console.log(`  Server root : ${config.serverRoot}`);
   console.log(`  Port        : ${config.port || 4500}`);
@@ -275,6 +276,41 @@ function listenerStatus(cideDir) {
     }
     console.log(`  Log         : ${getServerLog(cideDir)}`);
   }
+
+  // ── Show deployed apps status ─────────────────────────────────────────
+  const deployments = safeReadJson(path.join(cideDir, 'deployments.json'));
+  if (deployments && deployments.apps && Object.keys(deployments.apps).length > 0) {
+    console.log('');
+    console.log('  ── Deployed Apps ────────────────────────────');
+
+    for (const [appCode, appData] of Object.entries(deployments.apps)) {
+      const pidFile = path.join(cideDir, 'logs', `${appCode}.pid`);
+      let appPid = null;
+      try { appPid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10); } catch {}
+      if (isNaN(appPid)) appPid = null;
+
+      const appRunning = appPid ? isProcessRunning(appPid) : false;
+      const current = appData.current || {};
+      const appLogFile = path.join(cideDir, 'logs', `${appCode}.log`);
+
+      console.log('');
+      console.log(`  App         : ${appCode}`);
+      console.log(`  Path        : ${current.appDir || 'N/A'}`);
+      console.log(`  Version     : ${current.version || 'N/A'}`);
+      console.log(`  Deployed    : ${current.deployedAt || 'N/A'}`);
+      if (appRunning) {
+        console.log(`  Status      : Running (PID: ${appPid})`);
+      } else {
+        console.log('  Status      : Stopped');
+        if (appPid) {
+          try { fs.unlinkSync(pidFile); } catch {}
+        }
+      }
+      console.log(`  Log         : ${appLogFile}`);
+      console.log(`  Releases    : ${appData.history ? appData.history.length : 0}`);
+    }
+  }
+
   console.log('');
 }
 

package/uploadProject.js

@@ -629,6 +629,17 @@ async function uploadProject(opts = {}) {
         console.log('  Rollback successful!');
         console.log(`  Now active : ${result.rolledBackTo}`);
         console.log(`  Previous   : ${result.previousVersion}`);
+        if (result.appProcess) {
+          if (result.appProcess.started) {
+            console.log(`  App        : Running (PID: ${result.appProcess.pid})`);
+          } else {
+            console.log(`  App        : Failed to start`);
+            if (result.appProcess.reason) console.log(`  Reason     : ${result.appProcess.reason}`);
+          }
+          if (result.appProcess.steps) {
+            result.appProcess.steps.forEach(s => console.log(`  Step       : ${s}`));
+          }
+        }
         console.log('');
       } else {
         console.error(`  Rollback failed: ${result.message || JSON.stringify(result)}`);
@@ -704,7 +715,33 @@ async function uploadProject(opts = {}) {
       console.log(`  App      : ${result.appCode}`);
       console.log(`  Server   : ${label}`);
       if (result.previousVersion) console.log(`  Previous : ${result.previousVersion}`);
-      if (result.releasePath) console.log(`  Path     : ${result.releasePath}`);
+      if (result.appDir) console.log(`  Path     : ${result.appDir}`);
+      else if (result.releasePath) console.log(`  Path     : ${result.releasePath}`);
+      if (result.appProcess) {
+        console.log('');
+        if (result.appProcess.started) {
+          console.log(`  App      : Running (PID: ${result.appProcess.pid})`);
+          if (result.appProcess.logFile) console.log(`  App Log  : ${result.appProcess.logFile}`);
+        } else {
+          console.log(`  App      : Failed to start`);
+          if (result.appProcess.reason) console.log(`  Reason   : ${result.appProcess.reason}`);
+        }
+        if (result.appProcess.steps) {
+          result.appProcess.steps.forEach(s => console.log(`  Step     : ${s}`));
+        }
+        if (result.appProcess.output) {
+          console.log('');
+          console.log('  ── App Console Output ──────────────────────');
+          console.log(result.appProcess.output.trim().split('\n').map(l => `  ${l}`).join('\n'));
+          console.log('  ─────────────────────────────────────────────');
+        }
+        if (result.appProcess.npmOutput) {
+          console.log('');
+          console.log('  ── npm install Output ──────────────────────');
+          console.log(result.appProcess.npmOutput.trim().split('\n').map(l => `  ${l}`).join('\n'));
+          console.log('  ─────────────────────────────────────────────');
+        }
+      }
       console.log('');
     } else {
       console.error(`  Upload failed: ${result.message || JSON.stringify(result)}`);