From 3eaa86905fee7eec6afee9ad80932943a00f2466 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Mon, 20 Nov 2023 19:21:30 -0700
Subject: [PATCH] feat: working websocket debug server

---
 src/Directory.Build.props                           |  1 +
 .../PepperDash.Essentials.Core.csproj               |  2 +-
 .../RequestHandlers/DebugSessionRequestHandler.cs   | 13 ++++++-------
 .../PepperDash.Essentials.Devices.Common.csproj     |  2 +-
 .../PepperDash.Essentials.csproj                    |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 698a159f..9c82b403 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.0.0-local</Version>
+    <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technologies</Authors>
     <Company>PepperDash Technologies</Company>
     <Product>PepperDash Essentials</Product>
diff --git a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
index c90612d9..ab2751d8 100644
--- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
+++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
       <Aliases>Full</Aliases>
     </PackageReference>
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-351" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-366" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />
diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs
index 725d9fb1..f97ed31d 100644
--- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs
+++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs
@@ -42,12 +42,7 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
 
                 var port = 0;
 
-                if(Debug.WebsocketSink == null)
-                {
-                    Debug.Console(0, "WebsocketSink is null");
-                }
-
-                if (!Debug.WebsocketSink.IsListening)
+                if (!Debug.WebsocketSink.IsRunning)
                 {
                     Debug.Console(0, "Starting WS Server");
                     // Generate a random port within a specified range
@@ -56,11 +51,15 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
                     Debug.WebsocketSink.StartServerAndSetPort(port);
                 }
 
+                var url = Debug.WebsocketSink.Url;
+
                 object data = new
                 {
-                    url = string.Format(@"wss://{0}:{1}", ip, Debug.WebsocketSink.Port)
+                    url = Debug.WebsocketSink.Url
                 };
 
+                Debug.Console(0, "Debug Session URL: {0}", url);
+
                 // Return the port number with the full url of the WS Server
                 var res = JsonConvert.SerializeObject(data);
 
diff --git a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
index 5ffd68fa..5d269def 100644
--- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
+++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
@@ -31,6 +31,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
       <Aliases>Full</Aliases>
     </PackageReference>
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-351" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-366" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/PepperDash.Essentials/PepperDash.Essentials.csproj b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
index aaf9b878..023a0911 100644
--- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj
+++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
@@ -51,7 +51,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
       <Aliases>Full</Aliases>
     </PackageReference>
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-351" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-366" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />