com.taptap.sdk.core 4.3.10 → 4.4.0

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -6,6 +6,10 @@ using UnityEditor;
 using System.IO;
 using TapSDK.Core.Internal.Utils;
 using TapSDK.Core.Standalone.Internal.Openlog;
+using TapSDK.Core.Internal.Log;
+using TapSDK.Core.Standalone.Internal.Http;
+using Newtonsoft.Json;
+using TapSDK.Core.Standalone.Internal.Bean;
 
 namespace TapSDK.Core.Standalone
 {
@@ -21,7 +25,9 @@ namespace TapSDK.Core.Standalone
         public static bool isRnd = false;
         internal static bool enableAutoEvent = true;
 
-        internal static Dictionary<string, object> gatekeeperData = new Dictionary<string, object>();
+        internal static TapGatekeeper gatekeeperData = new TapGatekeeper();
+
+        private readonly TapHttp tapHttp = TapHttp.NewBuilder("TapSDKCore", TapTapSDK.Version).Build();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TapCoreStandalone"/> class.
@@ -38,7 +44,7 @@ namespace TapSDK.Core.Standalone
 
         private static void SetRND(bool isRnd)
         {
-            Debug.Log("SetRND called" + isRnd);
+            TapLog.Log("SetRND called = " + isRnd);
             TapCoreStandalone.isRnd = isRnd;
         }
 
@@ -58,30 +64,29 @@ namespace TapSDK.Core.Standalone
         /// <param name="otherOptions">Additional TapCore SDK options.</param>
         public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
         {
-            Debug.Log("SDK inited with other options + " + coreOption.ToString() + coreOption.ToString());
+            TapLog.Log("SDK inited with other options + " + coreOption.ToString() + coreOption.ToString());
             coreOptions = coreOption;
 
             var path = Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName);
             if (File.Exists(path))
             {
                 var clientSettings = File.ReadAllText(path);
-                Debug.Log("本地 clientSettings: " + clientSettings);
-                SetAutoEvent(Json.Deserialize(clientSettings) as Dictionary<string, object>);
-
+                TapLog.Log("本地 clientSettings: " + clientSettings);
                 try
                 {
-                    gatekeeperData = Json.Deserialize(clientSettings) as Dictionary<string, object>;
+                    TapGatekeeper tapGatekeeper = JsonConvert.DeserializeObject<TapGatekeeper>(clientSettings);
+                    SetAutoEvent(tapGatekeeper);
+                    gatekeeperData = tapGatekeeper;
                 }
                 catch (System.Exception e)
                 {
-                    Debug.LogError("TriggerEvent error: " + e.Message);
+                    TapLog.Warning("TriggerEvent error: " + e.Message);
                 }
             }
 
             Tracker.Init();
 
             TapOpenlogStandalone.Init();
-
             requestClientSetting();
         }
 
@@ -92,102 +97,83 @@ namespace TapSDK.Core.Standalone
                 Debug.Log("coreOptions is null");
                 return;
             }
-            Debug.Log("UpdateLanguage called with language: " + language);
+            TapLog.Log("UpdateLanguage called with language: " + language);
             coreOptions.preferredLanguage = language;
         }
 
-       public static string getGatekeeperConfigUrl(string key)
-               {
-                   if (gatekeeperData != null)
-                   {
-                       var urlsData = gatekeeperData["urls"] as Dictionary<string, object>;
-                       if (urlsData != null && urlsData.ContainsKey(key))
-                       {
-                           var keyData = urlsData[key] as Dictionary<string, object>;
-                           if (keyData != null)
-                           {
-                               return (string)keyData["browser"];
-                           }
-                       }
-                   }
-                   return null;
-               }
+        public static string getGatekeeperConfigUrl(string key)
+        {
+            if (gatekeeperData != null)
+            {
+                var urlsData = gatekeeperData.Urls;
+                if (urlsData != null && urlsData.ContainsKey(key))
+                {
+                    var keyData = urlsData[key];
+                    if (keyData != null)
+                    {
+                        return keyData.Browser;
+                    }
+                }
+            }
+            return null;
+        }
 
-        private async void requestClientSetting()
+        private void requestClientSetting()
         {
             // 使用 httpclient 请求 /sdk-core/v1/gatekeeper 获取配置
-            HttpClientConfig config = new HttpClientConfig(Constants.TAPSDK_HOST, null, true);
-            var httpClient = new HttpClient(config);
 #if UNITY_EDITOR
             var bundleIdentifier = PlayerSettings.applicationIdentifier;
 #else
             var bundleIdentifier = Application.identifier;
 #endif
-            var path = $"sdk-core/v1/gatekeeper?client_id={coreOptions.clientId}";
+            var path = "sdk-core/v1/gatekeeper";
             var body = new Dictionary<string, object> {
                 { "platform", "pc" },
                 { "bundle_id", bundleIdentifier }
             };
-            var response = await httpClient.Post(path, body, headers: NetUtils.commonHeaders);
-            if (response != null)
-            {
-                var responseJson = Json.Deserialize(response) as Dictionary<string, object>;
-                if (responseJson != null)
-                {
-                    /**
-                    * {
-                    *   "data": {
-                    *     "check": {},
-                    *     "switch": {
-                    *       "auto_event": true,
-                    *       "heartbeat": true
-                    *     },
-                    *     "urls": {
-                    *       "achievement_my_list_url": {
-                    *         "webview": "https://tapsdk.xdrnd.cn/achievement/me?client_id=rfciqabirt4vqav7io",
-                    *         "browser": "https://www.xdrnd.cn/app/70253/achievement/6"
-                    *       }
-                    *     },
-                    *     "webview": {
-                    *       "js_bridge": {
-                    *         "host_allowlist": [
-                    *           "tapsdk.xdrnd.cn"
-                    *         ]
-                    *       }
-                    *     }
-                    *   },
-                    *   "now": 1719972670,
-                    *   "success": true
-                    * }
-                    */
-                    var isSuccess = (bool)responseJson["success"];
-                    if (isSuccess)
-                    {
-                        var data = responseJson["data"] as Dictionary<string, object>;
-                        SetAutoEvent(data);
-                        gatekeeperData = data;
-                        // 把 data 存储在本地
-                        saveClientSettings(data);
-                        // 发通知
-                        EventManager.TriggerEvent(Constants.ClientSettingsEventKey, data);
-                    }
-                }
-            }
+
+            tapHttp.PostJson<TapGatekeeper>(
+               url: path,
+               json: body,
+               onSuccess: (data) =>
+               {
+                   SetAutoEvent(data);
+                   gatekeeperData = data;
+                   // 把 data 存储在本地
+                   saveClientSettings(data);
+                   // 发通知
+                   EventManager.TriggerEvent(Constants.ClientSettingsEventKey, data);
+               },
+               onFailure: (error) =>
+               {
+                   if (error is TapHttpServerException se)
+                   {
+                       if (TapHttpErrorConstants.ERROR_INVALID_CLIENT.Equals(se.ErrorData.Error))
+                       {
+                           TapLog.Error("Init Failed", se.ErrorData.ErrorDescription);
+                           TapMessage.ShowMessage(se.ErrorData.Msg, TapMessage.Position.bottom, TapMessage.Time.twoSecond);
+                       }
+                   }
+               }
+           );
         }
 
-        private void saveClientSettings(Dictionary<string, object> settings)
+        private void saveClientSettings(TapGatekeeper settings)
         {
-            string json = Json.Serialize(settings);
+            string json = JsonConvert.SerializeObject(settings);
             Debug.Log("saveClientSettings: " + json);
             File.WriteAllText(Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName), json);
         }
 
-        private void SetAutoEvent(Dictionary<string, object> data)
+        private void SetAutoEvent(TapGatekeeper gatekeeper)
         {
-            if (data != null)
+            if (gatekeeper != null)
             {
-                var switchData = data["switch"] as Dictionary<string, object>;
-                enableAutoEvent = (bool)switchData["auto_event"];
+                var switchData = gatekeeper.Switch;
+                if (switchData != null)
+                {
+                    enableAutoEvent = switchData.AutoEvent;
+                }
             }
             Debug.Log("SetAutoEvent enableAutoEvent is: " + enableAutoEvent);
         }

package/link.xml

@@ -0,0 +1,4 @@
+<linker>
+  <assembly fullname="TapSDK.Core.Runtime" preserve="all" />
+  <assembly fullname="TapSDK.Core.Mobile.Runtime" preserve="all" />
+</linker>

package/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 10ec9c4261b764ec0a94ec236fdabef6
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -2,7 +2,7 @@
   "name": "com.taptap.sdk.core",
   "displayName": "TapTapSDK Core",
   "description": "TapTapSDK Core",
-  "version": "4.3.10",
+  "version": "4.4.0",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {

package/Standalone/Runtime/Internal/Http/HttpClient.cs

@@ -1,211 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Linq;
-using UnityEngine;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace TapSDK.Core.Standalone.Internal {
-    // 网络请求类，使用示例
-    /*
-    HttpClientConfig config = new HttpClientConfig("https://api.example.com");
-    config.DefaultHeaders.Add("Authorization", "Bearer your_token");
-
-    HttpClient client = new HttpClient(config);
-
-    // GET request
-    Dictionary<string, string> queryParams = new Dictionary<string, string>
-    {
-        { "query1", "value1" },
-        { "query2", "value2" }
-    };
-    string getResponse = await client.GetAsync("/path/to/resource", queryParams);
-    UnityEngine.Debug.Log("GET Response: " + getResponse);
-
-    // POST request
-    string postBody = "{\"key\":\"value\"}";
-    Dictionary<string, string> postHeaders = new Dictionary<string, string>
-    {
-        { "Content-Type", "application/json" }
-    };
-    string postResponse = await client.PostAsync("/path/to/resource", postBody, null, postHeaders);
-    UnityEngine.Debug.Log("POST Response: " + postResponse);
-    */
-    public class HttpClientConfig {
-        public string Host;
-        public Dictionary<string, string> DefaultHeaders;
-        public bool needSign = false;
-
-        public HttpClientConfig(string host, Dictionary<string, string> defaultHeaders = null, bool needSign = false) {
-            Host = host;
-            if (defaultHeaders == null) {
-                DefaultHeaders = new Dictionary<string, string>();
-            } else {
-                DefaultHeaders = defaultHeaders;
-            }
-            this.needSign = needSign;
-        }
-    }
-
-    public class HttpClient {
-        private readonly HttpClientConfig Config;
-        private static readonly System.Net.Http.HttpClientHandler handler = new System.Net.Http.HttpClientHandler
-        {
-            Proxy = new WebProxy(GetProxyAddress(), true), // Charles 代理地址
-            UseProxy = ShouldUseProxy()
-        };
-        private static readonly System.Net.Http.HttpClient client = new System.Net.Http.HttpClient(handler);
-
-        private static bool ShouldUseProxy()
-        {
-            string useProxyEnv = Environment.GetEnvironmentVariable("TAPSDK_USE_PROXY");
-            return !string.IsNullOrEmpty(useProxyEnv) && useProxyEnv.Equals("true", StringComparison.OrdinalIgnoreCase);
-        }
-
-        private static string GetProxyAddress()
-        {
-            // 获取代理地址，默认值为 "http://localhost:8888"
-            string proxyAddress = Environment.GetEnvironmentVariable("TAPSDK_PROXY_ADDRESS");
-            return !string.IsNullOrEmpty(proxyAddress) ? proxyAddress : "http://localhost:8888";
-        }
-
-        public HttpClient(HttpClientConfig config)
-        {
-            this.Config = config;
-            foreach (var header in this.Config.DefaultHeaders)
-            {
-                client.DefaultRequestHeaders.Add(header.Key, header.Value);
-            }
-        }
-
-        public async Task<string> Get(string path, Dictionary<string, string> queryParameters = null, Dictionary<string, string> headers = null)
-        {
-            string url = BuildUrl(path, queryParameters);
-            var request = new HttpRequestMessage(HttpMethod.Get, url);
-
-            AddHeaders(request, headers);
-
-            return await SendRequest(request);
-        }
-
-        public async Task<string> Post(string path, Dictionary<string, object> body, Dictionary<string, string> queryParameters = null, Dictionary<string, string> headers = null)
-        {
-            string url = BuildUrl(path, queryParameters);
-            var request = new HttpRequestMessage(HttpMethod.Post, url);
-
-            AddHeaders(request, headers);
-
-            if (body != null)
-            {
-                string jsonBody = Json.Serialize(body);
-                StringContent requestContent = new StringContent(jsonBody);
-                requestContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-                request.Content = requestContent;
-            }
-
-            return await SendRequest(request);
-        }
-
-        private void AddHeaders(HttpRequestMessage request, Dictionary<string, string> headers)
-        {
-            // Add request-specific headers
-            if (headers != null)
-            {
-                foreach (var header in headers)
-                {
-                    request.Headers.Add(header.Key, header.Value);
-                }
-            }
-        }
-
-        public static async Task<string> Sign(HttpRequestMessage req, string secret)
-        {
-            string methodPart = req.Method.Method;
-            string urlPathAndQueryPart = req.RequestUri.PathAndQuery;
-
-            string headersPart = GetHeadersPart(req.Headers);
-
-            string bodyPart = string.Empty;
-            if (req.Content != null)
-            {
-                bodyPart = await req.Content.ReadAsStringAsync();
-            }
-
-            string signParts = methodPart + "\n" + urlPathAndQueryPart + "\n" + headersPart + "\n" + bodyPart + "\n";
-
-            using (var hmac = new HMACSHA256(Encoding.UTF8.GetBytes(secret)))
-            {
-                byte[] hash = hmac.ComputeHash(Encoding.UTF8.GetBytes(signParts));
-                return Convert.ToBase64String(hash);
-            }
-        }
-
-        private static string GetHeadersPart(HttpRequestHeaders headers)
-        {
-            var headerKeys = headers
-                .Where(h => h.Key.StartsWith("x-tap-", StringComparison.OrdinalIgnoreCase))
-                .OrderBy(h => h.Key.ToLowerInvariant())
-                .Select(h => $"{h.Key.ToLowerInvariant()}:{string.Join(",", h.Value)}")
-                .ToList();
-
-            return string.Join("\n", headerKeys);
-        }
-        private async Task<string> SendRequest(HttpRequestMessage request)
-        {
-            if (this.Config.needSign)
-            {
-                string sign = await Sign(request, TapCoreStandalone.coreOptions.clientToken);
-                request.Headers.Add("X-Tap-Sign", sign);
-            }
-
-            HttpResponseMessage response;
-
-            try
-            {
-                response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-                request.Dispose();
-            }
-            catch (HttpRequestException e)
-            {
-                Debug.Log($"Request error: {e}");
-                return null;
-            }
-
-            string responseBody = await response.Content.ReadAsStringAsync();
-            var responseJson = Json.Deserialize(responseBody) as Dictionary<string, object>;
-            if (responseJson != null)
-            {
-                int now = (int)Convert.ToInt64(responseJson["now"]);
-                if (now > 0)
-                {
-                    TimeUtil.FixTime(now);
-                }
-            }
-
-            Debug.Log($"Response Code: {response.StatusCode}, Body: {responseBody}");
-
-            if (!response.IsSuccessStatusCode)
-            {
-                Debug.Log($"Error: {response}");
-                return null;
-            }
-
-            response.Dispose();
-            return responseBody;
-        }
-
-        private string BuildUrl(string path, Dictionary<string, string> queryParameters) {
-            string url = $"{this.Config.Host}/{path}";
-            if (queryParameters != null) {
-                IEnumerable<string> queryPairs = queryParameters.Select(kv => $"{kv.Key}={Uri.EscapeDataString(kv.Value.ToString())}");
-                string queries = string.Join("&", queryPairs);
-                url = $"{url}?{queries}";
-            }
-            return url;
-        }
-    }
-}

package/Standalone/Runtime/Internal/Http/NetUtils.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using UnityEditor;
-using UnityEngine;
-
-namespace TapSDK.Core.Standalone.Internal
-{
-    public class NetUtils
-    {
-        // 随机生成一个 10 位的字符串
-        public static string GenerateNonce()
-        {
-            string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-            char[] nonce = new char[10];
-            for (int i = 0; i < 10; i++)
-            {
-                nonce[i] = chars[UnityEngine.Random.Range(0, chars.Length)];
-            }
-            return new string(nonce);
-        }
-
-        public static Dictionary<string, string> commonHeaders {
-            get {
-                var headers = new Dictionary<string, string> {
-                    { "User-Agent", $"{TapTapSDK.SDKPlatform}/{TapTapSDK.Version}" },
-                    { "X-Tap-Ts", TimeUtil.GetCurrentTime().ToString() },
-                    { "X-Tap-Nonce", NetUtils.GenerateNonce() },
-                    { "X-Tap-PN", "TapSDK" },
-                    { "X-Tap-Lang", Tracker.getServerLanguage() },
-                    { "X-Tap-Device-Id", Identity.DeviceId },
-                    { "X-Tap-Platform", "PC" },
-                    { "X-Tap-SDK-Module", "TapSDKCore" },
-                    { "X-Tap-SDK-Module-Version", TapTapSDK.Version },
-                    { "X-Tap-SDK-Artifact", "Unity" }
-                };
-                
-                if (TapCoreStandalone.User.Id != null) {
-                    headers.Add("X-Tap-SDK-Game-User-Id", TapCoreStandalone.User.Id);
-                }
-
-                return headers;
-            }
-        }
-    }
-}

package/Standalone/Runtime/Internal/Http/TimeUtil.cs

@@ -1,30 +0,0 @@
-using System;
-using UnityEngine;
-
-namespace TapSDK.Core.Standalone.Internal {
-
-    public static class TimeUtil
-    {
-        private static int timeOffset = 0;
-
-        private static void SetTimeOffset(int offset)
-        {
-            timeOffset = offset;
-        }
-
-        // 获取当前时间的秒级时间戳
-        public static int GetCurrentTime()
-        {
-            DateTime epochStart = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-            TimeSpan timeSpan = DateTime.UtcNow - epochStart;
-            return (int)timeSpan.TotalSeconds + timeOffset;
-        }
-
-        public static void FixTime(int time)
-        {
-            Debug.Log("FixTime called with time: " + time);
-            SetTimeOffset(time - (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds);
-        }
-    }
-
-}