fix: add param info, clean up trailing whitespace and minor formatting

fix: handle subsequent join calls and clientid/websocket client mismatches

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.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>