diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/ContentTypes.cs b/src/PepperDash.Essentials.MobileControl.Messengers/ContentTypes.cs index 476747b0..e555f11f 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/ContentTypes.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/ContentTypes.cs @@ -5,7 +5,7 @@ namespace PepperDash.Essentials.AppServer { public class SourceSelectMessageContent { - + [JsonProperty("sourceListItemKey")] public string SourceListItemKey { get; set; } [JsonProperty("sourceListKey")] diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs index 659c62e8..3d15db76 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs @@ -2,14 +2,12 @@ using PepperDash.Core; using PepperDash.Essentials.AppServer; using PepperDash.Essentials.AppServer.Messengers; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using System; using System.Linq; using DisplayBase = PepperDash.Essentials.Devices.Common.Displays.DisplayBase; namespace PepperDash.Essentials.Room.MobileControl { - public class DisplayBaseMessenger: MessengerBase + public class DisplayBaseMessenger : MessengerBase { private readonly DisplayBase display; @@ -20,7 +18,7 @@ namespace PepperDash.Essentials.Room.MobileControl protected override void RegisterActions() { - base.RegisterActions(); + base.RegisterActions(); /*AddAction("/powerOn", (id, content) => display.PowerOn()); AddAction("/powerOff", (id, content) => display.PowerOff()); diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IChannelMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IChannelMessenger.cs index d02ecbf3..3cc382f8 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IChannelMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IChannelMessenger.cs @@ -4,7 +4,7 @@ using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.MobileControl { - public class IChannelMessenger:MessengerBase + public class IChannelMessenger : MessengerBase { private readonly IChannel channelDevice; @@ -15,14 +15,14 @@ namespace PepperDash.Essentials.Room.MobileControl protected override void RegisterActions() { - base.RegisterActions(); + base.RegisterActions(); AddAction("/chanUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.ChannelUp(b))); AddAction("/chanDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.ChannelDown(b))); AddAction("/lastChan", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.LastChannel(b))); AddAction("/guide", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Guide(b))); - AddAction("/info", (id, content) => PressAndHoldHandler.HandlePressAndHold (DeviceKey, content, (b) => channelDevice?.Info(b))); + AddAction("/info", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Info(b))); AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Exit(b))); } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IColorMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IColorMessenger.cs index d23fbf2b..021f8a25 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IColorMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IColorMessenger.cs @@ -1,11 +1,10 @@ using PepperDash.Core; using PepperDash.Essentials.AppServer.Messengers; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; namespace PepperDash.Essentials.Room.MobileControl { - public class IColorMessenger:MessengerBase + public class IColorMessenger : MessengerBase { private readonly IColor colorDevice; public IColorMessenger(string key, string messagePath, Device device) : base(key, messagePath, device) @@ -15,12 +14,12 @@ namespace PepperDash.Essentials.Room.MobileControl protected override void RegisterActions() { - base.RegisterActions(); + base.RegisterActions(); AddAction("/red", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Red(b))); AddAction("/green", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Green(b))); AddAction("/yellow", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Yellow(b))); - AddAction("/blue", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Blue(b))); + AddAction("/blue", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Blue(b))); } } } \ No newline at end of file diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDPadMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDPadMessenger.cs index 000f9185..1233d0da 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDPadMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDPadMessenger.cs @@ -4,7 +4,7 @@ using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.MobileControl { - public class IDPadMessenger:MessengerBase + public class IDPadMessenger : MessengerBase { private readonly IDPad dpadDevice; public IDPadMessenger(string key, string messagePath, Device device) : base(key, messagePath, device) @@ -15,7 +15,7 @@ namespace PepperDash.Essentials.Room.MobileControl protected override void RegisterActions() { - base.RegisterActions(); + base.RegisterActions(); AddAction("/up", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Up(b))); AddAction("/down", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Down(b))); diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDvrMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDvrMessenger.cs index b722bd73..2fd4679c 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDvrMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDvrMessenger.cs @@ -4,7 +4,7 @@ using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.MobileControl { - public class IDvrMessenger: MessengerBase + public class IDvrMessenger : MessengerBase { private readonly IDvr dvrDevice; public IDvrMessenger(string key, string messagePath, Device device) : base(key, messagePath, device) @@ -14,7 +14,7 @@ namespace PepperDash.Essentials.Room.MobileControl protected override void RegisterActions() { - base.RegisterActions(); + base.RegisterActions(); AddAction("/dvrlist", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dvrDevice?.DvrList(b))); AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dvrDevice?.Record(b))); diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IHasPowerMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IHasPowerMessenger.cs index 33ce7ea1..8fe09e75 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IHasPowerMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IHasPowerMessenger.cs @@ -1,11 +1,10 @@ using PepperDash.Core; using PepperDash.Essentials.AppServer.Messengers; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; namespace PepperDash.Essentials.Room.MobileControl { - public class IHasPowerMessenger:MessengerBase + public class IHasPowerMessenger : MessengerBase { private readonly IHasPowerControl powerDevice; public IHasPowerMessenger(string key, string messagePath, Device device) : base(key, messagePath, device) diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/INumericMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/INumericMessenger.cs index 6f601013..490b02b8 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/INumericMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/INumericMessenger.cs @@ -4,7 +4,7 @@ using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.MobileControl { - public class INumericKeypadMessenger:MessengerBase + public class INumericKeypadMessenger : MessengerBase { private readonly INumericKeypad keypadDevice; public INumericKeypadMessenger(string key, string messagePath, Device device) : base(key, messagePath, device) @@ -14,7 +14,7 @@ namespace PepperDash.Essentials.Room.MobileControl protected override void RegisterActions() { - base.RegisterActions(); + base.RegisterActions(); AddAction("/num0", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit0(b))); AddAction("/num1", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit1(b))); diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ISetTopBoxControlsMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ISetTopBoxControlsMessenger.cs index c47b5f47..16899110 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ISetTopBoxControlsMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ISetTopBoxControlsMessenger.cs @@ -4,7 +4,7 @@ using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.MobileControl { - public class ISetTopBoxControlsMessenger:MessengerBase + public class ISetTopBoxControlsMessenger : MessengerBase { private readonly ISetTopBoxControls stbDevice; public ISetTopBoxControlsMessenger(string key, string messagePath, IKeyName device) : base(key, messagePath, device) @@ -18,15 +18,15 @@ namespace PepperDash.Essentials.Room.MobileControl AddAction("/fullStatus", (id, content) => SendISetTopBoxControlsFullMessageObject()); AddAction("/dvrList", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => stbDevice?.DvrList(b))); AddAction("/replay", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => stbDevice?.Replay(b))); - } - /// + } + /// /// Helper method to build call status for vtc /// /// private void SendISetTopBoxControlsFullMessageObject() { - PostStatusMessage( new SetTopBoxControlsState()); + PostStatusMessage(new SetTopBoxControlsState()); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ITransportMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ITransportMessenger.cs index cf34b490..ee47491b 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ITransportMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ITransportMessenger.cs @@ -4,7 +4,7 @@ using PepperDash.Essentials.Core; namespace PepperDash.Essentials.Room.MobileControl { - public class ITransportMessenger:MessengerBase + public class ITransportMessenger : MessengerBase { private readonly ITransport transportDevice; public ITransportMessenger(string key, string messagePath, Device device) : base(key, messagePath, device) @@ -16,14 +16,14 @@ namespace PepperDash.Essentials.Room.MobileControl { base.RegisterActions(); - AddAction("/play", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Play(b))); - AddAction("/pause", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Pause(b))); - AddAction("/stop", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Stop(b))); - AddAction("/prevTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapPlus(b))); - AddAction("/nextTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapMinus(b))); - AddAction("/rewind", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Rewind(b))); - AddAction("/ffwd", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.FFwd(b))); - AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Record(b))); + AddAction("/play", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Play(b))); + AddAction("/pause", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Pause(b))); + AddAction("/stop", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Stop(b))); + AddAction("/prevTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapPlus(b))); + AddAction("/nextTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapMinus(b))); + AddAction("/rewind", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Rewind(b))); + AddAction("/ffwd", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.FFwd(b))); + AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Record(b))); } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs index 2acb90b5..9a42141e 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json.Linq; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Devices.Common.AudioCodec; using PepperDash.Essentials.Devices.Common.Codec; using System; @@ -103,14 +102,14 @@ namespace PepperDash.Essentials.AppServer.Messengers var info = Codec.CodecInfo; PostStatusMessage(JToken.FromObject(new + { + isInCall = Codec.IsInCall, + calls = Codec.ActiveCalls, + info = new { - isInCall = Codec.IsInCall, - calls = Codec.ActiveCalls, - info = new - { - phoneNumber = info.PhoneNumber - } - }) + phoneNumber = info.PhoneNumber + } + }) ); } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs index 404dbf6c..36a94781 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json.Linq; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Devices.Common.Cameras; using System; using System.Collections.Generic; @@ -40,9 +39,9 @@ namespace PepperDash.Essentials.AppServer.Messengers presetList = presetsCamera.Presets; PostStatusMessage(JToken.FromObject(new - { - presets = presetList - }) + { + presets = presetList + }) ); } @@ -175,14 +174,14 @@ namespace PepperDash.Essentials.AppServer.Messengers presetList = presetsCamera.Presets; PostStatusMessage(JToken.FromObject(new - { - cameraManualSupported = Camera is IHasCameraControls, - cameraAutoSupported = Camera is IHasCameraAutoMode, - cameraOffSupported = Camera is IHasCameraOff, - cameraMode = GetCameraMode(), - hasPresets = Camera is IHasCameraPresets, - presets = presetList - }) + { + cameraManualSupported = Camera is IHasCameraControls, + cameraAutoSupported = Camera is IHasCameraAutoMode, + cameraOffSupported = Camera is IHasCameraOff, + cameraMode = GetCameraMode(), + hasPresets = Camera is IHasCameraPresets, + presets = presetList + }) ); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs index 8a17ce01..ffd58948 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceInfoMessenger.cs @@ -2,11 +2,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.DeviceInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PepperDash.Essentials.AppServer.Messengers { diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs index ee4aac53..148b7d5b 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs @@ -43,12 +43,14 @@ namespace PepperDash.Essentials.AppServer.Messengers protected override void RegisterActions() { - AddAction("/presets/fullStatus", (id, content) => { + AddAction("/presets/fullStatus", (id, content) => + { this.LogInformation("getting full status for client {id}", id); try { SendPresets(); - } catch(Exception ex) + } + catch (Exception ex) { Debug.LogMessage(ex, "Exception sending preset full status", this); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs index 6531424e..22f837c3 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using PepperDash.Core; -using PepperDash.Core.Logging; using PepperDash.Essentials.Core; using System; @@ -39,7 +38,8 @@ namespace PepperDash.Essentials.AppServer.Messengers } PostStatusMessage(messageObj); - } catch(Exception ex) + } + catch (Exception ex) { Debug.LogMessage(ex, "Exception sending full status", this); } @@ -60,7 +60,7 @@ namespace PepperDash.Essentials.AppServer.Messengers }); AddAction("/muteToggle", (id, content) => - { + { _localDevice.MuteToggle(); }); @@ -74,21 +74,22 @@ namespace PepperDash.Essentials.AppServer.Messengers _localDevice.MuteOff(); }); - AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => + AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => { Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b); try { _localDevice.VolumeUp(b); - } catch (Exception ex) + } + catch (Exception ex) { Debug.LogMessage(ex, "Got exception during volume up: {Exception}", null, ex); } - })); + })); - AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => + AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => { Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume down with {value}", DeviceKey, b); @@ -132,7 +133,7 @@ namespace PepperDash.Essentials.AppServer.Messengers } }; - PostStatusMessage(JToken.FromObject(message)); + PostStatusMessage(JToken.FromObject(message)); }; diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs index 640df31a..64624bfa 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs @@ -1,6 +1,4 @@ using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using System; namespace PepperDash.Essentials.AppServer.Messengers { diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs index 7e4d03f6..5ab81832 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ICommunicationMonitorMessenger.cs @@ -3,11 +3,6 @@ using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PepperDash.Essentials.AppServer.Messengers { @@ -24,7 +19,7 @@ namespace PepperDash.Essentials.AppServer.Messengers { base.RegisterActions(); - AddAction("/fullStatus", (id, content) => + AddAction("/fullStatus", (id, content) => { PostStatusMessage(new CommunicationMonitorState { @@ -33,7 +28,7 @@ namespace PepperDash.Essentials.AppServer.Messengers IsOnline = _communicationMonitor.CommunicationMonitor.IsOnline, Status = _communicationMonitor.CommunicationMonitor.Status } - }); + }); }); _communicationMonitor.CommunicationMonitor.StatusChange += (sender, args) => diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs index 9601bad6..2cedf5fa 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs @@ -79,7 +79,7 @@ namespace PepperDash.Essentials.AppServer.Messengers PostStatusMessage(JToken.FromObject(message)); }; - foreach(var partition in _roomCombiner.Partitions) + foreach (var partition in _roomCombiner.Partitions) { partition.PartitionPresentFeedback.OutputChange += (sender, args) => { @@ -101,7 +101,7 @@ namespace PepperDash.Essentials.AppServer.Messengers foreach (var room in _roomCombiner.Rooms) { - rooms.Add(new RoomCombinerRoom{ Key = room.Key, Name = room.Name }); + rooms.Add(new RoomCombinerRoom { Key = room.Key, Name = room.Name }); } var message = new IEssentialsRoomCombinerStateMessage diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs index 65bc67bd..24f1f461 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCurrentSourceInfoMessenger.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.Routing; namespace PepperDash.Essentials.AppServer.Messengers { @@ -29,7 +28,8 @@ namespace PepperDash.Essentials.AppServer.Messengers PostStatusMessage(message); }); - sourceDevice.CurrentSourceChange += (sender, e) => { + sourceDevice.CurrentSourceChange += (sender, e) => + { switch (e) { case ChangeType.DidChange: @@ -42,11 +42,11 @@ namespace PepperDash.Essentials.AppServer.Messengers break; } } - }; + }; } } - public class CurrentSourceStateMessage: DeviceStateMessageBase + public class CurrentSourceStateMessage : DeviceStateMessageBase { [JsonProperty("currentSourceKey", NullValueHandling = NullValueHandling.Ignore)] public string CurrentSourceKey { get; set; } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs index bf838e92..689b5102 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasPowerControlWithFeedbackMessenger.cs @@ -1,20 +1,15 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using PepperDash.Essentials.Core; using PepperDash.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using PepperDash.Essentials.Core; namespace PepperDash.Essentials.AppServer.Messengers { - public class IHasPowerControlWithFeedbackMessenger: MessengerBase + public class IHasPowerControlWithFeedbackMessenger : MessengerBase { private readonly IHasPowerControlWithFeedback _powerControl; - public IHasPowerControlWithFeedbackMessenger(string key, string messagePath, IHasPowerControlWithFeedback powerControl) + public IHasPowerControlWithFeedbackMessenger(string key, string messagePath, IHasPowerControlWithFeedback powerControl) : base(key, messagePath, powerControl as Device) { _powerControl = powerControl; @@ -42,9 +37,9 @@ namespace PepperDash.Essentials.AppServer.Messengers private void PowerIsOnFeedback_OutputChange(object sender, FeedbackEventArgs args) { PostStatusMessage(JToken.FromObject(new - { - powerState = args.BoolValue - }) + { + powerState = args.BoolValue + }) ); } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs index 550f1045..86529e1b 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Devices.Common.Codec; using System; using System.Collections.Generic; @@ -28,13 +27,13 @@ namespace PepperDash.Essentials.AppServer.Messengers private void CodecSchedule_MeetingEventChange(object sender, MeetingEventArgs e) { PostStatusMessage(JToken.FromObject(new MeetingChangeMessage + { + MeetingChange = new MeetingChange { - MeetingChange = new MeetingChange - { - ChangeType = e.ChangeType.ToString(), - Meeting = e.Meeting - } - }) + ChangeType = e.ChangeType.ToString(), + Meeting = e.Meeting + } + }) ); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs index 6410d314..a476e9bc 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs @@ -1,13 +1,9 @@ -using Independentsoft.Exchange; -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PepperDash.Essentials.AppServer.Messengers { @@ -33,7 +29,7 @@ namespace PepperDash.Essentials.AppServer.Messengers PostStatusMessage(message); }); - foreach(var levelControl in levelControlsDevice.LevelControlPoints) + foreach (var levelControl in levelControlsDevice.LevelControlPoints) { // reassigning here just in case of lambda closure issues var key = levelControl.Key; @@ -78,7 +74,7 @@ namespace PepperDash.Essentials.AppServer.Messengers } } - public class LevelControlStateMessage:DeviceStateMessageBase + public class LevelControlStateMessage : DeviceStateMessageBase { [JsonProperty("levelControls")] public Dictionary Levels { get; set; } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs index 8bacab8f..4e403261 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IMatrixRoutingMessenger.cs @@ -3,10 +3,10 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Routing; -using System.Collections.Generic; -using System.Linq; using Serilog.Events; using System; +using System.Collections.Generic; +using System.Linq; namespace PepperDash.Essentials.AppServer.Messengers { @@ -36,7 +36,7 @@ namespace PepperDash.Essentials.AppServer.Messengers Inputs = matrixDevice.InputSlots.ToDictionary(kvp => kvp.Key, kvp => new RoutingInput(kvp.Value)), }; - + PostStatusMessage(message); } catch (Exception e) @@ -52,7 +52,7 @@ namespace PepperDash.Essentials.AppServer.Messengers matrixDevice.Route(request.InputKey, request.OutputKey, request.RouteType); }); - foreach(var output in matrixDevice.OutputSlots) + foreach (var output in matrixDevice.OutputSlots) { var key = output.Key; var outputSlot = output.Value; @@ -66,7 +66,7 @@ namespace PepperDash.Essentials.AppServer.Messengers }; } - foreach(var input in matrixDevice.InputSlots) + foreach (var input in matrixDevice.InputSlots) { var key = input.Key; var inputSlot = input.Value; @@ -82,7 +82,7 @@ namespace PepperDash.Essentials.AppServer.Messengers } } - public class MatrixStateMessage : DeviceStateMessageBase + public class MatrixStateMessage : DeviceStateMessageBase { [JsonProperty("outputs")] public Dictionary Outputs; @@ -113,13 +113,13 @@ namespace PepperDash.Essentials.AppServer.Messengers [JsonProperty("videoSyncDetected", NullValueHandling = NullValueHandling.Ignore)] - public bool? VideoSyncDetected => _input?.VideoSyncDetected; + public bool? VideoSyncDetected => _input?.VideoSyncDetected; [JsonProperty("key", NullValueHandling = NullValueHandling.Ignore)] public string Key => _input?.Key; public RoutingInput(IRoutingInputSlot input) - { + { _input = input; } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs index 9d4a3804..af885639 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IProjectorScreenLiftControlMessenger.cs @@ -7,7 +7,7 @@ using System; namespace PepperDash.Essentials.AppServer.Messengers { - public class IProjectorScreenLiftControlMessenger: MessengerBase + public class IProjectorScreenLiftControlMessenger : MessengerBase { private readonly IProjectorScreenLiftControl device; diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs index 2579f056..a5f2cf3a 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using System; diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs index 88441526..187a82fb 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs @@ -1,13 +1,8 @@ using Newtonsoft.Json; +using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json.Converters; namespace PepperDash.Essentials.AppServer.Messengers { @@ -45,7 +40,7 @@ namespace PepperDash.Essentials.AppServer.Messengers foreach (var input in itemDevice.Items) { var key = input.Key; - var localItem = input.Value; + var localItem = input.Value; AddAction($"/{key}", (id, content) => { diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs index 9b6f21d7..cdd238e2 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using PepperDash.Essentials.Core.CrestronIO; -using PepperDash.Essentials.Core.Shades; -using Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; +using PepperDash.Essentials.Core.CrestronIO; +using System; namespace PepperDash.Essentials.AppServer.Messengers { @@ -41,7 +36,7 @@ namespace PepperDash.Essentials.AppServer.Messengers }); - device.OutputIsOnFeedback.OutputChange += new EventHandler((o, a) => SendFullStatus()); + device.OutputIsOnFeedback.OutputChange += new EventHandler((o, a) => SendFullStatus()); } private void SendFullStatus() diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs index 46e2a5a7..438fcef0 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.Contracts; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Independentsoft.Json.Parser; -using Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; @@ -82,8 +75,8 @@ namespace PepperDash.Essentials.AppServer.Messengers [JsonProperty("isValid", NullValueHandling = NullValueHandling.Ignore)] public bool? IsValid { get; set; } } - - class SetTechPasswordContent + + internal class SetTechPasswordContent { [JsonProperty("oldPassword")] public string OldPassword { get; set; } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs index 3f8e36e5..2fd02a25 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Lighting; using System; using System.Collections.Generic; diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs index af9fbe43..7d809f13 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json; -using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; @@ -81,9 +80,10 @@ namespace PepperDash.Essentials.AppServer.Messengers private void HandleMessage(string path, string id, JToken content) { // replace base path with empty string. Should leave something like /fullStatus - var route = path.Replace(MessagePath, string.Empty); + var route = path.Replace(MessagePath, string.Empty); - if(!_actions.TryGetValue(route, out var action)) { + if (!_actions.TryGetValue(route, out var action)) + { return; } @@ -136,12 +136,12 @@ namespace PepperDash.Essentials.AppServer.Messengers { try { - if(message == null) + if (message == null) { throw new ArgumentNullException("message"); } - if(_device == null) + if (_device == null) { throw new ArgumentNullException("device"); } @@ -154,7 +154,8 @@ namespace PepperDash.Essentials.AppServer.Messengers PostStatusMessage(JToken.FromObject(message), MessagePath, clientId); } - catch (Exception ex) { + catch (Exception ex) + { Debug.LogMessage(ex, "Exception posting status message", this); } } @@ -202,17 +203,17 @@ namespace PepperDash.Essentials.AppServer.Messengers { Type = $"/event{MessagePath}/{message.EventType}", Content = JToken.FromObject(message), - }); + }); } protected void PostEventMessage(DeviceEventMessageBase message, string eventType) - { + { message.Key = _device.Key; - + message.Name = _device.Name; message.EventType = eventType; - + AppServerController?.SendMessageObject(new MobileControlMessage { Type = $"/event{MessagePath}/{eventType}", diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs index 2bf213ac..9ec2a4e4 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/PressAndHoldHandler.cs @@ -3,12 +3,11 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using System; using System.Collections.Generic; -using System.Runtime.CompilerServices; namespace PepperDash.Essentials.AppServer.Messengers { public static class PressAndHoldHandler - { + { private const long ButtonHeartbeatInterval = 1000; private static readonly Dictionary _pushedActions = new Dictionary(); @@ -54,7 +53,7 @@ namespace PepperDash.Essentials.AppServer.Messengers private static void ResetTimer(string deviceKey, Action action) { Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to reset timer for {deviceKey}", deviceKey); - + if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer)) { Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} not found", deviceKey); @@ -70,7 +69,8 @@ namespace PepperDash.Essentials.AppServer.Messengers { Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Attempting to stop timer for {deviceKey}", deviceKey); - if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer)) { + if (!_pushedActions.TryGetValue(deviceKey, out CTimer cancelTimer)) + { Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Timer for {deviceKey} not found", deviceKey); return; } @@ -110,7 +110,7 @@ namespace PepperDash.Essentials.AppServer.Messengers return; } - timerHandler(deviceKey, action); + timerHandler(deviceKey, action); } } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs index c316d13e..8b3b5681 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Room.Config; using System; using System.Collections.Generic; diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs index 1903b25f..3222289a 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs @@ -1,7 +1,6 @@ using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json.Linq; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Devices.Common.Codec; using System; using System.Collections.Generic; @@ -44,12 +43,12 @@ namespace PepperDash.Essentials.AppServer.Messengers private void SendFullStatus() { PostStatusMessage(JToken.FromObject(new - { - calls = GetCurrentCallList(), - currentCallString = _eisc.GetString(JoinMap.CurrentCallName.JoinNumber), - currentDialString = _eisc.GetString(JoinMap.CurrentDialString.JoinNumber), - isInCall = _eisc.GetString(JoinMap.HookState.JoinNumber) == "Connected" - }) + { + calls = GetCurrentCallList(), + currentCallString = _eisc.GetString(JoinMap.CurrentCallName.JoinNumber), + currentDialString = _eisc.GetString(JoinMap.CurrentDialString.JoinNumber), + isInCall = _eisc.GetString(JoinMap.HookState.JoinNumber) == "Connected" + }) ); } @@ -139,9 +138,9 @@ namespace PepperDash.Essentials.AppServer.Messengers private void SendCallsList() { PostStatusMessage(JToken.FromObject(new - { - calls = GetCurrentCallList(), - }) + { + calls = GetCurrentCallList(), + }) ); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs index de3f349d..bf4eb765 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs @@ -125,11 +125,11 @@ namespace PepperDash.Essentials.AppServer.Messengers } PostStatusMessage(JToken.FromObject(new - { - cameraMode = GetCameraMode(), - hasPresets = _eisc.GetBool(_joinMap.SupportsPresets.JoinNumber), - presets = presetList - }) + { + cameraMode = GetCameraMode(), + hasPresets = _eisc.GetBool(_joinMap.SupportsPresets.JoinNumber), + presets = presetList + }) ); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs index cf95b753..b0ddc47a 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using System.Collections.Generic; namespace PepperDash.Essentials.AppServer.Messengers diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs index c1f6d78e..d6d59cc0 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs @@ -60,9 +60,9 @@ namespace PepperDash.Essentials.AppServer.Messengers sourceKey = "none"; PostStatusMessage(JToken.FromObject(new - { - selectedSourceKey = sourceKey - }) + { + selectedSourceKey = sourceKey + }) ); } } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs index e88acb12..a9872285 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Devices.Common.Cameras; using PepperDash.Essentials.Devices.Common.Codec; using System; @@ -44,7 +43,7 @@ namespace PepperDash.Essentials.AppServer.Messengers /// /// protected override void RegisterActions() - { + { _eisc.SetStringSigAction(JoinMap.HookState.JoinNumber, s => { _currentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true); diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs index 7abf0fca..c5f27318 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Shades; using System; diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs index 9c13c569..8b7750a2 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Core; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Monitoring; using System; using System.Threading.Tasks; @@ -71,15 +70,15 @@ namespace PepperDash.Essentials.AppServer.Messengers // This takes a while, launch a new thread Task.Run(() => PostStatusMessage(JToken.FromObject(new SystemMonitorStateMessage - { + { - TimeZone = systemMonitor.TimeZoneFeedback.IntValue, - TimeZoneName = systemMonitor.TimeZoneTextFeedback.StringValue, - IoControllerVersion = systemMonitor.IoControllerVersionFeedback.StringValue, - SnmpVersion = systemMonitor.SnmpVersionFeedback.StringValue, - BacnetVersion = systemMonitor.BaCnetAppVersionFeedback.StringValue, - ControllerVersion = systemMonitor.ControllerVersionFeedback.StringValue - }) + TimeZone = systemMonitor.TimeZoneFeedback.IntValue, + TimeZoneName = systemMonitor.TimeZoneTextFeedback.StringValue, + IoControllerVersion = systemMonitor.IoControllerVersionFeedback.StringValue, + SnmpVersion = systemMonitor.SnmpVersionFeedback.StringValue, + BacnetVersion = systemMonitor.BaCnetAppVersionFeedback.StringValue, + ControllerVersion = systemMonitor.ControllerVersionFeedback.StringValue + }) )); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs index ddd7e7ba..0fb5cbae 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs @@ -47,10 +47,10 @@ namespace PepperDash.Essentials.AppServer.Messengers private void CurrentInputFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs) { PostStatusMessage(JToken.FromObject(new - { - currentInput = feedbackEventArgs.StringValue - }) - ); + { + currentInput = feedbackEventArgs.StringValue + }) + ); } @@ -66,21 +66,21 @@ namespace PepperDash.Essentials.AppServer.Messengers private void IsWarmingFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs) { PostStatusMessage(JToken.FromObject(new - { - isWarming = feedbackEventArgs.BoolValue - }) - ); + { + isWarming = feedbackEventArgs.BoolValue + }) + ); } private void IsCoolingFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs) { PostStatusMessage(JToken.FromObject(new - { - isCooling = feedbackEventArgs.BoolValue - }) + { + isCooling = feedbackEventArgs.BoolValue + }) ); - + } #endregion diff --git a/src/PepperDash.Essentials.MobileControl/Interfaces.cs b/src/PepperDash.Essentials.MobileControl/Interfaces.cs index 6b455e84..dc5552c6 100644 --- a/src/PepperDash.Essentials.MobileControl/Interfaces.cs +++ b/src/PepperDash.Essentials.MobileControl/Interfaces.cs @@ -1,6 +1,6 @@ using System; -namespace PepperDash.Essentials.Room.MobileControl +namespace PepperDash.Essentials { /// /// Represents a room whose configuration is derived from runtime data, @@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Room.MobileControl public interface IDelayedConfiguration { - + event EventHandler ConfigurationIsReady; } } \ No newline at end of file diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlAction.cs b/src/PepperDash.Essentials.MobileControl/MobileControlAction.cs index ac09fbc3..2f12f5bd 100644 --- a/src/PepperDash.Essentials.MobileControl/MobileControlAction.cs +++ b/src/PepperDash.Essentials.MobileControl/MobileControlAction.cs @@ -1,11 +1,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using PepperDash.Essentials.Core.Web.RequestHandlers; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PepperDash.Essentials { @@ -13,9 +8,10 @@ namespace PepperDash.Essentials { public IMobileControlMessenger Messenger { get; private set; } - public Action Action {get; private set; } + public Action Action { get; private set; } - public MobileControlAction(IMobileControlMessenger messenger, Action handler) { + public MobileControlAction(IMobileControlMessenger messenger, Action handler) + { Messenger = messenger; Action = handler; } diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs b/src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs index 4493e288..af25f27a 100644 --- a/src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs +++ b/src/PepperDash.Essentials.MobileControl/MobileControlConfig.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using System; using System.Collections.Generic; namespace PepperDash.Essentials @@ -57,7 +56,7 @@ namespace PepperDash.Essentials [JsonProperty("port")] public int Port { get; set; } - + } diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlDeviceFactory.cs b/src/PepperDash.Essentials.MobileControl/MobileControlDeviceFactory.cs index 6ccbb382..0c1f1087 100644 --- a/src/PepperDash.Essentials.MobileControl/MobileControlDeviceFactory.cs +++ b/src/PepperDash.Essentials.MobileControl/MobileControlDeviceFactory.cs @@ -2,7 +2,6 @@ using PepperDash.Core.Logging; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; -using PepperDash.Essentials.Room.MobileControl; using Serilog.Events; using System; using System.Collections.Generic; @@ -14,7 +13,7 @@ namespace PepperDash.Essentials public class MobileControlDeviceFactory : EssentialsDeviceFactory { public MobileControlDeviceFactory() - { + { TypeNames = new List { "appserver", "mobilecontrol", "webserver" }; } @@ -36,7 +35,7 @@ namespace PepperDash.Essentials public class MobileControlSimplFactory : EssentialsDeviceFactory { public MobileControlSimplFactory() - { + { TypeNames = new List { "mobilecontrolbridge-ddvc01", "mobilecontrolbridge-simpl" }; } @@ -55,7 +54,7 @@ namespace PepperDash.Essentials bridge.LogInformation("ERROR: Cannot connect bridge. System controller not present"); return; } - bridge.LogInformation("Linking to parent controller"); + bridge.LogInformation("Linking to parent controller"); parent.AddDeviceMessenger(bridge); }); diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlFactory.cs b/src/PepperDash.Essentials.MobileControl/MobileControlFactory.cs index e101dee8..58e4ed8a 100644 --- a/src/PepperDash.Essentials.MobileControl/MobileControlFactory.cs +++ b/src/PepperDash.Essentials.MobileControl/MobileControlFactory.cs @@ -1,24 +1,22 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using System; -using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; -namespace PepperDash.Essentials.MobileControl +namespace PepperDash.Essentials { public class MobileControlFactory { - public MobileControlFactory() { + public MobileControlFactory() + { var assembly = Assembly.GetExecutingAssembly(); PluginLoader.SetEssentialsAssembly(assembly.GetName().Name, assembly); var types = assembly.GetTypes().Where(t => typeof(IDeviceFactory).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract); - if(types == null) + if (types == null) { return; } diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs index 898fd10b..52555867 100644 --- a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs +++ b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs @@ -1,16 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using Crestron.SimplSharp; +using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharp.Net.Http; using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Org.BouncyCastle.Crypto.Prng; using PepperDash.Core; using PepperDash.Core.Logging; using PepperDash.Essentials.AppServer; @@ -32,9 +25,16 @@ using PepperDash.Essentials.Devices.Common.Displays; using PepperDash.Essentials.Devices.Common.SoftCodec; using PepperDash.Essentials.Devices.Common.VideoCodec; using PepperDash.Essentials.Room.MobileControl; +using PepperDash.Essentials.RoomBridges; using PepperDash.Essentials.Services; using PepperDash.Essentials.WebApiHandlers; -using Serilog.Events; +using PepperDash.Essentials.WebSocketServer; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text.RegularExpressions; +using System.Threading.Tasks; using WebSocketSharp; namespace PepperDash.Essentials @@ -160,7 +160,7 @@ namespace PepperDash.Essentials : base(key, name) { Config = config; - + // The queue that will collect the incoming messages in the order they are received //_receiveQueue = new ReceiveQueue(key, ParseStreamRx); _receiveQueue = new GenericQueue( @@ -222,7 +222,7 @@ namespace PepperDash.Essentials { _roomCombiner = DeviceManager.AllDevices.OfType().FirstOrDefault(); - if(_roomCombiner == null) + if (_roomCombiner == null) return; _roomCombiner.RoomCombinationScenarioChanged += OnRoomCombinationScenarioChanged; @@ -238,7 +238,7 @@ namespace PepperDash.Essentials return _wsClient2.IsAlive && IsAuthorized; }); - } + } private void SetupDefaultRoomMessengers() { @@ -247,7 +247,7 @@ namespace PepperDash.Essentials foreach (var room in DeviceManager.AllDevices.OfType()) { this.LogVerbose( - "Setting up room messengers for room: {key}", + "Setting up room messengers for room: {key}", room.Key ); @@ -260,7 +260,7 @@ namespace PepperDash.Essentials AddDefaultDeviceMessenger(messenger); this.LogVerbose( - "Attempting to set up default room messengers for room: {0}", + "Attempting to set up default room messengers for room: {0}", room.Key ); @@ -328,7 +328,7 @@ namespace PepperDash.Essentials var allDevices = DeviceManager.AllDevices.Where((d) => !(d is IEssentialsRoom)); this.LogInformation( - "All Devices that aren't rooms count: {0}", + "All Devices that aren't rooms count: {0}", allDevices?.Count() ); @@ -425,26 +425,26 @@ namespace PepperDash.Essentials var presetsDevice = device as ITvPresetsProvider; - this.LogVerbose( - "Adding ITvPresetsProvider for {deviceKey}", - device.Key - ); + this.LogVerbose( + "Adding ITvPresetsProvider for {deviceKey}", + device.Key + ); - var presetsMessenger = new DevicePresetsModelMessenger( - $"{device.Key}-presets-{Key}", - $"/device/{device.Key}", - presetsDevice - ); + var presetsMessenger = new DevicePresetsModelMessenger( + $"{device.Key}-presets-{Key}", + $"/device/{device.Key}", + presetsDevice + ); - AddDefaultDeviceMessenger(presetsMessenger); + AddDefaultDeviceMessenger(presetsMessenger); + + messengerAdded = true; + } - messengerAdded = true; - } - if (device is DisplayBase) { - this.LogVerbose( "Adding actions for device: {0}", device.Key); + this.LogVerbose("Adding actions for device: {0}", device.Key); var dbMessenger = new DisplayBaseMessenger( $"{device.Key}-displayBase-{Key}", @@ -458,7 +458,7 @@ namespace PepperDash.Essentials } if (device is TwoWayDisplayBase twoWayDisplay) - { + { this.LogVerbose( "Adding TwoWayDisplayBase for {deviceKey}", device.Key @@ -476,11 +476,11 @@ namespace PepperDash.Essentials if (device is IBasicVolumeWithFeedback) { var deviceKey = device.Key; - this.LogVerbose( - "Adding IBasicVolumeControlWithFeedback for {deviceKey}", - deviceKey - ); - + this.LogVerbose( + "Adding IBasicVolumeControlWithFeedback for {deviceKey}", + deviceKey + ); + var volControlDevice = device as IBasicVolumeWithFeedback; var messenger = new DeviceVolumeMessenger( $"{device.Key}-volume-{Key}", @@ -500,7 +500,7 @@ namespace PepperDash.Essentials "Adding LightingBaseMessenger for {deviceKey}", deviceKey ); - + var lightingDevice = device as ILightingScenes; var messenger = new ILightingScenesMessenger( $"{device.Key}-lighting-{Key}", @@ -516,7 +516,7 @@ namespace PepperDash.Essentials { var deviceKey = device.Key; var shadeDevice = device as IShadesOpenCloseStop; - + this.LogVerbose( "Adding ShadeBaseMessenger for {deviceKey}", deviceKey @@ -535,7 +535,7 @@ namespace PepperDash.Essentials if (device is VideoCodecBase codec) { this.LogVerbose( - "Adding VideoCodecBaseMessenger for {deviceKey}", codec.Key ); + "Adding VideoCodecBaseMessenger for {deviceKey}", codec.Key); var messenger = new VideoCodecBaseMessenger( $"{codec.Key}-videoCodec-{Key}", @@ -571,7 +571,7 @@ namespace PepperDash.Essentials "Adding ISetTopBoxControlMessenger for {deviceKey}" ); - var dev = device as Device; + var dev = device as Device; var messenger = new ISetTopBoxControlsMessenger( $"{device.Key}-stb-{Key}", @@ -639,7 +639,7 @@ namespace PepperDash.Essentials if (device is INumericKeypad) { - this.LogVerbose("Adding INumericKeyapdMessenger for {deviceKey}", device.Key); + this.LogVerbose("Adding INumericKeyapdMessenger for {deviceKey}", device.Key); var dev = device as PepperDash.Core.Device; @@ -709,7 +709,7 @@ namespace PepperDash.Essentials if (device is IHasCurrentSourceInfoChange) { - this.LogVerbose("Adding IHasCurrentSourceInfoMessenger for {deviceKey}", device.Key ); + this.LogVerbose("Adding IHasCurrentSourceInfoMessenger for {deviceKey}", device.Key); var messenger = new IHasCurrentSourceInfoMessenger( $"{device.Key}-currentSource-{Key}", @@ -942,7 +942,7 @@ namespace PepperDash.Essentials messengerAdded = true; } - if (device is IDspPresets dspPresets) + if (device is IDspPresets dspPresets) { this.LogVerbose("Adding IDspPresetsMessenger for {deviceKey}", device.Key ); @@ -958,13 +958,11 @@ namespace PepperDash.Essentials messengerAdded = true; } - this.LogVerbose("Trying to cast to generic device for device: {key}", device.Key ); + this.LogVerbose("Trying to cast to generic device for device: {key}", device.Key); if (device is EssentialsDevice) { - var genericDevice = device as EssentialsDevice; - - if (genericDevice == null || messengerAdded) + if (!(device is EssentialsDevice genericDevice) || messengerAdded) { this.LogVerbose( "Skipping GenericMessenger for {deviceKey}. Messenger(s) Added: {messengersAdded}.", @@ -1100,7 +1098,7 @@ namespace PepperDash.Essentials $"Connecting to MC API server" ); - ConnectWebsocketClient(); + ConnectWebsocketClient(); }, "mobileconnect", "Forces connect of websocket", @@ -1111,7 +1109,7 @@ namespace PepperDash.Essentials s => { _disableReconnect = true; - + CleanUpWebsocketClient(); CrestronConsole.ConsoleCommandResponse( @@ -1334,7 +1332,7 @@ namespace PepperDash.Essentials { if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Appliance) { - this.LogWarning( + this.LogWarning( "System Monitor does not exist for this platform. Skipping..." ); return; @@ -1394,7 +1392,7 @@ namespace PepperDash.Essentials CrestronConsole.ConsoleCommandResponse( $"{cmdparameters} is not a valid debug level. Valid options are:\r\n{LogLevel.Trace}\r\n{LogLevel.Debug}\r\n{LogLevel.Info}\r\n{LogLevel.Warn}\r\n{LogLevel.Error}\r\n{LogLevel.Fatal}\r\n" ); - + } } @@ -1617,8 +1615,8 @@ namespace PepperDash.Essentials if (Config.EnableApiServer) { - CrestronConsole.ConsoleCommandResponse( - @"Mobile Control Edge Server API Information: + CrestronConsole.ConsoleCommandResponse( + @"Mobile Control Edge Server API Information: Server address: {0} System Name: {1} @@ -1627,14 +1625,14 @@ namespace PepperDash.Essentials System User code: {4} Connected?: {5} Seconds Since Last Ack: {6}", - url, - name, - ConfigReader.ConfigObject.SystemUrl, - SystemUuid, - code, - conn, - secSinceLastAck.Seconds - ); + url, + name, + ConfigReader.ConfigObject.SystemUrl, + SystemUuid, + code, + conn, + secSinceLastAck.Seconds + ); } else { @@ -1960,17 +1958,16 @@ Mobile Control Direct Server Infromation: confObject.Info.RuntimeInfo.AssemblyVersion = essentialsVersion; -// // Set for local testing -// confObject.RuntimeInfo.PluginVersion = "4.0.0-localBuild"; + // // Set for local testing + // confObject.RuntimeInfo.PluginVersion = "4.0.0-localBuild"; // Populate the plugin version var pluginVersion = Assembly .GetExecutingAssembly() .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false); - var fullVersionAtt = pluginVersion[0] as AssemblyInformationalVersionAttribute; - if (fullVersionAtt != null) + if (pluginVersion[0] is AssemblyInformationalVersionAttribute fullVersionAtt) { var pluginInformationalVersion = fullVersionAtt.InformationalVersion; @@ -2003,7 +2000,7 @@ Mobile Control Direct Server Infromation: if (Config.EnableApiServer) { - _transmitToServerQueue.Enqueue(new TransmitMessage(o, _wsClient2)); + _transmitToServerQueue.Enqueue(new TransmitMessage(o, _wsClient2)); } @@ -2074,7 +2071,7 @@ Mobile Control Direct Server Infromation: private void PingTimerCallback(object o) { this.LogDebug( - + "Ping timer expired. Closing websocket" ); @@ -2142,7 +2139,6 @@ Mobile Control Direct Server Infromation: { var clientId = content["clientId"].Value(); var roomKey = content["roomKey"].Value(); - var touchpanelKey = content.SelectToken("touchpanelKey"); //content["touchpanelKey"].Value(); if (_roomCombiner == null) { @@ -2198,7 +2194,7 @@ Mobile Control Direct Server Infromation: catch { qrChecksum = new JValue(string.Empty); - } + } if (code == null) { @@ -2283,7 +2279,7 @@ Mobile Control Direct Server Infromation: // Can't do direct comparison because it will match /room/roomA with /room/roomA/xxx instead of /room/roomAB/xxx var handlersKv = _actionDictionary.FirstOrDefault(kv => message.Type.StartsWith(kv.Key + "/")); // adds trailing slash to ensure above case is handled - + if (handlersKv.Key == null) { diff --git a/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj b/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj index ca694e96..c32f226f 100644 --- a/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj +++ b/src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj @@ -30,6 +30,11 @@ + + + + + @@ -48,15 +53,15 @@ - + false runtime - + false runtime - + false runtime diff --git a/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlBridgeBase.cs b/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlBridgeBase.cs index e46eaf34..c005ca17 100644 --- a/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlBridgeBase.cs +++ b/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlBridgeBase.cs @@ -1,10 +1,11 @@ using PepperDash.Core; +using PepperDash.Core.Logging; using PepperDash.Essentials.AppServer.Messengers; using PepperDash.Essentials.Core.DeviceTypeInterfaces; using System; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.RoomBridges { /// /// @@ -102,12 +103,12 @@ namespace PepperDash.Essentials /// protected virtual void UserCodeChange() { - Debug.Console(1, this, "Server user code changed: {0}", UserCode); + this.LogDebug("Server user code changed: {userCode}", UserCode); var qrUrl = string.Format($"{Parent.Host}/api/rooms/{Parent.SystemUuid}/{RoomKey}/qr?x={new Random().Next()}"); QrCodeUrl = qrUrl; - Debug.Console(1, this, "Server user code changed: {0} - {1}", UserCode, qrUrl); + this.LogDebug("Server user code changed: {userCode} - {qrCodeUrl}", UserCode, qrUrl); OnUserCodeChanged(); } diff --git a/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs b/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs index ba6a3b0b..ac53a1d4 100644 --- a/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs +++ b/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs @@ -16,14 +16,14 @@ using PepperDash.Essentials.Devices.Common.Cameras; using PepperDash.Essentials.Devices.Common.Room; using PepperDash.Essentials.Devices.Common.VideoCodec; using PepperDash.Essentials.Room.Config; +using PepperDash.Essentials.WebSocketServer; using System; using System.Collections.Generic; using System.Linq; using IShades = PepperDash.Essentials.Core.Shades.IShades; using ShadeBase = PepperDash.Essentials.Devices.Common.Shades.ShadeBase; -using Volume = PepperDash.Essentials.Room.MobileControl.Volume; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.RoomBridges { public class MobileControlEssentialsRoomBridge : MobileControlBridgeBase { @@ -339,7 +339,7 @@ namespace PepperDash.Essentials string shareText; bool isSharing; - if (Room is IHasCurrentSourceInfoChange srcInfoRoom && (Room is IHasVideoCodec vcRoom && (vcRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && srcInfoRoom.CurrentSourceInfo != null))) + if (Room is IHasCurrentSourceInfoChange srcInfoRoom && Room is IHasVideoCodec vcRoom && vcRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && srcInfoRoom.CurrentSourceInfo != null) { shareText = srcInfoRoom.CurrentSourceInfo.PreferredName; isSharing = true; @@ -532,7 +532,8 @@ namespace PepperDash.Essentials } return state; - } catch (Exception ex) + } + catch (Exception ex) { Debug.LogMessage(ex, "Error getting full status", this); return null; @@ -560,7 +561,7 @@ namespace PepperDash.Essentials { var zrcTp = DeviceManager.AllDevices.OfType().SingleOrDefault((tp) => tp.ZoomRoomController); - configuration.ZoomRoomControllerKey = zrcTp != null ? zrcTp.Key : null; + configuration.ZoomRoomControllerKey = zrcTp?.Key; } catch { @@ -578,7 +579,7 @@ namespace PepperDash.Essentials // find the room combiner for this room by checking if the room is in the list of rooms for the room combiner var roomCombiner = DeviceManager.AllDevices.OfType().FirstOrDefault(); - configuration.RoomCombinerKey = roomCombiner != null ? roomCombiner.Key : null; + configuration.RoomCombinerKey = roomCombiner?.Key; if (room is IEssentialsRoomPropertiesConfig propertiesConfig) @@ -620,7 +621,8 @@ namespace PepperDash.Essentials configuration.VideoCodecKey = vcRoom.VideoCodec.Key; configuration.VideoCodecIsZoomRoom = type.Name.Equals("ZoomRoom", StringComparison.InvariantCultureIgnoreCase); } - }; + } + ; if (room is IHasAudioCodec acRoom) { @@ -655,7 +657,7 @@ namespace PepperDash.Essentials eEnvironmentalDeviceTypes type = eEnvironmentalDeviceTypes.None; - if (dev is ILightingScenes || dev is Devices.Common.Lighting.LightingBase) + if (dev is ILightingScenes) { type = eEnvironmentalDeviceTypes.Lighting; } @@ -871,7 +873,7 @@ namespace PepperDash.Essentials public Dictionary SourceList { get; set; } [JsonProperty("destinationList", NullValueHandling = NullValueHandling.Ignore)] - public Dictionary DestinationList { get; set;} + public Dictionary DestinationList { get; set; } [JsonProperty("audioControlPointList", NullValueHandling = NullValueHandling.Ignore)] public AudioControlPointListItem AudioControlPointList { get; set; } diff --git a/src/PepperDash.Essentials.MobileControl/Services/MobileControlApiService.cs b/src/PepperDash.Essentials.MobileControl/Services/MobileControlApiService.cs index 00ae00b0..262c7e07 100644 --- a/src/PepperDash.Essentials.MobileControl/Services/MobileControlApiService.cs +++ b/src/PepperDash.Essentials.MobileControl/Services/MobileControlApiService.cs @@ -66,7 +66,8 @@ namespace PepperDash.Essentials.Services } return authResponse; - } catch(Exception ex) + } + catch (Exception ex) { Debug.LogMessage(ex, "Error authorizing with Mobile Control"); return new AuthorizationResponse { Authorized = false, Reason = ex.Message }; diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/ITheme.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/ITheme.cs index 3d6eb7b9..7dc4ae16 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/ITheme.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/ITheme.cs @@ -1,15 +1,9 @@ using PepperDash.Core; -using PepperDash.Essentials.Core; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PepperDash.Essentials.Touchpanel { - public interface ITheme:IKeyed - { + public interface ITheme : IKeyed + { string Theme { get; } void UpdateTheme(string theme); diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswAppControlMessenger.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswAppControlMessenger.cs index dd69d2da..19e04775 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswAppControlMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswAppControlMessenger.cs @@ -3,7 +3,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Core.Logging; using PepperDash.Essentials.AppServer.Messengers; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; namespace PepperDash.Essentials.Touchpanel { diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswZoomControlMessenger.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswZoomControlMessenger.cs index 66ed4c1f..cbd4f6a2 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswZoomControlMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/ITswZoomControlMessenger.cs @@ -3,7 +3,6 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Core.Logging; using PepperDash.Essentials.AppServer.Messengers; -using PepperDash.Essentials.Core.DeviceTypeInterfaces; namespace PepperDash.Essentials.Touchpanel @@ -41,7 +40,7 @@ namespace PepperDash.Essentials.Touchpanel _zoomControl.ZoomInCallFeedback.OutputChange += (s, a) => - { + { PostStatusMessage(JToken.FromObject( new { diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs index 703cb291..4f5078a3 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs @@ -10,13 +10,12 @@ using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.DeviceInfo; using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.UI; -using PepperDash.Essentials.Touchpanel; using System; using System.Collections.Generic; using System.Linq; using Feedback = PepperDash.Essentials.Core.Feedback; -namespace PepperDash.Essentials.Devices.Common.TouchPanel +namespace PepperDash.Essentials.Touchpanel { //public interface IMobileControlTouchpanelController //{ @@ -75,7 +74,7 @@ namespace PepperDash.Essentials.Devices.Common.TouchPanel AddPostActivationAction(SubscribeForMobileControlUpdates); - ThemeFeedback = new StringFeedback($"{Key}-theme",() => Theme); + ThemeFeedback = new StringFeedback($"{Key}-theme", () => Theme); AppUrlFeedback = new StringFeedback($"{Key}-appUrl", () => _appUrl); QrCodeUrlFeedback = new StringFeedback($"{Key}-qrCodeUrl", () => _bridge?.QrCodeUrl); McServerUrlFeedback = new StringFeedback($"{Key}-mcServerUrl", () => _bridge?.McServerUrl); @@ -357,10 +356,11 @@ namespace PepperDash.Essentials.Devices.Common.TouchPanel _bridge = bridge; _bridge.UserCodeChanged += UpdateFeedbacks; - _bridge.AppUrlChanged += (s, a) => { - this.LogInformation("AppURL changed"); + _bridge.AppUrlChanged += (s, a) => + { + this.LogInformation("AppURL changed"); SetAppUrl(_bridge.AppUrl); - UpdateFeedbacks(s, a); + UpdateFeedbacks(s, a); }; SetAppUrl(_bridge.AppUrl); diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelProperties.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelProperties.cs index 1d8f8ebf..87f6d9a9 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelProperties.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelProperties.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using PepperDash.Essentials.Core; -namespace PepperDash.Essentials.Devices.Common.TouchPanel +namespace PepperDash.Essentials.Touchpanel { public class MobileControlTouchpanelProperties : CrestronTouchpanelPropertiesConfig { diff --git a/src/PepperDash.Essentials.MobileControl/Touchpanel/ThemeMessenger.cs b/src/PepperDash.Essentials.MobileControl/Touchpanel/ThemeMessenger.cs index cf93197c..ab48b60a 100644 --- a/src/PepperDash.Essentials.MobileControl/Touchpanel/ThemeMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl/Touchpanel/ThemeMessenger.cs @@ -27,14 +27,14 @@ namespace PepperDash.Essentials.Touchpanel var theme = content.ToObject>(); Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Setting theme to {theme}", this, theme.Value); - _tpDevice.UpdateTheme(theme.Value); + _tpDevice.UpdateTheme(theme.Value); - PostStatusMessage(JToken.FromObject(new {theme = theme.Value})); + PostStatusMessage(JToken.FromObject(new { theme = theme.Value })); }); } } - public class ThemeUpdateMessage:DeviceStateMessageBase + public class ThemeUpdateMessage : DeviceStateMessageBase { [JsonProperty("theme")] public string Theme { get; set; } diff --git a/src/PepperDash.Essentials.MobileControl/TransmitMessage.cs b/src/PepperDash.Essentials.MobileControl/TransmitMessage.cs index 6e536f4a..14f928ca 100644 --- a/src/PepperDash.Essentials.MobileControl/TransmitMessage.cs +++ b/src/PepperDash.Essentials.MobileControl/TransmitMessage.cs @@ -4,6 +4,7 @@ using PepperDash.Core; using PepperDash.Core.Logging; using PepperDash.Essentials.AppServer.Messengers; using PepperDash.Essentials.Core.Queues; +using PepperDash.Essentials.WebSocketServer; using Serilog.Events; using System; using System.Threading; @@ -46,19 +47,19 @@ namespace PepperDash.Essentials return; } - + var message = JsonConvert.SerializeObject(msgToSend, Formatting.None, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore, Converters = { new IsoDateTimeConverter() } }); Debug.LogMessage(LogEventLevel.Verbose, "Message TX: {0}", null, message); _ws.Send(message); - - + + } catch (Exception ex) { - Debug.LogMessage(ex, "Caught an exception in the Transmit Processor"); + Debug.LogMessage(ex, "Caught an exception in the Transmit Processor"); } } #endregion @@ -89,7 +90,7 @@ namespace PepperDash.Essentials { try { - if(_server == null) + if (_server == null) { Debug.LogMessage(LogEventLevel.Warning, "Cannot send message. Server is null"); return; @@ -109,13 +110,13 @@ namespace PepperDash.Essentials return; } - - _server.SendMessageToAllClients(message); - _server.LogVerbose("Message TX To all clients: {message}", null, message); - + _server.SendMessageToAllClients(message); + + _server.LogVerbose("Message TX To all clients: {message}", null, message); + + - } catch (ThreadAbortException) { @@ -123,7 +124,7 @@ namespace PepperDash.Essentials } catch (Exception ex) { - Debug.LogMessage(ex,"Caught an exception in the Transmit Processor"); + Debug.LogMessage(ex, "Caught an exception in the Transmit Processor"); } diff --git a/src/PepperDash.Essentials.MobileControl/UserCodeChangedContent.cs b/src/PepperDash.Essentials.MobileControl/UserCodeChangedContent.cs index ef004421..851f1b80 100644 --- a/src/PepperDash.Essentials.MobileControl/UserCodeChangedContent.cs +++ b/src/PepperDash.Essentials.MobileControl/UserCodeChangedContent.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace PepperDash.Essentials.AppServer +namespace PepperDash.Essentials { public class UserCodeChangedContent { diff --git a/src/PepperDash.Essentials.MobileControl/Volumes.cs b/src/PepperDash.Essentials.MobileControl/Volumes.cs index 88556675..6cd83cf4 100644 --- a/src/PepperDash.Essentials.MobileControl/Volumes.cs +++ b/src/PepperDash.Essentials.MobileControl/Volumes.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using System.Collections.Generic; -namespace PepperDash.Essentials.Room.MobileControl +namespace PepperDash.Essentials { public class Volumes { diff --git a/src/PepperDash.Essentials.MobileControl/WebApiHandlers/ActionPathsHandler.cs b/src/PepperDash.Essentials.MobileControl/WebApiHandlers/ActionPathsHandler.cs index 7351cc1e..2988241b 100644 --- a/src/PepperDash.Essentials.MobileControl/WebApiHandlers/ActionPathsHandler.cs +++ b/src/PepperDash.Essentials.MobileControl/WebApiHandlers/ActionPathsHandler.cs @@ -1,7 +1,6 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; -using PepperDash.Essentials.AppServer.Messengers; using System.Collections.Generic; using System.Linq; @@ -33,7 +32,7 @@ namespace PepperDash.Essentials.WebApiHandlers private readonly MobileControlSystemController mcController; [JsonProperty("actionPaths")] - public List ActionPaths => mcController.GetActionDictionaryPaths().Select((path) => new ActionPath { MessengerKey = path.Item1, Path = path.Item2}).ToList(); + public List ActionPaths => mcController.GetActionDictionaryPaths().Select((path) => new ActionPath { MessengerKey = path.Item1, Path = path.Item2 }).ToList(); public ActionPathsResponse(MobileControlSystemController mcController) { diff --git a/src/PepperDash.Essentials.MobileControl/WebApiHandlers/MobileInfoHandler.cs b/src/PepperDash.Essentials.MobileControl/WebApiHandlers/MobileInfoHandler.cs index f0c1809c..c8b97d0b 100644 --- a/src/PepperDash.Essentials.MobileControl/WebApiHandlers/MobileInfoHandler.cs +++ b/src/PepperDash.Essentials.MobileControl/WebApiHandlers/MobileInfoHandler.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Web.RequestHandlers; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.WebSocketServer; using System; using System.Collections.Generic; using System.Linq; @@ -30,8 +31,7 @@ namespace PepperDash.Essentials.WebApiHandlers } catch (Exception ex) { - Debug.Console(1, $"exception showing mobile info: {ex.Message}"); - Debug.Console(2, $"stack trace: {ex.StackTrace}"); + Debug.LogMessage(ex, "exception showing mobile info"); context.Response.StatusCode = 500; context.Response.End(); @@ -143,7 +143,7 @@ namespace PepperDash.Essentials.WebApiHandlers public string Token => Key; [JsonProperty("connected")] - public bool Connected => context.Client == null ? false : context.Client.Context.WebSocket.IsAlive; + public bool Connected => context.Client != null && context.Client.Context.WebSocket.IsAlive; [JsonProperty("duration")] public double Duration => context.Client == null ? 0 : context.Client.ConnectedDuration.TotalSeconds; diff --git a/src/PepperDash.Essentials.MobileControl/WebApiHandlers/UiClientHandler.cs b/src/PepperDash.Essentials.MobileControl/WebApiHandlers/UiClientHandler.cs index 56d61347..73fdb104 100644 --- a/src/PepperDash.Essentials.MobileControl/WebApiHandlers/UiClientHandler.cs +++ b/src/PepperDash.Essentials.MobileControl/WebApiHandlers/UiClientHandler.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Web.RequestHandlers; using PepperDash.Essentials.Core.Web; +using PepperDash.Essentials.WebSocketServer; using Serilog.Events; namespace PepperDash.Essentials.WebApiHandlers diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs index ee9ff1f3..8cf96cc5 100644 --- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs +++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs @@ -8,6 +8,7 @@ using PepperDash.Essentials.AppServer.Messengers; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Web; +using PepperDash.Essentials.RoomBridges; using PepperDash.Essentials.WebApiHandlers; using Serilog.Events; using System; @@ -23,7 +24,7 @@ using WebSocketSharp.Server; using ErrorEventArgs = WebSocketSharp.ErrorEventArgs; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.WebSocketServer { /// /// Represents the behaviour to associate with a UiClient for WebSocket communication @@ -255,14 +256,14 @@ namespace PepperDash.Essentials Port = customPort; } - if(parent.Config.DirectServer.AutomaticallyForwardPortToCSLAN == true) + if (parent.Config.DirectServer.AutomaticallyForwardPortToCSLAN == true) { try { CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetCSAdapter); - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Automatically forwarding port {0} to CS LAN", Port); + Debug.LogMessage(LogEventLevel.Information, "Automatically forwarding port {0} to CS LAN", Port); var csAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetCSAdapter); var csIp = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId); @@ -271,12 +272,12 @@ namespace PepperDash.Essentials if (result != CrestronEthernetHelper.PortForwardingUserPatRetCodes.NoErr) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Error, "Error adding port forwarding: {0}", result); + Debug.LogMessage(LogEventLevel.Error, "Error adding port forwarding: {0}", result); } } catch (ArgumentException) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "This processor does not have a CS LAN", this); + Debug.LogMessage(LogEventLevel.Information, "This processor does not have a CS LAN", this); } catch (Exception ex) { @@ -351,7 +352,7 @@ namespace PepperDash.Essentials if (_server.IsListening) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Mobile Control WebSocket Server listening on port {port}", this, _server.Port); + Debug.LogMessage(LogEventLevel.Information, "Mobile Control WebSocket Server listening on port {port}", this, _server.Port); } CrestronEnvironment.ProgramStatusEventHandler += OnProgramStop; @@ -537,7 +538,7 @@ namespace PepperDash.Essentials { Debug.LogMessage(ex, "Error getting application configuration", this); - Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Config Object: {config} from {parentConfig}", this, config, _parent.Config); + Debug.LogMessage(LogEventLevel.Verbose, "Config Object: {config} from {parentConfig}", this, config, _parent.Config); } return config; @@ -558,9 +559,9 @@ namespace PepperDash.Essentials if (secret != null) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Secret successfully retrieved", this); + Debug.LogMessage(LogEventLevel.Information, "Secret successfully retrieved", this); - Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Secret: {0}", this, secret.Value.ToString()); + Debug.LogMessage(LogEventLevel.Debug, "Secret: {0}", this, secret.Value.ToString()); // populate the local secrets object @@ -571,27 +572,27 @@ namespace PepperDash.Essentials // populate the _uiClient collection foreach (var token in _secret.Tokens) { - if(token.Value == null) + if (token.Value == null) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "Token value is null", this); + Debug.LogMessage(LogEventLevel.Warning, "Token value is null", this); continue; - } + } - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Adding token: {0} for room: {1}", this, token.Key, token.Value.RoomKey); - - if(UiClients == null) + Debug.LogMessage(LogEventLevel.Information, "Adding token: {0} for room: {1}", this, token.Key, token.Value.RoomKey); + + if (UiClients == null) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "UiClients is null", this); + Debug.LogMessage(LogEventLevel.Warning, "UiClients is null", this); UiClients = new Dictionary(); } - + UiClients.Add(token.Key, new UiClientContext(token.Value)); } } if (UiClients.Count > 0) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Restored {uiClientCount} UiClients from secrets data", this, UiClients.Count); + Debug.LogMessage(LogEventLevel.Information, "Restored {uiClientCount} UiClients from secrets data", this, UiClients.Count); foreach (var client in UiClients) { @@ -602,7 +603,7 @@ namespace PepperDash.Essentials _server.AddWebSocketService(path, () => { var c = new UiClient(); - Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Constructing UiClient with id: {key}", this, key); + Debug.LogMessage(LogEventLevel.Debug, "Constructing UiClient with id: {key}", this, key); c.Controller = _parent; c.RoomKey = roomKey; @@ -623,10 +624,10 @@ namespace PepperDash.Essentials } else { - Debug.LogMessage(Serilog.Events.LogEventLevel.Warning, "No secret found"); + Debug.LogMessage(LogEventLevel.Warning, "No secret found"); } - Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "{uiClientCount} UiClients restored from secrets data", this, UiClients.Count); + Debug.LogMessage(LogEventLevel.Debug, "{uiClientCount} UiClients restored from secrets data", this, UiClients.Count); } catch (Exception ex) { @@ -643,7 +644,7 @@ namespace PepperDash.Essentials { if (_secret == null) { - Debug.LogMessage(Serilog.Events.LogEventLevel.Error, "Secret is null", this); + Debug.LogMessage(LogEventLevel.Error, "Secret is null", this); _secret = new ServerTokenSecrets(string.Empty); } @@ -748,17 +749,17 @@ namespace PepperDash.Essentials _server.AddWebSocketService(path, () => { var c = new UiClient(); - Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Constructing UiClient with id: {0}", this, key); + Debug.LogMessage(LogEventLevel.Verbose, "Constructing UiClient with id: {0}", this, key); c.Controller = _parent; c.RoomKey = bridge.RoomKey; UiClients[key].SetClient(c); return c; }); - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Added new WebSocket UiClient service at path: {path}", this, path); - Debug.LogMessage(Serilog.Events.LogEventLevel.Information, "Token: {@token}", this, token); + Debug.LogMessage(LogEventLevel.Information, "Added new WebSocket UiClient service at path: {path}", this, path); + Debug.LogMessage(LogEventLevel.Information, "Token: {@token}", this, token); - Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "{serviceCount} websocket services present", this, _server.WebSocketServices.Count); + Debug.LogMessage(LogEventLevel.Verbose, "{serviceCount} websocket services present", this, _server.WebSocketServices.Count); UpdateSecret(); @@ -970,7 +971,7 @@ namespace PepperDash.Essentials } catch (Exception ex) { - this.LogException(ex, "Caught an exception in the OnPost handler"); + this.LogException(ex, "Caught an exception in the OnPost handler"); } } @@ -1048,7 +1049,7 @@ namespace PepperDash.Essentials var body = Encoding.UTF8.GetBytes(message); res.ContentLength64 = body.LongLength; res.Close(body, true); - + } } else @@ -1101,23 +1102,23 @@ namespace PepperDash.Essentials if (File.Exists(filePath)) { - if(filePath.EndsWith(".png")) - { + if (filePath.EndsWith(".png")) + { res.ContentType = "image/png"; } - else if(filePath.EndsWith(".jpg")) + else if (filePath.EndsWith(".jpg")) { res.ContentType = "image/jpeg"; } - else if(filePath.EndsWith(".gif")) + else if (filePath.EndsWith(".gif")) { res.ContentType = "image/gif"; } - else if(filePath.EndsWith(".svg")) + else if (filePath.EndsWith(".svg")) { res.ContentType = "image/svg+xml"; } - byte[] contents = System.IO.File.ReadAllBytes(filePath); + byte[] contents = File.ReadAllBytes(filePath); res.ContentLength64 = contents.LongLength; res.Close(contents, true); } @@ -1126,7 +1127,7 @@ namespace PepperDash.Essentials res.StatusCode = (int)HttpStatusCode.NotFound; res.Close(); } - } + } /// /// Handles requests to serve files for the Angular single page app @@ -1138,9 +1139,6 @@ namespace PepperDash.Essentials { this.LogVerbose("Requesting User app file"); - var qp = req.QueryString; - var token = qp["token"]; - string filePath = path.Split('?')[0]; // remove the token from the path if found @@ -1202,10 +1200,10 @@ namespace PepperDash.Essentials this.LogVerbose("Attempting to serve file: {filePath}", filePath); byte[] contents; - if (System.IO.File.Exists(filePath)) + if (File.Exists(filePath)) { this.LogVerbose("File found: {filePath}", filePath); - contents = System.IO.File.ReadAllBytes(filePath); + contents = File.ReadAllBytes(filePath); } else { diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/WebSocketServerSecretProvider.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/WebSocketServerSecretProvider.cs index 7aa40996..1b797767 100644 --- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/WebSocketServerSecretProvider.cs +++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/WebSocketServerSecretProvider.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using PepperDash.Essentials.Core; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.WebSocketServer { internal class WebSocketServerSecretProvider : CrestronLocalSecretsProvider {