Merge pull request #33 from brcoding/Experiments

Fixes for sendOOBMessages to be optionally async
brcoding · Jun 26, 2020 · abeb45c · abeb45c
2 parents adfcf08 + 132dfb6
commit abeb45c
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 14 deletions.
diff --git a/Mods/HandoutsPlugin/HandoutsPlugin/HandoutsPlugin.cs b/Mods/HandoutsPlugin/HandoutsPlugin/HandoutsPlugin.cs
@@ -16,6 +16,8 @@
 using BepInEx.Configuration;
 using Unity.Mathematics;
 using System.Linq;
+using System.Net.Sockets;
+using System.Text;
 
 namespace HandoutsPlugin
 {
@@ -115,10 +117,7 @@ IEnumerator DownloadImage(string MediaUrl)
 
         public void CheckOOB()
         {
-
-            ModdingUtils.SendOOBMessage("{\"sessionid\": \"" + CampaignSessionManager.Info.CampaignId + "\", \"type\": \"get\"}");
-            OOBResponse[] json = JsonConvert.DeserializeObject<OOBResponse[]>(ModdingUtils.SendOOBMessage("{\"sessionid\": \"" + CampaignSessionManager.Info.CampaignId + "\", \"type\": \"get\"}"));
-            foreach (OOBResponse item in json)
+            foreach (OOBResponse item in oobJson)
             {
                 Debug.Log("Board Load ID: " + item.boardLoadId);
                 if (!seenMessages.Contains(item.messageid))
@@ -134,8 +133,39 @@ public void CheckOOB()
                     StartCoroutine(DownloadImage(item.handoutUrl));
                 }
             }
+            oobJson = new OOBResponse[] { };
+            //ModdingUtils.SendOOBMessage("{\"sessionid\": \"" + CampaignSessionManager.Info.CampaignId + "\", \"type\": \"get\"}", SendCallback);
+            ModdingUtils.SendOOBMessage("{\"sessionid\": \"" + CampaignSessionManager.Info.CampaignId + "\", \"type\": \"get\"}", SendCallback);
+
+        }
+
+        private OOBResponse[] oobJson = new OOBResponse[] { };
+
+        private void SendCallback(IAsyncResult ar)
+        {
+            try
+            {
+                Socket socket = (Socket)ar.AsyncState;
+                // Complete sending the data to the remote device.  
+                int bytesSent = socket.EndSend(ar);
+                Console.WriteLine("Sent {0} bytes to server.", bytesSent);
+
+                byte[] buffer = ModdingUtils.ReceiveAll(socket);
+                int bytesRec = buffer.Length;
+                string data = Encoding.UTF8.GetString(buffer, 0, bytesRec);
+                oobJson = JsonConvert.DeserializeObject<OOBResponse[]>(data);
+
+                // Retrieve the socket from the state object.  
+                Socket client = (Socket)ar.AsyncState;
+
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
         }
 
+
         void Update()
         {
             var board = BoardSessionManager.Board;
@@ -212,7 +242,7 @@ void Update()
             {
                 SystemMessage.AskForTextInput("Handout URL", "Enter the Handout URL (PNG or JPG Image Only)", "OK", delegate (string name)
                 {
-                    ModdingUtils.SendOOBMessage("{\"sessionid\": \"" + CampaignSessionManager.Info.CampaignId + "\", \"type\": \"put\", \"handoutUrl\": \"" + name + "\"}");
+                    ModdingUtils.SendOOBMessage("{\"sessionid\": \"" + CampaignSessionManager.Info.CampaignId + "\", \"type\": \"put\", \"handoutUrl\": \"" + name + "\"}", null);
                 }, delegate
                 {
                 }, "Cancel", delegate

diff --git a/Utils/ModdingUtils/ModdingUtils.cs b/Utils/ModdingUtils/ModdingUtils.cs
@@ -254,7 +254,7 @@ private static void StartSocketServer()
         }
 
 
-        public static string SendOOBMessage(string message)
+        public static string SendOOBMessage(string message, AsyncCallback callback = null)
         {
             int port = 887;
 
@@ -263,14 +263,22 @@ public static string SendOOBMessage(string message)
             Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
             socket.Connect(localEndPoint);
             byte[] byteData = Encoding.UTF8.GetBytes(message);
-            socket.Send(byteData);
-            byte[] buffer = ReceiveAll(socket);
-            int bytesRec = buffer.Length;
-            string data = Encoding.UTF8.GetString(buffer, 0, bytesRec);
-
-            //Debug.Log("OOB Response: " + data);
-            //Debug.Log("Buffer Len:" + bytesRec.ToString());
-            return data;
+            if (callback != null)
+            {
+                socket.BeginSend(byteData, 0, byteData.Length, 0,
+                    new AsyncCallback(callback), socket);
+                return "";
+            } else
+            {
+                socket.Send(byteData);
+                byte[] buffer = ReceiveAll(socket);
+                int bytesRec = buffer.Length;
+                string data = Encoding.UTF8.GetString(buffer, 0, bytesRec);
+
+                //Debug.Log("OOB Response: " + data);
+                //Debug.Log("Buffer Len:" + bytesRec.ToString());
+                return data;
+            }
         }
 
         private static string GetPlayerControlledList(string[] input)