Merge branch 'main' into improve-reconnect-logic-for-websocket

example/lib/main.dart

@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_window_close/flutter_window_close.dart';
 import 'package:livekit_example/theme.dart';
 import 'package:logging/logging.dart';
 import 'package:intl/intl.dart';
 import 'pages/connect.dart';
+import 'utils.dart';
 
 void main() async {
   final format = DateFormat('HH:mm:ss');
@@ -14,6 +16,10 @@ void main() async {
 
   WidgetsFlutterBinding.ensureInitialized();
 
+  FlutterWindowClose.setWindowShouldCloseHandler(() async {
+    await onWindowShouldClose?.call();
+    return true;
+  });
   runApp(const LiveKitExampleApp());
 }
 

example/lib/pages/room.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:math' as math;
 
@@ -7,6 +8,7 @@ import 'package:livekit_client/livekit_client.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 import '../exts.dart';
+import '../utils.dart';
 import '../widgets/controls.dart';
 import '../widgets/participant.dart';
 import '../widgets/participant_info.dart';
@@ -28,7 +30,6 @@ class RoomPage extends StatefulWidget {
 }
 
 class _RoomPageState extends State<RoomPage> with WidgetsBindingObserver {
-  //
   List<Participant> participantTracks = [];
   EventsListener<RoomEvent> get _listener => widget.listener;
   bool get fastConnection => widget.room.engine.fastConnectOptions != null;
@@ -52,6 +53,14 @@ class _RoomPageState extends State<RoomPage> with WidgetsBindingObserver {
     if (lkPlatformIsMobile()) {
       Hardware.instance.setSpeakerphoneOn(true);
     }
+
+    if (!lkPlatformIs(PlatformType.web) && !lkPlatformIsTest()) {
+      onWindowShouldClose = () async {
+        unawaited(widget.room.disconnect());
+        await _listener.waitFor<RoomDisconnectedEvent>(
+            duration: const Duration(seconds: 5));
+      };
+    }
   }
 
   @override
@@ -62,8 +71,8 @@ class _RoomPageState extends State<RoomPage> with WidgetsBindingObserver {
       await _listener.dispose();
       await widget.room.dispose();
     })();
-
     WidgetsBinding.instance.removeObserver(this);
+    onWindowShouldClose = null;
     super.dispose();
   }
 

example/lib/utils.dart

@@ -0,0 +1,3 @@
+import 'dart:async';
+
+FutureOr<void> Function()? onWindowShouldClose;

example/pubspec.yaml

@@ -19,9 +19,7 @@ dependencies:
   shared_preferences: ^2.0.7
   google_fonts: ^4.0.4
   flutter_svg: ^2.0.5
-
   fluttertoast: ^8.2.4
-
   livekit_client:
     path: ../
   visibility_detector: ^0.4.0+2

lib/src/core/room.dart

@@ -34,7 +34,6 @@ import '../participant/participant.dart';
 import '../participant/remote.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../proto/livekit_rtc.pb.dart' as lk_rtc;
-import '../support/app_state.dart';
 import '../support/disposable.dart';
 import '../support/platform.dart';
 import '../track/local/audio.dart';
@@ -109,8 +108,6 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
   //
   late EventsListener<SignalEvent> _signalListener;
 
-  StreamSubscription<String>? _appCloseSubscription;
-
   Room({
     ConnectOptions connectOptions = const ConnectOptions(),
     RoomOptions roomOptions = const RoomOptions(),
@@ -124,13 +121,6 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
     _engineListener = this.engine.createListener();
     _setUpEngineListeners();
 
-    if (!kIsWeb && !lkPlatformIsTest()) {
-      _appCloseSubscription =
-          AppStateListener.instance.onWindowShouldClose.stream.listen((event) {
-        disconnect();
-      });
-    }
-
     _signalListener = this.engine.signalClient.createListener();
     _setUpSignalListeners();
 
@@ -153,8 +143,6 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
       await _engineListener.dispose();
       // dispose the engine
       await this.engine.dispose();
-      // dispose the app state listener
-      await _appCloseSubscription?.cancel();
     });
   }
 

lib/src/participant/local.dart

@@ -178,10 +178,9 @@ class LocalParticipant extends Participant<LocalTrackPublication> {
       try {
         // try to use getSettings for more accurate resolution
         final settings = track.mediaStreamTrack.getSettings();
-        if (settings['width'] is int) {
+        if ((settings['width'] is int && settings['width'] as int > 0) &&
+            (settings['height'] is int && settings['height'] as int > 0)) {
           dimensions = dimensions.copyWith(width: settings['width'] as int);
-        }
-        if (settings['height'] is int) {
           dimensions = dimensions.copyWith(height: settings['height'] as int);
         }
       } catch (_) {

pubspec.yaml

@@ -38,11 +38,7 @@ dependencies:
   uuid: '>=3.0.6'
   synchronized: ^3.0.0+3
   protobuf: ^3.0.0
-  flutter_webrtc:
-    git:
-      url: https://github.com/flutter-webrtc/flutter-webrtc.git
-      ref: fix/throw-exception-for-set-src-object
-  flutter_window_close: ^0.2.2
+  flutter_webrtc: 0.9.47
   device_info_plus: '>=8.0.0'
   js: ^0.6.4
   platform_detect: ^2.0.7
@@ -78,3 +74,15 @@ flutter:
       web:
         pluginClass: LiveKitWebPlugin
         fileName: livekit_client_web.dart
+
+
+topics:
+  - webrtc
+  - voip
+  - audio
+  - video
+  - livestream
+  - conference
+  - meeting
+  - chat
+  - real-time

web/e2ee.cryptor.dart

@@ -20,7 +20,7 @@ import 'dart:typed_data';
 import 'dart:collection';
 import 'dart:async';
 
-import 'package:flutter_webrtc/src/web/rtc_transform_stream.dart';
+import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 
 import 'crypto.dart' as crypto;
 import 'e2ee.utils.dart';

web/e2ee.worker.dart

@@ -20,7 +20,7 @@ import 'package:js/js.dart';
 
 import 'e2ee.cryptor.dart';
 
-import 'package:flutter_webrtc/src/web/rtc_transform_stream.dart';
+import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'package:collection/collection.dart';
 
 import 'crypto.dart' as crypto;