Refactor Observatory

runtime/bin/vmservice/client/lib/src/observatory/vm.dart

Index: runtime/bin/vmservice/client/lib/src/observatory/vm.dart
diff --git a/runtime/bin/vmservice/client/lib/src/observatory/vm.dart b/runtime/bin/vmservice/client/lib/src/observatory/vm.dart
new file mode 100644
index 0000000000000000000000000000000000000000..9e10728e86277017fc8810a86ac7f593cecbc399
--- /dev/null
+++ b/runtime/bin/vmservice/client/lib/src/observatory/vm.dart
@@ -0,0 +1,103 @@
+// 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 app;
+
+abstract class VM extends Observable {
+  @observable ObservatoryApplication get app => _app;
+  ObservatoryApplication _app;
+
+  Future<String> fetchString(String path);
+
+  Future<Map> fetchMap(String path) {

[turnidge, 2014/03/05 21:02:47]

Error checking?  Here or elsewhere?

[Cutch, 2014/03/05 21:54:23]

Done.

+    return fetchString(path).then((response) {
+      print(response);

[turnidge, 2014/03/05 21:02:47]

debug

[Cutch, 2014/03/05 21:54:23]

Done.

+      return toObservable(JSON.decode(response));
+    });
+  }
+
+  @observable final ObservableMap isolates = new ObservableMap();
+  Isolate getIsolate(String id) => isolates[id];

[turnidge, 2014/03/05 21:02:47]

Confirm that loading the stacktrace page directly (first page loaded) gets the
right isolate in the nav.

[Cutch, 2014/03/05 21:54:23]

Done.

+
+  static bool _foundIsolateInMembers(String id, List<Map> members) {
+    return members.any((E) => E['id'] == id);
+  }
+
+  void _updateIsolates(List<Map> members) {
+    // Find dead isolates.
+    var deadIsolates = [];
+    isolates.forEach((k, v) {
+      if (!_foundIsolateInMembers(k, members)) {
+        deadIsolates.add(k);
+      }
+    });
+    // Remove them.
+    deadIsolates.forEach((id) {
+      isolates.remove(id);
+    });
+    // Add new isolates.
+    members.forEach((map) {
+      var id = map['id'];
+      var isolate = isolates[id];
+      if (isolate == null) {
+        isolate = new Isolate.fromMap(this, map);
+        isolates[id] = isolate;
+      }
+      isolate.refresh();
+    });
+  }
+
+  void refreshIsolates() {
+    fetchMap('isolates').then((map) {
+      assert(map['type'] == 'IsolateList');
+      _updateIsolates(map['members']);
+      app.setResponse(map);
+    });
+  }
+}
+
+
+class HttpVM extends VM {
+  final String address;
+  HttpVM(this.address);
+
+  Future<String> fetchString(String path) {
+    Logger.root.info('Fetching $path from $address');
+    return HttpRequest.getString(address + path);
+  }
+}
+
+class DartiumVM extends VM {
+  final Map _outstandingRequests = new Map();
+  int _requestSerial = 0;
+  PostMessageRequestManager() {
+    window.onMessage.listen(_messageHandler);
+  }
+
+  void _messageHandler(msg) {
+    var id = msg.data['id'];
+    var name = msg.data['name'];
+    var data = msg.data['data'];
+    if (name != 'observatoryData') {
+      return;
+    }
+    var completer = _outstandingRequests[id];
+    assert(completer != null);
+    _outstandingRequests.remove(id);
+    completer.complete(data);
+  }
+
+  Future<String> fetchString(String path) {
+    var idString = '$_requestSerial';
+    Map message = {};
+    message['id'] = idString;
+    message['method'] = 'observatoryQuery';
+    message['query'] = path;
+    _requestSerial++;
+    var completer = new Completer();
+    _outstandingRequests[idString] = completer;
+    window.parent.postMessage(JSON.encode(message), '*');
+    return completer.future;
+  }
+}