com.xd.sdk.common 7.0.1 → 7.1.0

package/Runtime/Internal/Standalone/Config/AppConfig.cs

@@ -42,7 +42,7 @@ namespace XD.SDK.Common.Internal.Standalone
         [JsonProperty("anit")] public AntiConfig Anti { get; internal set; }
 
         [JsonProperty("customer_disable")] public bool CustomerDisable { get; internal set; }
-        
+
         [JsonIgnore] public string Region { get; internal set; }
 
         [JsonIgnore] public List<BindEntryConfig> BindEntryConfigs { get; internal set; }
@@ -53,6 +53,7 @@ namespace XD.SDK.Common.Internal.Standalone
 
         [JsonIgnore] public bool DisableAutoLogin2Tap { get; set; }
 
+        [JsonIgnore] public bool DisableWebPreload { get; set; }
 
         /// <summary>
         /// 判断是否为海外
@@ -63,6 +64,7 @@ namespace XD.SDK.Common.Internal.Standalone
         {
 #if UNITY_STANDALONE_WIN
             // win 环境 + packageType 为 tapPC + clientPublicKey 不为空
+            XDGLogger.Debug($"UsingTapPC:{IsGlobal} pacakgeType:{PackageType} TapConfig:{TapConfig != null} !clientPublicKey:{!string.IsNullOrEmpty(TapConfig?.ClientPublicKey)}");
             return !IsGlobal && string.Equals(PackageType, XDGPackageType.PackageTypePCTapTap) && TapConfig != null && !string.IsNullOrEmpty(TapConfig.ClientPublicKey);
 #endif
             return false;

package/Runtime/Internal/Standalone/Config/Config.cs

@@ -22,8 +22,10 @@ namespace XD.SDK.Common.Internal.Standalone
         [JsonProperty("webWhiteList")] public List<string> WebWhiteList { get; private set; }
 
         [JsonProperty("disableAutoLogin2Tap")] public bool DisableAutoLogin2Tap { get; private set; }
-        
+
         [JsonProperty("anti")] public AntiConfig Anti { get; private set; }
+
+        [JsonProperty("disableWebPreload")] public bool DisableWebPreload { get; private set; }
     }
 }
 #endif

package/Runtime/Internal/Standalone/Config/ConfigModule.cs

@@ -34,11 +34,11 @@ namespace XD.SDK.Common.Internal.Standalone
 
         private static string LoadConfigText()
         {
-#if UNITY_EDITOR
-            var xdConfigFilePath = GetXDConfigPath(ConfigFile);
-#else
+// #if UNITY_EDITOR
+//             var xdConfigFilePath = GetXDConfigPath(ConfigFile);
+// #else
             var xdConfigFilePath = Path.Combine(Application.streamingAssetsPath, $"{ConfigFile}.json");
-#endif
+// #endif
             return File.ReadAllText(xdConfigFilePath);
         }
 
@@ -199,6 +199,8 @@ namespace XD.SDK.Common.Internal.Standalone
                     }
                 }
 
+                _appConfig.DisableWebPreload = config.DisableWebPreload;
+
                 _appConfig.DisableAutoLogin2Tap = config.DisableAutoLogin2Tap;
             }
 
@@ -249,6 +251,8 @@ namespace XD.SDK.Common.Internal.Standalone
         public static string CancelUrl => _appConfig.CancelUrl;
 
         public static bool CustomerDisable => _appConfig.CustomerDisable;
+
+        public static bool DisableWebPreload => _appConfig.DisableWebPreload;
     }
 }
 #endif

package/Runtime/Internal/Standalone/Utils/SteamWrapper.cs

@@ -2,60 +2,93 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using Steamworks;
 using Newtonsoft.Json;
 
-namespace XD.SDK.Common.Internal.Standalone {
-    public class SteamWrapper : ISteamSDKWrapper {
+namespace XD.SDK.Common.Internal.Standalone
+{
+    public class SteamWrapper : ISteamSDKWrapper
+    {
         private readonly Callback<GetAuthSessionTicketResponse_t> getAuthSessionTicketResponseCallback;
         private readonly ConcurrentDictionary<HAuthTicket, Tuple<TaskCompletionSource<string>, string>> tickTasks;
 
         private readonly Callback<MicroTxnAuthorizationResponse_t> mircoTxnAuthorizationCallback;
         private readonly ConcurrentDictionary<ulong, TaskCompletionSource<string>> microTxnTasks;
+        private readonly Type _steamManagerType;
 
-        public SteamWrapper() {
+        public SteamWrapper()
+        {
             tickTasks = new ConcurrentDictionary<HAuthTicket, Tuple<TaskCompletionSource<string>, string>>();
 
-            getAuthSessionTicketResponseCallback = Callback<GetAuthSessionTicketResponse_t>.Create((GetAuthSessionTicketResponse_t pCallback) => {
+            getAuthSessionTicketResponseCallback = Callback<GetAuthSessionTicketResponse_t>.Create((GetAuthSessionTicketResponse_t pCallback) =>
+            {
                 HAuthTicket authTicket = pCallback.m_hAuthTicket;
-                if (tickTasks.TryRemove(authTicket, out Tuple<TaskCompletionSource<string>, string> callback)) {
+                if (tickTasks.TryRemove(authTicket, out Tuple<TaskCompletionSource<string>, string> callback))
+                {
                     callback.Item1.TrySetResult(callback.Item2);
                 }
             });
 
             microTxnTasks = new ConcurrentDictionary<ulong, TaskCompletionSource<string>>();
 
-            mircoTxnAuthorizationCallback = Callback<MicroTxnAuthorizationResponse_t>.Create((MicroTxnAuthorizationResponse_t pCallback) => {
+            mircoTxnAuthorizationCallback = Callback<MicroTxnAuthorizationResponse_t>.Create((MicroTxnAuthorizationResponse_t pCallback) =>
+            {
                 // 根据 pCallback.m_ulOrderID 查找对应的回调
                 ulong orderId = pCallback.m_ulOrderID;
                 UnityEngine.Debug.Log($"recv order id: {orderId}");
-                if (microTxnTasks.TryGetValue(orderId, out TaskCompletionSource<string> tcs)) {
-                    if (pCallback.m_bAuthorized == 1) {
-                        Dictionary<string, object> data = new Dictionary<string, object> {
+                if (microTxnTasks.TryGetValue(orderId, out TaskCompletionSource<string> tcs))
+                {
+                    if (pCallback.m_bAuthorized == 1)
+                    {
+                        Dictionary<string, object> data = new Dictionary<string, object>
+                        {
                             { "appId", pCallback.m_unAppID },
                             { "orderId", pCallback.m_ulOrderID },
                             { "authorized", pCallback.m_bAuthorized }
                         };
                         tcs.TrySetResult(JsonConvert.SerializeObject(data));
-                    } else {
+                    }
+                    else
+                    {
                         tcs.TrySetException(new XDGError(ResponseCode.Common.Failed, "Steam authorization failure"));
                     }
                 }
             });
+            
+            _steamManagerType = AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(a => a.GetTypes())
+                .FirstOrDefault(t => t.Name == "SteamManager");
+        }
+
+        private bool Initialized()
+        {
+            var initialized = false;
+            if (_steamManagerType == null) return false;
+            var prop = _steamManagerType.GetProperty("Initialized", BindingFlags.Public | BindingFlags.Static);
+            if (prop != null)
+            {
+                initialized = (bool)prop.GetValue(null);
+            }
+            return initialized;
         }
+        
+        public Task<string> GetAuthTicket()
+        {
+            if (!Initialized())
+            {
+                throw new Exception("Steam did not initialize.");
+            }
 
-        public Task<string> GetAuthTicket() {
-            // if (!SteamManager.Initialized) {
-            //     throw new Exception("Steam did not initialize.");
-            // }
 
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
 
             byte[] data = new byte[1024];
             HAuthTicket hTicket = SteamUser.GetAuthSessionTicket(data, 1024, out uint ticketLength);
             string ticket = BitConverter.ToString(data, 0, (int)ticketLength)
-                    .Replace("-", string.Empty);
+                .Replace("-", string.Empty);
             tickTasks.TryAdd(hTicket, new Tuple<TaskCompletionSource<string>, string>(tcs, ticket));
 
             return tcs.Task;
@@ -66,20 +99,26 @@ namespace XD.SDK.Common.Internal.Standalone {
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        public Task<string> GetMicroTxn(ulong orderId) {
-            // if (!SteamManager.Initialized) {
-            //     throw new Exception("Steam did not initialize.");
-            // }
+        public Task<string> GetMicroTxn(ulong orderId)
+        {
+            if (!Initialized())
+            {
+                throw new Exception("Steam did not initialize.");
+            }
+
 
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
             microTxnTasks.TryAdd(orderId, tcs);
             return tcs.Task;
         }
 
-        public string GetSteamId() {
-            // if (!SteamManager.Initialized) {
-            //     throw new Exception("Steam did not initialize.");
-            // }
+        public string GetSteamId()
+        {
+            if (!Initialized())
+            {
+                throw new Exception("Steam did not initialize.");
+            }
+
 
             try
             {
@@ -93,18 +132,24 @@ namespace XD.SDK.Common.Internal.Standalone {
             }
         }
 
-        public string GetSteamLanguage() {
-            // if (!SteamManager.Initialized) {
-            //     throw new Exception("Steam did not initialize.");
-            // }
-            
+        public string GetSteamLanguage()
+        {
+            if (!Initialized())
+            {
+                throw new Exception("Steam did not initialize.");
+            }
+
+
             return SteamApps.GetCurrentGameLanguage();
         }
 
-        public string GetSteamCountry() {
-            // if (!SteamManager.Initialized) {
-            //     throw new Exception("Steam did not initialize.");
-            // }
+        public string GetSteamCountry()
+        {
+            if (!Initialized())
+            {
+                throw new Exception("Steam did not initialize.");
+            }
+
 
             try
             {

package/Runtime/Internal/Standalone/Web/Function/BackgroundColorWebFunction.cs

@@ -17,7 +17,7 @@ namespace XD.SDK.Common.Internal.Standalone
         public void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
-            webView.ProviderWebTrans().Transparent(GetName(), data);
+            webView.ProviderWebTrans()?.Transparent(GetName(), data);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/CloseVisibleWebFunction.cs

@@ -15,8 +15,7 @@ namespace XD.SDK.Common.Internal.Standalone
 
         public void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
-            XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
-            webView.ProviderWebTrans().Transparent(Tag, data);
+            webView.ProviderWebTrans()?.Transparent(Tag, data);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/CloseWebFunction.cs

@@ -16,12 +16,9 @@ namespace XD.SDK.Common.Internal.Standalone
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
             var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
-            dic.TryGetValue("extra", out var extra);
-            callbackFunction?.Invoke(new WebBridgeResponse.Success
-            {
-                Data = extra
-            });
+            webView.ProviderWebTrans()?.TransObserver(WebActionEnum.CLOSE, dic);
             UIManager.Dismiss();
+            webView.Release();
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/GameMessageWebFunction.cs

@@ -16,7 +16,7 @@ namespace XD.SDK.Common.Internal.Standalone
         {
             XDGLogger.Debug("GameMessageWebFunction.Handler()");
             var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
-            webView.ProviderWebTrans().TransObserver(WebActionEnum.MESSAGE, dic);
+            webView.ProviderWebTrans()?.TransObserver(WebActionEnum.MESSAGE, dic);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/NavigationWebFunction.cs

@@ -16,7 +16,7 @@ namespace XD.SDK.Common.Internal.Standalone
         public void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
-            webView.ProviderWebTrans().Transparent(GetName(), data);
+            webView.ProviderWebTrans()?.Transparent(GetName(), data);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/PreloadWebTransmit.cs

@@ -0,0 +1 @@
+#if UNITY_EDITOR || UNITY_STANDALONE
    public class PreloadWebTransmit : IWebTransmit
    {
        private readonly Action<WebActionEnum, Dictionary<string, object>> callback;
        private readonly Action dispose;
        public PreloadWebTransmit(Action<WebActionEnum, Dictionary<string, object>> callback, Action dispose)
        {
            this.dispose = dispose;
            this.callback = callback;
        }
        public void Transparent(string functionName, string data)
        {
        }
        public void TransObserver(WebActionEnum type, Dictionary<string, object> dict)
        {
            callback?.Invoke(type, dict);
            dispose?.Invoke();
        }
    }

package/Runtime/Internal/Standalone/Web/PreloadWebTransmit.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 66be7c98de7f4406876c3e1d534fb3f6
+timeCreated: 1759997344

package/Runtime/Internal/Standalone/Web/WebBridgeController.cs

@@ -34,39 +34,46 @@ namespace XD.SDK.Common.Internal.Standalone
 
         private void OnMessageEmitted()
         {
-            webView.MessageEmitted += (_, args) =>
+            try
             {
-                try
+                webView.MessageEmitted += (_, args) =>
                 {
-                    if (!IsWhiteList())
-                    {
-                        XDGLogger.Debug($"WebBridgeController OnMessageEmitted 白名单校验失败");
-                        return;
-                    }
-
-                    var content = DecodeBase64String(args.Value);
-                    var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(content);
-                    if (dic == null)
+                    try
                     {
-                        XDGLogger.Debug($"WebBridgeController OnMessageEmitted 解析 jsBridge 参数失败");
-                        return;
+                        if (!IsWhiteList())
+                        {
+                            XDGLogger.Debug($"WebBridgeController OnMessageEmitted 白名单校验失败");
+                            return;
+                        }
+
+                        var content = DecodeBase64String(args.Value);
+                        var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(content);
+                        if (dic == null)
+                        {
+                            XDGLogger.Debug($"WebBridgeController OnMessageEmitted 解析 jsBridge 参数失败");
+                            return;
+                        }
+
+                        if (dic.TryGetValue("responseId", out var responseId))
+                        {
+                            DispatchResponse(responseId as string, dic["responseData"]);
+                            return;
+                        }
+
+                        dic.TryGetValue("handlerName", out var handlerName);
+                        dic.TryGetValue("callbackId", out var callbackId);
+                        DispatchHandler(handlerName as string, callbackId as string, dic["data"]);
                     }
-
-                    if (dic.TryGetValue("responseId", out var responseId))
+                    catch (Exception e)
                     {
-                        DispatchResponse(responseId as string, dic["responseData"]);
-                        return;
+                        XDGLogger.Debug(e.Message);
                     }
-
-                    dic.TryGetValue("handlerName", out var handlerName);
-                    dic.TryGetValue("callbackId", out var callbackId);
-                    DispatchHandler(handlerName as string, callbackId as string, dic["data"]);
-                }
-                catch (Exception e)
-                {
-                    XDGLogger.Debug(e.Message);
-                }
-            };
+                };
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Debug(e.Message);
+            }
         }
 
         public void RegisterHandler(IWebFunction handler)

package/Runtime/Internal/Standalone/Web/WebRequest.cs

@@ -2,9 +2,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Vuplex.WebView;
-using Task = System.Threading.Tasks.Task;
 
 namespace XD.SDK.Common.Internal.Standalone
 {
@@ -18,27 +19,75 @@ namespace XD.SDK.Common.Internal.Standalone
                 return;
             }
 
+            {
+                var queryParams = ParseQueryString(url);
+                var noUI = GetValueOrDefault(queryParams, "xdNoUI", "0") == "1";
+                if (noUI)
+                {
+                    PreloadWithCallback(url, callback, true);
+                    return;
+                }
+            }   
+            
+            XDGLogger.Debug("===> OpenWebPage " + url);
+            
             UIManager.ShowUI<XDWebBridgeView>("XDWebBridgeView", new Dictionary<string, object>
             {
                 { "url", url },
                 { "alpha", 0f },
                 { "interceptor", functions }
-            }, (code, data) =>
+            }, (code, data) => { callback?.Invoke((WebActionEnum)code, JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(data))); });
+        }
+
+        public static void Preload(string url)
+        {
+            PreloadWithCallback(url, null);
+        }
+
+        private static async void PreloadWithCallback(string url, Action<WebActionEnum, Dictionary<string, object>> callback, bool noUI = false)
+        {
+            XDGLogger.Debug("===> Preload " + url);
+
+            try
             {
-                callback?.Invoke((WebActionEnum)code,
-                    JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(data)));
-            });
+                var webView = Web.CreateWebView();
+                await webView.Init(1, 1);
+                var controller = new WebBridgeController(webView, new PreloadWebTransmit(callback, () => webView.Dispose()));
+                webView.LoadUrl(url);
+                await webView.WaitForNextPageLoadToFinish();
+                if (noUI) return;
+                await Task.Delay(15 * 1000);
+                controller.Release();
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        }
+
+        internal static Dictionary<string, string> ParseQueryString(string url)
+        {
+            var uri = new Uri(url);
+            if (string.IsNullOrWhiteSpace(uri.Query))
+            {
+                return new Dictionary<string, string>();
+            }
+
+            var dic = uri.Query.Substring(1)
+                .Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(param => param.Split(new[] { '=' }, 2, StringSplitOptions.RemoveEmptyEntries))
+                .GroupBy(part => part[0], part => part.Length > 1 ? part[1] : string.Empty)
+                .ToDictionary(group => group.Key, group => string.Join(",", group));
+            return dic;
         }
 
-        public static async void Preload(string url)
+        internal static TValue GetValueOrDefault<TKey, TValue>(
+            Dictionary<TKey, TValue> dictionary,
+            TKey key,
+            TValue defaultValue)
         {
-            var webView = Web.CreateWebView();
-            await webView.Init(1, 1);
-            var controller = new WebBridgeController(webView, null);
-            webView.LoadUrl(url);
-            await webView.WaitForNextPageLoadToFinish();
-            await Task.Delay(60 * 1000);
-            controller.Release();
+            if (dictionary == null) return defaultValue;
+            return dictionary.TryGetValue(key, out var obj) ? obj : defaultValue;
         }
     }
 }

package/Runtime/Internal/Standalone/Web/XDWebBridgeView.cs

@@ -73,23 +73,29 @@ namespace XD.SDK.Common.Internal.Standalone
             canvasWebViewPrefab.WebView.UrlChanged += OnUrlChanged;
             canvasWebViewPrefab.WebView.PageLoadFailed += OnPageLoadFailed;
             webBridgeController = new WebBridgeController(canvasWebViewPrefab.WebView, this);
-            if (extra["interceptor"] != null)
+            if (extra != null && extra.TryGetValue("interceptor", out var value))
             {
-                List<IWebFunction> interceptorFunctions = extra["interceptor"] as List<IWebFunction>;
+                List<IWebFunction> interceptorFunctions = value as List<IWebFunction>;
                 if (interceptorFunctions != null)
                     foreach (var interceptorFunction in interceptorFunctions)
                     {
                         webBridgeController.RegisterHandler(interceptorFunction);
                     }
             }
-
             Reload();
         }
 
         private void OnDestroy()
         {
-            canvasWebViewPrefab.Destroy();
-            webBridgeController.Release();
+            try
+            {
+                webBridgeController?.Release();
+                canvasWebViewPrefab?.Destroy();
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Warn(e.Message);
+            }
         }
 
         private async void OnBackButtonClicked()
@@ -144,12 +150,12 @@ namespace XD.SDK.Common.Internal.Standalone
 
         private void ParseUriToInitWebView(string url)
         {
-            var queryParams = ParseQueryString(url);
-            var bgColor = GetValueOrDefault(queryParams, "xdBgColor", WebBridgeConstants.DefaultBgColor);
-            var close = GetValueOrDefault(queryParams, "xdClose", "1") == "1";
-            var loading = GetValueOrDefault(queryParams, "xdLoading", "1") == "1";
-            var nav = GetValueOrDefault(queryParams, "xdNav", "1") == "1";
-            var title = Uri.UnescapeDataString(GetValueOrDefault(queryParams, "xdTitle", ""));
+            var queryParams = WebRequest.ParseQueryString(url);
+            var bgColor = WebRequest.GetValueOrDefault(queryParams, "xdBgColor", WebBridgeConstants.DefaultBgColor);
+            var close = WebRequest.GetValueOrDefault(queryParams, "xdClose", "1") == "1";
+            var loading = WebRequest.GetValueOrDefault(queryParams, "xdLoading", "1") == "1";
+            var nav = WebRequest.GetValueOrDefault(queryParams, "xdNav", "1") == "1";
+            var title = Uri.UnescapeDataString(WebRequest.GetValueOrDefault(queryParams, "xdTitle", ""));
 
             HandlerCloseButtonVisible(new WebCloseButtonBean
             {
@@ -167,7 +173,7 @@ namespace XD.SDK.Common.Internal.Standalone
 
             if (loading)
             {
-                UIManager.ShowLoading();
+                UIManager.ShowLoading(false, 5);
             }
         }
 
@@ -271,31 +277,6 @@ namespace XD.SDK.Common.Internal.Standalone
             ColorUtility.TryParseHtmlString(color, out var c);
             return c;
         }
-
-        private static Dictionary<string, string> ParseQueryString(string url)
-        {
-            var uri = new Uri(url);
-            if (string.IsNullOrWhiteSpace(uri.Query))
-            {
-                return new Dictionary<string, string>();
-            }
-
-            var dic = uri.Query.Substring(1)
-                .Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(param => param.Split(new[] { '=' }, 2, StringSplitOptions.RemoveEmptyEntries))
-                .GroupBy(part => part[0], part => part.Length > 1 ? part[1] : string.Empty)
-                .ToDictionary(group => group.Key, group => string.Join(",", group));
-            return dic;
-        }
-
-        private static TValue GetValueOrDefault<TKey, TValue>(
-            IReadOnlyDictionary<TKey, TValue> dictionary,
-            TKey key,
-            TValue defaultValue)
-        {
-            if (dictionary == null) return defaultValue;
-            return dictionary.TryGetValue(key, out var obj) ? obj : defaultValue;
-        }
     }
 }
 #endif

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.common",
   "displayName": "XDGSDK Common",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.foundation": "7.0.1"
+    "com.xd.sdk.foundation": "7.1.0"
   }
 }