Forward protocols parameter to WebSocket (flutter#74)

Fixes #34
rhencke · Aug 8, 2019 · 82692f9 · 82692f9
1 parent 5f5ca1a
commit 82692f9
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.15
+
+* bug fix don't pass protocols parameter to WebSocket.
+
 ## 1.0.14
 
 * Updates to handle `Socket implements Stream<Uint8List>`

diff --git a/lib/io.dart b/lib/io.dart
@@ -54,8 +54,9 @@ class IOWebSocketChannel extends StreamChannelMixin
       Duration pingInterval}) {
     var channel;
     var sinkCompleter = WebSocketSinkCompleter();
-    var stream = StreamCompleter.fromFuture(
-        WebSocket.connect(url.toString(), headers: headers).then((webSocket) {
+    var stream = StreamCompleter.fromFuture(WebSocket.connect(url.toString(),
+            headers: headers, protocols: protocols)
+        .then((webSocket) {
       webSocket.pingInterval = pingInterval;
       channel._webSocket = webSocket;
       sinkCompleter.setDestinationSink(_IOWebSocketSink(webSocket));

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: web_socket_channel
-version: 1.0.14
+version: 1.0.15
 
 description: >-
   StreamChannel wrappers for WebSockets. Provides a cross-platform

diff --git a/test/io_test.dart b/test/io_test.dart
@@ -97,4 +97,39 @@ void main() {
     expect(channel.stream.toList(),
         throwsA(TypeMatcher<WebSocketChannelException>()));
   });
+
+  test(".protocols fail", () async {
+    var passedProtocol = 'passed-protocol';
+    var failedProtocol = 'failed-protocol';
+    var selector = (List<String> receivedProtocols) => passedProtocol;
+
+    server = await HttpServer.bind('localhost', 0);
+    server.listen((request) {
+      expect(WebSocketTransformer.upgrade(request, protocolSelector: selector),
+          throwsException);
+    });
+
+    var channel = IOWebSocketChannel.connect("ws://localhost:${server.port}",
+        protocols: [failedProtocol]);
+    expect(channel.stream.toList(),
+        throwsA(TypeMatcher<WebSocketChannelException>()));
+  });
+
+  test(".protocols pass", () async {
+    var passedProtocol = 'passed-protocol';
+    var selector = (List<String> receivedProtocols) => passedProtocol;
+
+    server = await HttpServer.bind('localhost', 0);
+    server.listen((request) async {
+      var webSocket = await WebSocketTransformer.upgrade(request,
+          protocolSelector: selector);
+      expect(webSocket.protocol, passedProtocol);
+      await webSocket.close();
+    });
+
+    var channel = IOWebSocketChannel.connect("ws://localhost:${server.port}",
+        protocols: [passedProtocol]);
+    await channel.stream.listen(null).asFuture();
+    expect(channel.protocol, passedProtocol);
+  });
 }