Merge pull request #207 from GreenTeaProgrammers/fix/frontend/nursery…

…/stream Fix/frontend/nursery/stream
GreenTeaProgrammers · Feb 23, 2024 · 9d1c929 · 9d1c929
2 parents f58ae55 + 1a060a6
commit 9d1c929
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/frontend/where_child_bus/lib/pages/camera_page/camera_page.dart b/frontend/where_child_bus/lib/pages/camera_page/camera_page.dart
@@ -37,6 +37,9 @@ class _CameraPageState extends State<CameraPage> {
   VehicleEvent _vehicleEvent = VehicleEvent.VEHICLE_EVENT_GET_ON;
   final Location location = Location();
 
+  ClientChannel? _videoChannel;
+  ClientChannel? _locationChannel;
+
   @override
   void initState() {
     super.initState();
@@ -70,35 +73,35 @@ class _CameraPageState extends State<CameraPage> {
 
   Future<void> streamBusVideo(
       Stream<StreamBusVideoRequest> requestStream) async {
-    final channel = ClientChannel(
+    _videoChannel = ClientChannel(
       appConfig.grpcEndpoint,
       port: appConfig.grpcPort,
       options: const ChannelOptions(),
     );
-    final grpcClient = BusServiceClient(channel);
+    final grpcClient = BusServiceClient(_videoChannel!);
     developer.log("ServiceClient created");
     final res = grpcClient.streamBusVideo(requestStream);
 
     try {
-      await for (var response in res.asStream()) {
+      await for (var response in res) {
         developer.log("Received response: $response", name: "CameraPage");
         await _playAudio(response);
       }
     } catch (error) {
       developer.log("Caught Error:", error: error, name: "StreamBusVideo");
     } finally {
-      await channel.shutdown();
+      await _videoChannel!.shutdown();
     }
   }
 
   Future<void> _streamCoordinate(
       Stream<SendLocationContinuousRequest> requestStream) async {
-    final channel = ClientChannel(
+    _locationChannel = ClientChannel(
       appConfig.grpcEndpoint,
       port: appConfig.grpcPort,
       options: const ChannelOptions(),
     );
-    final grpcClient = BusServiceClient(channel);
+    final grpcClient = BusServiceClient(_locationChannel!);
     developer.log("ServiceClient created");
     final res = grpcClient.sendLocationContinuous(requestStream);
 
@@ -109,7 +112,7 @@ class _CameraPageState extends State<CameraPage> {
     } catch (error) {
       developer.log("Caught Error:", error: error);
     } finally {
-      await channel.shutdown();
+      await _locationChannel!.shutdown();
     }
   }
 
@@ -282,6 +285,8 @@ class _CameraPageState extends State<CameraPage> {
     _controller.dispose();
     _streamController.close();
     _locationStream.close();
+    _videoChannel?.shutdown();
+    _locationChannel?.shutdown();
     super.dispose();
   }
 

diff --git a/frontend/where_child_bus/lib/util/api/bus.dart b/frontend/where_child_bus/lib/util/api/bus.dart
@@ -128,7 +128,7 @@ Future<void> streamBusVideo(Stream<StreamBusVideoRequest> requestStream) async {
 
   try {
     developer.log("Streamed video to server");
-    await for (var response in res.asStream()) {
+    await for (var response in res) {
       developer.log("Received response: $response");
     }
   } catch (error) {