fix regression on encoded html attributes

Author: alessio-perugini

home.html

@@ -33,18 +33,27 @@
                 if (jsonMsg.Ports) {
                     const validKeys = ['Name', 'SerialNumber', 'IsOpen', 'VendorID', 'ProductID'];
                     if (jsonMsg.Network) {
-                        printMsg = "<b>Network Ports</b>:<br>"+JSON.stringify(jsonMsg.Ports, validKeys, 2);
+                        printMsg = "Network Ports:\n"+JSON.stringify(jsonMsg.Ports, validKeys, 2);
                     } else {
-                        printMsg = "<b>Serial Ports</b>:<br>"+JSON.stringify(jsonMsg.Ports, validKeys, 2);
+                        printMsg = "Serial Ports:\n"+JSON.stringify(jsonMsg.Ports, validKeys, 2);
                     }
                 } else if (Object.keys(jsonMsg).length !== 0) {
                     printMsg = JSON.stringify(jsonMsg, undefined, 2);
                 }
+
+                // when parsing JSON we're escaping some html charaters like "&:<>, we want to show their
+                // original value in the log
+                function decode(str) {
+                    let txt = new DOMParser().parseFromString(str, "text/html");
+                    return txt.documentElement.textContent;
+                }
+                printMsg = decode(printMsg);
+
                 messages.push(printMsg);
                 if (messages.length > MESSAGES_MAX_COUNT) {
                     messages.shift();
                 }
-                log.textContent = messages.join('<br><br>');
+                log.textContent = messages.join('\n\n');
                 if (autoscroll.checked) {
                     log.scrollTop = log.scrollHeight - log.clientHeight;
                 }
@@ -65,8 +74,7 @@
 	    $('#export').click(function() {
 	    	var link = document.createElement('a');
 	    	link.setAttribute('download', 'agent-log.txt');
-	    	var text = log.innerHTML.replace(/<br>/g, '\n');
-	    	text = text.replace(/<b>|<\/b>/g, '');
+	    	var text = log.textContent;
 	    	link.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
     		link.click();
     	});
@@ -83,13 +91,13 @@
 	            socket = io('http://{{$}}');
 	        }
 	        socket.on('disconnect', function(evt) {
-	            appendLog($('<div><b>Connection closed.</b></div>'))
+	            appendLog('Connection closed.')
 	        });
 	        socket.on('message', function(evt) {
 	            appendLog(evt);
 	        });
 	    } else {
-	        appendLog($('<div><b>Your browser does not support WebSockets.</b></div>'))
+	        appendLog('Your browser does not support WebSockets.')
         }
 
         $("#input").focus();