mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-08-31 19:08:29 +00:00
Compare commits
No commits in common. "main" and "v2.31.1" have entirely different histories.
49 changed files with 379 additions and 1932 deletions
|
|
@ -183,12 +183,11 @@ namespace PepperDash.Core
|
|||
Cresnet = 8,
|
||||
Cec = 9,
|
||||
Udp = 10,
|
||||
UdpClient = 11,
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
These enumerations are not case sensitive. Not all methods are valid for a ```genericComm``` device. For a comport, the only valid type would be ```Com```. For a direct network socket, valid options are ```Ssh```, ```Tcpip```, ```Telnet```, ```UdpClient```, and ```Udp```.
|
||||
These enumerations are not case sensitive. Not all methods are valid for a ```genericComm``` device. For a comport, the only valid type would be ```Com```. For a direct network socket, valid options are ```Ssh```, ```Tcpip```, ```Telnet```, and ```Udp```.
|
||||
|
||||
##### ComParams
|
||||
|
||||
|
|
@ -288,7 +287,7 @@ This property maps to the number of the port on the device you have mapped the r
|
|||
|
||||
##### TcpSshParams
|
||||
|
||||
A ```Ssh```, ```TcpIp```, ```UdpClient```, or ```Udp``` device requires a ```tcpSshProperties``` object to set the propeties of the socket.
|
||||
A ```Ssh```, ```TcpIp```, or ```Udp``` device requires a ```tcpSshProperties``` object to set the propeties of the socket.
|
||||
|
||||
```Json
|
||||
{
|
||||
|
|
@ -305,7 +304,7 @@ A ```Ssh```, ```TcpIp```, ```UdpClient```, or ```Udp``` device requires a ```tcp
|
|||
|
||||
**```address```**
|
||||
|
||||
This is the IP address, hostname, or FQDN of the resource you wish to open a socket to. Use ```UdpClient``` for outbound UDP to a remote endpoint. Use ```Udp``` when you need Essentials to bind a local UDP listener.
|
||||
This is the IP address, hostname, or FQDN of the resource you wish to open a socket to. In the case of a UDP device, you can set either a single whitelist address with this data, or an appropriate broadcast address.
|
||||
|
||||
**```port```**
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<Version>2.42.1-local</Version>
|
||||
<Version>2.29.0-local</Version>
|
||||
<InformationalVersion>$(Version)</InformationalVersion>
|
||||
<Authors>PepperDash Technology</Authors>
|
||||
<Company>PepperDash Technology</Company>
|
||||
<Product>PepperDash Essentials</Product>
|
||||
<Copyright>Copyright © 2026</Copyright>
|
||||
<Copyright>Copyright © 2025</Copyright>
|
||||
<RepositoryUrl>https://github.com/PepperDash/Essentials</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<PackageTags>Crestron; 4series</PackageTags>
|
||||
|
|
@ -20,7 +20,4 @@
|
|||
<None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
|
||||
<None Include="..\..\README.md" Pack="true" PackagePath=""/>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AssemblyMetadata Include="PackageId" Value="$(PackageId)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
this.LogDebug("Program stopping. Closing connection");
|
||||
Disconnect();
|
||||
if (client != null)
|
||||
{
|
||||
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.LogVerbose(ie ?? e, "Exception details: ");
|
||||
this.LogError("Error on connect: {error}", ie.Message);
|
||||
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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,463 +0,0 @@
|
|||
using System;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Crestron.SimplSharp;
|
||||
using Crestron.SimplSharp.CrestronSockets;
|
||||
using ThreadingTimeout = System.Threading.Timeout;
|
||||
using NetSocketException = System.Net.Sockets.SocketException;
|
||||
|
||||
namespace PepperDash.Core
|
||||
{
|
||||
/// <summary>
|
||||
/// A class to handle basic UDP communications to a remote endpoint
|
||||
/// </summary>
|
||||
public class GenericUdpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
|
||||
{
|
||||
private const string SplusKey = "Uninitialized UdpClient";
|
||||
|
||||
private readonly object stateLock = new object();
|
||||
private readonly Timer reconnectTimer;
|
||||
|
||||
private UdpClient client;
|
||||
private CancellationTokenSource receiveCancellationTokenSource;
|
||||
private bool connectEnabled;
|
||||
private bool connectionRefusedLogged;
|
||||
private SocketStatus clientStatus = SocketStatus.SOCKET_STATUS_NO_CONNECT;
|
||||
|
||||
/// <summary>
|
||||
/// Object to enable stream debugging
|
||||
/// </summary>
|
||||
public CommunicationStreamDebugging StreamDebugging { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Fires when data is received from the remote endpoint and returns it as a byte array
|
||||
/// </summary>
|
||||
public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
|
||||
|
||||
/// <summary>
|
||||
/// Fires when data is received from the remote endpoint and returns it as text
|
||||
/// </summary>
|
||||
public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
|
||||
|
||||
/// <summary>
|
||||
/// Fires when the socket status changes
|
||||
/// </summary>
|
||||
public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
|
||||
|
||||
/// <summary>
|
||||
/// Address of remote endpoint
|
||||
/// </summary>
|
||||
public string Hostname { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Port on remote endpoint
|
||||
/// </summary>
|
||||
public int Port { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Another S+ helper because large port numbers can be treated as signed ints
|
||||
/// </summary>
|
||||
public ushort UPort
|
||||
{
|
||||
get { return Convert.ToUInt16(Port); }
|
||||
set { Port = Convert.ToInt32(value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Defaults to 2000
|
||||
/// </summary>
|
||||
public int BufferSize { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// True when the local socket is created and associated with the configured remote endpoint
|
||||
/// </summary>
|
||||
public bool IsConnected
|
||||
{
|
||||
get { return ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S+ helper for IsConnected
|
||||
/// </summary>
|
||||
public ushort UIsConnected
|
||||
{
|
||||
get { return (ushort)(IsConnected ? 1 : 0); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The current socket status of the client
|
||||
/// </summary>
|
||||
public SocketStatus ClientStatus
|
||||
{
|
||||
get
|
||||
{
|
||||
lock (stateLock)
|
||||
{
|
||||
return clientStatus;
|
||||
}
|
||||
}
|
||||
private set
|
||||
{
|
||||
var shouldFireEvent = false;
|
||||
|
||||
lock (stateLock)
|
||||
{
|
||||
if (clientStatus != value)
|
||||
{
|
||||
clientStatus = value;
|
||||
shouldFireEvent = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (shouldFireEvent)
|
||||
ConnectionChange?.Invoke(this, new GenericSocketStatusChageEventArgs(this));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Ushort representation of client status
|
||||
/// </summary>
|
||||
public ushort UStatus
|
||||
{
|
||||
get { return (ushort)ClientStatus; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the AutoReconnect
|
||||
/// </summary>
|
||||
public bool AutoReconnect { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// S+ helper for AutoReconnect
|
||||
/// </summary>
|
||||
public ushort UAutoReconnect
|
||||
{
|
||||
get { return (ushort)(AutoReconnect ? 1 : 0); }
|
||||
set { AutoReconnect = value == 1; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
|
||||
/// </summary>
|
||||
public int AutoReconnectIntervalMs { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
public GenericUdpClient(string key, string address, int port, int bufferSize)
|
||||
: base(key)
|
||||
{
|
||||
StreamDebugging = new CommunicationStreamDebugging(key);
|
||||
CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
|
||||
AutoReconnectIntervalMs = 5000;
|
||||
Hostname = address;
|
||||
Port = port;
|
||||
BufferSize = bufferSize;
|
||||
|
||||
reconnectTimer = new Timer(o =>
|
||||
{
|
||||
if (connectEnabled)
|
||||
Connect();
|
||||
}, null, ThreadingTimeout.Infinite, ThreadingTimeout.Infinite);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Constructor for S+
|
||||
/// </summary>
|
||||
public GenericUdpClient()
|
||||
: base(SplusKey)
|
||||
{
|
||||
StreamDebugging = new CommunicationStreamDebugging(SplusKey);
|
||||
CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
|
||||
AutoReconnectIntervalMs = 5000;
|
||||
BufferSize = 2000;
|
||||
|
||||
reconnectTimer = new Timer(o =>
|
||||
{
|
||||
if (connectEnabled)
|
||||
Connect();
|
||||
}, null, ThreadingTimeout.Infinite, ThreadingTimeout.Infinite);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initialize method
|
||||
/// </summary>
|
||||
public void Initialize(string key)
|
||||
{
|
||||
Key = key;
|
||||
}
|
||||
|
||||
private void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
|
||||
{
|
||||
if (programEventType == eProgramStatusEventType.Stopping)
|
||||
{
|
||||
Debug.Console(1, this, "Program stopping. Closing connection");
|
||||
Deactivate();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Deactivate method
|
||||
/// </summary>
|
||||
public override bool Deactivate()
|
||||
{
|
||||
Disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Connect method
|
||||
/// </summary>
|
||||
public void Connect()
|
||||
{
|
||||
if (string.IsNullOrEmpty(Hostname))
|
||||
{
|
||||
Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpClient '{0}': No address set", Key);
|
||||
ClientStatus = SocketStatus.SOCKET_STATUS_NO_CONNECT;
|
||||
return;
|
||||
}
|
||||
|
||||
if (Port < 1 || Port > 65535)
|
||||
{
|
||||
Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpClient '{0}': Invalid port", Key);
|
||||
ClientStatus = SocketStatus.SOCKET_STATUS_NO_CONNECT;
|
||||
return;
|
||||
}
|
||||
|
||||
var hostname = Hostname;
|
||||
var port = Port;
|
||||
var bufferSize = BufferSize;
|
||||
UdpClient newClient = null;
|
||||
CancellationTokenSource newReceiveCancellationTokenSource = null;
|
||||
CancellationToken startReceiveToken = default(CancellationToken);
|
||||
var shouldStartReceive = false;
|
||||
|
||||
lock (stateLock)
|
||||
{
|
||||
connectEnabled = true;
|
||||
|
||||
if (client != null)
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
newReceiveCancellationTokenSource = new CancellationTokenSource();
|
||||
newClient = new UdpClient();
|
||||
newClient.Client.ReceiveBufferSize = bufferSize;
|
||||
newClient.Client.SendBufferSize = bufferSize;
|
||||
newClient.Connect(hostname, port);
|
||||
|
||||
lock (stateLock)
|
||||
{
|
||||
if (!connectEnabled || client != null)
|
||||
{
|
||||
newClient.Close();
|
||||
newReceiveCancellationTokenSource.Cancel();
|
||||
newReceiveCancellationTokenSource.Dispose();
|
||||
return;
|
||||
}
|
||||
|
||||
receiveCancellationTokenSource = newReceiveCancellationTokenSource;
|
||||
client = newClient;
|
||||
ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
|
||||
reconnectTimer.Change(ThreadingTimeout.Infinite, ThreadingTimeout.Infinite);
|
||||
startReceiveToken = receiveCancellationTokenSource.Token;
|
||||
shouldStartReceive = true;
|
||||
}
|
||||
|
||||
if (shouldStartReceive)
|
||||
StartReceive(startReceiveToken);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogMessage(ex, "Error connecting UDP client {0}", this, Key);
|
||||
|
||||
if (newClient != null)
|
||||
newClient.Close();
|
||||
|
||||
if (newReceiveCancellationTokenSource != null)
|
||||
{
|
||||
newReceiveCancellationTokenSource.Cancel();
|
||||
newReceiveCancellationTokenSource.Dispose();
|
||||
}
|
||||
|
||||
lock (stateLock)
|
||||
{
|
||||
if (connectEnabled && client == null)
|
||||
{
|
||||
ClientStatus = SocketStatus.SOCKET_STATUS_NO_CONNECT;
|
||||
StartReconnectTimer();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Disconnect method
|
||||
/// </summary>
|
||||
public void Disconnect()
|
||||
{
|
||||
lock (stateLock)
|
||||
{
|
||||
connectEnabled = false;
|
||||
reconnectTimer.Change(ThreadingTimeout.Infinite, ThreadingTimeout.Infinite);
|
||||
CleanupClient();
|
||||
ClientStatus = SocketStatus.SOCKET_STATUS_NO_CONNECT;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// SendText method
|
||||
/// </summary>
|
||||
public void SendText(string text)
|
||||
{
|
||||
this.PrintSentText(text);
|
||||
|
||||
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
||||
SendBytes(bytes);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// SendBytes method
|
||||
/// </summary>
|
||||
public void SendBytes(byte[] bytes)
|
||||
{
|
||||
if (bytes == null)
|
||||
return;
|
||||
|
||||
try
|
||||
{
|
||||
this.PrintSentBytes(bytes);
|
||||
|
||||
if (!IsConnected || client == null)
|
||||
Connect();
|
||||
|
||||
var udpClient = client;
|
||||
if (!IsConnected || udpClient == null)
|
||||
{
|
||||
Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpClient '{0}': Cannot send bytes because the client is not connected", Key);
|
||||
return;
|
||||
}
|
||||
|
||||
udpClient.Send(bytes, bytes.Length);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogMessage(ex, "Error sending UDP bytes for {0}", this, Key);
|
||||
HandleDisconnected();
|
||||
}
|
||||
}
|
||||
|
||||
private void StartReceive(CancellationToken token)
|
||||
{
|
||||
Task.Run(async () =>
|
||||
{
|
||||
while (!token.IsCancellationRequested)
|
||||
{
|
||||
try
|
||||
{
|
||||
var udpClient = client;
|
||||
if (udpClient == null)
|
||||
return;
|
||||
|
||||
var result = await udpClient.ReceiveAsync().ConfigureAwait(false);
|
||||
var bytes = result.Buffer;
|
||||
if (bytes == null || bytes.Length == 0)
|
||||
continue;
|
||||
|
||||
connectionRefusedLogged = false;
|
||||
|
||||
var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
|
||||
|
||||
this.PrintReceivedBytes(bytes);
|
||||
this.PrintReceivedText(text);
|
||||
|
||||
BytesReceived?.Invoke(this, new GenericCommMethodReceiveBytesArgs(bytes));
|
||||
TextReceived?.Invoke(this, new GenericCommMethodReceiveTextArgs(text));
|
||||
}
|
||||
catch (ObjectDisposedException)
|
||||
{
|
||||
return;
|
||||
}
|
||||
catch (InvalidOperationException)
|
||||
{
|
||||
return;
|
||||
}
|
||||
catch (NetSocketException ex)
|
||||
{
|
||||
if (ex.SocketErrorCode == SocketError.ConnectionRefused)
|
||||
{
|
||||
if (!connectionRefusedLogged)
|
||||
{
|
||||
Debug.Console(1, Debug.ErrorLogLevel.Warning,
|
||||
"GenericUdpClient '{0}': Remote endpoint refused UDP traffic or is no longer listening",
|
||||
Key);
|
||||
connectionRefusedLogged = true;
|
||||
}
|
||||
|
||||
HandleDisconnected();
|
||||
return;
|
||||
}
|
||||
|
||||
Debug.LogMessage(ex, "UDP receive error for {0}", this, Key);
|
||||
|
||||
if (AutoReconnect)
|
||||
{
|
||||
HandleDisconnected();
|
||||
return;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogMessage(ex, "Unexpected UDP receive error for {0}", this, Key);
|
||||
|
||||
if (AutoReconnect)
|
||||
{
|
||||
HandleDisconnected();
|
||||
return;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}, token);
|
||||
}
|
||||
|
||||
private void HandleDisconnected()
|
||||
{
|
||||
lock (stateLock)
|
||||
{
|
||||
CleanupClient();
|
||||
ClientStatus = SocketStatus.SOCKET_STATUS_NO_CONNECT;
|
||||
StartReconnectTimer();
|
||||
}
|
||||
}
|
||||
|
||||
private void StartReconnectTimer()
|
||||
{
|
||||
if (AutoReconnect && connectEnabled)
|
||||
reconnectTimer.Change(AutoReconnectIntervalMs, ThreadingTimeout.Infinite);
|
||||
}
|
||||
|
||||
private void CleanupClient()
|
||||
{
|
||||
if (receiveCancellationTokenSource != null)
|
||||
{
|
||||
receiveCancellationTokenSource.Cancel();
|
||||
receiveCancellationTokenSource.Dispose();
|
||||
receiveCancellationTokenSource = null;
|
||||
}
|
||||
|
||||
if (client != null)
|
||||
{
|
||||
client.Close();
|
||||
client = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -18,75 +18,70 @@ namespace PepperDash.Core
|
|||
/// <summary>
|
||||
/// RS232/422/485
|
||||
/// </summary>
|
||||
Com = 1,
|
||||
Com,
|
||||
/// <summary>
|
||||
/// Crestron IpId (most Crestron ethernet devices)
|
||||
/// </summary>
|
||||
IpId = 2,
|
||||
IpId,
|
||||
/// <summary>
|
||||
/// Crestron IpIdTcp (HD-MD series, etc.)
|
||||
/// </summary>
|
||||
IpidTcp = 3,
|
||||
IpidTcp,
|
||||
/// <summary>
|
||||
/// Crestron IR control
|
||||
/// </summary>
|
||||
IR = 4,
|
||||
IR,
|
||||
/// <summary>
|
||||
/// SSH client
|
||||
/// </summary>
|
||||
Ssh = 5,
|
||||
Ssh,
|
||||
/// <summary>
|
||||
/// TCP/IP client
|
||||
/// </summary>
|
||||
Tcpip = 6,
|
||||
Tcpip,
|
||||
/// <summary>
|
||||
/// Telnet
|
||||
/// </summary>
|
||||
Telnet = 7,
|
||||
Telnet,
|
||||
/// <summary>
|
||||
/// Crestnet device
|
||||
/// </summary>
|
||||
Cresnet = 8,
|
||||
Cresnet,
|
||||
/// <summary>
|
||||
/// CEC Control, via a DM HDMI port
|
||||
/// </summary>
|
||||
Cec = 9,
|
||||
Cec,
|
||||
/// <summary>
|
||||
/// UDP Server
|
||||
/// </summary>
|
||||
Udp = 10,
|
||||
|
||||
Udp,
|
||||
/// <summary>
|
||||
/// HTTP client
|
||||
/// </summary>
|
||||
Http = 11,
|
||||
Http,
|
||||
/// <summary>
|
||||
/// HTTPS client
|
||||
/// </summary>
|
||||
Https = 12,
|
||||
Https,
|
||||
/// <summary>
|
||||
/// Websocket client
|
||||
/// </summary>
|
||||
Ws = 13,
|
||||
Ws,
|
||||
/// <summary>
|
||||
/// Secure Websocket client
|
||||
/// </summary>
|
||||
Wss = 14,
|
||||
Wss,
|
||||
/// <summary>
|
||||
/// Secure TCP/IP
|
||||
/// </summary>
|
||||
SecureTcpIp = 15,
|
||||
SecureTcpIp,
|
||||
/// <summary>
|
||||
/// Used when comms needs to be handled in SIMPL and bridged opposite the normal direction
|
||||
/// </summary>
|
||||
ComBridge = 16,
|
||||
ComBridge,
|
||||
/// <summary>
|
||||
/// InfinetEX control
|
||||
/// </summary>
|
||||
InfinetEx = 17,
|
||||
/// <summary>
|
||||
/// UDP client
|
||||
/// </summary>
|
||||
UdpClient = 18,
|
||||
InfinetEx
|
||||
}
|
||||
}
|
||||
|
|
@ -11,7 +11,6 @@ namespace PepperDash.Core
|
|||
/// <summary>
|
||||
/// Represents a debugging context
|
||||
/// </summary>
|
||||
[Obsolete("DebugContext is no longer supported and will be removed in a future release.")]
|
||||
public class DebugContext
|
||||
{
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -8,17 +8,10 @@ using Crestron.SimplSharp;
|
|||
using WebSocketSharp;
|
||||
using System.Security.Authentication;
|
||||
using WebSocketSharp.Net;
|
||||
using System.Security.Cryptography;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.IO;
|
||||
using Org.BouncyCastle.Asn1;
|
||||
using Org.BouncyCastle.Asn1.X509;
|
||||
using Org.BouncyCastle.Crypto;
|
||||
using Org.BouncyCastle.Crypto.Generators;
|
||||
using Org.BouncyCastle.Crypto.Operators;
|
||||
using Org.BouncyCastle.Math;
|
||||
using Org.BouncyCastle.Pkcs;
|
||||
using Org.BouncyCastle.Security;
|
||||
using Org.BouncyCastle.X509;
|
||||
using Serilog.Formatting;
|
||||
using Serilog.Formatting.Json;
|
||||
|
||||
|
|
@ -72,20 +65,6 @@ 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;
|
||||
|
||||
|
|
@ -135,70 +114,51 @@ namespace PepperDash.Core
|
|||
var subjectName = string.Format("CN={0}.{1}", hostName, domainName);
|
||||
var fqdn = string.Format("{0}.{1}", hostName, domainName);
|
||||
|
||||
var random = new SecureRandom();
|
||||
|
||||
// Generate RSA 2048 key pair
|
||||
var keyPairGenerator = new RsaKeyPairGenerator();
|
||||
keyPairGenerator.Init(new KeyGenerationParameters(random, 2048));
|
||||
var keyPair = keyPairGenerator.GenerateKeyPair();
|
||||
|
||||
// Build certificate
|
||||
var certGenerator = new X509V3CertificateGenerator();
|
||||
certGenerator.SetSerialNumber(BigInteger.ValueOf(Math.Abs(DateTime.UtcNow.Ticks)));
|
||||
certGenerator.SetIssuerDN(new X509Name(subjectName));
|
||||
certGenerator.SetSubjectDN(new X509Name(subjectName));
|
||||
certGenerator.SetNotBefore(DateTime.UtcNow);
|
||||
certGenerator.SetNotAfter(DateTime.UtcNow.AddYears(2));
|
||||
certGenerator.SetPublicKey(keyPair.Public);
|
||||
|
||||
// Extended Key Usage: server + client auth
|
||||
certGenerator.AddExtension(X509Extensions.ExtendedKeyUsage, false,
|
||||
new ExtendedKeyUsage(new[] { KeyPurposeID.id_kp_serverAuth, KeyPurposeID.id_kp_clientAuth }));
|
||||
|
||||
// Subject Alternative Names: DNS + IP
|
||||
System.Net.IPAddress parsedIp;
|
||||
if (System.Net.IPAddress.TryParse(ipAddress, out parsedIp))
|
||||
using (var rsa = RSA.Create(2048))
|
||||
{
|
||||
certGenerator.AddExtension(X509Extensions.SubjectAlternativeName, false,
|
||||
new GeneralNames(new GeneralName[] {
|
||||
new GeneralName(GeneralName.DnsName, fqdn),
|
||||
new GeneralName(GeneralName.IPAddress, ipAddress)
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
certGenerator.AddExtension(X509Extensions.SubjectAlternativeName, false,
|
||||
new GeneralNames(new GeneralName(GeneralName.DnsName, fqdn)));
|
||||
}
|
||||
|
||||
// Sign with SHA256withRSA
|
||||
var signatureFactory = new Asn1SignatureFactory("SHA256WITHRSA", keyPair.Private, random);
|
||||
var certificate = certGenerator.Generate(signatureFactory);
|
||||
var request = new CertificateRequest(
|
||||
subjectName,
|
||||
rsa,
|
||||
HashAlgorithmName.SHA256,
|
||||
RSASignaturePadding.Pkcs1);
|
||||
|
||||
// Export as PKCS12/PFX
|
||||
var pkcs12Store = new Pkcs12StoreBuilder().Build();
|
||||
var certEntry = new X509CertificateEntry(certificate);
|
||||
pkcs12Store.SetCertificateEntry(_certificateName, certEntry);
|
||||
pkcs12Store.SetKeyEntry(_certificateName, new AsymmetricKeyEntry(keyPair.Private), new[] { certEntry });
|
||||
// Subject Key Identifier
|
||||
request.CertificateExtensions.Add(
|
||||
new X509SubjectKeyIdentifierExtension(request.PublicKey, false));
|
||||
|
||||
var separator = Path.DirectorySeparatorChar;
|
||||
var outputPath = string.Format("{0}user{1}{2}.pfx", separator, separator, _certificateName);
|
||||
// Extended Key Usage: server + client auth
|
||||
request.CertificateExtensions.Add(
|
||||
new X509EnhancedKeyUsageExtension(
|
||||
new OidCollection
|
||||
{
|
||||
new Oid("1.3.6.1.5.5.7.3.1"), // id-kp-serverAuth
|
||||
new Oid("1.3.6.1.5.5.7.3.2") // id-kp-clientAuth
|
||||
},
|
||||
false));
|
||||
|
||||
using (var ms = new MemoryStream())
|
||||
{
|
||||
var passwordChars = _certificatePassword.ToCharArray();
|
||||
try
|
||||
// Subject Alternative Names: DNS + IP
|
||||
var sanBuilder = new SubjectAlternativeNameBuilder();
|
||||
sanBuilder.AddDnsName(fqdn);
|
||||
if (System.Net.IPAddress.TryParse(ipAddress, out var ip))
|
||||
sanBuilder.AddIpAddress(ip);
|
||||
request.CertificateExtensions.Add(sanBuilder.Build());
|
||||
|
||||
var notBefore = DateTimeOffset.UtcNow;
|
||||
var notAfter = notBefore.AddYears(2);
|
||||
|
||||
using (var cert = request.CreateSelfSigned(notBefore, notAfter))
|
||||
{
|
||||
pkcs12Store.Save(ms, passwordChars, random);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Array.Clear(passwordChars, 0, passwordChars.Length);
|
||||
}
|
||||
File.WriteAllBytes(outputPath, ms.ToArray());
|
||||
}
|
||||
|
||||
CrestronConsole.PrintLine(string.Format("CreateCert: Certificate written to {0}", outputPath));
|
||||
var separator = Path.DirectorySeparatorChar;
|
||||
var outputPath = string.Format("{0}user{1}{2}.pfx", separator, separator, _certificateName);
|
||||
|
||||
var pfxBytes = cert.Export(X509ContentType.Pfx, _certificatePassword);
|
||||
File.WriteAllBytes(outputPath, pfxBytes);
|
||||
|
||||
CrestronConsole.PrintLine(string.Format("CreateCert: Certificate written to {0}", outputPath));
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
@ -231,66 +191,26 @@ namespace PepperDash.Core
|
|||
{
|
||||
Debug.LogInformation("Starting Websocket Server on port: {0}", port);
|
||||
|
||||
|
||||
|
||||
|
||||
Start(port, CertPath, _certificatePassword);
|
||||
}
|
||||
|
||||
private static X509Certificate2 LoadOrRecreateCert(string certPath, string certPassword)
|
||||
{
|
||||
if (!File.Exists(certPath))
|
||||
CreateCert();
|
||||
|
||||
try
|
||||
{
|
||||
return LoadCertFromBouncyCastle(certPath, certPassword);
|
||||
// EphemeralKeySet is required on Linux/OpenSSL (Crestron 4-series) to avoid
|
||||
// key-container persistence failures, and avoids the private key export restriction.
|
||||
return new X509Certificate2(certPath, certPassword, X509KeyStorageFlags.EphemeralKeySet);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Cert is corrupt or was written by an incompatible tool — delete and regenerate once.
|
||||
// Cert is stale or was generated by an incompatible library (e.g. old BouncyCastle output).
|
||||
// Delete it, regenerate with the BCL path, and retry once.
|
||||
CrestronConsole.PrintLine(string.Format("SSL cert load failed ({0}); regenerating...", ex.Message));
|
||||
try { File.Delete(certPath); } catch { }
|
||||
CreateCert();
|
||||
return LoadCertFromBouncyCastle(certPath, certPassword);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads a PKCS#12 file written by BouncyCastle and returns an <see cref="X509Certificate2"/> with
|
||||
/// private key attached.
|
||||
/// The PFX is parsed and re-encoded by BouncyCastle (ensuring format compatibility), then passed as
|
||||
/// raw bytes to <see cref="X509Certificate2"/> so neither <c>RSACryptoServiceProvider</c> nor the
|
||||
/// <c>EphemeralKeySet</c> flag (unsupported on the Crestron/Mono runtime) is needed.
|
||||
/// </summary>
|
||||
private static X509Certificate2 LoadCertFromBouncyCastle(string certPath, string certPassword)
|
||||
{
|
||||
var passwordChars = certPassword.ToCharArray();
|
||||
try
|
||||
{
|
||||
using (var stream = File.OpenRead(certPath))
|
||||
{
|
||||
var store = new Pkcs12StoreBuilder().Build();
|
||||
store.Load(stream, passwordChars);
|
||||
|
||||
// Re-encode through BouncyCastle to guarantee PKCS#12 format compatibility,
|
||||
// then hand raw bytes to X509Certificate2 — no RSACryptoServiceProvider needed.
|
||||
using (var ms = new MemoryStream())
|
||||
{
|
||||
store.Save(ms, passwordChars, new SecureRandom());
|
||||
var cert = new X509Certificate2(ms.ToArray(), certPassword);
|
||||
|
||||
if (!cert.HasPrivateKey)
|
||||
throw new InvalidOperationException(
|
||||
string.Format("Certificate loaded from '{0}' does not contain a private key and cannot be used as a server certificate.", certPath));
|
||||
|
||||
return cert;
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
Array.Clear(passwordChars, 0, passwordChars.Length);
|
||||
return new X509Certificate2(certPath, certPassword, X509KeyStorageFlags.EphemeralKeySet);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using Crestron.SimplSharp; // For Basic SIMPL# Classes
|
||||
using Crestron.SimplSharp; // For Basic SIMPL# Classes
|
||||
using Crestron.SimplSharp.CrestronIO;
|
||||
using Crestron.SimplSharp.Net.Http;
|
||||
using Crestron.SimplSharp.Net.Https;
|
||||
|
|
@ -10,25 +10,24 @@ using PepperDash.Core.JsonToSimpl;
|
|||
|
||||
namespace PepperDash.Core.WebApi.Presets
|
||||
{
|
||||
/// <summary>
|
||||
/// Passcode client for the WebApi
|
||||
/// </summary>
|
||||
[Obsolete("WebApiPasscodeClient is no longer supported and will be removed in a future release.")]
|
||||
/// <summary>
|
||||
/// Passcode client for the WebApi
|
||||
/// </summary>
|
||||
public class WebApiPasscodeClient : IKeyed
|
||||
{
|
||||
/// <summary>
|
||||
/// Notifies when user received
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// Notifies when user received
|
||||
/// </summary>
|
||||
public event EventHandler<UserReceivedEventArgs> UserReceived;
|
||||
|
||||
/// <summary>
|
||||
/// Notifies when Preset received
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// Notifies when Preset received
|
||||
/// </summary>
|
||||
public event EventHandler<PresetReceivedEventArgs> PresetReceived;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the Key
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// Gets or sets the Key
|
||||
/// </summary>
|
||||
public string Key { get; private set; }
|
||||
|
||||
//string JsonMasterKey;
|
||||
|
|
@ -55,13 +54,13 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes the instance
|
||||
/// </summary>
|
||||
/// <param name="key"></param>
|
||||
/// <param name="jsonMasterKey"></param>
|
||||
/// <param name="urlBase"></param>
|
||||
/// <param name="defaultPresetJsonFilePath"></param>
|
||||
/// <summary>
|
||||
/// Initializes the instance
|
||||
/// </summary>
|
||||
/// <param name="key"></param>
|
||||
/// <param name="jsonMasterKey"></param>
|
||||
/// <param name="urlBase"></param>
|
||||
/// <param name="defaultPresetJsonFilePath"></param>
|
||||
public void Initialize(string key, string jsonMasterKey, string urlBase, string defaultPresetJsonFilePath)
|
||||
{
|
||||
Key = key;
|
||||
|
|
@ -74,44 +73,44 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
J2SMaster.Initialize(jsonMasterKey);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the user for a passcode
|
||||
/// </summary>
|
||||
/// <param name="passcode"></param>
|
||||
/// <summary>
|
||||
/// GetUserForPasscode method
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// Gets the user for a passcode
|
||||
/// </summary>
|
||||
/// <param name="passcode"></param>
|
||||
/// <summary>
|
||||
/// GetUserForPasscode method
|
||||
/// </summary>
|
||||
public void GetUserForPasscode(string passcode)
|
||||
{
|
||||
// Bullshit duplicate code here... These two cases should be the same
|
||||
// except for https/http and the certificate ignores
|
||||
if (!UrlBase.StartsWith("https"))
|
||||
return;
|
||||
var req = new HttpsClientRequest();
|
||||
req.Url = new UrlParser(UrlBase + "/api/users/dopin");
|
||||
req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
|
||||
req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
|
||||
req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
|
||||
var jo = new JObject();
|
||||
jo.Add("pin", passcode);
|
||||
req.ContentString = jo.ToString();
|
||||
// Bullshit duplicate code here... These two cases should be the same
|
||||
// except for https/http and the certificate ignores
|
||||
if (!UrlBase.StartsWith("https"))
|
||||
return;
|
||||
var req = new HttpsClientRequest();
|
||||
req.Url = new UrlParser(UrlBase + "/api/users/dopin");
|
||||
req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
|
||||
req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
|
||||
req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
|
||||
var jo = new JObject();
|
||||
jo.Add("pin", passcode);
|
||||
req.ContentString = jo.ToString();
|
||||
|
||||
var client = new HttpsClient();
|
||||
client.HostVerification = false;
|
||||
client.PeerVerification = false;
|
||||
var resp = client.Dispatch(req);
|
||||
var handler = UserReceived;
|
||||
if (resp.Code == 200)
|
||||
{
|
||||
//CrestronConsole.PrintLine("Received: {0}", resp.ContentString);
|
||||
var user = JsonConvert.DeserializeObject<User>(resp.ContentString);
|
||||
CurrentUser = user;
|
||||
if (handler != null)
|
||||
handler(this, new UserReceivedEventArgs(user, true));
|
||||
}
|
||||
else
|
||||
if (handler != null)
|
||||
handler(this, new UserReceivedEventArgs(null, false));
|
||||
var client = new HttpsClient();
|
||||
client.HostVerification = false;
|
||||
client.PeerVerification = false;
|
||||
var resp = client.Dispatch(req);
|
||||
var handler = UserReceived;
|
||||
if (resp.Code == 200)
|
||||
{
|
||||
//CrestronConsole.PrintLine("Received: {0}", resp.ContentString);
|
||||
var user = JsonConvert.DeserializeObject<User>(resp.ContentString);
|
||||
CurrentUser = user;
|
||||
if (handler != null)
|
||||
UserReceived(this, new UserReceivedEventArgs(user, true));
|
||||
}
|
||||
else
|
||||
if (handler != null)
|
||||
UserReceived(this, new UserReceivedEventArgs(null, false));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -119,9 +118,9 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
/// </summary>
|
||||
/// <param name="roomTypeId"></param>
|
||||
/// <param name="presetNumber"></param>
|
||||
/// <summary>
|
||||
/// GetPresetForThisUser method
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// GetPresetForThisUser method
|
||||
/// </summary>
|
||||
public void GetPresetForThisUser(int roomTypeId, int presetNumber)
|
||||
{
|
||||
if (CurrentUser == null)
|
||||
|
|
@ -137,57 +136,57 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
PresetNumber = presetNumber
|
||||
};
|
||||
|
||||
var handler = PresetReceived;
|
||||
var handler = PresetReceived;
|
||||
try
|
||||
{
|
||||
if (!UrlBase.StartsWith("https"))
|
||||
return;
|
||||
var req = new HttpsClientRequest();
|
||||
req.Url = new UrlParser(UrlBase + "/api/presets/userandroom");
|
||||
req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
|
||||
req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
|
||||
req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
|
||||
req.ContentString = JsonConvert.SerializeObject(msg);
|
||||
if (!UrlBase.StartsWith("https"))
|
||||
return;
|
||||
var req = new HttpsClientRequest();
|
||||
req.Url = new UrlParser(UrlBase + "/api/presets/userandroom");
|
||||
req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
|
||||
req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
|
||||
req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
|
||||
req.ContentString = JsonConvert.SerializeObject(msg);
|
||||
|
||||
var client = new HttpsClient();
|
||||
client.HostVerification = false;
|
||||
client.PeerVerification = false;
|
||||
var client = new HttpsClient();
|
||||
client.HostVerification = false;
|
||||
client.PeerVerification = false;
|
||||
|
||||
// ask for the preset
|
||||
var resp = client.Dispatch(req);
|
||||
if (resp.Code == 200) // got it
|
||||
{
|
||||
//Debug.Console(1, this, "Received: {0}", resp.ContentString);
|
||||
var preset = JsonConvert.DeserializeObject<Preset>(resp.ContentString);
|
||||
CurrentPreset = preset;
|
||||
// ask for the preset
|
||||
var resp = client.Dispatch(req);
|
||||
if (resp.Code == 200) // got it
|
||||
{
|
||||
//Debug.Console(1, this, "Received: {0}", resp.ContentString);
|
||||
var preset = JsonConvert.DeserializeObject<Preset>(resp.ContentString);
|
||||
CurrentPreset = preset;
|
||||
|
||||
//if there's no preset data, load the template
|
||||
if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0)
|
||||
{
|
||||
//Debug.Console(1, this, "Loaded preset has no data. Loading default template.");
|
||||
LoadDefaultPresetData();
|
||||
return;
|
||||
}
|
||||
//if there's no preset data, load the template
|
||||
if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0)
|
||||
{
|
||||
//Debug.Console(1, this, "Loaded preset has no data. Loading default template.");
|
||||
LoadDefaultPresetData();
|
||||
return;
|
||||
}
|
||||
|
||||
J2SMaster.LoadWithJson(preset.Data);
|
||||
if (handler != null)
|
||||
handler(this, new PresetReceivedEventArgs(preset, true));
|
||||
}
|
||||
else // no existing preset
|
||||
{
|
||||
CurrentPreset = new Preset();
|
||||
LoadDefaultPresetData();
|
||||
if (handler != null)
|
||||
handler(this, new PresetReceivedEventArgs(null, false));
|
||||
}
|
||||
J2SMaster.LoadWithJson(preset.Data);
|
||||
if (handler != null)
|
||||
PresetReceived(this, new PresetReceivedEventArgs(preset, true));
|
||||
}
|
||||
else // no existing preset
|
||||
{
|
||||
CurrentPreset = new Preset();
|
||||
LoadDefaultPresetData();
|
||||
if (handler != null)
|
||||
PresetReceived(this, new PresetReceivedEventArgs(null, false));
|
||||
}
|
||||
}
|
||||
catch (HttpException e)
|
||||
{
|
||||
var resp = e.Response;
|
||||
Debug.Console(1, this, "No preset received (code {0}). Loading default template", resp.Code);
|
||||
LoadDefaultPresetData();
|
||||
if (handler != null)
|
||||
PresetReceived(this, new PresetReceivedEventArgs(null, false));
|
||||
if (handler != null)
|
||||
PresetReceived(this, new PresetReceivedEventArgs(null, false));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -219,14 +218,14 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
/// </summary>
|
||||
/// <param name="roomTypeId"></param>
|
||||
/// <param name="presetNumber"></param>
|
||||
/// <summary>
|
||||
/// SavePresetForThisUser method
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// SavePresetForThisUser method
|
||||
/// </summary>
|
||||
public void SavePresetForThisUser(int roomTypeId, int presetNumber)
|
||||
{
|
||||
if (CurrentPreset == null)
|
||||
LoadDefaultPresetData();
|
||||
//return;
|
||||
//return;
|
||||
|
||||
//// A new preset needs to have its numbers set
|
||||
//if (CurrentPreset.IsNewPreset)
|
||||
|
|
@ -246,8 +245,8 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
{
|
||||
CurrentPreset.Data = json;
|
||||
|
||||
if (!UrlBase.StartsWith("https"))
|
||||
return;
|
||||
if (!UrlBase.StartsWith("https"))
|
||||
return;
|
||||
var req = new HttpsClientRequest();
|
||||
req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
|
||||
req.Url = new UrlParser(string.Format("{0}/api/presets/addorchange", UrlBase));
|
||||
|
|
@ -256,8 +255,8 @@ namespace PepperDash.Core.WebApi.Presets
|
|||
req.ContentString = JsonConvert.SerializeObject(CurrentPreset);
|
||||
|
||||
var client = new HttpsClient();
|
||||
client.HostVerification = false;
|
||||
client.PeerVerification = false;
|
||||
client.HostVerification = false;
|
||||
client.PeerVerification = false;
|
||||
try
|
||||
{
|
||||
var resp = client.Dispatch(req);
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@ namespace PepperDash.Essentials.Core
|
|||
|
||||
ICec Port;
|
||||
|
||||
bool _cecSubscribed;
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
|
|
@ -56,7 +54,7 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
Port = postActivationFunc(config);
|
||||
|
||||
TryEnsureCecSubscription();
|
||||
Port.StreamCec.CecChange += StreamCec_CecChange;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -70,29 +68,7 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
Port = port;
|
||||
|
||||
TryEnsureCecSubscription();
|
||||
}
|
||||
|
||||
/// <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.
|
||||
/// If StreamCec is null during construction, this is retried when send methods invoke
|
||||
/// this method later.
|
||||
/// </summary>
|
||||
void TryEnsureCecSubscription()
|
||||
{
|
||||
if (_cecSubscribed)
|
||||
return;
|
||||
|
||||
if (Port?.StreamCec == null)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Warning, this, "StreamCec is not available; CEC feedback is deferred until the device is ready");
|
||||
return;
|
||||
}
|
||||
|
||||
Port.StreamCec.CecChange += new CecChangeEventHandler(StreamCec_CecChange);
|
||||
_cecSubscribed = true;
|
||||
Debug.LogMessage(LogEventLevel.Information, this, "Subscribed to CEC feedback");
|
||||
}
|
||||
|
||||
void StreamCec_CecChange(Cec cecDevice, CecEventArgs args)
|
||||
|
|
@ -128,9 +104,8 @@ namespace PepperDash.Essentials.Core
|
|||
/// </summary>
|
||||
public void SendText(string text)
|
||||
{
|
||||
if (Port?.StreamCec == null)
|
||||
if (Port == null)
|
||||
return;
|
||||
TryEnsureCecSubscription();
|
||||
this.PrintSentText(text);
|
||||
Port.StreamCec.Send.StringValue = text;
|
||||
}
|
||||
|
|
@ -140,9 +115,8 @@ namespace PepperDash.Essentials.Core
|
|||
/// </summary>
|
||||
public void SendBytes(byte[] bytes)
|
||||
{
|
||||
if (Port?.StreamCec == null)
|
||||
if (Port == null)
|
||||
return;
|
||||
TryEnsureCecSubscription();
|
||||
var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
|
||||
this.PrintSentBytes(bytes);
|
||||
Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
|
||||
|
|
|
|||
|
|
@ -96,17 +96,6 @@ namespace PepperDash.Essentials.Core
|
|||
comm = udp;
|
||||
break;
|
||||
}
|
||||
case eControlMethod.UdpClient:
|
||||
{
|
||||
var udpClient = new GenericUdpClient(deviceConfig.Key + "-udpClient", c.Address, c.Port, c.BufferSize)
|
||||
{
|
||||
AutoReconnect = c.AutoReconnect
|
||||
};
|
||||
if (udpClient.AutoReconnect)
|
||||
udpClient.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
|
||||
comm = udpClient;
|
||||
break;
|
||||
}
|
||||
case eControlMethod.Telnet:
|
||||
break;
|
||||
case eControlMethod.SecureTcpIp:
|
||||
|
|
|
|||
|
|
@ -135,14 +135,12 @@ namespace PepperDash.Essentials.Core.Config
|
|||
{
|
||||
var parsedConfig = JObject.Parse(fs.ReadToEnd());
|
||||
|
||||
// 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 (!isV1Config)
|
||||
// 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;
|
||||
|
||||
if (isV2Config)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Information, "Config file is a v2 format, no merge necessary.");
|
||||
ConfigObject = parsedConfig.ToObject<EssentialsConfig>();
|
||||
|
|
@ -150,8 +148,6 @@ 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>();
|
||||
|
||||
|
|
@ -164,13 +160,6 @@ 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");
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ namespace PepperDash.Essentials.Core.Config
|
|||
/// <summary>
|
||||
/// ConfigUpdater class
|
||||
/// </summary>
|
||||
[Obsolete("ConfigUpdater is no longer supported and will be removed in a future release.")]
|
||||
public static class ConfigUpdater
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -82,7 +81,7 @@ namespace PepperDash.Essentials.Core.Config
|
|||
{
|
||||
var handler = ConfigStatusChanged;
|
||||
|
||||
if (handler != null)
|
||||
if(handler != null)
|
||||
{
|
||||
handler(typeof(ConfigUpdater), new ConfigStatusEventArgs(status));
|
||||
}
|
||||
|
|
@ -90,7 +89,7 @@ namespace PepperDash.Essentials.Core.Config
|
|||
|
||||
static void WriteConfigToFile(string configData)
|
||||
{
|
||||
var filePath = Global.FilePathPrefix + "configurationFile-updated.json";
|
||||
var filePath = Global.FilePathPrefix+ "configurationFile-updated.json";
|
||||
|
||||
try
|
||||
{
|
||||
|
|
@ -105,7 +104,7 @@ namespace PepperDash.Essentials.Core.Config
|
|||
Debug.LogMessage(LogEventLevel.Debug, "Error parsing new config: {0}", e);
|
||||
|
||||
OnStatusUpdate(eUpdateStatus.UpdateFailed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -150,11 +149,11 @@ namespace PepperDash.Essentials.Core.Config
|
|||
// Directory exists, first clear any contents
|
||||
var archivedConfigFiles = ConfigReader.GetConfigFiles(archiveDirectoryPath + Global.DirectorySeparator + Global.ConfigFileName + ".bak");
|
||||
|
||||
if (archivedConfigFiles != null && archivedConfigFiles.Length > 0)
|
||||
if(archivedConfigFiles != null || archivedConfigFiles.Length > 0)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder. Deleting.", archivedConfigFiles.Length);
|
||||
|
||||
for (int i = 0; i < archivedConfigFiles.Length; i++)
|
||||
for (int i = 0; i < archivedConfigFiles.Length; i++ )
|
||||
{
|
||||
var file = archivedConfigFiles[i];
|
||||
Debug.LogMessage(LogEventLevel.Information, "Deleting archived file: '{0}'", file.FullName);
|
||||
|
|
@ -171,9 +170,9 @@ namespace PepperDash.Essentials.Core.Config
|
|||
|
||||
// Moves the file and appends the .bak extension
|
||||
var fileDest = archiveDirectoryPath + "/" + file.Name + ".bak";
|
||||
if (!File.Exists(fileDest))
|
||||
if(!File.Exists(fileDest))
|
||||
{
|
||||
file.MoveTo(fileDest);
|
||||
file.MoveTo(fileDest);
|
||||
}
|
||||
else
|
||||
Debug.LogMessage(LogEventLevel.Information, "Cannot move file to archive folder. Existing file already exists with same name: '{0}'", fileDest);
|
||||
|
|
@ -208,15 +207,15 @@ namespace PepperDash.Essentials.Core.Config
|
|||
|
||||
CrestronConsole.SendControlSystemCommand(string.Format("progreset -p:{0}", InitialParametersClass.ApplicationNumber), ref response);
|
||||
|
||||
Debug.LogMessage(LogEventLevel.Debug, "Console Response: {0}", response);
|
||||
Debug.LogMessage(LogEventLevel.Debug, "Console Response: {0}", response);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Enumeration of eUpdateStatus values
|
||||
/// </summary>
|
||||
public enum eUpdateStatus
|
||||
/// <summary>
|
||||
/// Enumeration of eUpdateStatus values
|
||||
/// </summary>
|
||||
public enum eUpdateStatus
|
||||
{
|
||||
/// <summary>
|
||||
/// UpdateStarted status
|
||||
|
|
|
|||
|
|
@ -105,7 +105,6 @@ namespace PepperDash.Essentials.Core.Config
|
|||
/// <summary>
|
||||
/// Gets or sets the Versions
|
||||
/// </summary>
|
||||
[JsonProperty("versions")]
|
||||
public VersionData Versions { get; set; }
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -135,25 +134,12 @@ 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>();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -171,20 +157,8 @@ namespace PepperDash.Essentials.Core.Config
|
|||
/// <summary>
|
||||
/// Gets or sets the PackageId
|
||||
/// </summary>
|
||||
[JsonProperty("packageId", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[JsonProperty("packageId")]
|
||||
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>
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines the contract for a wireless presentation endpoint that reports whether a wireless
|
||||
/// sharing session is currently active. Implemented by platforms such as Crestron AirMedia,
|
||||
/// Mersive Solstice, Barco ClickShare, Miracast/Teams receivers, etc. Allows consumers (e.g.
|
||||
/// room plugins) to react to wireless sharing activity without taking a dependency on any
|
||||
/// concrete device implementation.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// This refers specifically to wireless screen/device mirroring, as distinct from in-call
|
||||
/// content sharing on a video conference.
|
||||
/// </remarks>
|
||||
public interface IHasWirelessSharing
|
||||
{
|
||||
/// <summary>
|
||||
/// Reports whether a wireless sharing session is currently active (content is being presented).
|
||||
/// </summary>
|
||||
BoolFeedback IsSharingFeedback { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Raised when wireless sharing starts or stops. The event args carry the new sharing state.
|
||||
/// </summary>
|
||||
event EventHandler<WirelessSharingEventArgs> SharingChanged;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Event arguments describing a change in wireless sharing state.
|
||||
/// </summary>
|
||||
public class WirelessSharingEventArgs : EventArgs
|
||||
{
|
||||
/// <summary>
|
||||
/// True if a wireless sharing session is active (content is being presented), false otherwise.
|
||||
/// </summary>
|
||||
public bool IsSharing { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new <see cref="WirelessSharingEventArgs"/>.
|
||||
/// </summary>
|
||||
/// <param name="isSharing">True if a wireless sharing session is active, false otherwise.</param>
|
||||
public WirelessSharingEventArgs(bool isSharing)
|
||||
{
|
||||
IsSharing = isSharing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +1,10 @@
|
|||
using System;
|
||||
using PepperDash.Core;
|
||||
|
||||
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Obsolete: messengers are subscription based by default; use IMobileControlMessenger instead.
|
||||
/// Defines the contract for IMobileControlMessenger
|
||||
/// </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>
|
||||
|
|
|
|||
|
|
@ -1,122 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Interface for network switches that support VLAN assignment on individual ports.
|
||||
/// </summary>
|
||||
public interface INetworkSwitchVlanManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Returns the current access VLAN ID configured on the port.
|
||||
/// Return -1 when the value is unavailable (e.g. the switch has not been polled yet
|
||||
/// or the implementation does not support VLAN queries).
|
||||
/// </summary>
|
||||
/// <param name="port">Switch port identifier</param>
|
||||
/// <returns>VLAN ID or -1 when unavailable</returns>
|
||||
int GetPortCurrentVlan(string port);
|
||||
|
||||
/// <summary>
|
||||
/// Changes the access VLAN of a single switch port.
|
||||
/// The implementation is responsible for entering/exiting privileged/config mode.
|
||||
/// </summary>
|
||||
/// <param name="port">Switch port identifier (e.g. "1/0/3" for Netgear, "gi1/0/3" for Cisco)</param>
|
||||
/// <param name="vlanId">Target VLAN ID (1-4093)</param>
|
||||
void SetPortVlan(string port, uint vlanId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Interface for network switches that support Power over Ethernet (PoE) control on individual ports.
|
||||
/// </summary>
|
||||
public interface INetworkSwitchPoeManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Enables or disables PoE power delivery on a single switch port.
|
||||
/// The implementation is responsible for entering/exiting privileged/config mode.
|
||||
/// </summary>
|
||||
/// <param name="port">Switch port identifier</param>
|
||||
/// <param name="enabled">True to enable PoE; false to disable PoE</param>
|
||||
void SetPortPoeState(string port, bool enabled);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Standardized interface for network switch devices that support per-port PoE control
|
||||
/// and VLAN assignment.
|
||||
/// </summary>
|
||||
public interface INetworkSwitchPoeVlanManager : INetworkSwitchVlanManager, INetworkSwitchPoeManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Event that is raised when the state of a switch port changes, such as a VLAN change or PoE state change.
|
||||
/// </summary>
|
||||
event EventHandler<NetworkSwitchPortEventArgs> PortStateChanged;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Event arguments for port state changes on a network switch, such as VLAN changes or PoE state changes.
|
||||
/// </summary>
|
||||
public class NetworkSwitchPortEventArgs : EventArgs
|
||||
{
|
||||
/// <summary>
|
||||
/// The identifier of the port that changed state (e.g. "1/0/3" for Netgear, "gi1/0/3" for Cisco).
|
||||
/// </summary>
|
||||
public string Port { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// The type of event that occurred on the port (e.g. VLAN change, PoE enabled/disabled).
|
||||
/// </summary>
|
||||
public NetworkSwitchPortEventType EventType { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Constructor for NetworkSwitchPortEventArgs
|
||||
/// </summary>
|
||||
/// <param name="port">The identifier of the port that changed state</param>
|
||||
/// <param name="eventType">The type of event that occurred on the port</param>
|
||||
public NetworkSwitchPortEventArgs(string port, NetworkSwitchPortEventType eventType)
|
||||
{
|
||||
Port = port;
|
||||
EventType = eventType;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Enumeration of network switch port state change event types (e.g. VLAN changes or PoE state changes).
|
||||
/// </summary>
|
||||
public enum NetworkSwitchPortEventType
|
||||
{
|
||||
/// <summary>
|
||||
/// Indicates that the type of event is unknown or cannot be determined.
|
||||
/// </summary>
|
||||
Unknown,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that a VLAN change is in progress on the port, either through a call to SetPortVlan or an external change detected by polling.
|
||||
/// </summary>
|
||||
VlanChangeInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that the access VLAN on a port has changed, either through a successful call to SetPortVlan or an external change detected by polling.
|
||||
/// </summary>
|
||||
VlanChanged,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE is being disabled on the port, either through a call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoeDisableInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE has been disabled on the port, either through a successful call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoEDisabled,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE is being enabled on the port, either through a call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoeEnableInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Indicates that PoE has been enabled on the port, either through a successful call to SetPortPoeState or an external change detected by polling.
|
||||
/// </summary>
|
||||
PoEEnabled
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PepperDash.Essentials.Core
|
||||
|
|
@ -177,20 +176,7 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
if (!conversionType.IsEnum)
|
||||
{
|
||||
if (conversionType == typeof(byte[]) && value is string byteString)
|
||||
{
|
||||
var unescaped = UnescapeString(byteString);
|
||||
return System.Text.Encoding.GetEncoding(28591).GetBytes(unescaped);
|
||||
}
|
||||
|
||||
var converted = Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
|
||||
|
||||
if (conversionType == typeof(string) && converted is string s)
|
||||
{
|
||||
return UnescapeString(s);
|
||||
}
|
||||
|
||||
return converted;
|
||||
return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
var stringValue = Convert.ToString(value);
|
||||
|
|
@ -203,32 +189,6 @@ namespace PepperDash.Essentials.Core
|
|||
return Enum.Parse(conversionType, stringValue, true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Processes escape sequences in a string, converting sequences like \r, \n, \t, \xHH
|
||||
/// to their corresponding non-printable ASCII characters.
|
||||
/// </summary>
|
||||
private static string UnescapeString(string input)
|
||||
{
|
||||
if (string.IsNullOrEmpty(input))
|
||||
return input;
|
||||
|
||||
return Regex.Replace(input, @"\\(r|n|t|\\|x[0-9A-Fa-f]{2})", match =>
|
||||
{
|
||||
var seq = match.Groups[1].Value;
|
||||
switch (seq)
|
||||
{
|
||||
case "r": return "\r";
|
||||
case "n": return "\n";
|
||||
case "t": return "\t";
|
||||
case "\\": return "\\";
|
||||
default:
|
||||
// \xHH hex escape
|
||||
var hex = seq.Substring(1);
|
||||
return ((char)Convert.ToInt32(hex, 16)).ToString();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the properties on a device
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
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);
|
||||
}
|
||||
}
|
||||
|
|
@ -7,10 +7,9 @@ using PepperDash.Core;
|
|||
|
||||
namespace PepperDash.Essentials.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines the contract for ILogStrings
|
||||
/// </summary>
|
||||
[Obsolete("ILogStrings is no longer supported and will be removed in a future release.")]
|
||||
/// <summary>
|
||||
/// Defines the contract for ILogStrings
|
||||
/// </summary>
|
||||
public interface ILogStrings : IKeyed
|
||||
{
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -7,16 +7,15 @@ using PepperDash.Core;
|
|||
|
||||
namespace PepperDash.Essentials.Core.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines the contract for ILogStringsWithLevel
|
||||
/// </summary>
|
||||
[Obsolete("ILogStringsWithLevel is no longer supported and will be removed in a future release.")]
|
||||
/// <summary>
|
||||
/// Defines the contract for ILogStringsWithLevel
|
||||
/// </summary>
|
||||
public interface ILogStringsWithLevel : IKeyed
|
||||
{
|
||||
/// <summary>
|
||||
/// Defines a class that is capable of logging a string with an int level
|
||||
/// </summary>
|
||||
void SendToLog(IKeyed device, Debug.ErrorLogLevel level, string logMessage);
|
||||
void SendToLog(IKeyed device, Debug.ErrorLogLevel level,string logMessage);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
|
|
@ -51,6 +52,13 @@ namespace PepperDash.Essentials.Core
|
|||
/// </summary>
|
||||
private static Dictionary<string, List<TieLine>> _tieLinesBySource;
|
||||
|
||||
/// <summary>
|
||||
/// Cache of failed route attempts to avoid re-checking impossible paths.
|
||||
/// Format: "sourceKey|destKey|signalType"
|
||||
/// Uses ConcurrentDictionary as a thread-safe set (byte value is unused).
|
||||
/// </summary>
|
||||
private static readonly ConcurrentDictionary<string, byte> _impossibleRoutes = new ConcurrentDictionary<string, byte>();
|
||||
|
||||
/// <summary>
|
||||
/// Indexes all TieLines by source and destination device keys for faster lookups.
|
||||
/// Should be called once at system startup after all TieLines are created.
|
||||
|
|
@ -113,6 +121,29 @@ namespace PepperDash.Essentials.Core
|
|||
return TieLineCollection.Default.Where(t => t.SourcePort.ParentDevice.Key == sourceKey);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a cache key for route impossibility tracking.
|
||||
/// </summary>
|
||||
/// <param name="sourceKey">Source device key</param>
|
||||
/// <param name="destKey">Destination device key</param>
|
||||
/// <param name="sourcePortKey">Source port key</param>
|
||||
/// <param name="destinationPortKey">Destination port key</param>
|
||||
/// <param name="type">Signal type</param>
|
||||
/// <returns>Cache key string</returns>
|
||||
private static string GetRouteKey(string sourceKey, string destKey, string sourcePortKey, string destinationPortKey, eRoutingSignalType type)
|
||||
{
|
||||
return $"{sourceKey}|{destKey}|{sourcePortKey}|{destinationPortKey}|{type}";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clears the impossible routes cache. Should be called if TieLines are added/removed at runtime.
|
||||
/// </summary>
|
||||
public static void ClearImpossibleRoutesCache()
|
||||
{
|
||||
_impossibleRoutes.Clear();
|
||||
Debug.LogInformation("Impossible routes cache cleared");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets any existing RouteDescriptor for a destination, clears it using ReleaseRoute
|
||||
/// and then attempts a new Route and if sucessful, stores that RouteDescriptor
|
||||
|
|
@ -218,7 +249,7 @@ namespace PepperDash.Essentials.Core
|
|||
}
|
||||
// otherwise, audioVideo needs to be handled as two steps.
|
||||
|
||||
Debug.LogDebug(destination, "Attempting to build source route from {destinationKey} to {sourceKey} of type {type}", destination.Key, source.Key, signalType);
|
||||
Debug.LogDebug(destination, "Attempting to build source route from {destinationKey} to {sourceKey} of type {type}", source.Key, signalType);
|
||||
|
||||
RouteDescriptor audioRouteDescriptor;
|
||||
|
||||
|
|
@ -343,10 +374,8 @@ namespace PepperDash.Essentials.Core
|
|||
IndexTieLines();
|
||||
}
|
||||
|
||||
var sinks = DeviceManager.AllDevices.OfType<IRoutingInputs>()
|
||||
.Where(d => !(d is IRoutingInputsOutputs)).ToList();
|
||||
var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>()
|
||||
.Where(d => !(d is IRoutingInputsOutputs)).ToList();
|
||||
var sinks = DeviceManager.AllDevices.OfType<IRoutingInputs>().Where(d => !(d is IRoutingInputsOutputs));
|
||||
var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>().Where(d => !(d is IRoutingInputsOutputs));
|
||||
|
||||
foreach (var sink in sinks)
|
||||
{
|
||||
|
|
@ -356,17 +385,13 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
foreach (var outputPort in source.OutputPorts)
|
||||
{
|
||||
var (audioOrSingleRoute, videoRoute) = sink.GetRouteToSource(source, outputPort.Type, inputPort, outputPort);
|
||||
var (audioOrSingleRoute, videoRoute) = sink.GetRouteToSource(source, inputPort.Type, inputPort, outputPort);
|
||||
|
||||
if (audioOrSingleRoute == null && videoRoute == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
Debug.LogVerbose("AudioOrSingleRoute Found: {audioRoute}", audioOrSingleRoute);
|
||||
|
||||
Debug.LogVerbose("VideoRoute Found: {videoRoute}", videoRoute);
|
||||
|
||||
if (audioOrSingleRoute != null)
|
||||
{
|
||||
// Only add routes that have actual switching steps
|
||||
|
|
@ -375,10 +400,6 @@ namespace PepperDash.Essentials.Core
|
|||
continue;
|
||||
}
|
||||
|
||||
Debug.LogVerbose("Route mapped: {source} -> {sink} via {input}/{output}, type {type}",
|
||||
source.Key, sink.Key,
|
||||
inputPort.Key, outputPort.Key, audioOrSingleRoute.SignalType);
|
||||
|
||||
// Add to the appropriate collection(s) based on signal type
|
||||
// Note: A single route descriptor with combined flags (e.g., AudioVideo) will be added once per matching signal type
|
||||
if (audioOrSingleRoute.SignalType.HasFlag(eRoutingSignalType.Audio))
|
||||
|
|
@ -410,10 +431,6 @@ namespace PepperDash.Essentials.Core
|
|||
continue;
|
||||
}
|
||||
|
||||
Debug.LogVerbose("Video route mapped: {source} -> {sink} via {input}/{output}",
|
||||
source.Key, sink.Key,
|
||||
inputPort.Key, outputPort.Key);
|
||||
|
||||
RouteDescriptors[eRoutingSignalType.Video].AddRouteDescriptor(videoRoute);
|
||||
}
|
||||
}
|
||||
|
|
@ -567,6 +584,14 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
cycle++;
|
||||
|
||||
// Check if this route has already been determined to be impossible
|
||||
var routeKey = GetRouteKey(source.Key, destination.Key, sourcePort?.Key ?? "auto", destinationPort?.Key ?? "auto", signalType);
|
||||
if (_impossibleRoutes.ContainsKey(routeKey))
|
||||
{
|
||||
Debug.LogVerbose("Route {0} is cached as impossible, skipping", routeKey);
|
||||
return false;
|
||||
}
|
||||
|
||||
Debug.LogVerbose("GetRouteToSource: {cycle} {sourceKey}:{sourcePortKey}--> {destinationKey}:{destinationPortKey} {type}", null, cycle, source.Key, sourcePort?.Key ?? "auto", destination.Key, destinationPort?.Key ?? "auto", signalType.ToString());
|
||||
|
||||
RoutingInputPort goodInputPort = null;
|
||||
|
|
@ -619,12 +644,8 @@ namespace PepperDash.Essentials.Core
|
|||
|
||||
// No direct tie? Run back out on the inputs' attached devices...
|
||||
// Only the ones that are routing devices
|
||||
var midpointTieLines = destinationTieLines
|
||||
.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs)
|
||||
.ToList();
|
||||
var midpointTieLines = destinationTieLines.Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs);
|
||||
|
||||
Debug.LogVerbose(destination, "Found {tieLineCount} tie lines to walk for {destinationKey}", midpointTieLines.Count, destination.Key);
|
||||
|
||||
//Create a list for tracking already checked devices to avoid loops, if it doesn't already exist from previous iteration
|
||||
if (alreadyCheckedDevices == null)
|
||||
alreadyCheckedDevices = new List<IRoutingInputsOutputs>();
|
||||
|
|
@ -664,7 +685,10 @@ namespace PepperDash.Essentials.Core
|
|||
|
||||
if (goodInputPort == null)
|
||||
{
|
||||
Debug.LogVerbose(destination, "No route found to {0} from destination {1} for type {2}", source.Key, destination.Key, signalType);
|
||||
Debug.LogVerbose(destination, "No route found to {0}", source.Key);
|
||||
|
||||
// Cache this as an impossible route
|
||||
_impossibleRoutes.TryAdd(routeKey, 0);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,9 +66,6 @@ namespace PepperDash.Essentials.Core.Routing
|
|||
|
||||
foreach (var midpointKey in upstreamMidpoints)
|
||||
{
|
||||
if (string.IsNullOrEmpty(midpointKey))
|
||||
continue;
|
||||
|
||||
if (!midpointToSinksMap.ContainsKey(midpointKey))
|
||||
midpointToSinksMap[midpointKey] = new HashSet<string>();
|
||||
|
||||
|
|
@ -118,8 +115,7 @@ namespace PepperDash.Essentials.Core.Routing
|
|||
|
||||
if (tieLine.SourcePort.ParentDevice is IRoutingWithFeedback midpoint)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(midpoint.Key))
|
||||
midpoints.Add(midpoint.Key);
|
||||
midpoints.Add(midpoint.Key);
|
||||
|
||||
// Find upstream TieLines connected to this midpoint's inputs
|
||||
var midpointInputs = (midpoint as IRoutingInputs)?.InputPorts;
|
||||
|
|
@ -248,9 +244,6 @@ namespace PepperDash.Essentials.Core.Routing
|
|||
var upstreamMidpoints = GetUpstreamMidpoints(sink);
|
||||
foreach (var midpointKey in upstreamMidpoints)
|
||||
{
|
||||
if (string.IsNullOrEmpty(midpointKey))
|
||||
continue;
|
||||
|
||||
if (!midpointToSinksMap.ContainsKey(midpointKey))
|
||||
midpointToSinksMap[midpointKey] = new HashSet<string>();
|
||||
|
||||
|
|
|
|||
|
|
@ -27,19 +27,16 @@ namespace PepperDash.Essentials.Core
|
|||
/// <summary>
|
||||
/// Control signal type
|
||||
/// </summary>
|
||||
[Obsolete("UsbOutput is no longer supported and will be removed in a future release.")]
|
||||
UsbOutput = 8,
|
||||
|
||||
/// <summary>
|
||||
/// Control signal type
|
||||
/// </summary>
|
||||
[Obsolete("UsbInput is no longer supported and will be removed in a future release.")]
|
||||
UsbInput = 16,
|
||||
|
||||
/// <summary>
|
||||
/// Secondary audio signal type
|
||||
/// </summary>
|
||||
[Obsolete("SecondaryAudio is no longer supported and will be removed in a future release.")]
|
||||
SecondaryAudio = 32
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using Crestron.SimplSharp;
|
||||
using PepperDash.Core;
|
||||
using PepperDash.Core.Logging;
|
||||
using Serilog.Events;
|
||||
|
||||
namespace PepperDash.Essentials.Core
|
||||
|
|
@ -297,14 +296,19 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
var secretPresent = provider.TestSecret(key);
|
||||
|
||||
provider.LogVerbose("SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
|
||||
Debug.LogMessage(LogEventLevel.Verbose, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
|
||||
|
||||
if (!secretPresent)
|
||||
return
|
||||
$"Unable to update secret for {provider.Key}:{key} - Please use the 'SetSecret' command to modify it";
|
||||
String.Format(
|
||||
"Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to modify it");
|
||||
var response = provider.SetSecret(key, secret)
|
||||
? $"Secret successfully set for {provider.Key}:{key}"
|
||||
: $"Unable to set secret for {provider.Key}:{key}";
|
||||
? String.Format(
|
||||
"Secret successfully set for {0}:{1}",
|
||||
provider.Key, key)
|
||||
: String.Format(
|
||||
"Unable to set secret for {0}:{1}",
|
||||
provider.Key, key);
|
||||
return response;
|
||||
}
|
||||
|
||||
|
|
@ -312,14 +316,19 @@ namespace PepperDash.Essentials.Core
|
|||
{
|
||||
var secretPresent = provider.TestSecret(key);
|
||||
|
||||
provider.LogVerbose("SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
|
||||
Debug.LogMessage(LogEventLevel.Verbose, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
|
||||
|
||||
if (secretPresent)
|
||||
return
|
||||
$"Unable to set secret for {provider.Key}:{key} - Please use the 'UpdateSecret' command to modify it";
|
||||
String.Format(
|
||||
"Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
|
||||
var response = provider.SetSecret(key, secret)
|
||||
? $"Secret successfully set for {provider.Key}:{key}"
|
||||
: $"Unable to set secret for {provider.Key}:{key}";
|
||||
? String.Format(
|
||||
"Secret successfully set for {0}:{1}",
|
||||
provider.Key, key)
|
||||
: String.Format(
|
||||
"Unable to set secret for {0}:{1}",
|
||||
provider.Key, key);
|
||||
return response;
|
||||
|
||||
}
|
||||
|
|
@ -368,10 +377,15 @@ namespace PepperDash.Essentials.Core
|
|||
|
||||
var key = args[1];
|
||||
|
||||
|
||||
provider.SetSecret(key, "");
|
||||
response = provider.SetSecret(key, "")
|
||||
? $"Secret successfully deleted for {provider.Key}:{key}"
|
||||
: $"Unable to delete secret for {provider.Key}:{key}";
|
||||
? String.Format(
|
||||
"Secret successfully deleted for {0}:{1}",
|
||||
provider.Key, key)
|
||||
: String.Format(
|
||||
"Unable to delete secret for {0}:{1}",
|
||||
provider.Key, key);
|
||||
CrestronConsole.ConsoleCommandResponse(response);
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ namespace PepperDash.Essentials.Core.Web
|
|||
private readonly WebApiServer _debugServer;
|
||||
|
||||
|
||||
|
||||
|
||||
///<example>
|
||||
/// http(s)://{ipaddress}/cws/{basePath}
|
||||
/// http(s)://{ipaddress}/VirtualControl/Rooms/{roomId}/cws/{basePath}
|
||||
|
|
@ -95,11 +93,6 @@ namespace PepperDash.Essentials.Core.Web
|
|||
Name = "ReportVersions",
|
||||
RouteHandler = new ReportVersionsRequestHandler()
|
||||
},
|
||||
new HttpCwsRoute("packageManifest")
|
||||
{
|
||||
Name = "GetPackageManifest",
|
||||
RouteHandler = new GetPackageManifestRequestHandler()
|
||||
},
|
||||
new HttpCwsRoute("appdebug")
|
||||
{
|
||||
Name = "AppDebug",
|
||||
|
|
@ -267,7 +260,7 @@ namespace PepperDash.Essentials.Core.Web
|
|||
|
||||
_server.Start();
|
||||
_debugServer.Start();
|
||||
|
||||
|
||||
GetPaths();
|
||||
}
|
||||
|
||||
|
|
@ -308,15 +301,7 @@ namespace PepperDash.Essentials.Core.Web
|
|||
{
|
||||
Debug.LogMessage(LogEventLevel.Information, this, "{routeName:l}: {routePath:l}/{routeUrl:l}", route.Name, path, route.Url);
|
||||
}
|
||||
Debug.LogInformation(this, "Web API initialized and ready to accept requests");
|
||||
|
||||
Debug.LogMessage(LogEventLevel.Information, this, new string('-', 50));
|
||||
|
||||
var debugAppUrl = CrestronEnvironment.DevicePlatform == eDevicePlatform.Server
|
||||
? $"https://{hostname}/VirtualControl/Rooms/{InitialParametersClass.RoomId}/cws/debug"
|
||||
: $"https://{currentIp}/cws/debug";
|
||||
|
||||
Debug.LogMessage(LogEventLevel.Information, this, "Developer Tools Web App available at: {debugAppUrl:l}", debugAppUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -17,10 +17,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
|||
/// Represents a DebugSessionRequestHandler
|
||||
/// </summary>
|
||||
public class DebugSessionRequestHandler : WebApiBaseRequestHandler
|
||||
{
|
||||
private CTimer _portForwardTimeoutTimer;
|
||||
private readonly object _timerLock = new object();
|
||||
|
||||
{
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
|
|
@ -51,7 +48,6 @@ 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)
|
||||
{
|
||||
|
|
@ -63,50 +59,14 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
|||
Debug.SetWebSocketMinimumDebugLevel(Serilog.Events.LogEventLevel.Verbose);
|
||||
}
|
||||
|
||||
// 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 result = CrestronEthernetHelper.AddPortForwarding(
|
||||
(ushort)port, (ushort)port, csIp,
|
||||
CrestronEthernetHelper.ePortMapTransport.TCP);
|
||||
|
||||
if (result != CrestronEthernetHelper.PortForwardingUserPatRetCodes.NoErr)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Warning, "Error adding port forwarding for debug websocket: {0}", result);
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
var url = Debug.WebsocketSink.Url;
|
||||
|
||||
var data = new
|
||||
object data = new
|
||||
{
|
||||
url = Debug.WebsocketSink.Url,
|
||||
fallbackUrl = csIp != null ? url.Replace(csIp, ip) : null
|
||||
url = Debug.WebsocketSink.Url
|
||||
};
|
||||
|
||||
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);
|
||||
|
|
@ -130,49 +90,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();
|
||||
|
||||
// Remove the port forwarding entry
|
||||
try
|
||||
{
|
||||
var csAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(
|
||||
EthernetAdapterType.EthernetCSAdapter);
|
||||
var csIp = CrestronEthernetHelper.GetEthernetParameter(
|
||||
CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId);
|
||||
|
||||
if (port <= 0)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Debug, "Debug websocket port is not set; skipping port forwarding removal");
|
||||
}
|
||||
else
|
||||
{
|
||||
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)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Debug, "This processor does not have a CS LAN adapter; skipping port forwarding removal");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Warning, "Error removing debug websocket port forwarding: {0}", ex.Message);
|
||||
}
|
||||
|
||||
context.Response.StatusCode = 200;
|
||||
context.Response.StatusDescription = "OK";
|
||||
context.Response.End();
|
||||
|
|
@ -180,55 +99,5 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Linq;
|
||||
using Crestron.SimplSharp.WebScripting;
|
||||
using Newtonsoft.Json;
|
||||
using PepperDash.Core.Web.RequestHandlers;
|
||||
|
||||
namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a GetFeedbacksForDeviceRequestHandler
|
||||
/// </summary>
|
||||
/// <summary>
|
||||
/// Represents a GetFeedbacksForDeviceRequestHandler
|
||||
/// </summary>
|
||||
public class GetFeedbacksForDeviceRequestHandler : WebApiBaseRequestHandler
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -77,7 +76,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
|||
Value = feedback.IntValue
|
||||
};
|
||||
|
||||
var stringFeedback =
|
||||
var stringFeedback =
|
||||
from feedback in device.Feedbacks.OfType<StringFeedback>()
|
||||
where !string.IsNullOrEmpty(feedback.Key)
|
||||
select new
|
||||
|
|
|
|||
|
|
@ -1,259 +0,0 @@
|
|||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Crestron.SimplSharp.CrestronAuthentication;
|
||||
using Crestron.SimplSharp.WebScripting;
|
||||
using Newtonsoft.Json;
|
||||
|
|
@ -92,19 +91,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
|||
context.Response.StatusDescription = "OK";
|
||||
context.Response.ContentType = "application/json";
|
||||
context.Response.ContentEncoding = System.Text.Encoding.UTF8;
|
||||
context.Response.Write(JsonConvert.SerializeObject(
|
||||
new
|
||||
{
|
||||
Token = new LoginResponse
|
||||
{
|
||||
UserName = token.UserName,
|
||||
Access = token.Access,
|
||||
State = token.State,
|
||||
Groups = token.Groups,
|
||||
ADConnect = token.ADConnect,
|
||||
Valid = token.Valid
|
||||
}
|
||||
}, Formatting.Indented), false);
|
||||
context.Response.Write(JsonConvert.SerializeObject(new { Token = token }, Formatting.Indented), false);
|
||||
context.Response.End();
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
|
|
@ -134,40 +121,4 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
|
|||
/// </summary>
|
||||
public string Password { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Represents a LoginResponse
|
||||
/// </summary>
|
||||
internal class LoginResponse
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the username.
|
||||
/// </summary>
|
||||
public string UserName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the access level.
|
||||
/// </summary>
|
||||
public Authentication.UserAuthenticationLevelEnum Access { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the token authenticated state.
|
||||
/// </summary>
|
||||
public Authentication.eTokenAuthenticatedState State { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the list of groups.
|
||||
/// </summary>
|
||||
public List<string> Groups { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the active directory connection flag.
|
||||
/// </summary>
|
||||
public int ADConnect { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the valid flag indicating whether the token is valid.
|
||||
/// </summary>
|
||||
public bool Valid { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -17,8 +17,6 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
|
|||
/// <summary>
|
||||
/// Represents a CameraVisca
|
||||
/// </summary>
|
||||
[Obsolete("CameraVisca is no longer supported and will be removed in a future release. Use the CameraVisca plugin instead.")]
|
||||
|
||||
public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IHasPowerControlWithFeedback, IBridgeAdvanced, IHasCameraFocusControl, IHasAutoFocusMode
|
||||
{
|
||||
private readonly CameraViscaPropertiesConfig PropertiesConfig;
|
||||
|
|
|
|||
|
|
@ -152,15 +152,6 @@ namespace PepperDash.Essentials.Devices.Common.Shades
|
|||
|
||||
private void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
|
||||
{
|
||||
if (Config.DisableAutoRaiseOnPowerOff)
|
||||
{
|
||||
this.LogDebug(
|
||||
"Auto-raise on power-off disabled for {type}; leaving position unchanged (manual control only)",
|
||||
Type
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
!DisplayDevice.IsCoolingDownFeedback.BoolValue
|
||||
&& Type == eScreenLiftControlType.lift
|
||||
|
|
@ -183,15 +174,6 @@ namespace PepperDash.Essentials.Devices.Common.Shades
|
|||
{
|
||||
if (DisplayDevice.IsWarmingUpFeedback.BoolValue)
|
||||
{
|
||||
if (Config.DisableAutoLowerOnPowerOn)
|
||||
{
|
||||
this.LogDebug(
|
||||
"Auto-lower on power-on disabled for {type}; leaving position unchanged (manual control only)",
|
||||
Type
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
Lower();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,23 +41,5 @@ namespace PepperDash.Essentials.Devices.Common.Shades
|
|||
/// </summary>
|
||||
[JsonProperty("muteOnScreenUp")]
|
||||
public bool MuteOnScreenUp { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When true, this controller does NOT automatically lower when its assigned display powers on
|
||||
/// (warms up). Manual Raise/Lower still work, and the power-off auto-raise is unaffected. Intended
|
||||
/// for a projector screen that must not auto-drop in a public space for safety, while the projector
|
||||
/// lift (a separate controller) can still drop automatically.
|
||||
/// </summary>
|
||||
[JsonProperty("disableAutoLowerOnPowerOn")]
|
||||
public bool DisableAutoLowerOnPowerOn { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// When true, this controller does NOT automatically raise when its assigned display powers off
|
||||
/// (cools down). Manual Raise/Lower still work, and the power-on auto-lower is unaffected. The
|
||||
/// companion to <see cref="DisableAutoLowerOnPowerOn"/>; together they make a controller fully
|
||||
/// manual while leaving other controllers (e.g. the lift) on their default automatic behavior.
|
||||
/// </summary>
|
||||
[JsonProperty("disableAutoRaiseOnPowerOff")]
|
||||
public bool DisableAutoRaiseOnPowerOff { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -21,7 +21,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
|
|||
/// <summary>
|
||||
/// Represents a MockVC
|
||||
/// </summary>
|
||||
public class MockVC : VideoCodecBase, IRoutingSource, IHasCallHistory, IHasScheduleAwareness, IHasCallFavorites, IHasDirectory, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets, IRoutingInputs
|
||||
public class MockVC : VideoCodecBase, IRoutingSource, IHasCallHistory, IHasScheduleAwareness, IHasCallFavorites, IHasDirectory, IHasCodecCameras, IHasCameraAutoMode, IHasCodecRoomPresets
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the PropertiesConfig
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
|
|||
/// <summary>
|
||||
/// Base class for video codec devices
|
||||
/// </summary>
|
||||
public abstract class VideoCodecBase : ReconfigurableDevice,
|
||||
public abstract class VideoCodecBase : ReconfigurableDevice, IRoutingInputsOutputs,
|
||||
IUsageTracking, IHasDialer, IHasContentSharing, ICodecAudio, iVideoCodecInfo, IBridgeAdvanced, IHasStandbyMode
|
||||
{
|
||||
private const int XSigEncoding = 28591;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
/// <summary>
|
||||
/// The device key
|
||||
/// </summary>
|
||||
[JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[JsonProperty("key")]
|
||||
/// <summary>
|
||||
/// Gets or sets the Key
|
||||
/// </summary>
|
||||
|
|
@ -19,19 +19,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
/// <summary>
|
||||
/// The device name
|
||||
/// </summary>
|
||||
[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[JsonProperty("name")]
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The type of the message class
|
||||
/// </summary>
|
||||
[JsonProperty("messageType", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[JsonProperty("messageType")]
|
||||
public string MessageType => GetType().Name;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the MessageBasePath
|
||||
/// </summary>
|
||||
[JsonProperty("messageBasePath", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[JsonProperty("messageBasePath")]
|
||||
|
||||
public string MessageBasePath { get; set; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
|
|
@ -12,15 +11,13 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
/// <summary>
|
||||
/// The interfaces implmented by the device sending the messsage
|
||||
/// </summary>
|
||||
[JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)]
|
||||
[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")]
|
||||
[JsonProperty("interfaces")]
|
||||
public List<string> Interfaces { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Sets the interfaces implemented by the device sending the message
|
||||
/// </summary>
|
||||
/// <param name="interfaces"></param>
|
||||
[Obsolete("SetInterfaces 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")]
|
||||
public void SetInterfaces(List<string> interfaces)
|
||||
{
|
||||
Interfaces = interfaces;
|
||||
|
|
|
|||
|
|
@ -264,9 +264,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
|
|||
|
||||
message.Name = _device.Name;
|
||||
|
||||
message.MessageBasePath = MessagePath;
|
||||
|
||||
|
||||
var token = JToken.FromObject(message);
|
||||
|
||||
PostStatusMessage(token, MessagePath, clientId);
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Converters;
|
||||
|
||||
|
|
@ -41,10 +40,9 @@ namespace PepperDash.Essentials
|
|||
public bool EnableApiServer { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Enables subscriptions for messengers
|
||||
/// Enable 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; }
|
||||
}
|
||||
|
||||
|
|
@ -290,4 +288,4 @@ namespace PepperDash.Essentials
|
|||
/// </summary>
|
||||
NEO
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -69,32 +69,11 @@ 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>
|
||||
|
|
@ -158,7 +137,7 @@ namespace PepperDash.Essentials
|
|||
"No system_url value defined in config. Checking for value from SIMPL Bridge."
|
||||
);
|
||||
|
||||
if (string.IsNullOrEmpty(SystemUrl))
|
||||
if (!string.IsNullOrEmpty(SystemUrl))
|
||||
{
|
||||
this.LogError(
|
||||
"No system_url value defined in config or SIMPL Bridge. Unable to connect to Mobile Control."
|
||||
|
|
@ -1803,28 +1782,6 @@ 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>
|
||||
|
|
@ -2224,8 +2181,6 @@ 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
|
||||
|
|
@ -2297,50 +2252,6 @@ 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)
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 updatedUrl = Regex.Replace(url, @"^(https?)://[^:/]+", $"$1://{ip}");
|
||||
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}");
|
||||
|
||||
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)}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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=",
|
||||
HttpScheme,
|
||||
return string.Format("http://{0}:{1}{2}?token=",
|
||||
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",
|
||||
HttpScheme,
|
||||
UserAppUrl = string.Format("http://{0}:{1}/mc/app",
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace PepperDash.Essentials
|
|||
private CEvent _initializeEvent;
|
||||
private const long StartupTime = 500;
|
||||
|
||||
// private const string minimumFirmwareVersion = "2.8006.00110";
|
||||
private const string minimumFirmwareVersion = "2.8006.00110";
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the ControlSystem class
|
||||
|
|
@ -50,21 +50,21 @@ namespace PepperDash.Essentials
|
|||
{
|
||||
|
||||
// Get FW version and stop if it's too low to run this version of Essentials. Must be greater than v2.8006.00110
|
||||
// var fwVersion = InitialParametersClass.FirmwareVersion;
|
||||
var fwVersion = InitialParametersClass.FirmwareVersion;
|
||||
|
||||
// Debug.LogInformation("Control System Hardware Version: {fwVersion}", fwVersion);
|
||||
Debug.LogInformation("Control System Hardware Version: {fwVersion}", fwVersion);
|
||||
|
||||
// // split the version into parts and compare against minimumFirmwareVersion
|
||||
// var versionParts = fwVersion.Split('.').Select(int.Parse).ToArray();
|
||||
// var minParts = minimumFirmwareVersion.Split('.').Select(int.Parse).ToArray();
|
||||
// if (versionParts.Length < minParts.Length
|
||||
// || versionParts[0] < minParts[0]
|
||||
// || (versionParts[0] == minParts[0] && versionParts[1] < minParts[1])
|
||||
// || (versionParts[0] == minParts[0] && versionParts[1] == minParts[1] && versionParts[2] <= minParts[2]))
|
||||
// {
|
||||
// Debug.LogFatal("Firmware version {fwVersion} is too low to run this version of Essentials. Please upgrade to greater than v{minimumFirmwareVersion}.", fwVersion, minimumFirmwareVersion);
|
||||
// return;
|
||||
// }
|
||||
// split the version into parts and compare against minimumFirmwareVersion
|
||||
var versionParts = fwVersion.Split('.').Select(int.Parse).ToArray();
|
||||
var minParts = minimumFirmwareVersion.Split('.').Select(int.Parse).ToArray();
|
||||
if (versionParts.Length < minParts.Length
|
||||
|| versionParts[0] < minParts[0]
|
||||
|| (versionParts[0] == minParts[0] && versionParts[1] < minParts[1])
|
||||
|| (versionParts[0] == minParts[0] && versionParts[1] == minParts[1] && versionParts[2] <= minParts[2]))
|
||||
{
|
||||
Debug.LogFatal("Firmware version {fwVersion} is too low to run this version of Essentials. Please upgrade to greater than v{minimumFirmwareVersion}.", fwVersion, minimumFirmwareVersion);
|
||||
return;
|
||||
}
|
||||
|
||||
// If the control system is a DMPS type, we need to wait to exit this method until all devices have had time to activate
|
||||
// to allow any HD-BaseT DM endpoints to register first.
|
||||
|
|
@ -130,8 +130,14 @@ namespace PepperDash.Essentials
|
|||
(ConfigReader.ConfigObject, Newtonsoft.Json.Formatting.Indented).Replace(Environment.NewLine, "\r\n"));
|
||||
}, "showconfig", "Shows the current running merged config", ConsoleAccessLevelEnum.AccessOperator);
|
||||
|
||||
CrestronConsole.AddNewConsoleCommand(
|
||||
PrintPortalInfo,
|
||||
CrestronConsole.AddNewConsoleCommand(s =>
|
||||
CrestronConsole.ConsoleCommandResponse(
|
||||
"This system can be found at the following URLs:{2}" +
|
||||
"System URL: {0}{2}" +
|
||||
"Template URL: {1}{2}",
|
||||
ConfigReader.ConfigObject.SystemUrl,
|
||||
ConfigReader.ConfigObject.TemplateUrl,
|
||||
CrestronEnvironment.NewLine),
|
||||
"portalinfo",
|
||||
"Shows portal URLS from configuration",
|
||||
ConsoleAccessLevelEnum.AccessOperator);
|
||||
|
|
@ -154,29 +160,6 @@ namespace PepperDash.Essentials
|
|||
}
|
||||
}
|
||||
|
||||
private void PrintPortalInfo(string args)
|
||||
{
|
||||
if(ConfigReader.ConfigObject == null)
|
||||
{
|
||||
CrestronConsole.ConsoleCommandResponse("No configuration loaded. Cannot show portal URLs.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(ConfigReader.ConfigObject.SystemUrl) && string.IsNullOrEmpty(ConfigReader.ConfigObject.TemplateUrl))
|
||||
{
|
||||
CrestronConsole.ConsoleCommandResponse("No portal URLs defined in config.");
|
||||
return;
|
||||
}
|
||||
|
||||
CrestronConsole.ConsoleCommandResponse(
|
||||
"This system can be found at the following URLs:{2}" +
|
||||
"System URL: {0}{2}" +
|
||||
"Template URL: {1}{2}",
|
||||
ConfigReader.ConfigObject?.SystemUrl,
|
||||
ConfigReader.ConfigObject?.TemplateUrl,
|
||||
CrestronEnvironment.NewLine);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// DeterminePlatform method
|
||||
/// </summary>
|
||||
|
|
@ -274,6 +257,11 @@ namespace PepperDash.Essentials
|
|||
PluginLoader.AddProgramAssemblies();
|
||||
|
||||
_ = new Core.DeviceFactory();
|
||||
// _ = new Devices.Common.DeviceFactory();
|
||||
// _ = new DeviceFactory();
|
||||
|
||||
// _ = new ProcessorExtensionDeviceFactory();
|
||||
// _ = new MobileControlFactory();
|
||||
|
||||
LoadAssets(Global.ApplicationDirectoryPathPrefix, Global.FilePathPrefix);
|
||||
|
||||
|
|
@ -286,9 +274,10 @@ namespace PepperDash.Essentials
|
|||
PluginLoader.LoadPlugins();
|
||||
|
||||
Debug.LogMessage(LogEventLevel.Information, "Folder structure verified. Loading config...");
|
||||
if (!ConfigReader.LoadConfig2() || ConfigReader.ConfigObject == null)
|
||||
if (!ConfigReader.LoadConfig2())
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Warning, "Unable to load config file.");
|
||||
Debug.LogMessage(LogEventLevel.Information, "Essentials Load complete with errors");
|
||||
return;
|
||||
}
|
||||
|
||||
Load();
|
||||
|
|
@ -410,12 +399,6 @@ namespace PepperDash.Essentials
|
|||
new Core.Monitoring.SystemMonitorController("systemMonitor"));
|
||||
}
|
||||
|
||||
if (ConfigReader.ConfigObject is null)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Warning, "LoadDevices: ConfigObject is null. Cannot load devices.");
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (var devConf in ConfigReader.ConfigObject.Devices)
|
||||
{
|
||||
IKeyed newDev = null;
|
||||
|
|
@ -469,7 +452,7 @@ namespace PepperDash.Essentials
|
|||
|
||||
var tlc = TieLineCollection.Default;
|
||||
|
||||
if (ConfigReader.ConfigObject?.TieLines == null)
|
||||
if (ConfigReader.ConfigObject.TieLines == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -766,7 +749,7 @@ namespace PepperDash.Essentials
|
|||
/// </summary>
|
||||
public void LoadRooms()
|
||||
{
|
||||
if (ConfigReader.ConfigObject?.Rooms == null)
|
||||
if (ConfigReader.ConfigObject.Rooms == null)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Information, "Notice: Configuration contains no rooms - Is this intentional? This may be a valid configuration.");
|
||||
return;
|
||||
|
|
@ -801,16 +784,15 @@ namespace PepperDash.Essentials
|
|||
/// <summary>
|
||||
/// Fires up a logo server if not already running
|
||||
/// </summary>
|
||||
[Obsolete("Logo server is no longer supported and will be removed in a future release.")]
|
||||
void LoadLogoServer()
|
||||
{
|
||||
if (ConfigReader.ConfigObject?.Rooms == null)
|
||||
if (ConfigReader.ConfigObject.Rooms == null)
|
||||
{
|
||||
Debug.LogMessage(LogEventLevel.Information, "No rooms configured. Bypassing Logo server startup.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (ConfigReader.ConfigObject?.Rooms == null ||
|
||||
if (
|
||||
!ConfigReader.ConfigObject.Rooms.Any(
|
||||
CheckRoomConfig))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue