Merge a220474101 into 4f1eb979d3

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasWirelessSharing.cs

@@ -0,0 +1,48 @@
+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;
+        }
+    }
+}

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INetworkSwitchControl.cs

@@ -0,0 +1,122 @@
+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
+    }
+}

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -343,8 +343,10 @@ namespace PepperDash.Essentials.Core
                     IndexTieLines();
                 }
 
-                var sinks = DeviceManager.AllDevices.OfType<IRoutingInputs>();
-                var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>();
+                var sinks = DeviceManager.AllDevices.OfType<IRoutingInputs>()
+                    .Where(d => !(d is IRoutingInputsOutputs)).ToList();
+                var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>()
+                    .Where(d => !(d is IRoutingInputsOutputs)).ToList();
 
                 foreach (var sink in sinks.Where(d => !(d is IRoutingInputsOutputs)))
                 {
@@ -373,6 +375,10 @@ 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))
@@ -404,6 +410,10 @@ 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);
                                 }
                             }
@@ -609,9 +619,11 @@ 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);
+                var midpointTieLines = destinationTieLines
+                    .Where(t => t.SourcePort.ParentDevice is IRoutingInputsOutputs)
+                    .ToList();
 
-                Debug.LogVerbose(destination, "Found {tieLineCount} tie lines to walk for {destinationKey}", midpointTieLines.Count(), destination.Key);
+                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)

src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs

@@ -1,13 +1,14 @@
-using System.Linq;
+using System;
+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>
@@ -51,8 +52,20 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
 			var device = DeviceManager.GetDeviceForKey(deviceObj.ToString()) as IHasFeedback;
 			if (device == null)
 			{
-				context.Response.StatusCode = 404;
-				context.Response.StatusDescription = "Not Found";
+				context.Response.StatusCode = 200;
+				context.Response.StatusDescription = "OK";
+				context.Response.ContentType = "application/json";
+				context.Response.ContentEncoding = System.Text.Encoding.UTF8;
+				var resp = new
+				{
+					BoolValues = Array.Empty<object>(),
+					IntValues = Array.Empty<object>(),
+					SerialValues = Array.Empty<object>()
+				};
+				var respJs = JsonConvert.SerializeObject(resp, Formatting.Indented);
+
+				context.Response.Write(respJs, false);
+
 				context.Response.End();
 
 				return;

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceMessageBase.cs

@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// <summary>
     /// The device key
     /// </summary>
-    [JsonProperty("key")]
+    [JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)]
     /// <summary>
     /// Gets or sets the Key
     /// </summary>
@@ -19,19 +19,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// <summary>
     /// The device name
     /// </summary>
-    [JsonProperty("name")]
+    [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
     public string Name { get; set; }
 
     /// <summary>
     /// The type of the message class
     /// </summary>
-    [JsonProperty("messageType")]
+    [JsonProperty("messageType", NullValueHandling = NullValueHandling.Ignore)]
     public string MessageType => GetType().Name;
 
     /// <summary>
     /// Gets or sets the MessageBasePath
     /// </summary>
-    [JsonProperty("messageBasePath")]
+    [JsonProperty("messageBasePath", NullValueHandling = NullValueHandling.Ignore)]
 
     public string MessageBasePath { get; set; }
   }

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs

@@ -12,7 +12,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// <summary>
     /// The interfaces implmented by the device sending the messsage
     /// </summary>
-    [JsonProperty("interfaces")]
+    [JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)]
+    [Obsolete("Interfaces is no longer supported and will be removed in a future release.  Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
     public List<string> Interfaces { get; private set; }
 
     /// <summary>