Merge branch 'patchUrlMapping'

Author: momintlh

Assets/PlayroomKit/PlayroomKit.cs

@@ -348,7 +348,24 @@ public void ClearTurns(Action callback = null)
 
         #endregion
 
-        #region Discord
+        #region Discord Helpers
+        public static bool IsDicordContext()
+        {
+            return Application.absoluteURL.Contains("discord");
+        }
+
+        private static bool ValidateDiscord(string warningMessage)
+        {
+            if (!IsDicordContext())
+            {
+                UnityEngine.Debug.LogWarning($"[PlayroomDiscord] {warningMessage}");
+                return false;
+            }
+            return true;
+        }
+        #endregion
+
+        #region Discord    
         public void OpenDiscordInviteDialog(Action callback = null)
         {
             CheckPlayRoomInitialized();
@@ -391,6 +408,14 @@ public void SubscribeDiscordEvent(SDKEvent eventName, Action<string> callback)
             _playroomService.SubscribeDiscordEvent(eventName, callback);
         }
 
+        public void PatchDiscordUrlMappings(List<Mapping> mappings, PatchUrlMappingsConfig config = null)
+        {
+            if (!ValidateDiscord("PatchUrlMappings only works inside discord."))
+                return;
+
+            _playroomService.PatchDiscordUrlMappings(mappings, config);
+        }
+
         #endregion
     }
 }

Assets/PlayroomKit/modules/Discord/Utils.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace Discord
+{
+    public class Mapping
+    {
+        public string Prefix { get; set; }
+        public string Target { get; set; }
+    }
+
+    public class RemapInput {
+        public string URL { get; set; }
+        public List<Mapping> Mappings { get; set; }
+    }
+
+    public class PatchUrlMappingsConfig
+    {
+        public bool PatchFetch { get; set; } = true;
+        public bool PatchWebSocket { get; set; } = true;
+        public bool PatchXhr { get; set; } = true;
+        public bool PatchSrcAttributes { get; set; } = false;
+    }
+}

Assets/PlayroomKit/modules/Discord/Utils.cs.meta

@@ -187,6 +187,9 @@ private static extern string GetPersistentDataInternal(string key,
 
         [DllImport("__Internal")]
         private static extern void SubscribeDiscordInternal(string eventName, Action<string, string> callback);
+
+        [DllImport("__Internal")]
+        private static extern void PatchDiscordUrlMappingsInternal(string prefix, string target);
         #endregion
     }
 }

Assets/PlayroomKit/modules/Headers.cs

@@ -79,6 +79,7 @@ public void InsertCoin(InitOptions options = null, Action onLaunchCallBack = nul
             public void GetDiscordEntitlements(Action<List<DiscordEntitlement>> callback);
             public void DiscordPriceFormat(float price, string currency, string locale, Action<string> callback);
             public void SubscribeDiscordEvent(SDKEvent eventName, Action<string> callback);
+            public void PatchDiscordUrlMappings(List<Mapping> mappings, PatchUrlMappingsConfig config = null);
             #endregion
 
 

Assets/PlayroomKit/modules/Interfaces/IPlayroomBase.cs

@@ -1,3 +1,6 @@
+using Discord;
+using System.Collections.Generic;
+
 namespace Playroom
 {
     public interface IPlayroomBuildExtensions
@@ -7,5 +10,7 @@ public interface IPlayroomBuildExtensions
         void SetState(string key, bool value, bool reliable = false);
         void SetState(string key, float value, bool reliable = false);
         void SetState(string key, object value, bool reliable = false);
+
+        void PatchDiscordUrlMappings(List<Mapping> mappings, PatchUrlMappingsConfig config = null);
     }
 }

Assets/PlayroomKit/modules/Interfaces/IPlayroomBuildExtensions.cs

@@ -354,6 +354,11 @@ public void OpenDiscordExternalLink(string url, Action<string> callback = null)
             DebugLogger.LogWarning("[MockMode] Discord external link is currently not supported in browser mock mode!");
             callback?.Invoke("true");
         }
+
+        public void PatchDiscordUrlMappings(List<Mapping> mappings, PatchUrlMappingsConfig config = null)
+        {
+            DebugLogger.LogWarning("[MockMode] Patch Discord URL Mappings is currently not supported in browser mock mode!");
+        }
         #endregion
     }
 #endif

Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs

@@ -254,6 +254,11 @@ public void OpenDiscordExternalLink(string url, Action<string> callback = null)
             DebugLogger.LogWarning("[MockMode] Discord external link is currently not supported in local mode!");
             callback?.Invoke("true");
         }
+
+        public void PatchDiscordUrlMappings(List<Mapping> mappings, PatchUrlMappingsConfig config = null)
+        {
+            DebugLogger.LogWarning("[MockMode] Patch Discord URL Mappings is currently not supported in local mode!");
+        }
         #endregion
     }
 }

Assets/PlayroomKit/modules/MockMode/LocalPlayroomService.cs

@@ -433,6 +433,14 @@ private static void ClearTurnsCallback()
             #endregion
 
             #region Discord API
+            public void PatchDiscordUrlMappings(List<Mapping> mappings, PatchUrlMappingsConfig config = null)
+            {
+                for (int i = 0; i < mappings.Count; i++)
+                {
+                    PatchDiscordUrlMappingsInternal(mappings[i].Prefix, mappings[i].Target);
+                }
+            }
+
             public void OpenDiscordInviteDialog(Action callback = null)
             {
                 CheckPlayRoomInitialized();
@@ -598,7 +606,6 @@ private static void InvokeOnErrorInsertCoin(string error)
                 _onError?.Invoke(error);
                 Debug.LogException(new Exception(error));
             }
-
             #endregion
         }
     }

Assets/PlayroomKit/modules/PlayroomBuildService.cs

@@ -1208,8 +1208,7 @@ mergeInto(LibraryManager.library, {
 
   },
 
-  // callback variant
-    DiscordPriceFormatInternal: function(amount, currencyOrPtr, localeOrPtr, callbackPtr) {
+  DiscordPriceFormatInternal: function(amount, currencyOrPtr, localeOrPtr, callbackPtr) {
     var currency = (typeof currencyOrPtr === 'string')
       ? currencyOrPtr
       : UTF8ToString(currencyOrPtr);
@@ -1229,9 +1228,24 @@ mergeInto(LibraryManager.library, {
       {{{ makeDynCall("vi", "callbackPtr") }}}(0);
     });
   },
- 
-  //#endregion
+  
+  PatchDiscordUrlMappingsInternal: function (prefix, target) {
+    prefix = UTF8ToString(prefix);
+    target = UTF8ToString(target);
 
+    console.log(`[JSLIB]: PatchingURL: ${prefix} and ${target}`);
+
+    try {
+      Playroom.getDiscordSDK().then(discordSDK => {
+        discordSDK.patchUrlMappings([{ prefix: prefix, target: target }]);
+      }).catch(err => {
+        console.error("Discord SDK load failed:", err);
+      });
+    } catch (error) {
+      console.error(`[JSLIB] error PatchUrlMappingsInternal: ${error}`);
+    }
+  },
+  //#endregion
 
   //#region Utils
   GetPlayroomTokenInternal: function () {