fix: Conflict

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.4.0
+
+* Vendor: Upgrade WebRTC SDK to M125.6422
+* Fix: transceiver setCodecPreferences
+
+## 1.3.19
+
+* Refactor: use PlatformView for iOS
+
+## 1.3.18
+
+* Fix(Hive): Open box before create getIt
+
+## 1.3.17
+
+* Upgrade flutter_webrtc to support GPUPixel on Android
+* Fix socket connection
+
 ## 1.3.16
 
 * Refactor: websocket connection

README.md

@@ -5,16 +5,17 @@ Flutter plugin of [Waterbus](https://docs.waterbus.tech). Build video call or on
 <img src="https://github.com/waterbustech/waterbus-flutter-sdk/blob/migration/v2/.github/waterbus-sdk-banner.png?raw=true" width="100%"/>
 
 <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-green.svg"/></a>
-<img src="https://img.shields.io/github/issues/waterbustech/waterbus-flutter-sdk" alt="GitHub issues"><a href="https://chromium.googlesource.com/external/webrtc/+/branch-heads/6099"><img src="https://img.shields.io/badge/libwebrtc-124.6367.01-yellow.svg" alt="libwebrtc"></a><img src="https://img.shields.io/cocoapods/v/KaiRTC" alt="Cocoapods Version"><a href="https://github.com/lambiengcode"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat&amp;logo=github" alt="PRs Welcome"></a>
+<img src="https://img.shields.io/github/issues/waterbustech/waterbus-flutter-sdk" alt="GitHub issues"><a href="https://chromium.googlesource.com/external/webrtc/+/branch-heads/6099"><img src="https://img.shields.io/badge/libwebrtc-125.6422.02-yellow.svg" alt="libwebrtc"></a><img src="https://img.shields.io/cocoapods/v/KaiRTC" alt="Cocoapods Version"><a href="https://github.com/lambiengcode"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat&amp;logo=github" alt="PRs Welcome"></a>
 
 ## ⚡ Current supported features
 
 | Feature            | Subscribe/Publish | Screen Sharing | Picture in Picture | Virtual Background | Beauty Filters | End to End Encryption |
 | ------------------ | ----------------- | -------------- | ------------------ | ------------------ | -------------- | --------------------- |
-| Android            |         🟢         |        🟢      |          🟢         |          🟢         |       🟡        |           🟢          | 
-| iOS                |         🟢         |        🟢      |          🟢         |          🟢         |       🟢       |           🟢          |  
-| MacOS              |         🟢         |        🟢      |          🔴         |          🟢         |       🟢       |           🟢          |      
-| Web                |         🟢         |        🟢      |          🟢         |          🟢         |       🟡       |           🟢          |    
+| Android            |         🟢         |        🟢      |          🟢         |          🟢         |       🟢        |           🟢          | 
+| iOS                |         🟢         |        🟢      |          🟢         |          🟢         |       🟢       |           🟢          |        
+| Web                |         🟢         |        🟢      |          🟢         |          🟢         |       🟡       |           🟢          |
+| MacOS              |         🟢         |        🟢      |          🔴         |          🟢         |       🟢       |           🟢          |
+| Linux                |         🟢         |        🟢      |          🔴         |          🟡         |       🟡       |           🟢          |    
 
 
 🟢 = Available

lib/core/api/auth/datasources/auth_local_datasource.dart

@@ -34,9 +34,9 @@ class AuthLocalDataSourceImpl implements AuthLocalDataSource {
 
   @override
   String get accessToken =>
-      _hiveBox.get(StorageKeys.accessToken, defaultValue: null) ?? "";
+      _hiveBox.get(StorageKeys.accessToken, defaultValue: "");
 
   @override
   String get refreshToken =>
-      _hiveBox.get(StorageKeys.refreshToken, defaultValue: null) ?? "";
+      _hiveBox.get(StorageKeys.refreshToken, defaultValue: "");
 }

lib/core/api/base/base_local_storage.dart

@@ -1,20 +1,18 @@
 import 'package:hive/hive.dart';
-import 'package:injectable/injectable.dart';
 
 import 'package:waterbus_sdk/constants/storage_keys.dart';
 import 'package:waterbus_sdk/utils/path_helper.dart';
 
-@Singleton()
 class BaseLocalData {
-  Future<void> initialize() async {
+  static Future<void> initialize() async {
     await PathHelper.createDirWaterbus();
     final String? path = await PathHelper.localStoreDirWaterbus;
     Hive.init(path);
 
     await _openBoxApp();
   }
 
-  Future<void> _openBoxApp() async {
+  static Future<void> _openBoxApp() async {
     await Hive.openBox(StorageKeys.boxAuth);
   }
 }

lib/core/api/base/dio_configuration.dart

@@ -11,6 +11,11 @@ import 'package:waterbus_sdk/core/api/base/base_remote_data.dart';
 import 'package:waterbus_sdk/utils/extensions/duration_extensions.dart';
 import 'package:waterbus_sdk/utils/queues/completer_queue.dart';
 
+typedef TokensCallback = Function(
+  String accessToken,
+  String refreshToken,
+);
+
 @singleton
 class DioConfiguration {
   final BaseRemoteData _remoteData;
@@ -56,8 +61,9 @@ class DioConfiguration {
                 final String oldAccessToken =
                     response.requestOptions.headers['Authorization'];
 
-                final (String accessToken, String _) =
-                    await onRefreshToken(oldAccessToken: oldAccessToken);
+                final (String accessToken, String _) = await onRefreshToken(
+                  oldAccessToken: oldAccessToken.split(' ').last,
+                );
 
                 response.requestOptions.headers['Authorization'] =
                     'Bearer $accessToken';
@@ -88,12 +94,9 @@ class DioConfiguration {
 
   Future<(String, String)> onRefreshToken({
     String oldAccessToken = '',
-    Function(
-      String accessToken,
-      String refreshToken,
-    )? callback,
+    TokensCallback? callback,
   }) async {
-    if (oldAccessToken != 'Bearer ${_authLocal.accessToken}') {
+    if (oldAccessToken != _authLocal.accessToken) {
       return (_authLocal.accessToken, _authLocal.refreshToken);
     }
 
@@ -116,10 +119,7 @@ class DioConfiguration {
 
   // MARK: Private methods
   Future<(String, String)> _performRefreshToken({
-    Function(
-      String accessToken,
-      String refreshToken,
-    )? callback,
+    TokensCallback? callback,
   }) async {
     if (_authLocal.refreshToken.isEmpty) {
       if (_authLocal.accessToken.isNotEmpty) {

lib/core/webrtc/webrtc.dart

@@ -80,13 +80,13 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
         stream: _displayStream!,
       );
 
-      await _mParticipant?.setScreenSrcObject(_displayStream!);
+      await _mParticipant?.setSrcObject(_displayStream!, isDisplayStream: true);
 
       _displayStream?.getVideoTracks().first.onEnded = () {
         stopScreenSharing();
       };
 
-      _mParticipant?.isSharingScreen = true;
+      _mParticipant?.setScreenSharing(true);
 
       _notify(CallbackEvents.shouldBeUpdateState);
       _socketEmiter.setScreenSharing(true);
@@ -99,7 +99,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
   Future<void> stopScreenSharing({bool stayInRoom = true}) async {
     if (!(_mParticipant?.isSharingScreen ?? true)) return;
 
-    _mParticipant?.isSharingScreen = false;
+    _mParticipant?.setScreenSharing(false);
 
     if (_mParticipant == null) return;
 
@@ -132,7 +132,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
       track.stop();
     }
 
-    _mParticipant?.isSharingScreen = false;
+    _mParticipant?.setScreenSharing(false);
     _displayStream?.dispose();
     _displayStream = null;
 
@@ -216,7 +216,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
       participant: _mParticipant!,
     );
 
-    _nativeService.startCallKit(roomId);
+    _nativeService.startCallKit(roomId.roomCodeFormatted);
     _stats.initialize();
     _audioStats.initialize();
   }
@@ -534,7 +534,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
 
   @override
   void setScreenSharing({required String targetId, required bool isSharing}) {
-    _subscribers[targetId]?.isSharingScreen = isSharing;
+    _subscribers[targetId]?.setScreenSharing(isSharing);
     _notify(CallbackEvents.shouldBeUpdateState);
   }
 
@@ -590,7 +590,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
   }) async {
     final MediaStream? segmentedStream = await startVirtualBackground(
       backgroundImage: backgroundImage,
-      textureId: _mParticipant?.renderer?.textureId.toString(),
+      textureId: _mParticipant?.cameraSource?.textureId.toString(),
     );
 
     if (segmentedStream == null) return;
@@ -614,7 +614,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
     _mParticipant = ParticipantSFU(
       ownerId: kIsMine,
       peerConnection: peerConnection,
-      onChanged: () => _notify(CallbackEvents.shouldBeUpdateState),
+      onFirstFrameRendered: () => _notify(CallbackEvents.shouldBeUpdateState),
       videoCodec: _callSetting.preferedCodec,
       isE2eeEnabled: _callSetting.e2eeEnabled,
       stats: _stats,
@@ -756,7 +756,7 @@ class WaterbusWebRTCManagerIpml extends WaterbusWebRTCManager {
     _subscribers[targetId] = ParticipantSFU(
       ownerId: targetId,
       peerConnection: rtcPeerConnection,
-      onChanged: () => _notify(CallbackEvents.shouldBeUpdateState),
+      onFirstFrameRendered: () => _notify(CallbackEvents.shouldBeUpdateState),
       isAudioEnabled: audioEnabled,
       isVideoEnabled: videoEnabled,
       isSharingScreen: isScreenSharing,

lib/core/websocket/interfaces/socket_handler_interface.dart

@@ -5,4 +5,6 @@ abstract class SocketHandler {
   void disconnection();
 
   Socket? get socket;
+
+  bool get isConnected;
 }

lib/core/websocket/socket_handler.dart

@@ -27,13 +27,18 @@ class SocketHandlerImpl extends SocketHandler {
   Socket? _socket;
 
   @override
-  void establishConnection({bool forceConnection = false}) {
+  void establishConnection({
+    bool forceConnection = false,
+    String? forceAccessToken,
+  }) {
     if (_authLocal.accessToken.isEmpty ||
         (_socket != null && !forceConnection)) {
       return;
     }
 
-    final String mAccessToken = _authLocal.accessToken;
+    disconnection();
+
+    final String mAccessToken = forceAccessToken ?? _authLocal.accessToken;
 
     _socket = io(
       WaterbusSdk.wsUrl,
@@ -51,10 +56,14 @@ class SocketHandlerImpl extends SocketHandler {
     _socket?.onError((data) async {
       if (_authLocal.accessToken.isEmpty) return;
 
-      final (_, _) =
-          await _dioConfig.onRefreshToken(oldAccessToken: mAccessToken);
+      final (String newAccessToken, _) = await _dioConfig.onRefreshToken(
+        oldAccessToken: mAccessToken,
+      );
 
-      establishConnection();
+      establishConnection(
+        forceConnection: true,
+        forceAccessToken: newAccessToken,
+      );
     });
 
     _socket?.onConnect((_) async {
@@ -241,4 +250,7 @@ class SocketHandlerImpl extends SocketHandler {
 
   @override
   Socket? get socket => _socket;
+
+  @override
+  bool get isConnected => _socket != null && _socket!.connected;
 }

lib/flutter_waterbus_sdk.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 
 import 'package:flutter_webrtc_plus/flutter_webrtc_plus.dart';
 
+import 'package:waterbus_sdk/core/api/base/base_local_storage.dart';
 import 'package:waterbus_sdk/core/webrtc/webrtc_interface.dart';
 import 'package:waterbus_sdk/injection/injection_container.dart';
 import 'package:waterbus_sdk/types/index.dart';
@@ -23,7 +24,7 @@ class WaterbusSdk {
     WaterbusSdk.onEventChanged = onEventChanged;
   }
 
-  Future<void> initial({
+  Future<void> initializeApp({
     required String wsUrl,
     required String apiUrl,
   }) async {
@@ -32,14 +33,16 @@ class WaterbusSdk {
 
     // Init dependency injection if needed
     if (!getIt.isRegistered<WaterbusWebRTCManager>()) {
+      await BaseLocalData.initialize();
+
       configureDependencies();
 
       if (WebRTC.platformIsIOS) {
         _callKitListener.listenerEvents();
       }
     }
 
-    await _sdk.initialize();
+    await _sdk.initializeApp();
   }
 
   // Meeting