Merge pull request #102 from PepperDash/feature/move-messengers-out

.gitignore

@@ -359,3 +359,6 @@ MigrationBackup/
 
 # VS Code settings folders
 .vscode/
+
+# Build Outputs
+output/

.releaserc.json

@@ -0,0 +1,34 @@
+{
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "releaseRules": [
+          { "scope": "force-patch", "release": "patch" },
+          { "scope": "no-release", "release": false }
+        ]
+      }
+    ],
+    "@semantic-release/release-notes-generator",    
+    ["@semantic-release/changelog", 
+      {
+        "changelogFile": "CHANGELOG.md"
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "verifyReleaseCmd": "echo \"newVersion=true\" >> $GITHUB_OUTPUT",
+        "publishCmd": "echo \"version=${nextRelease.version}\" >> $GITHUB_OUTPUT && echo \"tag=${nextRelease.gitTag}\" >> $GITHUB_OUTPUT && echo \"type=${nextRelease.type}\" >> $GITHUB_OUTPUT && echo \"channel=${nextRelease.channel}\" >> $GITHUB_OUTPUT"
+      }
+    ]
+  ],  
+  "branches": [
+    "main",
+    {
+      "name": "replace-me-feature-branch",
+      "prerelease": "replace-me-prerelease",
+      "channel": "replace-me-prerelease"
+    }
+  ]
+}

3-series/DeviceTypeInterfaces/IChannelExtensions.cs

@@ -1,6 +1,8 @@
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
-
+#if SERIES4
+using PepperDash.Essentials.AppServer;
+#endif
 namespace PepperDash.Essentials.Room.MobileControl
 {
     public static class ChannelExtensions

3-series/DeviceTypeInterfaces/IColorExtensions.cs

@@ -1,5 +1,8 @@
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
+#if SERIES4
+using PepperDash.Essentials.AppServer;
+#endif
 
 namespace PepperDash.Essentials.Room.MobileControl
 {

3-series/DeviceTypeInterfaces/IDPadExtensions.cs

@@ -1,5 +1,8 @@
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+#if SERIES4
+using PepperDash.Essentials.AppServer;
+#endif
 
 namespace PepperDash.Essentials.Room.MobileControl
 {

3-series/Messengers/AudioCodecBaseMessenger.cs

@@ -3,6 +3,8 @@
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
 
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
 namespace PepperDash.Essentials.AppServer.Messengers
 {
     /// <summary>
@@ -31,7 +33,11 @@ public AudioCodecBaseMessenger(string key, AudioCodecBase codec, string messageP
             codec.CallStatusChange += codec_CallStatusChange;
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             base.CustomRegisterWithAppServer(appServerController);
 

3-series/Messengers/CameraBaseMessenger.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Devices.Common.Cameras;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -49,7 +50,11 @@ private void presetsCamera_PresetsListHasChanged(object sender, EventArgs e)
             });
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             base.CustomRegisterWithAppServer(appServerController);
 

3-series/Messengers/CommMonitorMessenger.cs

@@ -1,5 +1,6 @@
 using System;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -38,7 +39,11 @@ private void SendStatus()
 
         #region Overrides of MessengerBase
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendStatus));
 

3-series/Messengers/ConfigMessenger.cs

@@ -1,6 +1,7 @@
 using System;
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -21,7 +22,11 @@ private void ConfigUpdater_ConfigStatusChanged(object sender, ConfigStatusEventA
             PostUpdateStatus(e.UpdateStatus.ToString());
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/updateConfig", new Action<string>(GetConfigFile));
         }

3-series/Messengers/DevicePresetsModelMessenger.cs

@@ -49,7 +49,11 @@ private void SavePresets(List<PresetChannel> presets )
 
         #region Overrides of MessengerBase
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendPresets));
             appServerController.AddAction(MessagePath + "/recall", new Action<PresetChannelMessage>((p) =>

3-series/Messengers/DeviceVolumeMessenger.cs

@@ -1,5 +1,6 @@
 using System;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -35,7 +36,11 @@ private void SendStatus()
 
         #region Overrides of MessengerBase
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendStatus));
             appServerController.AddAction(MessagePath + "/level", new Action<ushort>(_device.SetVolume));

3-series/Messengers/GenericMessenger.cs

@@ -1,5 +1,6 @@
 using PepperDash.Essentials.Core;
 using System;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -17,7 +18,11 @@ public GenericMessenger(string key, EssentialsDevice device, string messagePath)
             _device = device;
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             base.CustomRegisterWithAppServer(appServerController);
 

3-series/Messengers/IHasScheduleAwarenessMessenger.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -24,7 +25,11 @@ public IHasScheduleAwarenessMessenger(string key, IHasScheduleAwareness schedule
             ScheduleSource.CodecSchedule.MeetingEventChange += new EventHandler<MeetingEventArgs>(CodecSchedule_MeetingEventChange);
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendFullScheduleObject));
 

3-series/Messengers/IMobileControlMessenger.cs

@@ -0,0 +1,12 @@
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+
+namespace PepperDash.Essentials.AppServer.Messengers
+{
+    public interface IMobileControlMessenger
+    {
+        IMobileControl3 AppServerController { get; }
+        string MessagePath { get; }
+
+        void RegisterWithAppServer(IMobileControl3 appServerController);
+    }
+}

3-series/Messengers/IRunRouteActionMessenger.cs

@@ -1,6 +1,7 @@
 using System;
 using PepperDash.Essentials.Core;
 using PepperDash.Core;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 
 namespace PepperDash.Essentials.AppServer.Messengers
@@ -33,7 +34,11 @@ private void routingSink_CurrentSourceChange(SourceListItem info, ChangeType typ
             SendRoutingFullMessageObject();
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(SendRoutingFullMessageObject));
 

3-series/Messengers/LightingBaseMessenger.cs

@@ -8,6 +8,7 @@
 using PepperDash.Essentials.Core.Lighting;
 
 using Newtonsoft.Json;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -38,7 +39,11 @@ void LightingDevice_LightingSceneChange(object sender, LightingSceneChangeEventA
             PostStatusMessage(state);
         }
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             base.CustomRegisterWithAppServer(appServerController);
 

3-series/Messengers/MessengerBase.cs

@@ -5,13 +5,18 @@
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
     /// <summary>
     /// Provides a messaging bridge
     /// </summary>
-    public abstract class MessengerBase : EssentialsDevice
+#if SERIES4
+    public abstract class MessengerBase : EssentialsDevice, IMobileControlMessenger
+#else
+    public abstract class MessengerBase: EssentialsDevice
+#endif
     {
         private Device _device;
 
@@ -20,7 +25,11 @@ public abstract class MessengerBase : EssentialsDevice
         /// <summary>
         /// 
         /// </summary>
+#if SERIES4
+        public IMobileControl3 AppServerController { get; private set; }
+#else
         public MobileControlSystemController AppServerController { get; private set; }
+#endif
 
         public string MessagePath { get; private set; }
 
@@ -41,7 +50,7 @@ protected MessengerBase(string key, string messagePath)
         }
 
         protected MessengerBase(string key, string messagePath, Device device)
-            :this(key, messagePath) 
+            : this(key, messagePath)
         {
             _device = device;
 
@@ -70,7 +79,11 @@ private List<string> GetInterfaces(Device device)
         /// Registers this messenger with appserver controller
         /// </summary>
         /// <param name="appServerController"></param>
+#if SERIES4
+        public void RegisterWithAppServer(IMobileControl3 appServerController)
+#else
         public void RegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             if (appServerController == null)
                 throw new ArgumentNullException("appServerController");
@@ -83,7 +96,11 @@ public void RegisterWithAppServer(MobileControlSystemController appServerControl
         /// Implemented in extending classes. Wire up API calls and feedback here
         /// </summary>
         /// <param name="appServerController"></param>
+#if SERIES4
+        protected virtual void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected virtual void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             var commMonitor = _device as ICommunicationMonitor;
 
@@ -97,7 +114,7 @@ protected virtual void CustomRegisterWithAppServer(MobileControlSystemController
         }
 
         private void CommunicationMonitor_StatusChange(object sender, MonitorStatusChangeEventArgs e)
-        {            
+        {
             var message = new DeviceStateMessageBase();
             message.CommMonitor = GetCommunicationMonitorState();
 
@@ -114,7 +131,7 @@ protected CommunicationMonitorState GetCommunicationMonitorState()
                 state.IsOnline = commMonitor.CommunicationMonitor.IsOnline;
                 state.Status = commMonitor.CommunicationMonitor.Status;
                 //Debug.Console(2, this, "******************GetCommunitcationMonitorState() IsOnline: {0} Status: {1}", state.IsOnline, state.Status);
-                return state;           
+                return state;
             }
             else
             {
@@ -163,7 +180,9 @@ protected void PostStatusMessage(DeviceStateMessageBase message)
             }
         }
 
-        protected void PostStatusMessage(MobileControlResponseMessage message)
+#if SERIES4
+        protected void PostStatusMessage(IMobileControlResponseMessage message)
+
         {
             if (AppServerController == null)
             {
@@ -185,8 +204,9 @@ protected void PostStatusMessage(MobileControlResponseMessage message)
             //    Debug.Console(2, this, "*********************Content is not DeviceStateMessageBase");
             //}
 
-            AppServerController.SendMessageObject(message); 
+            AppServerController.SendMessageObject(message);
         }
+#endif
 
         protected void PostEventMessage(DeviceEventMessageBase message)
         {

3-series/Messengers/RoomEventScheduleMessenger.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using PepperDash.Core;
 using PepperDash.Essentials.Room.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.AppServer.Messengers
 {
@@ -20,7 +21,11 @@ public RoomEventScheduleMessenger(string key, string messagePath, EssentialsTech
 
         #region Overrides of MessengerBase
 
+#if SERIES4
+        protected override void CustomRegisterWithAppServer(IMobileControl3 appServerController)
+#else
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
+#endif
         {
             appServerController.AddAction(MessagePath + "/save", new Action<List<ScheduledEventConfig>>(SaveScheduledEvents));
             appServerController.AddAction(MessagePath + "/fullStatus", new Action(() =>