Clean up of all calls to SendGetHttp url->cmd

BarbourSmith · Jan 22, 2025 · 786a025 · 786a025
1 parent 4aeb457
commit 786a025
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 57 deletions.
diff --git a/www/js/commands.js b/www/js/commands.js
@@ -103,19 +103,23 @@ const Monitor_output_Update = (message) => {
 };
 
 function SendCustomCommand() {
-	let cmd = id("custom_cmd_txt").value;
-	const url = "/command?commandText=";
-	cmd = cmd.trim();
-	if (cmd.trim().length === 0) return;
-	CustomCommand_history.push(cmd);
+	let elem = id("custom_cmd_txt");
+	if (!elem) {
+		return;
+	}
+	let cmdTxt = elem.value.trim();
+	if (!cmdTxt) {
+		return;
+	}
+
+	CustomCommand_history.push(cmdTxt);
 	CustomCommand_history.slice(-40);
 	CustomCommand_history_index = CustomCommand_history.length;
 	id("custom_cmd_txt").value = "";
-	Monitor_output_Update(`${cmd}\n`);
-	cmd = encodeURI(cmd);
-	//because # is not encoded
-	cmd = cmd.replace("#", "%23");
-	SendGetHttp(url + cmd, SendCustomCommandSuccess, SendCustomCommandFailed);
+	Monitor_output_Update(`${cmdTxt}\n`);
+
+	const cmd = `/command?commandText=${encodeURI(cmd).replace("#", "%23")}`;
+	SendGetHttp( cmd, SendCustomCommandSuccess, SendCustomCommandFailed);
 }
 
 function CustomCommand_OnKeyUp(event) {

diff --git a/www/js/config.js b/www/js/config.js
@@ -37,25 +37,24 @@ function config_display_override(display_it) {
     }
 }
 
-function getprinterconfig(is_override) {
-    var cmd = commandtxt;
-    if ((typeof is_override != 'undefined') && is_override) {
-        cmd = "M503";
-        config_override_List = [];
-        is_override_config = true;
-    } else is_override_config = false;
-    var url = "/command?plain=" + encodeURIComponent(cmd);
-    SendGetHttp(url);
+function getprinterconfig(is_override = false) {
+    is_override_config = is_override;
+    if (is_override) {
+        // Clear out the list
+        config_override_List.length = 0;
+    }
+    var cmd = `/command?plain=${encodeURIComponent(is_override ? "M503" : commandtx)}`;
+    SendGetHttp(cmd);
 }
 
 function Apply_config_override() {
-    var url = "/command?plain=" + encodeURIComponent("M500");
-    SendGetHttp(url, getESPUpdateconfigSuccess);
+    var cmd = `/command?plain=${encodeURIComponent("M500")}`;
+    SendGetHttp(cmd, getESPUpdateconfigSuccess);
 }
 
 function Delete_config_override() {
-    var url = "/command?plain=" + encodeURIComponent("M502");
-    SendGetHttp(url, getESPUpdateconfigSuccess);
+    var cmd = `/command?plain=${encodeURIComponent("M502")}`;
+    SendGetHttp(cmd, getESPUpdateconfigSuccess);
 }
 
 function getESPUpdateconfigSuccess(response) {
@@ -290,8 +289,8 @@ function configGetvalue(index, is_override) {
         id('icon_config_' + prefix + index).className = "form-control-feedback has-success ico_feedback";
         id('icon_config_' + prefix + index).innerHTML = get_icon_svg("ok");
         id('status_config_' + prefix + index).className = "form-group has-feedback has-success";
-        var url = "/command?plain=" + encodeURIComponent(cmd);
-        SendGetHttp(url, setESPconfigSuccess, setESPconfigfailed);
+        var cmd = `/command?plain=${encodeURIComponent(cmd)}`;
+        SendGetHttp(cmd, setESPconfigSuccess, setESPconfigfailed);
     }
 }
 

diff --git a/www/js/connectdlg.js b/www/js/connectdlg.js
@@ -130,6 +130,6 @@ const retryconnect = () => {
 
 	id("connectbtn").removeEventListener("click", retryconnect);
 
-	const url = `/command?plain=${encodeURIComponent("[ESP800]")}`;
-	SendGetHttp(url, connectsuccess, connectfailed);
+	const cmd = `/command?plain=${encodeURIComponent("[ESP800]")}`;
+	SendGetHttp(cmd, connectsuccess, connectfailed);
 };
diff --git a/www/js/http.js b/www/js/http.js
@@ -243,7 +243,7 @@ function ProcessGetHttp(cmd, resultfn, errorfn) {
     }
 
     if (cmd.startsWith("/command")) {
-        cmd += (url.indexOf("?") == -1) ? "?" : "&";
+        cmd += (cmd.indexOf("?") == -1) ? "?" : "&";
         cmd += `PAGEID=${pageID()}`;
     }
     //console.log("GET:" + cmd);

diff --git a/www/js/logindlg.js b/www/js/logindlg.js
@@ -16,8 +16,8 @@ const logindlg = (closefunc, check_first = false) => {
 	displayBlock("login_content");
 
 	if (check_first) {
-		const url = "/login";
-		SendGetHttp(url, checkloginsuccess);
+		const cmd = "/login";
+		SendGetHttp(cmd, checkloginsuccess);
 	} else {
 		showModal();
 	}
@@ -86,13 +86,12 @@ function loginsuccess(response_text) {
 function SubmitLogin() {
 	const user = id("login_user_text").value.trim();
 	const password = id("login_password_text").value.trim();
-	const url =
-		`/login?USER=${encodeURIComponent(user)}&PASSWORD=${encodeURIComponent(password)}&SUBMIT=yes`;
+	const cmd = `/login?USER=${encodeURIComponent(user)}&PASSWORD=${encodeURIComponent(password)}&SUBMIT=yes`;
 	setHTML("current_ID", user);
 	setHTML("current_auth_level", "");
 	displayNone("login_content");
 	displayBlock("login_loader");
-	SendGetHttp(url, loginsuccess, loginfailed);
+	SendGetHttp(cmd, loginsuccess, loginfailed);
 }
 
 function DisconnectionSuccess(response_text) {
@@ -114,7 +113,7 @@ function DisconnectionFailed(error_code, response) {
 
 function DisconnectLogin(answer) {
 	if (answer === "yes") {
-		const url = "/login?DISCONNECT=yes";
-		SendGetHttp(url, DisconnectionSuccess, DisconnectionFailed);
+		const cmd = "/login?DISCONNECT=yes";
+		SendGetHttp(cmd, DisconnectionSuccess, DisconnectionFailed);
 	}
 }
diff --git a/www/js/passworddlg.js b/www/js/passworddlg.js
@@ -62,8 +62,8 @@ function SubmitChangePassword() {
 	const user = encodeURIComponent(id("current_ID").innerHTML.trim());
 	const password = encodeURIComponent(id("password_password_text").value.trim());
 	const newpassword = encodeURIComponent(id("password_password_text1").value.trim());
-	const url = `/login?USER=${user}&PASSWORD=${password}&NEWPASSWORD=${newpassword}&SUBMIT=yes`;
+	const cmd = `/login?USER=${user}&PASSWORD=${password}&NEWPASSWORD=${newpassword}&SUBMIT=yes`;
 	displayBlock("password_loader");
 	displayNone("change_password_content");
-	SendGetHttp(url, ChangePasswordsuccess, ChangePasswordfailed);
+	SendGetHttp(cmd, ChangePasswordsuccess, ChangePasswordfailed);
 }
diff --git a/www/js/preferencesdlg.js b/www/js/preferencesdlg.js
@@ -49,14 +49,14 @@ function initpreferences() {
 }
 
 function getpreferenceslist() {
-    var url = preferences_file_name;
+    var cmd = preferences_file_name;
     preferenceslist = [];
     //removeIf(production)
     var response = defaultpreferenceslist;
     processPreferencesGetSuccess(response);
     return;
     //endRemoveIf(production)
-    SendGetHttp(url, processPreferencesGetSuccess, processPreferencesGetFailed);
+    SendGetHttp(cmd, processPreferencesGetSuccess, processPreferencesGetFailed);
 }
 
 function prefs_toggledisplay(id_source, forcevalue) {

diff --git a/www/js/printercmd.js b/www/js/printercmd.js
@@ -3,13 +3,15 @@ var grbl_errorfn = null;
 
 function noop() {}
 function SendPrinterCommand(cmd, echo_on, processfn, errorfn, id, max_id, extra_arg) {
-    var url = "/command?commandText=";
+    var cmdTxt = "/command?commandText=";
     var push_cmd = true;
     if (typeof echo_on !== 'undefined') {
         push_cmd = echo_on;
     }
     if (cmd.length == 0) return;
-    if (push_cmd) Monitor_output_Update("[#]" + cmd + "\n");
+    if (push_cmd) {
+        Monitor_output_Update("[#]" + cmd + "\n");
+    }
     //removeIf(production)
     console.log(cmd);
     if (typeof processfn !== 'undefined') processfn("Test response");
@@ -24,20 +26,20 @@ function SendPrinterCommand(cmd, echo_on, processfn, errorfn, id, max_id, extra_
         processfn = noop;
         errorfn = noop;
     }
-    cmd = encodeURI(cmd);
-    cmd = cmd.replace("#", "%23");
+    cmd = encodeURI(cmd).replace("#", "%23");
     if (extra_arg) {
         cmd += "&" + extra_arg;
     }
-    SendGetHttp(url + cmd, processfn, errorfn, id, max_id);
+    SendGetHttp(cmdTxt + cmd, processfn, errorfn, id, max_id);
     //console.log(cmd);
 }
 
 function SendPrinterSilentCommand(cmd, processfn, errorfn, id, max_id) {
-    var url = "/command_silent?commandText=";
-    if (cmd.length == 0) return;
+    if (!cmd) {
+        return;
+    }
     //removeIf(production)
-    console.log(cmd);
+    console.info(cmd);
     if (typeof processfn !== 'undefined') processfn("Test response");
     else SendPrinterCommandSuccess("Test response");
     return;
@@ -46,7 +48,8 @@ function SendPrinterSilentCommand(cmd, processfn, errorfn, id, max_id) {
     if (typeof errorfn === 'undefined' || errorfn == null) errorfn = SendPrinterCommandFailed;
     cmd = encodeURI(cmd);
     cmd = cmd.replace("#", "%23");
-    SendGetHttp(url + cmd, processfn, errorfn, id, max_id);
+    var cmdTxt = `/command_silent?commandText=${cmd}`;
+    SendGetHttp(cmdTxt, processfn, errorfn, id, max_id);
     //console.log(cmd);
 }
 

diff --git a/www/js/scanwifidlg.js b/www/js/scanwifidlg.js
@@ -46,8 +46,8 @@ function refresh_scanwifi() {
 	getscanWifiSuccess(testResponse.join(""));
 	return;
 	//endRemoveIf(production)
-	const url = `/command?plain=${encodeURIComponent("[ESP410]")}`;
-	SendGetHttp(url, getscanWifiSuccess, getscanWififailed);
+	const cmd = `/command?plain=${encodeURIComponent("[ESP410]")}`;
+	SendGetHttp(cmd, getscanWifiSuccess, getscanWififailed);
 }
 
 function process_scanWifi_answer(response_text) {

diff --git a/www/js/settings.js b/www/js/settings.js
@@ -45,8 +45,8 @@ function refreshSettings(hide_setting_list) {
   displayNone('settings_refresh_btn')
 
   scl = []
-  var url = '/command?plain=' + encodeURIComponent('[ESP400]')
-  SendGetHttp(url, getESPsettingsSuccess, getESPsettingsfailed)
+  var cmd = '/command?plain=' + encodeURIComponent('[ESP400]')
+  SendGetHttp(cmd, getESPsettingsSuccess, getESPsettingsfailed)
 }
 
 function defval(i) {
@@ -467,8 +467,8 @@ function settingsetvalue(i, j) {
     setIcon(i, j, 'has-success ico_feedback')
     setIconHTML(i, j, get_icon_svg('ok'))
     setStatus(i, j, 'has-feedback has-success')
-    var url = '/command?plain=' + encodeURIComponent(cmd)
-    SendGetHttp(url, setESPsettingsSuccess, setESPsettingsfailed)
+    var cmdTxt = '/command?plain=' + encodeURIComponent(cmd)
+    SendGetHttp(cmdTxt, setESPsettingsSuccess, setESPsettingsfailed)
   }
 }
 

diff --git a/www/js/statusdlg.js b/www/js/statusdlg.js
@@ -98,6 +98,6 @@ function refreshstatus() {
 	const text = modal.element.getElementsByClassName("modal-text")[0];
 	text.innerHTML = "";
 	displayNone("status_msg");
-	const url = `/command?plain=${encodeURIComponent("[ESP420]plain")}`;
-	SendGetHttp(url, statussuccess, statusfailed);
+	const cmd = `/command?plain=${encodeURIComponent("[ESP420]plain")}`;
+	SendGetHttp(cmd, statussuccess, statusfailed);
 }
diff --git a/www/js/tablet.js b/www/js/tablet.js
@@ -479,7 +479,7 @@ function scaleUnits(target) {
 
 function tabletUpdateModal() {
   const newUnits = modal.units === 'G21' ? 'mm' : 'Inch'
-  if (getText('units') !== newUnits) {
+  if (getValue('units') !== newUnits) {
     setText('units', newUnits)
     setJogSelector(modal.units)
     scaleUnits("disM")