cloud-ide-cide 2.0.41 → 2.0.43

package/appManager.js

@@ -15,11 +15,77 @@ const {
   printProjectList,
   selectProject,
   selectServer,
-  resolveEndpoint,
   getToken,
   getAuthHeaders,
 } = require('./uploadProject');
 
+/**
+ * Resolve app management endpoint URL.
+ * PHP uses ?action=app-status, Node uses /app/status routes.
+ */
+function resolveAppEndpoint(serverUrl, action) {
+  const u = new URL(serverUrl);
+  if (u.pathname.endsWith('.php')) {
+    u.searchParams.set('action', `app-${action}`);
+    return u.toString();
+  }
+  const base = u.pathname.replace(/\/upload\/?$/, '');
+  u.pathname = `${base}/app/${action}`;
+  return u.toString();
+}
+
+function isPhpServer(serverUrl) {
+  return new URL(serverUrl).pathname.endsWith('.php');
+}
+
+function printStatus(data) {
+  console.log(`  App      : ${data.appCode}`);
+  if (data.type === 'php') {
+    console.log(`  Type     : PHP/UI (served by Apache/Nginx)`);
+    console.log(`  Deployed : ${data.version ? 'Yes' : 'No'}`);
+    if (data.version) console.log(`  Version  : ${data.version}`);
+    if (data.deployedAt) console.log(`  Date     : ${data.deployedAt}`);
+    if (data.appUrl) console.log(`  URL      : ${data.appUrl}`);
+    if (data.releases) console.log(`  Releases : ${data.releases}`);
+  } else {
+    console.log(`  Status   : ${data.running ? `Running (PID: ${data.pid})` : 'Stopped'}`);
+    if (data.appDir) console.log(`  Path     : ${data.appDir}`);
+    if (data.logFile) console.log(`  Log      : ${data.logFile}`);
+  }
+  console.log('');
+}
+
+function printAppResult(data, action) {
+  if (data.type === 'php') {
+    console.log(`  ${data.message}`);
+    console.log('');
+    return;
+  }
+
+  if (action === 'stop') {
+    if (data.stopped) {
+      console.log(`  Stopped (was PID: ${data.pid})`);
+    } else {
+      console.log(`  ${data.reason || 'Not running'}`);
+    }
+  } else {
+    if (data.started) {
+      console.log(`  ${action === 'start' ? 'Started' : 'Restarted'} (PID: ${data.pid})`);
+      if (data.logFile) console.log(`  Log    : ${data.logFile}`);
+    } else {
+      console.log(`  Failed to start: ${data.reason || 'unknown'}`);
+    }
+  }
+
+  if (data.output) {
+    console.log('');
+    console.log('  ── App Console Output ──────────────────────');
+    console.log(data.output.trim().split('\n').map(l => `  ${l}`).join('\n'));
+    console.log('  ─────────────────────────────────────────────');
+  }
+  console.log('');
+}
+
 async function appManager(opts = {}) {
   const action = opts.restart ? 'restart'
     : opts.stop ? 'stop'
@@ -48,66 +114,27 @@ async function appManager(opts = {}) {
 
   try {
     if (action === 'status') {
-      const url = resolveEndpoint(server.server_url, `app/status`) + `?appCode=${encodeURIComponent(appCode)}`;
+      const url = resolveAppEndpoint(server.server_url, 'status') + `${isPhpServer(server.server_url) ? '&' : '?'}appCode=${encodeURIComponent(appCode)}`;
       const { data } = await axios.get(url, { headers, timeout: 15000 });
-
-      console.log(`  App      : ${data.appCode}`);
-      console.log(`  Status   : ${data.running ? `Running (PID: ${data.pid})` : 'Stopped'}`);
-      if (data.appDir) console.log(`  Path     : ${data.appDir}`);
-      if (data.logFile) console.log(`  Log      : ${data.logFile}`);
-      console.log('');
+      printStatus(data);
 
     } else if (action === 'stop') {
-      const url = resolveEndpoint(server.server_url, 'app/stop');
+      const url = resolveAppEndpoint(server.server_url, 'stop');
       const { data } = await axios.post(url, { appCode }, { headers, timeout: 15000 });
-
-      if (data.stopped) {
-        console.log(`  Stopped (was PID: ${data.pid})`);
-      } else {
-        console.log(`  ${data.reason || 'Not running'}`);
-      }
-      console.log('');
+      printAppResult(data, 'stop');
 
     } else if (action === 'start') {
-      const url = resolveEndpoint(server.server_url, 'app/start');
+      const url = resolveAppEndpoint(server.server_url, 'start');
       const { data } = await axios.post(url, { appCode }, { headers, timeout: 30000 });
-
-      if (data.started) {
-        console.log(`  Started (PID: ${data.pid})`);
-        if (data.logFile) console.log(`  Log    : ${data.logFile}`);
-      } else {
-        console.log(`  Failed to start: ${data.reason || 'unknown'}`);
-      }
-      if (data.output) {
-        console.log('');
-        console.log('  ── App Console Output ──────────────────────');
-        console.log(data.output.trim().split('\n').map(l => `  ${l}`).join('\n'));
-        console.log('  ─────────────────────────────────────────────');
-      }
-      console.log('');
+      printAppResult(data, 'start');
 
     } else if (action === 'restart') {
-      // Stop
-      const stopUrl = resolveEndpoint(server.server_url, 'app/stop');
+      const stopUrl = resolveAppEndpoint(server.server_url, 'stop');
       await axios.post(stopUrl, { appCode }, { headers, timeout: 15000 }).catch(() => {});
 
-      // Start
-      const startUrl = resolveEndpoint(server.server_url, 'app/start');
+      const startUrl = resolveAppEndpoint(server.server_url, 'start');
       const { data } = await axios.post(startUrl, { appCode }, { headers, timeout: 30000 });
-
-      if (data.started) {
-        console.log(`  Restarted (PID: ${data.pid})`);
-        if (data.logFile) console.log(`  Log    : ${data.logFile}`);
-      } else {
-        console.log(`  Failed to start: ${data.reason || 'unknown'}`);
-      }
-      if (data.output) {
-        console.log('');
-        console.log('  ── App Console Output ──────────────────────');
-        console.log(data.output.trim().split('\n').map(l => `  ${l}`).join('\n'));
-        console.log('  ─────────────────────────────────────────────');
-      }
-      console.log('');
+      printAppResult(data, 'restart');
     }
   } catch (err) {
     const msg = err.response?.data?.message || err.message || err;

package/cideShell.js

@@ -676,25 +676,87 @@ function handleBranch(ws, repoName) {
   else runGitAll(ws, 'branch -vv', true);
 }
 
-function killBgServer() {
-  if (!bgServerPid) {
-    console.log('No background server PID tracked (start with: server dev)');
+const PID_FILE = '.cide_node_bg_pid.json';
+
+function getPidFilePath(ws) {
+  if (ws && ws.nodeBackend) {
+    const dir = path.join(ws.nodeBackend.absPath, '.cide');
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+    return path.join(dir, PID_FILE);
+  }
+  return path.join(process.cwd(), PID_FILE);
+}
+
+function loadPids(ws) {
+  const file = getPidFilePath(ws);
+  if (fs.existsSync(file)) {
+    try {
+      const data = JSON.parse(fs.readFileSync(file, 'utf8'));
+      return Array.isArray(data) ? data : [data];
+    } catch {}
+  }
+  return [];
+}
+
+function savePid(ws, pid, command, args) {
+  const file = getPidFilePath(ws);
+  const pids = loadPids(ws);
+  pids.push({ pid, command, args, timestamp: Date.now() });
+  fs.writeFileSync(file, JSON.stringify(pids, null, 2));
+}
+
+function clearPid(ws, pidToRemove) {
+  const file = getPidFilePath(ws);
+  let pids = loadPids(ws);
+  if (pidToRemove) {
+    pids = pids.filter(p => p.pid !== pidToRemove);
+    if (pids.length > 0) {
+      fs.writeFileSync(file, JSON.stringify(pids, null, 2));
+      return;
+    }
+  }
+  if (fs.existsSync(file)) fs.unlinkSync(file);
+}
+
+function killBgServer(ws, specificPid) {
+  const pids = loadPids(ws);
+  if (pids.length === 0) {
+    let fallbackPid = bgServerPid;
+    if (specificPid) fallbackPid = parseInt(specificPid, 10);
+    if (!fallbackPid) {
+      console.log('No background server PIDs tracked.');
+      return;
+    }
+    pids.push({ pid: fallbackPid, command: 'unknown', args: [] });
+  }
+
+  const targets = specificPid 
+    ? pids.filter(p => p.pid === parseInt(specificPid, 10)) 
+    : pids;
+
+  if (targets.length === 0) {
+    console.log(`PID ${specificPid} not found in tracked background processes.`);
     return;
   }
-  try {
-    if (process.platform === 'win32') {
-      execSync(`taskkill /PID ${bgServerPid} /T /F`, { stdio: 'inherit', shell: true });
-    } else {
-      process.kill(-bgServerPid, 'SIGTERM');
+
+  for (const processInfo of targets) {
+    const targetPid = processInfo.pid;
+    try {
+      if (process.platform === 'win32') {
+        execSync(`taskkill /PID ${targetPid} /T /F`, { stdio: 'ignore', shell: true });
+      } else {
+        process.kill(-targetPid, 'SIGTERM');
+      }
+      console.log(`Stopped process tree ${targetPid} (${processInfo.command} ${processInfo.args.join(' ')})`);
+    } catch (e) {
+      console.error(`Stop failed or process ${targetPid} already killed: ${e.message}`);
     }
-    console.log(`Stopped process tree ${bgServerPid}`);
-  } catch (e) {
-    console.error('Stop failed:', e.message);
+    clearPid(ws, targetPid);
   }
-  bgServerPid = null;
+  if (!specificPid) bgServerPid = null;
 }
 
-function spawnBg(cwd, command, args) {
+function spawnBg(ws, cwd, command, args) {
   const child = spawn(command, args, {
     cwd,
     shell: true,
@@ -703,6 +765,7 @@ function spawnBg(cwd, command, args) {
   });
   child.unref();
   bgServerPid = child.pid;
+  savePid(ws, child.pid, command, args);
   console.log(`Started background PID ${child.pid} (${command} ${args.join(' ')})`);
   console.log('(Output not shown here; use server stop to end, or run npm in another terminal for logs.)');
 }
@@ -743,18 +806,48 @@ async function handleServer(ws, sub, rest, rl) {
     return;
   }
   if (sub === 'start') {
-    spawnBg(cwd, 'npm', ['run', 'start']);
+    spawnBg(ws, cwd, 'npm', ['run', 'start']);
     return;
   }
   if (sub === 'dev') {
-    spawnBg(cwd, 'npm', ['run', 'dev']);
+    spawnBg(ws, cwd, 'npm', ['run', 'dev']);
+    return;
+  }
+  if (sub === 'status') {
+    const pids = loadPids(ws);
+    if (pids.length === 0) {
+       console.log('No services are currently tracked as running in the background.');
+       return;
+    }
+    console.log(`Found ${pids.length} tracked background service(s):\n`);
+
+    for (const processInfo of pids) {
+      let isRunning = false;
+      try {
+        if (process.platform === 'win32') {
+          const out = execSync(`tasklist /FI "PID eq ${processInfo.pid}"`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] });
+          isRunning = out.includes(processInfo.pid.toString());
+        } else {
+          process.kill(processInfo.pid, 0);
+          isRunning = true;
+        }
+      } catch {
+        isRunning = false;
+      }
+      if (isRunning) {
+        console.log(`[🏃 RUNNING] PID: ${processInfo.pid} | Command: ${processInfo.command} ${processInfo.args.join(' ')}`);
+      } else {
+        console.log(`[❌ STALE]   PID: ${processInfo.pid} | Command: ${processInfo.command} ${processInfo.args.join(' ')} (No longer running)`);
+        clearPid(ws, processInfo.pid);
+      }
+    }
     return;
   }
   if (sub === 'stop') {
-    killBgServer();
+    killBgServer(ws, rest[0]);
     return;
   }
-  console.error('Usage: server build | start | dev | stop | init | listener start|stop|status|restart');
+  console.error('Usage: server build | start | dev | stop | status | init | listener start|stop|status|restart');
 }
 
 function handleSeed(ws, name) {
@@ -796,7 +889,7 @@ function handleServe(ws) {
     console.error(`No "start" script in ${path.basename(ws.angularRoot)}/package.json`);
     return;
   }
-  spawnBg(ws.angularRoot, 'npm', ['run', 'start']);
+  spawnBg(ws, ws.angularRoot, 'npm', ['run', 'start']);
 }
 
 function handleTailwind(ws) {
@@ -805,7 +898,7 @@ function handleTailwind(ws) {
     console.error(`No "tailwindcss" script in ${path.basename(ws.angularRoot)}/package.json`);
     return;
   }
-  spawnBg(ws.angularRoot, 'npm', ['run', 'tailwindcss']);
+  spawnBg(ws, ws.angularRoot, 'npm', ['run', 'tailwindcss']);
 }
 
 function handleLint(ws) {

package/deployer/php/upload-ui.php

@@ -59,9 +59,12 @@ $deploymentsFile = "{$cideDir}/deployments.json";
 // ── Route ────────────────────────────────────────────────────────────────────
 $action = $_GET['action'] ?? $_POST['action'] ?? 'upload';
 
-if ($action === 'history')       handleHistory();
-elseif ($action === 'rollback')  handleRollback();
-else                             handleUpload();
+if ($action === 'history')           handleHistory();
+elseif ($action === 'rollback')      handleRollback();
+elseif ($action === 'app-status')    handleAppStatus();
+elseif ($action === 'app-start')     handleAppManageNA('start');
+elseif ($action === 'app-stop')      handleAppManageNA('stop');
+else                                 handleUpload();
 
 // ═══════════════════════════════════════════════════════════════════════════════
 // ── Upload ────────────────────────────────────────────────────────────────────
@@ -238,6 +241,52 @@ function handleRollback() {
     ]);
 }
 
+// ═══════════════════════════════════════════════════════════════════════════════
+// ── App Status ───────────────────────────────────────────────────────────────
+// ═══════════════════════════════════════════════════════════════════════════════
+function handleAppStatus() {
+    global $currentDir;
+
+    $appCode = isset($_GET['appCode']) ? preg_replace('/[^a-zA-Z0-9\-_]/', '', $_GET['appCode']) : '';
+    if ($appCode === '') {
+        http_response_code(422);
+        echo json_encode(['status' => 'FAILED', 'message' => 'Missing appCode']);
+        exit;
+    }
+
+    $deployments = loadDeployments();
+    $current = $deployments['apps'][$appCode]['current'] ?? null;
+    $currentPath = "{$currentDir}/{$appCode}";
+    $deployed = is_dir($currentPath) || is_link($currentPath);
+
+    // Build the app URL from server info
+    $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+    $host = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? 'localhost';
+    // Strip port from host if present, UI runs on default 80/443
+    $host = preg_replace('/:\d+$/', '', $host);
+    $appUrl = "{$protocol}://{$host}";
+
+    echo json_encode([
+        'status'   => 'SUCCESS',
+        'appCode'  => $appCode,
+        'running'  => $deployed,
+        'type'     => 'php',
+        'appUrl'   => $appUrl,
+        'appDir'   => $currentPath,
+        'version'  => $current['version'] ?? null,
+        'deployedAt' => $current['deployedAt'] ?? null,
+        'releases' => count($deployments['apps'][$appCode]['history'] ?? []),
+    ]);
+}
+
+function handleAppManageNA($action) {
+    echo json_encode([
+        'status'  => 'SUCCESS',
+        'message' => "PHP/UI apps are served by Apache/Nginx — no process to {$action}. The app is always running when deployed.",
+        'type'    => 'php',
+    ]);
+}
+
 // ═══════════════════════════════════════════════════════════════════════════════
 // ── Helpers ───────────────────────────────────────────────────────────────────
 // ═══════════════════════════════════════════════════════════════════════════════

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-ide-cide",
-  "version": "2.0.41",
+  "version": "2.0.43",
   "description": "Cloud IDE CLI — create, build, publish, upload and deploy Cloud IDE projects.",
   "main": "cli.js",
   "bin": {
@@ -49,6 +49,5 @@
   ],
   "author": "Ankush Shivlal Bhure",
   "license": "ISC",
-  "repository": {
-  }
-}
+  "repository": {}
+}

package/publishPackage.js

@@ -41,9 +41,12 @@ function writeJson(p, obj) {
   fs.writeFileSync(p, JSON.stringify(obj, null, 2) + '\n', 'utf8');
 }
 
-function isGithubPackagesPublishable(pkg) {
-  const r = pkg && pkg.publishConfig && pkg.publishConfig.registry;
-  return typeof r === 'string' && r.includes(GPR_HOST);
+function isPublishable(pkg) {
+  if (!pkg || !pkg.publishConfig) return false;
+  const r = pkg.publishConfig.registry;
+  if (typeof r === 'string' && (r.includes(GPR_HOST) || r.includes('npmjs.org'))) return true;
+  if (pkg.publishConfig.access === 'public') return true;
+  return false;
 }
 
 function bumpSemver(version, kind) {
@@ -135,7 +138,7 @@ function discoverPublishablePackages({ cide, angularRoot, monorepoRoot }) {
     } catch {
       return;
     }
-    if (!isGithubPackagesPublishable(pkg)) return;
+    if (!isPublishable(pkg)) return;
     seen.add(resolved);
     const folderName = path.basename(absDir);
     list.push({
@@ -831,7 +834,9 @@ async function publishPackage(options = {}) {
         const originalCwd = process.cwd();
 
         try {
-          if (entry.kind === 'angular-lib') {
+          if (rl) rl.pause();
+          try {
+            if (entry.kind === 'angular-lib') {
             if (cide.templete !== 'angular') {
               console.warn('  Warning: cide.templete is not "angular"; still running ng build.');
             }
@@ -899,6 +904,9 @@ async function publishPackage(options = {}) {
           }
           publishOk++;
           stepComplete = true;
+          } finally {
+            if (rl) rl.resume();
+          }
         } catch (err) {
           console.error(`  ❌ Failed: ${err.message}`);
           process.chdir(originalCwd);