Fixed exception closing UWP message web socket

Author: deadlyfingers

Assets/BingSpeech/BingSpeech.unity

@@ -898,7 +898,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   key: 
   languageMode: 6
-  AutoConnect: 0
+  AutoConnect: 1
 --- !u!4 &1124061416
 Transform:
   m_ObjectHideFlags: 0

Assets/UnityWebSocket/WebSocket/WebSocketUWP.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -12,6 +11,7 @@
 using Windows.Security.Cryptography.Certificates;
 using Windows.Storage.Streams;
 using Windows.Web;
+using UnityEngine;
 
 namespace Unity3dAzure.WebSockets {
   public class WebSocketUWP : IWebSocket {
@@ -25,19 +25,16 @@ public class WebSocketUWP : IWebSocket {
     public event OnClose OnClose;
 
     private bool isAttached = false;
+    private bool isOpened = false;
 
     private string url;
     private List<KeyValuePair<string, string>> headers;
 
     public void ConfigureWebSocket(string url) {
-      ConfigureWebSocket(url, null, null, 0);
+      ConfigureWebSocket(url, null);
     }
 
     public void ConfigureWebSocket(string url, List<KeyValuePair<string, string>> headers) {
-      ConfigureWebSocket(url, headers, null, 0);
-    }
-
-    public void ConfigureWebSocket(string url, List<KeyValuePair<string, string>> headers, string origin, uint waitTime) {
       if (socket != null) {
         throw new Exception("WebSocket is already configured!");
       }
@@ -57,18 +54,19 @@ public void ConfigureWebSocket(string url, List<KeyValuePair<string, string>> he
 
     public async void ConnectAsync() {
       if (socket == null) {
-        Debug.WriteLine("Configure MessageWebSocket");
+        Debug.Log("Configure MessageWebSocket");
         ConfigureWebSocket(url, headers);
       }
       AttachHandlers();
       try {
         await socket.ConnectAsync(uri);
         dataWriter = new DataWriter(socket.OutputStream);
+        isOpened = true;
         RaiseOpen();
       } catch (Exception ex) {
         WebErrorStatus status = WebSocketError.GetStatus(ex.GetBaseException().HResult);
         if (status.Equals(WebErrorStatus.Unknown)) {
-          Debug.WriteLine("An unknown WebErrorStatus exception occurred.");
+          Debug.LogError("An unknown WebErrorStatus exception occurred.");
         } else {
           RaiseError("Error: MessageWebSocket failed to connect: " + status.ToString());
         }
@@ -81,14 +79,15 @@ public void CloseAsync() {
         return;
       }
       try {
+        isOpened = false;
         socket.Close(1000, "User closed");
       } catch (Exception ex) {
         RaiseError(ex.Message);
       }
     }
 
     public bool IsOpen() {
-      if (socket != null && isAttached) {
+      if (socket != null && isOpened) {
         return true;
       }
       return false;
@@ -106,15 +105,6 @@ public async void SendAsync(byte[] data, Action<bool> completed = null) {
       await SendAsyncData(data, completed);
     }
 
-    public void SendAsync(FileInfo fileInfo, Action<bool> completed = null) {
-      using (FileStream fs = fileInfo.OpenRead()) {
-        byte[] buffer = new byte[1024];
-        while (fs.Read(buffer, 0, buffer.Length) > 0) {
-          SendAsync(buffer, completed);
-        }
-      }
-    }
-
     private async Task SendAsyncText(string message, Action<bool> completed = null) {
       try {
         await dataWriter.FlushAsync();
@@ -153,7 +143,7 @@ private async Task SendAsyncData(byte[] Data, Action<bool> completed = null) {
       }
     }
 
-    #region WebSocket Handlers
+#region WebSocket Handlers
 
     private void AttachHandlers() {
       if (isAttached) {
@@ -169,11 +159,9 @@ private void UnattachHandlers() {
         return;
       }
       isAttached = false;
-      try {
+      if (isOpened) {
         socket.MessageReceived -= HandleOnMessage;
         socket.Closed -= HandleOnClose;
-      } catch (Exception ex) {
-        Debug.WriteLine("Socket closed: " + ex.Message);
       }
     }
 
@@ -182,6 +170,8 @@ private void Dispose() {
       dataWriter = null;
       socket.Dispose();
       socket = null;
+      isAttached = false;
+      isOpened = false;
     }
 
     private void RaiseError(string message) {
@@ -226,7 +216,7 @@ private void HandleOnClose(object sender, WebSocketClosedEventArgs args) {
       Dispose();
     }
 
-    #endregion
+#endregion
 
     private Uri WebSocketUri(string url) {
       Uri webSocketUri;

README.md

@@ -2,16 +2,16 @@
 
 Web Socket samples for Unity:
 
-* Bing Speech web socket demo (requires Key)
+* [Bing Speech API](https://portal.azure.com) web socket demo (requires Key)
 * Echo message demo
 * Transform JSON demo
 
 ## :octocat: Download instructions
 
-This project contains git submodule dependencies so use:
+This project contains git submodule dependencies so use:  
 `git clone --recursive https://github.com/Unity3dAzure/UnityWebSocketDemo.git`
 
-Or if you've already done a git clone then use:
+Or if you've already done a git clone then use:  
 `git submodule update --init --recursive`
 
 ## Demos