Merge remote-tracking branch 'origin/feature/add-serializer-option' into pc/epic-valorant-pivot-unity-upgrade

# Conflicts:
#	Runtime/SimpleGraphQL/GraphQLClient.cs
#	Runtime/SimpleGraphQL/HttpUtils.cs

Author: lucastatespace

Runtime/SimpleGraphQL/GraphQLClient.cs

@@ -51,6 +51,7 @@ public GraphQLClient(GraphQLConfig config)
         /// <returns></returns>
         public async Task<string> Send(
             Request request,
+            JsonSerializerSettings serializerSettings = null,
             Dictionary<string, string> headers = null,
             string authToken = null,
             string authScheme = null,
@@ -75,6 +76,7 @@ public async Task<string> Send(
             string postQueryAsync = await HttpUtils.PostRequest(
                 Endpoint,
                 request,
+                serializerSettings,
                 headers,
                 authToken,
                 authScheme,
@@ -86,25 +88,27 @@ public async Task<string> Send(
 
         public async Task<Response<TResponse>> Send<TResponse>(
             Request request,
+            JsonSerializerSettings serializerSettings = null,
             Dictionary<string, string> headers = null,
             string authToken = null,
             string authScheme = null,
             bool debug = false
         )
         {
-            string json = await Send(request, headers, authToken, authScheme, debug);
+            string json = await Send(request, serializerSettings, headers, authToken, authScheme, debug);
             return JsonConvert.DeserializeObject<Response<TResponse>>(json);
         }
 
         public async Task<Response<TResponse>> Send<TResponse>(
             Func<TResponse> responseTypeResolver,
             Request request,
+            JsonSerializerSettings serializerSettings = null,
             Dictionary<string, string> headers = null,
             string authToken = null,
             string authScheme = null,
             bool debug = false)
         {
-            return await Send<TResponse>(request, headers, authToken, authScheme, debug);
+            return await Send<TResponse>(request, serializerSettings, headers, authToken, authScheme, debug);
         }
 
         /// <summary>
@@ -116,6 +120,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>
@@ -125,6 +142,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

@@ -24,13 +24,15 @@ 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;
         public static HttpClient httpClient;
+
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         public static void PreInit()
         {
             _webSocket?.Dispose();
             SubscriptionDataReceived = null;
+            SubscriptionDataReceivedPerChannel = new Dictionary<string, Action<string>>();
 
             // Create a New HttpClient object.
             InitializeHttpClient();
@@ -67,6 +69,7 @@ public static void Dispose()
         public static async Task<string> PostRequest(
             string url,
             Request request,
+            JsonSerializerSettings serializerSettings = null,
             Dictionary<string, string> headers = null,
             string authToken = null,
             string authScheme = null,
@@ -83,6 +86,7 @@ public static async Task<string> PostRequest(
             string payload = request.ToJson();
 
             var requestMessage = new HttpRequestMessage();
+            //byte[] payload = request.ToBytes(serializerSettings);
 
             if (authToken != null)
             {
@@ -168,12 +172,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)
             {
@@ -188,12 +203,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
@@ -242,7 +268,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,
@@ -280,8 +306,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
@@ -324,17 +352,18 @@ private static async void WebSocketUpdate()
                 }
 
                 var msgType = (string)jsonObj["type"];
+                var id = (string)jsonObj["id"];
                 switch (msgType)
                 {
                     case "connection_error":
                         {
                             throw new WebSocketException("Connection error. Error: " + jsonResult);
                         }
                     case "connection_ack":
-                        {
-                            Debug.Log("Websocket connection acknowledged.");
-                            continue;
-                        }
+                    {
+                        Debug.Log($"Websocket connection acknowledged ({id}).");
+                        continue;
+                    }
                     case "data":
                     case "next":
                         {
@@ -380,4 +409,4 @@ await _webSocket.SendAsync(
             }
         }
     }
-}
+}

Runtime/SimpleGraphQL/Request.cs

@@ -26,18 +26,23 @@ public override string ToString()
     [PublicAPI]
     public static class RequestExtensions
     {
-        public static byte[] ToBytes(this Request request)
+        private static JsonSerializerSettings defaultSerializerSettings = new JsonSerializerSettings {NullValueHandling = NullValueHandling.Ignore};
+        public static byte[] ToBytes(this Request request, JsonSerializerSettings serializerSettings = null)
         {
-            return Encoding.UTF8.GetBytes(request.ToJson());
+            return Encoding.UTF8.GetBytes(request.ToJson(false, serializerSettings));
         }
 
-        public static string ToJson(this Request request,
-            bool prettyPrint = false)
+        public static string ToJson(this Request request, bool prettyPrint = false, JsonSerializerSettings serializerSettings = null)
         {
+            if (serializerSettings == null)
+            {
+                serializerSettings = defaultSerializerSettings;
+            }
+            
             return JsonConvert.SerializeObject
             (   request,
                 prettyPrint ? Formatting.Indented : Formatting.None,
-                new JsonSerializerSettings {NullValueHandling = NullValueHandling.Ignore}
+                serializerSettings
             );
         }
     }