Improve VM connection flow in Observatory

runtime/observatory/lib/src/elements/vm_connect.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 vm_connect_element;
 
 import 'dart:html';
 import 'dart:async';
 import 'dart:convert';
 import 'package:observatory/models.dart' as M;
+import 'package:observatory/app.dart';
 import 'package:observatory/src/elements/helpers/tag.dart';
 import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 import 'package:observatory/src/elements/helpers/nav_bar.dart';
 import 'package:observatory/src/elements/nav/notify.dart';
 import 'package:observatory/src/elements/nav/top_menu.dart';
 import 'package:observatory/src/elements/view_footer.dart';
 import 'package:observatory/src/elements/vm_connect_target.dart';
 
 typedef void CrashDumpLoadCallback(Map dump);
 
@@ skipping 65 matching lines @@
           new DivElement()
             ..classes = ['flex-row']
             ..children = [
               new DivElement()
                 ..classes = ['flex-item-40-percent']
                 ..children = [
                   new HeadingElement.h2()..text = 'WebSocket',
                   new BRElement(),
                   new UListElement()
                     ..children = _targets.list().map((target) {
+                      final ObservatoryApplication app =
+                          ObservatoryApplication.app;
+                      final bool current = app.isConnectedVMTarget(target);
                       return new LIElement()
                         ..children = [new VMConnectTargetElement(target,
-                          current: target == _targets.current, queue: _r.queue)
+                          current: current, queue: _r.queue)
                           ..onConnect.listen(_connect)
                           ..onDelete.listen(_delete)
                         ];
                       }).toList(),
                   new HRElement(),
                   new FormElement()
                     ..autocomplete = 'on'
                     ..children = [
                       _createAddressBox(),
                       new SpanElement()..text = ' ',
@@ skipping 54 matching lines @@
         var crashDump = JSON.decode(reader.result);
         _loadDump(crashDump);
       });
     });
     return e;
   }
   void _create() {
     if (_address == null || _address.isEmpty) return;
     _targets.add(_normalizeStandaloneAddress(_address));
   }
-  void _connect(TargetEvent e) => _targets.setCurrent(e.target);
+  void _connect(TargetEvent e) {
+    _targets.setCurrent(e.target);
+  }
   void _delete(TargetEvent e) => _targets.delete(e.target);
 
   static String _normalizeStandaloneAddress(String networkAddress) {
-    if (networkAddress.startsWith('ws://')) {
+    if (!networkAddress.startsWith('http') && !networkAddress.startsWith('ws')) {
+      networkAddress = 'http://$networkAddress';
+    }
+    try {
+      Uri uri = Uri.parse(networkAddress);
+      print('returning ${uri.host} ${uri.port}');
+      return 'ws://${uri.host}:${uri.port}/ws';
+    } catch (e) {
+      print('caught exception with: $networkAddress -- $e');
       return networkAddress;
     }
-    return 'ws://${networkAddress}/ws';
   }
 }