cloud-ide-cide 2.0.34 → 2.0.35

package/deployer/node/upload-api.js

@@ -4,10 +4,9 @@
  *
  * 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
  *
  * Endpoints (all except /health require Authorization: Bearer <token>):
  *
@@ -36,9 +35,7 @@ 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 upload = multer({ dest: path.join(CIDE_DIR, 'tmp') });
@@ -59,37 +56,6 @@ 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 });
-  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 */ }
-
-  try {
-    fs.symlinkSync(releasePath, currentPath, 'junction');
-  } catch {
-    copyRecursive(releasePath, currentPath);
-  }
-}
-
-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);
-    }
-  }
-}
-
 // ── Auth middleware ───────────────────────────────────────────────────────────
 function authGuard(req, res, next) {
   if (!TOKEN) {
@@ -103,6 +69,9 @@ function authGuard(req, res, next) {
   next();
 }
 
+// ── Server root (parent of .cide/) ───────────────────────────────────────────
+const SERVER_ROOT = config.serverRoot || path.dirname(CIDE_DIR);
+
 // ═══════════════════════════════════════════════════════════════════════════════
 // ── Upload ────────────────────────────────────────────────────────────────────
 // ═══════════════════════════════════════════════════════════════════════════════
@@ -122,31 +91,32 @@ 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);
 
     // ── 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,
       deployedAt: new Date().toISOString(),
       action: 'upload',
       message: deployMsg,
@@ -169,7 +139,8 @@ app.post('/upload', authGuard, upload.single('file'), (req, res) => {
       environment,
       releaseVersion: version,
       previousVersion,
-      releasePath,
+      appDir,
+      releaseZip: releaseZipPath,
       completedAt: new Date().toISOString(),
     });
   } catch (err) {
@@ -211,21 +182,25 @@ 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);
 
     const record = {
       version,
       environment: deployments.apps?.[appCode]?.current?.environment || 'production',
-      releasePath,
+      appDir,
+      releaseZip: releaseZipPath,
       deployedAt: new Date().toISOString(),
       action: 'rollback',
       previousVersion,

package/package.json

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