Merge branch 'main' into v2/remove-deprecated-api

livekit · Dec 22, 2023 · 97a8a91 · 97a8a91
2 parents 9dfde5e + adbff11
commit 97a8a91
Show file tree

Hide file tree

Showing 22 changed files with 546 additions and 343 deletions.
diff --git a/.github/workflows/deploy-web.yaml b/.github/workflows/deploy-web.yaml
@@ -18,6 +18,7 @@ jobs:
       - run: flutter clean
       - run: flutter pub get
       - run: |
+          dart compile js web/e2ee.worker.dart -o example/web/e2ee.worker.dart.js
           cd example
           flutter build web --release --web-renderer html --base-href /client-sdk-flutter/
           cd build/web

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.5.5
+
+* Improve reconnect logic for websocket (#406)
+* Fix: Prevent ReplayKitChannel related code from being executed on non-iOS platforms. (#432)
+
 ## 1.5.4
 
 * Add AudioSourceStats.

diff --git a/example/lib/exts.dart b/example/lib/exts.dart
@@ -208,12 +208,14 @@ extension LKExampleExt on BuildContext {
 
 enum SimulateScenarioResult {
   signalReconnect,
+  fullReconnect,
+  speakerUpdate,
   nodeFailure,
   migration,
   serverLeave,
   switchCandidate,
-  clear,
   e2eeKeyRatchet,
   participantName,
   participantMetadata,
+  clear,
 }
diff --git a/example/lib/pages/room.dart b/example/lib/pages/room.dart
@@ -49,7 +49,9 @@ class _RoomPageState extends State<RoomPage> {
       Hardware.instance.setSpeakerphoneOn(true);
     }
 
-    ReplayKitChannel.listenMethodChannel(widget.room);
+    if (lkPlatformIs(PlatformType.iOS)) {
+      ReplayKitChannel.listenMethodChannel(widget.room);
+    }
 
     if (lkPlatformIsDesktop()) {
       onWindowShouldClose = () async {
@@ -64,7 +66,9 @@ class _RoomPageState extends State<RoomPage> {
   void dispose() {
     // always dispose listener
     (() async {
-      ReplayKitChannel.closeReplayKit();
+      if (lkPlatformIs(PlatformType.iOS)) {
+        ReplayKitChannel.closeReplayKit();
+      }
       widget.room.removeListener(_onRoomDidUpdate);
       await _listener.dispose();
       await widget.room.dispose();
@@ -92,6 +96,8 @@ class _RoomPageState extends State<RoomPage> {
     })
     ..on<LocalTrackPublishedEvent>((_) => _sortParticipants())
     ..on<LocalTrackUnpublishedEvent>((_) => _sortParticipants())
+    ..on<TrackSubscribedEvent>((_) => _sortParticipants())
+    ..on<TrackUnsubscribedEvent>((_) => _sortParticipants())
     ..on<TrackE2EEStateEvent>(_onE2EEStateEvent)
     ..on<ParticipantNameUpdatedEvent>((event) {
       print(
@@ -203,22 +209,25 @@ class _RoomPageState extends State<RoomPage> {
     if (localParticipantTracks != null) {
       for (var t in localParticipantTracks) {
         if (t.isScreenShare) {
-          if (!_flagStartedReplayKit) {
-            _flagStartedReplayKit = true;
+          if (lkPlatformIs(PlatformType.iOS)) {
+            if (!_flagStartedReplayKit) {
+              _flagStartedReplayKit = true;
 
-            ReplayKitChannel.startReplayKit();
+              ReplayKitChannel.startReplayKit();
+            }
           }
-
           screenTracks.add(ParticipantTrack(
             participant: widget.room.localParticipant!,
             videoTrack: t.track,
             isScreenShare: true,
           ));
         } else {
-          if (_flagStartedReplayKit) {
-            _flagStartedReplayKit = false;
+          if (lkPlatformIs(PlatformType.iOS)) {
+            if (_flagStartedReplayKit) {
+              _flagStartedReplayKit = false;
 
-            ReplayKitChannel.closeReplayKit();
+              ReplayKitChannel.closeReplayKit();
+            }
           }
 
           userMediaTracks.add(ParticipantTrack(

diff --git a/example/lib/widgets/controls.dart b/example/lib/widgets/controls.dart
@@ -250,8 +250,12 @@ class _ControlsWidgetState extends State<ControlsWidget> {
       }
 
       await widget.room.sendSimulateScenario(
+        speakerUpdate:
+            result == SimulateScenarioResult.speakerUpdate ? 3 : null,
         signalReconnect:
             result == SimulateScenarioResult.signalReconnect ? true : null,
+        fullReconnect:
+            result == SimulateScenarioResult.fullReconnect ? true : null,
         nodeFailure: result == SimulateScenarioResult.nodeFailure ? true : null,
         migration: result == SimulateScenarioResult.migration ? true : null,
         serverLeave: result == SimulateScenarioResult.serverLeave ? true : null,

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -21,12 +21,10 @@ dependencies:
   flutter_svg: ^2.0.5
   dropdown_button2: ^2.3.6
   flutter_window_close: ^0.2.2
+  collection: '>=1.16.0'
 
   livekit_client:
     path: ../
-    # git:
-    #   url: https://github.com/livekit/client-sdk-flutter
-    #   ref: main
 
 dev_dependencies:
   flutter_test:

diff --git a/ios/livekit_client.podspec b/ios/livekit_client.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '1.5.4'
+  s.version             = '1.5.5'
   s.summary             = 'Open source platform for real-time audio and video.'
   s.description         = 'Open source platform for real-time audio and video.'
   s.homepage            = 'https://livekit.io/'