Allow additional headers for WebSocket connect

tests/standalone/io/web_socket_test.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.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 import "dart:async";
@@ skipping 414 matching lines @@
 
       WebSocket.connect(url).then((websocket) {
         return websocket.listen((message) {
           Expect.equals("Hello", message);
           websocket.close();
         }).asFuture();
       }).then((_) => server.close());
     });
   }
 
+  void testOnRequest(bool useFuture) {
+    createServer().then((server) {
+      server.listen((request) {
+        Expect.isTrue(WebSocketTransformer.isUpgradeRequest(request));
+        Expect.equals(request.headers['My-Header'][0], 'my-value');
+        WebSocketTransformer.upgrade(request).then((webSocket) {
+          webSocket.listen((_) { webSocket.close(); });
+          webSocket.add("Hello");
+        });
+      });
+
+      onRequest(request) {
+        request.headers.set('My-Header', 'my-value');
+        return useFuture ? new Future.value() : null;

[Lasse Reichstein Nielsen, 2015/01/12 15:11:56]

Consider actually delaying some action to just before the future completes,
e.g., use the future:

  new Future.delayed(ms100).then((_) {
    request.headers.set('My-Header', 'my-value');
  })

[Søren Gjesse, 2015/01/12 15:36:34]

Removed the use of a callback.

+      }
+
+      var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
+
+      WebSocket.connect(url, onRequest: onRequest).then((websocket) {
+        return websocket.listen((message) {
+          Expect.equals("Hello", message);
+          websocket.close();
+        }).asFuture();
+      }).then((_) => server.close());
+    });
+  }

[kustermann, 2015/01/09 14:45:12]

[Since this file already imports async_helper, you could use it for making sure
the callbacks get all called]

[Søren Gjesse, 2015/01/12 15:36:34]

Done.

+
+
   void runTests() {
     testRequestResponseClientCloses(2, null, null, 1);
     testRequestResponseClientCloses(2, 3001, null, 2);
     testRequestResponseClientCloses(2, 3002, "Got tired", 3);
     testRequestResponseServerCloses(2, null, null);
     testRequestResponseServerCloses(2, 3001, null);
     testRequestResponseServerCloses(2, 3002, "Got tired");
     testMessageLength(125);
     testMessageLength(126);
     testMessageLength(127);
     testMessageLength(65535);
     testMessageLength(65536);
     testDoubleCloseClient();
     testDoubleCloseServer();
     testImmediateCloseServer();
     testImmediateCloseClient();
     testNoUpgrade();
     testUsePOST();
     testConnections(10, 3002, "Got tired");
     testIndividualUpgrade(5);
     testFromUpgradedSocket();
+    testOnRequest(true);
+    testOnRequest(false);
   }
 }
 
 
 void initializeSSL() {
   var testPkcertDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: testPkcertDatabase,
                           password: "dartdart");
 }
 
 
 main() {
   new SecurityConfiguration(secure: false).runTests();
   initializeSSL();
   new SecurityConfiguration(secure: true).runTests();
 }