fix: mobileinfo & CWS info call report the correct data

src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs

@@ -1746,38 +1746,40 @@ namespace PepperDash.Essentials
                     "\r\n    UI Client Info:\r\n" +
                     "    Tokens Defined: {0}\r\n" +
                     "    Clients Connected: {1}\r\n",
-                    _directServer.UiClients.Count,
+                    _directServer.UiClientContexts.Count,
                     _directServer.ConnectedUiClientsCount
                 );
 
                 var clientNo = 1;
-                foreach (var clientContext in _directServer.UiClients)
+                foreach (var clientContext in _directServer.UiClientContexts)
                 {
                     var isAlive = false;
                     var duration = "Not Connected";
 
-                    if (clientContext.Value.Client != null)
+                    var clients = _directServer.UiClients.Values.Where(c => c.Token == clientContext.Value.Token.Token);
-                    {
-                        isAlive = clientContext.Value.Client.Context.WebSocket.IsAlive;
-                        duration = clientContext.Value.Client.ConnectedDuration.ToString();
-                    }
 
                     CrestronConsole.ConsoleCommandResponse(
-                        "\r\nClient {0}:\r\n" +
+                        $"\r\nClient {clientNo}:\r\n" +
-                        "Room Key: {1}\r\n" +
+                        $"  Room Key: {clientContext.Value.Token.RoomKey}\r\n" +
-                        "Touchpanel Key: {6}\r\n" +
+                        $"  Touchpanel Key: {clientContext.Value.Token.TouchpanelKey}\r\n" +
-                        "Token: {2}\r\n" +
+                        $"  Token: {clientContext.Key}\r\n" +
-                        "Client URL: {3}\r\n" +
+                        $"  Client URL: {_directServer.UserAppUrlPrefix}{clientContext.Key}\r\n" +
-                        "Connected: {4}\r\n" +
+                        $"  Clients:\r\n"
-                        "Duration: {5}\r\n",
-                        clientNo,
-                        clientContext.Value.Token.RoomKey,
-                        clientContext.Key,
-                        string.Format("{0}{1}", _directServer.UserAppUrlPrefix, clientContext.Key),
-                        isAlive,
-                        duration,
-                        clientContext.Value.Token.TouchpanelKey
                     );
+
+                    if (!clients.Any())
+                    {
+                        CrestronConsole.ConsoleCommandResponse("    No clients connected");
+                    }
+                    foreach (var client in clients)
+                    {
+                        CrestronConsole.ConsoleCommandResponse(
+                            $"    ID: {client.Id}\r\n" +
+                            $"    Connected: {client.Context.WebSocket.IsAlive}\r\n" +
+                            $"    Duration: {(client.Context.WebSocket.IsAlive ? client.ConnectedDuration.TotalSeconds.ToString() : "Not Connected")}\r\n"
+                        );
+                    }
+
                     clientNo++;
                 }
             }

src/PepperDash.Essentials.MobileControl/WebApiHandlers/MobileInfoHandler.cs

@@ -117,7 +117,11 @@ namespace PepperDash.Essentials.WebApiHandlers
         public int ClientsConnected => directServer.ConnectedUiClientsCount;
 
         [JsonProperty("clients")]
-        public List<MobileControlDirectClient> Clients => directServer.UiClientContexts.Select((c, i) => { return new MobileControlDirectClient(c, i, directServer.UserAppUrlPrefix); }).ToList();
+        public List<MobileControlDirectClient> Clients => directServer.UiClientContexts
+            .Select(context => (context, clients: directServer.UiClients.Where(client => client.Value.Token == context.Value.Token.Token).Select(c => c.Value).ToList()))
+            .Select((clientTuple, i) => new MobileControlDirectClient(clientTuple.clients, clientTuple.context, i, directServer.UserAppUrlPrefix))
+            .ToList();
+
 
         public MobileControlDirectServer(MobileControlWebsocketServer server)
         {
@@ -157,18 +161,39 @@ namespace PepperDash.Essentials.WebApiHandlers
         [JsonProperty("token")]
         public string Token => Key;
 
-        [JsonProperty("connected")]
+        private readonly List<UiClient> clients;
-        public bool Connected => context.Client != null && context.Client.Context.WebSocket.IsAlive;
 
-        [JsonProperty("duration")]
+        [JsonProperty("clientStatus")]
-        public double Duration => context.Client == null ? 0 : context.Client.ConnectedDuration.TotalSeconds;
+        public List<ClientStatus> ClientStatus => clients.Select(c => new ClientStatus(c)).ToList();
 
-        public MobileControlDirectClient(KeyValuePair<string, UiClientContext> clientContext, int index, string urlPrefix)
+        /// <summary>
+        /// Create an instance of the <see cref="MobileControlDirectClient"/> class.
+        /// </summary>
+        /// <param name="clients">List of Websocket Clients</param>
+        /// <param name="context">Context for the client</param>
+        /// <param name="index">Index of the client</param>
+        /// <param name="urlPrefix">URL prefix for the client</param>
+        public MobileControlDirectClient(List<UiClient> clients, KeyValuePair<string, UiClientContext> context, int index, string urlPrefix)
         {
-            context = clientContext.Value;
+            this.context = context.Value;
-            Key = clientContext.Key;
+            Key = context.Key;
             clientNumber = index;
             this.urlPrefix = urlPrefix;
+            this.clients = clients;
+        }
+    }
+
+    public class ClientStatus
+    {
+        private readonly UiClient client;
+
+        public bool Connected => client != null && client.Context.WebSocket.IsAlive;
+
+        public double Duration => client == null ? 0 : client.ConnectedDuration.TotalSeconds;
+
+        public ClientStatus(UiClient client)
+        {
+            this.client = client;
         }
     }
 }

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

@@ -61,6 +61,11 @@ namespace PepperDash.Essentials.WebSocketServer
 
         private readonly Dictionary<string, UiClient> uiClients = new Dictionary<string, UiClient>();
 
+        /// <summary>
+        /// Gets the collection of UI clients
+        /// </summary>
+        public ReadOnlyDictionary<string, UiClient> UiClients => new ReadOnlyDictionary<string, UiClient>(uiClients);
+
         private readonly MobileControlSystemController _parent;
 
         private WebSocketServerSecretProvider _secretProvider;
@@ -130,17 +135,7 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             get
             {
-                var count = 0;
+                return uiClients.Values.Where(c => c.Context.WebSocket.IsAlive).Count();
-
-                foreach (var client in UiClientContexts)
-                {
-                    if (client.Value.Client != null && client.Value.Client.Context.WebSocket.IsAlive)
-                    {
-                        count++;
-                    }
-                }
-
-                return count;
             }
         }
 
@@ -736,7 +731,7 @@ namespace PepperDash.Essentials.WebSocketServer
 
         private UiClient BuildUiClient(string roomKey, JoinToken token, string key)
         {
-            var c = new UiClient($"uiclient-{key}-{roomKey}-{token.Id}", token.Id);
+            var c = new UiClient($"uiclient-{key}-{roomKey}-{token.Id}", token.Id, token.Token);
             this.LogInformation("Constructing UiClient with key {key} and ID {id}", key, token.Id);
             c.Controller = _parent;
             c.RoomKey = roomKey;

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

@@ -1,5 +1,4 @@
 using System;
-using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
@@ -22,6 +21,16 @@ namespace PepperDash.Essentials.WebSocketServer
         /// <inheritdoc />
         public string Key { get; private set; }
 
+        /// <summary>
+        /// Client ID used by client for this connection
+        /// </summary>
+        public string Id { get; private set; }
+
+        /// <summary>
+        /// Token associated with this client
+        /// </summary>
+        public string Token { get; private set; }
+
         /// <summary>
         /// Gets or sets the mobile control system controller that handles this client's messages
         /// </summary>
@@ -32,11 +41,6 @@ namespace PepperDash.Essentials.WebSocketServer
         /// </summary>
         public string RoomKey { get; set; }
 
-        /// <summary>
-        /// The unique identifier for this client instance
-        /// </summary>
-        private string _clientId;
-
         /// <summary>
         /// The timestamp when this client connection was established
         /// </summary>
@@ -60,15 +64,22 @@ namespace PepperDash.Essentials.WebSocketServer
             }
         }
 
+        /// <summary>
+        /// Triggered when this client closes it's connection
+        /// </summary>
+        public event EventHandler<ConnectionClosedEventArgs> ConnectionClosed;
+
         /// <summary>
         /// Initializes a new instance of the UiClient class with the specified key
         /// </summary>
         /// <param name="key">The unique key to identify this client</param>
         /// <param name="id">The client ID used by the client for this connection</param>
-        public UiClient(string key, string id)
+        /// <param name="token"></param>
+        public UiClient(string key, string id, string token)
         {
             Key = key;
             Id = id;
+            Token = token;
         }
 
         /// <inheritdoc />
@@ -76,34 +87,11 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             base.OnOpen();
 
+            _connectionTime = DateTime.Now;
+
             Log.Output = (data, message) => Utilities.ConvertWebsocketLog(data, message);
             Log.Level = LogLevel.Trace;
 
-            try
-            {
-                this.LogDebug("Current session count on open {count}", Sessions.Count);
-                this.LogDebug("Current WebsocketServiceCount on open: {count}", Controller.DirectServer.WebsocketServiceCount);
-            }
-            catch (Exception ex)
-            {
-                this.LogError("Error getting service count: {message}", ex.Message);
-                this.LogDebug(ex, "Stack Trace: ");
-            }
-
-            // var url = Context.WebSocket.Url;
-            // this.LogInformation("New WebSocket Connection from: {url}", url);
-
-            // var match = Regex.Match(url.AbsoluteUri, "(?:ws|wss):\\/\\/.*(?:\\/mc\\/api\\/ui\\/join\\/)(.*)");
-
-            // if (!match.Success)
-            // {
-            //     _connectionTime = DateTime.Now;
-            //     return;
-            // }
-
-            // var clientId = match.Groups[1].Value;
-            // _clientId = clientId;
-
             if (Controller == null)
             {
                 Debug.LogMessage(LogEventLevel.Verbose, "WebSocket UiClient Controller is null");
@@ -141,7 +129,7 @@ namespace PepperDash.Essentials.WebSocketServer
         /// <param name="e">Event arguments</param>
         private void Bridge_UserCodeChanged(object sender, EventArgs e)
         {
-            SendUserCodeToClient((MobileControlEssentialsRoomBridge)sender, _clientId);
+            SendUserCodeToClient((MobileControlEssentialsRoomBridge)sender, Id);
         }
 
         /// <summary>
@@ -184,17 +172,6 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             base.OnClose(e);
 
-            try
-            {
-                this.LogDebug("Current session count on close {count}", Sessions.Count);
-                this.LogDebug("Current WebsocketServiceCount on close: {count}", Controller.DirectServer.WebsocketServiceCount);
-            }
-            catch (Exception ex)
-            {
-                this.LogError("Error getting service count: {message}", ex.Message);
-                this.LogDebug(ex, "Stack Trace: ");
-            }
-
             this.LogInformation("WebSocket UiClient Closing: {code} reason: {reason}", e.Code, e.Reason);
 
             foreach (var messenger in Controller.Messengers)