cloud-ide-cide 2.0.34 → 2.0.36

package/deployer/node/upload-api.js

@@ -4,16 +4,24 @@
  *
  * Reads config from:  ../.cide/config.json   (token, paths)
  * Writes state to:    ../.cide/deployments.json
- * Stores releases in: ../.cide/releases/{appCode}/{version}/
- * Stores backups in:  ../.cide/backups/{appCode}/{version}.zip
+ * Extracts code to:   {server_root}/{appCode}/        (live app directory)
+ * Stores zips in:     ../.cide/releases/{appCode}/{version}.zip  (for rollback)
  * Logs to:            ../.cide/logs/deploy.log
- * Symlinks:           {server_root}/current/{appCode} → active release
+ *
+ * After upload/rollback the listener automatically:
+ *   1. Runs npm install in the app directory
+ *   2. Stops the previous app process (if any)
+ *   3. Starts the app with `node server.js`
+ *   4. Tracks the app PID for future stop/restart
  *
  * Endpoints (all except /health require Authorization: Bearer <token>):
  *
- *   POST /upload       (multipart/form-data)  — upload & deploy a zip
+ *   POST /upload       (multipart/form-data)  — upload, deploy & start app
  *   GET  /history?appCode=xxx                 — deployment history
- *   POST /rollback     { appCode, version }   — switch to previous release
+ *   POST /rollback     { appCode, version }   — rollback & restart app
+ *   POST /app/stop     { appCode }            — stop a running app
+ *   POST /app/start    { appCode }            — start a stopped app
+ *   GET  /app/status?appCode=xxx              — check app process status
  *   GET  /health                              — uptime check (no auth)
  */
 
@@ -22,6 +30,7 @@ const multer = require('multer');
 const path = require('path');
 const fs = require('fs');
 const AdmZip = require('adm-zip');
+const { execSync, spawn } = require('child_process');
 
 const app = express();
 app.use(express.json());
@@ -36,10 +45,9 @@ try { config = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8')); } catch { /* no
 const TOKEN       = config.token || process.env.CIDE_UPLOAD_TOKEN || '';
 const PORT        = process.env.CIDE_UPLOAD_PORT || process.env.PORT || 4500;
 const RELEASES    = config.paths?.releases || path.join(CIDE_DIR, 'releases');
-const BACKUPS     = config.paths?.backups  || path.join(CIDE_DIR, 'backups');
 const LOGS        = config.paths?.logs     || path.join(CIDE_DIR, 'logs');
-const CURRENT_DIR = config.paths?.current  || path.join(path.dirname(CIDE_DIR), 'current');
 const DEPLOYMENTS = path.join(CIDE_DIR, 'deployments.json');
+const SERVER_ROOT = config.serverRoot || path.dirname(CIDE_DIR);
 
 const upload = multer({ dest: path.join(CIDE_DIR, 'tmp') });
 
@@ -59,35 +67,117 @@ function appendLog(message) {
   try { fs.appendFileSync(logFile, line); } catch { /* logs dir may not exist yet */ }
 }
 
-function switchCurrent(currentPath, releasePath) {
-  fs.mkdirSync(path.dirname(currentPath), { recursive: true });
+// ── App process management ───────────────────────────────────────────────────
+
+function getAppPidFile(appCode) {
+  return path.join(CIDE_DIR, 'logs', `${appCode}.pid`);
+}
+
+function getAppLogFile(appCode) {
+  return path.join(LOGS, `${appCode}.log`);
+}
+
+function readAppPid(appCode) {
   try {
-    const stat = fs.lstatSync(currentPath);
-    if (stat.isSymbolicLink()) {
-      fs.unlinkSync(currentPath);
-    } else if (stat.isDirectory()) {
-      fs.renameSync(currentPath, `${currentPath}_bak_${Date.now()}`);
-    }
-  } catch { /* doesn't exist yet */ }
+    const pid = parseInt(fs.readFileSync(getAppPidFile(appCode), 'utf8').trim(), 10);
+    return isNaN(pid) ? null : pid;
+  } catch {
+    return null;
+  }
+}
 
+function isProcessRunning(pid) {
   try {
-    fs.symlinkSync(releasePath, currentPath, 'junction');
+    process.kill(pid, 0);
+    return true;
   } catch {
-    copyRecursive(releasePath, currentPath);
+    return false;
+  }
+}
+
+function stopApp(appCode) {
+  const pid = readAppPid(appCode);
+  if (!pid) return { stopped: false, reason: 'no pid file' };
+
+  if (!isProcessRunning(pid)) {
+    try { fs.unlinkSync(getAppPidFile(appCode)); } catch {}
+    return { stopped: false, reason: 'not running (stale pid cleaned)' };
   }
+
+  try {
+    process.kill(pid, 'SIGTERM');
+    // Give it a moment to die, then force kill if needed
+    setTimeout(() => {
+      if (isProcessRunning(pid)) {
+        try { process.kill(pid, 'SIGKILL'); } catch {}
+      }
+    }, 3000);
+    try { fs.unlinkSync(getAppPidFile(appCode)); } catch {}
+    appendLog(`STOP    app=${appCode} pid=${pid}`);
+    return { stopped: true, pid };
+  } catch (e) {
+    return { stopped: false, reason: e.message };
+  }
+}
+
+function startApp(appCode) {
+  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}` };
+  }
+
+  // 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' },
+  });
+
+  child.unref();
+
+  // 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 };
 }
 
-function copyRecursive(src, dst) {
-  fs.mkdirSync(dst, { recursive: true });
-  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-    const srcPath = path.join(src, entry.name);
-    const dstPath = path.join(dst, entry.name);
-    if (entry.isDirectory()) {
-      copyRecursive(srcPath, dstPath);
-    } else {
-      fs.copyFileSync(srcPath, dstPath);
+function installAndStart(appCode) {
+  const appDir = path.join(SERVER_ROOT, appCode);
+  const steps = [];
+
+  // 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 });
+      steps.push('npm install: ok');
+      appendLog(`INSTALL app=${appCode} npm install ok`);
+    } catch (e) {
+      steps.push(`npm install: failed (${e.message})`);
+      appendLog(`INSTALL app=${appCode} npm install FAILED: ${e.message}`);
     }
   }
+
+  // Start the app
+  const result = startApp(appCode);
+  if (result.started) {
+    steps.push(`started: pid ${result.pid}`);
+  } else {
+    steps.push(`start failed: ${result.reason}`);
+  }
+
+  return { steps, ...result };
 }
 
 // ── Auth middleware ───────────────────────────────────────────────────────────
@@ -122,31 +212,35 @@ app.post('/upload', authGuard, upload.single('file'), (req, res) => {
     }
 
     const version = new Date().toISOString().replace(/[:.]/g, '-').replace('T', '_').slice(0, 19);
-    const releasePath = path.join(RELEASES, appCode, version);
-    const currentPath = path.join(CURRENT_DIR, appCode);
 
-    // ── Save backup zip ──────────────────────────────────────────────────
-    const backupDir = path.join(BACKUPS, appCode);
-    fs.mkdirSync(backupDir, { recursive: true });
-    fs.copyFileSync(req.file.path, path.join(backupDir, `${version}.zip`));
+    // ── Live app directory at server root ────────────────────────────────
+    const appDir = path.join(SERVER_ROOT, appCode);
+
+    // ── Save zip to releases for rollback ────────────────────────────────
+    const releaseDir = path.join(RELEASES, appCode);
+    fs.mkdirSync(releaseDir, { recursive: true });
+    const releaseZipPath = path.join(releaseDir, `${version}.zip`);
+    fs.copyFileSync(req.file.path, releaseZipPath);
 
-    // ── Extract ──────────────────────────────────────────────────────────
+    // ── Extract directly to {server_root}/{appCode}/ ─────────────────────
+    fs.mkdirSync(appDir, { recursive: true });
     const zip = new AdmZip(req.file.path);
-    fs.mkdirSync(releasePath, { recursive: true });
-    zip.extractAllTo(releasePath, true);
+    zip.extractAllTo(appDir, true);
     fs.unlinkSync(req.file.path);
 
+    // ── Install dependencies & start the app ─────────────────────────────
+    const appResult = installAndStart(appCode);
+
     // ── Track state ──────────────────────────────────────────────────────
     const deployments = loadDeployments();
     const previousVersion = deployments.apps?.[appCode]?.current?.version || null;
 
-    switchCurrent(currentPath, releasePath);
-
-    // ── Record ───────────────────────────────────────────────────────────
     const record = {
       version,
       environment,
-      releasePath,
+      appDir,
+      releaseZip: releaseZipPath,
+      appPid: appResult.pid || null,
       deployedAt: new Date().toISOString(),
       action: 'upload',
       message: deployMsg,
@@ -164,12 +258,14 @@ app.post('/upload', authGuard, upload.single('file'), (req, res) => {
 
     res.json({
       status: 'SUCCESS',
-      message: 'API code uploaded and deployed.',
+      message: 'Uploaded, installed & started.',
       appCode,
       environment,
       releaseVersion: version,
       previousVersion,
-      releasePath,
+      appDir,
+      releaseZip: releaseZipPath,
+      appProcess: appResult,
       completedAt: new Date().toISOString(),
     });
   } catch (err) {
@@ -211,21 +307,29 @@ app.post('/rollback', authGuard, (req, res) => {
       return res.status(422).json({ status: 'FAILED', message: 'Missing required fields: appCode, version' });
     }
 
-    const releasePath = path.join(RELEASES, appCode, version);
-    if (!fs.existsSync(releasePath)) {
-      return res.status(404).json({ status: 'FAILED', message: `Release not found: ${version}` });
+    const releaseZipPath = path.join(RELEASES, appCode, `${version}.zip`);
+    if (!fs.existsSync(releaseZipPath)) {
+      return res.status(404).json({ status: 'FAILED', message: `Release zip not found: ${version}` });
     }
 
-    const currentPath = path.join(CURRENT_DIR, appCode);
+    const appDir = path.join(SERVER_ROOT, appCode);
     const deployments = loadDeployments();
     const previousVersion = deployments.apps?.[appCode]?.current?.version || null;
 
-    switchCurrent(currentPath, releasePath);
+    // Re-extract the zip to the app directory
+    fs.mkdirSync(appDir, { recursive: true });
+    const zip = new AdmZip(releaseZipPath);
+    zip.extractAllTo(appDir, true);
+
+    // Install dependencies & restart the app
+    const appResult = installAndStart(appCode);
 
     const record = {
       version,
       environment: deployments.apps?.[appCode]?.current?.environment || 'production',
-      releasePath,
+      appDir,
+      releaseZip: releaseZipPath,
+      appPid: appResult.pid || null,
       deployedAt: new Date().toISOString(),
       action: 'rollback',
       previousVersion,
@@ -242,10 +346,11 @@ app.post('/rollback', authGuard, (req, res) => {
 
     res.json({
       status: 'SUCCESS',
-      message: `Rolled back to version ${version}.`,
+      message: `Rolled back to ${version} & restarted.`,
       appCode,
       rolledBackTo: version,
       previousVersion,
+      appProcess: appResult,
       completedAt: new Date().toISOString(),
     });
   } catch (err) {
@@ -253,6 +358,49 @@ app.post('/rollback', authGuard, (req, res) => {
   }
 });
 
+// ═══════════════════════════════════════════════════════════════════════════════
+// ── App management ────────────────────────────────────────────────────────────
+// ═══════════════════════════════════════════════════════════════════════════════
+
+app.post('/app/stop', authGuard, (req, res) => {
+  const appCode = (req.body.appCode || '').replace(/[^a-zA-Z0-9\-_]/g, '');
+  if (!appCode) return res.status(422).json({ status: 'FAILED', message: 'Missing appCode' });
+
+  const result = stopApp(appCode);
+  res.json({ status: 'SUCCESS', appCode, ...result });
+});
+
+app.post('/app/start', authGuard, (req, res) => {
+  const appCode = (req.body.appCode || '').replace(/[^a-zA-Z0-9\-_]/g, '');
+  if (!appCode) return res.status(422).json({ status: 'FAILED', message: 'Missing appCode' });
+
+  const result = startApp(appCode);
+  res.json({ status: result.started ? 'SUCCESS' : 'FAILED', appCode, ...result });
+});
+
+app.get('/app/status', authGuard, (req, res) => {
+  const appCode = (req.query.appCode || '').replace(/[^a-zA-Z0-9\-_]/g, '');
+  if (!appCode) return res.status(422).json({ status: 'FAILED', message: 'Missing appCode' });
+
+  const pid = readAppPid(appCode);
+  const running = pid ? isProcessRunning(pid) : false;
+  const appDir = path.join(SERVER_ROOT, appCode);
+  const logFile = getAppLogFile(appCode);
+
+  if (pid && !running) {
+    try { fs.unlinkSync(getAppPidFile(appCode)); } catch {}
+  }
+
+  res.json({
+    status: 'SUCCESS',
+    appCode,
+    running,
+    pid: running ? pid : null,
+    appDir,
+    logFile,
+  });
+});
+
 // ── Health check ──────────────────────────────────────────────────────────────
 app.get('/health', (_req, res) => {
   res.json({ status: 'ok', uptime: process.uptime() });
@@ -262,4 +410,5 @@ app.get('/health', (_req, res) => {
 app.listen(PORT, () => {
   console.log(`Cloud IDE upload-api listening on port ${PORT}`);
   console.log(`.cide dir: ${CIDE_DIR}`);
+  console.log(`Server root: ${SERVER_ROOT}`);
 });

package/package.json

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