Options, commands

Author: gedem

src/NetCoreStack.WebSockets.ProxyClient/ClientWebSocketConnector.cs

@@ -14,36 +14,37 @@ internal class ClientWebSocketConnector : IWebSocketConnector
     {
         private string _connectionId;
         private ClientWebSocket _webSocket;
-        private readonly ProxyOptions _options;
         private readonly IStreamCompressor _compressor;
         private readonly ILoggerFactory _loggerFactory;
         private readonly InvocatorRegistry _invocatorRegistry;
 
+        public ProxyOptions Options { get; }
+
         public ClientWebSocketConnector(IOptions<ProxyOptions> options, 
             IStreamCompressor compressor,
             InvocatorRegistry invocatorRegistry,
             ILoggerFactory loggerFactory)
         {
-            _options = options.Value;
             _compressor = compressor;
             _invocatorRegistry = invocatorRegistry;
             _loggerFactory = loggerFactory;
+            Options = options.Value;
         }
 
         public async Task ConnectAsync()
         {
             try
             {
-                var name = _options.ConnectorName;
-                var uri = new Uri($"ws://{_options.WebSocketHostAddress}");
+                var name = Options.ConnectorName;
+                var uri = new Uri($"ws://{Options.WebSocketHostAddress}");
                 _webSocket = new ClientWebSocket();
                 await _webSocket.ConnectAsync(uri, CancellationToken.None);
                 var receiverContext = new WebSocketReceiverContext
                 {
                     Compressor = _compressor,
                     InvocatorRegistry = _invocatorRegistry,
                     LoggerFactory = _loggerFactory,
-                    Options = _options,
+                    Options = Options,
                     WebSocket = _webSocket
                 };
                 var receiver = new WebSocketReceiver(receiverContext, Close);
@@ -55,7 +56,7 @@ public async Task ConnectAsync()
                 logger.LogDebug(new EventId((int)WebSocketState.Aborted, nameof(WebSocketState.Aborted)),
                     ex,
                     "WebSocket connection end!",
-                    _options);
+                    Options);
             }
             finally
             {

src/NetCoreStack.WebSockets.ProxyClient/IWebSocketConnector.cs

@@ -4,6 +4,7 @@ namespace NetCoreStack.WebSockets.ProxyClient
 {
     public interface IWebSocketConnector
     {
+        ProxyOptions Options { get; }
         Task ConnectAsync();
         Task SendAsync(WebSocketMessageContext context);
         Task SendBinaryAsync(byte[] bytes);

src/NetCoreStack.WebSockets/WebSocketCommands.cs

@@ -8,10 +8,6 @@ public enum WebSocketCommands : byte
         Connect = 1,
         DataSend = 2,
         Handshake = 4,
-        ServerClose = 8,
-        ServerAbort = 16,
-        CacheReady = 32,
-        CacheInvalidate = 64,
-        All = 127
+        All = 7
     }
 }