Update backend/server.js

backend/server.js

@@ -5,40 +5,43 @@ const path = require("path");
 const { exec } = require("child_process");
 const fs = require("fs-extra");
 const { handleTerminal } = require("./terminalManager");
-const app = express();
 const { 
   isValidDirectoryName, 
   createUserDirectory, 
-  deleteUserDirectory,  // Add this
+  deleteUserDirectory,  
   logMessage 
 } = require("./utils");
 
+const app = express();
+
+// Middleware
 app.use(bodyParser.json());
 app.use(cors({
-  origin: "*", // Consider limiting this for security
+  origin: "*", // For production, replace with specific allowed origins
   methods: ["GET", "POST"],
 }));
 app.use(express.static(path.join(__dirname, "../frontend")));
 
 const userDirectories = "./userDirectories";
 
-// Ensure user directories exist
+// Ensure userDirectories exists
 if (!fs.existsSync(userDirectories)) {
   fs.mkdirSync(userDirectories);
 }
 
-const runningProcesses = new Map(); // Tracks active processes by directory name
+const runningProcesses = new Map(); // Tracks running processes
 
+// Root Route
 app.get("/", (req, res) => {
   res.sendFile(path.join(__dirname, "../frontend/index.html"));
 });
 
-// Start Directory
+// Start Directory and Terminal
 app.post("/start", async (req, res) => {
   const { directoryName, password, repoURL } = req.body;
 
   try {
-    // Validate inputs
+    // Validate input
     if (!directoryName || !password || !repoURL) {
       return res.status(400).send("Invalid inputs");
     }
@@ -47,69 +50,74 @@ app.post("/start", async (req, res) => {
       return res.status(400).send("Invalid directory name format");
     }
 
-    // Check if a process is already running for this directory
     if (runningProcesses.has(directoryName)) {
       return res.status(400).send("A process is already running for this directory.");
     }
 
     const userDir = path.join(userDirectories, directoryName);
 
-    // Create user directory and store hashed password
-
-  try {
-    createUserDirectory(userDirectories, directoryName, password);
-   } catch (err) {
-    logMessage(`Failed to create directory: ${err.message}`);
+    // Create user directory
+    try {
+      createUserDirectory(userDirectories, directoryName, password);
+    } catch (err) {
+      logMessage(`Failed to create directory: ${err.message}`);
       return res.status(500).send("Failed to create user directory");
-}
+    }
 
-    // Clone GitHub repo into the user directory
-    exec(`git clone ${repoURL} ${userDir}`, async (cloneError) => {
+    // Clone GitHub repository
+    exec(`git clone ${repoURL} ${userDir}`, (cloneError, stdout, stderr) => {
       if (cloneError) {
         logMessage(`Error cloning repo: ${cloneError.message}`);
-        return res.status(500).send("Error cloning the repository");
+        logMessage(`STDERR: ${stderr}`);
+        return res.status(500).send(`Error cloning repository: ${stderr}`);
       }
 
-      // Install dependencies using global `node_modules`
-      exec(`git clone ${repoURL} ${userDir}`, (cloneError, stdout, stderr) => {
-  if (cloneError) {
-    logMessage(`Error cloning repo: ${cloneError.message}`);
-    logMessage(`STDERR: ${stderr}`);
-    return res.status(500).send(`Error cloning repository: ${stderr}`);
-  }
-});
+      logMessage(`Repository cloned successfully for ${directoryName}`);
 
-          // Start the user terminal process
-          handleTerminal(directoryName, userDir);
+      // Install dependencies
+      exec(`yarn install --cwd ${userDir}`, (installError, installStdout, installStderr) => {
+        if (installError) {
+          logMessage(`Error installing dependencies: ${installError.message}`);
+          logMessage(`STDERR: ${installStderr}`);
+          return res.status(500).send(`Error installing dependencies: ${installStderr}`);
+        }
 
-          // Track the running process
-          runningProcesses.set(directoryName, true);
+        // Start the terminal process
+        handleTerminal(directoryName, userDir);
 
-          logMessage(`Successfully initialized directory: ${directoryName}`);
-          res.send("Directory and terminal started successfully");
-        }
-      );
+        // Track the running process
+        runningProcesses.set(directoryName, true);
+
+        logMessage(`Successfully initialized directory: ${directoryName}`);
+        res.send("Directory and terminal started successfully");
+      });
     });
+
   } catch (error) {
     logMessage(`Error: ${error.message}`);
-    res.status(500).send(error.message);
+    res.status(500).send("Internal Server Error");
   }
 });
 
-// Corrected Delete Directory Route
+// Delete Directory
 app.post("/delete", async (req, res) => {
   const { directoryName, password } = req.body;
 
   try {
+    if (!directoryName || !password) {
+      return res.status(400).send("Invalid inputs");
+    }
+
     if (runningProcesses.has(directoryName)) {
-      handleTerminal(directoryName, null, true); 
-      runningProcesses.delete(directoryName); 
+      handleTerminal(directoryName, null, true); // Stop terminal
+      runningProcesses.delete(directoryName);
     }
 
-    deleteUserDirectory(userDirectories, directoryName, password); // Fixed here
+    deleteUserDirectory(userDirectories, directoryName, password);
+    logMessage(`Directory ${directoryName} deleted successfully`);
     res.send("Directory deleted successfully");
   } catch (error) {
-    logMessage(`Error: ${error.message}`); // Fixed here
+    logMessage(`Error deleting directory: ${error.message}`);
     res.status(500).send(error.message);
   }
 });
@@ -127,11 +135,11 @@ app.post("/stop", (req, res) => {
   }
 
   handleTerminal(directoryName, null, true); // Stop terminal
-
-  // Remove the directory from running processes
   runningProcesses.delete(directoryName);
 
+  logMessage(`Terminal for ${directoryName} stopped`);
   res.send("Terminal stopped successfully");
 });
 
+// Server Listener
 app.listen(7860, () => console.log("Server is running on port 7860"));