2rd rewrite of upload error management

luc-github · luc-github · commit dd4f204b28e2 · 2019-09-01T16:44:46.000+02:00
Add IPfor websocket setup in [ESP800]per @Nathan-ma suggestion Change `Error 0` by `No connection` message change version to 47
diff --git a/index.html.gz b/index.html.gz
diff --git a/www/index.html b/www/index.html
@@ -10,7 +10,7 @@
         var target_firmware = "";
     </script>
     <script>
-        var web_ui_version = "2.1b45";
+        var web_ui_version = "2.1b47";
     </script>
     <script>
         var direct_sd = false;
diff --git a/www/js/SPIFFSdlg.js b/www/js/SPIFFSdlg.js
@@ -257,4 +257,5 @@ function SPIFFSUploadfailed(errorcode, response) {
         document.getElementById('SPIFFS_status').innerHTML = translate_text_item("Upload failed : ") + errorcode;
     }
     SPIFFS_upload_ongoing = false;
+    refreshSPIFFS();
 }
diff --git a/www/js/app.js b/www/js/app.js
@@ -6,6 +6,7 @@ var event_source;
 var log_off = false;
 var async_webcommunication = false;
 var websocket_port = 0;
+var websocket_ip = "";
 var esp_hostname = "ESP3D WebUI";
 var EP_HOSTNAME;
 var EP_STA_SSID;
@@ -120,8 +121,8 @@ function startSocket() {
         if (async_webcommunication) {
             ws_source = new WebSocket('ws://' + document.location.host + '/ws', ['arduino']);
         } else {
-            console.log("Socket port is :" + websocket_port);
-            ws_source = new WebSocket('ws://' + document.location.hostname + ':' + websocket_port, ['arduino']);
+            console.log("Socket is " + websocket_ip + ":" + websocket_port);
+            ws_source = new WebSocket('ws://' + websocket_ip + ':' + websocket_port, ['arduino']);
         }
     } catch (exception) {
         console.error(exception);
@@ -185,7 +186,13 @@ function startSocket() {
                 if (tval[0] == 'ERROR') {
                   esp_error_message = tval[2];
                   esp_error_code = tval[1];
-                  console.log(tval[2] + " code:" +  tval[1]);
+                  console.log("ERROR: " + tval[2] + " code:" +  tval[1]);
+                  CancelCurrentUpload();
+                }
+                if (tval[0] == 'MSG') {
+                  var error_message = tval[2];
+                  var error_code = tval[1];
+                  console.log("MSG: " + tval[2] + " code:" +  tval[1]);
                 }
             }
 
diff --git a/www/js/commands.js b/www/js/commands.js
@@ -122,6 +122,10 @@ function SendCustomCommandSuccess(response) {
 }
 
 function SendCustomCommandFailed(error_code, response) {
-    Monitor_output_Update("Error " + error_code + " :" + decode_entitie(response) + "\n");
-    console.log("Error " + error_code + " :" + decode_entitie(response));
-}
+    if (error_code == 0) {
+        Monitor_output_Update(translate_text_item("No connection") + "\n");
+    } else {
+         Monitor_output_Update(translate_text_item("Error : ") + error_code + " :" + decode_entitie(response) + "\n");
+    }
+    console.log("cmd Error " + error_code + " :" + decode_entitie(response));
+}
diff --git a/www/js/connectdlg.js b/www/js/connectdlg.js
@@ -72,6 +72,12 @@ function getFWdata(response) {
         else {
             async_webcommunication = false;
             websocket_port = sublist[2].trim();
+            if (sublist.length>3) {
+                websocket_ip = sublist[3].trim();
+            } else {
+                console.log("No IP for websocket, use default");
+                 websocket_ip =  document.location.hostname;
+            }
         }
     }
     if (tlist.length > 7) {
diff --git a/www/js/files.js b/www/js/files.js
@@ -566,7 +566,7 @@ function files_serial_M20_list_failed(error_code, response) {
          alertdlg (translate_text_item("Error") + " (" + esp_error_code + ")", esp_error_message);
          esp_error_code = 0;
     } else {
-        alertdlg (translate_text_item("Error"), "Error " + errorcode + " : " + response);
+        alertdlg (translate_text_item("Error"), translate_text_item("No connection"));
     }
     files_build_display_filelist(false);
 }
diff --git a/www/js/http.js b/www/js/http.js
@@ -1,6 +1,7 @@
 var http_communication_locked = false;
 var http_cmd_list = [];
 var processing_cmd = false;
+var xmlhttpupload;
 
 var max_cmd = 20;
 
@@ -217,26 +218,32 @@ function SendFileHttp(url, postdata, progress_fn, result_fn, error_fn) {
     process_cmd();
 }
 
+function CancelCurrentUpload() {
+    xmlhttpupload.abort();
+    //http_communication_locked = false;
+    console.log("Cancel Upload");
+}
+
 function ProcessFileHttp(url, postdata, progressfn, resultfn, errorfn) {
     if (http_communication_locked) {
         errorfn(503, translate_text_item("Communication locked!"));
         return;
     }
     http_communication_locked = true;
-    var xmlhttp = new XMLHttpRequest();
-    xmlhttp.onreadystatechange = function() {
-        if (xmlhttp.readyState == 4) {
+    xmlhttpupload = new XMLHttpRequest();
+    xmlhttpupload.onreadystatechange = function() {
+        if (xmlhttpupload.readyState == 4) {
             http_communication_locked = false;
-            if (xmlhttp.status == 200) {
-                if (typeof resultfn != 'undefined' && resultfn != null) resultfn(xmlhttp.responseText);
+            if (xmlhttpupload.status == 200) {
+                if (typeof resultfn != 'undefined' && resultfn != null) resultfn(xmlhttpupload.responseText);
             } else {
-                if (xmlhttp.status == 401) GetIdentificationStatus();
-                if (typeof errorfn != 'undefined' && errorfn != null) errorfn(xmlhttp.status, xmlhttp.responseText);
+                if (xmlhttpupload.status == 401) GetIdentificationStatus();
+                if (typeof errorfn != 'undefined' && errorfn != null) errorfn(xmlhttpupload.status, xmlhttpupload.responseText);
             }
         }
     }
     //console.log(url);
-    xmlhttp.open("POST", url, true);
-    if (typeof progressfn != 'undefined' && progressfn != null) xmlhttp.upload.addEventListener("progress", progressfn, false);
-    xmlhttp.send(postdata);
-}
+    xmlhttpupload.open("POST", url, true);
+    if (typeof progressfn != 'undefined' && progressfn != null) xmlhttpupload.upload.addEventListener("progress", progressfn, false);
+    xmlhttpupload.send(postdata);
+}
diff --git a/www/js/printercmd.js b/www/js/printercmd.js
@@ -49,6 +49,10 @@ function SendPrinterCommandSuccess(response) {
 }
 
 function SendPrinterCommandFailed(error_code, response) {
-    Monitor_output_Update("Error " + error_code + " :" + decode_entitie(response) + "\n");
-    console.log("Error " + error_code + " :" + decode_entitie(response));
-}
+    if (error_code == 0) {
+        Monitor_output_Update(translate_text_item("No connection") + "\n");
+    } else {
+         Monitor_output_Update(translate_text_item("Error : ") + error_code + " :" + decode_entitie(response) + "\n");
+    }
+    console.log("printer cmd Error " + error_code + " :" + decode_entitie(response));
+}
diff --git a/www/js/updatedlg.js b/www/js/updatedlg.js
@@ -107,7 +107,10 @@ function updatesuccess(response) {
 function updatefailed(errorcode, response) {
     document.getElementById('fw-select_form').style.display = 'block';
     document.getElementById('prgfw').style.display = 'none';
-    document.getElementById('uploadfw-button').style.display = 'block';
+    document.getElementById("fw_file_name").innerHTML = translate_text_item("No file chosen");
+    document.getElementById('uploadfw-button').style.display = 'none';
+    //document.getElementById('updatemsg').innerHTML = "";
+    document.getElementById('fw-select').value = "";
     if (esp_error_code !=0){
         alertdlg (translate_text_item("Error") + " (" + esp_error_code + ")", esp_error_message);
         document.getElementById('updatemsg').innerHTML = translate_text_item("Upload failed : ") + esp_error_message;
@@ -118,4 +121,5 @@ function updatefailed(errorcode, response) {
     }
     console.log("Error " + errorcode + " : " + response);
     update_ongoing = false;
+    SendGetHttp("/updatefw");
 }

Original file line number	Diff line number	Diff line change
`@@ -257,4 +257,5 @@ function SPIFFSUploadfailed(errorcode, response) {`
`257`	`257`	`document.getElementById('SPIFFS_status').innerHTML = translate_text_item("Upload failed : ") + errorcode;`
`258`	`258`	`}`
`259`	`259`	`SPIFFS_upload_ongoing = false;`
	`260`	`+ refreshSPIFFS();`
`260`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,12 @@ function getFWdata(response) {`
`72`	`72`	`else {`
`73`	`73`	`async_webcommunication = false;`
`74`	`74`	`websocket_port = sublist[2].trim();`
	`75`	`+ if (sublist.length>3) {`
	`76`	`+ websocket_ip = sublist[3].trim();`
	`77`	`+ } else {`
	`78`	`+ console.log("No IP for websocket, use default");`
	`79`	`+ websocket_ip = document.location.hostname;`
	`80`	`+ }`
`75`	`81`	`}`
`76`	`82`	`}`
`77`	`83`	`if (tlist.length > 7) {`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ function files_serial_M20_list_failed(error_code, response) {`
`566`	`566`	`alertdlg (translate_text_item("Error") + " (" + esp_error_code + ")", esp_error_message);`
`567`	`567`	`esp_error_code = 0;`
`568`	`568`	`} else {`
`569`		`- alertdlg (translate_text_item("Error"), "Error " + errorcode + " : " + response);`
	`569`	`+ alertdlg (translate_text_item("Error"), translate_text_item("No connection"));`
`570`	`570`	`}`
`571`	`571`	`files_build_display_filelist(false);`
`572`	`572`	`}`