Merge pull request #20 from DrMarcII/shelf_fix

Fix multiplexor to work with latest version of shelf.

.gitignore

@@ -12,3 +12,4 @@ pubspec.lock
 docs/
 build/
 .settings/
+.packages

lib/multiplex.dart

@@ -37,7 +37,8 @@ class Server {
           .add(_webSocket)
           .add(_mainPage)
           .add(_json)
-          .add(_forward).handler);
+          .add(_forward)
+          .handler);
 
   void _shelfLogger(String msg, bool isError) {
     if (isError) {
@@ -123,7 +124,7 @@ class Server {
     }
     _log.info('connecting to websocket: ${request.url}');
 
-    return ws.webSocketHandler((ws) async {
+    return ws.webSocketHandler((WebSocketChannel ws) async {
       var debugger = await _connections.putIfAbsent(path[2], () async {
         var tab = await chrome.getTab((tab) => tab.id == path[2]);
         return WipConnection.connect(tab.webSocketDebuggerUrl);
@@ -134,7 +135,8 @@ class Server {
           return new WipDomModel(debugger.dom);
         });
       }
-      var forwarder = new WipForwarder(debugger, ws, domModel: dom);
+      var forwarder =
+          new WipForwarder(debugger, ws.stream, sink: ws.sink, domModel: dom);
       debugger.onClose.listen((_) {
         _connections.remove(path[2]);
         _modelDoms.remove(path[2]);

pubspec.yaml

@@ -1,5 +1,5 @@
 name: webkit_inspection_protocol
-version: 0.1.2
+version: 0.2.0
 description: A client for the Webkit Inspection Protocol (WIP).
 
 homepage: https://github.com/google/webkit_inspection_protocol.dart
@@ -12,8 +12,8 @@ environment:
 dependencies:
   args: '^0.13.2'
   logging: '^0.11.1'
-  shelf: '^0.6.2'
-  shelf_web_socket: '^0.0.1+2'
+  shelf: '^0.6.5'
+  shelf_web_socket: '^0.1.0'
 dev_dependencies:
-  shelf_static: '^0.2.2'
-  test: '^0.12.3+5'
+  shelf_static: '^0.2.3'
+  test: '^0.12.3'