Fix: fixed callback invoking in rpcRegister

Assets/PlayroomKit/PlayroomKit.cs

@@ -1044,17 +1044,15 @@ public enum RpcMode
             HOST
         }
 
-        private static List<Action<string, string>> rpcRegisterCallbacks = new();
-        private static List<string> rpcRegisteredEvents = new();
+        private static Dictionary<string, Action<string, string>> rpcRegisterCallbacks = new();
         private static List<string> rpcCalledEvents = new();
 
         [DllImport("__Internal")]
         private extern static void RpcRegisterInternal(string name, Action<string, string> rpcRegisterCallback, string onResponseReturn = null);
 
         public static void RpcRegister(string name, Action<string, string> rpcRegisterCallback, string onResponseReturn = null)
         {
-            rpcRegisterCallbacks.Add(rpcRegisterCallback);
-            rpcRegisteredEvents.Add(name);
+            rpcRegisterCallbacks.Add(name, rpcRegisterCallback);
             RpcRegisterInternal(name, InvokeRpcRegisterCallBack, onResponseReturn);
         }
 
@@ -1079,20 +1077,28 @@ private static void InvokeRpcRegisterCallBack(string dataJson, string senderJson
             }
 
 
-            // Getting the name of called Rpc event
-            string name = GetState<string>("rpcCalledEventName");
+            List<string> updatedRpcCalledEvents = new();
+            // This state is required to update the called rpc events list 
+            string nameJson = GetState<string>("rpcCalledEventName");
 
-            if (!rpcCalledEvents.Contains(name))
+            JSONArray jsonArray = JSON.Parse(nameJson).AsArray;
+            foreach (JSONNode node in jsonArray)
             {
-                rpcCalledEvents.Add(name);
+                string item = node.Value;
+                updatedRpcCalledEvents.Add(item);
             }
 
+            Debug.Log("\n\nupdatedRpcCalledEvents: ");
+            for (int i = 0; i < updatedRpcCalledEvents.Count; i++)
+            {
+                Debug.Log(updatedRpcCalledEvents[i]);
+            }
 
-            for (int i = 0; i < Math.Min(rpcRegisteredEvents.Count, rpcCalledEvents.Count); i++)
+            foreach (string name in updatedRpcCalledEvents)
             {
-                if (rpcRegisteredEvents[i] == rpcCalledEvents[i])
+                if (rpcRegisterCallbacks.TryGetValue(name, out Action<string, string> callback))
                 {
-                    rpcRegisterCallbacks[i].Invoke(dataJson, senderJson);
+                    callback?.Invoke(dataJson, senderJson);
                 }
             }
 
@@ -1105,9 +1111,6 @@ private static void InvokeRpcRegisterCallBack(string dataJson, string senderJson
 
         public static void RpcCall(string name, object data, RpcMode mode, Action callbackOnResponse)
         {
-            // setting to sync the event name with other players
-            SetState("rpcCalledEventName", name, reliable: true);
-
 
             string jsonData = ConvertToJson(data);
 
@@ -1124,6 +1127,18 @@ public static void RpcCall(string name, object data, RpcMode mode, Action callba
                 }
             }
 
+
+            JSONArray jsonArray = new JSONArray();
+            foreach (string item in rpcCalledEvents)
+            {
+                jsonArray.Add(item);
+            }
+            string jsonString = jsonArray.ToString();
+            /* 
+            This is requrired to sync the rpc events between all players, without this players won't know which event has been called.
+            this is a temporary fix, RPC's need to be handled within JS for better control.*/
+            SetState("rpcCalledEventName", jsonString, reliable: true);
+
             RpcCallInternal(name, jsonData, mode, InvokeOnResponseCallback);
         }
 
@@ -1138,7 +1153,7 @@ private static void InvokeOnResponseCallback()
         {
             var namesToRemove = new List<string>();
 
-            foreach (var name in rpcCalledEvents)
+            foreach (string name in rpcCalledEvents)
             {
                 try
                 {

Assets/Scripts/GameManager.cs

@@ -67,9 +67,10 @@ void Start()
         PlayroomKit.RpcRegister("Hello", Hello);
     }
 
-    private void Hello(string arg1, string arg2)
+    private void Hello(string data, string caller)
     {
-        print("helo");
+        var player = PlayroomKit.GetPlayer(caller);
+        Debug.Log($"Caller: {caller}, Player Name: {player?.GetProfile().name}, Data: {data}");
     }
 
     void HandleScoreUpdate(string data, string caller)
@@ -111,6 +112,7 @@ private void Update()
             players[index].SetState("pos", playerGameObjects[index].GetComponent<Transform>().position);
 
             ShootBullet(index);
+            SayHello();
 
             if (Input.GetKeyDown(KeyCode.R) && PlayroomKit.IsHost())
             {
@@ -159,7 +161,8 @@ private void SayHello()
     {
         if (Input.GetKeyDown(KeyCode.H))
         {
-            PlayroomKit.RpcCall("Hello", -1, () => {
+            PlayroomKit.RpcCall("Hello", -1, () =>
+            {
                 Debug.Log("saying helo");
             });
         }