Support root-level json rpc requests in the vm service.

runtime/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of service;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 193 matching lines @@
   Future<ServiceObject> load() {
     if (loaded) {
       return new Future.value(this);
     }
     // Call reload which will fill in the entire object.
     return reload();
   }
 
   Future<ServiceObject> _inProgressReload;
 
+  Future<ObservableMap> _fetchDirect() {
+    Map params = {
+      'objectId': id,
+    };
+    return isolate.invokeRpcNoUpgrade('getObject', params);
+  }
+
   /// Reload [this]. Returns a future which completes to [this] or
   /// a [ServiceError].
   Future<ServiceObject> reload() {
     if (id == '') {
       // Errors don't have ids.
       assert(type == 'Error');
       return new Future.value(this);
     }
     if (loaded && immutable) {
       return new Future.value(this);
     }
     if (_inProgressReload == null) {
-      _inProgressReload = vm.getAsMap(link).then((ObservableMap map) {
+      _inProgressReload = _fetchDirect().then((ObservableMap map) {
           var mapType = _stripRef(map['type']);
           if (mapType != _type) {
             // If the type changes, return a new object instead of
             // updating the existing one.
             //
             // TODO(turnidge): Check for vmType changing as well?
             assert(mapType == 'Error' || mapType == 'Sentinel');
             return new ServiceObject._fromMap(owner, map);
           }
           update(map);
@@ skipping 345 matching lines @@
     // through the JsonRpc interface, we will need to start checking the
     // cache before making the request here.  For now, we just make the
     // request without bothering with the cache.
     return invokeRpcNoUpgrade(method, params).then((ObservableMap response) {
         var obj = new ServiceObject._fromMap(this, response);
         // TODO(turnidge): Put the object into the cache if we can.
         return obj;
     });
   }
 
+  Future<ObservableMap> _fetchDirect() {
+    return invokeRpcNoUpgrade('getVM', {});
+  }
+
   /// Force the VM to disconnect.
   void disconnect();
   /// Completes when the VM first connects.
   Future get onConnect;
   /// Completes when the VM disconnects or there was an error connecting.
   Future get onDisconnect;
 
   void _update(ObservableMap map, bool mapIsRef) {
     if (mapIsRef) {
       return;
@@ skipping 300 matching lines @@
       }
       return obj;
     });
   }
 
   Future<ObservableMap> invokeRpcNoUpgrade(String method, Map params) {
     params['isolate'] = id;
     return vm.invokeRpcNoUpgrade(method, params);
   }
 
-
   Future<ServiceObject> invokeRpc(String method, Map params) {
     return invokeRpcNoUpgrade(method, params).then((ObservableMap response) {
       // TODO - needs to cache!!! move to constructor?
       return new ServiceObject._fromMap(this, response);
     });
   }
 
+  Future<ObservableMap> _fetchDirect() {
+    return invokeRpcNoUpgrade('getIsolate', {});
+  }
+
   @observable Class objectClass;
   @observable final rootClasses = new ObservableList<Class>();
 
   @observable Library rootLib;
   @observable ObservableList<Library> libraries =
       new ObservableList<Library>();
   @observable ObservableMap topFrame;
 
   @observable String name;
   @observable String vmName;
@@ skipping 1860 matching lines @@
 
   final ObservableList<MetricSample> samples =
       new ObservableList<MetricSample>();
   int _sampleBufferSize = 100;
   int get sampleBufferSize => _sampleBufferSize;
   set sampleBufferSize(int size) {
     _sampleBufferSize = size;
     _removeOld();
   }
 
+  Future<ObservableMap> _fetchDirect() {
+    // TODO(johnmmccutchan): Make this use json rpc.
+    return vm.getAsMap(link);
+  }
+
+
   void addSample(MetricSample sample) {
     samples.add(sample);
     _removeOld();
   }
 
   void _removeOld() {
     // TODO(johnmccutchan): If this becomes hot, consider using a circular
     // buffer.
     if (samples.length > _sampleBufferSize) {
       int count = samples.length - _sampleBufferSize;
@@ skipping 101 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }