Add P2P connection state tracking and handshake protocol

Author: JessTello

Assets/Scripts/EOSPeer2PeerManager.cs

@@ -89,6 +89,15 @@ public class EOSPeer2PeerManager : IEOSSubManager
 
         public UIPeer2PeerParticleController ParticleController;
         public Transform parent;
+        private enum PeerConnectionAppState
+        {
+            NotConnected,
+            IceConnected,
+            HandshakePending,
+            FullyConnected
+        }
+
+        private Dictionary<ProductUserId, PeerConnectionAppState> connectionStates = new();
 
 #if UNITY_EDITOR
         void OnPlayModeChanged(UnityEditor.PlayModeStateChange modeChange)
@@ -126,7 +135,19 @@ public bool GetChatDataCache(out Dictionary<ProductUserId, ChatWithFriendData> C
             ChatDataCache = this.ChatDataCache;
             return ChatDataCacheDirty;
         }
+        public void Initialize()
+        {
+            SubscribeToConnectionRequest();
+
+            var options = new AddNotifyPeerConnectionEstablishedOptions
+            {
+                LocalUserId = EOSManager.Instance.GetProductUserId() 
+            };
+
+            P2PHandle.AddNotifyPeerConnectionEstablished(ref options, null, OnPeerConnectionEstablished);
 
+            Debug.Log("EOSPeer2PeerManager initialized: connection listeners registered.");
+        }
         private void RefreshNATType()
         {
             var options = new QueryNATTypeOptions();
@@ -188,6 +209,12 @@ public void SendMessage(ProductUserId friendId, messageData message)
                 Debug.LogError("EOS P2PNAT SendMessage: bad input data: account id is wrong.");
                 return;
             }
+            if (!connectionStates.TryGetValue(friendId, out var state) || state != PeerConnectionAppState.FullyConnected)
+            {
+                Debug.LogWarning($"SendMessage: Cannot send to {friendId}, not fully connected (State={state}).");
+                return;
+            }
+
             if (message.type == messageType.textMessage)
             {
                 if (string.IsNullOrEmpty(message.textData))
@@ -283,6 +310,8 @@ public void SendMessage(ProductUserId friendId, messageData message)
 
         public ProductUserId HandleReceivedMessages()
         {
+            
+
             if (P2PHandle == null)
             {
                 return null;
@@ -330,6 +359,21 @@ public ProductUserId HandleReceivedMessages()
                 }
 
                 string message = System.Text.Encoding.UTF8.GetString(data);
+                // --- Handshake protocol ---
+                if (message == "hreq")
+                {
+                    SendHandshakeAck(peerId);
+                    connectionStates[peerId] = PeerConnectionAppState.FullyConnected;
+                    Debug.Log($"Received handshake request from {peerId}. Sending ack and setting FullyConnected.");
+                    return null;
+                }
+                else if (message == "hack")
+                {
+                    connectionStates[peerId] = PeerConnectionAppState.FullyConnected;
+                    Debug.Log($"Received handshake ack from {peerId}. Connection is now FullyConnected.");
+                    return null;
+                }
+                // --- End handshake ---
 
                 if (message.StartsWith("t"))
                 {
@@ -371,9 +415,11 @@ public ProductUserId HandleReceivedMessages()
 
                     return peerId;
                 }
-
-
-
+                else if (message == "ping")
+                {
+                    Debug.Log($"EOS P2PNAT HandleReceivedMessages: received ping from {peerId}, ignoring.");
+                    return null;
+                }
                 else
                 {
                     Debug.LogErrorFormat("EOS P2PNAT HandleReceivedMessages: error while reading data, code: {0}", result);
@@ -442,11 +488,61 @@ private void OnIncomingConnectionRequest(ref OnIncomingConnectionRequestInfo dat
             };
 
             Result result = P2PHandle.AcceptConnection(ref options);
-
+            SendHandshakeRequest(data.RemoteUserId);
             if (result != Result.Success)
             {
                 Debug.LogErrorFormat("P2p (OnIncomingConnectionRequest): error while accepting connection, code: {0}", result);
             }
         }
+        private void SendHandshakeRequest(ProductUserId remoteUserId)
+        {
+            SendRaw(remoteUserId, "hreq");
+            connectionStates[remoteUserId] = PeerConnectionAppState.HandshakePending;
+        }
+
+        private void SendHandshakeAck(ProductUserId remoteUserId)
+        {
+            SendRaw(remoteUserId, "hack");
+        }
+
+        private void SendRaw(ProductUserId remoteUserId, string rawMessage)
+        {
+            SocketId socketId = new SocketId() { SocketName = "CHAT" };
+
+            SendPacketOptions options = new SendPacketOptions()
+            {
+                LocalUserId = EOSManager.Instance.GetProductUserId(),
+                RemoteUserId = remoteUserId,
+                SocketId = socketId,
+                AllowDelayedDelivery = true,
+                Channel = 0,
+                Reliability = PacketReliability.ReliableOrdered,
+                Data = new ArraySegment<byte>(Encoding.UTF8.GetBytes(rawMessage))
+            };
+
+            var result = P2PHandle.SendPacket(ref options);
+            if (result != Result.Success)
+            {
+                Debug.LogError($"SendRaw failed: {result}");
+            }
+        }
+        private void OnPeerConnectionEstablished(ref OnPeerConnectionEstablishedInfo info)
+        {
+            Debug.Log($"[P2P] Connection established with {info.RemoteUserId}");
+
+            if (!connectionStates.ContainsKey(info.RemoteUserId))
+            {
+                connectionStates[info.RemoteUserId] = PeerConnectionAppState.IceConnected;
+                SendHandshakeRequest(info.RemoteUserId);
+                connectionStates[info.RemoteUserId] = PeerConnectionAppState.HandshakePending;
+            }
+        }
+        public void SendTrigger(ProductUserId peerId)
+        {
+            if (!peerId.IsValid()) return;
+            string trigger = "ping";
+            SendRaw(peerId, trigger);
+        }
     }
+
 }

Assets/Scripts/StandardSamples/UI/Peer2Peer/UIPeer2PeerMenu.cs

@@ -169,6 +169,8 @@ public void ChatButtonOnClick(EpicAccountId userId)
                 CurrentChatUserText.text = currentChatDisplayName;
 
                 ChatWindow.SetActive(true);
+                Peer2PeerManager.Initialize();
+                Peer2PeerManager.SendTrigger(currentChatProductUserId);
             }
             else
             {
@@ -206,6 +208,7 @@ public void IncomingChat(ProductUserId productUserId)
                 CurrentChatUserText.text = currentChatDisplayName;
 
                 ChatWindow.SetActive(true);
+                Peer2PeerManager.SendTrigger(productUserId);
             }
             else
             {