Split analysis server's HttpAnalysisServer into two classes.

pkg/analysis_server/lib/http_server.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 http.server;
 
 import 'dart:io';
 
-import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel.dart';
-import 'package:analysis_server/src/domain_context.dart';
-import 'package:analysis_server/src/domain_server.dart';
 import 'package:analysis_server/src/get_handler.dart';
-import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_server/src/socket_server.dart';
 import 'package:args/args.dart';
 
 /**
  * Instances of the class [HttpServer] implement a simple HTTP server. The
  * primary responsibility of this server is to listen for an UPGRADE request and
  * to start an analysis server.
  */
 class HttpAnalysisServer {
   /**
    * The name of the application that is used to start a server.
    */
   static const BINARY_NAME = 'server';
 
   /**
    * The name of the option used to print usage information.
    */
   static const String HELP_OPTION = "help";
 
   /**
    * The name of the option used to specify the port to which the server will
    * connect.
    */
   static const String PORT_OPTION = "port";
 
   /**
-   * The analysis server that was created when an UPGRADE request was received,
-   * or `null` if no such request has yet been received.
+   * An object that can handle either a WebSocket connection or a connection
+   * to the client over stdio.
    */
-  AnalysisServer analysisServer;
+  SocketServer socketServer = new SocketServer();
 
   /**
    * An object that can handle GET requests.
    */
   GetHandler getHandler;
 
   /**
    * Initialize a newly created HTTP server.
    */
   HttpAnalysisServer();
@@ skipping 54 matching lines @@
         _returnUnknownRequest(request);
       }
     });
   }
 
   /**
    * Handle a GET request received by the HTTP server.
    */
   void _handleGetRequest(HttpRequest request) {
     if (getHandler == null) {
-      getHandler = new GetHandler();
-      getHandler.server = analysisServer;
+      getHandler = new GetHandler(socketServer);
     }
     getHandler.handleGetRequest(request);
   }
 
   /**
    * Handle an UPGRADE request received by the HTTP server by creating and
    * running an analysis server on a [WebSocket]-based communication channel.
    */
   void _handleWebSocket(WebSocket socket) {
-    ServerCommunicationChannel serverChannel = new WebSocketServerChannel(socket);
-    if (analysisServer != null) {
-      // TODO(paulberry): add a message to the protocol so that the server can
-      // inform the client of a successful connection.
-      var error = new RequestError.serverAlreadyStarted();
-      serverChannel.sendResponse(new Response('', error));
-      serverChannel.listen((Request request) {
-        serverChannel.sendResponse(new Response(request.id, error));
-      });
-      return;
-    }
-    analysisServer = new AnalysisServer(new WebSocketServerChannel(socket));
-    _initializeHandlers(analysisServer);
-    if (getHandler != null) {
-      getHandler.server = analysisServer;
-    }
-    analysisServer.run();
+    socketServer.createAnalysisServer(new WebSocketServerChannel(socket));
   }
 
   /**
-   * Initialize the handlers to be used by the given [server].
-   */
-  void _initializeHandlers(AnalysisServer server) {
-    server.handlers = [
-        new ServerDomainHandler(server),
-        new ContextDomainHandler(server),
-    ];
-  }
-
-  /**
    * Print information about how to use the server.
    */
   void _printUsage(ArgParser parser) {
     print('Usage: $BINARY_NAME [flags]');
     print('');
     print('Supported flags are:');
     print(parser.getUsage());
   }
 
   /**
    * Return an error in response to an unrecognized request received by the HTTP
    * server.
    */
   void _returnUnknownRequest(HttpRequest request) {
     HttpResponse response = request.response;
     response.statusCode = HttpStatus.NOT_FOUND;
     response.headers.add(HttpHeaders.CONTENT_TYPE, "text/plain");
     response.write('Not found');
     response.close();
   }
 }