Merge branch 'dev-4.0' of https://github.com/project-fika/Fika-Dedicated

into dev-4.0
project-fika · Jan 15, 2025 · 0e2db0f · 0e2db0f
2 parents 12dcba1 + 24b9c12
commit 0e2db0f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Fika.Headless/Classes/HeadlessRaidWebSocketClient.cs b/Fika.Headless/Classes/HeadlessRaidWebSocketClient.cs
@@ -1,15 +1,19 @@
 using BepInEx.Logging;
+using EFT.UI;
 using Fika.Core.Networking.Http;
 using Fika.Headless;
 using Newtonsoft.Json.Linq;
 using SPT.Common.Http;
 using System;
+using System.Collections.Concurrent;
 using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.Networking.Match;
 using WebSocketSharp;
 
 namespace Fika.Core.Networking
 {
-    public class HeadlessRaidWebSocketClient
+    public class HeadlessRaidWebSocketClient : MonoBehaviour
     {
         private static ManualLogSource logger = BepInEx.Logging.Logger.CreateLogSource("Fika.HeadlessWebSocket");
 
@@ -25,6 +29,8 @@ public bool Connected
         }
 
         private WebSocket _webSocket;
+        // Add a queue for incoming messages, so they can be brought to the main thread in a nice way.
+        private ConcurrentQueue<StartHeadlessRequest> messagesQueue = new();
 
         public HeadlessRaidWebSocketClient()
         {
@@ -53,6 +59,14 @@ public void Connect()
             _webSocket.Connect();
         }
 
+        public void Update()
+        {
+            while (messagesQueue.TryDequeue(out StartHeadlessRequest request))
+            {
+                FikaHeadlessPlugin.Instance.OnFikaStartRaid(request);
+            }
+        }
+
         public void Close()
         {
             _webSocket.Close();
@@ -88,7 +102,7 @@ private void WebSocket_OnMessage(object sender, MessageEventArgs e)
             {
                 case "fikaHeadlessStartRaid":
                     StartHeadlessRequest request = jsonObject.ToObject<StartHeadlessRequest>();
-                    FikaHeadlessPlugin.Instance.OnFikaStartRaid(request);
+                    messagesQueue.Enqueue(request);
                     break;
                 case "fikaHeadlessKeepAlive":
                     _webSocket.Send("keepalive");

diff --git a/Fika.Headless/FikaHeadlessPlugin.cs b/Fika.Headless/FikaHeadlessPlugin.cs
@@ -140,7 +140,7 @@ protected void Awake()
 
             FikaBackendUtils.IsHeadless = true;
 
-            fikaHeadlessWebSocket = new HeadlessRaidWebSocketClient();
+            fikaHeadlessWebSocket = gameObject.AddComponent<HeadlessRaidWebSocketClient>();
 
             StartCoroutine(RunPluginValidation());
         }