Updated to latest version and fixed cookie handling

Author: FlorianRappl

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.2
+
+- Updated to latest version
+- Dispose WebSocket on unload
+
 # 0.3.1
 
 - Adjusted to service changes

src/AngleSharp.Io/AngleSharp.Io.csproj

@@ -33,8 +33,8 @@
     <DocumentationFile>bin\Release\AngleSharp.Io.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.7.21214, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.7\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.8.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.8\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

src/AngleSharp.Io/Dom/WebSocket.cs

@@ -3,6 +3,7 @@
     using AngleSharp.Attributes;
     using AngleSharp.Dom;
     using AngleSharp.Dom.Events;
+    using AngleSharp.Html;
     using AngleSharp.Io.Extensions;
     using System;
     using System.Linq;
@@ -20,24 +21,29 @@ public class WebSocket : EventTarget, IDisposable
     {
         #region Fields
 
-        const Int32 ReceiveChunkSize = 2048;
-        const Int32 SendChunkSize = 1024;
+        private const Int32 ReceiveChunkSize = 2048;
+        private const Int32 SendChunkSize = 1024;
 
-        readonly Url _url;
-        readonly CancellationTokenSource _cts;
-        readonly ClientWebSocket _ws;
-        readonly IWindow _window;
+        private readonly Url _url;
+        private readonly CancellationTokenSource _cts;
+        private readonly ClientWebSocket _ws;
+        private readonly IWindow _window;
 
         WebSocketReadyState _state;
 
         #endregion
 
         #region Event Names
 
-        static readonly String OpenEvent = "open";
-        static readonly String CloseEvent = "close";
-        static readonly String MessageEvent = "message";
-        static readonly String ErrorEvent = "error";
+        /// <summary>
+        /// The open event name.
+        /// </summary>
+        public static readonly String OpenEvent = "open";
+
+        /// <summary>
+        /// The close event name.
+        /// </summary>
+        public static readonly String CloseEvent = "close";
 
         #endregion
 
@@ -59,8 +65,8 @@ public event DomEventHandler Opened
         [DomName("onmessage")]
         public event DomEventHandler Message
         {
-            add { AddEventListener(MessageEvent, value, false); }
-            remove { RemoveEventListener(MessageEvent, value, false); }
+            add { AddEventListener(EventNames.Message, value, false); }
+            remove { RemoveEventListener(EventNames.Message, value, false); }
         }
 
         /// <summary>
@@ -69,8 +75,8 @@ public event DomEventHandler Message
         [DomName("onerror")]
         public event DomEventHandler Error
         {
-            add { AddEventListener(ErrorEvent, value, false); }
-            remove { RemoveEventListener(ErrorEvent, value, false); }
+            add { AddEventListener(EventNames.Error, value, false); }
+            remove { RemoveEventListener(EventNames.Error, value, false); }
         }
 
         /// <summary>
@@ -122,22 +128,7 @@ public WebSocket(IWindow window, String url, params String[] protocols)
 
             _ws.Options.KeepAliveInterval = TimeSpan.FromSeconds(20);
             ConnectAsync(url).Forget();
-        }
-
-        async Task ConnectAsync(String url)
-        {
-            try
-            {
-                await _ws.ConnectAsync(new Uri(url), _cts.Token).ConfigureAwait(false);
-                _state = WebSocketReadyState.Open;
-                OnConnected();
-                ListenAsync().Forget();
-            }
-            catch (Exception ex)
-            {
-                _state = WebSocketReadyState.Closed;
-                OnError(ex);
-            }
+            _window.Unloaded += OnUnload;
         }
 
         #endregion
@@ -225,7 +216,34 @@ void IDisposable.Dispose()
 
         #region Helpers
 
-        static Boolean IsValid(String protocol)
+        private async Task ConnectAsync(String url)
+        {
+            try
+            {
+                await _ws.ConnectAsync(new Uri(url), _cts.Token).ConfigureAwait(false);
+                _state = WebSocketReadyState.Open;
+                OnConnected();
+                ListenAsync().Forget();
+            }
+            catch (Exception ex)
+            {
+                _state = WebSocketReadyState.Closed;
+                OnError(ex);
+            }
+        }
+
+        private void OnUnload(Object sender, Event ev)
+        {
+            RemoveEventListeners();
+
+            if (_state != WebSocketReadyState.Closed && _state != WebSocketReadyState.Closing)
+            {
+                CloseAsync().Wait();
+                _ws.Dispose();
+            }
+        }
+
+        private static Boolean IsValid(String protocol)
         {
             for (var i = 0; i < protocol.Length; i++)
             {
@@ -238,7 +256,7 @@ static Boolean IsValid(String protocol)
             return true;
         }
 
-        async Task SendAsync(String message)
+        private async Task SendAsync(String message)
         {
             var messageBuffer = Encoding.UTF8.GetBytes(message);
             var remainder = 0;
@@ -262,15 +280,15 @@ async Task SendAsync(String message)
             }
         }
 
-        async Task CloseAsync()
+        private async Task CloseAsync()
         {
             _state = WebSocketReadyState.Closing;
             await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, String.Empty, _cts.Token).ConfigureAwait(false);
             CancelListener();
             OnDisconnected();
         }
 
-        async Task ListenAsync()
+        private async Task ListenAsync()
         {
             var buffer = new Byte[ReceiveChunkSize];
             var stringResult = new StringBuilder();
@@ -305,35 +323,35 @@ async Task ListenAsync()
             }
         }
 
-        void CancelListener()
+        private void CancelListener()
         {
             _cts.Cancel();
             _ws.Abort();
             _state = WebSocketReadyState.Closed;
         }
 
-        void OnMessage(String message)
+        private void OnMessage(String message)
         {
             var evt = new MessageEvent();
-            evt.Init(MessageEvent, false, false, message, _url.Origin, String.Empty, _window);
+            evt.Init(EventNames.Message, false, false, message, _url.Origin, String.Empty, _window);
             this.Dispatch(evt);
         }
 
-        void OnError(Exception ex)
+        private void OnError(Exception ex)
         {
             var evt = new ErrorEvent();
-            evt.Init(ErrorEvent, false, false);
+            evt.Init(EventNames.Error, false, false);
             this.Dispatch(evt);
         }
 
-        void OnDisconnected()
+        private void OnDisconnected()
         {
             var evt = new Event();
             evt.Init(CloseEvent, false, false);
             this.Dispatch(evt);
         }
 
-        void OnConnected()
+        private void OnConnected()
         {
             var evt = new Event();
             evt.Init(OpenEvent, false, false);

src/AngleSharp.Io/IoConfigurationExtensions.cs

@@ -19,8 +19,7 @@ public static class IoConfigurationExtensions
         /// <returns>The new configuration.</returns>
         public static IConfiguration WithRequesters(this IConfiguration configuration, Action<ConfigurationExtensions.LoaderSetup> setup = null)
         {
-            var requesters = new IRequester[] { new HttpClientRequester(), new DataRequester(), new FtpRequester(), new FileRequester() };
-            return configuration.WithDefaultLoader(setup, requesters);
+            return configuration.WithRequesters(new HttpClientHandler { UseCookies = false, AllowAutoRedirect = false }, setup);
         }
 
         /// <summary>

src/AngleSharp.Io/Network/HttpClientRequester.cs

@@ -6,6 +6,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Net;
     using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
@@ -120,9 +121,23 @@ public async Task<IResponse> RequestAsync(IRequest request, CancellationToken ca
                 }
             }
 
+            if (IsRedirected(response) && !response.Headers.ContainsKey(HeaderNames.SetCookie))
+            {
+                response.Headers[HeaderNames.SetCookie] = String.Empty;
+            }
+
             return response;
         }
 
+        private static Boolean IsRedirected(Response response)
+        {
+            var status = response.StatusCode;
+
+            return status == HttpStatusCode.Redirect || status == HttpStatusCode.RedirectKeepVerb ||
+                   status == HttpStatusCode.RedirectMethod || status == HttpStatusCode.TemporaryRedirect ||
+                   status == HttpStatusCode.MovedPermanently || status == HttpStatusCode.MultipleChoices;
+        }
+
         #endregion
     }
 }

src/AngleSharp.Io/Properties/AssemblyInfo.cs

@@ -12,6 +12,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("10d96c84-41d5-4c21-bacf-5d6997c85082")]
-[assembly: AssemblyVersion("0.3.1.*")]
-[assembly: AssemblyFileVersion("0.3.1")]
+[assembly: AssemblyVersion("0.3.2.0")]
+[assembly: AssemblyFileVersion("0.3.2")]
 [assembly: InternalsVisibleToAttribute("AngleSharp.Io.Tests")]

src/AngleSharp.Io/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.7" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.8" targetFramework="net45" />
 </packages>