chore: Update stack stream handling in GrpcServerConnection

F4zination · Jun 5, 2024 · 4c76bea · 4c76bea
1 parent 975e4c3
commit 4c76bea
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 49 deletions.
diff --git a/duo_backend/api/game_manager.go b/duo_backend/api/game_manager.go
@@ -424,8 +424,8 @@ func (gm *GameManager) SetStackStream(gameId int, userId uuid.UUID, stream pb.DU
 				return err
 			}
 
+			//TODO
 			log.Printf("[stack stream] Received message from stack %v: %v", userId, msg)
-
 		}
 	}
 }

diff --git a/duo_client/lib/provider/api_provider.dart b/duo_client/lib/provider/api_provider.dart
@@ -119,7 +119,6 @@ class ApiProvider extends ChangeNotifier implements AbstractServerConnection {
             notifyListeners();
             break;
           }
-        case StackStateInitEvent:
         case UserStatusInitEvent:
           {
             notifyListeners();

diff --git a/duo_client/lib/utils/connection/grpc_server_connection.dart b/duo_client/lib/utils/connection/grpc_server_connection.dart
@@ -33,7 +33,8 @@ class GrpcServerConnection extends AbstractServerConnection {
   StreamController<PlayerAction> playerActionStreamController =
       StreamController<PlayerAction>.broadcast();
 
-  StreamController<StackRequest>? stackRequestStreamController;
+  StreamController<StackRequest>? stackRequestStreamController =
+      StreamController<StackRequest>.broadcast();
   GrpcServerConnection({required String host}) : super() {
     channel = ClientChannel(
       host,
@@ -275,25 +276,25 @@ class GrpcServerConnection extends AbstractServerConnection {
       playerStream = stream;
 
       playerStream?.listen(
-            (value) {
-              // playerState = value;
-              // _notifyListeners();
-              debugPrint('Received Player State Event: $value');
-
-              eventController.add(PlayerStateEvent(value));
-            },
-            cancelOnError: false,
-            onError: (e) {
-              eventController.add(PlayerStateDoneEvent());
-              debugPrint('Error: $e');
-            },
-            onDone: () {
-              // playerState = null;
-              eventController.add(PlayerStateDoneEvent());
-              gameStream = null;
-              debugPrint('Player Stream Done');
-            },
-          );
+        (value) {
+          // playerState = value;
+          // _notifyListeners();
+          debugPrint('Received Player State Event: $value');
+
+          eventController.add(PlayerStateEvent(value));
+        },
+        cancelOnError: false,
+        onError: (e) {
+          eventController.add(PlayerStateDoneEvent());
+          debugPrint('Error: $e');
+        },
+        onDone: () {
+          // playerState = null;
+          eventController.add(PlayerStateDoneEvent());
+          gameStream = null;
+          debugPrint('Player Stream Done');
+        },
+      );
     } catch (e) {
       return -1;
     }
@@ -309,13 +310,6 @@ class GrpcServerConnection extends AbstractServerConnection {
   @override
   Future<int> getStackStream(String token, int gameId) async {
     try {
-      final streamEstablishedCompleter = Completer<void>();
-      if (!hasStackStream) {
-        stackRequestStreamController = StreamController<StackRequest>.broadcast(
-          onCancel: () =>
-              debugPrint('Stream controller for stack request cancelled'),
-        );
-      }
       final responseStream =
           client.getStackStream(stackRequestStreamController!.stream,
               options: CallOptions(
@@ -324,22 +318,14 @@ class GrpcServerConnection extends AbstractServerConnection {
       stackStream = responseStream;
       stackStream?.listen(
         (value) {
-          if (!streamEstablishedCompleter.isCompleted) {
-            if (!streamEstablishedCompleter.isCompleted) {
-              streamEstablishedCompleter.complete();
-            }
-            eventController.add(StackStateEvent(value));
-            debugPrint('card on top: ${value.placeStack.cardIdOnTop}');
-            debugPrint('stack stream acknowledge received');
-          }
+          eventController.add(StackStateEvent(value));
+          debugPrint('card on top: ${value.placeStack.cardIdOnTop}');
+          debugPrint('stack stream acknowledge received');
         },
         onError: (error) {
-          if (!streamEstablishedCompleter.isCompleted) {
-            streamEstablishedCompleter.completeError(error);
-            stackStream?.cancel();
-            stackStream = null;
-            eventController.add(StackStateDoneEvent());
-          }
+          stackStream?.cancel();
+          stackStream = null;
+          eventController.add(StackStateDoneEvent());
           debugPrint('Error establishing stack stream: $error');
         },
         onDone: () {
@@ -350,8 +336,6 @@ class GrpcServerConnection extends AbstractServerConnection {
         cancelOnError: false,
       );
 
-      await streamEstablishedCompleter.future;
-      eventController.add(StackStateInitEvent());
       return 0;
     } catch (e) {
       debugPrint('Error sending stack request: $e');

diff --git a/duo_client/lib/utils/connection/server_events.dart b/duo_client/lib/utils/connection/server_events.dart
@@ -33,10 +33,6 @@ class StackStateEvent extends ServerEvent {
   StackStateEvent(this.state);
 }
 
-class StackStateInitEvent extends ServerEvent {
-  StackStateInitEvent();
-}
-
 class StackStateDoneEvent extends ServerEvent {
   StackStateDoneEvent();
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     				return err
     			}
+    			//TODO
     			log.Printf("[stack stream] Received message from stack %v: %v", userId, msg)
     		}
     	}
     }
@@ Expand Down @@