Merge pull request #1378 from PepperDash/xml-docs

feat: complete XML documentation in PD Core

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpier": {
+      "version": "1.2.4",
+      "commands": [
+        "csharpier"
+      ],
+      "rollForward": false
+    }
+  }
+}

src/PepperDash.Core/Device.cs

@@ -15,23 +15,23 @@ namespace PepperDash.Core
 		/// Unique Key
 		/// </summary>
 		public string Key { get; protected set; }
-  /// <summary>
-  /// Gets or sets the Name
-  /// </summary>
+		/// <summary>
+		/// Gets or sets the Name
+		/// </summary>
 		public string Name { get; protected set; }
 		/// <summary>
-		/// 
+		/// Gets or sets a value indicating whether the device is enabled
 		/// </summary>
 		public bool Enabled { get; protected set; }
 
-		/// <summary>
-		/// A place to store reference to the original config object, if any. These values should 
-		/// NOT be used as properties on the device as they are all publicly-settable values.
-		/// </summary>
+		// /// <summary>
+		// /// A place to store reference to the original config object, if any. These values should 
+		// /// NOT be used as properties on the device as they are all publicly-settable values.
+		// /// </summary>
 		//public DeviceConfig Config { get; private set; }
-		/// <summary>
-		/// Helper method to check if Config exists
-		/// </summary>
+		// /// <summary>
+		// /// Helper method to check if Config exists
+		// /// </summary>
 		//public bool HasConfig { get { return Config != null; } }
 
 		List<Action> _PreActivationActions;

src/PepperDash.Core/Logging/DebugConsoleSink.cs

@@ -41,6 +41,9 @@ namespace PepperDash.Core
             CrestronConsole.PrintLine(message);
         }
 
+        /// <summary>
+        /// Constructor for DebugConsoleSink        
+        /// </summary>
         public DebugConsoleSink(ITextFormatter formatProvider )
         {
             _textFormatter = formatProvider ?? new JsonFormatter();
@@ -48,6 +51,9 @@ namespace PepperDash.Core
 
     }
 
+    /// <summary>
+    /// Provides extension methods for DebugConsoleSink
+    /// </summary>
     public static class DebugConsoleSinkExtensions
     {
         /// <summary>

src/PepperDash.Core/Logging/DebugCrestronLoggerSink.cs

@@ -27,6 +27,9 @@ namespace PepperDash.Core.Logging
             CrestronLogger.WriteToLog(message, (uint)logEvent.Level);
         }
 
+        /// <summary>
+        /// Constructor for DebugCrestronLoggerSink
+        /// </summary>
         public DebugCrestronLoggerSink()
         {
             CrestronLogger.Initialize(1, LoggerModeEnum.RM);

src/PepperDash.Core/Logging/DebugErrorLogSink.cs

@@ -63,6 +63,10 @@ namespace PepperDash.Core.Logging
             handler(message);
         }
 
+        /// <summary>
+        /// Constructor for DebugErrorLogSink
+        /// </summary>
+        /// <param name="formatter">text formatter for log output</param>
         public DebugErrorLogSink(ITextFormatter formatter = null)
         {
             _formatter = formatter;

src/PepperDash.Core/Logging/DebugExtensions.cs

@@ -4,6 +4,9 @@ using Log = PepperDash.Core.Debug;
 
 namespace PepperDash.Core.Logging
 {
+    /// <summary>
+    /// Provides extension methods for logging on IKeyed objects
+    /// </summary>
     public static class DebugExtensions
     {
         /// <summary>

src/PepperDash.Core/Logging/DebugWebsocketSink.cs

@@ -32,6 +32,9 @@ namespace PepperDash.Core
         private const string _certificateName = "selfCres";
         private const string _certificatePassword = "cres12345";
 
+        /// <summary>
+        /// Gets the Port
+        /// </summary>
         public int Port 
         { get 
             { 
@@ -41,6 +44,9 @@ namespace PepperDash.Core
             } 
         }
 
+        /// <summary>
+        /// Gets the Url
+        /// </summary>
         public string Url
         {
             get
@@ -58,6 +64,11 @@ namespace PepperDash.Core
 
         private readonly ITextFormatter _textFormatter;
 
+        /// <summary>
+        /// Constructor for DebugWebsocketSink
+        /// </summary>
+        /// <param name="formatProvider">text formatter for log output</param>
+      
         public DebugWebsocketSink(ITextFormatter formatProvider)
         {
 
@@ -217,6 +228,9 @@ namespace PepperDash.Core
         }
     }
 
+    /// <summary>
+    /// Provides extension methods for DebugWebsocketSink
+    /// </summary>
     public static class DebugWebsocketSinkExtensions
     {
         /// <summary>
@@ -237,6 +251,9 @@ namespace PepperDash.Core
     {
         private DateTime _connectionTime;
 
+        /// <summary>
+        /// Gets the ConnectedDuration
+        /// </summary>
         public TimeSpan ConnectedDuration
         {
             get
@@ -252,11 +269,17 @@ namespace PepperDash.Core
             }
         }
 
+        /// <summary>
+        /// Constructor for DebugClient
+        /// </summary>
         public DebugClient()
         {
             Debug.Console(0, "DebugClient Created");
         }
 
+        /// <summary>
+        /// OnOpen method
+        /// </summary>
         protected override void OnOpen()
         {
             base.OnOpen();
@@ -267,6 +290,9 @@ namespace PepperDash.Core
             _connectionTime = DateTime.Now;
         }
 
+        /// <summary>
+        /// OnMessage method
+        /// </summary>
         protected override void OnMessage(MessageEventArgs e)
         {
             base.OnMessage(e);
@@ -274,6 +300,9 @@ namespace PepperDash.Core
             Debug.Console(0, "WebSocket UiClient Message: {0}", e.Data);
         }
 
+        /// <summary>
+        /// OnClose method
+        /// </summary>
         protected override void OnClose(CloseEventArgs e)
         {
             base.OnClose(e);
@@ -282,6 +311,9 @@ namespace PepperDash.Core
 
         }
 
+        /// <summary>
+        /// OnError method
+        /// </summary>
         protected override void OnError(WebSocketSharp.ErrorEventArgs e)
         {
             base.OnError(e);

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs

@@ -5,9 +5,16 @@ using System.Threading.Tasks;
 
 namespace PepperDash.Core.Web.RequestHandlers
 {
+    /// <summary>
+    /// CWS Base Async Handler, implements IHttpCwsHandler
+    /// </summary>
     public abstract class WebApiBaseRequestAsyncHandler:IHttpCwsHandler
     {
         private readonly Dictionary<string, Func<HttpCwsContext, Task>> _handlers;
+       
+        /// <summary>
+        /// Indicates whether CORS is enabled
+        /// </summary>
         protected readonly bool EnableCors;
 
         /// <summary>

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs

@@ -10,6 +10,10 @@ namespace PepperDash.Core.Web.RequestHandlers
 	public abstract class WebApiBaseRequestHandler : IHttpCwsHandler
 	{
 		private readonly Dictionary<string, Action<HttpCwsContext>> _handlers;
+		
+		/// <summary>
+		/// Indicates whether CORS is enabled
+		/// </summary>
 		protected readonly bool EnableCors;
 
 		/// <summary>

src/PepperDash.Core/Web/WebApiServer.cs

@@ -45,9 +45,9 @@ namespace PepperDash.Core.Web
   /// </summary>
 		public bool IsRegistered { get; private set; }
 
-		/// <summary>
-		/// Http request handler
-		/// </summary>
+		// /// <summary>
+		// /// Http request handler
+		// /// </summary>
 		//public IHttpCwsHandler HttpRequestHandler
 		//{
 		//    get { return _server.HttpRequestHandler; }
@@ -58,9 +58,9 @@ namespace PepperDash.Core.Web
 		//    }
 		//}
 
-		/// <summary>
-		/// Received request event handler
-		/// </summary>
+		// /// <summary>
+		// /// Received request event handler
+		// /// </summary>
 		//public event EventHandler<HttpCwsRequestEventArgs> ReceivedRequestEvent
 		//{
 		//    add { _server.ReceivedRequestEvent += new HttpCwsRequestEventHandler(value); }

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IAudioZone.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines minimum functionality for an audio zone
+  /// </summary>
+  public interface IAudioZone : IBasicVolumeWithFeedback
+  {
+    void SelectInput(ushort input);
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IAudioZones.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Identifies a device that contains audio zones
+  /// </summary>
+  public interface IAudioZones : IRouting
+  {
+    Dictionary<uint, IAudioZone> Zone { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IBasicVolumeControls.cs

@@ -0,0 +1,27 @@
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// Defines minimal volume and mute control methods
+	/// </summary>
+	public interface IBasicVolumeControls : IKeyName
+	{
+		/// <summary>
+		/// Increases the volume
+		/// </summary>
+		/// <param name="pressRelease">Indicates whether the volume change is a press and hold action</param>
+		void VolumeUp(bool pressRelease);
+
+		/// <summary>
+		/// Decreases the volume
+		/// </summary>
+		/// <param name="pressRelease">Indicates whether the volume change is a press and hold action</param>
+		void VolumeDown(bool pressRelease);
+
+		/// <summary>
+		/// Toggles the mute state
+		/// </summary>
+		void MuteToggle();
+	}
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IBasicVolumeWithFeedback.cs

@@ -0,0 +1,14 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IBasicVolumeWithFeedback
+  /// </summary>
+  public interface IBasicVolumeWithFeedback : IBasicVolumeControls
+  {
+    BoolFeedback MuteFeedback { get; }
+    void MuteOn();
+    void MuteOff();
+    void SetVolume(ushort level);
+    IntFeedback VolumeLevelFeedback { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IBasicVolumeWithFeedbackAdvanced.cs

@@ -0,0 +1,12 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IBasicVolumeWithFeedbackAdvanced
+  /// </summary>
+  public interface IBasicVolumeWithFeedbackAdvanced : IBasicVolumeWithFeedback
+  {
+    int RawVolumeLevel { get; }
+
+    eVolumeLevelUnits Units { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IFullAudioSettings.cs

@@ -0,0 +1,41 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IFullAudioSettings
+  /// </summary>
+  public interface IFullAudioSettings : IBasicVolumeWithFeedback
+  {
+    void SetBalance(ushort level);
+    void BalanceLeft(bool pressRelease);
+    void BalanceRight(bool pressRelease);
+
+    void SetBass(ushort level);
+    void BassUp(bool pressRelease);
+    void BassDown(bool pressRelease);
+
+    void SetTreble(ushort level);
+    void TrebleUp(bool pressRelease);
+    void TrebleDown(bool pressRelease);
+
+    bool hasMaxVolume { get; }
+    void SetMaxVolume(ushort level);
+    void MaxVolumeUp(bool pressRelease);
+    void MaxVolumeDown(bool pressRelease);
+
+    bool hasDefaultVolume { get; }
+    void SetDefaultVolume(ushort level);
+    void DefaultVolumeUp(bool pressRelease);
+    void DefaultVolumeDown(bool pressRelease);
+
+    void LoudnessToggle();
+    void MonoToggle();
+
+    BoolFeedback LoudnessFeedback { get; }
+    BoolFeedback MonoFeedback { get; }
+    IntFeedback BalanceFeedback { get; }
+    IntFeedback BassFeedback { get; }
+    IntFeedback TrebleFeedback { get; }
+    IntFeedback MaxVolumeFeedback { get; }
+    IntFeedback DefaultVolumeFeedback { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasCurrentVolumeControls.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IHasCurrentVolumeControls
+  /// </summary>
+  public interface IHasCurrentVolumeControls
+  {
+    IBasicVolumeControls CurrentVolumeControls { get; }
+    event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
+
+    void SetDefaultLevels();
+
+    bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasMuteControl.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines basic mute control methods
+  /// </summary>
+  public interface IHasMuteControl
+  {
+    void MuteToggle();
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasMuteControlWithFeedback.cs

@@ -0,0 +1,12 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines mute control methods and properties with feedback
+  /// </summary>
+  public interface IHasMuteControlWithFeedback : IHasMuteControl
+  {
+    BoolFeedback MuteFeedback { get; }
+    void MuteOn();
+    void MuteOff();
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasVolumeControl.cs

@@ -0,0 +1,11 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IHasVolumeControl
+  /// </summary>
+  public interface IHasVolumeControl
+  {
+    void VolumeUp(bool pressRelease);
+    void VolumeDown(bool pressRelease);
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasVolumeControlWithFeedback.cs

@@ -0,0 +1,11 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines volume control methods and properties with feedback
+  /// </summary>
+  public interface IHasVolumeControlWithFeedback : IHasVolumeControl
+  {
+    void SetVolume(ushort level);
+    IntFeedback VolumeLevelFeedback { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasVolumeDevice.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IHasVolumeDevice
+  /// </summary>
+  public interface IHasVolumeDevice
+  {
+    IBasicVolumeControls VolumeDevice { get; }
+  }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/eVolumeLevelUnits.cs

@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core
+{
+  public enum eVolumeLevelUnits
+  {
+    Decibels,
+    Percent,
+    Relative,
+    Absolute
+  }
+}

src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// Defines minimal volume and mute control methods
-	/// </summary>
-    public interface IBasicVolumeControls 
-	{
-		void VolumeUp(bool pressRelease);
-		void VolumeDown(bool pressRelease);
-		void MuteToggle();
-	}
-
-    /// <summary>
-    /// Defines the contract for IHasVolumeControl
-    /// </summary>
-    public interface IHasVolumeControl
-    {
-        void VolumeUp(bool pressRelease);
-        void VolumeDown(bool pressRelease);
-    }
-
-    /// <summary>
-    /// Defines volume control methods and properties with feedback
-    /// </summary>
-    public interface IHasVolumeControlWithFeedback : IHasVolumeControl
-    {
-        void SetVolume(ushort level);
-        IntFeedback VolumeLevelFeedback { get; }
-    }
-
-    /// <summary>
-    /// Defines basic mute control methods
-    /// </summary>
-    public interface IHasMuteControl
-    {
-        void MuteToggle();
-    }
-
-    /// <summary>
-    /// Defines mute control methods and properties with feedback
-    /// </summary>
-    public interface IHasMuteControlWithFeedback : IHasMuteControl
-    {
-        BoolFeedback MuteFeedback { get; }
-        void MuteOn();
-        void MuteOff();
-    }
-
-    /// <summary>
-    /// Defines the contract for IBasicVolumeWithFeedback
-    /// </summary>
-    public interface IBasicVolumeWithFeedback : IBasicVolumeControls
-	{
-		BoolFeedback MuteFeedback { get; }
-        void MuteOn();
-        void MuteOff();
-		void SetVolume(ushort level);
-		IntFeedback VolumeLevelFeedback { get; }
-	}
-
- /// <summary>
- /// Defines the contract for IBasicVolumeWithFeedbackAdvanced
- /// </summary>
-	public interface IBasicVolumeWithFeedbackAdvanced : IBasicVolumeWithFeedback
-	{
-		int RawVolumeLevel { get; }
-
-		eVolumeLevelUnits Units { get; }
-	}
-
-    public enum eVolumeLevelUnits
-    {
-        Decibels,
-        Percent,
-        Relative,
-        Absolute
-    }
-
-    /// <summary>
-    /// Defines the contract for IHasCurrentVolumeControls
-    /// </summary>
-    public interface IHasCurrentVolumeControls
-    {
-        IBasicVolumeControls CurrentVolumeControls { get; }
-		event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-
-        void SetDefaultLevels();
-
-        bool ZeroVolumeWhenSwtichingVolumeDevices { get; }
-	}
-
-
- /// <summary>
- /// Defines the contract for IFullAudioSettings
- /// </summary>
-	public interface IFullAudioSettings : IBasicVolumeWithFeedback
-	{
-		void SetBalance(ushort level);
-		void BalanceLeft(bool pressRelease);
-		void BalanceRight(bool pressRelease);
-
-		void SetBass(ushort level);
-		void BassUp(bool pressRelease);
-		void BassDown(bool pressRelease);
-
-		void SetTreble(ushort level);
-		void TrebleUp(bool pressRelease);
-		void TrebleDown(bool pressRelease);
-
-		bool hasMaxVolume { get; }
-		void SetMaxVolume(ushort level);
-		void MaxVolumeUp(bool pressRelease);
-		void MaxVolumeDown(bool pressRelease);
-
-		bool hasDefaultVolume { get; }
-		void SetDefaultVolume(ushort level);
-		void DefaultVolumeUp(bool pressRelease);
-		void DefaultVolumeDown(bool pressRelease);
-
-		void LoudnessToggle();
-		void MonoToggle();
-
-		BoolFeedback LoudnessFeedback { get; }
-		BoolFeedback MonoFeedback { get; }
-		IntFeedback BalanceFeedback { get; }
-		IntFeedback BassFeedback { get; }
-		IntFeedback TrebleFeedback { get; }
-		IntFeedback MaxVolumeFeedback { get; }
-		IntFeedback DefaultVolumeFeedback { get; }
-	}
-
- /// <summary>
- /// Defines the contract for IHasVolumeDevice
- /// </summary>
-	public interface IHasVolumeDevice
-	{
-		IBasicVolumeControls VolumeDevice { get; }
-	}
-
-	/// <summary>
-	/// Identifies a device that contains audio zones
-	/// </summary>
-	public interface IAudioZones : IRouting
-	{
-		Dictionary<uint, IAudioZone> Zone { get; }
-	}
-
-	/// <summary>
-	/// Defines minimum functionality for an audio zone
-	/// </summary>
-	public interface IAudioZone : IBasicVolumeWithFeedback
-	{
-		void SelectInput(ushort input);
-	}
-}

src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs

@@ -1,16 +1,10 @@
 
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-
 using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices;
 using Serilog.Events;
 
@@ -25,17 +19,25 @@ namespace PepperDash.Essentials.Core.Fusion
         /// <summary>
         /// Evaluates the room info and custom properties from Fusion and updates the system properties aa needed
         /// </summary>
-        /// <param name="roomInfo"></param>
-        public void EvaluateRoomInfo(string roomKey, RoomInformation roomInfo)
+        /// <param name="room">The room associated with this Fusion instance</param>
+        /// <param name="roomInfo">The room information from Fusion</param>
+        /// <param name="useFusionRoomName"></param>
+        public void EvaluateRoomInfo(IEssentialsRoom room, RoomInformation roomInfo, bool useFusionRoomName)
         {
             try
             {
-                var reconfigurableDevices = DeviceManager.AllDevices.Where(d => d is ReconfigurableDevice);
+                var reconfigurableDevices = DeviceManager.AllDevices.OfType<ReconfigurableDevice>();
 
                 foreach (var device in reconfigurableDevices)
                 {
                     // Get the current device config so new values can be overwritten over existing
-                    var deviceConfig = (device as ReconfigurableDevice).Config;
+                    var deviceConfig = device.Config;
+
+                    if (device is IEssentialsRoom)
+                    {
+                        // Skipping room name as this will affect ALL room instances in the configuration and cause unintended consequences when multiple rooms are present and multiple Fusion instances are used
+                        continue;
+                    }
 
                     if (device is RoomOnToDefaultSourceWhenOccupied)
                     {
@@ -85,36 +87,49 @@ namespace PepperDash.Essentials.Core.Fusion
 
                         deviceConfig.Properties = JToken.FromObject(devProps);
                     }
-                    else if (device is IEssentialsRoom)
-                    {
-                        // Set the room name
-                        if (!string.IsNullOrEmpty(roomInfo.Name))
-                        {
-                            Debug.LogMessage(LogEventLevel.Debug, "Current Room Name: {0}. New Room Name: {1}", deviceConfig.Name, roomInfo.Name);
-                            // Set the name in config
-                            deviceConfig.Name = roomInfo.Name;
-
-                            Debug.LogMessage(LogEventLevel.Debug, "Room Name Successfully Changed.");
-                        }
-
-                        // Set the help message
-                        var helpMessage = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomHelpMessage"));
-                        if (helpMessage != null)
-                        {
-                            //Debug.LogMessage(LogEventLevel.Debug, "Current Help Message: {0}. New Help Message: {1}", deviceConfig.Properties["help"]["message"].Value<string>(ToString()), helpMessage.CustomFieldValue);
-                            deviceConfig.Properties["helpMessage"] = (string)helpMessage.CustomFieldValue;
-                        }
-                    }
 
                     // Set the config on the device
-                    (device as ReconfigurableDevice).SetConfig(deviceConfig);
+                    device.SetConfig(deviceConfig);
                 }
 
+                if (!(room is ReconfigurableDevice reconfigurable))
+                {
+                    Debug.LogWarning("FusionCustomPropertiesBridge: Room is not a ReconfigurableDevice. Cannot map custom properties.");
+                    return;
+                }
 
+                var roomConfig = reconfigurable.Config;
+
+                var updateConfig = false;
+
+                // Set the room name
+                if (!string.IsNullOrEmpty(roomInfo.Name) && useFusionRoomName)
+                {
+                    Debug.LogDebug("Current Room Name: {currentName}. New Room Name: {fusionName}", roomConfig.Name, roomInfo.Name);
+                    // Set the name in config
+                    roomConfig.Name = roomInfo.Name;
+                    updateConfig = true;
+
+                    Debug.LogDebug("Room Name Successfully Changed.");
+                }
+
+                // Set the help message
+                var helpMessage = roomInfo.FusionCustomProperties.FirstOrDefault(p => p.ID.Equals("RoomHelpMessage"));
+                if (helpMessage != null)
+                {
+                    roomConfig.Properties["helpMessage"] = helpMessage.CustomFieldValue;
+                    updateConfig = true;
+                }
+
+                if (updateConfig)
+                {
+                    reconfigurable.SetConfig(roomConfig);
+                }
             }
             catch (Exception e)
             {
-                Debug.LogMessage(LogEventLevel.Debug, "FusionCustomPropetiesBridge: Error mapping properties: {0}", e);
+                Debug.LogError("FusionCustomPropetiesBridge: Exception mapping properties for {roomKey}: {message}", room.Key, e.Message);
+                Debug.LogDebug(e, "Stack Trace: ");
             }
         }
     }

src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs

@@ -1,4 +1,9 @@
-using Crestron.SimplSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Timers;
+using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.CrestronXml;
 using Crestron.SimplSharp.CrestronXml.Serialization;
@@ -10,11 +15,6 @@ using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using Serilog.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Timers;
 
 namespace PepperDash.Essentials.Core.Fusion
 {
@@ -1091,7 +1091,7 @@ namespace PepperDash.Essentials.Core.Fusion
                         }
                         RoomInfoChange?.Invoke(this, new EventArgs());
 
-                        CustomPropertiesBridge.EvaluateRoomInfo(Room.Key, roomInformation);
+                        CustomPropertiesBridge.EvaluateRoomInfo(Room, roomInformation, _config.UseFusionRoomName);
                     }
                 }
                 catch (Exception e)

src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs

@@ -27,7 +27,7 @@ public class IEssentialsRoomFusionControllerPropertiesConfig
             }
             else
             {
-                Debug.LogWarning( "Failed to parse IpId '{0}' as UInt16", IpId);
+                Debug.LogWarning("Failed to parse IpId '{0}' as UInt16", IpId);
                 return 0;
             }
         }
@@ -45,6 +45,13 @@ public class IEssentialsRoomFusionControllerPropertiesConfig
     [JsonProperty("roomKey")]
     public string RoomKey { get; set; }
 
+    /// <summary>
+    /// Gets or sets whether to use the Fusion room name for this room
+    /// </summary>
+    /// <remarks>Defaults to true to preserve current behavior. Set to false to skip updating the room name from Fusion</remarks>
+    [JsonProperty("useFusionRoomName")]
+    public bool UseFusionRoomName { get; set; } = true;
+
     /// <summary>
     /// Gets or sets whether to use HTML format for help requests
     /// </summary>

src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs

@@ -1,7 +1,7 @@
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Config;
-using System;
+using System;
 using System.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Core.Routing
 {
@@ -9,20 +9,20 @@ namespace PepperDash.Essentials.Core.Routing
     /// Manages routing feedback by subscribing to route changes on midpoint and sink devices,
     /// tracing the route back to the original source, and updating the CurrentSourceInfo on sink devices.
     /// </summary>
-    public class RoutingFeedbackManager:EssentialsDevice
+    public class RoutingFeedbackManager : EssentialsDevice
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RoutingFeedbackManager"/> class.
         /// </summary>
         /// <param name="key">The unique key for this manager device.</param>
         /// <param name="name">The name of this manager device.</param>
-        public RoutingFeedbackManager(string key, string name): base(key, name)
-        {            
+        public RoutingFeedbackManager(string key, string name)
+            : base(key, name)
+        {
             AddPreActivationAction(SubscribeForMidpointFeedback);
             AddPreActivationAction(SubscribeForSinkFeedback);
         }
 
-
         /// <summary>
         /// Subscribes to the RouteChanged event on all devices implementing <see cref="IRoutingWithFeedback"/>.
         /// </summary>
@@ -41,12 +41,13 @@ namespace PepperDash.Essentials.Core.Routing
         /// </summary>
         private void SubscribeForSinkFeedback()
         {
-                var sinkDevices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitchingWithInputPort>();
+            var sinkDevices =
+                DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitchingWithInputPort>();
 
-                foreach (var device in sinkDevices)
-                {
-                    device.InputChanged += HandleSinkUpdate;
-                }   
+            foreach (var device in sinkDevices)
+            {
+                device.InputChanged += HandleSinkUpdate;
+            }
         }
 
         /// <summary>
@@ -55,11 +56,15 @@ namespace PepperDash.Essentials.Core.Routing
         /// </summary>
         /// <param name="midpoint">The midpoint device that reported a route change.</param>
         /// <param name="newRoute">The descriptor of the new route.</param>
-        private void HandleMidpointUpdate(IRoutingWithFeedback midpoint, RouteSwitchDescriptor newRoute)
+        private void HandleMidpointUpdate(
+            IRoutingWithFeedback midpoint,
+            RouteSwitchDescriptor newRoute
+        )
         {
             try
             {
-                var devices = DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitchingWithInputPort>();
+                var devices =
+                    DeviceManager.AllDevices.OfType<IRoutingSinkWithSwitchingWithInputPort>();
 
                 foreach (var device in devices)
                 {
@@ -68,7 +73,13 @@ namespace PepperDash.Essentials.Core.Routing
             }
             catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Error handling midpoint update from {midpointKey}:{Exception}", this, midpoint.Key, ex);
+                Debug.LogMessage(
+                    ex,
+                    "Error handling midpoint update from {midpointKey}:{Exception}",
+                    this,
+                    midpoint.Key,
+                    ex
+                );
             }
         }
 
@@ -78,7 +89,10 @@ namespace PepperDash.Essentials.Core.Routing
         /// </summary>
         /// <param name="sender">The sink device that reported an input change.</param>
         /// <param name="currentInputPort">The new input port selected on the sink device.</param>
-        private void HandleSinkUpdate(IRoutingSinkWithSwitching sender, RoutingInputPort currentInputPort)
+        private void HandleSinkUpdate(
+            IRoutingSinkWithSwitching sender,
+            RoutingInputPort currentInputPort
+        )
         {
             try
             {
@@ -86,7 +100,13 @@ namespace PepperDash.Essentials.Core.Routing
             }
             catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Error handling Sink update from {senderKey}:{Exception}", this, sender.Key, ex);
+                Debug.LogMessage(
+                    ex,
+                    "Error handling Sink update from {senderKey}:{Exception}",
+                    this,
+                    sender.Key,
+                    ex
+                );
             }
         }
 
@@ -96,13 +116,27 @@ namespace PepperDash.Essentials.Core.Routing
         /// </summary>
         /// <param name="destination">The destination sink device to update.</param>
         /// <param name="inputPort">The currently selected input port on the destination device.</param>
-        private void UpdateDestination(IRoutingSinkWithSwitching destination, RoutingInputPort inputPort)
-        {            
-            Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Updating destination {destination} with inputPort {inputPort}", this, destination?.Key, inputPort?.Key);
+        private void UpdateDestination(
+            IRoutingSinkWithSwitching destination,
+            RoutingInputPort inputPort
+        )
+        {
+            Debug.LogMessage(
+                Serilog.Events.LogEventLevel.Debug,
+                "Updating destination {destination} with inputPort {inputPort}",
+                this,
+                destination?.Key,
+                inputPort?.Key
+            );
 
-            if(inputPort == null)
+            if (inputPort == null)
             {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "Destination {destination} has not reported an input port yet", this,destination.Key);
+                Debug.LogMessage(
+                    Serilog.Events.LogEventLevel.Debug,
+                    "Destination {destination} has not reported an input port yet",
+                    this,
+                    destination.Key
+                );
                 return;
             }
 
@@ -111,11 +145,19 @@ namespace PepperDash.Essentials.Core.Routing
             {
                 var tieLines = TieLineCollection.Default;
 
-                firstTieLine = tieLines.FirstOrDefault(tl => tl.DestinationPort.Key == inputPort.Key && tl.DestinationPort.ParentDevice.Key == inputPort.ParentDevice.Key);
+                firstTieLine = tieLines.FirstOrDefault(tl =>
+                    tl.DestinationPort.Key == inputPort.Key
+                    && tl.DestinationPort.ParentDevice.Key == inputPort.ParentDevice.Key
+                );
 
                 if (firstTieLine == null)
                 {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No tieline found for inputPort {inputPort}. Clearing current source", this, inputPort);
+                    Debug.LogMessage(
+                        Serilog.Events.LogEventLevel.Debug,
+                        "No tieline found for inputPort {inputPort}. Clearing current source",
+                        this,
+                        inputPort
+                    );
 
                     var tempSourceListItem = new SourceListItem
                     {
@@ -123,12 +165,13 @@ namespace PepperDash.Essentials.Core.Routing
                         Name = inputPort.Key,
                     };
 
-
-                    destination.CurrentSourceInfo = tempSourceListItem;                        ;
+                    destination.CurrentSourceInfo = tempSourceListItem;
+                    ;
                     destination.CurrentSourceInfoKey = "$transient";
                     return;
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 Debug.LogMessage(ex, "Error getting first tieline: {Exception}", this, ex);
                 return;
@@ -143,7 +186,12 @@ namespace PepperDash.Essentials.Core.Routing
 
                 if (sourceTieLine == null)
                 {
-                    Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No route found to source for inputPort {inputPort}. Clearing current source", this, inputPort);
+                    Debug.LogMessage(
+                        Serilog.Events.LogEventLevel.Debug,
+                        "No route found to source for inputPort {inputPort}. Clearing current source",
+                        this,
+                        inputPort
+                    );
 
                     var tempSourceListItem = new SourceListItem
                     {
@@ -155,32 +203,45 @@ namespace PepperDash.Essentials.Core.Routing
                     destination.CurrentSourceInfoKey = string.Empty;
                     return;
                 }
-            } catch(Exception ex)
+            }
+            catch (Exception ex)
             {
                 Debug.LogMessage(ex, "Error getting sourceTieLine: {Exception}", this, ex);
                 return;
             }
 
-            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);           
+            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root TieLine {tieLine}", this, sourceTieLine);
 
             // Does not handle combinable scenarios or other scenarios where a display might be part of multiple rooms yet.
-            var room = DeviceManager.AllDevices.OfType<IEssentialsRoom>().FirstOrDefault((r) => {
-                if(r is IHasMultipleDisplays roomMultipleDisplays)
-                {
-                    return roomMultipleDisplays.Displays.Any(d => d.Value.Key == destination.Key);
-                }
+            var room = DeviceManager
+                .AllDevices.OfType<IEssentialsRoom>()
+                .FirstOrDefault(
+                    (r) =>
+                    {
+                        if (r is IHasMultipleDisplays roomMultipleDisplays)
+                        {
+                            return roomMultipleDisplays.Displays.Any(d =>
+                                d.Value.Key == destination.Key
+                            );
+                        }
 
-                if(r is IHasDefaultDisplay roomDefaultDisplay)
-                {
-                    return roomDefaultDisplay.DefaultDisplay.Key == destination.Key;
-                }
+                        if (r is IHasDefaultDisplay roomDefaultDisplay)
+                        {
+                            return roomDefaultDisplay.DefaultDisplay.Key == destination.Key;
+                        }
 
-                return false;
-            });
-            
-            if(room == null)
+                        return false;
+                    }
+                );
+
+            if (room == null)
             {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "No room found for display {destination}", this, destination.Key);
+                Debug.LogMessage(
+                    Serilog.Events.LogEventLevel.Debug,
+                    "No room found for display {destination}",
+                    this,
+                    destination.Key
+                );
                 return;
             }
 
@@ -190,29 +251,45 @@ namespace PepperDash.Essentials.Core.Routing
 
             if (sourceList == null)
             {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "No source list found for source list key {key}. Unable to find source for tieLine {sourceTieLine}", this, room.SourceListKey, sourceTieLine);
+                Debug.LogMessage(
+                    Serilog.Events.LogEventLevel.Debug,
+                    "No source list found for source list key {key}. Unable to find source for tieLine {sourceTieLine}",
+                    this,
+                    room.SourceListKey,
+                    sourceTieLine
+                );
                 return;
             }
 
             // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found sourceList for room {room}", this, room.Key);
 
-            var sourceListItem = sourceList.FirstOrDefault(sli => {
-                 //// Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
-                 //   "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
-                 //   this,
-                 //   sli.Key,
-                 //   sli.Value.SourceKey,
-                 //   sourceTieLine.SourcePort.ParentDevice.Key);
+            var sourceListItem = sourceList.FirstOrDefault(sli =>
+            {
+                //// Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose,
+                //   "SourceListItem {sourceListItem}:{sourceKey} tieLine sourceport device key {sourcePortDeviceKey}",
+                //   this,
+                //   sli.Key,
+                //   sli.Value.SourceKey,
+                //   sourceTieLine.SourcePort.ParentDevice.Key);
 
-                return sli.Value.SourceKey.Equals(sourceTieLine.SourcePort.ParentDevice.Key,StringComparison.InvariantCultureIgnoreCase);
-            });            
+                return sli.Value.SourceKey.Equals(
+                    sourceTieLine.SourcePort.ParentDevice.Key,
+                    StringComparison.InvariantCultureIgnoreCase
+                );
+            });
 
             var source = sourceListItem.Value;
             var sourceKey = sourceListItem.Key;
 
             if (source == null)
             {
-                Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No source found for device {key}. Creating transient source for {destination}", this, sourceTieLine.SourcePort.ParentDevice.Key, destination);
+                Debug.LogMessage(
+                    Serilog.Events.LogEventLevel.Debug,
+                    "No source found for device {key}. Creating transient source for {destination}",
+                    this,
+                    sourceTieLine.SourcePort.ParentDevice.Key,
+                    destination
+                );
 
                 var tempSourceListItem = new SourceListItem
                 {
@@ -221,7 +298,7 @@ namespace PepperDash.Essentials.Core.Routing
                 };
 
                 destination.CurrentSourceInfoKey = "$transient";
-                destination.CurrentSourceInfo = tempSourceListItem;                
+                destination.CurrentSourceInfo = tempSourceListItem;
                 return;
             }
 
@@ -229,7 +306,6 @@ namespace PepperDash.Essentials.Core.Routing
 
             destination.CurrentSourceInfoKey = sourceKey;
             destination.CurrentSourceInfo = source;
-            
         }
 
         /// <summary>
@@ -249,29 +325,49 @@ namespace PepperDash.Essentials.Core.Routing
                 {
                     // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source device {sourceDevice} is midpoint", this, midpoint);
 
-                    if(midpoint.CurrentRoutes == null || midpoint.CurrentRoutes.Count == 0)
+                    if (midpoint.CurrentRoutes == null || midpoint.CurrentRoutes.Count == 0)
                     {
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Midpoint {midpointKey} has no routes",this, midpoint.Key);
+                        Debug.LogMessage(
+                            Serilog.Events.LogEventLevel.Debug,
+                            "Midpoint {midpointKey} has no routes",
+                            this,
+                            midpoint.Key
+                        );
                         return null;
                     }
 
-                    var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route => {
+                    var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route =>
+                    {
                         //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine);
 
-                        return route.OutputPort != null && route.InputPort != null && route.OutputPort?.Key == tieLine.SourcePort.Key && route.OutputPort?.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key;
+                        return route.OutputPort != null
+                            && route.InputPort != null
+                            && route.OutputPort?.Key == tieLine.SourcePort.Key
+                            && route.OutputPort?.ParentDevice.Key
+                                == tieLine.SourcePort.ParentDevice.Key;
                     });
 
                     if (currentRoute == null)
                     {
-                        Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "No route through midpoint {midpoint} for outputPort {outputPort}", this, midpoint.Key, tieLine.SourcePort);
+                        Debug.LogMessage(
+                            Serilog.Events.LogEventLevel.Debug,
+                            "No route through midpoint {midpoint} for outputPort {outputPort}",
+                            this,
+                            midpoint.Key,
+                            tieLine.SourcePort
+                        );
                         return null;
                     }
 
                     //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found currentRoute {currentRoute} through {midpoint}", this, currentRoute, midpoint);
 
-                    nextTieLine = TieLineCollection.Default.FirstOrDefault(tl => { 
+                    nextTieLine = TieLineCollection.Default.FirstOrDefault(tl =>
+                    {
                         //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", tl.DestinationPort.Key, currentRoute.InputPort.Key);
-                        return tl.DestinationPort.Key == currentRoute.InputPort.Key && tl.DestinationPort.ParentDevice.Key == currentRoute.InputPort.ParentDevice.Key; });
+                        return tl.DestinationPort.Key == currentRoute.InputPort.Key
+                            && tl.DestinationPort.ParentDevice.Key
+                                == currentRoute.InputPort.ParentDevice.Key;
+                    });
 
                     if (nextTieLine != null)
                     {
@@ -286,19 +382,26 @@ namespace PepperDash.Essentials.Core.Routing
                 //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLIne Source Device {sourceDeviceKey} is IRoutingSource: {isIRoutingSource}", this, tieLine.SourcePort.ParentDevice.Key, tieLine.SourcePort.ParentDevice is IRoutingSource);
                 //Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "TieLine Source Device interfaces: {typeFullName}:{interfaces}", this, tieLine.SourcePort.ParentDevice.GetType().FullName, tieLine.SourcePort.ParentDevice.GetType().GetInterfaces().Select(i => i.Name));
 
-                if (tieLine.SourcePort.ParentDevice is IRoutingSource || tieLine.SourcePort.ParentDevice is IRoutingOutputs) //end of the chain
+                if (
+                    tieLine.SourcePort.ParentDevice is IRoutingSource
+                    || tieLine.SourcePort.ParentDevice is IRoutingOutputs
+                ) //end of the chain
                 {
                     // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Found root: {tieLine}", this, tieLine);
                     return tieLine;
                 }
 
-                nextTieLine = TieLineCollection.Default.FirstOrDefault(tl => tl.DestinationPort.Key == tieLine.SourcePort.Key && tl.DestinationPort.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key );
+                nextTieLine = TieLineCollection.Default.FirstOrDefault(tl =>
+                    tl.DestinationPort.Key == tieLine.SourcePort.Key
+                    && tl.DestinationPort.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key
+                );
 
                 if (nextTieLine != null)
                 {
                     return GetRootTieLine(nextTieLine);
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 Debug.LogMessage(ex, "Error walking tieLines: {Exception}", this, ex);
                 return null;

src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs

@@ -61,13 +61,18 @@ namespace PepperDash.Essentials.Devices.Common.DSP
     /// <summary>
     /// Base class for DSP control points
     /// </summary>
-    public abstract class DspControlPoint : IKeyed
+    public abstract class DspControlPoint : IKeyName
     {
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
         public string Key { get; }
 
+        /// <summary>
+        /// Gets or sets the Name
+        /// </summary>
+        public string Name { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the DspControlPoint class
         /// </summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs

@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
         /// <param name="messagePath">The message path.</param>
         /// <param name="device">The device.</param>
         public DeviceVolumeMessenger(string key, string messagePath, IBasicVolumeControls device)
-            : base(key, messagePath, device as IKeyName)
+            : base(key, messagePath, device)
         {
             this.device = device;
         }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs

@@ -62,6 +62,14 @@ namespace PepperDash.Essentials.AppServer.Messengers
                         inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value))
                     }));
                 };
+
+                inputSlot.IsOnline.OutputChange += (sender, args) =>
+                {
+                    PostStatusMessage(JToken.FromObject(new
+                    {
+                        inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value))
+                    }));
+                };
             }
         }
 

src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs

@@ -69,10 +69,11 @@ namespace PepperDash.Essentials.WebSocketServer
         private readonly ConcurrentDictionary<string, string> pendingClientRegistrations = new ConcurrentDictionary<string, string>();
 
         /// <summary>
-        /// Stores queues of pending client IDs per token for legacy clients (FIFO)
-        /// This ensures thread-safety when multiple legacy clients use the same token
+        /// Stores pending client registrations with timestamp for legacy clients
+        /// Key is token, Value is list of (clientId, timestamp) tuples
+        /// Most recent registration is used to handle duplicate join requests
         /// </summary>
-        private readonly ConcurrentDictionary<string, ConcurrentQueue<string>> legacyClientIdQueues = new ConcurrentDictionary<string, ConcurrentQueue<string>>();
+        private readonly ConcurrentDictionary<string, ConcurrentBag<(string clientId, DateTime timestamp)>> legacyClientRegistrations = new ConcurrentDictionary<string, ConcurrentBag<(string, DateTime)>>();
 
         /// <summary>
         /// Gets the collection of UI clients
@@ -736,15 +737,23 @@ namespace PepperDash.Essentials.WebSocketServer
 
         private UiClient BuildUiClient(string roomKey, JoinToken token, string key)
         {
-            // Dequeue the next clientId for legacy client support (FIFO per token)
+            // Get the most recent unused clientId for this token (legacy support)
             // New clients will override this ID in OnOpen with the validated query parameter value
             var clientId = "pending";
-            if (legacyClientIdQueues.TryGetValue(key, out var queue) && queue.TryDequeue(out var dequeuedId))
+            if (legacyClientRegistrations.TryGetValue(key, out var registrations))
             {
-                clientId = dequeuedId;
-                this.LogVerbose("Dequeued legacy clientId {clientId} for token {token}", clientId, key);
+                // Get most recent registration
+                var sorted = registrations.OrderByDescending(r => r.timestamp).ToList();
+                if (sorted.Any())
+                {
+                    clientId = sorted.First().clientId;
+                    // Remove it from the bag
+                    var newBag = new ConcurrentBag<(string, DateTime)>(sorted.Skip(1));
+                    legacyClientRegistrations.TryUpdate(key, newBag, registrations);
+                    this.LogVerbose("Assigned most recent legacy clientId {clientId} for token {token}", clientId, key);
+                }
             }
-            
+
             var c = new UiClient($"uiclient-{key}-{roomKey}-{clientId}", clientId, token.Token, token.TouchpanelKey);
             this.LogInformation("Constructing UiClient with key {key} and temporary ID (will be set from query param)", key);
             c.Controller = _parent;
@@ -753,8 +762,8 @@ namespace PepperDash.Essentials.WebSocketServer
             c.Server = this; // Give UiClient access to server for ID registration
 
             // Don't add to uiClients yet - will be added in OnOpen after ID is set from query param
-            
-            c.ConnectionClosed += (o, a) => 
+
+            c.ConnectionClosed += (o, a) =>
             {
                 uiClients.TryRemove(a.ClientId, out _);
                 // Clean up any pending registrations for this token
@@ -765,11 +774,11 @@ namespace PepperDash.Essentials.WebSocketServer
                 {
                     pendingClientRegistrations.TryRemove(k, out _);
                 }
-                
-                // Clean up legacy queue if empty
-                if (legacyClientIdQueues.TryGetValue(key, out var legacyQueue) && legacyQueue.IsEmpty)
+
+                // Clean up legacy registrations if empty
+                if (legacyClientRegistrations.TryGetValue(key, out var legacyBag) && legacyBag.IsEmpty)
                 {
-                    legacyClientIdQueues.TryRemove(key, out _);
+                    legacyClientRegistrations.TryRemove(key, out _);
                 }
             };
             return c;
@@ -785,7 +794,7 @@ namespace PepperDash.Essentials.WebSocketServer
         public bool RegisterUiClient(UiClient client, string clientId, string tokenKey)
         {
             var registrationKey = $"{tokenKey}-{clientId}";
-            
+
             // Verify this clientId was generated during a join request for this token
             if (!pendingClientRegistrations.TryRemove(registrationKey, out _))
             {
@@ -799,11 +808,63 @@ namespace PepperDash.Essentials.WebSocketServer
                 this.LogWarning("Replacing existing client with duplicate id {id}", id);
                 return client;
             });
-            
+
             this.LogInformation("Successfully registered UiClient with ID {clientId} for token {token}", clientId, tokenKey);
             return true;
         }
 
+        /// <summary>
+        /// Updates a client's ID when a mismatch is detected between stored ID and message ID
+        /// </summary>
+        /// <param name="oldClientId">The current/old client ID</param>
+        /// <param name="newClientId">The new client ID from the message</param>
+        /// <param name="tokenKey">The token key for validation</param>
+        /// <returns>True if update successful, false otherwise</returns>
+        public bool UpdateClientId(string oldClientId, string newClientId, string tokenKey)
+        {
+            if (string.IsNullOrEmpty(oldClientId) || string.IsNullOrEmpty(newClientId))
+            {
+                this.LogWarning("Cannot update client ID with null or empty values");
+                return false;
+            }
+
+            if (oldClientId == newClientId)
+            {
+                return true; // No update needed
+            }
+
+            // Verify the new clientId was registered for this token
+            var registrationKey = $"{tokenKey}-{newClientId}";
+            if (!pendingClientRegistrations.TryRemove(registrationKey, out _))
+            {
+                this.LogWarning("Cannot update to unregistered clientId {newClientId} for token {token}", newClientId, tokenKey);
+                return false;
+            }
+
+            // Get the existing client
+            if (!uiClients.TryRemove(oldClientId, out var client))
+            {
+                this.LogWarning("Cannot find client with old ID {oldClientId}", oldClientId);
+                return false;
+            }
+
+            // Update the client's ID
+            client.UpdateId(newClientId);
+
+            // Re-add with new ID
+            if (!uiClients.TryAdd(newClientId, client))
+            {
+                // If add fails, try to restore old entry
+                uiClients.TryAdd(oldClientId, client);
+                client.UpdateId(oldClientId);
+                this.LogError("Failed to update client ID from {oldClientId} to {newClientId}", oldClientId, newClientId);
+                return false;
+            }
+
+            this.LogInformation("Successfully updated client ID from {oldClientId} to {newClientId}", oldClientId, newClientId);
+            return true;
+        }
+
         /// <summary>
         /// Registers a UiClient using legacy flow (for backwards compatibility with older clients)
         /// </summary>
@@ -821,7 +882,7 @@ namespace PepperDash.Essentials.WebSocketServer
                 this.LogWarning("Replacing existing client with duplicate id {id} (legacy flow)", id);
                 return client;
             });
-            
+
             this.LogInformation("Successfully registered UiClient with ID {clientId} using legacy flow", client.Id);
         }
 
@@ -1133,16 +1194,17 @@ namespace PepperDash.Essentials.WebSocketServer
 
             // Generate a client ID for this join request
             var clientId = $"{Utilities.GetNextClientId()}";
-            
+            var now = DateTime.UtcNow;
+
             // Store in pending registrations for new clients that send clientId via query param
             var registrationKey = $"{token}-{clientId}";
             pendingClientRegistrations.TryAdd(registrationKey, clientId);
-            
-            // Also enqueue for legacy clients (thread-safe FIFO per token)
-            var queue = legacyClientIdQueues.GetOrAdd(token, _ => new ConcurrentQueue<string>());
-            queue.Enqueue(clientId);
 
-            this.LogVerbose("Assigning ClientId: {clientId} for token: {token}", clientId, token);
+            // For legacy clients, store with timestamp instead of FIFO queue
+            var legacyBag = legacyClientRegistrations.GetOrAdd(token, _ => new ConcurrentBag<(string, DateTime)>());
+            legacyBag.Add((clientId, now));
+
+            this.LogVerbose("Assigning ClientId: {clientId} for token: {token} at {timestamp}", clientId, token, now);
 
             // Construct WebSocket URL with clientId query parameter
             var wsProtocol = "ws";

src/PepperDash.Essentials.MobileControl/WebSocketServer/UiClient.cs

@@ -26,6 +26,15 @@ namespace PepperDash.Essentials.WebSocketServer
         /// </summary>
         public string Id { get; private set; }
 
+        /// <summary>
+        /// Updates the client ID - only accessible from within the assembly (e.g., by the server)
+        /// </summary>
+        /// <param name="newId">The new client ID</param>
+        internal void UpdateId(string newId)
+        {
+            Id = newId;
+        }
+
         /// <summary>
         /// Token associated with this client
         /// </summary>

src/PepperDash.Essentials/ControlSystem.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
@@ -549,7 +549,10 @@ namespace PepperDash.Essentials
             var applicationDirectory = new DirectoryInfo(Global.ApplicationDirectoryPathPrefix);
             Debug.LogMessage(LogEventLevel.Information, "Searching: {applicationDirectory:l} for embedded assets - {Destination}", applicationDirectory.FullName, Global.FilePathPrefix);
 
-            var zipFiles = applicationDirectory.GetFiles("assets*.zip");
+            var zipFiles = applicationDirectory.GetFiles("*")
+                .Where(f => f.Name.StartsWith("assets", StringComparison.OrdinalIgnoreCase) && 
+                            f.Extension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                .ToArray();
 
             if (zipFiles.Length > 1)
             {
@@ -597,7 +600,10 @@ namespace PepperDash.Essentials
                 File.Delete(file.FullName);
             }
 
-            var htmlZipFiles = applicationDirectory.GetFiles("htmlassets*.zip");
+            var htmlZipFiles = applicationDirectory.GetFiles("*")
+                .Where(f => f.Name.StartsWith("htmlassets", StringComparison.OrdinalIgnoreCase) && 
+                            f.Extension.Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                .ToArray();
 
             if (htmlZipFiles.Length > 1)
             {
@@ -658,7 +664,10 @@ namespace PepperDash.Essentials
                 File.Delete(file.FullName);
             }
 
-            var jsonFiles = applicationDirectory.GetFiles("*configurationFile*.json");
+            var jsonFiles = applicationDirectory.GetFiles("*")
+                .Where(f => f.Name.IndexOf("configurationFile", StringComparison.OrdinalIgnoreCase) >= 0 && 
+                            f.Extension.Equals(".json", StringComparison.OrdinalIgnoreCase))
+                .ToArray();
 
             if (jsonFiles.Length > 1)
             {