data collection communication [wip][dnm]

Packages/vr.teachr.applicationmanager/Runtime/EventLogger/Scripts/EventLogger.cs

@@ -40,6 +40,7 @@ namespace TeachR.ApplicationManager
             new ScriptInfo { scriptName = "FOVController", scriptAlias = "FOV"},
             new ScriptInfo { scriptName = "AmbientSound", scriptAlias = "AmbientSound" },
         };
+        public event Action<ScriptInfo> OnScriptInfoListChanged;
 
         [Header("Settings"), Tooltip("Optional name of the folder in which the data is to be saved.")]
         public string measurementName;
@@ -94,15 +95,6 @@ namespace TeachR.ApplicationManager
             return Task.CompletedTask;
         }
 
-        /// <summary>
-        /// Used to send the scriptInfoList to website
-        /// </summary>
-        /// <returns>The script info list as Json.</returns>
-        public string GetScriptInfoListAsJson()
-        {
-            return JsonUtility.ToJson(new { scripts = scriptInfoList }, true);
-        }
-
         private void CreateChildInInspector(MonoBehaviour_Loggable script, string additionalName = "")
         {
             if (script.Chosen)
@@ -174,6 +166,7 @@ namespace TeachR.ApplicationManager
             {
                 MonoBehaviour_Loggable script = availableScripts.FirstOrDefault(script => script.GetType().Name.Equals(info.scriptName));
                 info.scriptAvailable = script != null;
+                
                 if (info.scriptAvailable)
                 {
                     info.OnLogScriptChanged += HandleLogScriptChanged;
@@ -182,6 +175,17 @@ namespace TeachR.ApplicationManager
             }
         }
 
+        /// <summary>
+        /// After a scriptInfo request is received, all scriptInfo entries need an eventlistener.
+        /// </summary>
+        public void AddEventListenerAfterConnection()
+        {
+            foreach (ScriptInfo info in scriptInfoList)
+            {
+                info.OnParameterChanged += HandleScriptInfoChanged;
+            }
+        }
+
         /// <summary>
         /// If a script is started after calling the <see cref="FindLoggableScripts"/> method, 
         /// it can register itself.
@@ -263,6 +267,20 @@ namespace TeachR.ApplicationManager
             }
         }
 
+        public void HandleScriptInfoChanged(ScriptInfo scriptInfo)
+        {
+            OnScriptInfoListChanged?.Invoke(scriptInfo);
+        }
+
+        /// <summary>
+        /// Used to send the scriptInfoList to website
+        /// </summary>
+        /// <returns>The script info list as Json.</returns>
+        public string GetScriptInfoListAsJson()
+        {
+            return JsonUtility.ToJson(new { scripts = scriptInfoList }, true);
+        }
+
         /// <summary>
         /// This method gets the name and alias of a script and returns a list of scripts that have the 
         /// same alias. This is important if several scripts are to write to the same file (alias).

Packages/vr.teachr.applicationmanager/Runtime/EventLogger/Scripts/ScriptInfo.cs

 using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace TeachR.ApplicationManager
 {
+    /// <summary>
+    /// This class represents scripts that are used for data collection. 
+    /// It is used to display them via <see cref=EventLogger/> and send them to the website. 
+    /// Here, scriptAvailable indicates whether the corresponding script is available in the 
+    /// scene (or whether the component has been deactivated). _logScript indicates whether 
+    /// the user wants to log the script. scriptAlias is the display name in the list or on the website.
+    /// </summary>
     [Serializable]
     public class ScriptInfo
     {
         public string scriptName;
         public string scriptAlias;
         [SerializeField] private bool _logScript;
-        public bool scriptAvailable;
+        private bool _scriptAvailable;
+        public bool scriptAvailable
+        {
+            get => _scriptAvailable;
+            set
+            {
+                if (_scriptAvailable != value)
+                {
+                    _scriptAvailable = value;
+                    OnParameterChanged?.Invoke(this);
+                }
+            }
+        }
 
         public bool logScript
         {
@@ -20,10 +40,21 @@ namespace TeachR.ApplicationManager
                 {
                     _logScript = value;
                     OnLogScriptChanged?.Invoke(value, this);
+                    OnParameterChanged?.Invoke(this);
                 }
             }
         }
 
         public Action<bool, ScriptInfo> OnLogScriptChanged;
+        public Action<ScriptInfo> OnParameterChanged;
+
+        /// <summary>
+        /// Used to send the scriptInfo to website
+        /// </summary>
+        /// <returns>The script info as Json.</returns>
+        public string GetScriptInfoAsJson()
+        {
+            return JsonUtility.ToJson(new { scriptName = scriptName, scriptAlias = scriptAlias, logScript = logScript, scriptAvailable = scriptAvailable }, true);
+        }
     }
 }

Packages/vr.teachr.webcommunication/Runtime/Scripts/CoachRtc.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using TeachR.ApplicationManager;
 using UnityEngine;
 using UnityEngine.Events;
 
@@ -27,7 +28,8 @@ namespace TeachR.WebCommunication
         private static UnityEvent configurationEvent;
         private static UnityEvent dataCollectionEvent;
         private static UnityEvent speechtoolEvent;
-      
+        public static Action<List<ScriptInfo>> OnScriptInfoListChanged;
+
 
         /// <summary>
         /// Listener for transient events, i.e. events that are specific to a current scene and that are reset after
@@ -52,6 +54,8 @@ namespace TeachR.WebCommunication
 
             WebsocketDelegateHooks.OnFixedUpdate += RunEventLoop;
             RegisterFunctionCheckResultHandler(HandleFunctionCheckResult);
+            RegisterScriptInfoListRequestHandler(HandleScriptInfoListRequest);
+            EventLogger.Instance.OnScriptInfoListChanged += HandleScriptInfoListEntryChanged;
 
             return Task.CompletedTask;
         }
@@ -80,12 +84,25 @@ namespace TeachR.WebCommunication
         private static void RegisterFunctionCheckResultHandler(Action<JsonMsg> handler)
         {
             Persistent.On("functionCheckResult", handler);
+        }        
+        
+        private static void RegisterScriptInfoListRequestHandler(Action<JsonMsg> handler)
+        {
+            Persistent.On("requestScriptInfoList", handler);
+            Debug.Log("requestScriptInfoList bereit zum Empfang");
         }
 
         private static void HandleFunctionCheckResult(JsonMsg msg)
         {
             Debug.Log($"Function check result received: {msg.content} DoTo: Do something with this information");
-        }        
+        }
+
+        private static void HandleScriptInfoListRequest(JsonMsg msg)
+        {
+            Send("sendScriptInfoList", EventLogger.Instance.GetScriptInfoListAsJson());
+            EventLogger.Instance.AddEventListenerAfterConnection();
+            Debug.Log("HandleScriptInfoListRequest lst send aus");
+        }
 
         /// <summary>
         /// This function checks whether certain controller scripts are available in Unity. 
@@ -115,6 +132,12 @@ namespace TeachR.WebCommunication
             }
         }
 
+        private static void HandleScriptInfoListEntryChanged(ScriptInfo scriptInfo)
+        {
+            Send("sendScriptInfoList", scriptInfo.GetScriptInfoAsJson());
+            Debug.Log($"[DATA] send script Info entry: {scriptInfo.GetScriptInfoAsJson()}");
+        }
+
         /// <summary>
         /// Converts parameters into a valid message to send to the frontend. The messages are probably 
         /// sent from website-control\src\features\behaviourControls\behaviourGroups\BehaviourManagement\SendBehaviour.jsx .
@@ -151,12 +174,18 @@ namespace TeachR.WebCommunication
             }
             else if (arg1.Equals("dataCollectionParameters"))
             {
-                Debug.Log($"[DEBUG] received data collection parameters: {arg2}");
+                Debug.Log($"[DATA] received data collection parameters: {arg2}");
+                //var parameters = JsonUtility.FromJson<DataCollectionParameters>(arg2);
+                //EventLogger.Instance.UpdateDataCollectionParameters(parameters);
             }
             else if (arg1.Equals("speechtoolParameters"))
             {
                 Debug.Log($"[DEBUG] received speechtool parameters: {arg2}");
             }
+            else if (arg1.Equals("requestScriptInfoList"))
+            {
+                Debug.Log($"[DEBUG] received requestScriptInfoList : {arg2}");
+            }
         }
 
         private static void RunEventLoop()