From 1531c6e794ef1bf9723975abc38c7f5f972748d7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 25 Jan 2024 10:35:27 -0600 Subject: [PATCH] refactor: Add handy WebsocketExtensions * IsSocketStateOpen * IsClosedProperly --- .../Core/WebsocketConnectionGateway.cs | 39 ++++++++++++------- .../Core/WebsocketExtensions.cs | 14 +++++++ 2 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 src/client/spark_websocket/Core/WebsocketExtensions.cs diff --git a/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs b/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs index 1c17364df..bc20e2751 100644 --- a/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs +++ b/src/client/spark_websocket/Core/WebsocketConnectionGateway.cs @@ -108,9 +108,6 @@ namespace bts.websocket_core { /// can access the store but not change anything in it, /// class WebSocketHandler { - - private static bool IsSocketStateOpen(WebSocket? ws) => ws != null && ws.State != WebSocketState.Closed && ws.State != WebSocketState.Aborted && ws.State != WebSocketState.None; - private static bool IsClosedProperly(WebSocket ws) => ws.CloseStatus == WebSocketCloseStatus.NormalClosure; /// /// GetConnectedWebSocket attempts to retrieve a connected WebSocket from the WebSocketConnectionStore using the provided client ID. /// If the socket is not found or is not in an open state, it logs an error message and calls the HandleDisconnection method on the @@ -120,16 +117,14 @@ namespace bts.websocket_core { /// The error message to log if the WebSocket is not found or not open. /// The connected WebSocket or null if it was not found or not open. private WebSocket? GetConnectedWebSocket(WebsocketClientID id, string error_message) { - LoggerContext logger = new(Log.Gen, error_message, ""); var socket = Connections.GetSocket(id); - if (IsSocketStateOpen(socket)) { + if (socket?.IsOpen() ?? false) { return socket; } - if (socket != null) { - logger.warn(" failed as Socket closed"); - } else { - logger.warn(" failed as could not find socket in dictionary"); - } + Log.Gen.warn( + $"GetConnectedWebsocket failed: {(socket is null ? + "could not find socket in dictionary" : + "socket is closed")}"); gtwy.HandleDisconnection(id, error_message); return null; } @@ -143,10 +138,13 @@ namespace bts.websocket_core { public bool ShouldDisconnect(WebsocketClientID id, Connection conn, string error_message) { LoggerContext logger = new(Log.Gen, error_message, ""); var socket = conn.Ws; - if (IsSocketStateOpen(socket)) { + if (socket is null) { + return false; + } + if (socket.IsOpen()) { return true; } - if (!IsClosedProperly(socket)) { + if (!socket.IsClosedProperly()) { logger.info(" closed improperly by other thread"); gtwy.NotifyDisconnection(id); } @@ -213,7 +211,7 @@ namespace bts.websocket_core { if (socket == null || que == null) { return; } - while (IsSocketStateOpen(socket)) { + while (socket.IsOpen()) { // Try to dequeue a message from the queue if (!que.TryDequeue(out var message)) { // If the queue is empty, wait for 100 milliseconds before trying again @@ -272,7 +270,7 @@ namespace bts.websocket_core { ArraySegment buffer = new ArraySegment(new byte[256]); WebSocketReceiveResult result; string request = ""; - while (IsSocketStateOpen(socket)) { + while (socket.IsOpen()) { // Receive the message result = await socket.ReceiveAsync(buffer, CancellationToken.None); // If the message is a close request, handle the disconnection and return @@ -417,7 +415,18 @@ namespace bts.websocket_core { _server_params = server_params; var builder = WebApplication.CreateBuilder(); - builder.WebHost.UseUrls(_server_params.Uri()); + + var localServerParams = _server_params.Clone(); + localServerParams.Scheme = "http"; + var localUri = localServerParams.Uri(); + builder.WebHost.UseUrls(localUri); + + var publicServerParams = _server_params.Clone(); + publicServerParams.Scheme = "https"; + publicServerParams.Host = "192.168.50.94"; + var publicUri = publicServerParams.Uri(); + builder.WebHost.UseUrls(publicUri); + // var MyAllowSpecificOrigins = "_myAllowSpecificOrigins"; builder.Services.AddLogging(builder => { builder.AddFilter("Microsoft", Microsoft.Extensions.Logging.LogLevel.Warning) diff --git a/src/client/spark_websocket/Core/WebsocketExtensions.cs b/src/client/spark_websocket/Core/WebsocketExtensions.cs new file mode 100644 index 000000000..bc92b0ba6 --- /dev/null +++ b/src/client/spark_websocket/Core/WebsocketExtensions.cs @@ -0,0 +1,14 @@ +namespace bts.websocket_core; + +using System.Net.WebSockets; + +public static class WebsocketExtensions { + public static bool IsOpen(this WebSocket ws) => + ws.State switch { + WebSocketState.None or WebSocketState.Closed or WebSocketState.Aborted => false, + _ => true + }; + + public static bool IsClosedProperly(this WebSocket ws) => + ws.CloseStatus == WebSocketCloseStatus.NormalClosure; +}