cloud-ide-cide 2.0.37 → 2.0.39

package/cli.js

@@ -361,6 +361,33 @@ program
     });
   });
 
+/* app — remote app management (status/start/stop/restart) via upload listener */
+program
+  .command('app')
+  .description('Manage deployed apps remotely: status, start, stop, restart')
+  .option('--status', 'Check if the deployed app is running')
+  .option('--start', 'Start the deployed app')
+  .option('--stop', 'Stop the deployed app')
+  .option('--restart', 'Restart the deployed app (stop + start)')
+  .option('-p, --packages <spec>', 'Project number from the list (e.g. 1)')
+  .option('-s, --server <spec>', 'Server number or name (e.g. 1 or "Production")')
+  .addHelpText('after', `
+Examples:
+  cide app --status          Check if app is running on the server
+  cide app --start           Start the app
+  cide app --stop            Stop the app
+  cide app --restart         Restart the app
+  cide app --status -p 1 -s 1   Non-interactive: pick project & server by number
+`)
+  .action((opts) => {
+    checkUserLoggedIn(() => {
+      require('./appManager')(opts).catch((err) => {
+        console.error(err);
+        process.exitCode = 1;
+      });
+    });
+  });
+
 program
   .command('shell')
   .description('Start the interactive CloudIDE workspace shell (git, build, publish, server, npm, …)')

package/deployer/node/upload-api.js

@@ -121,63 +121,110 @@ 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, '');
 
-  child.unref();
+    const out = fs.openSync(logFile, 'a');
+    const err = fs.openSync(logFile, 'a');
 
-  // Save PID
-  fs.writeFileSync(getAppPidFile(appCode), String(child.pid));
-  appendLog(`START   app=${appCode} pid=${child.pid} entry=${entryFile}`);
+    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}`);
+
+    // 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 {}
+      }
 
-  return { started: true, pid: child.pid, logFile };
+      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 };
+}
+
+function readAppPort(appCode) {
+  const envPath = path.join(SERVER_ROOT, appCode, '.env');
+  try {
+    const content = fs.readFileSync(envPath, 'utf8');
+    const match = content.match(/^PORT\s*=\s*(\d+)/m);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
 }
 
 // ── Auth middleware ───────────────────────────────────────────────────────────
@@ -196,7 +243,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 +269,21 @@ 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);
+
+    // ── Build the full running URL ───────────────────────────────────────
+    const appPort = readAppPort(appCode);
+    const host = req.hostname || req.headers.host?.replace(/:\d+$/, '') || 'localhost';
+    const protocol = req.protocol || 'http';
+    const appUrl = appPort ? `${protocol}://${host}:${appPort}` : null;
 
     // ── Track state ──────────────────────────────────────────────────────
     const deployments = loadDeployments();
@@ -241,6 +295,8 @@ app.post('/upload', authGuard, upload.single('file'), (req, res) => {
       appDir,
       releaseZip: releaseZipPath,
       appPid: appResult.pid || null,
+      appUrl,
+      appPort,
       deployedAt: new Date().toISOString(),
       action: 'upload',
       message: deployMsg,
@@ -264,6 +320,8 @@ app.post('/upload', authGuard, upload.single('file'), (req, res) => {
       releaseVersion: version,
       previousVersion,
       appDir,
+      appUrl,
+      appPort,
       releaseZip: releaseZipPath,
       appProcess: appResult,
       completedAt: new Date().toISOString(),
@@ -298,7 +356,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 +374,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.37",
+  "version": "2.0.39",
   "description": "Cloud IDE CLI — create, build, publish, upload and deploy Cloud IDE projects.",
   "main": "cli.js",
   "bin": {

package/uploadProject.js

@@ -715,6 +715,7 @@ async function uploadProject(opts = {}) {
       console.log(`  App      : ${result.appCode}`);
       console.log(`  Server   : ${label}`);
       if (result.previousVersion) console.log(`  Previous : ${result.previousVersion}`);
+      if (result.appUrl) console.log(`  Running  : ${result.appUrl}`);
       if (result.appDir) console.log(`  Path     : ${result.appDir}`);
       else if (result.releasePath) console.log(`  Path     : ${result.releasePath}`);
       if (result.appProcess) {
@@ -729,6 +730,18 @@ async function uploadProject(opts = {}) {
         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 {
@@ -745,6 +758,11 @@ async function uploadProject(opts = {}) {
 module.exports = uploadProject;
 module.exports.discoverUploadableProjects = discoverUploadableProjects;
 module.exports.printProjectList = printProjectList;
+module.exports.selectProject = selectProject;
+module.exports.selectServer = selectServer;
+module.exports.resolveEndpoint = resolveEndpoint;
+module.exports.getToken = getToken;
+module.exports.getAuthHeaders = getAuthHeaders;
 module.exports.findEnvFile = findEnvFile;
 module.exports.findHostManagerFile = findHostManagerFile;
 module.exports.parseExistingEnv = parseExistingEnv;