Dispose method for WebSocket

Author: David Douglas

UnityWebSocket.cs

@@ -17,7 +17,7 @@ public abstract class UnityWebSocket : MonoBehaviour {
     protected string WebSocketUri;
     protected List<UnityKeyValue> Headers;
 
-    private IWebSocket _ws;
+    protected IWebSocket _ws;
 
     protected bool isAttached = false;
 
@@ -41,9 +41,6 @@ protected virtual void OnWebSocketOpen (object sender, EventArgs e) {
 
     protected virtual void OnWebSocketClose (object sender, WebSocketCloseEventArgs e) {
       Debug.Log ("Web socket closed with reason: " + e.Reason);
-      if (!e.WasClean) {
-        DisconnectWebSocket ();
-      }
       DettachHandlers();
     }
 
@@ -75,7 +72,7 @@ public void SendUTF8Text (string text, Action<bool> callback = null) {
       SendBytes (data, callback);
     }
 
-    public void SendInputText (InputField inputField) {
+    public virtual void SendInputText (InputField inputField) {
       SendText (inputField.text);
     }
 
@@ -93,17 +90,19 @@ protected void ConnectWebSocket () {
         return;
       }
 
-      if (_ws == null) {
+      if (_ws == null || !_ws.IsConfigured()) {
         var customHeaders = new List<KeyValuePair<string, string>>();
-        foreach (UnityKeyValue header in Headers) {
-          customHeaders.Add(new KeyValuePair<string, string>(header.key, header.value));
+        if (Headers != null) {
+          foreach (UnityKeyValue header in Headers) {
+            customHeaders.Add(new KeyValuePair<string, string>(header.key, header.value));
+          }
         }
 
         Debug.Log ("Create Web Socket: " + WebSocketUri);
 #if ENABLE_WINMD_SUPPORT
         Debug.Log ("Using UWP Web Socket");
         _ws = new WebSocketUWP();
-#else
+#elif UNITY_EDITOR || ENABLE_MONO
         Debug.Log("Using Mono Web Socket");
         _ws = new WebSocketMono();
 #endif

UnityWebSocketScript.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using WebSocketSharp;
 
 namespace Unity3dAzure.WebSockets {
   public sealed class UnityWebSocketScript : UnityWebSocket {

WebSocket/IWebSocket.cs

@@ -15,6 +15,7 @@ public interface IWebSocket {
     void SendAsync(byte[] data, Action<bool> completed = null);
     void SendAsync(string text, Action<bool> completed = null);
 
+    bool IsConfigured();
     bool IsOpen();
     string Url();
 

WebSocket/WebSocketMono.cs

@@ -1,3 +1,4 @@
+#if UNITY_EDITOR || ENABLE_MONO
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -45,7 +46,8 @@ public void ConfigureWebSocket(string url, List<KeyValuePair<string, string>> he
 
     public void ConnectAsync() {
       if (socket == null) {
-        throw new Exception("WebSocket needs to be configured!");
+        Debug.LogError("WebSocket not configured!");
+        return;
       }
       AttachHandlers();
       socket.ConnectAsync();
@@ -58,6 +60,13 @@ public void CloseAsync() {
       socket.CloseAsync();
     }
 
+    public bool IsConfigured() {
+      if (socket == null) {
+        return false;
+      }
+      return true;
+    }
+
     public bool IsOpen() {
       if (socket == null || socket.ReadyState != WebSocketState.Open) {
         return false;
@@ -101,6 +110,12 @@ private void UnattachHandlers() {
       socket.OnClose -= HandleOnClose;
     }
 
+    private void Dispose() {
+      ((IDisposable)socket).Dispose();
+      socket = null;
+      isAttached = false;
+    }
+
     private void HandleOnError(object sender, WebSocketSharp.ErrorEventArgs e) {
       if (OnError != null) {
         OnError.Invoke(sender, new WebSocketErrorEventArgs(e.Message));
@@ -125,6 +140,7 @@ private void HandleOnClose(object sender, WebSocketSharp.CloseEventArgs e) {
         OnClose.Invoke(sender, new WebSocketCloseEventArgs(e.Reason, e.Code));
       }
       UnattachHandlers();
+      Dispose();
     }
 
 #endregion
@@ -153,3 +169,4 @@ public bool CheckValidCertificateCallback(System.Object sender, X509Certificate
 
   }
 }
+#endif

WebSocket/WebSocketUWP.cs

@@ -86,6 +86,13 @@ public void CloseAsync() {
       }
     }
 
+    public bool IsConfigured() {
+      if (socket == null) {
+        return false;
+      }
+      return true;
+    }
+
     public bool IsOpen() {
       if (socket != null && isOpened) {
         return true;