adding start and end function

EarliestFall988 · Dec 9, 2023 · fc6426a · fc6426a
1 parent e5a854a
commit fc6426a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git a/State Machine/FunctionLibrary.cs b/State Machine/FunctionLibrary.cs
@@ -5,6 +5,8 @@
 using System.Security.Cryptography;
 using System.Threading.Tasks;
 
+using Valkyrie_Server.State_Machine.Function_Definitions;
+
 using ValkyrieFSMCore.WM;
 
 namespace ValkyrieFSMCore
@@ -76,6 +78,12 @@ public void BuildFunctionLibrary()
             ImportedFunctions.Add(splitProject.Name, splitProject);
 
             #endregion
+
+            var start = new StartFunction();
+            var end = new ExitFunction();
+
+            ImportedFunctions.Add(start.Name, start);
+            ImportedFunctions.Add(end.Name, end);
         }
 
         /// <summary>

diff --git a/ValkyrieServerController.cs b/ValkyrieServerController.cs
@@ -99,29 +99,37 @@ public ValkyrieServerController()
             var functionJSON = GetSyncDataHandler.GetSyncData();
             Debug.WriteLine(functionJSON);
 
-            using HttpClient client = new();
+            try
+            {
 
-            HttpContent content = new StringContent(functionJSON);
+                using HttpClient client = new();
 
-            client.DefaultRequestHeaders.Add("x-api-key", ValkyrieAPIKey);
-            client.DefaultRequestHeaders.Add("x-instruction-id", instructionId);
-            var response = await client.PostAsync(prodSyncFunctionsURITestBranch, content);
+                HttpContent content = new StringContent(functionJSON);
 
-            using StreamReader reader = new StreamReader(response.Content.ReadAsStream());
+                client.DefaultRequestHeaders.Add("x-api-key", ValkyrieAPIKey);
+                client.DefaultRequestHeaders.Add("x-instruction-id", instructionId);
+                var response = await client.PostAsync(prodSyncFunctionsURITestBranch, content);
 
-            string responseString = await reader.ReadToEndAsync();
+                using StreamReader reader = new StreamReader(response.Content.ReadAsStream());
 
-            if (!response.IsSuccessStatusCode)
-            {
-                return ("Server Response Error: " + response.StatusCode + "\n" + responseString, false, response.StatusCode.ToString());
-            }
+                string responseString = await reader.ReadToEndAsync();
 
-            if (string.IsNullOrEmpty(responseString))
+                if (!response.IsSuccessStatusCode)
+                {
+                    return ("Server Response Error: " + response.StatusCode + "\n" + responseString, false, response.StatusCode.ToString());
+                }
+
+                if (string.IsNullOrEmpty(responseString))
+                {
+                    return ("Error: Empty response from server", false, "0");
+                }
+
+                return (responseString, response.IsSuccessStatusCode, response.ReasonPhrase ?? "");
+            }
+            catch (Exception ex)
             {
-                return ("Error: Empty response from server", false, "0");
+                return (ex.Message, false, "0");
             }
-
-            return (responseString, response.IsSuccessStatusCode, response.ReasonPhrase ?? "");
         }
     }