update client to use channel rather than socket

pkg/analysis_server/lib/src/analysis_manager.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.
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:analysis_server/src/channel.dart';
 import 'package:analysis_server/src/domain_server.dart';
 import 'package:analysis_server/src/protocol.dart';
 
 /**
  * [AnalysisManager] is used to launch and manage an analysis server
  * running in a separate process using either the [start] or [connect] methods.
  */
 class AnalysisManager {
   // TODO dynamically allocate port and/or allow client to specify port
   static const int PORT = 3333;
 
   /**
    * The analysis server process being managed
    * or `null` if managing an analysis server that was already running.
    */
   Process process;
 
   /**
-   * The socket used to communicate with the analysis server.
+   * The channel used to communicate with the analysis server.
    */
-  WebSocket socket;
+  CommunicationChannel channel;
 
   /**
    * Launch analysis server in a separate process
    * and return a future with a manager for that analysis server.
    */
   static Future<AnalysisManager> start(String serverPath) {
     return new AnalysisManager()._launchServer(serverPath);
   }
 
   /**
@@ skipping 53 matching lines @@
       exitCode = 1;
       if (process != null) {
         process.kill();
       }
       throw 'Failed to connect to analysis server at $serverUrl\n  $error';
     };
     try {
       return WebSocket.connect(serverUrl)
           .catchError(onError)
           .then((WebSocket socket) {
-            this.socket = socket;
+            this.channel = new WebSocketChannel(socket);
             return this;
           });
     } catch (error) {
       onError(error);
     }
   }
 
   /**
    * Stop the analysis server.
    *
    * Returns `true` if the signal is successfully sent and process terminates.
    * Otherwise there was no attached process or the signal could not be sent,
    * usually meaning that the process is already dead.
    */
   Future<bool> stop() {
     if (process == null) {
       return new Future.value(false);
     }
-    var shutdownRequest = {
-        Request.ID : '0',
-        Request.METHOD : ServerDomainHandler.SHUTDOWN_METHOD };
-    socket.add(JSON.encoder.convert(shutdownRequest));
+    var request = new Request('0', ServerDomainHandler.SHUTDOWN_METHOD);
+    channel.sendRequest(request);
     return process.exitCode
         .timeout(new Duration(seconds: 10))
         .catchError((error) {
           process.kill();
           throw 'Expected server to shutdown';
         })
         .then((result) {
           if (result != 0) {
             exitCode = result;
           }
           return true;
         });
   }
 
 }