update service creation

Emby.Server.Implementations/HttpServer/HttpListenerHost.cs

@@ -182,6 +182,8 @@ namespace Emby.Server.Implementations.HttpServer
 
         private IHttpListener GetListener()
         {
+            //return new KestrelHost.KestrelListener(_logger, _environment, _fileSystem);
+
             return new WebSocketSharpListener(_logger,
                 _certificate,
                 _memoryStreamProvider,
@@ -306,7 +308,8 @@ namespace Emby.Server.Implementations.HttpServer
             if (_listener != null)
             {
                 _logger.Info("Stopping HttpListener...");
-                _listener.Stop();
+                var task = _listener.Stop();
+                Task.WaitAll(task);
                 _logger.Info("HttpListener stopped");
             }
         }
@@ -392,7 +395,7 @@ namespace Emby.Server.Implementations.HttpServer
             return address.Trim('/');
         }
 
-        private bool ValidateHost(Uri url)
+        private bool ValidateHost(string host)
         {
             var hosts = _config
                 .Configuration
@@ -405,7 +408,7 @@ namespace Emby.Server.Implementations.HttpServer
                 return true;
             }
 
-            var host = url.Host ?? string.Empty;
+            host = host ?? string.Empty;
 
             _logger.Debug("Validating host {0}", host);
 
@@ -423,7 +426,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// <summary>
         /// Overridable method that can be used to implement a custom hnandler
         /// </summary>
-        protected async Task RequestHandler(IHttpRequest httpReq, Uri url, CancellationToken cancellationToken)
+        protected async Task RequestHandler(IHttpRequest httpReq, string urlString, string host, string localPath, CancellationToken cancellationToken)
         {
             var date = DateTime.Now;
             var httpRes = httpReq.Response;
@@ -442,7 +445,7 @@ namespace Emby.Server.Implementations.HttpServer
                     return;
                 }
 
-                if (!ValidateHost(url))
+                if (!ValidateHost(host))
                 {
                     httpRes.StatusCode = 400;
                     httpRes.ContentType = "text/plain";
@@ -462,9 +465,7 @@ namespace Emby.Server.Implementations.HttpServer
                 }
 
                 var operationName = httpReq.OperationName;
-                var localPath = url.LocalPath;
 
-                var urlString = url.OriginalString;
                 enableLog = EnableLogging(urlString, localPath);
                 urlToLog = urlString;
                  logHeaders = enableLog && urlToLog.IndexOf("/videos/", StringComparison.OrdinalIgnoreCase) != -1;

Emby.Server.Implementations/HttpServer/IHttpListener.cs

@@ -19,7 +19,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// Gets or sets the request handler.
         /// </summary>
         /// <value>The request handler.</value>
-        Func<IHttpRequest, Uri, CancellationToken, Task> RequestHandler { get; set; }
+        Func<IHttpRequest, string, string, string, CancellationToken, Task> RequestHandler { get; set; }
 
         /// <summary>
         /// Gets or sets the web socket handler.
@@ -42,6 +42,6 @@ namespace Emby.Server.Implementations.HttpServer
         /// <summary>
         /// Stops this instance.
         /// </summary>
-        void Stop();
+        Task Stop();
     }
 }

Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs

@@ -53,7 +53,7 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         }
 
         public Action<Exception, IRequest, bool> ErrorHandler { get; set; }
-        public Func<IHttpRequest, Uri, CancellationToken, Task> RequestHandler { get; set; }
+        public Func<IHttpRequest, string, string, string, CancellationToken, Task> RequestHandler { get; set; }
 
         public Action<WebSocketConnectingEventArgs> WebSocketConnecting { get; set; }
 
@@ -114,7 +114,9 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
                 return Task.FromResult(true);
             }
 
-            return RequestHandler(httpReq, request.Url, cancellationToken);
+            var uri = request.Url;
+
+            return RequestHandler(httpReq, uri.OriginalString, uri.Host, uri.LocalPath, cancellationToken);
         }
 
         private void ProcessWebSocketRequest(HttpListenerContext ctx)
@@ -177,7 +179,7 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             return req;
         }
 
-        public void Stop()
+        public Task Stop()
         {
             _disposeCancellationTokenSource.Cancel();
 
@@ -190,6 +192,8 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
 
                 _listener.Close();
             }
+
+            return Task.FromResult(true);
         }
 
         public void Dispose()

Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpRequest.cs

@@ -246,13 +246,12 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             set
             {
                 this.responseContentType = value;
-                HasExplicitResponseContentType = true;
             }
         }
 
         public const string FormUrlEncoded = "application/x-www-form-urlencoded";
         public const string MultiPartFormData = "multipart/form-data";
-        private static string GetResponseContentType(IRequest httpReq)
+        public static string GetResponseContentType(IRequest httpReq)
         {
             var specifiedContentType = GetQueryStringContentType(httpReq);
             if (!string.IsNullOrEmpty(specifiedContentType)) return specifiedContentType;
@@ -360,8 +359,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
                 : strVal.Substring(0, pos);
         }
 
-        public bool HasExplicitResponseContentType { get; private set; }
-
         public static string HandlerFactoryPath;
 
         private string pathInfo;
@@ -504,13 +501,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             get { return HttpMethod; }
         }
 
-        public string Param(string name)
-        {
-            return Headers[name]
-                ?? QueryString[name]
-                ?? FormData[name];
-        }
-
         public string ContentType
         {
             get { return request.ContentType; }

Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs

@@ -29,7 +29,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         }
 
         public IRequest Request { get; private set; }
-        public bool UseBufferedStream { get; set; }
         public Dictionary<string, object> Items { get; private set; }
         public object OriginalResponse
         {

Emby.Server.Implementations/Services/HttpResult.cs

@@ -45,10 +45,15 @@ namespace Emby.Server.Implementations.Services
             var bytesResponse = this.Response as byte[];
             if (bytesResponse != null)
             {
+                var contentLength = bytesResponse.Length;
+
                 if (response != null)
-                    response.SetContentLength(bytesResponse.Length);
+                    response.SetContentLength(contentLength);
 
-                await responseStream.WriteAsync(bytesResponse, 0, bytesResponse.Length).ConfigureAwait(false);
+                if (contentLength > 0)
+                {
+                    await responseStream.WriteAsync(bytesResponse, 0, contentLength).ConfigureAwait(false);
+                }
                 return;
             }
 

Emby.Server.Implementations/Services/ResponseHelper.cs

@@ -41,11 +41,11 @@ namespace Emby.Server.Implementations.Services
 
                 response.StatusCode = httpResult.Status;
                 response.StatusDescription = httpResult.StatusCode.ToString();
-                if (string.IsNullOrEmpty(httpResult.ContentType))
+                //if (string.IsNullOrEmpty(httpResult.ContentType))
-                {
+                //{
-                    httpResult.ContentType = defaultContentType;
+                //    httpResult.ContentType = defaultContentType;
-                }
+                //}
-                response.ContentType = httpResult.ContentType;
+                //response.ContentType = httpResult.ContentType;
 
                 if (httpResult.Cookies != null)
                 {
@@ -124,7 +124,10 @@ namespace Emby.Server.Implementations.Services
                 response.ContentType = "application/octet-stream";
                 response.SetContentLength(bytes.Length);
 
+                if (bytes.Length > 0)
+                {
                     await response.OutputStream.WriteAsync(bytes, 0, bytes.Length, cancellationToken).ConfigureAwait(false);
+                }
                 return;
             }
 
@@ -133,7 +136,10 @@ namespace Emby.Server.Implementations.Services
             {
                 bytes = Encoding.UTF8.GetBytes(responseText);
                 response.SetContentLength(bytes.Length);
+                if (bytes.Length > 0)
+                {
                     await response.OutputStream.WriteAsync(bytes, 0, bytes.Length, cancellationToken).ConfigureAwait(false);
+                }
                 return;
             }
 
@@ -150,9 +156,16 @@ namespace Emby.Server.Implementations.Services
                 serializer(result, ms);
 
                 ms.Position = 0;
-                response.SetContentLength(ms.Length);
+
+                var contentLength = ms.Length;
+
+                response.SetContentLength(contentLength);
+
+                if (contentLength > 0)
+                {
                     await ms.CopyToAsync(response.OutputStream).ConfigureAwait(false);
                 }
+            }
 
             //serializer(result, outputStream);
         }

Emby.Server.Implementations/Services/ServiceHandler.cs

@@ -162,7 +162,11 @@ namespace Emby.Server.Implementations.Services
             if (RequireqRequestStream(requestType))
             {
                 // Used by IRequiresRequestStream
-                return CreateRequiresRequestStreamRequest(host, httpReq, requestType);
+                var request = ServiceHandler.CreateRequest(httpReq, restPath, GetRequestParams(httpReq), host.CreateInstance(requestType));
+
+                var rawReq = (IRequiresRequestStream)request;
+                rawReq.RequestStream = httpReq.InputStream;
+                return rawReq;
             }
 
             var requestParams = GetFlattenedRequestParams(httpReq);
@@ -176,16 +180,6 @@ namespace Emby.Server.Implementations.Services
             return requiresRequestStreamTypeInfo.IsAssignableFrom(requestType.GetTypeInfo());
         }
 
-        private static IRequiresRequestStream CreateRequiresRequestStreamRequest(HttpListenerHost host, IRequest req, Type requestType)
-        {
-            var restPath = GetRoute(req);
-            var request = ServiceHandler.CreateRequest(req, restPath, GetRequestParams(req), host.CreateInstance(requestType));
-
-            var rawReq = (IRequiresRequestStream)request;
-            rawReq.RequestStream = req.InputStream;
-            return rawReq;
-        }
-
         public static object CreateRequest(HttpListenerHost host, IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams)
         {
             var requestDto = CreateContentTypeRequest(host, httpReq, restPath.RequestType, httpReq.ContentType);
@@ -228,13 +222,16 @@ namespace Emby.Server.Implementations.Services
                 }
             }
 
-            if ((IsMethod(request.Verb, "POST") || IsMethod(request.Verb, "PUT")) && request.FormData != null)
+            if ((IsMethod(request.Verb, "POST") || IsMethod(request.Verb, "PUT")))
+            {
+                var formData = request.FormData;
+                if (formData != null)
                 {
-                foreach (var name in request.FormData.Keys)
+                    foreach (var name in formData.Keys)
                     {
                         if (name == null) continue; //thank you ASP.NET
 
-                    var values = request.FormData.GetValues(name);
+                        var values = formData.GetValues(name);
                         if (values.Count == 1)
                         {
                             map[name] = values[0];
@@ -248,6 +245,7 @@ namespace Emby.Server.Implementations.Services
                         }
                     }
                 }
+            }
 
             return map;
         }
@@ -270,12 +268,16 @@ namespace Emby.Server.Implementations.Services
                 map[name] = request.QueryString[name];
             }
 
-            if ((IsMethod(request.Verb, "POST") || IsMethod(request.Verb, "PUT")) && request.FormData != null)
+            if ((IsMethod(request.Verb, "POST") || IsMethod(request.Verb, "PUT")))
+            {
+                var formData = request.FormData;
+                if (formData != null)
                 {
-                foreach (var name in request.FormData.Keys)
+                    foreach (var name in formData.Keys)
                     {
                         if (name == null) continue; //thank you ASP.NET
-                    map[name] = request.FormData[name];
+                        map[name] = formData[name];
+                    }
                 }
             }
 

MediaBrowser.Model/Services/IRequest.cs

@@ -48,11 +48,6 @@ namespace MediaBrowser.Model.Services
         /// </summary>
         string ResponseContentType { get; set; }
 
-        /// <summary>
-        /// Whether the ResponseContentType has been explicitly overrided or whether it was just the default
-        /// </summary>
-        bool HasExplicitResponseContentType { get; }
-
         /// <summary>
         /// Attach any data to this request that all filters and services can access.
         /// </summary>

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.30.5")]
+[assembly: AssemblyVersion("3.2.30.6")]