Skip to content

Commit d19cc62

Browse files
ignaciosantiseclaude
ignaciosantise
and
claude
authored
fix: resolve 5 sentry alerts in sample apps (#363)
* fix: resolve 5 sentry alerts in wallet and dapp sample apps - Fix StateError on closed WebSocket sink by storing and canceling subscriptions - Add null-safe access in activity_page error handlers to prevent TypeError - Handle ReownSignError in modal request flow instead of rethrowing - Wrap WebSocket handshake and stream errors in try-catch blocks - Increase app initialization timeout and add yield points to prevent hanging All changes include test coverage validation (140/140 core tests pass). * fix: address PR review feedback on sentry alert fixes - Stop rethrowing ReownSignError after UI broadcast (comment #1) - Add debugPrint logging in all silent catch blocks (comment #2) - Clean up socket/controllers on failed handshake via close() (comment #3) - Move chainId validation inside try/catch so it's handled (comment #4) - Fix "disconnnect" typo in comment (comment #6) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 7fcd262 commit d19cc62

File tree

4 files changed

+115
-51
lines changed

4 files changed

+115
-51
lines changed

‎packages/reown_appkit/lib/modal/appkit_modal_impl.dart‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,18 +1607,18 @@ class ReownAppKitModal
16071607
if (_currentSession == null) {
16081608
throw ReownAppKitModalException('Session is null');
16091609
}
1610-
if (!NamespaceUtils.isValidChainId(chainId)) {
1611-
throw Errors.getSdkError(
1612-
Errors.UNSUPPORTED_CHAINS,
1613-
context: 'chainId should conform to "CAIP-2" format',
1614-
).toSignError();
1615-
}
16161610
//
16171611
_appKit.core.logger.d(
16181612
'[$runtimeType] request, chainId: $chainId, '
16191613
'${jsonEncode(request.toJson())}',
16201614
);
16211615
try {
1616+
if (!NamespaceUtils.isValidChainId(chainId)) {
1617+
throw Errors.getSdkError(
1618+
Errors.UNSUPPORTED_CHAINS,
1619+
context: 'chainId should conform to "CAIP-2" format',
1620+
).toSignError();
1621+
}
16221622
if (_currentSession!.sessionService.isMagic) {
16231623
return await _magicService.request(chainId: chainId, request: request);
16241624
}
@@ -1655,12 +1655,13 @@ class ReownAppKitModal
16551655
} catch (e) {
16561656
if (_isUserRejectedError(e)) {
16571657
onModalError.broadcast(UserRejectedRequest());
1658-
} else {
1659-
if (e is CoinbaseServiceException) {
1660-
// If the error is due to no session on Coinbase Wallet we disconnnect the session on Modal.
1661-
// This is the only way to detect a missing session since Coinbase Wallet is not sending any event.
1662-
throw ReownAppKitModalException('Coinbase Wallet Error');
1663-
}
1658+
} else if (e is CoinbaseServiceException) {
1659+
// If the error is due to no session on Coinbase Wallet we disconnect the session on Modal.
1660+
// This is the only way to detect a missing session since Coinbase Wallet is not sending any event.
1661+
throw ReownAppKitModalException('Coinbase Wallet Error');
1662+
} else if (e is ReownSignError) {
1663+
onModalError.broadcast(ModalError(e.message));
1664+
return;
16641665
}
16651666
rethrow;
16661667
}

‎packages/reown_appkit/lib/modal/pages/activity_page.dart‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -114,32 +114,40 @@ class _ActivityListViewBuilderState extends State<ActivityListViewBuilder> {
114114
widget.appKitModal.onModalError.broadcast(
115115
ModalError('Error fetching activity'),
116116
);
117-
final namespace = NamespaceUtils.getNamespaceFromChain(
118-
widget.appKitModal.selectedChain?.chainId ?? '',
119-
);
120-
GetIt.I<IAnalyticsService>().sendEvent(
121-
ErrorFetchTransactionsEvent(
122-
address: widget.appKitModal.session!.getAddress(namespace),
123-
projectId: widget.appKitModal.appKit!.core.projectId,
124-
cursor: _currentCursor,
125-
),
126-
);
117+
final session = widget.appKitModal.session;
118+
final appKit = widget.appKitModal.appKit;
119+
if (session != null && appKit != null) {
120+
final namespace = NamespaceUtils.getNamespaceFromChain(
121+
widget.appKitModal.selectedChain?.chainId ?? '',
122+
);
123+
GetIt.I<IAnalyticsService>().sendEvent(
124+
ErrorFetchTransactionsEvent(
125+
address: session.getAddress(namespace),
126+
projectId: appKit.core.projectId,
127+
cursor: _currentCursor,
128+
),
129+
);
130+
}
127131
}
128132
setState(() {});
129133
}
130134

131135
Future<void> _loadMoreActivities() async {
132136
if (_isLoadingActivities || !_hasMoreActivities) return;
133137

134-
final chainId = widget.appKitModal.selectedChain?.chainId ?? '';
135-
final namespace = NamespaceUtils.getNamespaceFromChain(chainId);
136-
GetIt.I<IAnalyticsService>().sendEvent(
137-
LoadMoreTransactionsEvent(
138-
address: widget.appKitModal.session!.getAddress(namespace),
139-
projectId: widget.appKitModal.appKit!.core.projectId,
140-
cursor: _currentCursor,
141-
),
142-
);
138+
final session = widget.appKitModal.session;
139+
final appKit = widget.appKitModal.appKit;
140+
if (session != null && appKit != null) {
141+
final chainId = widget.appKitModal.selectedChain?.chainId ?? '';
142+
final namespace = NamespaceUtils.getNamespaceFromChain(chainId);
143+
GetIt.I<IAnalyticsService>().sendEvent(
144+
LoadMoreTransactionsEvent(
145+
address: session.getAddress(namespace),
146+
projectId: appKit.core.projectId,
147+
cursor: _currentCursor,
148+
),
149+
);
150+
}
143151
await _fetchActivities();
144152
}
145153

‎packages/reown_core/lib/relay_client/websocket/websocket_handler.dart‎

Lines changed: 72 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'dart:async';
22

3+
import 'package:flutter/foundation.dart';
34
import 'package:reown_core/models/basic_models.dart';
45
import 'package:reown_core/relay_client/websocket/i_websocket_handler.dart';
56
import 'package:stream_channel/stream_channel.dart';
@@ -23,6 +24,8 @@ class WebSocketHandler implements IWebSocketHandler {
2324

2425
StreamController<String>? _inputController;
2526
StreamController<String>? _outputController;
27+
StreamSubscription<String>? _inputSubscription;
28+
StreamSubscription<String>? _outputSubscription;
2629

2730
@override
2831
Future<void> setup({required String url}) async {
@@ -51,17 +54,47 @@ class WebSocketHandler implements IWebSocketHandler {
5154
_outputController = StreamController<String>.broadcast(sync: true);
5255

5356
// Split the incoming stream to support multiple listeners
54-
_socket!.stream.cast<String>().listen(
57+
_inputSubscription = _socket!.stream.cast<String>().listen(
5558
(data) => _inputController?.add(data),
56-
onError: (error) => _inputController?.addError(error),
57-
onDone: () => _inputController?.close(),
59+
onError: (error) {
60+
try {
61+
_inputController?.addError(error);
62+
} catch (e) {
63+
debugPrint('[WebSocketHandler] inputController.addError failed: $e');
64+
}
65+
},
66+
onDone: () {
67+
try {
68+
_inputController?.close();
69+
} catch (e) {
70+
debugPrint('[WebSocketHandler] inputController.close failed: $e');
71+
}
72+
},
5873
);
5974

6075
// Route outgoing messages through the output controller
61-
_outputController!.stream.listen(
62-
(data) => _socket?.sink.add(data),
63-
onError: (error) => _socket?.sink.addError(error),
64-
onDone: () => _socket?.sink.close(),
76+
_outputSubscription = _outputController!.stream.listen(
77+
(data) {
78+
try {
79+
_socket?.sink.add(data);
80+
} catch (e) {
81+
debugPrint('[WebSocketHandler] sink.add failed: $e');
82+
}
83+
},
84+
onError: (error) {
85+
try {
86+
_socket?.sink.addError(error);
87+
} catch (e) {
88+
debugPrint('[WebSocketHandler] sink.addError failed: $e');
89+
}
90+
},
91+
onDone: () {
92+
try {
93+
_socket?.sink.close();
94+
} catch (e) {
95+
debugPrint('[WebSocketHandler] sink.close failed: $e');
96+
}
97+
},
6598
);
6699

67100
_channel = StreamChannel(_inputController!.stream, _outputController!.sink);
@@ -75,30 +108,50 @@ class WebSocketHandler implements IWebSocketHandler {
75108
}
76109
}
77110

78-
await _socket?.ready;
79-
80-
// Check if the request was successful (status code 200)
81-
// try {} catch (e) {
82-
// throw ReownCoreError(
83-
// code: 400,
84-
// message: 'WebSocket connection failed, missing or invalid project id.',
85-
// );
86-
// }
111+
try {
112+
await _socket?.ready;
113+
} catch (e) {
114+
await close();
115+
throw ReownCoreError(
116+
code: -1,
117+
message: 'WebSocket connection failed: ${e.toString()}',
118+
);
119+
}
87120
}
88121

89122
@override
90123
Future<void> close() async {
124+
// Cancel subscriptions first to prevent writes to closed sinks
125+
try {
126+
await _inputSubscription?.cancel();
127+
} catch (e) {
128+
debugPrint('[WebSocketHandler] inputSubscription.cancel failed: $e');
129+
}
130+
try {
131+
await _outputSubscription?.cancel();
132+
} catch (e) {
133+
debugPrint('[WebSocketHandler] outputSubscription.cancel failed: $e');
134+
}
135+
_inputSubscription = null;
136+
_outputSubscription = null;
137+
91138
try {
92139
await _socket?.sink.close();
93-
} catch (_) {}
140+
} catch (e) {
141+
debugPrint('[WebSocketHandler] socket.sink.close failed: $e');
142+
}
94143

95144
// Close the controllers to prevent further messages and race conditions
96145
try {
97146
await _inputController?.close();
98-
} catch (_) {}
147+
} catch (e) {
148+
debugPrint('[WebSocketHandler] inputController.close failed: $e');
149+
}
99150
try {
100151
await _outputController?.close();
101-
} catch (_) {}
152+
} catch (e) {
153+
debugPrint('[WebSocketHandler] outputController.close failed: $e');
154+
}
102155

103156
_inputController = null;
104157
_outputController = null;

‎packages/reown_walletkit/example/lib/main.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,13 @@ class _MyHomePageState extends State<MyHomePage> {
148148
return keyService;
149149
});
150150
GetIt.I.registerSingleton<IWalletKitService>(WalletKitService());
151-
await GetIt.I.allReady(timeout: Duration(seconds: 1));
151+
await GetIt.I.allReady(timeout: Duration(seconds: 5));
152152

153153
final walletKitService = GetIt.I<IWalletKitService>();
154154
await walletKitService.create();
155+
await Future<void>.delayed(Duration.zero); // Yield to prevent UI hang
155156
await walletKitService.setUpAccounts();
157+
await Future<void>.delayed(Duration.zero); // Yield to prevent UI hang
156158
await walletKitService.init();
157159

158160
walletKitService.walletKit.core.relayClient.onRelayClientConnect

0 commit comments

Comments
 (0)