fix(logging): clamp stored log caps to minimums and reject extra applogfilecap args

Addresses Copilot review on #1473: clamp CDS-loaded fileSizeLimitBytes/retainedCount to the enforced floors (65536 bytes / 1 file) at startup so a stale small stored value cannot cause pathological rolling, and reject >2 console tokens to prevent silent misconfiguration.

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.42.1-local</Version>
+    <Version>2.36.6-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -151,8 +151,6 @@ namespace PepperDash.Core
         // Thread-safety lock for state changes
         private readonly object _stateLock = new object();
 
-        private volatile bool _isProgramStopping;
-
         private bool disconnectLogged = false;
 
         /// <summary>
@@ -209,9 +207,11 @@ namespace PepperDash.Core
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                _isProgramStopping = true;
+                if (client != null)
-                this.LogDebug("Program stopping. Closing connection");
+                {
-                Disconnect();
+                    this.LogDebug("Program stopping. Closing connection");
+                    Disconnect();
+                }
             }
         }
 
@@ -228,12 +228,6 @@ namespace PepperDash.Core
                 return;
             }
 
-            if (_isProgramStopping)
-            {
-                this.LogDebug("Skipping connect because program is stopping");
-                return;
-            }
-
             ConnectEnabled = true;
 
             try
@@ -293,7 +287,13 @@ namespace PepperDash.Core
                     }
                     catch (SshConnectionException e)
                     {
-                        var ie = e.InnerException; // The details are inside, when present - remote can close the connection with no inner exception at all
+                        var ie = e.InnerException; // The details are inside!!
+
+                        if (ie is SocketException)
+                        {
+                            this.LogError("CONNECTION failure: Cannot reach host");
+                            this.LogVerbose(ie, "Exception details: ");
+                        }
 
                         if (ie is System.Net.Sockets.SocketException socketException)
                         {
@@ -301,20 +301,20 @@ namespace PepperDash.Core
                                 Hostname, Port);
                             this.LogVerbose(socketException, "SocketException details: ");
                         }
-                        else if (ie is SshAuthenticationException)
+                        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 ?? e.Message);
+                            this.LogError("Error on connect: {error}", ie.Message);
-                            this.LogVerbose(ie ?? e, "Exception details: ");
+                            this.LogVerbose(ie, "Exception details: ");
                         }
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             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 && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             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 && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -473,7 +473,7 @@ namespace PepperDash.Core
                 {
                     connectLock.Release();
                 }
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                     StartReconnectTimer();
@@ -516,10 +516,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                StartReconnectTimer();
-                {
-                    StartReconnectTimer();
-                }
             }
             catch (Exception ex)
             {
@@ -552,10 +549,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                StartReconnectTimer();
-                {
-                    StartReconnectTimer();
-                }
             }
             catch (Exception ex)
             {

src/PepperDash.Core/Logging/Debug.cs

@@ -26,6 +26,31 @@ namespace PepperDash.Core
         private static readonly string WebSocketLevelStoreKey = "WebsocketDebugLevel";
         private static readonly string ErrorLogLevelStoreKey = "ErrorLogDebugLevel";
         private static readonly string FileLevelStoreKey = "FileDebugLevel";
+        private static readonly string FileSizeLimitStoreKey = "FileLogSizeLimitBytes";
+        private static readonly string FileRetainedCountStoreKey = "FileLogRetainedCount";
+
+        // Conservative defaults so the daily rolling log set cannot exhaust
+        // constrained storage (e.g. RMC4 with \user on a small removable drive).
+        private const long DefaultApplianceFileSizeLimitBytes = 4L * 1024 * 1024;
+        private const long DefaultServerFileSizeLimitBytes = 16L * 1024 * 1024;
+        private const int DefaultApplianceRetainedFileCount = 7;
+        private const int DefaultServerRetainedFileCount = 14;
+
+        // Enforced floors so a stale/corrupt stored value can't cause pathological rolling.
+        private const int MinFileSizeLimitBytes = 65536;
+        private const int MinRetainedFileCount = 1;
+
+        /// <summary>
+        /// Per-file size (bytes) that triggers a roll of the debug log file. Read at
+        /// startup from CrestronDataStore; override with the applogfilecap console command.
+        /// </summary>
+        public static long LogFileSizeLimitBytes { get; private set; }
+
+        /// <summary>
+        /// Number of rolled debug log files retained on disk. Combined with
+        /// LogFileSizeLimitBytes this bounds total debug-log disk usage.
+        /// </summary>
+        public static int LogRetainedFileCountLimit { get; private set; }
 
         private static readonly Dictionary<uint, LogEventLevel> _logLevels = new Dictionary<uint, LogEventLevel>()
         {
@@ -157,6 +182,12 @@ namespace PepperDash.Core
                 ? "{@t:fff}ms [{@l:u4}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}"
                 : "[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}";
 
+            var isAppliance = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance;
+            LogFileSizeLimitBytes = Math.Max(MinFileSizeLimitBytes, GetStoredIntValue(FileSizeLimitStoreKey,
+                (int)(isAppliance ? DefaultApplianceFileSizeLimitBytes : DefaultServerFileSizeLimitBytes)));
+            LogRetainedFileCountLimit = Math.Max(MinRetainedFileCount, GetStoredIntValue(FileRetainedCountStoreKey,
+                isAppliance ? DefaultApplianceRetainedFileCount : DefaultServerRetainedFileCount));
+
             _defaultLoggerConfiguration = new LoggerConfiguration()
                 .MinimumLevel.Verbose()
                 .Enrich.FromLogContext()
@@ -166,8 +197,10 @@ namespace PepperDash.Core
                 .WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate(errorLogTemplate)), levelSwitch: _errorLogLevelSwitch)
                 .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,
                     rollingInterval: RollingInterval.Day,
+                    fileSizeLimitBytes: LogFileSizeLimitBytes,
+                    rollOnFileSizeLimit: true,
                     restrictedToMinimumLevel: LogEventLevel.Debug,
-                    retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 7 : 14,
+                    retainedFileCountLimit: LogRetainedFileCountLimit,
                     levelSwitch: _fileLogLevelSwitch
                 );
 
@@ -223,6 +256,9 @@ namespace PepperDash.Core
                     ConsoleAccessLevelEnum.AccessOperator);
                 CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
                     "appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
+                CrestronConsole.AddNewConsoleCommand(SetLogFileCapFromConsole, "applogfilecap",
+                    "applogfilecap:P [sizeBytes] [retainedCount]: Caps rolling debug log size/count (next restart)",
+                    ConsoleAccessLevelEnum.AccessOperator);
             }
 
             CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
@@ -297,6 +333,81 @@ namespace PepperDash.Core
             }
         }
 
+        private static int GetStoredIntValue(string storeKey, int defaultValue)
+        {
+            try
+            {
+                var result = CrestronDataStoreStatic.GetLocalIntValue(storeKey, out int value);
+
+                if (result != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+                {
+                    CrestronDataStoreStatic.SetLocalIntValue(storeKey, defaultValue);
+                    return defaultValue;
+                }
+
+                return value <= 0 ? defaultValue : value;
+            }
+            catch (Exception ex)
+            {
+                CrestronConsole.PrintLine($"Exception retrieving stored value for {storeKey}: {ex.Message}");
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Console handler to cap the rolling debug log file size and retained count.
+        /// Values persist in CrestronDataStore and take effect on the next program restart.
+        /// </summary>
+        public static void SetLogFileCapFromConsole(string command)
+        {
+            var trimmed = command?.Trim() ?? string.Empty;
+
+            if (trimmed == "?" || string.IsNullOrEmpty(trimmed))
+            {
+                CrestronConsole.ConsoleCommandResponse(
+                    "Caps the rolling debug log file (takes effect on next program restart):\r\n" +
+                    "Usage: applogfilecap:P [sizeBytes] [retainedCount]\r\n" +
+                    "  sizeBytes: per-file size that triggers a roll (min 65536)\r\n" +
+                    "  retainedCount: number of rolled files to keep (min 1)\r\n" +
+                    $"Current: sizeBytes = {LogFileSizeLimitBytes}, retainedCount = {LogRetainedFileCountLimit}\r\n" +
+                    $"Approx on-disk ceiling = {LogFileSizeLimitBytes * LogRetainedFileCountLimit} bytes\r\n");
+                return;
+            }
+
+            var tokens = trimmed.Split(new char[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+
+            if (tokens.Length > 2)
+            {
+                CrestronConsole.ConsoleCommandResponse("Too many arguments. Usage: applogfilecap [sizeBytes] [retainedCount].\r\n");
+                return;
+            }
+
+            if (!long.TryParse(tokens[0], out var sizeBytes) || sizeBytes < MinFileSizeLimitBytes)
+            {
+                CrestronConsole.ConsoleCommandResponse("Invalid sizeBytes. Must be an integer >= 65536.\r\n");
+                return;
+            }
+
+            sizeBytes = Math.Min(sizeBytes, int.MaxValue);
+
+            var retained = LogRetainedFileCountLimit;
+            if (tokens.Length > 1 && (!int.TryParse(tokens[1], out retained) || retained < MinRetainedFileCount))
+            {
+                CrestronConsole.ConsoleCommandResponse("Invalid retainedCount. Must be an integer >= 1.\r\n");
+                return;
+            }
+
+            var sizeErr = CrestronDataStoreStatic.SetLocalIntValue(FileSizeLimitStoreKey, (int)sizeBytes);
+            var countErr = CrestronDataStoreStatic.SetLocalIntValue(FileRetainedCountStoreKey, retained);
+
+            LogFileSizeLimitBytes = sizeBytes;
+            LogRetainedFileCountLimit = retained;
+
+            CrestronConsole.ConsoleCommandResponse(
+                $"File log cap stored: sizeBytes = {sizeBytes}, retainedCount = {retained} (store result: {sizeErr}/{countErr}).\r\n" +
+                "Takes effect on next program restart.\r\n");
+        }
+
         private static void GetVersion()
         {
             var assembly = Assembly.GetExecutingAssembly();

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.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />

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.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

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.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
   </ItemGroup>
 </Project>

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.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Core\PepperDash.Core.csproj" />

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.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
     <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>

src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs

@@ -25,28 +25,11 @@ 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, ICommunicationMonitor
+    public class MobileControlTouchpanelController : TouchpanelBase, IHasFeedback, ITswAppControl, ITswZoomControl, IDeviceInfoProvider, IMobileControlCrestronTouchpanelController, ITheme
     {
         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>
@@ -145,11 +128,6 @@ namespace PepperDash.Essentials.Touchpanel
         {
             localConfig = config;
 
-            if (panel != null)
-            {
-                CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, panel, 120000, 300000);
-            }
-
             AddPostActivationAction(SubscribeForMobileControlUpdates);
 
             ThemeFeedback = new StringFeedback($"{Key}-theme", () => Theme);
@@ -388,8 +366,6 @@ 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);
@@ -417,17 +393,6 @@ 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>
@@ -554,8 +519,15 @@ namespace PepperDash.Essentials.Touchpanel
                 return false;
             }) ? csIpAddress.ToString() : processorIp;
 
-            // replace the host but preserve whatever scheme (http/https) is already present in the URL
+            var match = Regex.Match(url, @"^http://([^:/]+):\d+/mc/app\?token=.+$");
-            var updatedUrl = Regex.Replace(url, @"^(https?)://[^:/]+", $"$1://{ip}");
+            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}");
 
             this.LogVerbose("Updated URL: {updatedUrl}", updatedUrl);
 
@@ -768,7 +740,7 @@ namespace PepperDash.Essentials.Touchpanel
         /// </summary>
         public MobileControlTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mctsw1080", "mcts1080", "mcxpanel", "mcdge1000" };
+            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel", "mcdge1000" };
             MinimumEssentialsFrameworkVersion = "2.0.0";
 
             factories = new Dictionary<string, Func<uint, CrestronControlSystem, string, BasicTriListWithSmartObject>>
@@ -793,8 +765,6 @@ 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)}
             };
         }

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

@@ -127,16 +127,6 @@ 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>
@@ -144,8 +134,7 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             get
             {
-                return string.Format("{0}://{1}:{2}{3}?token=",
+                return string.Format("http://{0}:{1}{2}?token=",
-                    HttpScheme,
                     CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0),
                     Port,
                     _userAppBaseHref);
@@ -284,7 +273,7 @@ namespace PepperDash.Essentials.WebSocketServer
             {
                 base.Initialize();
 
-                _server = new HttpServer(Port, _parent.Config.DirectServer.Secure);
+                _server = new HttpServer(Port, false);
 
                 _server.OnGet += Server_OnGet;
 
@@ -302,7 +291,7 @@ namespace PepperDash.Essentials.WebSocketServer
                     {
                         ClientCertificateRequired = false,
                         CheckCertificateRevocation = false,
-                        EnabledSslProtocols = SslProtocols.Tls12
+                        EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11
                     };
                 }
 
@@ -414,11 +403,11 @@ namespace PepperDash.Essentials.WebSocketServer
                     ip = csIpAddress.ToString();
                 }
 
-                var appUrl = $"{HttpScheme}://{ip}:{Port}/mc/app?token={touchpanel.Key}";
+                var appUrl = $"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}";
 
                 this.LogVerbose("Sending URL {appUrl} to touchpanel {touchpanelKey}", appUrl, touchpanel.Touchpanel.Key);
 
-                touchpanel.Touchpanel.SetAppUrl(appUrl);
+                touchpanel.Touchpanel.SetAppUrl($"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}");
             }
         }
 
@@ -498,7 +487,7 @@ namespace PepperDash.Essentials.WebSocketServer
             {
                 var config = new MobileControlApplicationConfig
                 {
-                    ApiPath = string.Format("{0}://{1}:{2}/mc/api", HttpScheme, processorIp, Port),
+                    ApiPath = string.Format("http://{0}:{1}/mc/api", processorIp, _parent.Config.DirectServer.Port),
                     GatewayAppPath = "",
                     LogoPath = _parent.Config.ApplicationConfig?.LogoPath ?? "logo/logo.png",
                     EnableDev = _parent.Config.ApplicationConfig?.EnableDev ?? false,
@@ -1109,7 +1098,6 @@ 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"),
@@ -1162,11 +1150,6 @@ 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;
@@ -1230,7 +1213,8 @@ 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 wsUrl = $"{WsScheme}://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{Port}{_wsPath}{token}?clientId={clientId}";
+            var wsProtocol = "ws";
+            var wsUrl = $"{wsProtocol}://{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
@@ -1242,8 +1226,7 @@ namespace PepperDash.Essentials.WebSocketServer
                 Config = _parent.GetConfigWithPluginVersion(),
                 CodeExpires = new DateTime().AddYears(1),
                 UserCode = bridge.UserCode,
-                UserAppUrl = string.Format("{0}://{1}:{2}/mc/app",
+                UserAppUrl = string.Format("http://{0}:{1}/mc/app",
-                HttpScheme,
                 CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0),
                 Port),
                 WebSocketUrl = wsUrl,
@@ -1268,8 +1251,6 @@ 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);

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -48,7 +48,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
     <PackageReference Include="System.IO.Compression" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>