Expanding WebSocket test

tools/testing/dart/http_server.dart

 // Copyright (c) 2013, 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:async';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:uri';
@@ skipping 114 matching lines @@
     for (var server in _serverList) {
       server.close();
     }
   }
 
   Future _startHttpServer(String host, {int port: 0, int allowedPort: -1}) {
     return HttpServer.bind(host, port).then((HttpServer httpServer) {
       httpServer.listen((HttpRequest request) {
         if (request.uri.path == "/echo") {
           _handleEchoRequest(request, request.response);
+        } else if (request.uri.path == '/ws') {

[kustermann, 2013/03/19 12:13:43]

Please add '/ws' to the description of the http server on line 19.

[blois, 2013/03/20 21:05:17]

Done.

+          _handleWebSocketRequest(request);
         } else {
           _handleFileOrDirectoryRequest(
               request, request.response, allowedPort);
         }
       },
       onError: (e) {
         DebugLogger.error('HttpServer: an error occured: $e');
       });
       _serverList.add(httpServer);
     });
@@ skipping 34 matching lines @@
   }
 
   void _handleEchoRequest(HttpRequest request, HttpResponse response) {
     response.headers.set("Access-Control-Allow-Origin", "*");
     request.pipe(response).catchError((e) {
       DebugLogger.warning(
           'HttpServer: error while closing the response stream: $e');
     });
   }
 
+  void _handleWebSocketRequest(HttpRequest request) {
+    WebSocketTransformer.upgrade(request).then((websocket) {

[Søren Gjesse, 2013/03/19 12:31:13]

There should be a catchError (with some print statement) on this upgrade
otherwise an uncaught error can cause the HTTP server to terminate during
testing.

[blois, 2013/03/20 21:05:17]

Done.

+      websocket.listen((data) {
+        websocket.send(data);
+        websocket.close();

[Søren Gjesse, 2013/03/19 12:31:13]

There should also be an onError handler here to avoid uncaught errors in the
HTTP server.

[blois, 2013/03/20 21:05:17]

Done.

+      });
+    });
+  }
+
   Path _getFilePathFromRequestPath(String urlRequestPath) {
     // Go to the top of the file to see an explanation of the URL path scheme.
     var requestPath = new Path(urlRequestPath.substring(1)).canonicalize();
     var pathSegments = requestPath.segments();
     if (pathSegments.length > 0) {
       var basePath;
       var relativePath;
       if (pathSegments[0] == PREFIX_BUILDDIR) {
         basePath = _buildDirectory;
         relativePath = new Path(
@@ skipping 143 matching lines @@
 class _Entry {
   final String name;
   final String displayName;
 
   _Entry(this.name, this.displayName);
 
   int compareTo(_Entry other) {
     return name.compareTo(other.name);
   }
 }