Fix websockets and RawUrl

3 files changed, 13 insertions, 4 deletions

diff --git a/Emby.Server.Implementations/SocketSharp/SharpWebSocket.cs b/Emby.Server.Implementations/SocketSharp/SharpWebSocket.cs
index 89004ba7f..eab903db8 100644
--- a/Emby.Server.Implementations/SocketSharp/SharpWebSocket.cs
+++ b/Emby.Server.Implementations/SocketSharp/SharpWebSocket.cs
@@ -119,7 +119,7 @@ namespace Emby.Server.Implementations.SocketSharp
                 _cancellationTokenSource.Cancel();
 
                 // TODO
-                WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "bye", CancellationToken.None).GetAwaiter().GetResult();
+                // WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "bye", CancellationToken.None).GetAwaiter().GetResult();
             }
 
             _disposed = true;
diff --git a/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
index b64fc0683..05f159b4e 100644
--- a/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
+++ b/Emby.Server.Implementations/SocketSharp/WebSocketSharpListener.cs
@@ -160,6 +160,15 @@ using Microsoft.Extensions.Logging;
                     var buffer = WebSocket.CreateClientBuffer(1024 * 4, 1024 * 4);
                     WebSocketReceiveResult result = await webSocketContext.ReceiveAsync(buffer, CancellationToken.None);
                     socket.OnReceiveBytes(buffer.Array);
+
+                    while (result.MessageType != WebSocketMessageType.Close)
+                    {
+                        result = await webSocketContext.ReceiveAsync(buffer, CancellationToken.None);
+                        socket.OnReceiveBytes(buffer.Array);
+                    }
+                    await webSocketContext.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None);
+                    socket.Dispose();
+
                     //while (!result.CloseStatus.HasValue)
                     //{
                     //    await webSocketContext.SendAsync(new ArraySegment<byte>(buffer, 0, result.Count), result.MessageType, result.EndOfMessage, CancellationToken.None);
@@ -173,11 +182,11 @@ using Microsoft.Extensions.Logging;
                     //    WebSocket = webSocketContext,
                     //    Endpoint = endpoint
                     //});
-                    await webSocketContext.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None);
+                    //await webSocketContext.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None);
                     //SharpWebSocket socket = new SharpWebSocket(webSocketContext, _logger);
                     //await socket.ConnectAsServerAsync().ConfigureAwait(false);
 
-                    
+
 
                     //await ReceiveWebSocketAsync(ctx, socket).ConfigureAwait(false);
                 }
diff --git a/Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs b/Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
index 9c5b2b083..b07c4bfeb 100644
--- a/Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
+++ b/Emby.Server.Implementations/SocketSharp/WebSocketSharpRequest.cs
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.SocketSharp
 
         public object Dto { get; set; }
 
-        public string RawUrl => request.Path.ToString();
+        public string RawUrl => request.GetEncodedPathAndQuery();
 
         public string AbsoluteUri => request.GetDisplayUrl().TrimEnd('/');