Merge pull request #189 from huang12zheng/master

fix #186 #188

Author: agent3bood

links/gql_websocket_link/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.7
+
+- fix #188, Determine the boundary if `channelGenerator` is null and uri is not null
+- Update the dependent package rxdart to ^0.25.0
+
 ## 0.1.6
 
 - Delay requests until connect is done

links/gql_websocket_link/lib/src/link.dart

@@ -95,9 +95,12 @@ class WebSocketLink extends Link {
     this.initialPayload,
     this.inactivityTimeout,
   }) : assert(uri == null || (channel == null && channelGenerator == null)) {
-    _uri = uri;
-    _channelGenerator = channelGenerator;
-    _channel = channel ?? _channelGenerator();
+    if (uri != null) {
+      _uri = uri;
+    } else {
+      _channelGenerator = channelGenerator;
+      _channel = channel ?? _channelGenerator();
+    }
     _connectionStateController.value = closed;
   }
 

links/gql_websocket_link/pubspec.yaml

@@ -1,5 +1,5 @@
 name: gql_websocket_link
-version: 0.1.6
+version: 0.1.7
 description: GQL Websocket Link
 repository: https://github.com/gql-dart/gql
 environment: 
@@ -9,7 +9,7 @@ dependencies:
   gql_exec: ^0.2.5
   gql_link: ^0.3.1
   meta: ^1.1.8
-  rxdart: ^0.24.0
+  rxdart: ^0.25.0
   uuid_enhanced: ^3.0.2
   web_socket_channel: ^1.1.0
 dev_dependencies: 

links/gql_websocket_link/test/gql_websocket_link_test.dart

@@ -12,6 +12,13 @@ void main() {
   group(
     "WebSocketLink",
     () {
+      test("WebSocketLink Construction with uri isn't null", () {
+        final wsLink = WebSocketLink(
+          "",
+          initialPayload: {"authorization": "Bearer 12345"},
+        );
+      });
+
       test(
         "send connection_init",
         () async {