update translations

2 files changed, 42 insertions, 19 deletions

diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index 6f14bb322..a65184f61 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -249,13 +249,13 @@ namespace MediaBrowser.Server.Implementations.ServerManager
                 _logger.Info("Sending web socket message {0}", messageType);
 
                 var message = new WebSocketMessage<T> { MessageType = messageType, Data = dataFunction() };
-                var bytes = _jsonSerializer.SerializeToBytes(message);
+                var json = _jsonSerializer.SerializeToString(message);
 
                 var tasks = connectionsList.Select(s => Task.Run(() =>
                 {
                     try
                     {
-                        s.SendAsync(bytes, cancellationToken);
+                        s.SendAsync(json, cancellationToken);
                     }
                     catch (OperationCanceledException)
                     {
@@ -265,7 +265,8 @@ namespace MediaBrowser.Server.Implementations.ServerManager
                     {
                         _logger.ErrorException("Error sending web socket message {0} to {1}", ex, messageType, s.RemoteEndPoint);
                     }
-                }));
+
+                }, cancellationToken));
 
                 await Task.WhenAll(tasks).ConfigureAwait(false);
             }
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 2b60f3116..3c3d7740a 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -194,9 +194,9 @@ namespace MediaBrowser.Server.Implementations.ServerManager
                 throw new ArgumentNullException("message");
             }
 
-            var bytes = _jsonSerializer.SerializeToBytes(message);
+            var json = _jsonSerializer.SerializeToString(message);
 
-            return SendAsync(bytes, cancellationToken);
+            return SendAsync(json, cancellationToken);
         }
 
         /// <summary>
@@ -205,24 +205,46 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         /// <param name="buffer">The buffer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task SendAsync(byte[] buffer, CancellationToken cancellationToken)
+        public async Task SendAsync(byte[] buffer, CancellationToken cancellationToken)
         {
-            return SendAsync(buffer, WebSocketMessageType.Text, cancellationToken);
+            if (buffer == null)
+            {
+                throw new ArgumentNullException("buffer");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Per msdn docs, attempting to send simultaneous messages will result in one failing.
+            // This should help us workaround that and ensure all messages get sent
+            await _sendSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            try
+            {
+                await _socket.SendAsync(buffer, true, cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.Info("WebSocket message to {0} was cancelled", RemoteEndPoint);
+
+                throw;
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error sending WebSocket message {0}", ex, RemoteEndPoint);
+
+                throw;
+            }
+            finally
+            {
+                _sendSemaphore.Release();
+            }
         }
 
-        /// <summary>
-        /// Sends a message asynchronously.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="type">The type.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">buffer</exception>
-        public async Task SendAsync(byte[] buffer, WebSocketMessageType type, CancellationToken cancellationToken)
+        public async Task SendAsync(string text, CancellationToken cancellationToken)
         {
-            if (buffer == null)
+            if (string.IsNullOrWhiteSpace(text))
             {
-                throw new ArgumentNullException("buffer");
+                throw new ArgumentNullException("text");
             }
 
             cancellationToken.ThrowIfCancellationRequested();
@@ -233,7 +255,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
 
             try
             {
-                await _socket.SendAsync(buffer, type, true, cancellationToken);
+                await _socket.SendAsync(text, true, cancellationToken);
             }
             catch (OperationCanceledException)
             {