fix: check for inactive topic at init wc2 client

Signed-off-by: phuoc <[email protected]>
bitmark-inc · Apr 26, 2024 · 4ce5228 · 4ce5228
1 parent f3a056e
commit 4ce5228
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lib/screen/bloc/connections/connections_bloc.dart b/lib/screen/bloc/connections/connections_bloc.dart
@@ -13,6 +13,7 @@ import 'package:autonomy_flutter/database/entity/connection.dart';
 import 'package:autonomy_flutter/model/p2p_peer.dart';
 import 'package:autonomy_flutter/service/tezos_beacon_service.dart';
 import 'package:autonomy_flutter/service/wc2_service.dart';
+import 'package:autonomy_flutter/util/log.dart';
 import 'package:collection/collection.dart';
 
 part 'connections_state.dart';
@@ -158,7 +159,7 @@ class ConnectionsBloc extends AuBloc<ConnectionsEvent, ConnectionsState> {
     if (topic == null) {
       return;
     }
-
+    log.info('SessionDeletedEvent: $topic');
     add(SessionDeletedEvent(topic));
   }
 

diff --git a/lib/service/wc2_service.dart b/lib/service/wc2_service.dart
@@ -114,7 +114,6 @@ class Wc2Service {
     _wcClient.onSessionDelete.subscribe(_onSessionDeleted);
 
     _registerEthRequest('${Wc2Chain.ethereum}:${Environment.web3ChainId}');
-    _registerEthRequest('${Wc2Chain.ethereum}:5');
 
     _registerFeralfileRequest(
         '${Wc2Chain.autonomy}:${Environment.appTestnetConfig ? 1 : 0}');
@@ -330,7 +329,19 @@ class Wc2Service {
 
   Future<List<String>> _getAllConnectionKey() async {
     final connections = await _cloudDB.connectionDao.getWc2Connections();
-    return connections.map((e) => e.key).toList();
+    final activeTopics = _wcClient.getActiveSessions().keys;
+    log.info('[Wc2Service] activeTopics: $activeTopics');
+    final inactiveConnections = connections
+        .where((element) =>
+            !activeTopics.any((topic) => element.key.contains(topic)))
+        .toList();
+    await _cloudDB.connectionDao.deleteConnections(inactiveConnections);
+    final keys = connections
+        .where((element) => !inactiveConnections.contains(element))
+        .map((e) => e.key)
+        .toList();
+    log.info('[Wc2Service] connection keys: $keys');
+    return keys;
   }
 
   List<SessionRequest> getPendingRequests() =>