refactor: edit the event handler code

waterbustech · Jan 7, 2025 · d1637ba · d1637ba
1 parent fd5eab4
commit d1637ba
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 21 deletions.
diff --git a/lib/core/websocket/socket_handler.dart b/lib/core/websocket/socket_handler.dart
@@ -262,7 +262,7 @@ class SocketHandlerImpl extends SocketHandler {
         final participantId = data['participantId'];
         final content = data['transcription'];
 
-        WaterbusSdk.onSubtitle?.call(
+        WaterbusSdk.listener.onSubtitle?.call(
           Subtitle(participant: participantId, content: content),
         );
       });
@@ -314,7 +314,7 @@ class SocketHandlerImpl extends SocketHandler {
         final String dataDecrypted =
             await EncryptAES().decryptAES256(cipherText: message.data);
 
-        WaterbusSdk.onMesssageChanged?.call(
+        WaterbusSdk.listener.onMesssageChanged?.call(
           MessageSocketEvent(
             event: MessageEventEnum.create,
             message: message.copyWith(data: dataDecrypted),
@@ -330,7 +330,7 @@ class SocketHandlerImpl extends SocketHandler {
         final String dataDecrypted =
             await EncryptAES().decryptAES256(cipherText: message.data);
 
-        WaterbusSdk.onMesssageChanged?.call(
+        WaterbusSdk.listener.onMesssageChanged?.call(
           MessageSocketEvent(
             event: MessageEventEnum.update,
             message: message.copyWith(data: dataDecrypted),
@@ -343,7 +343,7 @@ class SocketHandlerImpl extends SocketHandler {
 
         final MessageModel message = MessageModel.fromMapSocket(data);
 
-        WaterbusSdk.onMesssageChanged?.call(
+        WaterbusSdk.listener.onMesssageChanged?.call(
           MessageSocketEvent(event: MessageEventEnum.delete, message: message),
         );
       });
@@ -352,7 +352,7 @@ class SocketHandlerImpl extends SocketHandler {
         if (data == null) return;
         final Meeting meeting = Meeting.fromMapSocket(data['meeting']);
 
-        WaterbusSdk.onConversationChanged?.call(
+        WaterbusSdk.listener.onConversationChanged?.call(
           ConversationSocketEvent(
             event: ConversationEventEnum.newInvitaion,
             conversation: meeting,
@@ -364,7 +364,7 @@ class SocketHandlerImpl extends SocketHandler {
         if (data == null) return;
         final Member member = Member.fromMapSocket(data);
 
-        WaterbusSdk.onConversationChanged?.call(
+        WaterbusSdk.listener.onConversationChanged?.call(
           ConversationSocketEvent(
             event: ConversationEventEnum.newMemberJoined,
             member: member,

diff --git a/lib/core/whiteboard/white_board.dart b/lib/core/whiteboard/white_board.dart
@@ -104,6 +104,6 @@ class WhiteBoardManagerIpml extends WhiteBoardManager {
   Future<void> _emitWhiteBoard() async {
     final props = [..._localPaints, ..._remotePaints];
     props.sort((a, b) => a.createdAt.compareTo(b.createdAt));
-    WaterbusSdk.onDrawChanged?.call(props);
+    WaterbusSdk.listener.onDrawChanged?.call(props);
   }
 }
diff --git a/lib/flutter_waterbus_sdk.dart b/lib/flutter_waterbus_sdk.dart
@@ -14,6 +14,7 @@ import 'package:waterbus_sdk/types/models/draw_model.dart';
 import 'package:waterbus_sdk/types/models/record_model.dart';
 import 'package:waterbus_sdk/types/result.dart';
 import 'package:waterbus_sdk/utils/callkit/callkit_listener.dart';
+import 'package:waterbus_sdk/waterbus_event_listener.dart';
 import 'package:waterbus_sdk/waterbus_sdk_interface.dart';
 
 export 'types/index.dart';
@@ -25,37 +26,38 @@ class WaterbusSdk {
   static String wsUrl = '';
   static String apiKey = '';
   static String privateMessageKey = '';
-  static Function(CallbackPayload)? onEventChanged;
-  static Function(VideoSenderStats)? onStatsChanged;
-  static Function(Subtitle)? onSubtitle;
-  static Function(MessageSocketEvent)? onMesssageChanged;
-  static Function(ConversationSocketEvent)? onConversationChanged;
-  static Function(List<DrawModel> drawList)? onDrawChanged;
+  static WaterBusEventListener listener = WaterBusEventListener();
 
   set onMessageSocketChanged(Function(MessageSocketEvent) onMesssageChanged) {
-    WaterbusSdk.onMesssageChanged = onMesssageChanged;
+    WaterbusSdk.listener =
+        WaterbusSdk.listener.copyWith(onMesssageChanged: onMesssageChanged);
   }
 
   set onConversationSocketChanged(
     Function(ConversationSocketEvent) onConversationChanged,
   ) {
-    WaterbusSdk.onConversationChanged = onConversationChanged;
+    WaterbusSdk.listener = WaterbusSdk.listener
+        .copyWith(onConversationChanged: onConversationChanged);
   }
 
   set onEventChangedRegister(Function(CallbackPayload) onEventChanged) {
-    WaterbusSdk.onEventChanged = onEventChanged;
+    WaterbusSdk.listener =
+        WaterbusSdk.listener.copyWith(onEventChanged: onEventChanged);
   }
 
   set setStatsChanged(Function(VideoSenderStats)? onStatsChanged) {
-    WaterbusSdk.onStatsChanged = onStatsChanged;
+    WaterbusSdk.listener =
+        WaterbusSdk.listener.copyWith(onStatsChanged: onStatsChanged);
   }
 
   set setOnSubtitle(Function(Subtitle)? onSubtitle) {
-    WaterbusSdk.onSubtitle = onSubtitle;
+    WaterbusSdk.listener =
+        WaterbusSdk.listener.copyWith(onSubtitle: onSubtitle);
   }
 
   set setOnDrawChanged(Function(List<DrawModel> drawList)? onDrawChanged) {
-    WaterbusSdk.onDrawChanged = onDrawChanged;
+    WaterbusSdk.listener =
+        WaterbusSdk.listener.copyWith(onDrawChanged: onDrawChanged);
   }
 
   Future<void> initializeApp({

diff --git a/lib/stats/webrtc_video_stats.dart b/lib/stats/webrtc_video_stats.dart
@@ -185,7 +185,7 @@ class WebRTCVideoStats {
           // Monitor latency & jitter
           WaterbusLogger().log(vs.toString());
 
-          WaterbusSdk.onStatsChanged?.call(vs);
+          WaterbusSdk.listener.onStatsChanged?.call(vs);
         }
         final c = stats.firstWhereOrNull((element) => element.type == 'codec');
         if (c != null) {

diff --git a/lib/waterbus_event_listener.dart b/lib/waterbus_event_listener.dart
@@ -0,0 +1,43 @@
+import 'package:waterbus_sdk/types/models/callback_payload.dart';
+import 'package:waterbus_sdk/types/models/conversation_socket_event.dart';
+import 'package:waterbus_sdk/types/models/draw_model.dart';
+import 'package:waterbus_sdk/types/models/message_socket_event.dart';
+import 'package:waterbus_sdk/types/models/stats.dart';
+import 'package:waterbus_sdk/types/models/subtitle.dart';
+
+class WaterBusEventListener {
+  final Function(CallbackPayload)? onEventChanged;
+  final Function(VideoSenderStats)? onStatsChanged;
+  final Function(Subtitle)? onSubtitle;
+  final Function(MessageSocketEvent)? onMesssageChanged;
+  final Function(ConversationSocketEvent)? onConversationChanged;
+  final Function(List<DrawModel> drawList)? onDrawChanged;
+
+  WaterBusEventListener({
+    this.onEventChanged,
+    this.onStatsChanged,
+    this.onSubtitle,
+    this.onMesssageChanged,
+    this.onConversationChanged,
+    this.onDrawChanged,
+  });
+
+  WaterBusEventListener copyWith({
+    Function(CallbackPayload)? onEventChanged,
+    Function(VideoSenderStats)? onStatsChanged,
+    Function(Subtitle)? onSubtitle,
+    Function(MessageSocketEvent)? onMesssageChanged,
+    Function(ConversationSocketEvent)? onConversationChanged,
+    Function(List<DrawModel> drawList)? onDrawChanged,
+  }) {
+    return WaterBusEventListener(
+      onEventChanged: onEventChanged ?? this.onEventChanged,
+      onStatsChanged: onStatsChanged ?? this.onStatsChanged,
+      onSubtitle: onSubtitle ?? this.onSubtitle,
+      onMesssageChanged: onMesssageChanged ?? this.onMesssageChanged,
+      onConversationChanged:
+          onConversationChanged ?? this.onConversationChanged,
+      onDrawChanged: onDrawChanged ?? this.onDrawChanged,
+    );
+  }
+}
diff --git a/lib/waterbus_sdk_impl.dart b/lib/waterbus_sdk_impl.dart
@@ -69,7 +69,7 @@ class SdkCore extends WaterbusSdkInterface {
     _webSocket.establishConnection(forceConnection: true);
 
     _rtcManager.notifyChanged.listen((event) {
-      WaterbusSdk.onEventChanged?.call(event);
+      WaterbusSdk.listener.onEventChanged?.call(event);
     });
   }