[BasicUI] Close EventSource when leaving (openhab#2282)

Signed-off-by: Laurent Garnier <[email protected]>
wborn · Jan 21, 2024 · 32a7393 · 32a7393
1 parent 3a31e85
commit 32a7393
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/bundles/org.openhab.ui.basic/web-src/smarthome.js b/bundles/org.openhab.ui.basic/web-src/smarthome.js
@@ -2677,7 +2677,7 @@
 		_t.navigate = function(){};
 		_t.source = new EventSource(subscribeLocation);
 
-		_t.source.addEventListener("event", function(payload) {
+		function handleEventSourceEvent(payload) {
 			if (_t.paused) {
 				return;
 			}
@@ -2749,10 +2749,17 @@
 				};
 				_t.updateWidget(smarthome.dataModel[data.widgetId], update);
 			}
-		});
+		}
 
-		_t.source.onerror = function() {
+		_t.source.addEventListener("event", handleEventSourceEvent);
+
+		_t.closeConnection = function() {
+			_t.source.removeEventListener("event", handleEventSourceEvent);
 			_t.source.close();
+		};
+
+		_t.source.onerror = function() {
+			_t.closeConnection();
 			_t.connectionError();
 		};
 	}
@@ -2994,6 +3001,8 @@
 			initSubscription(null);
 		};
 
+		_t.closeConnection = function(){};
+
 		ajax({
 			url: _t.subscribeRequestURL,
 			type: "POST",
@@ -3056,6 +3065,7 @@
 
 		window.addEventListener("beforeunload", function() {
 			smarthome.changeListener.suppressErrors();
+			smarthome.changeListener.closeConnection();
 		});
 	});
 })({