rentnerend: connection info + fix a few bugs

Author: MrMineDe

.gitignore

@@ -9,7 +9,6 @@ rentnerend/pubspec.lock
 
 ## Backend
 backend/interscore-backend
-docker/obs
 
 ## Frontend
 *.js

README.md

@@ -95,37 +95,41 @@ Building and running:
 - FINAL³ translations
 
 ## rentnerend
-- URGENT rentnerend infos über connection
-- BUG goal hotkeys vertauscht (input_window)
-- zeit sollte rot werden (oder gelb), wenn pausiert (im public window)
-- BUG UI reset wird nicht geupdatet (input_window)
-- verletzungscounter
-- recv & send time handshake
-- URGENT widget pipelines:
-	- 5s this widget, 5s that
-	- absolute cinema
-- JSON-Creator GUI for non-technical users
+### JSON-Creator
 - @julian :) Import tournaments from cycleball.eu (and Radball.at when library is ready)
 - @julian FINAL Import Spieler, Teams, Vereine, Ligen, Schiedsrichter for custom tournaments from cycleball.eu (and Radball.at)
-- FINAL make the streaming status button accurate
-- FINAL Reversing der anzeige im Anzeigefenster, je nach Position des Bildschirms/Beamers (maybe button anzeigen, wenn window im fokus?)
-- FINAL Add cycleball.eu push support
-- FINAL Cards for Coaches: "Coach von Gifhorn 1 bekommt eine gelbe Karte"
-- FINAL Ads in public window, e.g. fullscreen video/picture during a pause
-- FINAL Next Game in public window, e.g. before the fullscreen ad during a pause
-- FINAL delte cards
 - FINAL² add export to Spielplan-pdf:
 	- we define a standard for what formular keys we expect
 	- users can upload their template only if their matches our standard:
 		- otherwise error dialog ig
 	- we export the results as a writable formular
 - FINAL² Add referees
+### Input Window
+- verletzungscounter
+- widget pipelines: 5s this widget, 5s that
+- JSON-Creator GUI for non-technical users
+- support and create more gameactions easily
+- FINAL make the streaming status button accurate
+- FINAL Add cycleball.eu push support
+- FINAL Cards for Coaches: "Coach von Gifhorn 1 bekommt eine gelbe Karte"
+- FINAL delte cards
+### Public Window
+- zeit sollte rot werden (oder gelb), wenn pausiert (im public window)
+- FINAL Reversing der anzeige im Anzeigefenster, je nach Position des Bildschirms/Beamers (maybe button anzeigen, wenn window im fokus?)
+- recv & send time handshake
+- FINAL Ads, e.g. fullscreen video/picture during a pause
+- FINAL Next Game in public window, e.g. before the fullscreen ad during a pause
 - FINAL³ IDEA Ansagen durch KI bei der Hälfte
-### Remoteend
+### Remote Window
 - FINAL Display Gamerelated information:
 	- Scoreboard Infos: Teams playing, Score, Time, Half
 	- Connection Status of all Clients (backend, rentnerend, frontend)
 	- OBS Scene / replay situation
+### Infoend
+- show connection status
+- zeit als bar um den oval rum
+- FINAL Info Window loggt wie viele leute da waren
+- FINAL Add Logo to Info Window
 
 ## backend
 
@@ -145,12 +149,6 @@ Building and running:
 - FINAL Add different replay possibilities (?? make setting for: speed of replay, length of replay)
 - FINAL Allow changing/select Streaming Service
 
-## Infoend
-- show connection status
-- zeit als bar um den oval rum
-- FINAL Info Window loggt wie viele leute da waren
-- FINAL Add Logo to Info Window
-
 ## interscore.mminl.de
 - UX improvement: look like frontend
 - mobile friendly

rentnerend/lib/input_window.dart

@@ -16,7 +16,7 @@ class InterscoreWS {
 	// This is needed, so Matchday can be updated and trigger a UI redraw
 	// Also we need the Matchday informations in sendSignal() to send them
 	late final ValueNotifier<Matchday> _mdl;
-	ValueNotifier<bool>? get connection => client.connected;
+	ValueNotifier<bool> get connection => client.connected;
 
 	// We have to use a "factory" so the constructor can be async
 	InterscoreWS(String server_url, String client_url, this._mdl) {

rentnerend/lib/websocket.dart

@@ -8,9 +8,9 @@ import 'lib.dart' as lib;
 abstract class WSClient {
 	final String url;
 	final ValueNotifier<Matchday> mdl;
-	bool boss = false;
 	final bool allowReadFrom, allowWriteTo;
 	final ValueNotifier<bool> connected = ValueNotifier(false);
+	final ValueNotifier<bool> boss = ValueNotifier(false);
 
 	WSClient(this.url, this.mdl, this.allowReadFrom, this.allowWriteTo);
 
@@ -29,7 +29,7 @@ abstract class WSClient {
 		if(msg[0] == MessageType.DATA_IM_BOSS.value) {
 			if(msg.length < 2) return;
 			debugPrint("Received DATA_IM_BOSS: ${msg[1] == 1}");
-			this.boss = msg[1] == 1 ? true : false;
+			boss.value = msg[1] == 1 ? true : false;
 		}
 		// Parse the message
 		if(allowReadFrom) _listenRead(msg);

rentnerend/lib/ws_client.dart

@@ -26,19 +26,19 @@ class WSClientIO extends WSClient {
 					debugPrint("WS Client: Server \'${url}\' closed connection");
 					connected.value = false;
 					_ws = null;
-					boss = false;
+					boss.value = false;
 				},
 				onError: (err) {
 					debugPrint("WS Client: ERR ${err}");
 					connected.value = false;
 					_ws = null;
-					boss = false;
+					boss.value = false;
 				}
 			);
 		} catch (e) {
 			debugPrint("WS Client: Connection failed with error: ${e}");
 			_ws = null;
-			boss = false;
+			boss.value = false;
 		}
 	}
 
@@ -52,7 +52,7 @@ class WSClientIO extends WSClient {
 	void close() {
 		_ws?.close();
 		_ws = null;
-		boss = false;
+		boss.value = false;
 	}
 }
 

rentnerend/lib/ws_client_io.dart

@@ -38,17 +38,20 @@ class WSClientWeb extends WSClient{
 				debugPrint("WS Client: ERR");
 				connected.value = false;
 				_ws = null;
+				boss.value = false;
 			}).toJS;
 			ws.onclose = ((CloseEvent e) {
 				debugPrint("WS Client: Server '$url' closed connection");
 				connected.value = false;
 				_ws = null;
+				boss.value = false;
 			}).toJS;
 
 			_ws = ws;
 		} catch (e) {
 			debugPrint("WS Client: Connection failed with error: ${e}");
 			_ws = null;
+			boss.value = false;
 		}
 	}
 
@@ -62,7 +65,7 @@ class WSClientWeb extends WSClient{
 	void close() {
 		_ws?.close();
 		_ws = null;
-		boss = false;
+		boss.value = false;
 	}
 }
 

rentnerend/lib/ws_client_web.dart

@@ -13,6 +13,7 @@ class WSServer {
 	HttpServer? _server;
 	ValueNotifier<Matchday> _mdl;
 	bool readonly = true;
+	ValueNotifier<int> clientsConnected = ValueNotifier(0);
 
 	WSServer(this._url, this._mdl, {this.readonly = true});
 
@@ -44,12 +45,13 @@ class WSServer {
 			final client = await WebSocketTransformer.upgrade(req);
 			debugPrint("WS Server: upgraded client to WS");
 			_clients.add(client);
+			_updateClientCount();
 
 			// Listen is empty, because The server is write only.
 			// Writing clients should connect to the real backend!
 			client.listen(
 				_listen,
-				onDone: () => _clients.remove(client),
+				onDone: () { _clients.remove(client); _updateClientCount(); },
 				onError: (e) => debugPrint("grrr, client couldnt be connected properly!")
 			);
 		}
@@ -126,4 +128,8 @@ class WSServer {
 			client.add(data);
 		}
 	}
+
+	void _updateClientCount() {
+		clientsConnected.value = _clients.length;
+	}
 }