Handle Errors

Author: cybersecmoo

public/electron.js

@@ -79,9 +79,14 @@ async function createWindow() {
   });
 
   ipcMain.on("terminal:command", async (event, command) => {
-    var output = await sendArbitraryCommand(selectedShell, command);
-    output = parseMultiline(output);
-    event.reply("terminal:command-reply", output);
+    try {
+      var output = await sendArbitraryCommand(selectedShell, command);
+      output = parseMultiline(output);
+      event.reply("terminal:command-reply", output);
+    } catch(err) {
+      console.log(err);
+      event.reply("misc:alert", {alertType: "warning", alertMessage: "Failed to send command!"});
+    }
   });
 
   // Listen for window being closed

public/utils/requests.js

@@ -87,18 +87,23 @@ const sendRequest = async (shell, reqType) => {
 
 /** @exports */
 const sendArbitraryCommand = async (shell, command) => {
-	var request = encodeCommand(command, shell.commandEncoding);
+	try {
+		var request = encodeCommand(command, shell.commandEncoding);
 
-	const config = generateConfig(shell, request);
-	var response;
+		const config = generateConfig(shell, request);
+		var response;
 
-	if(shell.commandParamType === "POST") {
-		response = await axios.post(shell.ipOrHostname, config);
-	} else {
-		response = await axios.get(shell.ipOrHostname, config);
-	}
+		if(shell.commandParamType === "POST") {
+			response = await axios.post(shell.ipOrHostname, config);
+		} else {
+			response = await axios.get(shell.ipOrHostname, config);
+		}
 
-	return response;
+		return response;
+	} catch (error) {
+		return null;
+	}
+	
 }
 
 /** 
@@ -159,4 +164,4 @@ const workingDir = async (shell) => {
 	return dirName;
 };
 
-module.exports = { sendRequest, sendArbitraryRequest, determineOS, listDir, workingDir };
+module.exports = { sendRequest, sendArbitraryCommand, determineOS, listDir, workingDir };