aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server/SocketSharp
diff options
context:
space:
mode:
Diffstat (limited to 'Jellyfin.Server/SocketSharp')
-rw-r--r--Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs54
-rw-r--r--Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs3
-rw-r--r--Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs46
3 files changed, 80 insertions, 23 deletions
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
index 693c2328c..64856f04a 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
-using System.Security.Cryptography.X509Certificates;
+ using System.Net;
+ using System.Security.Cryptography.X509Certificates;
using System.Threading;
using System.Threading.Tasks;
using Emby.Server.Implementations.HttpServer;
@@ -13,9 +14,8 @@ using MediaBrowser.Model.Net;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.System;
using Microsoft.Extensions.Logging;
-using SocketHttpListener.Net;
-namespace Jellyfin.Server.SocketSharp
+ namespace Jellyfin.Server.SocketSharp
{
public class WebSocketSharpListener : IHttpListener
{
@@ -67,24 +67,44 @@ namespace Jellyfin.Server.SocketSharp
public void Start(IEnumerable<string> urlPrefixes)
{
- if (_listener == null)
- {
- _listener = new HttpListener(_logger, _cryptoProvider, _socketFactory, _streamHelper, _fileSystem, _environment);
- }
+ // TODO
+ //if (_listener == null)
+ //{
+ // _listener = new HttpListener(_logger, _cryptoProvider, _socketFactory, _streamHelper, _fileSystem, _environment);
+ //}
+
+ //_listener.EnableDualMode = _enableDualMode;
+
+ //if (_certificate != null)
+ //{
+ // _listener.LoadCert(_certificate);
+ //}
- _listener.EnableDualMode = _enableDualMode;
+ //_logger.LogInformation("Adding HttpListener prefixes {Prefixes}", urlPrefixes);
+ //_listener.Prefixes.AddRange(urlPrefixes);
- if (_certificate != null)
+ //_listener.OnContext = async c => await InitTask(c, _disposeCancellationToken).ConfigureAwait(false);
+
+ //_listener.Start();
+
+ if (_listener == null)
{
- _listener.LoadCert(_certificate);
+ _listener = new HttpListener();
}
-
+
_logger.LogInformation("Adding HttpListener prefixes {Prefixes}", urlPrefixes);
- _listener.Prefixes.AddRange(urlPrefixes);
- _listener.OnContext = async c => await InitTask(c, _disposeCancellationToken).ConfigureAwait(false);
+ //foreach (var urlPrefix in urlPrefixes)
+ //{
+ // _listener.Prefixes.Add(urlPrefix);
+ //}
+ _listener.Prefixes.Add("http://localhost:8096/");
_listener.Start();
+
+ // TODO how to do this in netcore?
+ _listener.BeginGetContext(async c => await InitTask(c, _disposeCancellationToken).ConfigureAwait(false),
+ null);
}
private static void LogRequest(ILogger logger, HttpListenerRequest request)
@@ -98,8 +118,10 @@ namespace Jellyfin.Server.SocketSharp
request.UserAgent ?? string.Empty);
}
- private Task InitTask(HttpListenerContext context, CancellationToken cancellationToken)
+ private Task InitTask(IAsyncResult asyncResult, CancellationToken cancellationToken)
{
+ var context = _listener.EndGetContext(asyncResult);
+ _listener.BeginGetContext(async c => await InitTask(c, _disposeCancellationToken).ConfigureAwait(false), null);
IHttpRequest httpReq = null;
var request = context.Request;
@@ -134,7 +156,7 @@ namespace Jellyfin.Server.SocketSharp
var endpoint = ctx.Request.RemoteEndPoint.ToString();
var url = ctx.Request.RawUrl;
- var queryString = ctx.Request.QueryString;
+ var queryString = new QueryParamCollection(ctx.Request.QueryString);
var connectingArgs = new WebSocketConnectingEventArgs
{
@@ -153,7 +175,7 @@ namespace Jellyfin.Server.SocketSharp
if (WebSocketConnected != null)
{
- var socket = new SharpWebSocket(webSocketContext.WebSocket, _logger);
+ SharpWebSocket socket = null; //new SharpWebSocket(webSocketContext.WebSocket, _logger);
await socket.ConnectAsServerAsync().ConfigureAwait(false);
WebSocketConnected(new WebSocketConnectEventArgs
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
index 6458707d9..6a00e283c 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
+using System.Net;
using System.Text;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Model.Services;
@@ -438,7 +439,7 @@ namespace Jellyfin.Server.SocketSharp
public string UserAgent => request.UserAgent;
- public QueryParamCollection Headers => request.Headers;
+ public QueryParamCollection Headers => new QueryParamCollection(request.Headers);
private QueryParamCollection queryString;
public QueryParamCollection QueryString => queryString ?? (queryString = MyHttpUtility.ParseQueryString(request.Url.Query));
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs
index cf5aee5d4..552ae1754 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs
@@ -3,13 +3,14 @@ using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Sockets;
+using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using Emby.Server.Implementations;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;
using Microsoft.Extensions.Logging;
-using HttpListenerResponse = SocketHttpListener.Net.HttpListenerResponse;
using IHttpResponse = MediaBrowser.Model.Services.IHttpResponse;
using IRequest = MediaBrowser.Model.Services.IRequest;
@@ -53,7 +54,7 @@ namespace Jellyfin.Server.SocketSharp
set => _response.ContentType = value;
}
- public QueryParamCollection Headers => _response.Headers;
+ public QueryParamCollection Headers => new QueryParamCollection(_response.Headers);
private static string AsHeaderValue(Cookie cookie)
{
@@ -152,7 +153,7 @@ namespace Jellyfin.Server.SocketSharp
// you can happily set the Content-Length header in Asp.Net
// but HttpListener will complain if you do - you have to set ContentLength64 on the response.
// workaround: HttpListener throws "The parameter is incorrect" exceptions when we try to set the Content-Length header
- _response.ContentLength64 = contentLength;
+ //_response.ContentLength64 = contentLength;
}
public void SetCookie(Cookie cookie)
@@ -172,10 +173,43 @@ namespace Jellyfin.Server.SocketSharp
public void ClearCookies()
{
}
-
- public Task TransmitFile(string path, long offset, long count, FileShareMode fileShareMode, CancellationToken cancellationToken)
+ const int StreamCopyToBufferSize = 81920;
+ public async Task TransmitFile(string path, long offset, long count, FileShareMode fileShareMode, IFileSystem fileSystem, IStreamHelper streamHelper, CancellationToken cancellationToken)
{
- return _response.TransmitFile(path, offset, count, fileShareMode, cancellationToken);
+ // TODO
+ // return _response.TransmitFile(path, offset, count, fileShareMode, cancellationToken);
+ var allowAsync = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
+ //if (count <= 0)
+ //{
+ // allowAsync = true;
+ //}
+
+ var fileOpenOptions = FileOpenOptions.SequentialScan;
+
+ if (allowAsync)
+ {
+ fileOpenOptions |= FileOpenOptions.Asynchronous;
+ }
+
+ // use non-async filestream along with read due to https://github.com/dotnet/corefx/issues/6039
+
+ using (var fs = fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, fileShareMode, fileOpenOptions))
+ {
+ if (offset > 0)
+ {
+ fs.Position = offset;
+ }
+
+ if (count > 0)
+ {
+ await streamHelper.CopyToAsync(fs, OutputStream, count, cancellationToken).ConfigureAwait(false);
+ }
+ else
+ {
+ await fs.CopyToAsync(OutputStream, StreamCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+ }
+ }
}
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-04 03:19:29 +0000