From 19032a0f6d3623f948f341176ba1e5398dfd76f4 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 20 Nov 2023 13:40:55 -0700 Subject: [PATCH] fix: Adds url property and utilizes private _path for consistency --- .../Logging/DebugWebsocketSink.cs | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Pepperdash Core/Logging/DebugWebsocketSink.cs b/src/Pepperdash Core/Logging/DebugWebsocketSink.cs index 9ad30d6..ad21b49 100644 --- a/src/Pepperdash Core/Logging/DebugWebsocketSink.cs +++ b/src/Pepperdash Core/Logging/DebugWebsocketSink.cs @@ -22,7 +22,7 @@ namespace PepperDash.Core { private HttpServer _httpsServer; - private string _path = "/join"; + private string _path = "/debug/join/"; private const string _certificateName = "selfCres"; private const string _certificatePassword = "cres12345"; @@ -35,6 +35,15 @@ namespace PepperDash.Core } } + public string Url + { + get + { + if (_httpsServer == null) return ""; + return $"wss://{_httpsServer.Address}:{_httpsServer.Port}{_httpsServer.WebSocketServices[_path].Path}"; + } + } + public bool IsRunning { get => _httpsServer?.IsListening ?? false; } @@ -112,17 +121,15 @@ namespace PepperDash.Core Debug.Console(0, "Starting Websocket Server on port: {0}", port); - Start(port, $"\\user\\{_certificateName}.pfx", _certificatePassword, @""); + Start(port, $"\\user\\{_certificateName}.pfx", _certificatePassword, @"/"); } private void Start(int port, string certPath = "", string certPassword = "", string rootPath = @"/html") { try { - _httpsServer = new HttpServer(port, true) - { - RootPath = rootPath - }; + _httpsServer = new HttpServer(port, true); + if (!string.IsNullOrWhiteSpace(certPath)) { @@ -141,7 +148,7 @@ namespace PepperDash.Core }; } Debug.Console(0, "Adding Debug Client Service"); - _httpsServer.AddWebSocketService("/debug/join"); + _httpsServer.AddWebSocketService(_path); Debug.Console(0, "Assigning Log Info"); _httpsServer.Log.Level = LogLevel.Trace; _httpsServer.Log.Output = (d, s) =>