Merge pull request #1469 from PepperDash/hotfix/ssh-stopprog-timing

fix(core-ssh): stop reconnect loop during stopprog
fix(core-ssh): harden GenericSshClient shutdown reconnect guards
2026-08-31 19:08:29 +00:00 · 2026-08-20 14:47:33 -06:00 · 2026-08-20 16:39:20 -04:00 · 2026-08-20 16:18:04 -04:00 · 2026-08-20 11:52:03 -05:00 · 2026-08-20 10:47:30 -06:00
27 changed files with 719 additions and 130 deletions
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -1,11 +1,11 @@
 <Project>
  <PropertyGroup>
-    <Version>2.29.0-local</Version>
+    <Version>2.42.1-local</Version>
    <InformationalVersion>$(Version)</InformationalVersion>
    <Authors>PepperDash Technology</Authors>
    <Company>PepperDash Technology</Company>
    <Product>PepperDash Essentials</Product>
-    <Copyright>Copyright ©  2025</Copyright>
+    <Copyright>Copyright © 2026</Copyright>
    <RepositoryUrl>https://github.com/PepperDash/Essentials</RepositoryUrl>
    <RepositoryType>git</RepositoryType>
    <PackageTags>Crestron; 4series</PackageTags>
@ -20,4 +20,7 @@
    <None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
    <None Include="..\..\README.md" Pack="true" PackagePath=""/>
  </ItemGroup>
+  <ItemGroup>
+    <AssemblyMetadata Include="PackageId" Value="$(PackageId)" />
+  </ItemGroup>
 </Project>
--- a/src/PepperDash.Core/Comm/GenericSshClient.cs
+++ b/src/PepperDash.Core/Comm/GenericSshClient.cs
@ -151,6 +151,8 @@ namespace PepperDash.Core
        // Thread-safety lock for state changes
        private readonly object _stateLock = new object();

+        private volatile bool _isProgramStopping;
+
        private bool disconnectLogged = false;

        /// <summary>
@ -207,11 +209,9 @@ namespace PepperDash.Core
        {
            if (programEventType == eProgramStatusEventType.Stopping)
            {
-                if (client != null)
-                {
-                    this.LogDebug("Program stopping. Closing connection");
-                    Disconnect();
-                }
+                _isProgramStopping = true;
+                this.LogDebug("Program stopping. Closing connection");
+                Disconnect();
            }
        }

@ -228,6 +228,12 @@ namespace PepperDash.Core
                return;
            }

+            if (_isProgramStopping)
+            {
+                this.LogDebug("Skipping connect because program is stopping");
+                return;
+            }
+
            ConnectEnabled = true;

            try
@ -287,13 +293,7 @@ namespace PepperDash.Core
                    }
                    catch (SshConnectionException e)
                    {
-                        var ie = e.InnerException; // The details are inside!!
-
-                        if (ie is SocketException)
-                        {
-                            this.LogError("CONNECTION failure: Cannot reach host");
-                            this.LogVerbose(ie, "Exception details: ");
-                        }
+                        var ie = e.InnerException; // The details are inside, when present - remote can close the connection with no inner exception at all

                        if (ie is System.Net.Sockets.SocketException socketException)
                        {
@ -301,20 +301,20 @@ namespace PepperDash.Core
                                Hostname, Port);
                            this.LogVerbose(socketException, "SocketException details: ");
                        }
-                        if (ie is SshAuthenticationException)
+                        else if (ie is SshAuthenticationException)
                        {
                            this.LogError("Authentication failure for username {userName}", Username);
                            this.LogVerbose(ie, "AuthenticationException details: ");
                        }
                        else
                        {
-                            this.LogError("Error on connect: {error}", ie.Message);
-                            this.LogVerbose(ie, "Exception details: ");
+                            this.LogError("Error on connect: {error}", ie?.Message ?? e.Message);
+                            this.LogVerbose(ie ?? e, "Exception details: ");
                        }

                        disconnectLogged = true;
                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect)
+                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
                        {
                            this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
                            StartReconnectTimer();
@ -326,7 +326,7 @@ namespace PepperDash.Core

                        disconnectLogged = true;
                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect)
+                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
                        {
                            this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                            StartReconnectTimer();
@ -338,7 +338,7 @@ namespace PepperDash.Core
                        this.LogVerbose(e, "Exception details: ");
                        disconnectLogged = true;
                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect)
+                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
                        {
                            this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                            StartReconnectTimer();
@ -473,7 +473,7 @@ namespace PepperDash.Core
                {
                    connectLock.Release();
                }
-                if (AutoReconnect && ConnectEnabled)
+                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
                {
                    this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                    StartReconnectTimer();
@ -516,7 +516,10 @@ namespace PepperDash.Core
                this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());

                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                {
+                    StartReconnectTimer();
+                }
            }
            catch (Exception ex)
            {
@ -549,7 +552,10 @@ namespace PepperDash.Core
                this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));

                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                StartReconnectTimer();
+                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                {
+                    StartReconnectTimer();
+                }
            }
            catch (Exception ex)
            {
--- a/src/PepperDash.Core/Logging/DebugWebsocketSink.cs
+++ b/src/PepperDash.Core/Logging/DebugWebsocketSink.cs
@ -72,6 +72,20 @@ namespace PepperDash.Core
        /// </summary>
        public bool IsRunning { get => _httpsServer?.IsListening ?? false; }

+        /// <summary>
+        /// Gets a value indicating whether there are active WebSocket connections.
+        /// </summary>
+        public bool HasActiveConnections
+        {
+            get
+            {
+                if (_httpsServer == null || !_httpsServer.IsListening) return false;
+                var service = _httpsServer.WebSocketServices[_path];
+                if (service == null) return false;
+                return service.Sessions.Count > 0;
+            }
+        }
+

        private readonly ITextFormatter _textFormatter;

@ -218,6 +232,8 @@ namespace PepperDash.Core
            Debug.LogInformation("Starting Websocket Server on port: {0}", port);

            
+
+
            Start(port, CertPath, _certificatePassword);
        }

--- a/src/PepperDash.Core/PepperDash.Core.csproj
+++ b/src/PepperDash.Core/PepperDash.Core.csproj
@ -43,7 +43,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.274" />
    <PackageReference Include="Serilog" Version="3.1.1" />
    <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
--- a/src/PepperDash.Essentials.Core/Comm
+++ b/src/PepperDash.Essentials.Core/Comm
@ -75,9 +75,9 @@ namespace PepperDash.Essentials.Core

        /// <summary>
        /// Subscribes to the CEC change event once <see cref="ICec.StreamCec"/> is available.
-        /// Safe to call repeatedly; the subscription is only wired a single time. This allows the
-        /// receive path to self-heal if StreamCec was null at construction (e.g. the underlying
-        /// device had not yet come online).
+        /// Safe to call repeatedly; the subscription is only wired a single time.
+        /// If StreamCec is null during construction, this is retried when send methods invoke
+        /// this method later.
        /// </summary>
        void TryEnsureCecSubscription()
        {
--- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs
+++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs
@ -135,12 +135,14 @@ namespace PepperDash.Essentials.Core.Config
                    {
                        var parsedConfig = JObject.Parse(fs.ReadToEnd());

-                        // Check if it's a v2 config (check for "version" node)
-                        // this means it's already merged by the Portal API
-                        // from the v2 config tool
-                        var isV2Config = parsedConfig["versions"] != null;
+                        // A config is v1 if it has separate "system" and "template" nodes that
+                        // need to be merged. A v2 config is already merged by the Portal API and
+                        // will not have "system"/"template" nodes. This is independent of whether
+                        // a "versions" node is present, which only carries version metadata and
+                        // can appear on either a v1 or v2 config.
+                        var isV1Config = parsedConfig["system"] != null && parsedConfig["template"] != null;

-                        if (isV2Config)
+                        if (!isV1Config)
                        {
                            Debug.LogMessage(LogEventLevel.Information, "Config file is a v2 format, no merge necessary.");
                            ConfigObject = parsedConfig.ToObject<EssentialsConfig>();
@ -148,6 +150,8 @@ namespace PepperDash.Essentials.Core.Config
                            return true;
                        }

+                        Debug.LogMessage(LogEventLevel.Information, "Config file is a v1 format, merging system and template.");
+
                        // Extract SystemUrl and TemplateUrl into final config output
                        ConfigObject = PortalConfigReader.MergeConfigs(parsedConfig).ToObject<EssentialsConfig>();

@ -160,6 +164,13 @@ namespace PepperDash.Essentials.Core.Config
                        {
                            ConfigObject.TemplateUrl = parsedConfig["template_url"].Value<string>();
                        }
+
+                        // MergeConfigs does not carry the "versions" node forward, so it must be
+                        // applied separately to ensure it's preserved in the merged config.
+                        if (parsedConfig["versions"] != null)
+                        {
+                            ConfigObject.Versions = parsedConfig["versions"].ToObject<VersionData>();
+                        }
                    }

                    Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Merged Config");
--- a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
+++ b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs
@ -105,6 +105,7 @@ namespace PepperDash.Essentials.Core.Config
        /// <summary>
        /// Gets or sets the Versions
        /// </summary>
+        [JsonProperty("versions")]
        public VersionData Versions { get; set; }

        /// <summary>
@ -134,12 +135,25 @@ namespace PepperDash.Essentials.Core.Config
        [JsonProperty("packages")]
        public List<NugetVersion> Packages { get; set; }

+        /// <summary>
+        /// Gets or sets the touchpanel wrapper app version
+        /// </summary>
+        [JsonProperty("touchpanelWrapperApp")]
+        public NugetVersion TouchpanelWrapperApp { get; set; }
+
+        /// <summary>
+        /// Gets or sets the list of user interface packages
+        /// </summary>
+        [JsonProperty("userInterfaces")]
+        public List<NugetVersion> UserInterfaces { get; set; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="VersionData"/> class.
        /// </summary>
        public VersionData()
        {
            Packages = new List<NugetVersion>();
+            UserInterfaces = new List<NugetVersion>();
        }
    }

@ -157,8 +171,20 @@ namespace PepperDash.Essentials.Core.Config
        /// <summary>
        /// Gets or sets the PackageId
        /// </summary>
-        [JsonProperty("packageId")]
+        [JsonProperty("packageId", NullValueHandling = NullValueHandling.Ignore)]
        public string PackageId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the RepoUrl
+        /// </summary>
+        [JsonProperty("repoUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string RepoUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets the human-readable name
+        /// </summary>
+        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
+        public string Name { get; set; }
    }

    /// <summary>
--- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessengerWithSubscriptions.cs
+++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControlMessengerWithSubscriptions.cs
@ -1,10 +1,12 @@
+using System;
 using PepperDash.Core;

 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
  /// <summary>
-  /// Defines the contract for IMobileControlMessenger
+  /// Obsolete: messengers are subscription based by default; use IMobileControlMessenger instead.
  /// </summary>
+  [Obsolete("This interface is obsolete and will be removed in a future version. All messengers are now subscription based.")]
  public interface IMobileControlMessengerWithSubscriptions : IMobileControlMessenger
  {
    /// <summary>
--- a/src/PepperDash.Essentials.Core/Devices/IHasDspPresetSave.cs
+++ b/src/PepperDash.Essentials.Core/Devices/IHasDspPresetSave.cs
@ -0,0 +1,14 @@
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Defines the contract for IHasDspPresetSave
+    /// </summary>
+    public interface IHasDspPresetSave : IDspPresets
+    {
+        /// <summary>
+        /// Saves the preset by key
+        /// </summary>
+        /// <param name="key">key of preset to save</param>
+        void SavePreset(string key);
+    }
+}
--- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
+++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
@ -25,7 +25,7 @@
    <DocumentationFile>bin\$(Configuration)\PepperDash_Essentials_Core.xml</DocumentationFile>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />
--- a/src/PepperDash.Essentials.Core/Routing/Extensions.cs
+++ b/src/PepperDash.Essentials.Core/Routing/Extensions.cs
@ -348,9 +348,9 @@ namespace PepperDash.Essentials.Core
                var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>()
                    .Where(d => !(d is IRoutingInputsOutputs)).ToList();

-                foreach (var sink in sinks.Where(d => !(d is IRoutingInputsOutputs)))
+                foreach (var sink in sinks)
                {
-                    foreach (var source in sources.Where(d => !(d is IRoutingInputsOutputs)))
+                    foreach (var source in sources)
                    {
                        foreach (var inputPort in sink.InputPorts)
                        {
--- a/src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs
+++ b/src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs
@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Crestron.SimplSharp;
 using PepperDash.Core;
+using PepperDash.Core.Logging;
 using Serilog.Events;

 namespace PepperDash.Essentials.Core
@ -296,19 +297,14 @@ namespace PepperDash.Essentials.Core
        {
            var secretPresent = provider.TestSecret(key);

-            Debug.LogMessage(LogEventLevel.Verbose, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
+            provider.LogVerbose("SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);

            if (!secretPresent)
                return
-                    String.Format(
-                        "Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to modify it");
+                    $"Unable to update secret for {provider.Key}:{key} - Please use the 'SetSecret' command to modify it";
            var response = provider.SetSecret(key, secret)
-                ? String.Format(
-                    "Secret successfully set for {0}:{1}",
-                    provider.Key, key)
-                : String.Format(
-                    "Unable to set secret for {0}:{1}",
-                    provider.Key, key);
+                ? $"Secret successfully set for {provider.Key}:{key}"
+                : $"Unable to set secret for {provider.Key}:{key}";
            return response;
        }

@ -316,19 +312,14 @@ namespace PepperDash.Essentials.Core
        {
            var secretPresent = provider.TestSecret(key);

-            Debug.LogMessage(LogEventLevel.Verbose, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
+            provider.LogVerbose("SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);

            if (secretPresent)
                return
-                    String.Format(
-                        "Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
+                    $"Unable to set secret for {provider.Key}:{key} - Please use the 'UpdateSecret' command to modify it";
            var response = provider.SetSecret(key, secret)
-                ? String.Format(
-                    "Secret successfully set for {0}:{1}",
-                    provider.Key, key)
-                : String.Format(
-                    "Unable to set secret for {0}:{1}",
-                    provider.Key, key);
+                ? $"Secret successfully set for {provider.Key}:{key}"
+                : $"Unable to set secret for {provider.Key}:{key}";
            return response;

        }
@ -377,15 +368,10 @@ namespace PepperDash.Essentials.Core

            var key = args[1];

-
            provider.SetSecret(key, "");
            response = provider.SetSecret(key, "")
-                ? String.Format(
-                    "Secret successfully deleted for {0}:{1}",
-                    provider.Key, key)
-                : String.Format(
-                    "Unable to delete secret for {0}:{1}",
-                    provider.Key, key);
+                ? $"Secret successfully deleted for {provider.Key}:{key}"
+                : $"Unable to delete secret for {provider.Key}:{key}";
            CrestronConsole.ConsoleCommandResponse(response);
            return;

--- a/src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs
+++ b/src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs
@ -95,6 +95,11 @@ namespace PepperDash.Essentials.Core.Web
                    Name = "ReportVersions",
                    RouteHandler = new ReportVersionsRequestHandler()
                },
+                new HttpCwsRoute("packageManifest")
+                {
+                    Name = "GetPackageManifest",
+                    RouteHandler = new GetPackageManifestRequestHandler()
+                },
                new HttpCwsRoute("appdebug")
                {
                    Name = "AppDebug",
--- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs
+++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs
@ -18,6 +18,9 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
    /// </summary>
    public class DebugSessionRequestHandler : WebApiBaseRequestHandler
    {
+        private CTimer _portForwardTimeoutTimer;
+        private readonly object _timerLock = new object();
+
        /// <summary>
        /// Constructor
        /// </summary>
@ -48,6 +51,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);

                var port = 0;
+                string csIp = null;

                if (!Debug.WebsocketSink.IsRunning)
                {
@ -57,15 +61,18 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
                    // Start the WS Server
                    Debug.WebsocketSink.StartServerAndSetPort(port);
                    Debug.SetWebSocketMinimumDebugLevel(Serilog.Events.LogEventLevel.Verbose);
+                }

-                    // Attempt to forward the port to the CS LAN
-                    try
+                // Attempt to get the CS LAN IP and forward the port
+                try
+                {
+                    var csAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(
+                        EthernetAdapterType.EthernetCSAdapter);
+                    csIp = CrestronEthernetHelper.GetEthernetParameter(
+                        CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId);
+
+                    if (port > 0)
                    {
-                        var csAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(
-                            EthernetAdapterType.EthernetCSAdapter);
-                        var csIp = CrestronEthernetHelper.GetEthernetParameter(
-                            CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId);
-
                        var result = CrestronEthernetHelper.AddPortForwarding(
                            (ushort)port, (ushort)port, csIp,
                            CrestronEthernetHelper.ePortMapTransport.TCP);
@ -77,26 +84,29 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
                        else
                        {
                            Debug.LogMessage(LogEventLevel.Information, "Port {0} forwarded to CS LAN for debug websocket", port);
+                            StartPortForwardTimeout(port, csIp);
                        }
                    }
-                    catch (ArgumentException)
-                    {
-                        Debug.LogMessage(LogEventLevel.Debug, "This processor does not have a CS LAN adapter; skipping port forwarding");
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.LogMessage(LogEventLevel.Warning, "Error automatically forwarding debug websocket port to CS LAN: {0}", ex.Message);
-                    }
+                }
+                catch (ArgumentException)
+                {
+                    Debug.LogMessage(LogEventLevel.Debug, "This processor does not have a CS LAN adapter; skipping port forwarding");
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogMessage(LogEventLevel.Warning, "Error automatically forwarding debug websocket port to CS LAN: {0}", ex.Message);
                }

                var url = Debug.WebsocketSink.Url;

-                object data = new
+                var data = new
                {
-                    url = Debug.WebsocketSink.Url
+                    url = Debug.WebsocketSink.Url,
+                    fallbackUrl = csIp != null ? url.Replace(csIp, ip) : null
                };

                Debug.LogMessage(LogEventLevel.Information, "Debug Session URL: {0}", url);
+                Debug.LogMessage(LogEventLevel.Information, "Fallback Debug Session URL: {0}", data.fallbackUrl);

                // Return the port number with the full url of the WS Server
                var res = JsonConvert.SerializeObject(data);
@ -120,6 +130,8 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
        /// <param name="context"></param>
        protected override void HandlePost(HttpCwsContext context)
        {
+            CancelPortForwardTimeout();
+
            var port = Debug.WebsocketSink.Port;

            Debug.WebsocketSink.StopServer();
@ -132,17 +144,24 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
                var csIp = CrestronEthernetHelper.GetEthernetParameter(
                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId);

-                var result = CrestronEthernetHelper.RemovePortForwarding(
-                    (ushort)port, (ushort)port, csIp,
-                    CrestronEthernetHelper.ePortMapTransport.TCP);
-
-                if (result != CrestronEthernetHelper.PortForwardingUserPatRetCodes.NoErr)
+                if (port <= 0)
                {
-                    Debug.LogMessage(LogEventLevel.Warning, "Error removing port forwarding for debug websocket: {0}", result);
+                    Debug.LogMessage(LogEventLevel.Debug, "Debug websocket port is not set; skipping port forwarding removal");
                }
                else
                {
-                    Debug.LogMessage(LogEventLevel.Information, "Port forwarding for port {0} removed", port);
+                    var result = CrestronEthernetHelper.RemovePortForwarding(
+                        (ushort)port, (ushort)port, csIp,
+                        CrestronEthernetHelper.ePortMapTransport.TCP);
+
+                    if (result != CrestronEthernetHelper.PortForwardingUserPatRetCodes.NoErr)
+                    {
+                        Debug.LogMessage(LogEventLevel.Warning, "Error removing port forwarding for debug websocket: {0}", result);
+                    }
+                    else
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "Port forwarding for port {0} removed", port);
+                    }
                }
            }
            catch (ArgumentException)
@ -161,5 +180,55 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
            Debug.LogMessage(LogEventLevel.Information, "Websocket Debug Session Stopped");
        }

+        private void StartPortForwardTimeout(int port, string csIp)
+        {
+            lock (_timerLock)
+            {
+                _portForwardTimeoutTimer?.Dispose();
+                _portForwardTimeoutTimer = new CTimer(_ =>
+                {
+                    if (Debug.WebsocketSink.HasActiveConnections)
+                    {
+                        Debug.LogMessage(LogEventLevel.Debug, "Debug websocket has active connections; keeping port forward");
+                        return;
+                    }
+
+                    Debug.LogMessage(LogEventLevel.Information, "No debug websocket connection within 30 seconds; removing port forward for port {0}", port);
+
+                    try
+                    {
+                        var result = CrestronEthernetHelper.RemovePortForwarding(
+                            (ushort)port, (ushort)port, csIp,
+                            CrestronEthernetHelper.ePortMapTransport.TCP);
+
+                        if (result != CrestronEthernetHelper.PortForwardingUserPatRetCodes.NoErr)
+                        {
+                            Debug.LogMessage(LogEventLevel.Warning, "Error removing port forwarding on timeout: {0}", result);
+                        }
+                        else
+                        {
+                            Debug.LogMessage(LogEventLevel.Information, "Port forwarding for port {0} removed due to timeout", port);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.LogMessage(LogEventLevel.Warning, "Error removing port forwarding on timeout: {0}", ex.Message);
+                    }
+                }, 30000);
+            }
+        }
+
+        /// <summary>
+        /// Cancels the port forward timeout timer if a session is being explicitly stopped.
+        /// </summary>
+        private void CancelPortForwardTimeout()
+        {
+            lock (_timerLock)
+            {
+                _portForwardTimeoutTimer?.Dispose();
+                _portForwardTimeoutTimer = null;
+            }
+        }
+
    }
 }
--- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs
+++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs
@ -52,20 +52,8 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
 			var device = DeviceManager.GetDeviceForKey(deviceObj.ToString()) as IHasFeedback;
 			if (device == null)
 			{
-				context.Response.StatusCode = 200;
-				context.Response.StatusDescription = "OK";
-				context.Response.ContentType = "application/json";
-				context.Response.ContentEncoding = System.Text.Encoding.UTF8;
-				var resp = new
-				{
-					BoolValues = Array.Empty<object>(),
-					IntValues = Array.Empty<object>(),
-					SerialValues = Array.Empty<object>()
-				};
-				var respJs = JsonConvert.SerializeObject(resp, Formatting.Indented);
-
-				context.Response.Write(respJs, false);
-
+				context.Response.StatusCode = 404;
+				context.Response.StatusDescription = "Not Found";
 				context.Response.End();

 				return;
--- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetPackageManifestRequestHandler.cs
+++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetPackageManifestRequestHandler.cs
@ -0,0 +1,259 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Crestron.SimplSharp.WebScripting;
+using Newtonsoft.Json;
+using PepperDash.Core.Web.RequestHandlers;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Core.Web.RequestHandlers
+{
+	/// <summary>
+	/// Represents a GetPackageManifestRequestHandler
+	/// </summary>
+	public class GetPackageManifestRequestHandler : WebApiBaseRequestHandler
+	{
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <remarks>
+		/// base(true) enables CORS support by default
+		/// </remarks>
+		public GetPackageManifestRequestHandler()
+			: base(true)
+		{
+		}
+
+		/// <summary>
+		/// Handles GET method requests
+		/// </summary>
+		/// <param name="context"></param>
+		protected override void HandleGet(HttpCwsContext context)
+		{
+			try
+			{
+				var result = CloneVersionData(ConfigReader.ConfigObject?.Versions) ?? new VersionData();
+
+				PopulateEssentials(result);
+				PopulatePackages(result);
+
+				var js = JsonConvert.SerializeObject(result, Formatting.Indented);
+
+				context.Response.StatusCode = 200;
+				context.Response.StatusDescription = "OK";
+				context.Response.ContentType = "application/json";
+				context.Response.ContentEncoding = System.Text.Encoding.UTF8;
+				context.Response.Write(js, false);
+				context.Response.End();
+			}
+			catch (Exception ex)
+			{
+				PepperDash.Core.Debug.LogMessage(ex, "Exception handling GET /packageManifest request");
+				context.Response.StatusCode = 500;
+				context.Response.StatusDescription = "Internal Server Error";
+				context.Response.End();
+			}
+		}
+
+		/// <summary>
+		/// Deep-copies the config's VersionData so the live config object is never mutated
+		/// </summary>
+		private static VersionData CloneVersionData(VersionData source)
+		{
+			if (source == null)
+			{
+				return null;
+			}
+
+			var json = JsonConvert.SerializeObject(source);
+			return JsonConvert.DeserializeObject<VersionData>(json);
+		}
+
+		/// <summary>
+		/// Enriches (or creates) the essentials entry from the loaded PepperDash.Essentials.Core assembly
+		/// </summary>
+		private static void PopulateEssentials(VersionData result)
+		{
+			var essentials = result.Essentials ?? new NugetVersion();
+
+			essentials.Version = Global.AssemblyVersion;
+
+			// The main program assembly (PackageId "PepperDashEssentials") is what's actually published
+			// to NuGet, but this handler lives in PepperDash.Essentials.Core, which can't reference that
+			// project's types directly (Essentials -> Core, not the reverse). PluginLoader.EssentialsAssembly.Assembly
+			// is unreliable (often left null - see PluginLoader.SetEssentialsAssembly), so look it up
+			// directly from the loaded AppDomain by its Directory.Build.props-embedded PackageId metadata
+			// (every project's .csproj sets its own PackageId explicitly), falling back to this handler's
+			// own (Core) assembly if it can't be found.
+			var essentialsAssembly = AppDomain.CurrentDomain.GetAssemblies()
+				.FirstOrDefault(a => string.Equals(GetAssemblyMetadataValue(a, "PackageId"), "PepperDashEssentials", StringComparison.OrdinalIgnoreCase))
+				?? typeof(GetPackageManifestRequestHandler).Assembly;
+
+			var repoUrl = TrimTrailingGit(GetAssemblyMetadataValue(essentialsAssembly, "RepositoryUrl"));
+			if (!string.IsNullOrEmpty(repoUrl))
+			{
+				essentials.RepoUrl = repoUrl;
+			}
+
+			var name = GetAssemblyProduct(essentialsAssembly);
+			if (!string.IsNullOrEmpty(name))
+			{
+				essentials.Name = name;
+			}
+
+			// Prefer the PackageId embedded via Directory.Build.props' AssemblyMetadata item (the
+			// authoritative source, matching the actual published PackageId) over any config-supplied
+			// or hardcoded value.
+			var reflectedPackageId = GetAssemblyMetadataValue(essentialsAssembly, "PackageId");
+			if (!string.IsNullOrEmpty(reflectedPackageId))
+			{
+				essentials.PackageId = reflectedPackageId;
+			}
+			else if (string.IsNullOrEmpty(essentials.PackageId))
+			{
+				essentials.PackageId = "PepperDashEssentials";
+			}
+
+			result.Essentials = essentials;
+		}
+
+		/// <summary>
+		/// Merges reflection data from loaded plugin assemblies with the config's packages list
+		/// </summary>
+		private static void PopulatePackages(VersionData result)
+		{
+			// Filter out null entries defensively - the packages list is deserialized from user-editable
+			// config JSON, so a malformed "packages": [null, ...] shouldn't throw and 500 the endpoint.
+			var configPackages = (result.Packages ?? new System.Collections.Generic.List<NugetVersion>())
+				.Where(p => p != null)
+				.ToList();
+			var matchedConfigPackages = new System.Collections.Generic.HashSet<NugetVersion>();
+			var mergedPackages = new System.Collections.Generic.List<NugetVersion>();
+
+			foreach (var loaded in PluginLoader.EssentialsPluginAssemblies.Where(a => a.Assembly != null))
+			{
+				var reflectedVersion = loaded.Version;
+				if (string.IsNullOrEmpty(reflectedVersion))
+				{
+					// Never emit an entry with no version - the extension's parser drops entries
+					// whose version isn't a string.
+					continue;
+				}
+
+				var reflectedRepoUrl = TrimTrailingGit(GetAssemblyMetadataValue(loaded.Assembly, "RepositoryUrl"));
+				var reflectedName = GetAssemblyProduct(loaded.Assembly);
+
+				// Plugins built from a Directory.Build.props that embeds
+				// <AssemblyMetadata Include="PackageId" Value="$(PackageId)" /> carry their PackageId
+				// directly - this is authoritative and should be preferred over the title/name fallback chain.
+				var reflectedPackageId = GetAssemblyMetadataValue(loaded.Assembly, "PackageId");
+
+				var assemblyTitle = GetAssemblyTitle(loaded.Assembly);
+				var assemblyName = loaded.Assembly.GetName().Name;
+				var assemblyNameNoSeriesSuffix = StripTrailingSeriesSuffix(assemblyName);
+
+				var match = configPackages.FirstOrDefault(p =>
+					!matchedConfigPackages.Contains(p) &&
+					!string.IsNullOrEmpty(p.PackageId) &&
+					(string.Equals(p.PackageId, reflectedPackageId, StringComparison.OrdinalIgnoreCase) ||
+					 string.Equals(p.PackageId, assemblyTitle, StringComparison.OrdinalIgnoreCase) ||
+					 string.Equals(p.PackageId, assemblyName, StringComparison.OrdinalIgnoreCase) ||
+					 string.Equals(p.PackageId, assemblyNameNoSeriesSuffix, StringComparison.OrdinalIgnoreCase)));
+
+				if (match != null)
+				{
+					matchedConfigPackages.Add(match);
+
+					mergedPackages.Add(new NugetVersion
+					{
+						Name = !string.IsNullOrEmpty(match.Name) ? match.Name : reflectedName,
+						RepoUrl = !string.IsNullOrEmpty(match.RepoUrl) ? match.RepoUrl : reflectedRepoUrl,
+						PackageId = !string.IsNullOrEmpty(reflectedPackageId) ? reflectedPackageId : match.PackageId,
+						Version = reflectedVersion
+					});
+				}
+				else
+				{
+					// Loaded but not present (or not matched) in config - emit the reflected PackageId
+					// when the assembly carries one, otherwise leave it null as before.
+					mergedPackages.Add(new NugetVersion
+					{
+						Name = reflectedName,
+						RepoUrl = reflectedRepoUrl,
+						PackageId = reflectedPackageId,
+						Version = reflectedVersion,						
+					});
+				}
+			}
+
+			// Configured but not currently loaded - pass through unchanged
+			mergedPackages.AddRange(configPackages.Where(p => !matchedConfigPackages.Contains(p)));
+
+			result.Packages = mergedPackages;
+		}
+
+		private static string GetAssemblyMetadataValue(Assembly assembly, string key)
+		{
+			if (assembly == null)
+			{
+				return null;
+			}
+
+			var match = assembly.GetCustomAttributes(typeof(AssemblyMetadataAttribute), false)
+				.Cast<AssemblyMetadataAttribute>()
+				.FirstOrDefault(a => string.Equals(a.Key, key, StringComparison.OrdinalIgnoreCase));
+
+			return match?.Value;
+		}
+
+		private static string GetAssemblyProduct(Assembly assembly)
+		{
+			if (assembly == null)
+			{
+				return null;
+			}
+
+			var attribute = assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false)
+				.FirstOrDefault() as AssemblyProductAttribute;
+
+			return attribute?.Product;
+		}
+
+		private static string GetAssemblyTitle(Assembly assembly)
+		{
+			if (assembly == null)
+			{
+				return null;
+			}
+
+			var attribute = assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)
+				.FirstOrDefault() as AssemblyTitleAttribute;
+
+			return attribute?.Title;
+		}
+
+		private static string StripTrailingSeriesSuffix(string assemblyName)
+		{
+			const string suffix = ".4Series";
+
+			if (string.IsNullOrEmpty(assemblyName) || !assemblyName.EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
+			{
+				return assemblyName;
+			}
+
+			return assemblyName.Substring(0, assemblyName.Length - suffix.Length);
+		}
+
+		private static string TrimTrailingGit(string repoUrl)
+		{
+			const string suffix = ".git";
+
+			if (string.IsNullOrEmpty(repoUrl) || !repoUrl.EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
+			{
+				return repoUrl;
+			}
+
+			return repoUrl.Substring(0, repoUrl.Length - suffix.Length);
+		}
+	}
+}
--- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
+++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
@ -29,6 +29,6 @@
    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
  </ItemGroup>
 </Project>
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs
@ -13,7 +13,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
    /// The interfaces implmented by the device sending the messsage
    /// </summary>
    [JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)]
-    [Obsolete("Interfaces is no longer supported and will be removed in a future release.  Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
+    [Obsolete("Interfaces are no longer supported and will be removed in a future release. Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
    public List<string> Interfaces { get; private set; }

    /// <summary>
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
@ -264,6 +264,9 @@ namespace PepperDash.Essentials.AppServer.Messengers

                message.Name = _device.Name;

+                message.MessageBasePath = MessagePath;
+
+
                var token = JToken.FromObject(message);

                PostStatusMessage(token, MessagePath, clientId);
--- a/src/PepperDash.Essentials.MobileControl.Messengers/PepperDash.Essentials.MobileControl.Messengers.csproj
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/PepperDash.Essentials.MobileControl.Messengers.csproj
@ -33,7 +33,7 @@
    <Compile Remove="Messengers\SIMPLVtcMessenger.cs" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\PepperDash.Core\PepperDash.Core.csproj" />
--- a/src/PepperDash.Essentials.MobileControl/ConnectedClientVersionInfo.cs
+++ b/src/PepperDash.Essentials.MobileControl/ConnectedClientVersionInfo.cs
@ -0,0 +1,61 @@
+using System;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials
+{
+    /// <summary>
+    /// Represents the version information reported by a connected Mobile Control UI client
+    /// </summary>
+    public class ConnectedClientVersionInfo
+    {
+        /// <summary>
+        /// Gets or sets the client id
+        /// </summary>
+        [JsonProperty("clientId")]
+        public string ClientId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the room key the client joined
+        /// </summary>
+        [JsonProperty("roomKey")]
+        public string RoomKey { get; set; }
+
+        /// <summary>
+        /// Gets or sets the touchpanel key the client joined as, if any
+        /// </summary>
+        [JsonProperty("touchpanelKey")]
+        public string TouchpanelKey { get; set; }
+
+        /// <summary>
+        /// Gets or sets the app version reported by the client (e.g. the React app's build-time APP_VERSION)
+        /// </summary>
+        [JsonProperty("appVersion")]
+        public string AppVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the expected app version from the system config's versions.touchpanelWrapperApp, if configured
+        /// </summary>
+        [JsonProperty("expectedAppVersion")]
+        public string ExpectedAppVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UTC time the client last reported this version
+        /// </summary>
+        [JsonProperty("lastSeen")]
+        public DateTime LastSeen { get; set; }
+
+        /// <summary>
+        /// Returns a copy of this instance, safe for callers outside the owning lock to hold/mutate
+        /// without affecting the internally tracked instance
+        /// </summary>
+        public ConnectedClientVersionInfo Clone() => new ConnectedClientVersionInfo
+        {
+            ClientId = ClientId,
+            RoomKey = RoomKey,
+            TouchpanelKey = TouchpanelKey,
+            AppVersion = AppVersion,
+            ExpectedAppVersion = ExpectedAppVersion,
+            LastSeen = LastSeen
+        };
+    }
+}
--- a/src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs
+++ b/src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs
@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

@ -40,9 +41,10 @@ namespace PepperDash.Essentials
        public bool EnableApiServer { get; set; } = true;

        /// <summary>
-        /// Enable subscriptions for Messengers
+        /// Enables subscriptions for messengers
        /// </summary>
        [JsonProperty("enableMessengerSubscriptions")]
+        [Obsolete("This property is obsolete and will be removed in a future version. All messengers are now subscription based.")]
        public bool EnableMessengerSubscriptions { get; set; }
    }

--- a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
+++ b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
@ -69,11 +69,32 @@ namespace PepperDash.Essentials
        private readonly Dictionary<string, IMobileControlMessenger> _defaultMessengers =
            new Dictionary<string, IMobileControlMessenger>();

+        private readonly Dictionary<string, ConnectedClientVersionInfo> _connectedClientVersions =
+            new Dictionary<string, ConnectedClientVersionInfo>(StringComparer.InvariantCultureIgnoreCase);
+
+        private readonly object _connectedClientVersionsLock = new object();
+
        /// <summary>
        /// Get the custom messengers with subscriptions
        /// </summary>
        public ReadOnlyDictionary<string, IMobileControlMessengerWithSubscriptions> Messengers => new ReadOnlyDictionary<string, IMobileControlMessengerWithSubscriptions>(_messengers.Values.OfType<IMobileControlMessengerWithSubscriptions>().ToDictionary(k => k.Key, v => v));

+        /// <summary>
+        /// Gets the most recently reported UI app version for each connected client, keyed by clientId
+        /// </summary>
+        public ReadOnlyDictionary<string, ConnectedClientVersionInfo> ConnectedClientVersions
+        {
+            get
+            {
+                lock (_connectedClientVersionsLock)
+                {
+                    return new ReadOnlyDictionary<string, ConnectedClientVersionInfo>(
+                        _connectedClientVersions.ToDictionary(kv => kv.Key, kv => kv.Value.Clone())
+                    );
+                }
+            }
+        }
+
        /// <summary>
        /// Get the default messengers
        /// </summary>
@ -1782,6 +1803,28 @@ namespace PepperDash.Essentials
                    "    Not Enabled in Config.\r\n"
                );
            }
+
+            var connectedClientVersions = ConnectedClientVersions;
+
+            if (connectedClientVersions.Count == 0)
+            {
+                CrestronConsole.ConsoleCommandResponse("\r\nUI Client App Versions: None reported yet\r\n");
+            }
+            else
+            {
+                CrestronConsole.ConsoleCommandResponse("\r\nUI Client App Versions:\r\n");
+                foreach (var kv in connectedClientVersions)
+                {
+                    var v = kv.Value;
+                    var match = string.IsNullOrEmpty(v.ExpectedAppVersion) || string.Equals(v.ExpectedAppVersion, v.AppVersion, StringComparison.OrdinalIgnoreCase);
+
+                    CrestronConsole.ConsoleCommandResponse(
+                        $"  Client: {v.ClientId}  Touchpanel: {v.TouchpanelKey}  Room: {v.RoomKey}\r\n" +
+                        $"    Reported: {v.AppVersion}  Expected: {(string.IsNullOrEmpty(v.ExpectedAppVersion) ? "(not configured)" : v.ExpectedAppVersion)}  Match: {(match ? "Yes" : "NO - MISMATCH")}\r\n" +
+                        $"    Last Seen (UTC): {v.LastSeen:yyyy-MM-dd HH:mm:ss}\r\n"
+                    );
+                }
+            }
        }

        /// <summary>
@ -2181,6 +2224,8 @@ namespace PepperDash.Essentials
            var roomKey = content["roomKey"].Value<string>();
            var touchpanelKey = content.SelectToken("touchpanelKey");

+            TrackClientAppVersion(clientId, roomKey, touchpanelKey?.Value<string>(), content.SelectToken("appVersion")?.Value<string>());
+
            if (_roomCombiner == null)
            {
                var message = new MobileControlMessage
@ -2252,6 +2297,50 @@ namespace PepperDash.Essentials
            SendTouchpanelKey(clientId, touchpanelKey);
        }

+        /// <summary>
+        /// Records the app version reported by a connecting UI client (e.g. the mobile control React app's
+        /// build-time APP_VERSION) and compares it against the configured versions.touchpanelWrapperApp version.
+        /// </summary>
+        private void TrackClientAppVersion(string clientId, string roomKey, string touchpanelKey, string appVersion)
+        {
+            if (string.IsNullOrEmpty(appVersion))
+            {
+                return;
+            }
+
+            var expectedVersion = ConfigReader.ConfigObject?.Versions?.TouchpanelWrapperApp?.Version;
+
+            var info = new ConnectedClientVersionInfo
+            {
+                ClientId = clientId,
+                RoomKey = roomKey,
+                TouchpanelKey = touchpanelKey,
+                AppVersion = appVersion,
+                ExpectedAppVersion = expectedVersion,
+                LastSeen = DateTime.UtcNow
+            };
+
+            lock (_connectedClientVersionsLock)
+            {
+                _connectedClientVersions[clientId] = info;
+            }
+
+            if (!string.IsNullOrEmpty(expectedVersion) && !string.Equals(expectedVersion, appVersion, StringComparison.OrdinalIgnoreCase))
+            {
+                this.LogWarning(
+                    "Client {clientId} (touchpanel {touchpanelKey}) reported UI app version {appVersion}, which does not match configured versions.touchpanelWrapperApp version {expectedVersion}",
+                    clientId, touchpanelKey, appVersion, expectedVersion
+                );
+            }
+            else
+            {
+                this.LogVerbose(
+                    "Client {clientId} (touchpanel {touchpanelKey}) reported UI app version {appVersion}",
+                    clientId, touchpanelKey, appVersion
+                );
+            }
+        }
+
        private void SendTouchpanelKey(string clientId, JToken touchpanelKeyToken)
        {
            if (touchpanelKeyToken == null)
--- a/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj
+++ b/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj
@ -38,7 +38,7 @@
    <Compile Remove="RoomBridges\SourceDeviceMapDictionary.cs" />
  </ItemGroup>  
  <ItemGroup>    
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
    <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
  </ItemGroup>
  <ItemGroup>
--- a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs
+++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs
@ -25,11 +25,28 @@ namespace PepperDash.Essentials.Touchpanel
    /// Mobile Control touchpanel controller that provides app control, Zoom integration, 
    /// and mobile control functionality for Crestron touchpanels.
    /// </summary>
-    public class MobileControlTouchpanelController : TouchpanelBase, IHasFeedback, ITswAppControl, ITswZoomControl, IDeviceInfoProvider, IMobileControlCrestronTouchpanelController, ITheme
+    public class MobileControlTouchpanelController : TouchpanelBase, IHasFeedback, ITswAppControl, ITswZoomControl, IDeviceInfoProvider, IMobileControlCrestronTouchpanelController, ITheme, ICommunicationMonitor
    {
        private readonly MobileControlTouchpanelProperties localConfig;
        private IMobileControlRoomMessenger _bridge;

+        /// <summary>
+        /// Gets the CommunicationMonitor tracking the panel's online/offline state
+        /// </summary>
+        public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+        private sealed class NullCommunicationMonitor : StatusMonitorBase
+        {
+            public NullCommunicationMonitor(IKeyed parent) : base(parent, 120000, 300000)
+            {
+                Status = MonitorStatus.InError;
+                Message = "Panel is not initialized";
+            }
+
+            public override void Start() { }
+            public override void Stop() { }
+        }
+
        private string _appUrl;

        /// <summary>
@ -128,6 +145,11 @@ namespace PepperDash.Essentials.Touchpanel
        {
            localConfig = config;

+            if (panel != null)
+            {
+                CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, panel, 120000, 300000);
+            }
+
            AddPostActivationAction(SubscribeForMobileControlUpdates);

            ThemeFeedback = new StringFeedback($"{Key}-theme", () => Theme);
@ -366,6 +388,8 @@ namespace PepperDash.Essentials.Touchpanel
        /// </summary>
        public override bool CustomActivate()
        {
+            CommunicationMonitor?.Start();
+
            var appMessenger = new ITswAppControlMessenger($"appControlMessenger-{Key}", $"/device/{Key}", this);

            var zoomMessenger = new ITswZoomControlMessenger($"zoomControlMessenger-{Key}", $"/device/{Key}", this);
@ -393,6 +417,17 @@ namespace PepperDash.Essentials.Touchpanel
            return base.CustomActivate();
        }

+        /// <summary>
+        /// Stops the CommunicationMonitor on deactivation.
+        /// </summary>
+        /// <returns>True if deactivation was successful; otherwise, false.</returns>
+        public override bool Deactivate()
+        {
+            CommunicationMonitor?.Stop();
+
+            return base.Deactivate();
+        }
+
        /// <summary>
        /// Handles device extender signal changes for system reserved signals.
        /// </summary>
@ -519,15 +554,8 @@ namespace PepperDash.Essentials.Touchpanel
                return false;
            }) ? csIpAddress.ToString() : processorIp;

-            var match = Regex.Match(url, @"^http://([^:/]+):\d+/mc/app\?token=.+$");
-            if (match.Success)
-            {
-                string ipa = match.Groups[1].Value;
-                // ip will be "192.168.1.100"
-            }
-
-            // replace ipa with ip but leave the rest of the string intact
-            var updatedUrl = Regex.Replace(url, @"^http://[^:/]+", $"http://{ip}");
+            // replace the host but preserve whatever scheme (http/https) is already present in the URL
+            var updatedUrl = Regex.Replace(url, @"^(https?)://[^:/]+", $"$1://{ip}");

            this.LogVerbose("Updated URL: {updatedUrl}", updatedUrl);

@ -740,7 +768,7 @@ namespace PepperDash.Essentials.Touchpanel
        /// </summary>
        public MobileControlTouchpanelControllerFactory()
        {
-            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel", "mcdge1000" };
+            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mctsw1080", "mcts1080", "mcxpanel", "mcdge1000" };
            MinimumEssentialsFrameworkVersion = "2.0.0";

            factories = new Dictionary<string, Func<uint, CrestronControlSystem, string, BasicTriListWithSmartObject>>
@ -765,6 +793,8 @@ namespace PepperDash.Essentials.Touchpanel
                {"ts770", (id, controlSystem, projectName) => new Ts770(id, controlSystem)},
                {"tsw1070", (id, controlSystem, projectName) => new Tsw1070(id, controlSystem)},
                {"ts1070", (id, controlSystem, projectName) => new Ts1070(id, controlSystem)},
+                {"tsw1080", (id, controlSystem, projectName) => new Tsw1080(id, controlSystem)},
+                {"ts1080", (id, controlSystem, projectName) => new Ts1080(id, controlSystem)},
                {"dge1000", (id, controlSystem, projectName) => new Dge1000(id, controlSystem)}
            };
        }
--- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
+++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
@ -127,6 +127,16 @@ namespace PepperDash.Essentials.WebSocketServer
        /// </summary>
        public int Port { get; private set; }

+        /// <summary>
+        /// Gets the HTTP scheme to use for generated URLs, based on whether the direct server is configured as secure
+        /// </summary>
+        private string HttpScheme => _parent.Config.DirectServer.Secure ? "https" : "http";
+
+        /// <summary>
+        /// Gets the WebSocket scheme to use for generated URLs, based on whether the direct server is configured as secure
+        /// </summary>
+        private string WsScheme => _parent.Config.DirectServer.Secure ? "wss" : "ws";
+
        /// <summary>
        /// Gets the user app URL prefix
        /// </summary>
@ -134,7 +144,8 @@ namespace PepperDash.Essentials.WebSocketServer
        {
            get
            {
-                return string.Format("http://{0}:{1}{2}?token=",
+                return string.Format("{0}://{1}:{2}{3}?token=",
+                    HttpScheme,
                    CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0),
                    Port,
                    _userAppBaseHref);
@ -273,7 +284,7 @@ namespace PepperDash.Essentials.WebSocketServer
            {
                base.Initialize();

-                _server = new HttpServer(Port, false);
+                _server = new HttpServer(Port, _parent.Config.DirectServer.Secure);

                _server.OnGet += Server_OnGet;

@ -291,7 +302,7 @@ namespace PepperDash.Essentials.WebSocketServer
                    {
                        ClientCertificateRequired = false,
                        CheckCertificateRevocation = false,
-                        EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11
+                        EnabledSslProtocols = SslProtocols.Tls12
                    };
                }

@ -403,11 +414,11 @@ namespace PepperDash.Essentials.WebSocketServer
                    ip = csIpAddress.ToString();
                }

-                var appUrl = $"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}";
+                var appUrl = $"{HttpScheme}://{ip}:{Port}/mc/app?token={touchpanel.Key}";

                this.LogVerbose("Sending URL {appUrl} to touchpanel {touchpanelKey}", appUrl, touchpanel.Touchpanel.Key);

-                touchpanel.Touchpanel.SetAppUrl($"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}");
+                touchpanel.Touchpanel.SetAppUrl(appUrl);
            }
        }

@ -487,7 +498,7 @@ namespace PepperDash.Essentials.WebSocketServer
            {
                var config = new MobileControlApplicationConfig
                {
-                    ApiPath = string.Format("http://{0}:{1}/mc/api", processorIp, _parent.Config.DirectServer.Port),
+                    ApiPath = string.Format("{0}://{1}:{2}/mc/api", HttpScheme, processorIp, Port),
                    GatewayAppPath = "",
                    LogoPath = _parent.Config.ApplicationConfig?.LogoPath ?? "logo/logo.png",
                    EnableDev = _parent.Config.ApplicationConfig?.EnableDev ?? false,
@ -1098,6 +1109,7 @@ namespace PepperDash.Essentials.WebSocketServer
                    res.StatusCode = 200;
                    res.Close();

+                    // remote log collector has no dedicated secure flag; keep it on http regardless of DirectServer.Secure
                    var logRequest = new HttpRequestMessage(HttpMethod.Post, $"http://{_parent.Config.DirectServer.Logging.Host}:{_parent.Config.DirectServer.Logging.Port}/logs")
                    {
                        Content = new StringContent(body, Encoding.UTF8, "application/json"),
@ -1150,6 +1162,11 @@ namespace PepperDash.Essentials.WebSocketServer
            var qp = req.QueryString;
            var token = qp["token"];

+            // Each join mints a single-use clientId; the panel webview must never replay a cached
+            // response, or it reconnects forever with an already-consumed id (1008 loop).
+            res.Headers.Add("Cache-Control", "no-store");
+            res.Headers.Add("Pragma", "no-cache");
+
            this.LogVerbose("Join Room Request with token: {token}", token);

            byte[] body;
@ -1213,8 +1230,7 @@ namespace PepperDash.Essentials.WebSocketServer
            this.LogVerbose("Assigning ClientId: {clientId} for token: {token} at {timestamp}", clientId, token, now);

            // Construct WebSocket URL with clientId query parameter
-            var wsProtocol = "ws";
-            var wsUrl = $"{wsProtocol}://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{Port}{_wsPath}{token}?clientId={clientId}";
+            var wsUrl = $"{WsScheme}://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{Port}{_wsPath}{token}?clientId={clientId}";

            // Construct the response object
            JoinResponse jRes = new JoinResponse
@ -1226,7 +1242,8 @@ namespace PepperDash.Essentials.WebSocketServer
                Config = _parent.GetConfigWithPluginVersion(),
                CodeExpires = new DateTime().AddYears(1),
                UserCode = bridge.UserCode,
-                UserAppUrl = string.Format("http://{0}:{1}/mc/app",
+                UserAppUrl = string.Format("{0}://{1}:{2}/mc/app",
+                HttpScheme,
                CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0),
                Port),
                WebSocketUrl = wsUrl,
@ -1251,6 +1268,8 @@ namespace PepperDash.Essentials.WebSocketServer
        {
            res.StatusCode = 200;
            res.ContentType = "application/json";
+            res.Headers.Add("Cache-Control", "no-store");
+            res.Headers.Add("Pragma", "no-cache");
            var version = new Version() { ServerVersion = _parent.GetConfigWithPluginVersion().RuntimeInfo.PluginVersion };
            var message = JsonConvert.SerializeObject(version);
            this.LogVerbose("{message}", message);
--- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj
+++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
@ -48,7 +48,7 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.274" />
    <PackageReference Include="System.IO.Compression" Version="4.0.0" />
  </ItemGroup>
  <ItemGroup>
Author	SHA1	Message	Date
Neil Dorin	7f05654638	Merge pull request #1469 from PepperDash/hotfix/ssh-stopprog-timing fix(core-ssh): stop reconnect loop during stopprog	2026-08-20 14:47:33 -06:00
Robert Sanders	4ca59e3186	fix(core-ssh): harden GenericSshClient shutdown reconnect guards	2026-08-20 16:39:20 -04:00
Robert Sanders	a55e4811b3	fix(core-ssh): stop reconnect loop during stopprog	2026-08-20 16:18:04 -04:00
Andrew Welker	5cac0bb6c8	Merge pull request #1468 from PepperDash/fix/ssh-connection-exception	2026-08-20 11:52:03 -05:00
Neil Dorin	44e5ff4c3e	fix: Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-08-20 10:47:30 -06:00
Neil Dorin	ec9753b19e	fix(ssh-client): improve error handling for SSH connection exceptions	2026-08-20 10:26:09 -06:00
Jonathan Arndt	12e5ff752d	Merge pull request #1464 from PepperDash/fix-mobile-control-join-response-caching fix(mobile-control): update version and improve response caching for …	2026-08-19 10:37:32 -07:00
Jonathan Arndt	85a4b635f6	fix(mobile-control): update version and improve response caching for join requests	2026-08-19 10:24:23 -07:00
Jonathan Arndt	aff4c1e897	Merge pull request #1450 from PepperDash/feature/mobile-control-https-wss-support feat(mobile-control): support https/wss for direct server URLs when Secure is true	2026-08-13 16:27:47 -07:00
jkdevito	3afc73a446	fix(mobile-control): address PR review feedback - Use the actual listening Port instead of raw DirectServer.Port config when building the app URL and API path, so advertised URLs match the listener even when the configured port is 0. - Keep the remote logging endpoint on http:// since there is no dedicated secure flag for the log collector. - Remove dead Regex.Match/ipa variable in GetUrlWithCorrectIp; the scheme-preserving Regex.Replace below it already handles this.	2026-08-13 17:50:26 -05:00
jkdevito	3c9f5e95e0	feat(mobile-control): support https/wss for direct server URLs when Secure is true - Add HttpScheme/WsScheme helpers driven by directServer.Secure - Replace hardcoded http/ws literals in UserAppUrlPrefix, touchpanel app URL, _config.local.json ApiPath, remote logging POST, join-response WebSocketUrl and UserAppUrl - Pass Secure flag into the HttpServer constructor so the listener actually negotiates TLS when a cert is configured - Drop TLS 1.1 from EnabledSslProtocols, keep TLS 1.2 (TLS 1.3 is not defined in the net472 SslProtocols enum used by this project) - MobileControlTouchpanelController: rewrite the app-URL IP regex to match and preserve either http or https instead of assuming http	2026-08-13 17:46:17 -05:00
Neil Dorin	f70c78bcc5	Merge pull request #1456 from PepperDash/feat/touchpanel-communication-monitor	2026-08-12 21:14:52 -06:00
Neil Dorin	5b5619764f	Merge pull request #1455 from PepperDash/feature/touchpanel-1080-types	2026-08-12 21:13:29 -06:00
Jonathan Arndt	d21cef0e60	fix: Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-30 16:22:30 -07:00
Jonathan Arndt	1719de195f	feat: implement ICommunicationMonitor on MobileControlTouchpanelController for Health page visibility	2026-07-30 14:10:15 -07:00
Jonathan Arndt	6949253b1a	feat: add TS-1080 and TSW-1080 touchpanel support Add mctsw1080 and mcts1080 Mobile Control touchpanel types and map them to the Tsw1080 and Ts1080 hardware classes in the touchpanel controller factory. Bump the Crestron SimplSharp SDK packages (Library, ProgramLibrary, Program) from 2.21.90 to 2.21.274 across all projects. The Tsw1080 and Ts1080 device classes do not exist in the SDK prior to 2.21.274, so the SDK bump is required for the new panel types to compile.	2026-07-29 14:39:36 -07:00
Andrew Knous	e23c987516	Merge pull request #1448 from PepperDash/fix-cecportcontroller-null-streamcec-guard Fix cecportcontroller null streamcec guard	2026-07-16 09:40:19 -04:00
copilot-swe-agent[bot]	14cd082076	Remove redundant IRoutingInputsOutputs filtering in route mapping loops	2026-07-16 13:26:25 +00:00
copilot-swe-agent[bot]	36c15b8d95	Clarify CecPortController subscription XML comment	2026-07-16 13:25:25 +00:00
erikdred	fbf4c56403	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-16 09:23:18 -04:00
erikdred	f4cb17314d	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-16 09:21:45 -04:00
Neil Dorin	12828e8dd4	Merge pull request #1446 from PepperDash/feature-add-iHasDspPresetSave feat: add IHasDspPresetSave interface for DSP preset management	2026-07-14 11:29:44 -06:00
Jonathan Arndt	4dca16e9bd	fix: Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-13 16:09:45 -07:00
Jonathan Arndt	d4284bd59f	fix: Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-13 16:08:10 -07:00
Jonathan Arndt	a8ec831064	feat: add IHasDspPresetSave interface for DSP preset management	2026-07-13 12:58:52 -07:00
Jason DeVito	6ceddcf571	Merge pull request #1439 from PepperDash/feature/version-data-touchpanel-ui-schema fix(config): version data, packageManifest API, and v1/v2 config detection	2026-07-08 10:25:55 -05:00
jkdevito	02f507ccb1	fix(mobile-control): address PR review feedback on version tracking - ConnectedClientVersions now deep-copies each ConnectedClientVersionInfo when snapshotting, so external callers can't mutate the internally tracked, lock-protected instances (Copilot review). - ShowInfo now prints "(not configured)" for an empty ExpectedAppVersion, matching the match/mismatch calculation which already treats empty the same as not-configured (Copilot review). - GetPackageManifestRequestHandler.PopulatePackages filters out null entries from the config-supplied packages list before processing, so a malformed "packages": [null, ...] in user-edited config JSON degrades gracefully instead of throwing (Copilot review).	2026-07-08 10:07:20 -05:00
Jason DeVito	22ef9cf7c2	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-07-08 09:54:14 -05:00
jkdevito	02216372bc	feat(mobile-control): track and validate UI client app versions Extend the /system/clientJoined handler to accept an optional `appVersion` field reported by connecting UI clients (e.g. the React app's build-time APP_VERSION), so Essentials can record and validate what's actually running against the configured versions.touchpanelWrapperApp version. - Add ConnectedClientVersionInfo to capture clientId, roomKey, touchpanelKey, reported/expected app version, and last-seen time. - Add MobileControlSystemController.TrackClientAppVersion(), storing results in a new thread-safe ConnectedClientVersions dictionary and logging a warning on version mismatch. - Expose ConnectedClientVersions as a public read-only property for diagnostics. - Surface reported vs. expected versions per client in the `mobileinfo` console command output. No wire protocol changes required; content is passed as-is over the existing clientJoined message.	2026-07-07 17:41:04 -05:00
jkdevito	c323c872fc	fix: match main assembly by PackageId metadata instead of AssemblyName	2026-07-07 17:20:22 -05:00
jkdevito	1e63b10aa4	fix: report main assembly's PackageId (PepperDashEssentials) in packageManifest API	2026-07-07 17:14:34 -05:00
jkdevito	47e186d8f4	fix(config): correctly detect v1 vs v2 config and preserve versions node - Determine config version by presence of "system" and "template" nodes instead of "versions", since a v2 config can also include "versions" and was previously being skipped from merging as a result. - Preserve the "versions" node after merging a v1 config, since PortalConfigReader.MergeConfigs does not carry it forward.	2026-07-07 16:55:43 -05:00
jkdevito	2f7789b374	fix: prefer embedded PackageId assembly metadata in packageManifest API WHAT / WHY ---------- GetPackageManifestRequestHandler previously identified a loaded plugin's NuGet PackageId by fuzzy-matching AssemblyTitle/AssemblyName against the config's packageId - a chain that silently fails for any plugin whose AssemblyTitle/AssemblyName doesn't happen to match its PackageId (verified against real shipped plugin DLLs; see FINDINGS-nuget-packageid-gaps.md). epi-symetrix-dsp and epi-shure-mxa have already backported a Directory.Build.props change that embeds `<AssemblyMetadata Include="PackageId" Value="$(PackageId)" />`, giving Essentials an unambiguous, authoritative PackageId via AssemblyMetadataAttribute("PackageId", ...) instead of guessing. Validated by building both plugins and inspecting the generated AssemblyInfo.cs. Changes: - src/Directory.Build.props: add the same AssemblyMetadata PackageId item, so every Essentials-owned assembly (Core, Essentials, Devices.Common, MobileControl, MobileControl.Messengers) now embeds its real PackageId too - previously none of them did. - GetPackageManifestRequestHandler.cs: - PopulatePackages: read AssemblyMetadataAttribute("PackageId", ...) from loaded plugin assemblies and use it as the first-priority match/identity signal, ahead of the AssemblyTitle -> AssemblyName -> AssemblyName-minus- ".4Series" fallback chain. Loaded-but-unconfigured plugins that carry this metadata now report a PackageId in the manifest instead of null. - PopulateEssentials: replace the hardcoded "PepperDash.Essentials" fallback (which matched none of the real PackageIds) with the reflected value from PepperDash.Essentials.Core's own assembly metadata. Fully backward compatible: plugins without the updated Directory.Build.props (most existing epi-* repos today) fall through to the prior fallback chain unchanged. RECOMMENDATIONS - Essentials & sub-projects (this repo) -------------------------------------------------------- - AssemblyName/AssemblyTitle drift from PackageId across sub-projects (confirmed via generated AssemblyInfo.cs, not assumed): PepperDash.Essentials.Core: PackageId "PepperDash.Essentials.Core" vs AssemblyName "PepperDash_Essentials_Core" PepperDash.Essentials.Devices.Common: PackageId "PepperDash.Essentials.Devices.Common" vs AssemblyName "Essentials Devices Common" PepperDash.Essentials.MobileControl: PackageId "PepperDash.Essentials.MobileControl" vs AssemblyName "epi-essentials-mobile-control" PepperDash.Essentials.MobileControl.Messengers: PackageId "...Messengers" vs AssemblyName "mobile-control-messengers" Only PepperDash.Essentials and PepperDash.Core happen to agree. Fixing AssemblyName changes the physical .dll filename for existing consumers, so this needs a deliberate, versioned decision - not bundled here. - Once this ships and bakes for a release or two, consider deleting the now-redundant "PepperDash.Essentials" hardcoded string entirely and the Product/AssemblyTitle-based Name fallback, since AssemblyMetadata PackageId supersedes both for any assembly built after this change. RECOMMENDATIONS - EPI plugin repos (epi-) ------------------------------------------- - Backport `<AssemblyMetadata Include="PackageId" Value="$(PackageId)" />` into every existing epi- repo's src/Directory.Build.props (recommendation E from FINDINGS-nuget-packageid-gaps.md). This is opt-in and additive - repos that skip it keep working via the existing fallback chain, but gain nothing until they backport it and cut a new release. - Land the corresponding fix in EssentialsPluginTemplate (src/Directory.Build.props + src/epi-make-model.4Series.csproj) so all new plugin repos get this by default, and fix the template's own AssemblyTitle/PackageId drift ("Plugin" vs "Plugins") while there. - Already-published plugin versions can't be retroactively fixed - this only takes effect on a plugin's next release after adopting the template change. WORKFLOW RECOMMENDATIONS ------------------------- - Extend workflow-templates' essentialsplugins-4Series-builds.yml "Check Package Name" step to validate the built DLL's embedded AssemblyMetadataAttribute("PackageId", ...) (and/or AssemblyTitle as a fallback) against the repo-derived expected package name - today it only compares the .nupkg filename, which would not have caught drift like epi-display-samsung-mdc's AssemblyTitle mismatch. - Sequence this after the template + per-repo backports have landed and baked for a release cycle, otherwise it will fail CI for every epi-* repo that hasn't picked up the Directory.Build.props change yet. Gate it behind the existing bypassPackageCheck input for repos not yet ready.	2026-07-07 16:22:23 -05:00
jkdevito	588057f3ba	feat: add packageManifest CWS API route New GET https://{ip}/cws/app{xx}/api/packageManifest route returning a JSON package manifest (Essentials + plugins + user interfaces) shaped to hydrate the vsce-essentials-version-manager extension's VersionsSnapshot object. - EssentialsConfig.cs: add [JsonProperty("versions")] to EssentialsConfig.Versions (was attribute-less); add NugetVersion.Name; NullValueHandling.Ignore on PackageId/RepoUrl/Name. - New GetPackageManifestRequestHandler: deep-copies the config's VersionData (never mutates the live config object), then enriches it via reflection: - essentials: version from Global.AssemblyVersion, repoUrl/name from the RepositoryUrl AssemblyMetadata + AssemblyProduct of PepperDash.Essentials.Core's own assembly (PluginLoader.EssentialsAssembly.Assembly is null at runtime due to a pre-existing name-matching bug, so this route reads its own loaded assembly instead), packageId from config or a constant. - packages[]: merges PluginLoader.EssentialsPluginAssemblies (matched to config packages by packageId via AssemblyTitle -> AssemblyName -> AssemblyName minus a trailing .4Series suffix) with reflection supplying version and filling missing repoUrl/name; unmatched loaded assemblies are emitted without a packageId; configured-but-not-loaded packages pass through unchanged. - userInterfaces/touchpanelWrapperApp are passed through from config as-is. - Entries with no resolvable version are skipped (the extension's parser drops entries whose version isn't a string). - EssentialsWebApi.cs: register the new packageManifest route next to versions. Build verified clean (Core + Essentials program, 0 errors). Not yet tested on hardware.	2026-07-05 20:57:05 -05:00
jkdevito	64d60dacc2	feat: update version object Add touchpanelWrapperApp, userInterfaces, and repoUrl to VersionData config schema VersionData/NugetVersion previously only modeled the essentials and packages entries under the versions node. This adds support for the touchpanelWrapperApp (single object) and userInterfaces (array) nodes, plus a repoUrl property on NugetVersion so it round-trips instead of being silently dropped, matching the schema produced by the vsce-essentials-version-manager extension.	2026-07-02 17:13:26 -05:00
Neil Dorin	f34d7223e0	Merge pull request #1438 from PepperDash/set-secrets-formatting	2026-07-02 14:08:32 -06:00
Andrew Welker	68c44e46ae	fix: string formatting for console responses was incorrect in some cases and causing exceptions	2026-07-02 15:06:51 -05:00
Neil Dorin	4f1eb979d3	Merge pull request #1436 from PepperDash/claude/deprecate-imobilecontrolmessengerwithsubscriptions	2026-06-26 18:11:17 -06:00
anthropic-code-agent[bot]	8ac4eb7584	refactor: marked mobile control subscription items as obsolete Co-authored-by: ndorin <18535240+ndorin@users.noreply.github.com>	2026-06-26 22:32:56 +00:00
Neil Dorin	0240887d93	Clarify summary for EnableMessengerSubscriptions property Updated the summary comment for EnableMessengerSubscriptions property to clarify its purpose.	2026-06-26 15:57:52 -06:00
copilot-swe-agent[bot]	640bd7a8a7	Update XML summary for EnableMessengerSubscriptions to reflect obsolete status	2026-06-26 21:55:49 +00:00
Neil Dorin	2fac0ca926	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-26 14:32:22 -06:00
anthropic-code-agent[bot]	af5611e403	Mark IMobileControlMessengerWithSubscriptions and EnableMessengerSubscriptions as obsolete All messengers are now subscription based in v3.x, making these constructs no longer necessary. Closes #1435 Agent-Logs-Url: https://github.com/PepperDash/Essentials/sessions/bda64c9c-5343-412b-801f-5e60816bc38d Co-authored-by: ndorin <18535240+ndorin@users.noreply.github.com>	2026-06-26 20:11:48 +00:00
anthropic-code-agent[bot]	3286d27898	Initial plan	2026-06-26 20:09:32 +00:00
erikdred	a63da82cc3	Merge pull request #1432 from PepperDash/fix/web-debug-url Fix/web debug url	2026-06-12 17:15:05 -04:00
Neil Dorin	3974455337	fix: add port forward timeout handling in DebugSessionRequestHandler	2026-06-12 15:08:34 -06:00
Neil Dorin	782bb6c057	fix: improve CS LAN IP handling and update fallback debug session URL in DebugSessionRequestHandler	2026-06-12 14:52:35 -06:00
Neil Dorin	907eb2f397	fix: add csIp handling and update debug session URL in DebugSessionRequestHandler	2026-06-12 14:29:49 -06:00
Neil Dorin	72a4c63a06	Merge pull request #1430 from PepperDash/feature/add-escape-handling-for-devjson Feature/add escape handling for devjson	2026-06-12 11:31:24 -06:00
Neil Dorin	5f26cb98fd	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-12 11:28:39 -06:00
Neil Dorin	75587c361f	Merge pull request #1428 from PepperDash/tieline-mapping Fix cache clearing for impossibleRoutes	2026-06-09 09:25:42 -06:00
Andrew Welker	c3511cd1a6	fix: remove impossibleRoutes cache The cache wasn't being cleared correctly, and was an unnecessary add.	2026-06-09 10:18:25 -05:00