Port _echo, etc commands to 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].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 477 matching lines @@
 
   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, st) {
-      return null;
+    } catch (e) {
+      return toObservable({
+        'type': 'ServiceException',
+        'kind': 'JSONDecodeException',
+        'response': map,
+        'message': 'Could not decode JSON: $e',
+      });
     }
     return toObservable(map);
   }
 
   Future<ObservableMap> _processMap(ObservableMap map) {
     // Verify that the top level response is a service map.
     if (!_isServiceMap(map)) {
       return new Future.error(
             new ServiceObject._fromMap(this, toObservable({
         'type': 'ServiceException',
-        'id': '',
-        'kind': 'FormatException',
+        'kind': 'ResponseFormatException',
         'response': map,
         'message': 'Top level service responses must be service maps: ${map}.',
       })));
     }
     // 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);
   }
 
-  Future<ObservableMap> _decodeError(e) {
-    return new Future.error(new ServiceObject._fromMap(this, toObservable({
-      'type': 'ServiceException',
-      'id': '',
-      'kind': 'DecodeException',
-      'response':
-          'This is likely a result of a known V8 bug. Although the '
-          'the bug has been fixed the fix may not be in your Chrome'
-          ' version. For more information see dartbug.com/18385. '
-          'Observatory is still functioning and you should try your'
-          ' action again.',
-      'message': 'Could not decode JSON: $e',
-    })));
-  }
-
   /// 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);
       }
@@ skipping 2401 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);
     }
   }
 }