Fix isolate lifecycle handling in service library

runtime/observatory/lib/service_common.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.
 
 library service_common;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
@@ skipping 143 matching lines @@
     _notifyDisconnect();
   }
 
   // WebSocket open event handler.
   void _onOpen() {
     target.lastConnectionTime = new DateTime.now().millisecondsSinceEpoch;
     _sendAllDelayedRequests();
     _notifyConnect();
   }
 
-  // WebSocket message event handler.
-  void _onMessage(dynamic data) {
-    if (data is! String) {
-      _webSocket.nonStringToByteData(data).then((ByteData bytes) {
-        // See format spec. in VMs Service::SendEvent.
-        int offset = 0;
-        // Dart2JS workaround (no getUint64). Limit to 4 GB metadata.
-        assert(bytes.getUint32(offset, Endianness.BIG_ENDIAN) == 0);
-        int metaSize = bytes.getUint32(offset + 4, Endianness.BIG_ENDIAN);
-        offset += 8;
-        var meta = _utf8Decoder.convert(new Uint8List.view(
-            bytes.buffer, bytes.offsetInBytes + offset, metaSize));
-        offset += metaSize;
-        var data = new ByteData.view(
-            bytes.buffer,
-            bytes.offsetInBytes + offset,
-            bytes.lengthInBytes - offset);
-        postEventMessage(meta, data);
-      });
-      return;
-    }
+  void _onBinaryMessage(dynamic data) {
+    _webSocket.nonStringToByteData(data).then((ByteData bytes) {
+      // See format spec. in VMs Service::SendEvent.
+      int offset = 0;
+      // Dart2JS workaround (no getUint64). Limit to 4 GB metadata.
+      assert(bytes.getUint32(offset, Endianness.BIG_ENDIAN) == 0);
+      int metaSize = bytes.getUint32(offset + 4, Endianness.BIG_ENDIAN);
+      offset += 8;
+      var meta = _utf8Decoder.convert(new Uint8List.view(
+          bytes.buffer, bytes.offsetInBytes + offset, metaSize));
+      offset += metaSize;
+      var data = new ByteData.view(
+          bytes.buffer,
+          bytes.offsetInBytes + offset,
+          bytes.lengthInBytes - offset);
+      postServiceEvent(meta, data);
+    });
+  }
+
+  void _onStringMessage(String data) {
     var map = JSON.decode(data);
     if (map == null) {
       Logger.root.severe('WebSocketVM got empty message');
       return;
     }
     // Extract serial and response.
     var serial;
     var response;
-    if (target.chrome) {
-      if (map['method'] != 'Dart.observatoryData') {
-        // ignore devtools protocol spam.
-        return;
-      }
-      serial = map['params']['id'].toString();
-      response = map['params']['data'];
-    } else {
-      serial = map['id'];
-      response = map['response'];
-    }
+    serial = map['id'];
+    response = map['response'];
     if (serial == null) {
-      // Messages without sequence numbers are asynchronous events
+      // Messages without serial numbers are asynchronous events
       // from the vm.
-      postEventMessage(response);
+      postServiceEvent(response, null);
       return;
     }
     // Complete request.
     var request = _pendingRequests.remove(serial);
     if (request == null) {
       Logger.root.severe('Received unexpected message: ${map}');
       return;
     }
     request.completer.complete(response);
   }
 
+  // WebSocket message event handler.
+  void _onMessage(dynamic data) {
+    if (data is! String) {
+      _onBinaryMessage(data);
+    } else {
+      _onStringMessage(data);
+    }
+  }
+
   String _generateNetworkError(String userMessage) {
     return JSON.encode({
       'type': 'ServiceException',
       'id': '',
       'kind': 'NetworkException',
       'message': userMessage
     });
   }
 
   void _cancelRequests(Map<String, _WebSocketRequest> requests) {
@@ skipping 53 matching lines @@
       });
     } else {
       message = JSON.encode({'id': serial,
                              'method': request.method,
                              'params': request.params});
     }
     // Send message.
     _webSocket.send(message);
   }
 }