update websocket library, add customdata to StartListening for request headers

Author: mediumTaj

Plugins/websocket-sharp.dll

@@ -300,58 +300,58 @@ private IEnumerator ProcessReceiveQueue()
         #region Threaded Functions
         // NOTE: ALl functions in this region are operating in a background thread, do NOT call any Unity functions!
 #if !NETFX_CORE
-		private void SendMessages()
-		{
-			try
-			{
-				WebSocket ws = null;
-
-				ws = new WebSocket(URL);
-				//if (Headers != null)
-				//    ws.Headers = Headers;
-				if (Authentication != null)
-					ws.SetCredentials(Authentication.Username, Authentication.Password, true);
-				ws.OnOpen += OnWSOpen;
-				ws.OnClose += OnWSClose;
-				ws.OnError += OnWSError;
-				ws.OnMessage += OnWSMessage;
-				ws.Connect();
-
-				while (_connectionState == ConnectionState.CONNECTED)
-				{
-					_sendEvent.WaitOne(50);
-
-					Message msg = null;
-					lock (_sendQueue)
-					{
-						if (_sendQueue.Count > 0)
-							msg = _sendQueue.Dequeue();
-					}
-
-					while (msg != null)
-					{
-						if (msg is TextMessage)
-							ws.Send(((TextMessage)msg).Text);
-						else if (msg is BinaryMessage)
-							ws.Send(((BinaryMessage)msg).Data);
-
-						msg = null;
-						lock (_sendQueue)
-						{
-							if (_sendQueue.Count > 0)
-								msg = _sendQueue.Dequeue();
-						}
-					}
-				}
-
-				ws.Close();
-			}
-			catch (System.Exception e)
-			{
-				_connectionState = ConnectionState.DISCONNECTED;
-				Log.Error("WSConnector", "Caught WebSocket exception: {0}", e.ToString());
-			}
-		}
+        private void SendMessages()
+        {
+            try
+            {
+                WebSocket ws = null;
+
+                ws = new WebSocket(URL);
+                if (Headers != null)
+                    ws.CustomHeaders = Headers;
+                if (Authentication != null)
+                    ws.SetCredentials(Authentication.Username, Authentication.Password, true);
+                ws.OnOpen += OnWSOpen;
+                ws.OnClose += OnWSClose;
+                ws.OnError += OnWSError;
+                ws.OnMessage += OnWSMessage;
+                ws.Connect();
+
+                while (_connectionState == ConnectionState.CONNECTED)
+                {
+                    _sendEvent.WaitOne(50);
+
+                    Message msg = null;
+                    lock (_sendQueue)
+                    {
+                        if (_sendQueue.Count > 0)
+                            msg = _sendQueue.Dequeue();
+                    }
+
+                    while (msg != null)
+                    {
+                        if (msg is TextMessage)
+                            ws.Send(((TextMessage)msg).Text);
+                        else if (msg is BinaryMessage)
+                            ws.Send(((BinaryMessage)msg).Data);
+
+                        msg = null;
+                        lock (_sendQueue)
+                        {
+                            if (_sendQueue.Count > 0)
+                                msg = _sendQueue.Dequeue();
+                        }
+                    }
+                }
+
+                ws.Close();
+            }
+            catch (System.Exception e)
+            {
+                _connectionState = ConnectionState.DISCONNECTED;
+                Log.Error("WSConnector", "Caught WebSocket exception: {0}", e.ToString());
+            }
+        }
 
         private void OnWSOpen(object sender, System.EventArgs e)
         {

Scripts/Connection/WSConnector.cs

@@ -501,7 +501,7 @@ private void OnGetModelResponse(RESTConnector.Request req, RESTConnector.Respons
         /// <param name="callback">All recognize results are passed to this callback.</param>
         /// <param name="speakerLabelCallback">Speaker label goes through this callback if it arrives separately from recognize result.</param>
         /// <returns>Returns true on success, false on failure.</returns>
-        public bool StartListening(OnRecognize callback, OnRecognizeSpeaker speakerLabelCallback = null)
+        public bool StartListening(OnRecognize callback, OnRecognizeSpeaker speakerLabelCallback = null, Dictionary<string, object> customData = null)
         {
             if (callback == null)
                 throw new ArgumentNullException("callback");
@@ -510,6 +510,18 @@ public bool StartListening(OnRecognize callback, OnRecognizeSpeaker speakerLabel
             if (!CreateListenConnector())
                 return false;
 
+            Dictionary<string, string> customHeaders = null;
+            if (customData.ContainsKey(Constants.String.CUSTOM_REQUEST_HEADERS))
+            {
+                foreach (KeyValuePair<string, string> kvp in customData[Constants.String.CUSTOM_REQUEST_HEADERS] as Dictionary<string, string>)
+                {
+                    customHeaders.Add(kvp.Key, kvp.Value);
+                }
+            }
+
+            if (customHeaders != null && _listenSocket != null)
+                _listenSocket.Headers = customHeaders;
+
             _isListening = true;
             _listenCallback = callback;
             if (speakerLabelCallback != null)