bug: fix stream controller not being closed

juliansteenbakker · Dec 5, 2023 · 327a114 · 327a114
1 parent 91a0394
commit 327a114
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/lib/mobile_scanner_web_plugin.dart b/lib/mobile_scanner_web_plugin.dart
@@ -186,7 +186,8 @@ class MobileScannerWebPlugin {
 
   /// Stops the video feed and analyzer
   Future<void> cancel() async {
-    barCodeReader.stop();
+    await barCodeReader.stop();
+    await barCodeReader.stopDetectBarcodeContinuously();
     await _barCodeStreamSubscription?.cancel();
     _barCodeStreamSubscription = null;
   }

diff --git a/lib/src/web/base.dart b/lib/src/web/base.dart
@@ -50,6 +50,9 @@ abstract class WebBarcodeReaderBase {
   /// Starts scanning QR codes or barcodes
   Stream<Barcode?> detectBarcodeContinuously();
 
+  /// Stops scanning QR codes or barcodes
+  Future<void> stopDetectBarcodeContinuously();
+
   /// Stops streaming video
   Future<void> stop();
 

diff --git a/lib/src/web/jsqr.dart b/lib/src/web/jsqr.dart
@@ -83,6 +83,11 @@ class JsQrCodeReader extends WebBarcodeReaderBase
     });
   }
 
+  @override
+  Future<void> stopDetectBarcodeContinuously() async {
+    return;
+  }
+
   /// Captures a frame and analyzes it for QR codes
   Future<Code?> _captureFrame(VideoElement video) async {
     if (localMediaStream == null) return null;

diff --git a/lib/src/web/zxing.dart b/lib/src/web/zxing.dart
@@ -250,24 +250,30 @@ class ZXingBarcodeReader extends WebBarcodeReaderBase
     await videoSource.play();
   }
 
+  StreamController<Barcode?>? controller;
+
+  @override
+  Future<void> stopDetectBarcodeContinuously() async {
+    _reader?.stopContinuousDecode();
+    controller?.close();
+    controller = null;
+  }
+
   @override
   Stream<Barcode?> detectBarcodeContinuously() {
-    final controller = StreamController<Barcode?>();
-    controller.onListen = () async {
+    controller ??= StreamController<Barcode?>();
+    controller!.onListen = () async {
       _reader?.decodeContinuously(
         video,
         allowInterop((result, error) {
           if (result != null) {
-            controller.add(result.toBarcode());
+            controller?.add(result.toBarcode());
           }
         }),
       );
     };
-    controller.onCancel = () {
-      _reader?.stopContinuousDecode();
-      controller.close();
-    };
-    return controller.stream;
+    controller!.onCancel = () => stopDetectBarcodeContinuously();
+    return controller!.stream;
   }
 
   @override