DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[frdb] Updates invokeRpc method and VM connect. (#17819)

Browse Source 
This fixes a runtime error triggered when calling `invokeRpc`:
```
type 'Future<dynamic>' is not a subtype of type 'Future<Map<String, dynamic>>'
```

Also adds a log message for why connections are failing, as well as a
default timeout when attempting to connect to a websocket.
This commit is contained in:
Andrew Davies 2018-05-22 15:49:47 -07:00 committed by GitHub
parent 9471e4e216
commit 6dbdccf7f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/fuchsia_remote_debug_protocol/lib/src/dart/dart_vm.dart
View File

@ -38,7 +38,8 @@ Future<json_rpc.Peer> _waitAndConnect(Uri uri) async {
WebSocket socket;
json_rpc.Peer peer;
try {
socket = await WebSocket.connect(uri.toString());
socket =
await WebSocket.connect(uri.toString()).timeout(_kConnectTimeout);
peer = new json_rpc.Peer(new IOWebSocketChannel(socket).cast())..listen();
return peer;
} on HttpException catch (e) {
@ -48,6 +49,7 @@ Future<json_rpc.Peer> _waitAndConnect(Uri uri) async {
await socket?.close();
rethrow;
} catch (e) {
_log.fine('Dart VM connection failed $e: ${e.message}');
// Other unknown errors will be handled with reconnects.
await peer?.close();
await socket?.close();
@ -141,19 +143,15 @@ class DartVm {
Map<String, dynamic> params,
Duration timeout = _kRpcTimeout,
}) async {
final Future<Map<String, dynamic>> future = _peer.sendRequest(
function,
params ?? <String, dynamic>{},
);
if (timeout == null) {
return future;
}
return future.timeout(timeout, onTimeout: () {
final Map<String, dynamic> result = await _peer
.sendRequest(function, params ?? <String, dynamic>{})
.timeout(timeout, onTimeout: () {
throw new TimeoutException(
'Peer connection timed out during RPC call',
timeout,
);
});
return result;
}
/// Returns a list of [FlutterView] objects running across all Dart VM's.