com.taptap.sdk.core 4.4.2 → 4.5.0

package/Standalone/Runtime/Internal/Openlog/TapOpenlogWrapper.cs

@@ -0,0 +1,178 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace TapSDK.Core.Standalone.Internal.Openlog
+{
+    internal class TapOpenlogWrapper
+    {
+
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+        internal const string DllName = "tapsdkcore";
+#elif UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
+        internal const string DllName = "libtapsdkcorecpp";
+#endif
+
+        /**
+         * 初始化接口，只需要调用一次。
+         *
+         *   cfg 初始化配置，JSON 格式：
+         *
+        {
+            "region": 2,
+            "log_to_console": 1,
+            "log_level": 1,
+            "data_dir": "/tmp",
+            "env": "local",
+            "platform": "abc",
+            "ua": "TapSDK-Android/3.28.0",
+            "client_id": "uZ8Yy6cSXVOR6AMRPj",
+            "client_token": "AVhR1Bu9qfLR1cGbZMAdZ5rzJSxfoEiQaFf1T2P7",
+            "modules": [
+                "app_duration"
+            ],
+            "common": {
+                "pn": "TapSDK",
+                "app_version_code": "123",
+                "app_version": "1.2.3",
+                "app_package_name": "",
+                "install_uuid": "",
+                "device_id": "123456",
+                "caid": "",
+                "dv": "",
+                "md": "",
+                "hardware": "",
+                "cpu": "",
+                "cpu_abis": "",
+                "os": "android",
+                "sv": "",
+                "width": "",
+                "height": "",
+                "total_rom": "",
+                "total_ram": "",
+                "open_id": "",
+                "tds_user_id": "",
+                "sdk_locale": ""
+            }
+            "app_duration": {
+                "tapsdk_version": ""
+            }
+        }
+         *
+         *   - log_level 取值：1 Trace、2 Debug、3 Info、4 Warn、5 Error、6 完全不输出
+         *   - region 取值：0 国内、1 海外、2 RND
+         *   - modules 取值：app_duration（开启时长埋点）。如果 modules 不传，或者为空，
+         *                  则仅开启 OpenLog 功能，不会上报游戏时长
+         *
+         *  commonVariablesGetter 用于获取运行时会发生变化的公参
+         *
+         * 成功返回 0，失败返回 -1
+         */
+        [DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int TdkOnAppStarted(string cfg, CommonVariablesGetter commonVariablesGetter, FreeStringCallback freeString);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate IntPtr CommonVariablesGetter();
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        internal delegate void FreeStringCallback(IntPtr intPtr);
+
+        /**
+         * App 退出时调用，只需要调用一次。
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkOnAppStopped();
+
+        /**
+         * 启用功能模块，如：app_duration
+         *
+         *   modules JSON 数组，如：["app_duration"]
+         *
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkEnableModules(string modules);
+
+        /**
+        * 禁用功能模块，如：app_duration
+        *
+        *   modules JSON 数组，如：["app_duration"]
+        *
+        */
+        [DllImport(DllName)]
+        internal static extern void TdkDisableModules(string modules);
+
+        /**
+         * 需要发送埋点日志时调用。
+         * SDK 内部会整合初始化接口传入的公参、extraArgsFunc 返回的公参，以及 log 里的业务参数，
+         * 然后再发送到 OpenLog 服务端
+         *
+         *   logstore 如：tapsdk、tapsdk-apm
+         *   log 埋点日志，仅需传递业务参数，JSON 格式：{"action":"xxx", "open_id":"yyy","tds_user_id":"zzz"}
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkOpenLog(string logStore, string logContent);
+
+        /**
+        * 用户登录成功时调用。
+        *
+        *   userInfo 用户信息，JSON 格式：{"open_id":"","tds_user_id":""}
+        */
+        [DllImport(DllName)]
+        internal static extern void TdkOnLogin(string userInfo);
+
+        /**
+         * 用户登出时调用。
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkOnLogout();
+
+        /**
+         * 用户切到后台时调用。
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkOnForeground();
+
+        /**
+         * 游戏切回前台时调用。
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkOnBackground();
+
+        /**
+         * 设置额外的时长模块日志参数，JSON K/V 格式。每次调用这个接口时，会用最新得到的参数，替换原有参数。
+         *
+         *   params 额外日志参数，JSON 格式：{"K1":"V1","K2":"V2","K3":"V3"}
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkSetExtraAppDurationParams(string paramsJson);
+
+        /**
+         * 设置日志等级
+         */
+        [DllImport(DllName)]
+        internal static extern void TdkSetLogLevel(int logLevel, int logToConsole);
+
+        /**
+         * 代码版本，如：1.2.5
+         */
+        [DllImport(DllName)]
+        internal static extern IntPtr TdkVersion();
+
+        /**
+         * git commit 版本，如：98f5d81a0fdcab9a755878b3e825c2cb510e5196
+         */
+        [DllImport(DllName)]
+        internal static extern IntPtr TdkGitCommit();
+
+        // 用于返回 TdkVersion 的封装方法
+        public static string GetTdkVersion()
+        {
+            return Marshal.PtrToStringAnsi(TdkVersion());
+        }
+
+        // 用于返回 TdkGitCommit 的封装方法
+        public static string GetTdkGitCommit()
+        {
+            return Marshal.PtrToStringAnsi(TdkGitCommit());
+        }
+    }
+}

package/Standalone/Runtime/Internal/Openlog/{Bean/TapOpenlogLogGroup.cs.meta → TapOpenlogWrapper.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3408a0ca858fb4782bacbdbca16a5a41
+guid: f7931ada3fb5ee14ca44265af3983618
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -22,7 +22,6 @@ namespace TapSDK.Core.Standalone
         internal static Tracker Tracker;
         internal static User User;
         internal static TapTapSdkOptions coreOptions;
-        public static bool isRnd = false;
         internal static bool enableAutoEvent = true;
 
         internal static TapGatekeeper gatekeeperData = new TapGatekeeper();
@@ -34,7 +33,6 @@ namespace TapSDK.Core.Standalone
         /// </summary>
         public TapCoreStandalone()
         {
-            Debug.Log("TapCoStandalone constructor");
             // Instantiate modules
             Prefs = new Prefs();
             Tracker = new Tracker();
@@ -42,12 +40,6 @@ namespace TapSDK.Core.Standalone
             TapLoom.Initialize();
         }
 
-        private static void SetRND(bool isRnd)
-        {
-            TapLog.Log("SetRND called = " + isRnd);
-            TapCoreStandalone.isRnd = isRnd;
-        }
-
         /// <summary>
         /// Initializes the TapCore SDK with the specified options.
         /// </summary>
@@ -64,18 +56,28 @@ namespace TapSDK.Core.Standalone
         /// <param name="otherOptions">Additional TapCore SDK options.</param>
         public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
         {
-            TapLog.Log("SDK inited with other options + " + coreOption.ToString() + coreOption.ToString());
+            TapLog.Log("SDK Init Options : ", "coreOption : " + JsonConvert.SerializeObject(coreOption) + "\notherOptions : " + JsonConvert.SerializeObject(otherOptions));
             coreOptions = coreOption;
 
+            TapOpenlogStandalone.Init();
+
             var path = Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName);
             if (File.Exists(path))
             {
                 var clientSettings = File.ReadAllText(path);
-                TapLog.Log("本地 clientSettings: " + clientSettings);
+                // TapLog.Log("本地 clientSettings: " + clientSettings);
                 try
                 {
                     TapGatekeeper tapGatekeeper = JsonConvert.DeserializeObject<TapGatekeeper>(clientSettings);
                     SetAutoEvent(tapGatekeeper);
+                    if (tapGatekeeper.Switch?.Heartbeat == true)
+                    {
+                        TapAppDurationStandalone.Enable();
+                    }
+                    else
+                    {
+                        TapAppDurationStandalone.Disable();
+                    }
                     gatekeeperData = tapGatekeeper;
                 }
                 catch (System.Exception e)
@@ -86,7 +88,6 @@ namespace TapSDK.Core.Standalone
 
             Tracker.Init();
 
-            TapOpenlogStandalone.Init();
             requestClientSetting();
         }
 
@@ -138,6 +139,14 @@ namespace TapSDK.Core.Standalone
                onSuccess: (data) =>
                {
                    SetAutoEvent(data);
+                   if (data.Switch?.Heartbeat == true)
+                   {
+                       TapAppDurationStandalone.Enable();
+                   }
+                   else
+                   {
+                       TapAppDurationStandalone.Disable();
+                   }
                    gatekeeperData = data;
                    // 把 data 存储在本地
                    saveClientSettings(data);
@@ -161,7 +170,6 @@ namespace TapSDK.Core.Standalone
         private void saveClientSettings(TapGatekeeper settings)
         {
             string json = JsonConvert.SerializeObject(settings);
-            Debug.Log("saveClientSettings: " + json);
             File.WriteAllText(Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName), json);
         }
 
@@ -175,7 +183,6 @@ namespace TapSDK.Core.Standalone
                     enableAutoEvent = switchData.AutoEvent;
                 }
             }
-            Debug.Log("SetAutoEvent enableAutoEvent is: " + enableAutoEvent);
         }
     }
 

package/Standalone/Runtime/TapSDK.Core.Standalone.Runtime.asmdef

@@ -5,7 +5,6 @@
     ],
     "includePlatforms": [
         "Editor",
-        "LinuxStandalone64",
         "macOSStandalone",
         "WindowsStandalone32",
         "WindowsStandalone64"

package/package.json

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

package/Standalone/Runtime/Internal/Openlog/Bean/TapOpenlogLogGroup.cs

@@ -1,39 +0,0 @@
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
-using Newtonsoft.Json;
-using ProtoBuf;
-using System.Collections.Generic;
-
-namespace TapSDK.Core.Standalone.Internal
-{
-    [ProtoContract]
-    public class LogContent
-    {
-        [JsonProperty("Key")]
-        [ProtoMember(1)]
-        public string Key { get; set; }
-
-        [JsonProperty("Value")]
-        [ProtoMember(2)]
-        public string Value { get; set; }
-    }
-
-    [ProtoContract]
-    public class Log
-    {
-        [JsonProperty("Value")]
-        [ProtoMember(1)]
-        public uint Time { get; set; }
-        [JsonProperty("Contents")]
-        [ProtoMember(2)]
-        public List<LogContent> Contents { get; set; }
-    }
-
-    [ProtoContract]
-    public class LogGroup
-    {
-        [JsonProperty("Logs")]
-        [ProtoMember(1)]
-        public List<Log> Logs { get; set; }
-    }
-}
-#endif

package/Standalone/Runtime/Internal/Openlog/Bean/TapOpenlogStoreBean.cs

@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace TapSDK.Core.Standalone.Internal.Openlog
-{
-    public class TapOpenlogStoreBean
-    {
-        [JsonProperty("action")]
-        public string action;
-
-        [JsonProperty("timestamp")]
-        public long timestamp;
-
-        [JsonProperty("t_log_id")]
-        public string tLogId;
-
-        [JsonProperty("props")]
-        public readonly Dictionary<string, string> props;
-
-        public TapOpenlogStoreBean(string action, long timestamp, string tLogId, Dictionary<string, string> props)
-        {
-            this.action = action;
-            this.timestamp = timestamp;
-            this.tLogId = tLogId;
-            this.props = props;
-        }
-
-        public override string ToString()
-        {
-            return $"TapOpenlogStoreBean(action: {action} , tLogId: {tLogId} , timestamp: {timestamp})";
-        }
-    }
-}

package/Standalone/Runtime/Internal/Openlog/TapOpenlogHttpClient.cs

@@ -1,153 +0,0 @@
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
-using System;
-using System.Threading.Tasks;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using TapSDK.Core.Internal.Log;
-using K4os.Compression.LZ4;
-
-namespace TapSDK.Core.Standalone.Internal
-{
-    public class TapOpenlogHttpClient
-    {
-
-        private static readonly string HOST_CN = "openlog.tapapis.cn";
-        private static readonly string HOST_IO = "openlog.tapapis.com";
-
-        private static string GetHost()
-        {
-            if (TapCoreStandalone.coreOptions.region == TapTapRegionType.CN)
-            {
-                return HOST_CN;
-            }
-            else if (TapCoreStandalone.coreOptions.region == TapTapRegionType.Overseas)
-            {
-                return HOST_IO;
-            }
-            else
-            {
-                return HOST_CN;
-            }
-        }
-
-        private static TapLog log = new TapLog(module: "Openlog.HttpClient");
-
-        private static HttpClient client;
-
-        public TapOpenlogHttpClient()
-        {
-            client = new HttpClient();
-        }
-
-        public async Task<bool> Post(string path, byte[] content)
-        {
-            string url = BuildUrl(path);
-            var request = new HttpRequestMessage(HttpMethod.Post, url);
-
-            request.Headers.Add("User-Agent", "TapSDK-Unity/" + TapTapSDK.Version);
-            request.Headers.Add("Accept", "*/*");
-            request.Headers.Add("x-log-apiversion", "0.6.0");
-            request.Headers.Add("x-log-compresstype", "lz4");
-            request.Headers.Add("x-log-signaturemethod", "hmac-sha1");
-            request.Headers.Add("x-log-timestamp", DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString());
-            request.Headers.Add("x-log-bodyrawsize", content.Length.ToString());
-
-            byte[] compressContent = LZ4Compress(content);
-
-            var contentMD5 = EncryptString(compressContent);
-            request.Headers.Add("x-content-md5", contentMD5);
-
-            string methodPart = request.Method.Method;
-            string urlPath = request.RequestUri.LocalPath;
-            string headersPart = GetHeadersPart(request.Headers);
-            string signParts = methodPart + "\n" + contentMD5 + "\n" + "application/x-protobuf" + "\n" + headersPart + "\n" + urlPath;
-            string sign;
-            using (var hmac = new HMACSHA1(Encoding.UTF8.GetBytes(TapCoreStandalone.coreOptions.clientToken)))
-            {
-                byte[] hash = hmac.ComputeHash(Encoding.UTF8.GetBytes(signParts));
-                sign = Convert.ToBase64String(hash);
-            }
-
-            request.Headers.Add("Authorization", "LOG " + TapCoreStandalone.coreOptions.clientId + ":" + sign);
-
-            ByteArrayContent requestContent = new ByteArrayContent(compressContent);
-            requestContent.Headers.ContentType = new MediaTypeHeaderValue("application/x-protobuf");
-            request.Content = requestContent;
-
-            return await SendRequest(request);
-        }
-
-        private static string EncryptString(byte[] str)
-        {
-            var md5 = MD5.Create();
-            byte[] byteOld = str;
-            byte[] byteNew = md5.ComputeHash(byteOld);
-            var sb = new StringBuilder();
-            foreach (byte b in byteNew)
-            {
-                sb.Append(b.ToString("X2"));
-            }
-            return sb.ToString();
-        }
-
-        private static byte[] LZ4Compress(byte[] data)
-        {
-            int maxCompressedLength = LZ4Codec.MaximumOutputSize(data.Length);
-            byte[] compressedData = new byte[maxCompressedLength];
-            int compressedLength = LZ4Codec.Encode(data, 0, data.Length, compressedData, 0, compressedData.Length);
-
-            byte[] result = new byte[compressedLength];
-            Array.Copy(compressedData, result, compressedLength);
-            return result;
-        }
-
-        private static string GetHeadersPart(HttpRequestHeaders headers)
-        {
-            var headerKeys = headers
-                .Where(h => h.Key.StartsWith("x-log-", 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<bool> SendRequest(HttpRequestMessage request)
-        {
-            HttpResponseMessage response;
-            try
-            {
-                response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-                request.Dispose();
-            }
-            catch (HttpRequestException e)
-            {
-                log.Warning($"Request error", e.ToString());
-                return false;
-            }
-
-            if (response.IsSuccessStatusCode || (response.StatusCode >= HttpStatusCode.BadRequest && response.StatusCode < HttpStatusCode.InternalServerError))
-            {
-                response.Dispose();
-                return true;
-            }
-            else
-            {
-                log.Warning($"SendOpenlog failed", response.StatusCode.ToString());
-                response.Dispose();
-                return false;
-            }
-        }
-
-        private static string BuildUrl(string path)
-        {
-            string url = $"https://{GetHost()}/{path}?client_id={TapCoreStandalone.coreOptions.clientId}";
-            return url;
-        }
-    }
-}
-#endif

package/Standalone/Runtime/Internal/Openlog/TapOpenlogHttpClient.cs.meta

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