Finish moving service protocol to json rpc.

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].
+/// A [ServiceObject] represents a persistent object within the vm.
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
     return o1.name.compareTo(o2.name);
   }
 
   List removeDuplicatesAndSortLexical(List<ServiceObject> list) {
     return list.toSet().toList()..sort(LexicalSortName);
   }
 
   /// The owner of this [ServiceObject].  This can be an [Isolate], a
@@ skipping 64 matching lines @@
 
   // Kinds of Instance.
   bool get isMirrorReference => vmType == 'MirrorReference';
   bool get isWeakProperty => vmType == 'WeakProperty';
   bool get isClosure => false;
   bool get isPlainInstance {
     return (type == 'Instance' &&
             !isMirrorReference && !isWeakProperty && !isClosure);
   }
 
-  /// The complete service url of this object.
-  @reflectable String get link => _owner.relativeLink(_id);
-
   /// Has this object been fully loaded?
   bool get loaded => _loaded;
   bool _loaded = false;
   // TODO(turnidge): Make loaded observable and get rid of loading
   // from Isolate.
 
   /// Is this object cacheable?  That is, is it impossible for the [id]
   /// of this object to change?
   bool get canCache => false;
 
@@ skipping 169 matching lines @@
       _vmType = _stripRef(map['_vmType']);
     } else {
       _vmType = _type;
     }
 
     _update(map, mapIsRef);
   }
 
   // Updates internal state from [map]. [map] can be a reference.
   void _update(ObservableMap map, bool mapIsRef);
-
-  String relativeLink(String id) {
-    assert(id != null);
-    return "${link}/${id}";
-  }
 }
 
 abstract class Coverage {
   // Following getters and functions will be provided by [ServiceObject].
   ServiceObjectOwner get owner;
   String get type;
   VM get vm;
-  String relativeLink(String id);
 
   /// Default handler for coverage data.
   void processCoverageData(List coverageData) {
     coverageData.forEach((scriptCoverage) {
       assert(scriptCoverage['script'] != null);
       scriptCoverage['script']._processHits(scriptCoverage['hits']);
     });
   }
 
   Future refreshCoverage() {
@@ skipping 14 matching lines @@
 }
 
 abstract class ServiceObjectOwner extends ServiceObject {
   /// Creates an empty [ServiceObjectOwner].
   ServiceObjectOwner._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   /// Builds a [ServiceObject] corresponding to the [id] from [map].
   /// The result may come from the cache.  The result will not necessarily
   /// be [loaded].
   ServiceObject getFromMap(ObservableMap map);
-
-  /// Creates a link to [id] relative to [this].
-  String relativeLink(String id);
 }
 
 /// State for a VM being inspected.
 abstract class VM extends ServiceObjectOwner {
   @reflectable VM get vm => this;
   @reflectable Isolate get isolate => null;
 
   @reflectable Iterable<Isolate> get isolates => _isolateCache.values;
 
-  @reflectable String get link => '$id';
-  @reflectable String relativeLink(String id) => '$id';
-
   @observable String version = 'unknown';
   @observable String targetCPU;
   @observable int architectureBits;
   @observable double uptime = 0.0;
   @observable bool assertsEnabled = false;
   @observable bool typeChecksEnabled = false;
   @observable String pid = '';
   @observable DateTime lastUpdate;
 
   VM() : super._empty(null) {
@@ skipping 86 matching lines @@
     // Doesn't scale well.  Change this to be more fine-grained.
     return reload().then((result) {
         if (result is! VM) {
           return null;
         }
         assert(result == this);
         return _isolateCache[isolateId];
       });
   }
 
-  Future<ServiceObject> getDeprecated(String id) {
-    assert(id.startsWith('/') == false);
-    // Isolates are handled specially, since they can cache sub-objects.
-    if (id.startsWith(_isolatesPrefix)) {
-      String isolateId = _parseIsolateId(id);
-      String objectId = _parseObjectId(id);
-      return getIsolate(isolateId).then((isolate) {
-        if (isolate == null) {
-          // The isolate does not exist.  Return the VM object instead.
-          //
-          // TODO(turnidge): Generate a service error?
-          return this;
-        }
-        if (objectId == null) {
-          return isolate.reload();
-        } else {
-          return isolate.getDeprecated(objectId);
-        }
-      });
-    }
-
-    var obj = _cache[id];
-    if (obj != null) {
-      return obj.reload();
-    }
-
-    // Cache miss.  Get the object from the vm directly.
-    return _getAsMapDeprecated(id).then((ObservableMap map) {
-      var obj = new ServiceObject._fromMap(this, map);
-      if (obj.canCache) {
-        _cache.putIfAbsent(id, () => obj);
-      }
-      return obj;
-    });
-  }
-
   dynamic _reviver(dynamic key, dynamic value) {
     return value;
   }
 
   ObservableMap _parseJSON(String response) {
     var map;
     try {
       var decoder = new JsonDecoder(_reviver);
       map = decoder.convert(response);
     } catch (e) {
@@ skipping 21 matching lines @@
     // Preemptively capture ServiceError and ServiceExceptions.
     if (map['type'] == 'ServiceError') {
       return new Future.error(new ServiceObject._fromMap(this, map));
     } else if (map['type'] == 'ServiceException') {
       return new Future.error(new ServiceObject._fromMap(this, map));
     }
     // map is now guaranteed to be a non-error/exception ServiceObject.
     return new Future.value(map);
   }
 
-  /// Gets [id] as an [ObservableMap] from the service directly. If
-  /// an error occurs, the future is completed as an error with a
-  /// ServiceError or ServiceException. Therefore any chained then() calls
-  /// will only receive a map encoding a valid ServiceObject.
-  Future<ObservableMap> _getAsMapDeprecated(String id) {
-    return getStringDeprecated(id).then((response) {
-      var map = _parseJSON(response);
-      if (Tracer.current != null) {
-        Tracer.current.trace("Received response for ${id}", map:map);
-      }
-      return _processMap(map);
-    }).catchError((error) {
-      // ServiceError, forward to VM's ServiceError stream.
-      errors.add(error);
-      return new Future.error(error);
-    }, test: (e) => e is ServiceError).catchError((exception) {
-      // ServiceException, forward to VM's ServiceException stream.
-      exceptions.add(exception);
-      return new Future.error(exception);
-    }, test: (e) => e is ServiceException);
-  }
-
-  /// Get [id] as a [String] from the service directly. See [getAsMap].
-  Future<String> getStringDeprecated(String id);
-
   // Implemented in subclass.
   Future<String> invokeRpcRaw(String method, Map params);
 
   Future<ObservableMap> invokeRpcNoUpgrade(String method, Map params) {
     return invokeRpcRaw(method, params).then((String response) {
       var map = _parseJSON(response);
       if (Tracer.current != null) {
         Tracer.current.trace("Received response for ${method}/${params}}",
                              map:map);
       }
@@ skipping 20 matching lines @@
           _cache.putIfAbsent(id, () => obj);
         }
         return obj;
     });
   }
 
   Future<ObservableMap> _fetchDirect() {
     return invokeRpcNoUpgrade('getVM', {});
   }
 
+  Future<ServiceObject> getFlagList() {
+    return invokeRpc('getFlagList', {});
+  }
+
   /// 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 142 matching lines @@
 
   HeapSnapshot(this.isolate, ByteData data) :
       graph = new ObjectGraph(new ReadStream(data)),
       timeStamp = new DateTime.now() {
   }
 
   List<Future<ServiceObject>> getMostRetained({int classId, int limit}) {
     var result = [];
     for (var v in graph.getMostRetained(classId: classId, limit: limit)) {
       var address = v.addressForWordSize(isolate.vm.architectureBits ~/ 8);
-      result.add(isolate.getDeprecated(
-          'address/${address.toRadixString(16)}?ref=true').then((obj) {
+      result.add(isolate.getObjectByAddress(address.toRadixString(16)).then((obj) {
         obj.retainedSize = v.retainedSize;
         return new Future(() => obj);
       }));
     }
     return result;
   }
 
 
 }
 
 /// State for a running isolate.
 class Isolate extends ServiceObjectOwner with Coverage {
   @reflectable VM get vm => owner;
   @reflectable Isolate get isolate => this;
   @observable ObservableMap counters = new ObservableMap();
 
-  String get link => '/${_id}';
-
   @observable ServiceEvent pauseEvent = null;
   bool get _isPaused => pauseEvent != null;
 
   @observable bool running = false;
   @observable bool idle = false;
   @observable bool loading = true;
   @observable bool ioEnabled = false;
 
   Map<String,ServiceObject> _cache = new Map<String,ServiceObject>();
   final TagProfile tagProfile = new TagProfile(20);
 
   Isolate._empty(ServiceObjectOwner owner) : super._empty(owner) {
     assert(owner is VM);
   }
 
-  /// Creates a link to [id] relative to [this].
-  @reflectable String relativeLink(String id) => '/${this.id}/$id';
-
   static const TAG_ROOT_ID = 'code/tag-0';
 
   /// Returns the Code object for the root tag.
   Code tagRoot() {
     // TODO(turnidge): Use get() here instead?
     return _cache[TAG_ROOT_ID];
   }
 
   void processProfile(ServiceMap profile) {
     assert(profile.type == 'CpuProfile');
@@ skipping 78 matching lines @@
       return obj;
     }
     // Build the object from the map directly.
     obj = new ServiceObject._fromMap(this, map);
     if (obj != null && obj.canCache) {
       _cache[id] = obj;
     }
     return obj;
   }
 
-  Future<ServiceObject> getDeprecated(String id) {
-    // Do not allow null ids or empty ids.
-    assert(id != null && id != '');
-    var obj = _cache[id];
-    if (obj != null) {
-      return obj.reload();
-    }
-    // Cache miss.  Get the object from the vm directly.
-    return vm._getAsMapDeprecated(relativeLink(id)).then((ObservableMap map) {
-      var obj = new ServiceObject._fromMap(this, map);
-      if (obj.canCache) {
-        _cache.putIfAbsent(id, () => obj);
-      }
-      return obj;
-    });
-  }
-
   Future<ObservableMap> invokeRpcNoUpgrade(String method, Map params) {
-    params['isolate'] = id;
+    params['isolateId'] = id;
     return vm.invokeRpcNoUpgrade(method, params);
   }
 
   Future<ServiceObject> invokeRpc(String method, Map params) {
     return invokeRpcNoUpgrade(method, params).then((ObservableMap response) {
         var obj = new ServiceObject._fromMap(this, response);
         if (obj.canCache) {
           _cache.putIfAbsent(id, () => obj);
         }
         return obj;
@@ skipping 398 matching lines @@
   }
 
   Future<ServiceObject> getInstances(Class cls, var limit) {
     Map params = {
       'classId': cls.id,
       'limit': limit.toString(),
     };
     return invokeRpc('getInstances', params);
   }
 
+  Future<ServiceObject> getObjectByAddress(String address, [bool ref=true]) {
+    Map params = {
+      'address': address,
+      'ref': ref,
+    };
+    return invokeRpc('getObjectByAddress', params);
+  }
+
   final ObservableMap<String, ServiceMetric> dartMetrics =
       new ObservableMap<String, ServiceMetric>();
 
   final ObservableMap<String, ServiceMetric> nativeMetrics =
       new ObservableMap<String, ServiceMetric>();
 
   Future<ObservableMap<String, ServiceMetric>> _refreshMetrics(
       String metricType,
       ObservableMap<String, ServiceMetric> metricsMap) {
     return invokeRpc('getIsolateMetricList',
@@ skipping 1602 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);
     }
   }
 }