Merge pull request #29 from waterbustech/refactor/initial-base-url

lambiengcode · web-flow · commit 1daddff4bebd · 2025-05-26T09:53:53.000+07:00
Refactor: Initial base url
diff --git a/lib/core/api/auth/repositories/auth_repository.dart b/lib/core/api/auth/repositories/auth_repository.dart
@@ -2,9 +2,7 @@ import 'package:injectable/injectable.dart';
 
 import 'package:waterbus_sdk/core/api/auth/datasources/auth_local_data_source.dart';
 import 'package:waterbus_sdk/core/api/auth/datasources/auth_remote_data_source.dart';
-import 'package:waterbus_sdk/types/error/failures.dart';
-import 'package:waterbus_sdk/types/externals/models/index.dart';
-import 'package:waterbus_sdk/types/result.dart';
+import 'package:waterbus_sdk/flutter_waterbus_sdk.dart';
 
 abstract class AuthRepository {
   Future<Result<bool>> renewToken();
diff --git a/lib/core/api/base/base_remote_data.dart b/lib/core/api/base/base_remote_data.dart
@@ -21,7 +21,7 @@ class BaseRemoteData {
 
   Dio dio = Dio(
     BaseOptions(
-      baseUrl: WaterbusSdk.apiUrl,
+      baseUrl: WaterbusSdk.baseUrl.baseUrlApi,
       connectTimeout: 10.seconds,
       receiveTimeout: 10.seconds,
       sendTimeout: 10.seconds,
@@ -146,7 +146,7 @@ class BaseRemoteData {
         'Connection': 'keep-alive',
         'Accept': '*/*',
         'Accept-Encoding': 'gzip, deflate, br',
-        'X-API-Key': WaterbusSdk.apiKey,
+        'X-API-Key': WaterbusSdk.baseUrl.apiKey,
       },
     );
   }
@@ -167,14 +167,14 @@ class BaseRemoteData {
       'Connection': 'keep-alive',
       'Accept': '*/*',
       'Accept-Encoding': 'gzip, deflate, br',
-      'X-API-Key': WaterbusSdk.apiKey,
+      'X-API-Key': WaterbusSdk.baseUrl.apiKey,
     };
   }
 
   initialize() async {
     dio = Dio(
       BaseOptions(
-        baseUrl: WaterbusSdk.apiUrl,
+        baseUrl: WaterbusSdk.baseUrl.baseUrlApi,
         connectTimeout: 10.seconds,
         receiveTimeout: 10.seconds,
         sendTimeout: 10.seconds,
diff --git a/lib/core/api/chat/datasources/chat_remote_data_source.dart b/lib/core/api/chat/datasources/chat_remote_data_source.dart
@@ -51,9 +51,8 @@ class ChatRemoteDataSourceImpl extends ChatRemoteDataSource {
 
     if ([StatusCode.ok, StatusCode.created].contains(response.statusCode)) {
       final Map<String, dynamic> message = {
-        "conversations": (response.data['rooms'] as List)
-            .map((room) => Room.fromJson(room))
-            .toList(),
+        "conversations":
+            (response.data as List).map((room) => Room.fromJson(room)).toList(),
         "key": WaterbusSdk.messageEncryptionKey,
       };
 
diff --git a/lib/core/api/rooms/datasources/room_remote_data_source.dart b/lib/core/api/rooms/datasources/room_remote_data_source.dart
@@ -6,7 +6,6 @@ import 'package:waterbus_sdk/constants/status_code.dart';
 import 'package:waterbus_sdk/core/api/base/base_remote_data.dart';
 import 'package:waterbus_sdk/types/error/app_exception.dart';
 import 'package:waterbus_sdk/types/externals/models/index.dart';
-import 'package:waterbus_sdk/types/internals/models/create_room_params.dart';
 import 'package:waterbus_sdk/types/result.dart';
 
 abstract class RoomRemoteDataSource {
diff --git a/lib/core/api/rooms/repositories/room_repository.dart b/lib/core/api/rooms/repositories/room_repository.dart
@@ -2,7 +2,6 @@ import 'package:injectable/injectable.dart';
 
 import 'package:waterbus_sdk/core/api/rooms/datasources/room_remote_data_source.dart';
 import 'package:waterbus_sdk/types/externals/models/index.dart';
-import 'package:waterbus_sdk/types/internals/models/create_room_params.dart';
 import 'package:waterbus_sdk/types/result.dart';
 
 abstract class RoomRepository {
diff --git a/lib/core/websocket/ws_handler_impl.dart b/lib/core/websocket/ws_handler_impl.dart
@@ -61,7 +61,7 @@ class WsHandlerImpl extends WsHandler {
       },
     ).build();
 
-    _socket = io(WaterbusSdk.wsUrl, options);
+    _socket = io(WaterbusSdk.baseUrl.url, options);
 
     _socket?.connect();
 
diff --git a/lib/flutter_waterbus_sdk.dart b/lib/flutter_waterbus_sdk.dart
@@ -17,11 +17,10 @@ export 'package:flutter_webrtc_plus/flutter_webrtc_plus.dart';
 export 'package:rhttp/rhttp.dart';
 
 class WaterbusSdk {
-  static String apiUrl = '';
-  static String wsUrl = '';
+  static BaseUrl baseUrl = BaseUrl(url: "", suffixUrl: "");
   static String messageEncryptionKey = '';
   static String webrtcE2eeKey = 'waterbus';
-  static String? apiKey;
+
   static HttpVersionPref httpVersionPref = HttpVersionPref.all;
   static WaterbusEventListener listener = WaterbusEventListener();
 
@@ -41,18 +40,14 @@ class WaterbusSdk {
   }
 
   Future<void> initializeApp({
-    required String wsUrl,
-    required String apiUrl,
-    String? apiKey,
+    required BaseUrl baseUrl,
 
     /// Encryption message will be disabled if the key is empty
     String messageEncryptionKey = '',
     String webrtcE2eeKey = '',
     HttpVersionPref httpVersionPref = HttpVersionPref.all,
   }) async {
-    WaterbusSdk.wsUrl = wsUrl;
-    WaterbusSdk.apiUrl = apiUrl;
-    WaterbusSdk.apiKey = apiKey;
+    WaterbusSdk.baseUrl = baseUrl;
     WaterbusSdk.messageEncryptionKey = messageEncryptionKey;
     WaterbusSdk.webrtcE2eeKey = webrtcE2eeKey;
     WaterbusSdk.httpVersionPref = httpVersionPref;
@@ -72,40 +67,16 @@ class WaterbusSdk {
   }
 
   // Rooms
-  Future<Result<Room>> createRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  }) async {
-    return await _sdk.createRoom(
-      room: room,
-      password: password,
-      userId: userId,
-    );
+  Future<Result<Room>> createRoom({required RoomParams params}) async {
+    return await _sdk.createRoom(params: params);
   }
 
-  Future<Result<Room>> joinRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  }) async {
-    return await _sdk.joinRoom(
-      room: room,
-      password: password,
-      userId: userId,
-    );
+  Future<Result<Room>> joinRoom({required RoomParams params}) async {
+    return await _sdk.joinRoom(params: params);
   }
 
-  Future<Result<bool>> updateRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  }) async {
-    return await _sdk.updateRoom(
-      room: room,
-      password: password,
-      userId: userId,
-    );
+  Future<Result<bool>> updateRoom({required RoomParams params}) async {
+    return await _sdk.updateRoom(params: params);
   }
 
   Future<Result<Room>> getRoomInfo({required String code}) async {
diff --git a/lib/types/externals/models/base_url.dart b/lib/types/externals/models/base_url.dart
@@ -0,0 +1,9 @@
+class BaseUrl {
+  final String url;
+  final String suffixUrl;
+  String? apiKey;
+
+  BaseUrl({required this.url, required this.suffixUrl, this.apiKey});
+
+  String get baseUrlApi => url + suffixUrl;
+}
diff --git a/lib/types/externals/models/index.dart b/lib/types/externals/models/index.dart
@@ -16,3 +16,5 @@ export 'subscribe_payload.dart';
 export 'video_config.dart';
 export 'video_quality.dart';
 export 'presigned_url.dart';
+export 'base_url.dart';
+export 'room_params.dart';
diff --git a/lib/types/externals/models/room_params.dart b/lib/types/externals/models/room_params.dart
diff --git a/lib/types/internals/models/index.dart b/lib/types/internals/models/index.dart
@@ -4,7 +4,6 @@ export 'audio_stats_params.dart';
 export 'rtc_participant_stats.dart';
 export 'subscribe_response.dart';
 export 'video_stats_params.dart';
-export 'create_room_params.dart';
 export 'publish_ws_emitter_payload.dart';
 export 'participant_screen_sharing_config.dart';
 export 'participant_e2ee_config.dart';
diff --git a/lib/waterbus_sdk_impl.dart b/lib/waterbus_sdk_impl.dart
@@ -60,31 +60,15 @@ class SdkCore extends WaterbusSdkInterface {
 
   // Room
   @override
-  Future<Result<Room>> createRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  }) async {
-    return await _roomRepository.createRoom(
-      RoomParams(
-        room: room,
-        password: password,
-        userId: userId,
-      ),
-    );
+  Future<Result<Room>> createRoom({required RoomParams params}) async {
+    return await _roomRepository.createRoom(params);
   }
 
   @override
-  Future<Result<Room>> joinRoom({
-    required Room room,
-    required String? password,
-    required int? userId,
-  }) async {
+  Future<Result<Room>> joinRoom({required RoomParams params}) async {
     if (!_wsHandler.isConnected) return Result.failure(ServerFailure());
 
-    final Result<Room> roomCurrent = await _roomRepository.joinRoom(
-      RoomParams(room: room, password: password ?? "", userId: userId),
-    );
+    final Result<Room> roomCurrent = await _roomRepository.joinRoom(params);
 
     if (roomCurrent.isSuccess) {
       final Room? room = roomCurrent.value;
@@ -118,18 +102,8 @@ class SdkCore extends WaterbusSdkInterface {
   }
 
   @override
-  Future<Result<bool>> updateRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  }) async {
-    return await _roomRepository.updateRoom(
-      RoomParams(
-        room: room,
-        password: password,
-        userId: userId,
-      ),
-    );
+  Future<Result<bool>> updateRoom({required RoomParams params}) async {
+    return await _roomRepository.updateRoom(params);
   }
 
   @override
diff --git a/lib/waterbus_sdk_interface.dart b/lib/waterbus_sdk_interface.dart
@@ -61,21 +61,9 @@ abstract class WaterbusSdkInterface {
   Future<Result<Message>> deleteMessage({required int messageId});
 
   // Room
-  Future<Result<Room>> createRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  });
-  Future<Result<bool>> updateRoom({
-    required Room room,
-    required String password,
-    required int? userId,
-  });
-  Future<Result<Room>> joinRoom({
-    required Room room,
-    required String? password,
-    required int? userId,
-  });
+  Future<Result<Room>> createRoom({required RoomParams params});
+  Future<Result<bool>> updateRoom({required RoomParams params});
+  Future<Result<Room>> joinRoom({required RoomParams params});
   Future<Result<Room>> getRoomInfo(String code);
   Future<void> leaveRoom();
   void toggleRaiseHand();
diff --git a/test/features/profile/data/repositories/user_repository_impl_test.mocks.dart b/test/features/profile/data/repositories/user_repository_impl_test.mocks.dart
@@ -5,12 +5,11 @@
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 
 import 'dart:async' as _i4;
-import 'dart:typed_data' as _i7;
+import 'dart:typed_data' as _i6;
 
 import 'package:mockito/mockito.dart' as _i1;
 
 import 'package:waterbus_sdk/types/externals/models/index.dart' as _i5;
-import 'package:waterbus_sdk/types/externals/models/presigned_url.dart' as _i6;
 import 'package:waterbus_sdk/types/result.dart' as _i2;
 
 import 'package:waterbus_sdk/core/api/user/datasources/user_remote_data_source.dart'
@@ -186,36 +185,36 @@ class MockUserRemoteDataSource extends _i1.Mock
       ) as _i4.Future<_i2.Result<List<_i5.User>>>);
 
   @override
-  _i4.Future<_i2.Result<_i6.PresignedUrl>> getPresignedUrl() =>
+  _i4.Future<_i2.Result<_i5.PresignedUrl>> getPresignedUrl() =>
       (super.noSuchMethod(
         Invocation.method(
           #getPresignedUrl,
           [],
         ),
-        returnValue: _i4.Future<_i2.Result<_i6.PresignedUrl>>.value(
-            _FakeResult_0<_i6.PresignedUrl>(
+        returnValue: _i4.Future<_i2.Result<_i5.PresignedUrl>>.value(
+            _FakeResult_0<_i5.PresignedUrl>(
           this,
           Invocation.method(
             #getPresignedUrl,
             [],
           ),
         )),
         returnValueForMissingStub:
-            _i4.Future<_i2.Result<_i6.PresignedUrl>>.value(
-                _FakeResult_0<_i6.PresignedUrl>(
+            _i4.Future<_i2.Result<_i5.PresignedUrl>>.value(
+                _FakeResult_0<_i5.PresignedUrl>(
           this,
           Invocation.method(
             #getPresignedUrl,
             [],
           ),
         )),
-      ) as _i4.Future<_i2.Result<_i6.PresignedUrl>>);
+      ) as _i4.Future<_i2.Result<_i5.PresignedUrl>>);
 
   @override
   _i4.Future<_i2.Result<String>> uploadAvatarToCloud({
     required String? presignedUrl,
     required String? sourceUrl,
-    required _i7.Uint8List? image,
+    required _i6.Uint8List? image,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
