mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
fix web socket message parsing
This commit is contained in:
parent
ecc6df0b71
commit
e70e06f0ac
3 changed files with 36 additions and 15 deletions
|
@ -2,6 +2,7 @@
|
||||||
using MediaBrowser.Controller.Net;
|
using MediaBrowser.Controller.Net;
|
||||||
using MediaBrowser.Model.Logging;
|
using MediaBrowser.Model.Logging;
|
||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using WebSocketState = MediaBrowser.Model.Net.WebSocketState;
|
using WebSocketState = MediaBrowser.Model.Net.WebSocketState;
|
||||||
|
|
|
@ -98,6 +98,9 @@
|
||||||
<Reference Include="ServiceStack.Text">
|
<Reference Include="ServiceStack.Text">
|
||||||
<HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
|
<HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="UniversalDetector">
|
||||||
|
<HintPath>..\ThirdParty\UniversalDetector\UniversalDetector.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="..\SharedVersion.cs">
|
<Compile Include="..\SharedVersion.cs">
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using MediaBrowser.Common.Events;
|
using System.Text;
|
||||||
|
using MediaBrowser.Common.Events;
|
||||||
using MediaBrowser.Controller.Net;
|
using MediaBrowser.Controller.Net;
|
||||||
using MediaBrowser.Model.Logging;
|
using MediaBrowser.Model.Logging;
|
||||||
using MediaBrowser.Model.Net;
|
using MediaBrowser.Model.Net;
|
||||||
|
@ -8,6 +9,7 @@ using System.Collections.Specialized;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using UniversalDetector;
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Implementations.ServerManager
|
namespace MediaBrowser.Server.Implementations.ServerManager
|
||||||
{
|
{
|
||||||
|
@ -132,28 +134,43 @@ namespace MediaBrowser.Server.Implementations.ServerManager
|
||||||
{
|
{
|
||||||
return;
|
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
|
try
|
||||||
{
|
{
|
||||||
//_logger.Debug(Encoding.UTF8.GetString(bytes));
|
using (var ms = new MemoryStream(bytes))
|
||||||
using (var memoryStream = new MemoryStream(bytes))
|
|
||||||
{
|
{
|
||||||
var info = (WebSocketMessageInfo)_jsonSerializer.DeserializeFromStream(memoryStream, typeof(WebSocketMessageInfo));
|
var detector = new CharsetDetector();
|
||||||
|
detector.Feed(ms);
|
||||||
|
detector.DataEnd();
|
||||||
|
|
||||||
//info = new WebSocketMessageInfo
|
var charset = detector.Charset;
|
||||||
//{
|
|
||||||
// MessageType = stub.MessageType,
|
|
||||||
// Data = stub.Data == null ? null : stub.Data.ToString()
|
|
||||||
//};
|
|
||||||
info.Connection = this;
|
|
||||||
|
|
||||||
OnReceive(info);
|
if (!string.IsNullOrWhiteSpace(charset))
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
{
|
||||||
_logger.ErrorException("Error processing web socket message", ex);
|
//_logger.Debug("UniversalDetector detected charset {0}", charset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return charset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (IOException ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error attempting to determine web socket message charset", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnReceiveInternal(string message)
|
private void OnReceiveInternal(string message)
|
||||||
|
|
Loading…
Reference in a new issue