Introduced support for external services registration in the ServiceProtocol

runtime/bin/vmservice/server.dart

 // Copyright (c) 2013, 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 vmservice_io;
 
 final bool silentObservatory = const bool.fromEnvironment('SILENT_OBSERVATORY');
 
 void serverPrint(String s) {
   if (silentObservatory) {
@@ skipping 27 matching lines @@
       try {
         map = JSON.decode(message);
       } catch (e) {
         socket.close(PARSE_ERROR_CODE, 'Message parse error: $e');
         return;
       }
       if (map is! Map) {
         socket.close(NOT_MAP_ERROR_CODE, 'Message must be a JSON map.');
         return;
       }
-      var serial = map['id'];
-      if (serial != null && serial is! num && serial is! String) {
-        socket.close(ID_ERROR_CODE, '"id" must be a number, string, or null.');
+      try {
+        final rpc = new Message.fromJsonRpc(this, map);
+        switch (rpc.type) {
+          case MessageType.Request:
+            onRequest(rpc);
+            break;
+          case MessageType.Notification:
+            onNotification(rpc);
+            break;
+          case MessageType.Response:
+            onResponse(rpc);
+            break;
+        }
+      } catch (e) {
+        socket.close(ID_ERROR_CODE, e.message);
       }
-      onMessage(serial, new Message.fromJsonRpc(this, map));
     } else {
       socket.close(BINARY_MESSAGE_ERROR_CODE, 'Message must be a string.');
     }
   }
 
   void post(dynamic result) {
     if (result == null) {
       // Do nothing.
       return;
     }
     try {
       if (result is String || result is Uint8List) {
         socket.add(result); // String or binary message.
       } else {
         // String message as external Uint8List.
         assert(result is List);
         Uint8List cstring = result[0];
         socket.addUtf8Text(cstring);
       }
     } catch (e, st) {
       serverPrint("Ignoring error posting over WebSocket.");
-      serverPrint(e);
-      serverPrint(st);
+      serverPrint(e.toString());
+      serverPrint(st.toString());
     }
   }
 
   dynamic toJson() {
     Map map = super.toJson();
     map['type'] = 'WebSocketClient';
     map['socket'] = '$socket';
     return map;
   }
 }
@@ skipping 218 matching lines @@
     }
     Asset asset = assets[path];
     if (asset != null) {
       // Serving up a static asset (e.g. .css, .html, .png).
       request.response.headers.contentType = ContentType.parse(asset.mimeType);
       request.response.add(asset.data);
       request.response.close();
       return;
     }
     // HTTP based service request.
-    try {
-      var client = new HttpRequestClient(request, _service);
-      var message = new Message.fromUri(client, request.uri);
-      client.onMessage(null, message);
-    } catch (e) {
-      serverPrint('Unexpected error processing HTTP request uri: '
-          '${request.uri}\n$e\n');
-      rethrow;
-    }
+    final client = new HttpRequestClient(request, _service);
+    final message = new Message.fromUri(client, request.uri);
+    client.onRequest(message); // exception free, no need to try catch
   }
 
   Future startup() async {
     if (_server != null) {
       // Already running.
       return this;
     }
 
     // Startup HTTP server.
     var pollError;
@@ skipping 82 matching lines @@
       _server = null;
       serverPrint('Could not shutdown Observatory HTTP server:\n$e\n$st\n');
       _notifyServerState("");
       onServerAddressChange(null);
       return this;
     });
   }
 }
 
 void _notifyServerState(String uri) native "VMServiceIO_NotifyServerState";