Mostly working websocket stuff, some message weirdness at the moment...

frontend/lib/providers/game_messages.dart

@@ -1,43 +1,47 @@
+import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:frontend/providers/dio.dart';
+import 'package:frontend/providers/web_socket.dart';
+import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_models/room.dart';
 
 part 'game_messages.g.dart';
 
+final _logger = Logger('GameMessageNotifier');
+
 @riverpod
 class GameMessageNotifier extends _$GameMessageNotifier {
+  StreamSubscription<GameRoomMessage?>? _sub;
+
   @override
-  Stream<GameRoomMessage> build() {
-    return Stream.empty();
-  }
+  Stream<GameRoomMessage?> build() {
+    final Stream<dynamic>? stream = ref.watch(webSocketStreamProvider);
+    if (stream == null) {
+      return Stream.empty();
+    }
 
-  Future<void> connect(String gameRoomUuid) async {
-    final dio = ref.read(dioProvider);
-    Uri.parse('ws://localhost:8080/room/$gameRoomUuid/ws');
-
-    // connect to websocket and then set stream of websocket to state
-    final wsUrl = Uri.parse('ws://localhost:8080/room/$gameRoomUuid/ws');
-
-    final connection = await WebSocket.connect(wsUrl.toString());
-
-    final Stream<GameRoomMessage> gameRoomStream = connection.map((message) {
+    final Stream<GameRoomMessage?> gameRoomStream = stream.map((message) {
       try {
         if (message is String) {
-          GameRoomMessage.fromJson(jsonDecode(message) as Map<String, dynamic>);
+          return GameRoomMessage.fromJson(jsonDecode(message) as Map<String, dynamic>);
         } else {
-          logger.info('Recieved non-string message in socket: $message');
+          _logger.info('Recieved non-string message in socket: $message');
+          return null;
         }
       } catch (e) {
-        print('Error parsing message: $e');
-        rethrow;
+        _logger.severe('Error parsing message: `${message.runtimeType}` $message', e, StackTrace.current);
+        return null;
       }
     });
-    gameRoomStream.listen(
+    _sub = gameRoomStream.listen(
       (event) => state = AsyncValue.data(event),
     );
+    return gameRoomStream;
+  }
+
+  // Cancel the gameroom stream subscription
+  void close() {
+    _sub?.cancel();
   }
 }