Merge branch 'discord-sdk'

momintlh · momintlh · commit f45f509eb9b3 · 2025-05-29T00:38:58.000+05:00
diff --git a/Assets/PlayroomKit/PlayroomKit.cs b/Assets/PlayroomKit/PlayroomKit.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System;
 using UBB;
+using Discord;
 
 
 namespace Playroom
@@ -358,6 +359,24 @@ public void StartDiscordPurchase(string skuId, Action<string> responseCallback =
             CheckPlayRoomInitialized();
             _playroomService.StartDiscordPurchase(skuId, responseCallback);
         }
+
+        public void GetDiscordSkus(Action<List<DiscordSku>> callback)
+        {
+            CheckPlayRoomInitialized();
+            _playroomService.GetDiscordSkus(callback);
+        }
+
+        public void GetDiscordEntitlements(Action<List<DiscordEntitlement>> callback)
+        {
+            CheckPlayRoomInitialized();
+            _playroomService.GetDiscordEntitlements(callback);
+        }
+
+        public void DiscordPriceFormat(float price, string currency, string locale, Action<string> callback)
+        {
+            CheckPlayRoomInitialized();
+            _playroomService.DiscordPriceFormat(price, currency, locale, callback);
+        }
         #endregion
     }
 }
diff --git a/Assets/PlayroomKit/modules/Discord/DiscordEntitlement.cs b/Assets/PlayroomKit/modules/Discord/DiscordEntitlement.cs
@@ -81,7 +81,15 @@ public static List<DiscordEntitlement> FromJSON(string jsonString)
             var list = new List<DiscordEntitlement>();
             var root = JSON.Parse(jsonString);
 
-            if (root.IsArray)
+            if (root == null)
+                throw new FormatException("Invalid JSON: root is null.");
+
+            if (root.HasKey("entitlements") && root["entitlements"].IsArray)
+            {
+                foreach (var item in root["entitlements"].AsArray)
+                    list.Add(FromJSONNode(item));
+            }
+            else if (root.IsArray)
             {
                 foreach (var item in root.AsArray)
                     list.Add(FromJSONNode(item));
diff --git a/Assets/PlayroomKit/modules/Discord/DiscordSkus.cs b/Assets/PlayroomKit/modules/Discord/DiscordSkus.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using SimpleJSON;
+
+namespace Discord
+{
+    public enum DiscordSkuType
+    {
+        UNHANDLED = -1,
+        APPLICATION = 1,
+        DLC = 2,
+        CONSUMABLE = 3,
+        BUNDLE = 4,
+        SUBSCRIPTION = 5
+    }
+
+    [Serializable]
+    public class DiscordSkuPrice
+    {
+        public int Amount;
+        public string Currency;
+
+        internal static DiscordSkuPrice FromJSONNode(JSONNode n)
+        {
+            return new DiscordSkuPrice
+            {
+                Amount = n["amount"].AsInt,
+                Currency = n["currency"].Value
+            };
+        }
+    }
+
+    [Serializable]
+    public class DiscordSku
+    {
+        // Required
+        public string Id;
+        public string Name;
+        public DiscordSkuType Type;
+        public DiscordSkuPrice Price;
+        public string ApplicationId;
+        public int Flags;
+
+        // Optional
+        public string? ReleaseDate;
+
+        internal static DiscordSku FromJSONNode(JSONNode n)
+        {
+            var rawType = n["type"].AsInt;
+            if (!Enum.IsDefined(typeof(DiscordSkuType), rawType))
+                throw new FormatException($"Unknown SkuType code: {rawType}");
+
+            var sku = new DiscordSku
+            {
+                Id = n["id"].Value,
+                Name = n["name"].Value,
+                Type = (DiscordSkuType)rawType,
+                Price = DiscordSkuPrice.FromJSONNode(n["price"]),
+                ApplicationId = n["application_id"].Value,
+                Flags = n["flags"].AsInt
+            };
+
+            if (n.HasKey("release_date"))
+            {
+                var rd = n["release_date"].Value;
+                sku.ReleaseDate = string.IsNullOrEmpty(rd) ? null : rd;
+            }
+
+            return sku;
+        }
+
+        public static List<DiscordSku> FromJSON(string jsonString)
+        {
+            var list = new List<DiscordSku>();
+            var root = JSON.Parse(jsonString);
+
+            if (root.HasKey("skus") && root["skus"].IsArray)
+            {
+                foreach (var item in root["skus"].AsArray)
+                    list.Add(FromJSONNode(item));
+            }
+            else if (root.IsArray)
+            {
+                foreach (var item in root.AsArray)
+                    list.Add(FromJSONNode(item));
+            }
+            else
+            {
+                list.Add(FromJSONNode(root));
+            }
+
+            return list;
+        }
+    }
+}
diff --git a/Assets/PlayroomKit/modules/Discord/DiscordSkus.cs.meta b/Assets/PlayroomKit/modules/Discord/DiscordSkus.cs.meta
diff --git a/Assets/PlayroomKit/modules/Headers.cs b/Assets/PlayroomKit/modules/Headers.cs
@@ -172,6 +172,16 @@ private static extern string GetPersistentDataInternal(string key,
 
         [DllImport("__Internal")]
         private static extern void StartDiscordPurchaseInternal(string skuId, Action<string, string> callback);
+
+        [DllImport("__Internal")]
+        private static extern void GetDiscordSkusInternal(Action<string> callback);
+
+        [DllImport("__Internal")]
+        private static extern void GetDiscordEntitlementsInternal(Action<string> callback);
+
+        [DllImport("__Internal")]
+        private static extern string DiscordPriceFormatInternal(float price, string currency, string locale, Action<string> callback);
+
         #endregion
     }
 }
diff --git a/Assets/PlayroomKit/modules/Helpers/CallbackManager.cs b/Assets/PlayroomKit/modules/Helpers/CallbackManager.cs
@@ -126,6 +126,17 @@ public static void InvokeCallback(string key, List<DiscordEntitlement> entitleme
             }
         }
 
+        public static void InvokeCallback(string key, List<DiscordSku> skus)
+        {
+            if (callbacks.TryGetValue(key, out Delegate callback))
+            {
+                if (callback is Action<List<DiscordSku>> action) action?.Invoke(skus);
+                else
+                    Debug.LogError(
+                        $"Callback with key {key} is of unsupported type or incorrect number of arguments: {skus}!");
+            }
+        }
+
         public static bool CheckCallback(string key)
         {
             return callbacks.TryGetValue(key, out Delegate callback);
diff --git a/Assets/PlayroomKit/modules/Interfaces/IPlayroomBase.cs b/Assets/PlayroomKit/modules/Interfaces/IPlayroomBase.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using AOT;
+using Discord;
 using UnityEngine;
 
 namespace Playroom
@@ -73,6 +74,9 @@ public void InsertCoin(InitOptions options = null, Action onLaunchCallBack = nul
             #region Discord
             public void OpenDiscordInviteDialog(Action callback = null);
             public void StartDiscordPurchase(string skuId, Action<string> callback = null);
+            public void GetDiscordSkus(Action<List<DiscordSku>> callback);
+            public void GetDiscordEntitlements(Action<List<DiscordEntitlement>> callback);
+            public void DiscordPriceFormat(float price, string currency, string locale, Action<string> callback);
             #endregion
 
 
diff --git a/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs b/Assets/PlayroomKit/modules/MockMode/BrowserMode/BrowserMockService.cs
@@ -3,6 +3,8 @@
 using System.Reflection;
 using UBB;
 using UnityEngine;
+using Discord;
+
 
 #if UNITY_EDITOR
 using ParrelSync;
@@ -323,6 +325,24 @@ public void StartDiscordPurchase(string skuId, Action<string> callback = null)
         {
             DebugLogger.LogWarning("[MockMode] Discord purchase is currently not supported in browser mock mode!");
         }
+
+        public void GetDiscordSkus(Action<List<DiscordSku>> callback)
+        {
+            DebugLogger.LogWarning("[MockMode] Discord SKUs are currently not supported in browser mock mode!");
+            callback?.Invoke(new List<DiscordSku>());
+        }
+
+        public void GetDiscordEntitlements(Action<List<DiscordEntitlement>> callback)
+        {
+            DebugLogger.LogWarning("[MockMode] Discord SKUs are currently not supported in browser mock mode!");
+            callback?.Invoke(new List<DiscordEntitlement>());
+        }
+
+        public void DiscordPriceFormat(float price, string currency, string locale, Action<string> callback)
+        {
+            DebugLogger.LogWarning("[MockMode] Discord SKUs are currently not supported in browser mock mode!");
+            callback?.Invoke("");
+        }
         #endregion
     }
 #endif
diff --git a/Assets/PlayroomKit/modules/MockMode/LocalPlayroomService.cs b/Assets/PlayroomKit/modules/MockMode/LocalPlayroomService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Discord;
 using UnityEngine;
 
 namespace Playroom
@@ -224,6 +225,24 @@ public void StartDiscordPurchase(string skuId, Action<string> callback = null)
         {
             DebugLogger.LogWarning("[MockMode] Discord purchase is currently not supported in local mode!");
         }
+
+        public void GetDiscordSkus(Action<List<DiscordSku>> callback)
+        {
+            DebugLogger.LogWarning("[MockMode] Discord SKUs are currently not supported in local mode!");
+            callback?.Invoke(new List<DiscordSku>());
+        }
+
+        public void GetDiscordEntitlements(Action<List<DiscordEntitlement>> callback)
+        {
+            DebugLogger.LogWarning("[MockMode] Discord Entitlements are currently not supported in local mode!");
+            callback?.Invoke(new List<DiscordEntitlement>());
+        }
+
+        public void DiscordPriceFormat(float price, string currency, string locale, Action<string> callback)
+        {
+            DebugLogger.LogWarning("[MockMode] Discord SKUs are currently not supported in local mode!");
+            callback?.Invoke($"${price}");
+        }
         #endregion
     }
 }
diff --git a/Assets/PlayroomKit/modules/PlayroomBuildService.cs b/Assets/PlayroomKit/modules/PlayroomBuildService.cs
@@ -4,6 +4,7 @@
 using SimpleJSON;
 using System;
 using System.Collections.Generic;
+using Discord;
 
 namespace Playroom
 {
@@ -451,6 +452,63 @@ public void StartDiscordPurchase(string skuId, Action<string> callback = null)
                 CallbackManager.RegisterCallback(callback, skuId);
                 StartDiscordPurchaseInternal(skuId, DiscordPurchaseCallback);
             }
+
+            public void GetDiscordSkus(Action<List<DiscordSku>> callback)
+            {
+                CheckPlayRoomInitialized();
+                CallbackManager.RegisterCallback(callback, "discordSkus");
+                GetDiscordSkusInternal(DiscordSkusCallback);
+            }
+
+            [MonoPInvokeCallback(typeof(Action<string>))]
+            private static void DiscordSkusCallback(string data)
+            {
+                try
+                {
+                    List<DiscordSku> list = DiscordSku.FromJSON(data);
+                    CallbackManager.InvokeCallback("discordSkus", list);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"[Unity]: Error in Discord SKU: {e}");
+                    throw;
+                }
+            }
+
+            public void GetDiscordEntitlements(Action<List<DiscordEntitlement>> callback)
+            {
+                CheckPlayRoomInitialized();
+                CallbackManager.RegisterCallback(callback, "discordEntitlements");
+                GetDiscordEntitlementsInternal(DiscordEntitlementsCallback);
+            }
+
+            [MonoPInvokeCallback(typeof(Action<string>))]
+            private static void DiscordEntitlementsCallback(string data)
+            {
+                try
+                {
+                    List<DiscordEntitlement> list = DiscordEntitlement.FromJSON(data);
+                    CallbackManager.InvokeCallback("discordEntitlements", list);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"[Unity]: Error in discord Entitlements: {e}");
+                    throw;
+                }
+            }
+
+            public void DiscordPriceFormat(float price, string currency, string locale, Action<string> callback)
+            {
+                CheckPlayRoomInitialized();
+                CallbackManager.RegisterCallback(callback, "formattedPrice");
+                DiscordPriceFormatInternal(price, currency, locale, DiscordPriceFormatCallbackInvoker);
+            }
+
+            [MonoPInvokeCallback(typeof(Action<string>))]
+            private static void DiscordPriceFormatCallbackInvoker(string formattedPrice)
+            {
+                CallbackManager.InvokeCallback("formattedPrice", formattedPrice);
+            }
             #endregion
 
             #region Callbacks
diff --git a/Assets/PlayroomKit/src/frameworks.js b/Assets/PlayroomKit/src/frameworks.js
@@ -1,2 +1,2 @@
 import * as Playroom from "playroomkit";
-window.Playroom = Playroom;
+window.Playroom = Playroom;
diff --git a/Assets/PlayroomKit/src/index.js b/Assets/PlayroomKit/src/index.js
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,17 @@ public static void InvokeCallback(string key, List<DiscordEntitlement> entitleme`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
	`129`	`+ public static void InvokeCallback(string key, List<DiscordSku> skus)`
	`130`	`+ {`
	`131`	`+ if (callbacks.TryGetValue(key, out Delegate callback))`
	`132`	`+ {`
	`133`	`+ if (callback is Action<List<DiscordSku>> action) action?.Invoke(skus);`
	`134`	`+ else`
	`135`	`+ Debug.LogError(`
	`136`	`+ $"Callback with key {key} is of unsupported type or incorrect number of arguments: {skus}!");`
	`137`	`+ }`
	`138`	`+ }`
	`139`	`+`
`129`	`140`	`public static bool CheckCallback(string key)`
`130`	`141`	`{`
`131`	`142`	`return callbacks.TryGetValue(key, out Delegate callback);`