Update server.js

server.js

@@ -124,41 +124,62 @@ app.get("/logs", async (req, res) => {
 });
 
 // Endpoint for "Deploy Kaizen"
-app.post("/deploy", async (req, res) => {
-    const { username, repoUrl } = req.body;
+app.post("/deploy", (req, res) => {
+  const { username, repoUrl } = req.body;
 
-    if (!username || !repoUrl) {
-        return res.status(400).send("Username and repository URL are required.");
-    }
+  const userDir = path.join(usersDir, username);
+  if (!fs.existsSync(userDir)) fs.mkdirSync(userDir, { recursive: true });
 
-    const userDir = path.join(usersDir, username);
-    try {
-        // Clear user directory
-        await fs.rmdir(userDir, { recursive: true }).catch(() => {});
-        await fs.mkdir(userDir, { recursive: true });
+  // Clear the user's directory before deployment
+  fs.rmdirSync(userDir, { recursive: true });
+  fs.mkdirSync(userDir);
 
-        // Clone repository and install dependencies
-        const cloneCommand = `git clone ${repoUrl} . && /usr/bin/yarn install && /usr/bin/yarn start`;
+  const cloneCommand = `git clone ${repoUrl} .`;
 
-        const child = exec(cloneCommand, { cwd: userDir, shell: "/bin/bash" });
+  const child = exec(cloneCommand, { cwd: userDir });
 
-        child.stdout.on("data", (data) => {
-            appendLog(username, `STDOUT: ${data.trim()}`);
-        });
+  child.stdout.on("data", (data) => {
+    appendLog(username, data.trim());
+  });
 
-        child.stderr.on("data", (data) => {
-            appendLog(username, `STDERR: ${data.trim()}`);
-        });
+  child.stderr.on("data", (data) => {
+    appendLog(username, data.trim());
+  });
 
-        child.on("close", (code) => {
-            appendLog(username, `Deploy process exited with code ${code}`);
-        });
+  child.on("close", async (code) => {
+    appendLog(username, `Clone process exited with code ${code}`);
+    if (code !== 0) {
+      res.status(500).send("Error cloning repository.");
+      return;
+    }
 
-        res.send("Deployment started.");
-    } catch (error) {
-        console.error("Error during deployment:", error);
-        res.status(500).send("Failed to start deployment.");
+    // Ensure package.json exists
+    if (!fs.existsSync(path.join(userDir, "package.json"))) {
+      appendLog(username, "No package.json found. Initializing a default one.");
+      execSync("yarn init -y", { cwd: userDir });
     }
+
+    // Run yarn install and start
+    const installStartCommand = `yarn install && yarn start`;
+    const installChild = exec(installStartCommand, { cwd: userDir });
+
+    installChild.stdout.on("data", (data) => {
+      appendLog(username, data.trim());
+    });
+
+    installChild.stderr.on("data", (data) => {
+      appendLog(username, data.trim());
+    });
+
+    installChild.on("close", (installCode) => {
+      appendLog(username, `Install/Start process exited with code ${installCode}`);
+      if (installCode === 0) {
+        res.send("Deployment completed successfully.");
+      } else {
+        res.status(500).send("Error during deployment.");
+      }
+    });
+  });
 });
 
 // Start the server