Update server.js

server.js

@@ -17,8 +17,20 @@ if (!fs.existsSync(usersDir)) fs.mkdirSync(usersDir);
 
 // Helper to write logs
 function appendLog(username, log) {
-  const userLogsDir = path.join(usersDir, username, "logs.txt");
-  fs.appendFileSync(userLogsDir, log + "\n");
+  const userDir = path.join(usersDir, username);
+  const logFile = path.join(userDir, "logs.txt");
+
+  try {
+    // Ensure the user directory exists
+    if (!fs.existsSync(userDir)) {
+      fs.mkdirSync(userDir, { recursive: true });
+    }
+
+    // Append the log to logs.txt
+    fs.appendFileSync(logFile, log + "\n");
+  } catch (error) {
+    console.error(`Error appending log for user ${username}:`, error);
+  }
 }
 
 // Endpoint to handle user sign-up
@@ -62,33 +74,37 @@ app.post("/signup", async (req, res) => {
 });
 
 // Endpoint to handle terminal commands
-app.post("/execute", (req, res) => {
-  const { username, command } = req.body;
+app.post("/execute", async (req, res) => {
+    const { username, command } = req.body;
 
-  const userDir = path.join(usersDir, username);
-  if (!fs.existsSync(userDir)) {
-    return res.status(400).send("User not found.");
-  }
+    if (!username || !command) {
+        return res.status(400).send("Username and command are required.");
+    }
+
+    const userDir = path.join(usersDir, username);
+    if (!await fs.access(userDir).catch(() => false)) {
+        return res.status(400).send("User directory not found.");
+    }
 
-  const child = exec(command, { cwd: userDir });
+    const child = exec(command, { cwd: userDir, shell: "/bin/bash" });
 
-  child.stdout.on("data", (data) => {
-    appendLog(username, data.trim());
-  });
+    child.stdout.on("data", (data) => {
+        appendLog(username, `STDOUT: ${data.trim()}`);
+    });
 
-  child.stderr.on("data", (data) => {
-    appendLog(username, data.trim());
-  });
+    child.stderr.on("data", (data) => {
+        appendLog(username, `STDERR: ${data.trim()}`);
+    });
 
-  child.on("close", (code) => {
-    appendLog(username, `Process exited with code ${code}`);
-  });
+    child.on("close", (code) => {
+        appendLog(username, `Process exited with code ${code}`);
+    });
 
-  res.send("Command executed.");
+    res.send("Command execution started.");
 });
 
 // Endpoint to get user logs
-app.get("/logs", (req, res) => {
+app.get("/logs", async (req, res) => {
     const { username } = req.query;
 
     if (!username) {
@@ -98,49 +114,51 @@ app.get("/logs", (req, res) => {
     const userDir = path.join(usersDir, username);
     const logsFile = path.join(userDir, "logs.txt");
 
-    if (!fs.existsSync(logsFile)) {
-        return res.status(404).send("Logs not found.");
-    }
-
     try {
-        const logs = fs.readFileSync(logsFile, "utf8");
+        const logs = await fs.readFile(logsFile, "utf8");
         res.send(logs);
     } catch (error) {
         console.error("Error fetching logs:", error);
-        res.status(500).send("Failed to fetch logs.");
+        res.status(404).send("Logs not found.");
     }
 });
 
 // Endpoint for "Deploy Kaizen"
-app.post("/deploy", (req, res) => {
-  const { username, repoUrl } = req.body;
+app.post("/deploy", async (req, res) => {
+    const { username, repoUrl } = req.body;
 
-  const userDir = path.join(usersDir, username);
-  if (!fs.existsSync(userDir)) {
-    return res.status(400).send("User not found.");
-  }
+    if (!username || !repoUrl) {
+        return res.status(400).send("Username and repository URL are required.");
+    }
 
-  // Clear user directory
-  fs.rmdirSync(userDir, { recursive: true });
-  fs.mkdirSync(userDir);
+    const userDir = path.join(usersDir, username);
+    try {
+        // Clear user directory
+        await fs.rmdir(userDir, { recursive: true }).catch(() => {});
+        await fs.mkdir(userDir, { recursive: true });
 
-  const cloneCommand = `git clone ${repoUrl} . && yarn install && yarn start`;
+        // Clone repository and install dependencies
+        const cloneCommand = `git clone ${repoUrl} . && /usr/bin/yarn install && /usr/bin/yarn start`;
 
-  const child = exec(cloneCommand, { cwd: userDir });
+        const child = exec(cloneCommand, { cwd: userDir, shell: "/bin/bash" });
 
-  child.stdout.on("data", (data) => {
-    appendLog(username, data.trim());
-  });
+        child.stdout.on("data", (data) => {
+            appendLog(username, `STDOUT: ${data.trim()}`);
+        });
 
-  child.stderr.on("data", (data) => {
-    appendLog(username, data.trim());
-  });
+        child.stderr.on("data", (data) => {
+            appendLog(username, `STDERR: ${data.trim()}`);
+        });
 
-  child.on("close", (code) => {
-    appendLog(username, `Deploy process exited with code ${code}`);
-  });
+        child.on("close", (code) => {
+            appendLog(username, `Deploy process exited with code ${code}`);
+        });
 
-  res.send("Deployment started.");
+        res.send("Deployment started.");
+    } catch (error) {
+        console.error("Error during deployment:", error);
+        res.status(500).send("Failed to start deployment.");
+    }
 });
 
 // Start the server