Merge pull request #1132 from andersjonsson/async-readmessage

Async readmessage

Author: andersjonsson

src/SoapCore/MessageEncoder/SoapMessageEncoder.cs

@@ -128,18 +128,18 @@ public bool IsContentTypeSupported(string contentType, bool checkCharset)
 			return false;
 		}
 
-		public Message ReadMessage(PipeReader pipeReader, int maxSizeOfHeaders, string contentType)
+		public async Task<Message> ReadMessageAsync(PipeReader pipeReader, int maxSizeOfHeaders, string contentType)
 		{
 			if (pipeReader == null)
 			{
 				throw new ArgumentNullException(nameof(pipeReader));
 			}
 
 			using var stream = pipeReader.AsStream(true);
-			return ReadMessage(stream, maxSizeOfHeaders, contentType);
+			return await ReadMessageAsync(stream, maxSizeOfHeaders, contentType);
 		}
 
-		public Message ReadMessage(Stream stream, int maxSizeOfHeaders, string contentType)
+		public async Task<Message> ReadMessageAsync(Stream stream, int maxSizeOfHeaders, string contentType)
 		{
 			if (stream == null)
 			{
@@ -158,7 +158,7 @@ public Message ReadMessage(Stream stream, int maxSizeOfHeaders, string contentTy
 
 			var streamReaderWithEncoding = new StreamReader(stream, readEncoding);
 
-			message = ParsedMessage.FromStreamReader(streamReaderWithEncoding, MessageVersion);
+			message = await ParsedMessage.FromStreamReaderAsync(streamReaderWithEncoding, MessageVersion);
 
 			return message;
 		}

src/SoapCore/ParsedMessage.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.ServiceModel.Channels;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Linq;
@@ -33,7 +34,10 @@ public ParsedMessage(MessageHeaders headers, MessageProperties properties, Messa
 
 		public override bool IsEmpty => _isEmpty;
 
-		public static ParsedMessage FromStreamReader(StreamReader stream, MessageVersion version)
+#if !NETCOREAPP3_0_OR_GREATER
+#pragma warning disable CS1998 // XDocument.LoadAsync does only exists in NETCOREAPP3_0_OR_GREATER
+#endif
+		public static async Task<ParsedMessage> FromStreamReaderAsync(StreamReader stream, MessageVersion version)
 		{
 			if (stream == null)
 			{
@@ -45,14 +49,21 @@ public static ParsedMessage FromStreamReader(StreamReader stream, MessageVersion
 				throw new ArgumentNullException(nameof(version));
 			}
 
+#if NETCOREAPP3_0_OR_GREATER
+			var envelope = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None);
+#else
 			var envelope = XDocument.Load(stream);
+#endif
 			var headers = ExtractSoapHeaders(envelope, version);
 
 			//var properties = ExtractSoapProperties(httpRequest);
 			(var body, var isEmpty) = ExtractSoapBody(envelope, version);
 
 			return new ParsedMessage(headers, new MessageProperties(), version, body, isEmpty);
 		}
+#if !NETCOREAPP3_0_OR_GREATER
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+#endif
 
 		public XDocument GetBodyAsXDocument()
 		{

src/SoapCore/SoapCore.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<Description>SOAP protocol middleware for ASP.NET Core</Description>
-		<Version>1.2.1.3</Version>
+		<Version>1.2.1.4</Version>
 		<Authors>Digital Design</Authors>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;netcoreapp3.1;</TargetFrameworks>
 		<PackageId>SoapCore</PackageId>

src/SoapCore/SoapEndpointMiddleware.cs

@@ -224,20 +224,20 @@ private async Task<Message> ReadMessageAsync(HttpContext httpContext, SoapMessag
 					if (messageEncoder.IsContentTypeSupported(multipartSection.ContentType, true)
 						|| messageEncoder.IsContentTypeSupported(multipartSection.ContentType, false))
 					{
-						return messageEncoder.ReadMessage(multipartSection.Body, messageEncoder.MaxSoapHeaderSize, multipartSection.ContentType);
+						return await messageEncoder.ReadMessageAsync(multipartSection.Body, messageEncoder.MaxSoapHeaderSize, multipartSection.ContentType);
 					}
 				}
 			}
 
 #if !NETCOREAPP3_0_OR_GREATER
-			return messageEncoder.ReadMessage(httpContext.Request.Body, messageEncoder.MaxSoapHeaderSize, httpContext.Request.ContentType);
+			return await messageEncoder.ReadMessageAsync(httpContext.Request.Body, messageEncoder.MaxSoapHeaderSize, httpContext.Request.ContentType);
 #else
 			if (httpContext.Request.Body is FileBufferingReadStream)
 			{
-				return messageEncoder.ReadMessage(httpContext.Request.Body, messageEncoder.MaxSoapHeaderSize, httpContext.Request.ContentType);
+				return await messageEncoder.ReadMessageAsync(httpContext.Request.Body, messageEncoder.MaxSoapHeaderSize, httpContext.Request.ContentType);
 			}
 
-			return messageEncoder.ReadMessage(httpContext.Request.BodyReader, messageEncoder.MaxSoapHeaderSize, httpContext.Request.ContentType);
+			return await messageEncoder.ReadMessageAsync(httpContext.Request.BodyReader, messageEncoder.MaxSoapHeaderSize, httpContext.Request.ContentType);
 #endif
 		}