apoloz/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

feat(video_calls): incommig call handling fix for ios and anroid

Browse Source
This commit is contained in:
misha
2026-10-05 13:12:55 +03:00
parent 2dce28b196
commit df634fedd8
12 changed files with 1079 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
View File

@@ -5,9 +5,14 @@ import 'dart:developer';
import 'package:eatvio_app/core/enums/base_state.dart';
import 'package:eatvio_app/core/websockets/ws_manager.dart';
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_chat_signal.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_handler.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_incoming_push_presenter.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/core/error_reporting/report_from.dart';
@@ -18,13 +23,22 @@ class ChatsCubit extends Cubit<ChatsState> {
StreamSubscription? newIncomingMessagesSubscription;
StreamSubscription? newLastMessageSubscription;
StreamSubscription<void>? reconnectedSubscription;
final Set<int> _presentedVideoCallMessageIds = {};
/// Test seam. Production uses CallKit.
Future<void> Function(VideoCallPushPayload payload)? presentIncomingVideoCall;
Future<void> Function()? dismissIncomingVideoCall;
ChatsCubit({
required this.chatRepository,
required this.wsManager,
required this.profileRepository,
this.presentIncomingVideoCall,
this.dismissIncomingVideoCall,
}) : super(ChatsState()) {
newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((message) {
newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((
message,
) {
_setNewLastMessage(message);
});
}
@@ -35,7 +49,9 @@ class ChatsCubit extends Cubit<ChatsState> {
Future<void> connectToWebSocket() async {
try {
await newIncomingMessagesSubscription?.cancel();
newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((event) {
newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((
event,
) {
_handleNewMessageViaSocket(event.data);
});
@@ -53,7 +69,9 @@ class ChatsCubit extends Cubit<ChatsState> {
_query = query;
emit(state.copyWith(state: BaseState.loading));
try {
final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
final chatRoomsPaginationModel = await chatRepository.getChatRooms(
query: query,
);
final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
emit(
@@ -66,9 +84,7 @@ class ChatsCubit extends Cubit<ChatsState> {
page++;
} catch (e, st) {
await reportFrom(e, st, this);
emit(
state.copyWith(errorMessage: e.toString(), state: BaseState.error),
);
emit(state.copyWith(errorMessage: e.toString(), state: BaseState.error));
}
}
@@ -76,7 +92,9 @@ class ChatsCubit extends Cubit<ChatsState> {
page = 1;
_query = query;
try {
final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
final chatRoomsPaginationModel = await chatRepository.getChatRooms(
query: query,
);
final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
emit(
@@ -90,9 +108,7 @@ class ChatsCubit extends Cubit<ChatsState> {
} catch (e, st) {
await reportFrom(e, st, this);
log(e.toString(), stackTrace: st);
emit(
state.copyWith(errorMessage: e.toString(), state: BaseState.error),
);
emit(state.copyWith(errorMessage: e.toString(), state: BaseState.error));
}
}
@@ -100,7 +116,10 @@ class ChatsCubit extends Cubit<ChatsState> {
try {
if (state.isLoadingMoreChats || lastPage == page) return;
emit(state.copyWith(isLoadingMoreChats: true));
final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: _query, page: page);
final chatRoomsPaginationModel = await chatRepository.getChatRooms(
query: _query,
page: page,
);
final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
emit(
state.copyWith(
@@ -140,7 +159,9 @@ class ChatsCubit extends Cubit<ChatsState> {
emit(
state.copyWith(
chatRooms: updatedChatRooms,
chatsWithUnreadMessagesCount: isChatRead ? state.chatsWithUnreadMessagesCount - 1 : state.chatsWithUnreadMessagesCount,
chatsWithUnreadMessagesCount: isChatRead
? state.chatsWithUnreadMessagesCount - 1
: state.chatsWithUnreadMessagesCount,
),
);
}
@@ -162,7 +183,8 @@ class ChatsCubit extends Cubit<ChatsState> {
wasChanged = true;
// Идемпотентность: повторная доставка того же message.id (реконнект,
// доставка по нескольким каналам) не начисляет непрочитанное дважды.
final isDuplicate = message.id != 0 && chatRoom.lastMessage?.id == message.id;
final isDuplicate =
message.id != 0 && chatRoom.lastMessage?.id == message.id;
// Собственное сообщение (второе устройство автора) обновляет
// lastMessage, но не создаёт непрочитанное (S3).
if (!isOwn && !isDuplicate && chatRoom.unreadMessagesCount == 0) {
@@ -170,7 +192,9 @@ class ChatsCubit extends Cubit<ChatsState> {
}
return chatRoom.copyWith(
lastMessage: message,
unreadMessagesCount: isOwn || isDuplicate ? chatRoom.unreadMessagesCount : chatRoom.unreadMessagesCount + 1,
unreadMessagesCount: isOwn || isDuplicate
? chatRoom.unreadMessagesCount
: chatRoom.unreadMessagesCount + 1,
);
}
return chatRoom;
@@ -182,15 +206,83 @@ class ChatsCubit extends Cubit<ChatsState> {
emit(
state.copyWith(
chatRooms: updatedChatRooms,
chatsWithUnreadMessagesCount: willIncrementUnreadChats ? state.chatsWithUnreadMessagesCount + 1 : state.chatsWithUnreadMessagesCount,
chatsWithUnreadMessagesCount: willIncrementUnreadChats
? state.chatsWithUnreadMessagesCount + 1
: state.chatsWithUnreadMessagesCount,
),
);
}
_presentVideoCallFromMessage(
message,
isOwn: isOwn,
chatRooms: currentChatRooms,
);
} catch (e, st) {
await reportFrom(e, st, this);
}
}
void _presentVideoCallFromMessage(
ChatMessageModel message, {
required bool isOwn,
required List<ChatRoom> chatRooms,
}) {
final kind = VideoCallChatSignal.kindOf(message);
if (kind == VideoCallChatSignalKind.ended) {
unawaited(_dismissIncomingVideoCallUi());
return;
}
if (isOwn || kind != VideoCallChatSignalKind.started) return;
if (message.id != 0 && !_presentedVideoCallMessageIds.add(message.id)) {
return;
}
final caller = _callerFromRooms(message, chatRooms);
final payload = VideoCallChatSignal.incomingPayload(
message: message,
callerName: caller?.name,
callerAvatarUrl: caller?.profilePhotoUrl,
);
if (payload == null) return;
unawaited(_showIncomingVideoCall(payload));
}
Future<void> _showIncomingVideoCall(VideoCallPushPayload payload) async {
try {
await (presentIncomingVideoCall ??
VideoCallIncomingPushPresenter.showIncomingCall)(payload);
} catch (e, st) {
log('ChatsCubit: failed to show incoming video call: $e', stackTrace: st);
}
}
Future<void> _dismissIncomingVideoCallUi() async {
try {
await (dismissIncomingVideoCall ??
VideoCallEndedPushHandler.dismissIncomingCallUi)();
} catch (e, st) {
log(
'ChatsCubit: failed to dismiss incoming video call: $e',
stackTrace: st,
);
}
}
ChatUser? _callerFromRooms(
ChatMessageModel message,
List<ChatRoom> chatRooms,
) {
for (final room in chatRooms) {
if (room.id != message.roomId) continue;
final from = room.users.fromChatUser;
final to = room.users.toChatUser;
if (from.id == message.authorId) return from;
if (to.id == message.authorId) return to;
}
return null;
}
void _setNewLastMessage(ChatMessageModel message) {
final chats = state.chatRooms.map((chat) {
if (chat.id == message.roomId) {

8
lib/features/video_calls/managers/video_call_manager.dart
View File

@@ -932,7 +932,13 @@ class VideoCallManager {
_preparedWsUrl = tokenResponse.wsUrl;
_preparedToken = tokenResponse.token;
await room.prepareConnection(tokenResponse.wsUrl, tokenResponse.token);
// Warmup must not keep the enter button disabled. Joining the room
// connects with the token even if prepareConnection hangs or fails.
try {
await room
.prepareConnection(tokenResponse.wsUrl, tokenResponse.token)
.timeout(const Duration(seconds: 5));
} catch (_) {}
if (_liveKitDisposed) return;
_emitSnapshot(

85
lib/features/video_calls/services/video_call_chat_signal.dart Normal file
View File

@@ -0,0 +1,85 @@
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
enum VideoCallChatSignalKind { none, started, ended }
/// Detects a video-call system message.
///
/// The realtime `ChatMessageUpdated` payload does not include `type`, so an
/// open app has to recognize the system text. Messages that already have
/// another type are ignored.
abstract final class VideoCallChatSignal {
static final RegExp _startedRu = RegExp(
r'начал\(а\) видеозвонок\.?\s*$',
caseSensitive: false,
);
static final RegExp _startedEn = RegExp(
r'started a video call\.?\s*$',
caseSensitive: false,
);
static final RegExp _endedRu = RegExp(
r'завершил\(а\) видеозвонок\.?\s*$',
caseSensitive: false,
);
static final RegExp _endedEn = RegExp(
r'ended a video call\.?\s*$',
caseSensitive: false,
);
static final RegExp _callerRu = RegExp(
r'^(.*) начал\(а\) видеозвонок\.?\s*$',
caseSensitive: false,
);
static final RegExp _callerEn = RegExp(
r'^(.*) started a video call\.?\s*$',
caseSensitive: false,
);
static VideoCallChatSignalKind kindOf(ChatMessageModel message) {
if (message.type == ChatMessageType.videoCallEnded) {
return VideoCallChatSignalKind.ended;
}
if (message.type == ChatMessageType.videoCallStarted) {
return VideoCallChatSignalKind.started;
}
if (message.type != null) return VideoCallChatSignalKind.none;
final text = message.data.trim();
if (_endedRu.hasMatch(text) || _endedEn.hasMatch(text)) {
return VideoCallChatSignalKind.ended;
}
if (_startedRu.hasMatch(text) || _startedEn.hasMatch(text)) {
return VideoCallChatSignalKind.started;
}
return VideoCallChatSignalKind.none;
}
static VideoCallPushPayload? incomingPayload({
required ChatMessageModel message,
String? callerName,
String? callerAvatarUrl,
}) {
if (kindOf(message) != VideoCallChatSignalKind.started) return null;
final conversationUuid = message.roomId?.trim();
if (conversationUuid == null || conversationUuid.isEmpty) return null;
final resolvedName = callerName?.trim();
final avatar = callerAvatarUrl?.trim();
return VideoCallPushPayload(
conversationUuid: conversationUuid,
counterpartName: resolvedName != null && resolvedName.isNotEmpty
? resolvedName
: callerNameFromBody(message.data),
counterpartAvatarUrl: avatar != null && avatar.isNotEmpty ? avatar : null,
messageId: message.id > 0 ? message.id : null,
);
}
static String? callerNameFromBody(String body) {
final text = body.trim();
for (final pattern in [_callerRu, _callerEn]) {
final name = pattern.firstMatch(text)?.group(1)?.trim();
if (name != null && name.isNotEmpty) return name;
}
return null;
}
}

22
lib/features/video_calls/services/video_call_incoming_push_presenter.dart
View File

@@ -1,3 +1,6 @@
import 'dart:io';
import 'package:eatvio_app/features/video_calls/services/video_call_kit_id.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
import 'package:flutter_callkit_incoming/entities/entities.dart';
import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
@@ -6,18 +9,25 @@ abstract final class VideoCallIncomingPushPresenter {
static const String _androidAccentColor = '#2787F5';
static Future<void> showIncomingCall(VideoCallPushPayload payload) async {
final callerName =
payload.counterpartName?.trim().isNotEmpty == true
? payload.counterpartName!.trim()
: 'Итвио';
final callerName = payload.counterpartName?.trim().isNotEmpty == true
? payload.counterpartName!.trim()
: 'Итвио';
final callId = Platform.isIOS
? VideoCallKitId.iosUuid(
conversationUuid: payload.conversationUuid,
messageId: payload.messageId,
) ??
payload.conversationUuid
: payload.conversationUuid;
final params = CallKitParams(
id: payload.conversationUuid,
id: callId,
nameCaller: callerName,
appName: 'Итвио',
avatar: payload.counterpartAvatarUrl,
handle: payload.conversationUuid,
type: 0,
type: 1,
duration: 45000,
extra: <String, dynamic>{
'conversationUuid': payload.conversationUuid,

23
lib/features/video_calls/services/video_call_kit_id.dart Normal file
View File

@@ -0,0 +1,23 @@
/// CallKit on iOS rejects a second incoming call that reuses a UUID.
///
/// The conversation uuid stays in the call payload for navigation. The CallKit
/// id is derived from that uuid plus the chat message id, so one ring is one
/// call and the next ring in the same chat still appears. Android notifications
/// keep the conversation uuid: the same id updates one incoming notification.
abstract final class VideoCallKitId {
static final RegExp _uuidPrefix = RegExp(
r'^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-)[0-9a-fA-F]{12}$',
);
static String? iosUuid({
required String conversationUuid,
required int? messageId,
}) {
if (messageId == null || messageId <= 0) return null;
final prefix = _uuidPrefix.firstMatch(conversationUuid.trim())?.group(1);
if (prefix == null) return null;
final suffix = messageId.toRadixString(16).padLeft(12, '0');
if (suffix.length != 12) return null;
return '$prefix$suffix'.toLowerCase();
}
}

20
lib/features/video_calls/services/video_call_push_payload.dart
View File

@@ -5,6 +5,7 @@ class VideoCallPushPayload {
this.counterpartAvatarUrl,
this.localParticipantName,
this.counterpartIsConsultant,
this.messageId,
});
final String conversationUuid;
@@ -12,6 +13,7 @@ class VideoCallPushPayload {
final String? counterpartAvatarUrl;
final String? localParticipantName;
final bool? counterpartIsConsultant;
final int? messageId;
static VideoCallPushPayload? tryParse(Map<String, dynamic> data) {
if (!isIncomingVideoCall(data)) return null;
@@ -49,6 +51,7 @@ class VideoCallPushPayload {
'is_consultant',
'isConsultant',
]),
messageId: _messageId(data),
);
}
@@ -132,7 +135,8 @@ class VideoCallPushPayload {
final uri = Uri.tryParse(actionUrl);
if (uri == null) return null;
final fromQuery = uri.queryParameters['uuid'] ??
final fromQuery =
uri.queryParameters['uuid'] ??
uri.queryParameters['conversationUuid'] ??
uri.queryParameters['conversation_uuid'];
if (fromQuery != null && fromQuery.trim().isNotEmpty) {
@@ -167,14 +171,22 @@ class VideoCallPushPayload {
return null;
}
static int? _messageId(Map<String, dynamic> data) {
final value = data['message_id'] ?? data['messageId'];
if (value is int) return value > 0 ? value : null;
if (value is String) {
final parsed = int.tryParse(value.trim());
if (parsed != null && parsed > 0) return parsed;
}
return null;
}
static bool _isTruthy(Object? value) {
if (value == null) return false;
if (value is bool) return value;
if (value is num) return value != 0;
final normalized = value.toString().trim().toLowerCase();
return normalized == '1' ||
normalized == 'true' ||
normalized == 'yes';
return normalized == '1' || normalized == 'true' || normalized == 'yes';
}
static String? _resolveAvatarUrl(String? raw) {