Merge pull request #135 from sendbird/v4.2.31

Add 4.2.31.

Author: sf-tyler-jeong

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v4.2.31 (Feb 25, 2025)
+
+### Improvements
+- Fixed a bug where `requestId` is null if websocket is disconnected while sending a `FileMessage`
+
 ## v4.2.30 (Dec 5, 2024)
 
 ### Improvements

README.md

@@ -50,7 +50,7 @@ Before installing Sendbird Chat SDK, you need to create a Sendbird application o
 
 ```yaml
 dependencies:
-  sendbird_chat_sdk: ^4.2.30
+  sendbird_chat_sdk: ^4.2.31
 ```
 
 - Run `flutter pub get` command in your project directory.

lib/src/internal/main/chat/chat.dart

@@ -62,7 +62,7 @@ part 'chat_notifications.dart';
 part 'chat_push.dart';
 part 'chat_user.dart';
 
-const sdkVersion = '4.2.30';
+const sdkVersion = '4.2.31';
 
 // Internal implementation for main class. Do not directly access this class.
 class Chat with WidgetsBindingObserver {

lib/src/internal/main/chat_manager/command_manager.dart

@@ -99,11 +99,9 @@ class CommandManager {
     _completerMap.forEach((key, value) {
       if (e != null) {
         value.completeError(e);
-      } else {
-        value.complete();
       }
     });
-    _completerMap.removeWhere((key, value) => true);
+    _completerMap.clear();
   }
 
   Future<Command?> sendCommand(Command cmd) async {

lib/src/internal/main/chat_manager/connection_manager.dart

@@ -260,7 +260,10 @@ class ConnectionManager {
       reconnectTimer = null;
     }
 
-    await webSocketClient.close();
+    // Check
+    if (!isDisconnected()) {
+      await webSocketClient.close();
+    }
 
     final disconnectedUserId = chat.chatContext.currentUserId ?? '';
 
@@ -466,10 +469,13 @@ class ConnectionManager {
   }
 
   String get _sbUserAgentHeader {
-    final uikitVersion = chat.extensions[Chat.extensionKeyUiKit];
     const core = '/c$sdkVersion';
+
+    final uikitVersion = chat.extensions[Chat.extensionKeyUiKit];
     final uikit = uikitVersion != null ? '/u$uikitVersion' : '';
+
     final os = '/o${kIsWeb ? 'web' : Platform.operatingSystem}';
+
     return '${Chat.platform}$core$uikit$os';
   }
 
@@ -480,11 +486,14 @@ class ConnectionManager {
     // '2.19.0 (stable) (Mon Jan 23 11:29:09 2023 -0800) on "android_arm64"'
     final platformVersion = kIsWeb ? '' : Platform.version.split(' ').first;
 
+    final uikitVersion = chat.extensions[Chat.extensionKeyUiKit];
+    final uikitInfo = 'uikit-chat/$deviceOsPlatform/${uikitVersion ?? ''}';
+
     return 'main_sdk_info=$mainSdkInfo'
         '&device_os_platform=$deviceOsPlatform'
         '&os_version=$osVersion'
-        '&platform_version=$platformVersion';
-    // '&extension_sdk_info='; // 'uikit/android/3.3.2,live/android/1.0.0-beta' // TODO: SendbirdChat.addSendbirdExtensions()
+        '&platform_version=$platformVersion'
+        '&extension_sdk_info=$uikitInfo';
   }
 
   String get _sendbirdHeader {

lib/src/internal/main/chat_manager/db_manager.dart

@@ -67,6 +67,10 @@ class DBManager {
       return false;
     }
 
+    if (_isInitialized) {
+      return true;
+    }
+
     try {
       if (_chat.isTest) {
         // https://github.com/isar/isar#unit-tests

lib/src/internal/network/http/http_client/http_client.dart

@@ -372,7 +372,7 @@ class HttpClient {
       body = jsonDecode(response.body.toString());
     } catch (e) {
       sbLog.e(StackTrace.current, 'e: $e');
-      throw MalformedDataException();
+      return false; // throw MalformedDataException();
     }
 
     if (response.statusCode >= 400 && response.statusCode < 500) {

lib/src/internal/network/http/http_client/request/channel/message/channel_file_message_send_request.dart

@@ -26,6 +26,7 @@ class ChannelFileMessageSendRequest extends ApiRequest {
     bool markAsRead = false,
     bool? requireAuth,
     List<String>? additionalMentionedUserIds,
+    String? requestId,
   }) : super(chat: chat) {
     url = '${channelType.urlString}/$channelUrl/messages';
 
@@ -40,6 +41,7 @@ class ChannelFileMessageSendRequest extends ApiRequest {
       'file_name': params.fileInfo.fileName,
       'file_type': params.fileInfo.mimeType,
       'url': params.fileInfo.fileUrl,
+      'req_id': requestId,
     };
 
     body.addAll(params.toJson());

lib/src/internal/network/websocket/websocket_client.dart

@@ -129,11 +129,14 @@ class WebSocketClient {
         _onDoneCompleter = null;
         _onDone();
         return false;
-      }).timeout(const Duration(milliseconds: 500), onTimeout: () {
-        _onDoneCompleter = null;
-        _onDone();
-        return false;
-      });
+      }).timeout(
+        const Duration(milliseconds: 500), // Check
+        onTimeout: () {
+          _onDoneCompleter = null;
+          _onDone();
+          return false;
+        },
+      );
       return result ?? false;
     } catch (e) {
       sbLog.e(StackTrace.current, 'e: $e');

lib/src/public/core/channel/base_channel/base_channel_message.dart

@@ -438,6 +438,7 @@ extension BaseChannelMessage on BaseChannel {
               params: params,
               thumbnails: uploadResponse?.thumbnails,
               requireAuth: uploadResponse?.requireAuth,
+              requestId: pendingFileMessage.requestId,
             );
             final message = await chat.apiClient.send<FileMessage>(request);
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: sendbird_chat_sdk
 description: With Sendbird Chat for Flutter, you can easily build an in-app chat with all the essential messaging features.
-version: 4.2.30
+version: 4.2.31
 homepage: https://sendbird.com
 repository: https://github.com/sendbird/sendbird-chat-sdk-flutter
 documentation: https://sendbird.com/docs/chat/sdk/v4/flutter/getting-started/send-first-message