Update XmlMtomWriter and Stream Formatter

Author: afifi-ins

src/System.ServiceModel.Primitives/src/Internals/System/Xml/XmlMtomWriter.cs

@@ -286,6 +286,25 @@ public override void WriteValue(IStreamProvider value)
                 Writer.WriteValue(value);
         }
 
+        public override Task WriteValueAsync(IStreamProvider value)
+        {
+            if (value == null)
+                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("value"));
+
+            if (Writer.WriteState == WriteState.Element)
+            {
+                if (_binaryDataChunks == null)
+                {
+                    _binaryDataChunks = new List<MtomBinaryData>();
+                    _contentID = GenerateUriForMimePart((_mimeParts == null) ? 1 : _mimeParts.Count + 1);
+                }
+                _binaryDataChunks.Add(new MtomBinaryData(value));
+                return Task.CompletedTask;
+            }
+            else
+                return Task.FromResult(Writer.WriteValueAsync(value));
+        }
+
         public override void WriteBase64(byte[] buffer, int index, int count)
         {
             if (Writer.WriteState == WriteState.Element)
@@ -488,9 +507,7 @@ private void WriteXOPBinaryParts()
                 {
                     WriteMimeHeaders(part.contentID, part.contentType, part.contentTransferEncoding);
                     Stream s = _mimeWriter.GetContentStream();
-                    int blockSize = 256;
-                    int bytesRead = 0;
-                    byte[] block = new byte[blockSize];
+                    int bufferSize = 65536;
                     Stream stream = null;
                     foreach (MtomBinaryData data in part.binaryData)
                     {
@@ -499,20 +516,9 @@ private void WriteXOPBinaryParts()
                             stream = data.provider.GetStream();
                             if (stream == null)
                                 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new XmlException(SRP.XmlInvalidStream));
-                            while (true)
-                            {
-                                bytesRead = stream.Read(block, 0, blockSize);
-                                if (bytesRead > 0)
-                                    s.Write(block, 0, bytesRead);
-                                else
-                                    break;
-                                if (blockSize < 65536 && bytesRead == blockSize)
-                                {
-                                    blockSize = blockSize * 16;
-                                    block = new byte[blockSize];
-                                }
-                            }
 
+                            stream.CopyTo(s, bufferSize);
+                            
                             data.provider.ReleaseStream(stream);
                         }
                         else
@@ -540,9 +546,7 @@ private async Task WriteXOPBinaryPartsAsync()
                 {
                     await WriteMimeHeadersAsync(part.contentID, part.contentType, part.contentTransferEncoding);
                     Stream s = await _mimeWriter.GetContentStreamAsync();
-                    int blockSize = 256;
-                    int bytesRead = 0;
-                    byte[] block = new byte[blockSize];
+                    int bufferSize = 65536;
                     Stream stream = null;
                     foreach (MtomBinaryData data in part.binaryData)
                     {
@@ -551,25 +555,14 @@ private async Task WriteXOPBinaryPartsAsync()
                             stream = data.provider.GetStream();
                             if (stream == null)
                                 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new XmlException(SRP.XmlInvalidStream));
-                            while (true)
-                            {
-                                bytesRead = stream.Read(block, 0, blockSize);
-                                if (bytesRead > 0)
-                                    s.Write(block, 0, bytesRead);
-                                else
-                                    break;
-                                if (blockSize < 65536 && bytesRead == blockSize)
-                                {
-                                    blockSize = blockSize * 16;
-                                    block = new byte[blockSize];
-                                }
-                            }
+
+                            await stream.CopyToAsync(s, bufferSize);
 
                             data.provider.ReleaseStream(stream);
                         }
                         else
                         {
-                            s.Write(data.chunk, 0, data.chunk.Length);
+                            await s.WriteAsync(data.chunk, 0, data.chunk.Length);
                         }
                     }
                 }

src/System.ServiceModel.Primitives/src/System/ServiceModel/Dispatcher/StreamFormatter.cs

@@ -57,15 +57,15 @@ internal void Serialize(XmlDictionaryWriter writer, object[] parameters, object
         {
             Stream streamValue = GetStreamAndWriteStartWrapperIfNecessary(writer, parameters, returnValue);
             var streamProvider = new OperationStreamProvider(streamValue);
-            StreamFormatterHelper.WriteValue(writer, streamProvider);
+            writer.WriteValue(streamProvider);
             WriteEndWrapperIfNecessary(writer);
         }
 
         internal async Task SerializeAsync(XmlDictionaryWriter writer, object[] parameters, object returnValue)
         {
             Stream streamValue = await GetStreamAndWriteStartWrapperIfNecessaryAsync(writer, parameters, returnValue);
             var streamProvider = new OperationStreamProvider(streamValue);
-            await StreamFormatterHelper.WriteValueAsync(writer, streamProvider);
+            await writer.WriteValueAsync(streamProvider);
             await WriteEndWrapperIfNecessaryAsync(writer);
         }
 
@@ -451,7 +451,7 @@ public override long Length
             public override void Write(byte[] buffer, int offset, int count) { throw TraceUtility.ThrowHelperError(new NotSupportedException(), _message); }
         }
 
-        internal class OperationStreamProvider
+        internal class OperationStreamProvider : IStreamProvider
         {
             private Stream _stream;
 
@@ -469,87 +469,5 @@ public void ReleaseStream(Stream stream)
                 //Noop
             }
         }
-
-        internal class StreamFormatterHelper
-        {
-            // The method was duplicated from the desktop implementation of
-            // System.Xml.XmlDictionaryWriter.WriteValue(IStreamProvider)
-            public static void WriteValue(XmlDictionaryWriter writer, OperationStreamProvider value)
-            {
-                if (value == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException(nameof(value)));
-                }
-
-                Stream stream = value.GetStream();
-                if (stream == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new XmlException(SRP.Format(SRP.XmlInvalidStream)));
-                }
-
-                int blockSize = 256;
-                int bytesRead = 0;
-                byte[] block = new byte[blockSize];
-                while (true)
-                {
-                    bytesRead = stream.Read(block, 0, blockSize);
-                    if (bytesRead > 0)
-                    {
-                        writer.WriteBase64(block, 0, bytesRead);
-                    }
-                    else
-                    {
-                        break;
-                    }
-
-                    if (blockSize < 65536 && bytesRead == blockSize)
-                    {
-                        blockSize = blockSize * 16;
-                        block = new byte[blockSize];
-                    }
-                }
-
-                value.ReleaseStream(stream);
-            }
-
-            public static async Task WriteValueAsync(XmlDictionaryWriter writer, OperationStreamProvider value)
-            {
-                if (value == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException(nameof(value)));
-                }
-
-                Stream stream = value.GetStream();
-                if (stream == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new XmlException(SRP.Format(SRP.XmlInvalidStream)));
-                }
-
-                int blockSize = 256;
-                int bytesRead = 0;
-                byte[] block = new byte[blockSize];
-                while (true)
-                {
-                    bytesRead = await stream.ReadAsync(block, 0, blockSize);
-                    if (bytesRead > 0)
-                    {
-                        // XmlDictionaryWriter has not implemented WriteBase64Async() yet.
-                        writer.WriteBase64(block, 0, bytesRead);
-                    }
-                    else
-                    {
-                        break;
-                    }
-
-                    if (blockSize < 65536 && bytesRead == blockSize)
-                    {
-                        blockSize = blockSize * 16;
-                        block = new byte[blockSize];
-                    }
-                }
-
-                value.ReleaseStream(stream);
-            }
-        }
     }
 }