com.xmobitea.changx.gn-unity 2.0.1 → 2.0.3

package/Runtime/Networking/Http/NetworkingPeerUnityWebRequest.cs

@@ -1,192 +1,188 @@
-namespace XmobiTea.GN.Networking.Http
-{
-    using System;
-    using System.Collections;
-    using System.Text;
-    using UnityEngine;
-    using UnityEngine.Networking;
-    using XmobiTea.GN.Common;
-    using XmobiTea.GN.Constant;
-    using XmobiTea.GN.Helper;
-    using XmobiTea.MsgPack;
-
-    class UnityWebRequestSupportMono : MonoBehaviour { }
-
-    internal class NetworkingPeerUnityWebRequest : NetworkingHttpPeerBase
-    {
-        class AcceptAllCertificatesSignedWithASpecificKeyPublicKey : CertificateHandler
-        {
-            protected override bool ValidateCertificate(byte[] certificateData)
-            {
-                return true;
-            }
-        }
-
-        private MonoBehaviour unityMonoBehaviour;
-
-        public override void getRequest(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
-        {
-            this.unityMonoBehaviour.StartCoroutine(this.ieGetRequestViaUnityWebRequest(subUri, onHttpAppResponse, timeout, authToken, secretKey));
-        }
-
-        public override void postRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
-        {
-            this.unityMonoBehaviour.StartCoroutine(this.iePostRequestViaUnityWebRequest(subUri, param, postType, onHttpAppResponse, timeout, authToken, secretKey, customTags));
-        }
-
-        public override void postRequestUpload(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
-        {
-            this.unityMonoBehaviour.StartCoroutine(this.iePostRequestUploadViaUnityWebRequest(subUri, content, mimetype, onHttpAppResponse, timeout));
-        }
-
-        private IEnumerator ieGetRequestViaUnityWebRequest(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
-        {
-            using (var unityWebRequest = UnityWebRequest.Get(new Uri(this.httpUrl + "/" + subUri)))
-            {
-                var certificateHandler = new AcceptAllCertificatesSignedWithASpecificKeyPublicKey();
-                unityWebRequest.certificateHandler = certificateHandler;
-
-                unityWebRequest.timeout = (int)timeout;
-
-                if (!string.IsNullOrEmpty(authToken)) unityWebRequest.SetRequestHeader(Commands.RequestAuthTokenCmd, authToken);
-                if (!string.IsNullOrEmpty(secretKey)) unityWebRequest.SetRequestHeader(Commands.RequestSecretCmd, secretKey);
-                //unityWebRequest.SetRequestHeader("User-Agent", userAgent);
-
-                yield return unityWebRequest.SendWebRequest();
-
-                certificateHandler.Dispose();
-
-                var httpAppResponse = new HttpAppResponse();
-                httpAppResponse.statusCode = unityWebRequest.responseCode;
-
-                if (unityWebRequest.result == UnityWebRequest.Result.ConnectionError
-                    || unityWebRequest.result == UnityWebRequest.Result.ProtocolError
-                    || unityWebRequest.result == UnityWebRequest.Result.DataProcessingError)
-                {
-                    httpAppResponse.error = unityWebRequest.error;
-                }
-                else
-                {
-                    var downloadHandler = unityWebRequest.downloadHandler;
-                    httpAppResponse.data = downloadHandler.data;
-                    httpAppResponse.text = downloadHandler.text;
-                }
-
-                onHttpAppResponse?.Invoke(httpAppResponse);
-            }
-        }
-
-        private IEnumerator iePostRequestViaUnityWebRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
-        {
-            using (var unityWebRequest = new UnityWebRequest(new Uri(this.httpUrl + "/" + subUri)))
-            {
-                unityWebRequest.method = UnityWebRequest.kHttpVerbPOST;
-
-                var certificateHandler = new AcceptAllCertificatesSignedWithASpecificKeyPublicKey();
-                unityWebRequest.certificateHandler = certificateHandler;
-
-                unityWebRequest.timeout = (int)timeout;
-
-                if (param == null) param = new GNHashtable();
-                if (customTags != null) param.add(GNParameterCode.CustomTags, customTags);
-
-                //unityWebRequest.SetRequestHeader("User-Agent", userAgent);
-
-                if (postType == PostType.Json)
-                {
-                    unityWebRequest.SetRequestHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
-
-                    var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
-
-                    unityWebRequest.uploadHandler = new UploadHandlerRaw(content);
-                }
-                else if (postType == PostType.MsgPack)
-                {
-                    unityWebRequest.SetRequestHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
-
-                    var dataSend = param.toData();
-
-                    var content = MsgPackSerializer.Serialize(dataSend);
-
-                    unityWebRequest.uploadHandler = new UploadHandlerRaw(content);
-                }
-
-                unityWebRequest.downloadHandler = new DownloadHandlerBuffer();
-
-                if (!string.IsNullOrEmpty(authToken)) unityWebRequest.SetRequestHeader(Commands.RequestAuthTokenCmd, authToken);
-                if (!string.IsNullOrEmpty(secretKey)) unityWebRequest.SetRequestHeader(Commands.RequestSecretCmd, secretKey);
-
-                yield return unityWebRequest.SendWebRequest();
-
-                certificateHandler.Dispose();
-
-                var httpAppResponse = new HttpAppResponse();
-                httpAppResponse.statusCode = unityWebRequest.responseCode;
-
-                if (unityWebRequest.result == UnityWebRequest.Result.ConnectionError
-                    || unityWebRequest.result == UnityWebRequest.Result.ProtocolError
-                    || unityWebRequest.result == UnityWebRequest.Result.DataProcessingError)
-                {
-                    httpAppResponse.error = unityWebRequest.error;
-                }
-                else
-                {
-                    var downloadHandler = unityWebRequest.downloadHandler;
-                    httpAppResponse.data = downloadHandler.data;
-                    httpAppResponse.text = downloadHandler.text;
-                }
-
-                onHttpAppResponse?.Invoke(httpAppResponse);
-            }
-        }
-
-        private IEnumerator iePostRequestUploadViaUnityWebRequest(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
-        {
-            var form = new UnityEngine.WWWForm();
-            form.AddBinaryData(Commands.File, content, null, mimetype);
-
-            using (var unityWebRequest = UnityWebRequest.Post(new Uri(this.httpUrl + "/" + subUri), form))
-            {
-                var certificateHandler = new AcceptAllCertificatesSignedWithASpecificKeyPublicKey();
-
-                unityWebRequest.certificateHandler = certificateHandler;
-
-                unityWebRequest.timeout = (int)timeout;
-
-                var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
-
-                if (!string.IsNullOrEmpty(authToken)) unityWebRequest.SetRequestHeader(Commands.RequestAuthTokenCmd, authToken);
-
-                yield return unityWebRequest.SendWebRequest();
-
-                certificateHandler.Dispose();
-
-                var httpAppResponse = new HttpAppResponse();
-                httpAppResponse.statusCode = unityWebRequest.responseCode;
-
-                if (unityWebRequest.result == UnityWebRequest.Result.ConnectionError
-                    || unityWebRequest.result == UnityWebRequest.Result.ProtocolError
-                    || unityWebRequest.result == UnityWebRequest.Result.DataProcessingError)
-                {
-                    httpAppResponse.error = unityWebRequest.error;
-                }
-                else
-                {
-                    var downloadHandler = unityWebRequest.downloadHandler;
-                    httpAppResponse.data = downloadHandler.data;
-                    httpAppResponse.text = downloadHandler.text;
-                }
-
-                onHttpAppResponse?.Invoke(httpAppResponse);
-            }
-        }
-
-        public NetworkingPeerUnityWebRequest()
-        {
-            var unityWebRequestSupport = new GameObject("[GN] UnityWebRequestSupport");
-
-            this.unityMonoBehaviour = unityWebRequestSupport.AddComponent<UnityWebRequestSupportMono>();
-        }
-    }
-
-}
+namespace XmobiTea.GN.Networking.Http
+{
+    using System;
+    using System.Collections;
+    using System.Text;
+    using UnityEngine;
+    using UnityEngine.Networking;
+    using XmobiTea.GN.Common;
+    using XmobiTea.GN.Constant;
+    using XmobiTea.GN.Helper;
+    using XmobiTea.MsgPack;
+
+    internal class NetworkingPeerUnityWebRequest : NetworkingHttpPeerBase
+    {
+        class AcceptAllCertificatesSignedWithASpecificKeyPublicKey : CertificateHandler
+        {
+            protected override bool ValidateCertificate(byte[] certificateData)
+            {
+                return true;
+            }
+        }
+
+        private MonoBehaviour unityMonoBehaviour;
+
+        public override void getRequest(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
+        {
+            this.unityMonoBehaviour.StartCoroutine(this.ieGetRequestViaUnityWebRequest(subUri, onHttpAppResponse, timeout, authToken, secretKey));
+        }
+
+        public override void postRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
+        {
+            this.unityMonoBehaviour.StartCoroutine(this.iePostRequestViaUnityWebRequest(subUri, param, postType, onHttpAppResponse, timeout, authToken, secretKey, customTags));
+        }
+
+        public override void postRequestUpload(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
+        {
+            this.unityMonoBehaviour.StartCoroutine(this.iePostRequestUploadViaUnityWebRequest(subUri, content, mimetype, onHttpAppResponse, timeout));
+        }
+
+        private IEnumerator ieGetRequestViaUnityWebRequest(string subUri, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey)
+        {
+            using (var unityWebRequest = UnityWebRequest.Get(new Uri(this.httpUrl + "/" + subUri)))
+            {
+                var certificateHandler = new AcceptAllCertificatesSignedWithASpecificKeyPublicKey();
+                unityWebRequest.certificateHandler = certificateHandler;
+
+                unityWebRequest.timeout = (int)timeout;
+
+                if (!string.IsNullOrEmpty(authToken)) unityWebRequest.SetRequestHeader(Commands.RequestAuthTokenCmd, authToken);
+                if (!string.IsNullOrEmpty(secretKey)) unityWebRequest.SetRequestHeader(Commands.RequestSecretCmd, secretKey);
+                //unityWebRequest.SetRequestHeader("User-Agent", userAgent);
+
+                yield return unityWebRequest.SendWebRequest();
+
+                certificateHandler.Dispose();
+
+                var httpAppResponse = new HttpAppResponse();
+                httpAppResponse.statusCode = unityWebRequest.responseCode;
+
+                if (unityWebRequest.result == UnityWebRequest.Result.ConnectionError
+                    || unityWebRequest.result == UnityWebRequest.Result.ProtocolError
+                    || unityWebRequest.result == UnityWebRequest.Result.DataProcessingError)
+                {
+                    httpAppResponse.error = unityWebRequest.error;
+                }
+                else
+                {
+                    var downloadHandler = unityWebRequest.downloadHandler;
+                    httpAppResponse.data = downloadHandler.data;
+                    httpAppResponse.text = downloadHandler.text;
+                }
+
+                onHttpAppResponse?.Invoke(httpAppResponse);
+            }
+        }
+
+        private IEnumerator iePostRequestViaUnityWebRequest(string subUri, GNHashtable param, PostType postType, Action<HttpAppResponse> onHttpAppResponse, float timeout, string authToken, string secretKey, GNHashtable customTags)
+        {
+            using (var unityWebRequest = new UnityWebRequest(new Uri(this.httpUrl + "/" + subUri)))
+            {
+                unityWebRequest.method = UnityWebRequest.kHttpVerbPOST;
+
+                var certificateHandler = new AcceptAllCertificatesSignedWithASpecificKeyPublicKey();
+                unityWebRequest.certificateHandler = certificateHandler;
+
+                unityWebRequest.timeout = (int)timeout;
+
+                if (param == null) param = new GNHashtable();
+                if (customTags != null) param.add(GNParameterCode.CustomTags, customTags);
+
+                //unityWebRequest.SetRequestHeader("User-Agent", userAgent);
+
+                if (postType == PostType.Json)
+                {
+                    unityWebRequest.SetRequestHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_JSON);
+
+                    var content = Encoding.UTF8.GetBytes(Serializer.Serialize(param.toData()));
+
+                    unityWebRequest.uploadHandler = new UploadHandlerRaw(content);
+                }
+                else if (postType == PostType.MsgPack)
+                {
+                    unityWebRequest.SetRequestHeader(Commands.CONTENT_TYPE, Commands.APPLICATION_MSGPACK);
+
+                    var dataSend = param.toData();
+
+                    var content = MsgPackSerializer.Serialize(dataSend);
+
+                    unityWebRequest.uploadHandler = new UploadHandlerRaw(content);
+                }
+
+                unityWebRequest.downloadHandler = new DownloadHandlerBuffer();
+
+                if (!string.IsNullOrEmpty(authToken)) unityWebRequest.SetRequestHeader(Commands.RequestAuthTokenCmd, authToken);
+                if (!string.IsNullOrEmpty(secretKey)) unityWebRequest.SetRequestHeader(Commands.RequestSecretCmd, secretKey);
+
+                yield return unityWebRequest.SendWebRequest();
+
+                certificateHandler.Dispose();
+
+                var httpAppResponse = new HttpAppResponse();
+                httpAppResponse.statusCode = unityWebRequest.responseCode;
+
+                if (unityWebRequest.result == UnityWebRequest.Result.ConnectionError
+                    || unityWebRequest.result == UnityWebRequest.Result.ProtocolError
+                    || unityWebRequest.result == UnityWebRequest.Result.DataProcessingError)
+                {
+                    httpAppResponse.error = unityWebRequest.error;
+                }
+                else
+                {
+                    var downloadHandler = unityWebRequest.downloadHandler;
+                    httpAppResponse.data = downloadHandler.data;
+                    httpAppResponse.text = downloadHandler.text;
+                }
+
+                onHttpAppResponse?.Invoke(httpAppResponse);
+            }
+        }
+
+        private IEnumerator iePostRequestUploadViaUnityWebRequest(string subUri, byte[] content, string mimetype, Action<HttpAppResponse> onHttpAppResponse, float timeout)
+        {
+            var form = new UnityEngine.WWWForm();
+            form.AddBinaryData(Commands.File, content, null, mimetype);
+
+            using (var unityWebRequest = UnityWebRequest.Post(new Uri(this.httpUrl + "/" + subUri), form))
+            {
+                var certificateHandler = new AcceptAllCertificatesSignedWithASpecificKeyPublicKey();
+
+                unityWebRequest.certificateHandler = certificateHandler;
+
+                unityWebRequest.timeout = (int)timeout;
+
+                var authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
+
+                if (!string.IsNullOrEmpty(authToken)) unityWebRequest.SetRequestHeader(Commands.RequestAuthTokenCmd, authToken);
+
+                yield return unityWebRequest.SendWebRequest();
+
+                certificateHandler.Dispose();
+
+                var httpAppResponse = new HttpAppResponse();
+                httpAppResponse.statusCode = unityWebRequest.responseCode;
+
+                if (unityWebRequest.result == UnityWebRequest.Result.ConnectionError
+                    || unityWebRequest.result == UnityWebRequest.Result.ProtocolError
+                    || unityWebRequest.result == UnityWebRequest.Result.DataProcessingError)
+                {
+                    httpAppResponse.error = unityWebRequest.error;
+                }
+                else
+                {
+                    var downloadHandler = unityWebRequest.downloadHandler;
+                    httpAppResponse.data = downloadHandler.data;
+                    httpAppResponse.text = downloadHandler.text;
+                }
+
+                onHttpAppResponse?.Invoke(httpAppResponse);
+            }
+        }
+
+        public NetworkingPeerUnityWebRequest()
+        {
+            this.unityMonoBehaviour = new GameObject("[GN] UnityWebRequestSupport").AddComponent<MonoBehaviour>();
+        }
+    }
+
+}

package/Runtime/Networking/Http/NetworkingPeerUnityWebRequest.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: dc5891aeed68b2f4da9ba6c00a8daa93
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: dc5891aeed68b2f4da9ba6c00a8daa93
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Networking/Http.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 508b36f536bb55146ad7c5069c61377d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 508b36f536bb55146ad7c5069c61377d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Networking/IPeer.cs

@@ -1,19 +1,19 @@
-namespace XmobiTea.GN.Networking
-{
-    using System;
-    using XmobiTea.GN.Common;
-    using XmobiTea.GN.Constant;
-    using XmobiTea.GN.Entity;
-
-    internal interface IPeer
-    {
-        void initPeer();
-
-        void enqueue(RequestType requestType, RequestRole requestRole, OperationRequest operationRequest, Action<OperationResponse> onOperationResponse, string authToken, string secretKey, GNHashtable customTags);
-
-        bool isUsing();
-
-        void service();
-    }
-
-}
+namespace XmobiTea.GN.Networking
+{
+    using System;
+    using XmobiTea.GN.Common;
+    using XmobiTea.GN.Constant;
+    using XmobiTea.GN.Entity;
+
+    internal interface IPeer
+    {
+        void initPeer();
+
+        void enqueue(RequestType requestType, RequestRole requestRole, OperationRequest operationRequest, Action<OperationResponse> onOperationResponse, string authToken, string secretKey, GNHashtable customTags);
+
+        bool isUsing();
+
+        void service();
+    }
+
+}

package/Runtime/Networking/IPeer.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: ae20e7e7970e7724b9a595eb53b70866
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: ae20e7e7970e7724b9a595eb53b70866
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: