Replace VmService with VmServiceWrapper (#57)

* Replace VmService with VmServiceWrapper.

Author: kenzieschmoll

lib/device/device.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:html' as html;
 
+import 'package:devtools/vm_service_wrapper.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
 import '../framework/framework.dart';
@@ -53,7 +54,7 @@ class DeviceScreen extends Screen {
     _rebuildTogglesDiv();
   }
 
-  void _handleConnectionStart(VmService service) {
+  void _handleConnectionStart(VmServiceWrapper service) {
     extensionTracker = new ExtensionTracker(service);
     extensionTracker.start();
 
@@ -142,7 +143,7 @@ class ExtensionTracker {
   final StreamController<Null> _changeController =
       new StreamController<Null>.broadcast();
 
-  VmService service;
+  VmServiceWrapper service;
 
   Map<String, Set<IsolateRef>> extensionToIsolatesMap =
       <String, Set<IsolateRef>>{};

lib/eval_on_dart_library.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
 import 'globals.dart';
+import 'vm_service_wrapper.dart';
 
 class EvalOnDartLibrary {
   EvalOnDartLibrary(this.libraryName, this.service) {
@@ -21,7 +22,7 @@ class EvalOnDartLibrary {
   }
 
   final String libraryName;
-  final VmService service;
+  final VmServiceWrapper service;
   Completer<LibraryRef> _libraryRef;
   String _isolateId;
 

lib/framework/framework_core.dart

@@ -3,7 +3,7 @@ import 'dart:html' hide Screen;
 import 'package:devtools/globals.dart';
 import 'package:devtools/service.dart';
 import 'package:devtools/service_manager.dart';
-import 'package:vm_service_lib/vm_service_lib.dart';
+import 'package:devtools/vm_service_wrapper.dart';
 
 class FrameworkCore {
   static void init() {
@@ -30,7 +30,7 @@ class FrameworkCore {
     final Completer<Null> finishedCompleter = new Completer<Null>();
 
     try {
-      final VmService service =
+      final VmServiceWrapper service =
           await connect('localhost', port, finishedCompleter);
       if (serviceManager != null) {
         serviceManager.vmServiceOpened(service, finishedCompleter.future);

lib/logging/logging.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:devtools/vm_service_wrapper.dart';
 import 'package:intl/intl.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
@@ -109,7 +110,7 @@ class LoggingScreen extends Screen {
   HelpInfo get helpInfo =>
       new HelpInfo(title: 'logs view docs', url: 'http://www.cheese.com');
 
-  void _handleConnectionStart(VmService service) {
+  void _handleConnectionStart(VmServiceWrapper service) {
     if (ref == null) {
       return;
     }
@@ -261,7 +262,7 @@ class LoggingScreen extends Screen {
   }
 
   Future<String> _retrieveFullStringValue(
-    VmService service,
+    VmServiceWrapper service,
     IsolateRef isolateRef,
     InstanceRef stringRef,
   ) async {

lib/memory/memory.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:math' as math;
 
+import 'package:devtools/vm_service_wrapper.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
 import '../charts/charts.dart';
@@ -229,7 +230,7 @@ class MemoryScreen extends Screen {
   HelpInfo get helpInfo =>
       new HelpInfo(title: 'memory view docs', url: 'http://www.cheese.com');
 
-  void _handleConnectionStart(VmService service) {
+  void _handleConnectionStart(VmServiceWrapper service) {
     loadSnapshotButton.disabled = false;
     memoryChart.disabled = false;
 
@@ -393,7 +394,7 @@ class MemoryTracker {
   static const Duration kMaxGraphTime = Duration(minutes: 1);
   static const Duration kUpdateDelay = Duration(seconds: 1);
 
-  VmService service;
+  VmServiceWrapper service;
   Timer _pollingTimer;
   final StreamController<Null> _changeController =
       new StreamController<Null>.broadcast();

lib/performance/performance.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:math' as math;
 
+import 'package:devtools/vm_service_wrapper.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
 import '../charts/charts.dart';
@@ -182,7 +183,7 @@ class PerformanceScreen extends Screen {
     })));
   }
 
-  void _handleConnectionStart(VmService service) {
+  void _handleConnectionStart(VmServiceWrapper service) {
     cpuChart.disabled = false;
 
     cpuTracker = new CpuTracker(service);
@@ -255,7 +256,7 @@ class CpuTracker {
   static const Duration kMaxGraphTime = Duration(minutes: 1);
   static const Duration kUpdateDelay = Duration(seconds: 1);
 
-  VmService service;
+  VmServiceWrapper service;
   Timer _pollingTimer;
   final StreamController<Null> _changeController =
       new StreamController<Null>.broadcast();

lib/service.dart

@@ -2,13 +2,14 @@ import 'dart:async';
 import 'dart:html' hide Event;
 import 'dart:typed_data';
 
-import 'package:vm_service_lib/vm_service_lib.dart';
+import 'vm_service_wrapper.dart';
 
-Future<VmService> connect(
+Future<VmServiceWrapper> connect(
     String host, int port, Completer<Null> finishedCompleter) {
   final WebSocket ws = new WebSocket('ws://$host:$port/ws');
 
-  final Completer<VmService> connectedCompleter = new Completer<VmService>();
+  final Completer<VmServiceWrapper> connectedCompleter =
+      new Completer<VmServiceWrapper>();
 
   ws.onOpen.listen((_) {
     final Stream<dynamic> inStream =
@@ -26,7 +27,7 @@ Future<VmService> connect(
       }
     });
 
-    final VmService service = new VmService(
+    final VmServiceWrapper service = new VmServiceWrapper.fromNewVmService(
       inStream,
       (String message) => ws.send(message),
     );

lib/service_manager.dart

@@ -8,6 +8,7 @@ import 'package:meta/meta.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
 import 'eval_on_dart_library.dart';
+import 'vm_service_wrapper.dart';
 
 class ServiceConnectionManager {
   ServiceConnectionManager() {
@@ -21,8 +22,8 @@ class ServiceConnectionManager {
   }
   final StreamController<Null> _stateController =
       new StreamController<Null>.broadcast();
-  final StreamController<VmService> _connectionAvailableController =
-      new StreamController<VmService>.broadcast();
+  final StreamController<VmServiceWrapper> _connectionAvailableController =
+      new StreamController<VmServiceWrapper>.broadcast();
   final StreamController<Null> _connectionClosedController =
       new StreamController<Null>.broadcast();
 
@@ -33,21 +34,23 @@ class ServiceConnectionManager {
   ServiceExtensionManager get serviceExtensionManager =>
       _serviceExtensionManager;
 
-  VmService service;
+  VmServiceWrapper service;
   VM vm;
   String sdkVersion;
 
   bool get hasConnection => service != null;
 
   Stream<Null> get onStateChange => _stateController.stream;
 
-  Stream<VmService> get onConnectionAvailable =>
+  Stream<VmServiceWrapper> get onConnectionAvailable =>
       _connectionAvailableController.stream;
 
   Stream<Null> get onConnectionClosed => _connectionClosedController.stream;
 
-  void vmServiceOpened(VmService service, Future<void> onClosed) {
-    service.getVM().then((VM vm) {
+  Future<void> vmServiceOpened(
+      VmServiceWrapper service, Future<void> onClosed) async {
+    try {
+      final vm = await service.getVM();
       this.vm = vm;
       sdkVersion = vm.version;
       if (sdkVersion.contains(' ')) {
@@ -78,10 +81,10 @@ class ServiceConnectionManager {
       service.streamListen('Extension');
       service.streamListen('_Graph');
       service.streamListen('_Logging');
-    }).catchError((dynamic e) {
+    } catch (e) {
       // TODO:
       print(e);
-    });
+    }
   }
 
   void vmServiceClosed() {
@@ -104,7 +107,7 @@ class IsolateManager {
   List<IsolateRef> _isolates = <IsolateRef>[];
   IsolateRef _selectedIsolate;
   IsolateRef _flutterIsolate;
-  VmService _service;
+  VmServiceWrapper _service;
   ServiceExtensionManager _serviceExtensionManager;
 
   StreamController<IsolateRef> _flutterIsolateController;
@@ -230,7 +233,7 @@ class IsolateManager {
 }
 
 class ServiceExtensionManager {
-  VmService _service;
+  VmServiceWrapper _service;
   IsolateManager _isolateManager;
 
   bool firstFrameEventReceived = false;

lib/timeline/fps.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:math' as math;
 
+import 'package:devtools/vm_service_wrapper.dart';
 import 'package:vm_service_lib/vm_service_lib.dart';
 
 import '../charts/charts.dart';
@@ -95,7 +96,7 @@ class FramesTracker {
 
   static const int kMaxFrames = 60;
 
-  VmService service;
+  VmServiceWrapper service;
   final StreamController<Null> _changeController =
       new StreamController<Null>.broadcast();
   List<FrameInfo> samples = <FrameInfo>[];

lib/timeline/timeline.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:math' as math;
 
+import 'package:devtools/vm_service_wrapper.dart';
 import 'package:vm_service_lib/vm_service_lib.dart' hide TimelineEvent;
 
 import '../framework/framework.dart';
@@ -148,7 +149,7 @@ class TimelineScreen extends Screen {
     _updateListeningState();
   }
 
-  void _handleConnectionStart(VmService service) {
+  void _handleConnectionStart(VmServiceWrapper service) {
     framesChart.disabled = false;
 
     framesTracker = new FramesTracker(service);