Update server.js

server.js

@@ -1,15 +1,15 @@
 const WebSocket = require('ws');
-const { spawn } = require('child_process');
+const { exec } = require('child_process');
 
 // Create a WebSocket server listening on port 7860
 const wss = new WebSocket.Server({ port: 7860 });
 
 // Event listener for new connections
 wss.on('connection', (ws) => {
-    console.log('New client connected');
+    console.log('connected');
 
     // Send a message to the client when they connect
-    ws.send('Welcome to the WebSocket server!');
+    ws.send('WebSocket server!');
 
     // Event listener for messages from the client
     ws.on('message', (message) => {
@@ -18,32 +18,24 @@ wss.on('connection', (ws) => {
         // Convert message (Buffer) to string
         const command = message.toString();
 
-        // Split command into command and arguments
-        const [cmd, ...args] = command.split(' ');
-
-        // Spawn a child process to execute the command
-        const process = spawn(cmd, args, { shell: true });
-
-        // Send stdout data to the WebSocket client
-        process.stdout.on('data', (data) => {
-            ws.send(`stdout: ${data}`);
-            console.log(`Log: ${data}`);
-        });
-
-        // Send stderr data to the WebSocket client
-        process.stderr.on('data', (data) => {
-            ws.send(`stderr: ${data}`);
-            console.log(`Log: ${data}`);
-        });
-
-        // Handle process completion
-        process.on('close', (code) => {
-            ws.send(`Process exited with code ${code}`);
-        });
-
-        // Handle errors
-        process.on('error', (err) => {
-            ws.send(`Error: ${err.message}`);
+        // Execute the command without sudo
+        exec(command, (error, stdout, stderr) => {
+            if (error) {
+                ws.send(`Error: ${error.message}`);
+                console.log(`\x1b[31mLOG: ${stderr}\x1b[0m`);
+                return;
+            }
+            if (stderr) {
+                ws.send(`stderr: ${stderr}`);
+                console.log(`\x1b[32mLOG: ${stderr}\x1b[0m`);
+                return;
+            }
+            if (stdout) {
+                ws.send(`stdout: ${stdout}`);
+                console.log(`\x1b[32mLOG: ${stdout}\x1b[0m`);
+                return;
+            }
+            //ws.send(`stdout: ${stdout}`);
         });
     });
 
@@ -53,4 +45,4 @@ wss.on('connection', (ws) => {
     });
 });
 
-console.log('WebSocket server is running on ws://localhost:7860');
+console.log('WebSocket server is running on ws://localhost:7860');