Make WebSocket.fromSocket public.

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";
 import "dart:io";
 import "dart:typed_data";
 
 import "package:async_helper/async_helper.dart";
+import "package:crypto/crypto.dart";
 import "package:expect/expect.dart";
 import "package:path/path.dart";
 
+const WEB_SOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+
 const String CERT_NAME = 'localhost_cert';
 const String HOST_NAME = 'localhost';
 
 /**
  * A SecurityConfiguration lets us run the tests over HTTP or HTTPS.
  */
 class SecurityConfiguration {
   final bool secure;
 
   SecurityConfiguration({bool this.secure});
@@ skipping 348 matching lines @@
                }));
       }
 
       Future.wait(futures).then((_) {
         server.close();
         client.close();
       });
     });
   }
 
+  testFromSocket() {
+    createServer().then((server) {
+      server.listen((request) {
+        Expect.equals('Upgrade', request.headers.value(HttpHeaders.CONNECTION));
+        Expect.equals('websocket', request.headers.value(HttpHeaders.UPGRADE));
+
+        var key = request.headers.value('Sec-WebSocket-Key');
+        var sha1 = new SHA1()..add("$key$WEB_SOCKET_GUID".codeUnits);
+        var accept = CryptoUtils.bytesToBase64(sha1.close());
+        request.response
+            ..statusCode = HttpStatus.SWITCHING_PROTOCOLS
+            ..headers.add(HttpHeaders.CONNECTION, "Upgrade")
+            ..headers.add(HttpHeaders.UPGRADE, "websocket")
+            ..headers.add("Sec-WebSocket-Accept", accept);
+        request.response.contentLength = 0;
+        return request.response.detachSocket()

[kustermann, 2014/04/29 20:36:50]

The 'return' here has no effect right?

[nweiz, 2014/04/30 22:33:27]

Removed.

+            .then((socket) => new WebSocket.fromUpgradedSocket(socket))
+            .then((websocket) {
+          websocket.add("Hello");
+          websocket.close();
+        });
+      });
+
+      var url = '${secure ? "wss" : "ws"}://$HOST_NAME:${server.port}/';
+
+      var client = new HttpClient();
+      var completer = new Completer();

[kustermann, 2014/04/29 20:36:50]

[client] and [completer] seem to be unused.

[nweiz, 2014/04/30 22:33:27]

Removed.

+      WebSocket.connect(url).then((websocket) {
+        return websocket.listen((message) {
+          Expect.equals("Hello", message);
+          websocket.close();
+        }).asFuture();
+      }).then((_) => server.close());
+    });
+  }
+
   void runTests() {
     testRequestResponseClientCloses(2, null, null);
     testRequestResponseClientCloses(2, 3001, null);
     testRequestResponseClientCloses(2, 3002, "Got tired");
     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);
+    testFromSocket();
   }
 }
 
 
 void initializeSSL() {
   var testPkcertDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: testPkcertDatabase,
                           password: "dartdart");
 }
 
 
 main() {
   asyncStart();
   new SecurityConfiguration(secure: false).runTests();
   initializeSSL();
   new SecurityConfiguration(secure: true).runTests();
   asyncEnd();
 }