Merge pull request #1240 from PepperDash/codec-messenger-issues

Codec messenger serialization issues
2026-01-11 19:44:52 +00:00 · 2025-04-02 12:05:17 -05:00
parent 157ef3397f 1fe8993db3
commit b77fc3647a
9 changed files with 339 additions and 211 deletions
--- a/src/PepperDash.Essentials.Core/Routing/RoutingInputPort.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RoutingInputPort.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;


 namespace PepperDash.Essentials.Core
@@ -8,10 +9,11 @@ namespace PepperDash.Essentials.Core
    /// </summary>
    public class RoutingInputPort : RoutingPort
 	{
-		/// <summary>
-		/// The IRoutingInputs object this lives on
-		/// </summary>
-		public IRoutingInputs ParentDevice { get; private set; }
+        /// <summary>
+        /// The IRoutingInputs object this lives on
+        /// </summary>
+        [JsonIgnore]
+        public IRoutingInputs ParentDevice { get; private set; }

 		/// <summary>
 		/// Constructor for a basic RoutingInputPort
--- a/src/PepperDash.Essentials.Core/Routing/RoutingOutputPort.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RoutingOutputPort.cs
@@ -1,14 +1,17 @@
-using System;
+using Newtonsoft.Json;
+using System;


 namespace PepperDash.Essentials.Core
 {
    public class RoutingOutputPort : RoutingPort
-	{
-		/// <summary>
-		/// The IRoutingOutputs object this port lives on
-		/// </summary>
-		public IRoutingOutputs ParentDevice { get; private set; }
+    {
+        /// <summary>
+        /// The IRoutingOutputs object this port lives on
+        /// </summary>
+        ///
+        [JsonIgnore]
+        public IRoutingOutputs ParentDevice { get; private set; }

 		public InUseTracking InUseTracker { get; private set; }

--- a/src/PepperDash.Essentials.Core/Routing/RoutingPortCollection.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RoutingPortCollection.cs
@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;

-using PepperDash.Core;
-
-
 namespace PepperDash.Essentials.Core
 {
 	/// <summary>
--- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
@@ -37,6 +37,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras

        #region IRoutingOutputs Members

+        [JsonIgnore]
        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; protected set; }

        #endregion
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs
@@ -43,7 +43,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        protected override void RegisterActions()

        {
-            AddAction("/presets/fullStatus", (id, content) =>
+            AddAction("/fullStatus", (id, content) =>
            {
                this.LogInformation("getting full status for client {id}", id);
                try
@@ -56,7 +56,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                }
            });

-            AddAction("/presets/recall", (id, content) =>
+            AddAction("/recall", (id, content) =>
            {
                var p = content.ToObject<PresetChannelMessage>();

@@ -70,7 +70,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                RecallPreset(dev, p.Preset.Channel);
            });

-            AddAction("/presets/save", (id, content) =>
+            AddAction("/save", (id, content) =>
            {
                var presets = content.ToObject<List<PresetChannel>>();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs
@@ -2,7 +2,10 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using System;
+using System.Collections.Generic;

 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -56,10 +59,32 @@ namespace PepperDash.Essentials.AppServer.Messengers

        private void SendFullStatus()
        {
-            var stateObject = new JObject();
-            stateObject[_propName] = JToken.FromObject(itemDevice, serializer);
-            PostStatusMessage(stateObject);
+            try
+            {
+                this.LogInformation("Sending full status");
+
+                var stateObject = new ISelectableItemsStateMessage<TKey>
+                {
+                    Items = itemDevice.Items,
+                    CurrentItem = itemDevice.CurrentItem
+                };
+
+                PostStatusMessage(stateObject);
+            }
+            catch (Exception e)
+            {
+                this.LogError("Error sending full status: {0}", e.Message);
+            }
        }
    }

+    public class ISelectableItemsStateMessage<TKey> : DeviceStateMessageBase
+    {
+        [JsonProperty("items")]
+        public Dictionary<TKey, ISelectableItem> Items { get; set; }
+
+        [JsonProperty("currentItem")]
+        public TKey CurrentItem { get; set; }
+    }
+
 }
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using System;
@@ -152,11 +153,13 @@ namespace PepperDash.Essentials.AppServer.Messengers

                message.Name = _device.Name;

-                PostStatusMessage(JToken.FromObject(message), MessagePath, clientId);
+                var token = JToken.FromObject(message);                
+                
+                PostStatusMessage(token, MessagePath, clientId);
            }
            catch (Exception ex)
            {
-                Debug.LogMessage(ex, "Exception posting status message", this);
+                this.LogError(ex, "Exception posting status message for {messagePath} to {clientId}", MessagePath, clientId ?? "all clients");                
            }
        }

@@ -173,11 +176,13 @@ namespace PepperDash.Essentials.AppServer.Messengers

                deviceState.MessageBasePath = MessagePath;

-                PostStatusMessage(JToken.FromObject(deviceState), type, clientId);
+                var token = JToken.FromObject(deviceState);
+
+                PostStatusMessage(token, type, clientId);
            }
            catch (Exception ex)
            {
-                Debug.LogMessage(ex, "Exception posting status message", this);
+                this.LogError(ex, "Exception posting status message for {type} to {clientId}", type, clientId ?? "all clients");                
            }
        }

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/VideoCodecBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/VideoCodecBaseMessenger.cs
@@ -12,7 +12,6 @@ using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using static PepperDash.Essentials.AppServer.Messengers.VideoCodecBaseStateMessage.CameraStatus;

 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -78,16 +77,23 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// <param name="e"></param>
        private void CallHistory_RecentCallsListHasChanged(object sender, EventArgs e)
        {
-            var state = new VideoCodecBaseStateMessage();
-
-            if (!(sender is CodecCallHistory codecCallHistory)) return;
-            var recents = codecCallHistory.RecentCalls;
-
-            if (recents != null)
+            try
            {
-                state.RecentCalls = recents;
+                var state = new VideoCodecBaseStateMessage();

-                PostStatusMessage(state);
+                if (!(sender is CodecCallHistory codecCallHistory)) return;
+                var recents = codecCallHistory.RecentCalls;
+
+                if (recents != null)
+                {
+                    state.RecentCalls = recents;
+
+                    PostStatusMessage(state);
+                }
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting call history");
            }
        }

@@ -107,28 +113,24 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// </summary>
        protected void SendDirectory(CodecDirectory directory)
        {
-            var state = new VideoCodecBaseStateMessage();
-
-
-            if (Codec is IHasDirectory dirCodec)
+            try
            {
-                this.LogVerbose("Sending Directory.  Directory Item Count: {directoryItemCount}", directory.CurrentDirectoryResults.Count);
+                var state = new VideoCodecBaseStateMessage();

-                //state.CurrentDirectory = PrefixDirectoryFolderItems(directory);
-                state.CurrentDirectory = directory;
-                CrestronInvoke.BeginInvoke((o) => PostStatusMessage(state));

-                /*                var directoryMessage = new
-                                {
-                                    currentDirectory = new
-                                    {
-                                        directoryResults = prefixedDirectoryResults,
-                                        isRootDirectory = isRoot
-                                    }
-                                };
+                if (Codec is IHasDirectory dirCodec)
+                {
+                    this.LogVerbose("Sending Directory.  Directory Item Count: {directoryItemCount}", directory.CurrentDirectoryResults.Count);

-                                //Spool up a thread in case this is a large quantity of data
-                                CrestronInvoke.BeginInvoke((o) => PostStatusMessage(directoryMessage));           */
+                    //state.CurrentDirectory = PrefixDirectoryFolderItems(directory);
+                    state.CurrentDirectory = directory;
+
+                    CrestronInvoke.BeginInvoke((o) => PostStatusMessage(state));
+                }
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error sending directory");
            }
        }

@@ -139,14 +141,20 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// <param name="e"></param>
        private void Codec_IsReadyChange(object sender, EventArgs e)
        {
-            var state = new VideoCodecBaseStateMessage
+            try
            {
-                IsReady = true
-            };
+                var state = new VideoCodecBaseStateMessage
+                {
+                    IsReady = true
+                };

-            PostStatusMessage(state);
+                PostStatusMessage(state);

-            SendFullStatus();
+                SendFullStatus();
+            } catch (Exception ex)
+            {
+                this.LogError(ex, "Error sending codec ready status");
+            }
        }

        /// <summary>
@@ -353,32 +361,51 @@ namespace PepperDash.Essentials.AppServer.Messengers

        private void SharingSourceFeedback_OutputChange(object sender, FeedbackEventArgs e)
        {
-            var state = new VideoCodecBaseStateMessage
+            try
            {
-                SharingSource = e.StringValue
-            };
+                var state = new VideoCodecBaseStateMessage
+                {
+                    SharingSource = e.StringValue
+                };

-            PostStatusMessage(state);
+                PostStatusMessage(state);
+            } catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting sharing source");
+            }
        }

        private void SharingContentIsOnFeedback_OutputChange(object sender, FeedbackEventArgs e)
        {
-            var state = new VideoCodecBaseStateMessage
+            try
            {
-                SharingContentIsOn = e.BoolValue
-            };
+                var state = new VideoCodecBaseStateMessage
+                {
+                    SharingContentIsOn = e.BoolValue
+                };

-            PostStatusMessage(state);
+                PostStatusMessage(state);
+            } catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting sharing content");
+            }
        }

        private void PhonebookSyncState_InitialSyncCompleted(object sender, EventArgs e)
        {
-            var state = new VideoCodecBaseStateMessage
+            try
            {
-                InitialPhonebookSyncComplete = true
-            };
+                var state = new VideoCodecBaseStateMessage
+                {
+                    InitialPhonebookSyncComplete = true
+                };

-            PostStatusMessage(state);
+                PostStatusMessage(state);
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting phonebook sync state");
+            }
        }

        private void CameraIsOffFeedback_OutputChange(object sender, FeedbackEventArgs e)
@@ -404,8 +431,14 @@ namespace PepperDash.Essentials.AppServer.Messengers

        private void CameraCodec_CameraSelected(object sender, CameraSelectedEventArgs e)
        {
-            MapCameraActions();
-            PostSelectedCamera();
+            try
+            {
+                MapCameraActions();
+                PostSelectedCamera();
+            } catch(Exception ex)
+            {
+                this.LogError(ex, "Exception handling camera selected event");
+            }
        }

        /// <summary>
@@ -564,21 +597,28 @@ namespace PepperDash.Essentials.AppServer.Messengers

        private void PostCallHistory()
        {
-            var codec = (Codec as IHasCallHistory);
-
-            if (codec != null)
+            try
            {
-                var status = new VideoCodecBaseStateMessage();
+                var codec = (Codec as IHasCallHistory);

-                var recents = codec.CallHistory.RecentCalls;
-
-                if (recents != null)
+                if (codec != null)
                {
-                    status.RecentCalls = codec.CallHistory.RecentCalls;
+                    var status = new VideoCodecBaseStateMessage();

-                    PostStatusMessage(status);
+                    var recents = codec.CallHistory.RecentCalls;
+
+                    if (recents != null)
+                    {
+                        status.RecentCalls = codec.CallHistory.RecentCalls;
+
+                        PostStatusMessage(status);
+                    }
                }
            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting call history");
+            }
        }

        /// <summary>
@@ -609,23 +649,30 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// </summary>
        private void GetDirectoryRoot()
        {
-            if (!(Codec is IHasDirectory dirCodec))
+            try
            {
-                // do something else?
-                return;
-            }
-            if (!dirCodec.PhonebookSyncState.InitialSyncComplete)
-            {
-                var state = new VideoCodecBaseStateMessage
+                if (!(Codec is IHasDirectory dirCodec))
                {
-                    InitialPhonebookSyncComplete = false
-                };
+                    // do something else?
+                    return;
+                }
+                if (!dirCodec.PhonebookSyncState.InitialSyncComplete)
+                {
+                    var state = new VideoCodecBaseStateMessage
+                    {
+                        InitialPhonebookSyncComplete = false
+                    };

-                PostStatusMessage(state);
-                return;
+                    PostStatusMessage(state);
+                    return;
+                }
+
+                dirCodec.SetCurrentDirectoryToRoot();
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error getting directory root");
            }
-
-            dirCodec.SetCurrentDirectoryToRoot();
        }

        /// <summary>
@@ -654,14 +701,21 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// </summary>
        private void SendIsReady()
        {
-            var status = new VideoCodecBaseStateMessage();
+            try
+            {
+                var status = new VideoCodecBaseStateMessage();

-            var codecType = Codec.GetType();
+                var codecType = Codec.GetType();

-            status.IsReady = Codec.IsReady;
-            status.IsZoomRoom = codecType.GetInterface("IHasZoomRoomLayouts") != null;
+                status.IsReady = Codec.IsReady;
+                status.IsZoomRoom = codecType.GetInterface("IHasZoomRoomLayouts") != null;

-            PostStatusMessage(status);
+                PostStatusMessage(status);
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error sending codec ready status");
+            }
        }

        /// <summary>
@@ -670,55 +724,60 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// <returns></returns>
        protected VideoCodecBaseStateMessage GetStatus()
        {
-            var status = new VideoCodecBaseStateMessage();
-
-
-            if (Codec is IHasCodecCameras camerasCodec)
+            try
            {
-                status.Cameras = new VideoCodecBaseStateMessage.CameraStatus
+                var status = new VideoCodecBaseStateMessage();
+
+                if (Codec is IHasCodecCameras camerasCodec)
                {
-                    CameraManualIsSupported = true,
-                    CameraAutoIsSupported = Codec.SupportsCameraAutoMode,
-                    CameraOffIsSupported = Codec.SupportsCameraOff,
-                    CameraMode = GetCameraMode(),
-                    Cameras = camerasCodec.Cameras,
-                    SelectedCamera = GetSelectedCamera(camerasCodec)
-                };
-            }
+                    status.Cameras = new CameraStatus
+                    {
+                        CameraManualIsSupported = true,
+                        CameraAutoIsSupported = Codec.SupportsCameraAutoMode,
+                        CameraOffIsSupported = Codec.SupportsCameraOff,
+                        CameraMode = GetCameraMode(),
+                        Cameras = camerasCodec.Cameras,
+                        SelectedCamera = GetSelectedCamera(camerasCodec)
+                    };
+                }

-            if (Codec is IHasDirectory directoryCodec)
+                if (Codec is IHasDirectory directoryCodec)
+                {
+                    status.HasDirectory = true;
+                    status.HasDirectorySearch = true;
+                    status.CurrentDirectory = directoryCodec.CurrentDirectoryResult;
+                }
+
+                var codecType = Codec.GetType();
+
+                status.CameraSelfViewIsOn = Codec is IHasCodecSelfView && (Codec as IHasCodecSelfView).SelfviewIsOnFeedback.BoolValue;
+                status.IsInCall = Codec.IsInCall;
+                status.PrivacyModeIsOn = Codec.PrivacyModeIsOnFeedback.BoolValue;
+                status.SharingContentIsOn = Codec.SharingContentIsOnFeedback.BoolValue;
+                status.SharingSource = Codec.SharingSourceFeedback.StringValue;
+                status.StandbyIsOn = Codec.StandbyIsOnFeedback.BoolValue;
+                status.Calls = Codec.ActiveCalls;
+                status.Info = Codec.CodecInfo;
+                status.ShowSelfViewByDefault = Codec.ShowSelfViewByDefault;
+                status.SupportsAdHocMeeting = Codec is IHasStartMeeting;
+                status.HasRecents = Codec is IHasCallHistory;
+                status.HasCameras = Codec is IHasCameras;
+                status.Presets = GetCurrentPresets();
+                status.IsZoomRoom = codecType.GetInterface("IHasZoomRoomLayouts") != null;
+                status.ReceivingContent = Codec is IHasFarEndContentStatus && (Codec as IHasFarEndContentStatus).ReceivingContent.BoolValue;
+
+                if (Codec is IHasMeetingInfo meetingInfoCodec)
+                {
+                    status.MeetingInfo = meetingInfoCodec.MeetingInfo;
+                }
+
+                return status;
+            }
+            catch (Exception ex)
            {
-                status.HasDirectory = true;
-                status.HasDirectorySearch = true;
-                status.CurrentDirectory = directoryCodec.CurrentDirectoryResult;
+                this.LogError(ex, "Error getting codec status");
+                return null;
            }
-
-            var codecType = Codec.GetType();
-
-            status.CameraSelfViewIsOn = Codec is IHasCodecSelfView && (Codec as IHasCodecSelfView).SelfviewIsOnFeedback.BoolValue;
-            status.IsInCall = Codec.IsInCall;
-            status.PrivacyModeIsOn = Codec.PrivacyModeIsOnFeedback.BoolValue;
-            status.SharingContentIsOn = Codec.SharingContentIsOnFeedback.BoolValue;
-            status.SharingSource = Codec.SharingSourceFeedback.StringValue;
-            status.StandbyIsOn = Codec.StandbyIsOnFeedback.BoolValue;
-            status.Calls = Codec.ActiveCalls;
-            status.Info = Codec.CodecInfo;
-            status.ShowSelfViewByDefault = Codec.ShowSelfViewByDefault;
-            status.SupportsAdHocMeeting = Codec is IHasStartMeeting;
-            status.HasRecents = Codec is IHasCallHistory;
-            status.HasCameras = Codec is IHasCameras;
-            status.Presets = GetCurrentPresets();
-            status.IsZoomRoom = codecType.GetInterface("IHasZoomRoomLayouts") != null;
-            status.ReceivingContent = Codec is IHasFarEndContentStatus && (Codec as IHasFarEndContentStatus).ReceivingContent.BoolValue;
-
-            if (Codec is IHasMeetingInfo meetingInfoCodec)
-            {
-                status.MeetingInfo = meetingInfoCodec.MeetingInfo;
-            }
-
-            //Debug.Console(2, this, "VideoCodecBaseStatus:\n{0}", JsonConvert.SerializeObject(status)); 
-
-            return status;
        }

        protected virtual void SendFullStatus()
@@ -733,22 +792,36 @@ namespace PepperDash.Essentials.AppServer.Messengers

        private void PostReceivingContent(bool receivingContent)
        {
-            var state = new VideoCodecBaseStateMessage
+            try
            {
-                ReceivingContent = receivingContent
-            };
-            PostStatusMessage(state);
+                var state = new VideoCodecBaseStateMessage
+                {
+                    ReceivingContent = receivingContent
+                };
+
+                PostStatusMessage(state);
+            } catch(Exception ex)
+            {
+                this.LogError(ex, "Error posting receiving content");
+            }
        }

        private void PostCameraSelfView()
        {
-            var status = new VideoCodecBaseStateMessage
+            try
            {
-                CameraSelfViewIsOn = Codec is IHasCodecSelfView
-                                     && (Codec as IHasCodecSelfView).SelfviewIsOnFeedback.BoolValue
-            };
+                var status = new VideoCodecBaseStateMessage
+                {
+                    CameraSelfViewIsOn = Codec is IHasCodecSelfView
+                                         && (Codec as IHasCodecSelfView).SelfviewIsOnFeedback.BoolValue
+                };

-            PostStatusMessage(status);
+                PostStatusMessage(status);
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting camera self view");
+            }
        }

        /// <summary>
@@ -756,34 +829,56 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// </summary>
        private void PostCameraMode()
        {
-            var status = new VideoCodecBaseStateMessage
+            try
            {
-                CameraMode = GetCameraMode()
-            };
+                var status = new VideoCodecBaseStateMessage
+                {
+                    CameraMode = GetCameraMode()
+                };

-            PostStatusMessage(status);
+                PostStatusMessage(status);
+            }
+            catch (Exception ex)
+            {
+                this.LogError(ex, "Error posting camera mode");
+            }
        }

        private void PostSelectedCamera()
        {
-            var camerasCodec = Codec as IHasCodecCameras;
-
-            var status = new VideoCodecBaseStateMessage
+            try
            {
-                Cameras = new VideoCodecBaseStateMessage.CameraStatus() { SelectedCamera = GetSelectedCamera(camerasCodec) },
-                Presets = GetCurrentPresets()
-            };
-            PostStatusMessage(status);
+                var camerasCodec = Codec as IHasCodecCameras;
+
+                var status = new VideoCodecBaseStateMessage
+                {
+                    Cameras = new CameraStatus() { SelectedCamera = GetSelectedCamera(camerasCodec) },
+                    Presets = GetCurrentPresets()
+                };
+
+                PostStatusMessage(status);
+            }
+            catch (Exception e)
+            {
+                this.LogError(e, "Error posting selected camera");
+            }
        }

        private void PostCameraPresets()
        {
-            var status = new VideoCodecBaseStateMessage
+            try
            {
-                Presets = GetCurrentPresets()
-            };
+                var status = new VideoCodecBaseStateMessage
+                {
+                    Presets = GetCurrentPresets()
+                };

-            PostStatusMessage(status);
+                PostStatusMessage(status);
+            }
+            catch (Exception e)
+            {
+                this.LogError(e, "Error posting camera presets");
+            }
        }

        private Camera GetSelectedCamera(IHasCodecCameras camerasCodec)
@@ -796,7 +891,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            {
                camera.Name = camerasCodec.SelectedCamera.Name;

-                camera.Capabilities = new Camera.CameraCapabilities()
+                camera.Capabilities = new CameraCapabilities()
                {
                    CanPan = camerasCodec.SelectedCamera.CanPan,
                    CanTilt = camerasCodec.SelectedCamera.CanTilt,
@@ -922,59 +1017,57 @@ namespace PepperDash.Essentials.AppServer.Messengers

        [JsonProperty("supportsAdHocMeeting", NullValueHandling = NullValueHandling.Ignore)]
        public bool? SupportsAdHocMeeting { get; set; }
+    }

-        public class CameraStatus
-        {
-            [JsonProperty("cameraManualSupported", NullValueHandling = NullValueHandling.Ignore)]
-            public bool? CameraManualIsSupported { get; set; }
+    public class CameraStatus
+    {
+        [JsonProperty("cameraManualSupported", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CameraManualIsSupported { get; set; }

-            [JsonProperty("cameraAutoSupported", NullValueHandling = NullValueHandling.Ignore)]
-            public bool? CameraAutoIsSupported { get; set; }
+        [JsonProperty("cameraAutoSupported", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CameraAutoIsSupported { get; set; }

-            [JsonProperty("cameraOffSupported", NullValueHandling = NullValueHandling.Ignore)]
-            public bool? CameraOffIsSupported { get; set; }
+        [JsonProperty("cameraOffSupported", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CameraOffIsSupported { get; set; }

-            [JsonProperty("cameraMode", NullValueHandling = NullValueHandling.Ignore)]
-            public string CameraMode { get; set; }
+        [JsonProperty("cameraMode", NullValueHandling = NullValueHandling.Ignore)]
+        public string CameraMode { get; set; }

-            [JsonProperty("cameraList", NullValueHandling = NullValueHandling.Ignore)]
-            public List<CameraBase> Cameras { get; set; }
+        [JsonProperty("cameraList", NullValueHandling = NullValueHandling.Ignore)]
+        public List<CameraBase> Cameras { get; set; }

-            [JsonProperty("selectedCamera", NullValueHandling = NullValueHandling.Ignore)]
-            public Camera SelectedCamera { get; set; }
+        [JsonProperty("selectedCamera", NullValueHandling = NullValueHandling.Ignore)]
+        public Camera SelectedCamera { get; set; }        
+    }

-            public class Camera
-            {
-                [JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
-                public string Key { get; set; }
+    public class Camera
+    {
+        [JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
+        public string Key { get; set; }

-                [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
-                public string Name { get; set; }
+        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+        public string Name { get; set; }

-                [JsonProperty("isFarEnd", NullValueHandling = NullValueHandling.Ignore)]
-                public bool? IsFarEnd { get; set; }
+        [JsonProperty("isFarEnd", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsFarEnd { get; set; }

-                [JsonProperty("capabilities", NullValueHandling = NullValueHandling.Ignore)]
-                public CameraCapabilities Capabilities { get; set; }
+        [JsonProperty("capabilities", NullValueHandling = NullValueHandling.Ignore)]
+        public CameraCapabilities Capabilities { get; set; }
+    }

-                public class CameraCapabilities
-                {
-                    [JsonProperty("canPan", NullValueHandling = NullValueHandling.Ignore)]
-                    public bool? CanPan { get; set; }
+    public class CameraCapabilities
+    {
+        [JsonProperty("canPan", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CanPan { get; set; }

-                    [JsonProperty("canTilt", NullValueHandling = NullValueHandling.Ignore)]
-                    public bool? CanTilt { get; set; }
+        [JsonProperty("canTilt", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CanTilt { get; set; }

-                    [JsonProperty("canZoom", NullValueHandling = NullValueHandling.Ignore)]
-                    public bool? CanZoom { get; set; }
+        [JsonProperty("canZoom", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CanZoom { get; set; }

-                    [JsonProperty("canFocus", NullValueHandling = NullValueHandling.Ignore)]
-                    public bool? CanFocus { get; set; }
-
-                }
-            }
-
-        }
+        [JsonProperty("canFocus", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CanFocus { get; set; }

    }

--- a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
+++ b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
@@ -1133,7 +1133,11 @@ namespace PepperDash.Essentials

            _messengers.Add(messenger.Key, messenger);

-            messenger.RegisterWithAppServer(this);
+            if (_initialized)
+            {
+                this.LogDebug("Registering messenger {messengerKey} AFTER initialization", messenger.Key);
+                messenger.RegisterWithAppServer(this);
+            }
        }

        private void AddDefaultDeviceMessenger(IMobileControlMessenger messenger)
@@ -2230,16 +2234,14 @@ Mobile Control Direct Server Infromation:
                        // /room/roomAB

                        // Can't do direct comparison because it will match /room/roomA with /room/roomA/xxx instead of /room/roomAB/xxx
-                        var handlersKv = _actionDictionary.FirstOrDefault(kv => message.Type.StartsWith(kv.Key + "/")); // adds trailing slash to ensure above case is handled
+                        var handlers = _actionDictionary.Where(kv => message.Type.StartsWith(kv.Key + "/")).SelectMany(kv => kv.Value).ToList(); // adds trailing slash to ensure above case is handled


-                        if (handlersKv.Key == null)
+                        if (handlers.Count == 0)
                        {
                            this.LogInformation("-- Warning: Incoming message has no registered handler {type}", message.Type);
                            break;
-                        }
-
-                        var handlers = handlersKv.Value;
+                        }                        

                        foreach (var handler in handlers)
                        {