WS reconnect logic & WS memory leak protection

shana · Feb 17, 2022 · 3be4b69 · 3be4b69
1 parent e9a0589
commit 3be4b69
Show file tree

Hide file tree

Showing 3 changed files with 810 additions and 795 deletions.
diff --git a/wled00/data/index.js b/wled00/data/index.js
@@ -956,7 +956,7 @@ function cmpP(a, b) {
 function makeWS() {
 	if (ws) return;
 	ws = new WebSocket('ws://'+(loc?locip:window.location.hostname)+'/ws');
-  ws.binaryType = "arraybuffer";
+	ws.binaryType = "arraybuffer";
 	ws.onmessage = function(event) {
     if (event.data instanceof ArrayBuffer) return; //liveview packet
 		var json = JSON.parse(event.data);
@@ -974,9 +974,15 @@ function makeWS() {
 		displayRover(info, s);
 		readState(json.state);
 	};
-	ws.onclose = function(event) {
-    	d.getElementById('connind').style.backgroundColor = "#831";
-  	}
+	ws.onclose = (e)=>{
+		d.getElementById('connind').style.backgroundColor = "#831";
+		ws = null;
+		if (lastinfo.ws > -1) setTimeout(makeWS,500); //retry WS connection
+	}
+	ws.onopen = (e)=>{
+		ws.send("{'v':true}");
+		reqsLegal = true;
+	}
 }
 
 function readState(s,command=false) {