SolarNetwork/App
3
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔊 Add more logging and optimzation

Browse Source
This commit is contained in:
LittleSheep
2025-08-16 23:39:41 +08:00
parent 007b46b080
commit 6892afb974
1 changed files with 496 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

245
lib/screens/chat/room.dart
View File

@@ -1,5 +1,6 @@
import 'dart:async';
import 'dart:convert';
import 'dart:developer' as developer;
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:easy_localization/easy_localization.dart';
@@ -41,6 +42,8 @@ import 'package:island/widgets/stickers/picker.dart';
part 'room.g.dart';
final isSyncingProvider = StateProvider.autoDispose<bool>((ref) => false);
final appLifecycleStateProvider = StreamProvider<AppLifecycleState>((ref) {
final controller = StreamController<AppLifecycleState>();
@@ -97,8 +100,11 @@ class MessagesNotifier extends _$MessagesNotifier {
_room = room;
_identity = identity;
developer.log('MessagesNotifier built for room $roomId', name: 'MessagesNotifier');
ref.listen(appLifecycleStateProvider, (_, next) {
if (next.hasValue && next.value == AppLifecycleState.resumed) {
developer.log('App resumed, syncing messages', name: 'MessagesNotifier');
syncMessages();
}
});
@@ -110,6 +116,7 @@ class MessagesNotifier extends _$MessagesNotifier {
int offset = 0,
int take = 20,
}) async {
developer.log('Getting cached messages from offset $offset, take $take', name: 'MessagesNotifier');
final dbMessages = await _database.getMessagesForRoom(
_roomId,
offset: offset,
@@ -120,9 +127,7 @@ class MessagesNotifier extends _$MessagesNotifier {
if (offset == 0) {
final pendingForRoom =
_pendingMessages.values
.where((msg) => msg.roomId == _roomId)
.toList();
_pendingMessages.values.where((msg) => msg.roomId == _roomId).toList();
final allMessages = [...pendingForRoom, ...dbLocalMessages];
allMessages.sort((a, b) => b.createdAt.compareTo(a.createdAt));
@@ -144,6 +149,7 @@ class MessagesNotifier extends _$MessagesNotifier {
int offset = 0,
int take = 20,
}) async {
developer.log('Fetching messages from API, offset $offset, take $take', name: 'MessagesNotifier');
if (_totalCount == null) {
final response = await _apiClient.get(
'/sphere/chat/$_roomId/messages',
@@ -164,8 +170,7 @@ class MessagesNotifier extends _$MessagesNotifier {
final List<dynamic> data = response.data;
_totalCount = int.parse(response.headers['x-total']?.firstOrNull ?? '0');
final messages =
data.map((json) {
final messages = data.map((json) {
final remoteMessage = SnChatMessage.fromJson(json);
return LocalChatMessage.fromRemoteMessage(
remoteMessage,
@@ -185,18 +190,25 @@ class MessagesNotifier extends _$MessagesNotifier {
return messages;
}
Future<bool> syncMessages() async {
Future<void> syncMessages() async {
developer.log('Starting message sync', name: 'MessagesNotifier');
ref.read(isSyncingProvider.notifier).state = true;
try {
final dbMessages = await _database.getMessagesForRoom(
_room.id,
offset: 0,
limit: 1,
);
final lastMessage =
dbMessages.isEmpty
? null
: _database.companionToMessage(dbMessages.first);
if (lastMessage == null) return false;
try {
dbMessages.isEmpty ? null : _database.companionToMessage(dbMessages.first);
if (lastMessage == null) {
developer.log('No local messages, fetching from network', name: 'MessagesNotifier');
final newMessages = await _fetchAndCacheMessages(offset: 0, take: _pageSize);
state = AsyncValue.data(newMessages);
return;
}
final resp = await _apiClient.post(
'/sphere/chat/${_room.id}/sync',
data: {
@@ -206,6 +218,7 @@ class MessagesNotifier extends _$MessagesNotifier {
);
final response = MessageSyncResponse.fromJson(resp.data);
developer.log('Sync response: ${response.changes.length} changes', name: 'MessagesNotifier');
for (final change in response.changes) {
switch (change.action) {
case MessageChangeAction.create:
@@ -219,10 +232,13 @@ class MessagesNotifier extends _$MessagesNotifier {
break;
}
}
} catch (err) {
} catch (err, stackTrace) {
developer.log('Error syncing messages', name: 'MessagesNotifier', error: err, stackTrace: stackTrace);
showErrorAlert(err);
} finally {
developer.log('Finished message sync', name: 'MessagesNotifier');
ref.read(isSyncingProvider.notifier).state = false;
}
return true;
}
Future<List<LocalChatMessage>> listMessages({
@@ -261,23 +277,17 @@ class MessagesNotifier extends _$MessagesNotifier {
}
Future<List<LocalChatMessage>> loadInitial() async {
try {
final synced = await syncMessages();
final messages = await listMessages(
offset: 0,
take: _pageSize,
synced: synced,
);
developer.log('Loading initial messages', name: 'MessagesNotifier');
syncMessages();
final messages = await _getCachedMessages(offset: 0, take: _pageSize);
_currentPage = 0;
_hasMore = messages.length == _pageSize;
return messages;
} catch (_) {
rethrow;
}
}
Future<void> loadMore() async {
if (!_hasMore || state is AsyncLoading) return;
developer.log('Loading more messages', name: 'MessagesNotifier');
try {
final currentMessages = state.value ?? [];
@@ -292,7 +302,8 @@ class MessagesNotifier extends _$MessagesNotifier {
}
state = AsyncValue.data([...currentMessages, ...newMessages]);
} catch (err) {
} catch (err, stackTrace) {
developer.log('Error loading more messages', name: 'MessagesNotifier', error: err, stackTrace: stackTrace);
showErrorAlert(err);
_currentPage--;
}
@@ -306,11 +317,12 @@ class MessagesNotifier extends _$MessagesNotifier {
SnChatMessage? replyingTo,
Function(String, Map<int, double>)? onProgress,
}) async {
final nonce = const Uuid().v4();
developer.log('Sending message with nonce $nonce', name: 'MessagesNotifier');
final baseUrl = ref.read(serverUrlProvider);
final token = await getToken(ref.watch(tokenProvider));
if (token == null) throw ArgumentError('Access token is null');
final nonce = const Uuid().v4();
final mockMessage = SnChatMessage(
id: 'pending_$nonce',
chatRoomId: _roomId,
@@ -337,14 +349,12 @@ class MessagesNotifier extends _$MessagesNotifier {
try {
var cloudAttachments = List.empty(growable: true);
for (var idx = 0; idx < attachments.length; idx++) {
final cloudFile =
await putMediaToCloud(
final cloudFile = await putMediaToCloud(
fileData: attachments[idx],
atk: token,
baseUrl: baseUrl,
filename: attachments[idx].data.name ?? 'Post media',
mimetype:
attachments[idx].data.mimeType ??
mimetype: attachments[idx].data.mimeType ??
switch (attachments[idx].type) {
UniversalFileType.image => 'image/unknown',
UniversalFileType.video => 'video/unknown',
@@ -390,34 +400,35 @@ class MessagesNotifier extends _$MessagesNotifier {
await _database.deleteMessage(localMessage.id);
await _database.saveMessage(_database.messageToCompanion(updatedMessage));
final newMessages =
(state.value ?? []).map((m) {
final newMessages = (state.value ?? []).map((m) {
if (m.id == localMessage.id) {
return updatedMessage;
}
return m;
}).toList();
state = AsyncValue.data(newMessages);
} catch (err) {
developer.log('Message with nonce $nonce sent successfully', name: 'MessagesNotifier');
} catch (e, stackTrace) {
developer.log('Failed to send message with nonce $nonce', name: 'MessagesNotifier', error: e, stackTrace: stackTrace);
localMessage.status = MessageStatus.failed;
_pendingMessages[localMessage.id] = localMessage;
await _database.updateMessageStatus(
localMessage.id,
MessageStatus.failed,
);
final newMessages =
(state.value ?? []).map((m) {
final newMessages = (state.value ?? []).map((m) {
if (m.id == localMessage.id) {
return m..status = MessageStatus.failed;
}
return m;
}).toList();
state = AsyncValue.data(newMessages);
showErrorAlert(err);
showErrorAlert(e);
}
}
Future<void> retryMessage(String pendingMessageId) async {
developer.log('Retrying message $pendingMessageId', name: 'MessagesNotifier');
final message = await fetchMessageById(pendingMessageId);
if (message == null) {
throw Exception('Message not found');
@@ -452,35 +463,35 @@ class MessagesNotifier extends _$MessagesNotifier {
await _database.deleteMessage(pendingMessageId);
await _database.saveMessage(_database.messageToCompanion(updatedMessage));
final newMessages =
(state.value ?? []).map((m) {
final newMessages = (state.value ?? []).map((m) {
if (m.id == pendingMessageId) {
return updatedMessage;
}
return m;
}).toList();
state = AsyncValue.data(newMessages);
} catch (err) {
} catch (e, stackTrace) {
developer.log('Failed to retry message $pendingMessageId', name: 'MessagesNotifier', error: e, stackTrace: stackTrace);
message.status = MessageStatus.failed;
_pendingMessages[pendingMessageId] = message;
await _database.updateMessageStatus(
pendingMessageId,
MessageStatus.failed,
);
final newMessages =
(state.value ?? []).map((m) {
final newMessages = (state.value ?? []).map((m) {
if (m.id == pendingMessageId) {
return m..status = MessageStatus.failed;
}
return m;
}).toList();
state = AsyncValue.data(newMessages);
showErrorAlert(err);
showErrorAlert(e);
}
}
Future<void> receiveMessage(SnChatMessage remoteMessage) async {
if (remoteMessage.chatRoomId != _roomId) return;
developer.log('Received new message ${remoteMessage.id}', name: 'MessagesNotifier');
final localMessage = LocalChatMessage.fromRemoteMessage(
remoteMessage,
@@ -513,6 +524,7 @@ class MessagesNotifier extends _$MessagesNotifier {
Future<void> receiveMessageUpdate(SnChatMessage remoteMessage) async {
if (remoteMessage.chatRoomId != _roomId) return;
developer.log('Received message update ${remoteMessage.id}', name: 'MessagesNotifier');
final updatedMessage = LocalChatMessage.fromRemoteMessage(
remoteMessage,
@@ -521,7 +533,9 @@ class MessagesNotifier extends _$MessagesNotifier {
await _database.updateMessage(_database.messageToCompanion(updatedMessage));
final currentMessages = state.value ?? [];
final index = currentMessages.indexWhere((m) => m.id == updatedMessage.id);
final index = currentMessages.indexWhere(
(m) => m.id == updatedMessage.id,
);
if (index >= 0) {
final newList = [...currentMessages];
@@ -531,6 +545,7 @@ class MessagesNotifier extends _$MessagesNotifier {
}
Future<void> receiveMessageDeletion(String messageId) async {
developer.log('Received message deletion $messageId', name: 'MessagesNotifier');
_pendingMessages.remove(messageId);
await _database.deleteMessage(messageId);
@@ -544,19 +559,22 @@ class MessagesNotifier extends _$MessagesNotifier {
}
Future<void> deleteMessage(String messageId) async {
developer.log('Deleting message $messageId', name: 'MessagesNotifier');
try {
await _apiClient.delete('/sphere/chat/$_roomId/messages/$messageId');
await receiveMessageDeletion(messageId);
} catch (err) {
} catch (err, stackTrace) {
developer.log('Error deleting message $messageId', name: 'MessagesNotifier', error: err, stackTrace: stackTrace);
showErrorAlert(err);
}
}
Future<LocalChatMessage?> fetchMessageById(String messageId) async {
developer.log('Fetching message by id $messageId', name: 'MessagesNotifier');
try {
final localMessage =
await (_database.select(_database.chatMessages)
..where((tbl) => tbl.id.equals(messageId))).getSingleOrNull();
final localMessage = await (_database.select(_database.chatMessages)
..where((tbl) => tbl.id.equals(messageId)))
.getSingleOrNull();
if (localMessage != null) {
return _database.companionToMessage(localMessage);
}
@@ -587,6 +605,7 @@ class ChatRoomScreen extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final chatRoom = ref.watch(chatroomProvider(id));
final chatIdentity = ref.watch(chatroomIdentityProvider(id));
final isSyncing = ref.watch(isSyncingProvider);
if (chatIdentity.isLoading || chatRoom.isLoading) {
return AppScaffold(
@@ -598,8 +617,7 @@ class ChatRoomScreen extends HookConsumerWidget {
return AppScaffold(
appBar: AppBar(leading: const PageBackButton()),
body: Center(
child:
ConstrainedBox(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 280),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
@@ -708,10 +726,8 @@ class ChatRoomScreen extends HookConsumerWidget {
if (typingStatuses.value.isNotEmpty) {
// Remove typing statuses older than 5 seconds
final now = DateTime.now();
typingStatuses.value =
typingStatuses.value.where((member) {
final lastTyped =
member.lastTyped ??
typingStatuses.value = typingStatuses.value.where((member) {
final lastTyped = member.lastTyped ??
DateTime.now().subtract(const Duration(milliseconds: 1350));
return now.difference(lastTyped).inSeconds < 5;
}).toList();
@@ -885,9 +901,7 @@ class ChatRoomScreen extends HookConsumerWidget {
automaticallyImplyLeading: false,
toolbarHeight: compactHeader ? null : 64,
title: chatRoom.when(
data:
(room) =>
compactHeader
data: (room) => compactHeader
? Row(
spacing: 8,
crossAxisAlignment: CrossAxisAlignment.center,
@@ -895,18 +909,11 @@ class ChatRoomScreen extends HookConsumerWidget {
SizedBox(
height: 26,
width: 26,
child:
(room!.type == 1 && room.picture?.id == null)
child: (room!.type == 1 && room.picture?.id == null)
? SplitAvatarWidget(
filesId:
room.members!
filesId: room.members!
.map(
(e) =>
e
.account
.profile
.picture
?.id,
(e) => e.account.profile.picture?.id,
)
.toList(),
)
@@ -924,9 +931,7 @@ class ChatRoomScreen extends HookConsumerWidget {
),
Text(
(room.type == 1 && room.name == null)
? room.members!
.map((e) => e.account.nick)
.join(', ')
? room.members!.map((e) => e.account.nick).join(', ')
: room.name!,
).fontSize(19),
],
@@ -939,18 +944,11 @@ class ChatRoomScreen extends HookConsumerWidget {
SizedBox(
height: 26,
width: 26,
child:
(room!.type == 1 && room.picture?.id == null)
child: (room!.type == 1 && room.picture?.id == null)
? SplitAvatarWidget(
filesId:
room.members!
filesId: room.members!
.map(
(e) =>
e
.account
.profile
.picture
?.id,
(e) => e.account.profile.picture?.id,
)
.toList(),
)
@@ -968,16 +966,13 @@ class ChatRoomScreen extends HookConsumerWidget {
),
Text(
(room.type == 1 && room.name == null)
? room.members!
.map((e) => e.account.nick)
.join(', ')
? room.members!.map((e) => e.account.nick).join(', ')
: room.name!,
).fontSize(15),
],
),
loading: () => const Text('Loading...'),
error:
(err, _) => ResponseErrorWidget(
error: (err, _) => ResponseErrorWidget(
error: err,
onRetry: () => messagesNotifier.loadInitial(),
),
@@ -992,6 +987,12 @@ class ChatRoomScreen extends HookConsumerWidget {
),
const Gap(8),
],
bottom: isSyncing
? const PreferredSize(
preferredSize: Size.fromHeight(4.0),
child: LinearProgressIndicator(),
)
: null,
),
body: Stack(
children: [
@@ -999,16 +1000,13 @@ class ChatRoomScreen extends HookConsumerWidget {
children: [
Expanded(
child: messages.when(
data:
(messageList) =>
messageList.isEmpty
data: (messageList) => messageList.isEmpty
? Center(child: Text('No messages yet'.tr()))
: SuperListView.builder(
listController: listController,
padding: EdgeInsets.symmetric(vertical: 16),
controller: scrollController,
reverse:
true, // Show newest messages at the bottom
reverse: true, // Show newest messages at the bottom
itemCount: messageList.length,
findChildIndexCallback: (key) {
final valueKey = key as ValueKey;
@@ -1019,14 +1017,11 @@ class ChatRoomScreen extends HookConsumerWidget {
},
itemBuilder: (context, index) {
final message = messageList[index];
final nextMessage =
index < messageList.length - 1
final nextMessage = index < messageList.length - 1
? messageList[index + 1]
: null;
final isLastInGroup =
nextMessage == null ||
nextMessage.senderId !=
message.senderId ||
final isLastInGroup = nextMessage == null ||
nextMessage.senderId != message.senderId ||
nextMessage.createdAt
.difference(message.createdAt)
.inMinutes
@@ -1035,12 +1030,10 @@ class ChatRoomScreen extends HookConsumerWidget {
return chatIdentity.when(
skipError: true,
data:
(identity) => MessageItem(
data: (identity) => MessageItem(
key: ValueKey(message.id),
message: message,
isCurrentUser:
identity?.id == message.senderId,
isCurrentUser: identity?.id == message.senderId,
onAction: (action) {
switch (action) {
case MessageItemAction.delete:
@@ -1051,17 +1044,11 @@ class ChatRoomScreen extends HookConsumerWidget {
messageEditingTo.value =
message.toRemoteMessage();
messageController.text =
messageEditingTo
.value
?.content ??
'';
attachments.value =
messageEditingTo
.value!
.attachments
messageEditingTo.value?.content ?? '';
attachments.value = messageEditingTo
.value!.attachments
.map(
(e) =>
UniversalFile.fromAttachment(
(e) => UniversalFile.fromAttachment(
e,
),
)
@@ -1075,8 +1062,7 @@ class ChatRoomScreen extends HookConsumerWidget {
}
},
onJump: (messageId) {
final messageIndex = messageList
.indexWhere(
final messageIndex = messageList.indexWhere(
(m) => m.id == messageId,
);
listController.jumpToItem(
@@ -1086,13 +1072,10 @@ class ChatRoomScreen extends HookConsumerWidget {
alignment: 0.5,
);
},
progress:
attachmentProgress.value[message
.id],
progress: attachmentProgress.value[message.id],
showAvatar: isLastInGroup,
),
loading:
() => MessageItem(
loading: () => MessageItem(
message: message,
isCurrentUser: false,
onAction: null,
@@ -1104,18 +1087,15 @@ class ChatRoomScreen extends HookConsumerWidget {
);
},
),
loading:
() => const Center(child: CircularProgressIndicator()),
error:
(error, _) => ResponseErrorWidget(
loading: () => const Center(child: CircularProgressIndicator()),
error: (error, _) => ResponseErrorWidget(
error: error,
onRetry: () => messagesNotifier.loadInitial(),
),
),
),
chatRoom.when(
data:
(room) => Column(
data: (room) => Column(
mainAxisSize: MainAxisSize.min,
children: [
AnimatedSwitcher(
@@ -1146,8 +1126,7 @@ class ChatRoomScreen extends HookConsumerWidget {
),
);
},
child:
typingStatuses.value.isNotEmpty
child: typingStatuses.value.isNotEmpty
? Container(
key: const ValueKey('typing-indicator'),
width: double.infinity,
@@ -1170,14 +1149,12 @@ class ChatRoomScreen extends HookConsumerWidget {
typingStatuses.value
.map(
(x) =>
x.nick ??
x.account.nick,
x.nick ?? x.account.nick,
)
.join(', '),
],
),
style:
Theme.of(
style: Theme.of(
context,
).textTheme.bodySmall,
),
@@ -1446,14 +1423,11 @@ class _ChatInput extends HookConsumerWidget {
// Insert placeholder at current cursor position
final text = messageController.text;
final selection = messageController.selection;
final start =
selection.start >= 0
final start = selection.start >= 0
? selection.start
: text.length;
final end =
selection.end >= 0
? selection.end
: text.length;
selection.end >= 0 ? selection.end : text.length;
final newText = text.replaceRange(
start,
end,
@@ -1471,8 +1445,7 @@ class _ChatInput extends HookConsumerWidget {
),
PopupMenuButton(
icon: const Icon(Symbols.photo_library),
itemBuilder:
(context) => [
itemBuilder: (context) => [
PopupMenuItem(
onTap: () => onPickFile(true),
child: Row(
@@ -1543,8 +1516,8 @@ class _ChatInput extends HookConsumerWidget {
),
),
maxLines: null,
onTapOutside:
(_) => FocusManager.instance.primaryFocus?.unfocus(),
onTapOutside: (_) =>
FocusManager.instance.primaryFocus?.unfocus(),
),
),
),