feat: leave room added

Author: momintlh

Assets/PlayroomKit/Examples/2d-platformer/scripts/GameManager2d.cs

@@ -64,7 +64,10 @@ private void Initialize()
         }, () =>
         {
             _playroomKit.OnPlayerJoin(AddPlayer);
-            print($"[Unity Log] isHost: {_playroomKit.IsHost()}");
+            Debug.Log($"[Unity Log] isHost: {_playroomKit.IsHost()}");
+        }, () =>
+        {
+            Debug.LogWarning("OnDisconnect Callback Called");
         });
     }
 

Assets/PlayroomKit/modules/Headers.cs

@@ -133,6 +133,9 @@ private static extern void SetPlayerStateStringById(string playerID, string key,
         [DllImport("__Internal")]
         private static extern string GetProfileByPlayerId(string playerID);
 
+        [DllImport("__Internal")]
+        private static extern void LeaveRoomInternal(Action callback = null);
+
         #region Persistence
 
         [DllImport("__Internal")]

Assets/PlayroomKit/modules/Interfaces/IPlayerBase.cs

@@ -18,10 +18,12 @@ public interface IPlayerBase
                 public Profile GetProfile();
                 public Action OnQuit(Action<string> callback);
                 public void Kick(Action onKickCallBack = null);
+                public void LeaveRoom(Action onLeaveCallback = null);
 
                 public void WaitForState(string stateKey, Action<string> onStateSetCallback = null);
 
                 protected static Action onKickCallBack = null;
+                protected static Action onLeaveCallback = null;
             }
         }
     }

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

@@ -67,7 +67,7 @@ public void SetState(string key, object value, bool reliable = false)
             _ubb.CallJs("SetPlayerStateByPlayerId", null, null, false, _id, key, json,
                 reliable.ToString().ToLower());
         }
-        
+
         public T GetState<T>(string key)
         {
             string rawValue = _ubb.CallJs<string>("GetPlayerStateByPlayerId", null, null, false, _id, key);
@@ -81,7 +81,7 @@ public T GetState<T>(string key)
             try
             {
                 var jsonNode = JSON.Parse(rawValue);
-                
+
                 if (typeof(T) == typeof(string))
                 {
                     return (T)(object)jsonNode.Value;
@@ -108,7 +108,7 @@ public T GetState<T>(string key)
                     catch (ArgumentException)
                     {
                         Debug.LogError($"Failed to parse '{rawValue}' to Enum of type {typeof(T)}");
-                        return default;  
+                        return default;
                     }
                 }
 
@@ -119,8 +119,8 @@ public T GetState<T>(string key)
                 Debug.LogError($"Failed to parse state for key '{key}': {e.Message}\nReceived value: {rawValue}");
                 return default;
             }
-            
-            
+
+
         }
 
         #endregion
@@ -140,6 +140,11 @@ public void Kick(Action onKickCallBack = null)
             _ubb.CallJs("Kick", null, null, true, _id);
         }
 
+        public void LeaveRoom(Action onLeave = null)
+        {
+            DebugLogger.LogWarning("[MockMode] leaveRoom doesn't work in mock mode, build test required");
+        }
+
         public void WaitForState(string stateKey, Action<string> onStateSetCallback = null)
         {
             string callbackKey = $"WaitForState_{stateKey}";
@@ -152,7 +157,7 @@ public void WaitForState(string stateKey, Action<string> onStateSetCallback = nu
 
             _ubb.CallJs("WaitForPlayerState", null, null, true, _id, stateKey, callbackKey);
         }
-        
+
         private List<Action<string>> OnQuitCallbacks = new();
 
         public Action OnQuit(Action<string> callback)
@@ -166,14 +171,14 @@ void Unsubscribe()
 
             return Unsubscribe;
         }
-        
+
         public void OnQuitWrapperCallback(string id)
         {
             if (OnQuitCallbacks != null)
                 foreach (var callback in OnQuitCallbacks)
                     callback?.Invoke(id);
         }
-        
+
         internal void InvokePlayerOnQuitCallback(string id)
         {
             OnQuitWrapperCallback(id);

Assets/PlayroomKit/modules/Player/LocalPlayerService.cs

@@ -61,27 +61,27 @@ public void SetState(string key, object value, bool reliable = false)
                 {
                     SetStateHelper(key, value, reliable);
                 }
-                
+
                 public void SetState(string key, Enum value, bool reliable = false)
                 {
                     SetStateHelper(key, value.ToString(), reliable);
                 }
-                
-                
+
+
 
                 public T GetState<T>(string key)
                 {
                     if (mockPlayerStatesDictionary.TryGetValue(key, out var value) && value is T typedValue)
                     {
-                      try
-                {
-                    return (T)Convert.ChangeType(typedValue, typeof(T));
-                }
-                catch (InvalidCastException)
-                {
-                    Debug.LogWarning($"Failed to convert the value of key '{key}' to type {typeof(T)}.");
-                    return default;
-                }
+                        try
+                        {
+                            return (T)Convert.ChangeType(typedValue, typeof(T));
+                        }
+                        catch (InvalidCastException)
+                        {
+                            Debug.LogWarning($"Failed to convert the value of key '{key}' to type {typeof(T)}.");
+                            return default;
+                        }
                     }
                     else
                     {
@@ -123,6 +123,11 @@ public void Kick(Action onKickCallBack = null)
                     IPlayerBase.onKickCallBack?.Invoke();
                 }
 
+                public void LeaveRoom(Action onLeave = null)
+                {
+                    DebugLogger.LogWarning("[MockMode] leaveRoom doesn't work in mock mode, build test required");
+                }
+
                 public void WaitForState(string stateKey, Action<string> onStateSetCallback = null)
                 {
                     if (onStateSetCallback == null)

Assets/PlayroomKit/modules/Player/Player.cs

@@ -126,6 +126,17 @@ public void Kick(Action OnKickCallBack = null)
                 _playerService.Kick(OnKickCallBack);
             }
 
+            public void LeaveRoom(Action onLeaveCallback = null)
+            {
+                if (!IsPlayRoomInitialized)
+                {
+                    Debug.LogError("[Mock Mode] Playroom not initialized yet! Please call InsertCoin.");
+                    return;
+                }
+
+                _playerService.LeaveRoom(onLeaveCallback);
+            }
+
             public void WaitForState(string StateKey, Action<string> onStateSetCallback = null)
             {
                 if (!IsPlayRoomInitialized)
@@ -160,7 +171,7 @@ public class Profile
             {
                 [NonSerialized]
                 public UnityEngine.Color color;
-                
+
                 public PlayerProfileColor playerProfileColor;
                 public string name;
                 public string photo;

Assets/PlayroomKit/modules/Player/PlayerService.cs

@@ -186,6 +186,17 @@ public void Kick(Action onKickCallBack = null)
                     _interop.KickPlayerWrapper(_id, InvokeKickCallBack);
                 }
 
+                public void LeaveRoom(Action onLeave = null)
+                {
+                    IPlayerBase.onLeaveCallback = onLeave;
+                    LeaveRoomInternal(InvokeLeaveRoom);
+                }
+
+                [MonoPInvokeCallback(typeof(Action))]
+                private static void InvokeLeaveRoom()
+                {
+                    IPlayerBase.onKickCallBack?.Invoke();
+                }
 
                 private static Action<string> onSetState;
 

Assets/PlayroomKit/src/index.js

@@ -121,7 +121,10 @@ mergeInto(LibraryManager.library, {
       return;
     }
 
-    var myPlayerID = Playroom.myPlayer().id;
+    const player = Playroom.myPlayer()
+    if (!player || player.id == null) return;
+
+    var myPlayerID = player.id;
     var bufferSize = lengthBytesUTF8(myPlayerID) + 1;
     var buffer = _malloc(bufferSize);
     stringToUTF8(myPlayerID, buffer, bufferSize);
@@ -820,6 +823,21 @@ mergeInto(LibraryManager.library, {
       });
   },
 
+  LeaveRoomInternal: function(callback) {
+    if (!window.Playroom) {
+      console.error(
+        "Playroom library is not loaded. Please make sure to call InsertCoin first."
+      );
+      return;
+    }    
+
+    Playroom.myPlayer().leaveRoom().then(() => {
+      {{{ makeDynCall('v', 'callback') }}};
+    }).catch((error) => {
+      console.error("[JS]: Error calling leaveRoom: ", error);
+    });
+  },
+
   ResetStatesInternal: function (keysToExclude, onStatesReset) {
     if (!window.Playroom) {
       console.error(