Merge pull request NavidK0#37 from Sewdn/master

Author: Navid Kabir

Runtime/SimpleGraphQL/GraphQLClient.cs

@@ -112,6 +112,19 @@ public void RegisterListener(Action<string> listener)
             HttpUtils.SubscriptionDataReceived += listener;
         }
 
+        public void RegisterListener(string id, Action<string> listener)
+        {
+            if(!HttpUtils.SubscriptionDataReceivedPerChannel.ContainsKey(id)) {
+              HttpUtils.SubscriptionDataReceivedPerChannel[id] = null;
+            }
+            HttpUtils.SubscriptionDataReceivedPerChannel[id] += listener;
+        }
+
+        public void RegisterListener(Request request, Action<string> listener)
+        {
+            RegisterListener(request.Query.ToMurmur2Hash().ToString(), listener);
+        }
+
         /// <summary>
         /// Unregisters a listener for subscriptions.
         /// </summary>
@@ -121,6 +134,18 @@ public void UnregisterListener(Action<string> listener)
             HttpUtils.SubscriptionDataReceived -= listener;
         }
 
+        public void UnregisterListener(string id, Action<string> listener)
+        {
+            if(HttpUtils.SubscriptionDataReceivedPerChannel.ContainsKey(id)) {
+              HttpUtils.SubscriptionDataReceivedPerChannel[id] -= listener;
+            }
+        }
+
+        public void UnregisterListener(Request request, Action<string> listener)
+        {
+            UnregisterListener(request.Query.ToMurmur2Hash().ToString(), listener);
+        }
+
         /// <summary>
         /// Subscribe to a query in GraphQL.
         /// </summary>

Runtime/SimpleGraphQL/HttpUtils.cs

@@ -21,12 +21,14 @@ public static class HttpUtils
         /// Called when the websocket receives subscription data.
         /// </summary>
         public static event Action<string> SubscriptionDataReceived;
+        public static Dictionary<string, Action<string>> SubscriptionDataReceivedPerChannel;
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         public static void PreInit()
         {
             _webSocket?.Dispose();
             SubscriptionDataReceived = null;
+            SubscriptionDataReceivedPerChannel = new Dictionary<string, Action<string>>();
         }
 
         /// <summary>
@@ -138,10 +140,23 @@ public static async Task WebSocketConnect(
             _webSocket = new ClientWebSocket();
             _webSocket.Options.AddSubProtocol(protocol);
 
-            if (authToken != null)
-                _webSocket.Options.SetRequestHeader("Authorization", $"{authScheme} {authToken}");
+            var payload = new Dictionary<string, string>();
+
+            if(protocol == "graphql-transport-ws") {
+              payload["content-type"] = "application/json";
+            } else {
+              _webSocket.Options.SetRequestHeader("Content-Type", "application/json");
+            }
+
+            if (authToken != null) {
+                if(protocol == "graphql-transport-ws") {
+                    // set Authorization as payload
+                    payload["Authorization"] = $"{authScheme} {authToken}";
+                } else {
+                    _webSocket.Options.SetRequestHeader("Authorization", $"{authScheme} {authToken}");
+                }
+            }
 
-            _webSocket.Options.SetRequestHeader("Content-Type", "application/json");
 
             if (headers != null)
             {
@@ -156,12 +171,23 @@ public static async Task WebSocketConnect(
                 Debug.Log("Websocket is connecting");
                 await _webSocket.ConnectAsync(uri, CancellationToken.None);
 
+                var json = JsonConvert.SerializeObject(
+                    new
+                    {
+                        type = "connection_init",
+                        payload = payload
+                    },
+                    Formatting.None,
+                    new JsonSerializerSettings
+                    {
+                        NullValueHandling = NullValueHandling.Ignore
+                    }
+                );
+
                 Debug.Log("Websocket is starting");
                 // Initialize the socket at the server side
                 await _webSocket.SendAsync(
-                    new ArraySegment<byte>(
-                        Encoding.UTF8.GetBytes(@"{""type"":""connection_init"",""payload"": {}}")
-                    ),
+                    new ArraySegment<byte>(Encoding.UTF8.GetBytes(json)),
                     WebSocketMessageType.Text,
                     true,
                     CancellationToken.None
@@ -210,7 +236,7 @@ public static async Task<bool> WebSocketSubscribe(string id, Request request)
                 new
                 {
                     id,
-                    type = "start",
+                    type = _webSocket.SubProtocol == "graphql-transport-ws" ? "subscribe" : "start",
                     payload = new
                     {
                         query = request.Query,
@@ -248,8 +274,10 @@ public static async Task WebSocketUnsubscribe(string id)
                 return;
             }
 
+            var type = _webSocket.SubProtocol == "graphql-transport-ws" ? "complete" : "stop";
+
             await _webSocket.SendAsync(
-                new ArraySegment<byte>(Encoding.UTF8.GetBytes($@"{{""type"":""stop"",""id"":""{id}""}}")),
+                new ArraySegment<byte>(Encoding.UTF8.GetBytes($@"{{""type"":""{type}"",""id"":""{id}""}}")),
                 WebSocketMessageType.Text,
                 true,
                 CancellationToken.None
@@ -292,6 +320,7 @@ private static async void WebSocketUpdate()
                 }
 
                 var msgType = (string)jsonObj["type"];
+                var id = (string)jsonObj["id"];
                 switch (msgType)
                 {
                     case "connection_error":
@@ -300,7 +329,7 @@ private static async void WebSocketUpdate()
                     }
                     case "connection_ack":
                     {
-                        Debug.Log("Websocket connection acknowledged.");
+                        Debug.Log($"Websocket connection acknowledged ({id}).");
                         continue;
                     }
                     case "data":
@@ -311,6 +340,7 @@ private static async void WebSocketUpdate()
                         if (jToken != null)
                         {
                             SubscriptionDataReceived?.Invoke(jToken.ToString());
+                            SubscriptionDataReceivedPerChannel?[id]?.Invoke(jToken.ToString());
                         }
 
                         continue;
@@ -349,4 +379,4 @@ await _webSocket.SendAsync(
             }
         }
     }
-}
+}