From 98992ca580a3e921d57653161c7a27f2442e4dd3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 8 Mar 2015 14:49:51 -0400
Subject: simplify message parsing

---
 .../HttpServer/SocketSharp/SharpWebSocket.cs                           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 9dcb679f4..583b8809d 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -65,9 +65,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         void socket_OnMessage(object sender, SocketHttpListener.MessageEventArgs e)
         {
-            if (OnReceive != null)
+            if (OnReceiveBytes != null)
             {
                 OnReceiveBytes(e.RawData);
+                //OnReceive(e.Data);
             }
         }
 
-- 
cgit v1.2.3


From 55c47e50fc261849c277cb65654d91a8c5a8e308 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 8 Mar 2015 15:06:15 -0400
Subject: exclude httplistener from project

---
 .../HttpServer/SocketSharp/SharpWebSocket.cs                     | 9 ++++++++-
 .../MediaBrowser.Server.Implementations.csproj                   | 5 +++--
 .../ServerManager/ServerManager.cs                               | 3 +--
 .../Session/SessionWebSocketListener.cs                          | 3 +--
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 583b8809d..9faf2bc47 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -65,10 +65,17 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         void socket_OnMessage(object sender, SocketHttpListener.MessageEventArgs e)
         {
+            //if (!string.IsNullOrWhiteSpace(e.Data))
+            //{
+            //    if (OnReceive != null)
+            //    {
+            //        OnReceive(e.Data);
+            //    }
+            //    return;
+            //}
             if (OnReceiveBytes != null)
             {
                 OnReceiveBytes(e.RawData);
-                //OnReceive(e.Data);
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 41f970041..81b47daff 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -152,7 +152,6 @@
     <Compile Include="EntryPoints\UserDataChangeNotifier.cs" />
     <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
     <Compile Include="HttpServer\IHttpListener.cs" />
-    <Compile Include="HttpServer\NetListener\HttpListenerServer.cs" />
     <Compile Include="HttpServer\Security\AuthorizationContext.cs" />
     <Compile Include="HttpServer\ContainerAdapter.cs" />
     <Compile Include="HttpServer\GetSwaggerResource.cs" />
@@ -511,7 +510,9 @@
     <EmbeddedResource Include="Localization\iso6392.txt" />
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="HttpServer\NetListener\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index ef2fef746..dcfb9c449 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index 36a7fcbd8..d1bb4b837 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
-- 
cgit v1.2.3


From e70e06f0ac57efc66db5701f4f2a01d157eb8c8a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 8 Mar 2015 20:36:02 -0400
Subject: fix web socket message parsing

---
 .../HttpServer/SocketSharp/SharpWebSocket.cs       |  3 +-
 .../MediaBrowser.Server.Implementations.csproj     |  3 ++
 .../ServerManager/WebSocketConnection.cs           | 45 +++++++++++++++-------
 3 files changed, 36 insertions(+), 15 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs')

diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 9faf2bc47..8ab8b0215 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
 using System;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using WebSocketState = MediaBrowser.Model.Net.WebSocketState;
@@ -149,7 +150,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
                 WebSocket.OnMessage -= socket_OnMessage;
                 WebSocket.OnClose -= socket_OnClose;
                 WebSocket.OnError -= socket_OnError;
-                
+
                 _cancellationTokenSource.Cancel();
 
                 WebSocket.Close();
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 81b47daff..923e57b9b 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -98,6 +98,9 @@
     <Reference Include="ServiceStack.Text">
       <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
     </Reference>
+    <Reference Include="UniversalDetector">
+      <HintPath>..\ThirdParty\UniversalDetector\UniversalDetector.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 738e82bd0..44d8cc437 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Events;
+using System.Text;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
@@ -8,6 +9,7 @@ using System.Collections.Specialized;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using UniversalDetector;
 
 namespace MediaBrowser.Server.Implementations.ServerManager
 {
@@ -132,28 +134,43 @@ namespace MediaBrowser.Server.Implementations.ServerManager
             {
                 return;
             }
+            var charset = DetectCharset(bytes);
+
+            if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase))
+            {
+                OnReceiveInternal(Encoding.UTF8.GetString(bytes));
+            }
+            else
+            {
+                OnReceiveInternal(Encoding.ASCII.GetString(bytes));
+            }
+        }
+        private string DetectCharset(byte[] bytes)
+        {
             try
             {
-                //_logger.Debug(Encoding.UTF8.GetString(bytes));
-                using (var memoryStream = new MemoryStream(bytes))
+                using (var ms = new MemoryStream(bytes))
                 {
-                    var info = (WebSocketMessageInfo)_jsonSerializer.DeserializeFromStream(memoryStream, typeof(WebSocketMessageInfo));
+                    var detector = new CharsetDetector();
+                    detector.Feed(ms);
+                    detector.DataEnd();
 
-                    //info = new WebSocketMessageInfo
-                    //{
-                    //    MessageType = stub.MessageType,
-                    //    Data = stub.Data == null ? null : stub.Data.ToString()
-                    //};
-                    info.Connection = this;
+                    var charset = detector.Charset;
 
-                    OnReceive(info);
-                }
+                    if (!string.IsNullOrWhiteSpace(charset))
+                    {
+                        //_logger.Debug("UniversalDetector detected charset {0}", charset);
+                    }
 
+                    return charset;
+                }
             }
-            catch (Exception ex)
+            catch (IOException ex)
             {
-                _logger.ErrorException("Error processing web socket message", ex);
+                _logger.ErrorException("Error attempting to determine web socket message charset", ex);
             }
+
+            return null;
         }
 
         private void OnReceiveInternal(string message)
-- 
cgit v1.2.3