Refactored ResponseStream.cs

websocket-sharp/Net/ResponseStream.cs

@@ -51,12 +51,11 @@ namespace WebSocketSharp.Net
   {
     #region Private Fields
 
-    private MemoryStream           _buffer;
+    private MemoryStream           _body;
     private static readonly byte[] _crlf = new byte[] { 13, 10 };
     private bool                   _disposed;
     private bool                   _ignoreWriteExceptions;
     private HttpListenerResponse   _response;
-    private long                   _start;
     private Stream                 _stream;
     private bool                   _trailerSent;
 
@@ -70,6 +69,8 @@ namespace WebSocketSharp.Net
       _stream = stream;
       _response = response;
       _ignoreWriteExceptions = ignoreWriteExceptions;
+
+      _body = new MemoryStream ();
     }
 
     #endregion
@@ -114,33 +115,62 @@ namespace WebSocketSharp.Net
 
     #region Private Methods
 
-    private static void checkWriteParameters (byte[] buffer, int offset, int count)
+    private void flush (bool closing)
     {
-      if (buffer == null)
+      if (!_response.HeadersSent) {
-        throw new ArgumentNullException ("buffer");
+        using (var headers = new MemoryStream ()) {
-
+          _response.SendHeaders (headers, closing);
-      if (offset < 0)
+          var start = headers.Position;
-        throw new ArgumentOutOfRangeException ("offset", "A negative value.");
+          InternalWrite (headers.GetBuffer (), (int) start, (int) (headers.Length - start));
-
+        }
-      if (count < 0)
-        throw new ArgumentOutOfRangeException ("count", "A negative value.");
-
-      if (offset + count > buffer.Length)
-        throw new ArgumentException (
-          "The sum of 'offset' and 'count' is greater than 'buffer' length.");
       }
 
-    private MemoryStream getBuffer (bool closing)
+      var len = _body.Length;
-    {
+      if (len == 0)
-      if (_buffer != null)
+        return;
-        return _buffer;
 
-      _buffer = new MemoryStream ();
+      var chunked = _response.SendChunked;
-      _response.SendHeaders (_buffer, closing);
+      using (_body) {
-      _start = _buffer.Position;
+        if (len > Int32.MaxValue) {
-      _buffer.Position = _buffer.Length;
+          _body.Position = 0;
 
-      return _buffer;
+          var buffLen = 1024;
+          var buff = new byte[buffLen];
+          var nread = 0;
+          while ((nread = _body.Read (buff, 0, buffLen)) > 0) {
+            if (chunked) {
+              var size = getChunkSizeBytes (nread, false);
+              InternalWrite (size, 0, size.Length);
+              InternalWrite (buff, 0, nread);
+              InternalWrite (_crlf, 0, 2);
+
+              continue;
+            }
+
+            InternalWrite (buff, 0, nread);
+          }
+        }
+        else {
+          if (chunked) {
+            var size = getChunkSizeBytes ((int) len, false);
+            InternalWrite (size, 0, size.Length);
+            InternalWrite (_body.GetBuffer (), 0, (int) len);
+            InternalWrite (_crlf, 0, 2);
+          }
+          else {
+            InternalWrite (_body.GetBuffer (), 0, (int) len);
+          }
+        }
+      }
+
+      if (closing && chunked) {
+        var size = getChunkSizeBytes (0, true);
+        InternalWrite (size, 0, size.Length);
+      }
+
+      _body = null;
+      if (!closing)
+        _body = new MemoryStream ();
     }
 
     private static byte[] getChunkSizeBytes (int size, bool final)
@@ -159,23 +189,16 @@ namespace WebSocketSharp.Net
 
       _disposed = true;
       if (!force) {
-        var buff = getBuffer (true);
+        flush (true);
-        if (_response.SendChunked && !_trailerSent) {
-          var size = getChunkSizeBytes (0, true);
-          buff.Write (size, 0, size.Length);
-          _trailerSent = true;
-        }
-
-        InternalWrite (buff.GetBuffer (), (int) _start, (int) (buff.Position - _start));
         _response.Close ();
       }
       else {
         _response.Abort ();
       }
 
-      if (_buffer != null) {
+      if (_body != null) {
-        _buffer.Dispose ();
+        _body.Dispose ();
-        _buffer = null;
+        _body = null;
       }
 
       _response = null;
@@ -212,17 +235,7 @@ namespace WebSocketSharp.Net
       if (_disposed)
         throw new ObjectDisposedException (GetType ().ToString ());
 
-      checkWriteParameters (buffer, offset, count);
+      return _body.BeginWrite (buffer, offset, count, callback, state);
-      if (count == 0)
-        return null;
-
-      var buff = getBuffer (false);
-      if (_response.SendChunked) {
-        var size = getChunkSizeBytes (count, false);
-        buff.Write (size, 0, size.Length);
-      }
-
-      return buff.BeginWrite (buffer, offset, count, callback, state);
     }
 
     public override void Close ()
@@ -245,20 +258,13 @@ namespace WebSocketSharp.Net
       if (_disposed)
         throw new ObjectDisposedException (GetType ().ToString ());
 
-      if (_buffer == null)
+      _body.EndWrite (asyncResult);
-        throw new InvalidOperationException ("The BeginWrite method hasn't been done.");
-
-      if (asyncResult == null)
-        throw new ArgumentNullException ("asyncResult");
-
-      var buff = getBuffer (false);
-      buff.EndWrite (asyncResult);
-      if (_response.SendChunked)
-        buff.Write (_crlf, 0, 2);
     }
 
     public override void Flush ()
     {
+      if (_response.SendChunked)
+        flush (false);
     }
 
     public override int Read (byte[] buffer, int offset, int count)
@@ -281,20 +287,7 @@ namespace WebSocketSharp.Net
       if (_disposed)
         throw new ObjectDisposedException (GetType ().ToString ());
 
-      checkWriteParameters (buffer, offset, count);
+      _body.Write (buffer, offset, count);
-      if (count == 0)
-        return;
-
-      var buff = getBuffer (false);
-      var chunked = _response.SendChunked;
-      if (chunked) {
-        var size = getChunkSizeBytes (count, false);
-        buff.Write (size, 0, size.Length);
-      }
-
-      buff.Write (buffer, offset, count);
-      if (chunked)
-        buff.Write (_crlf, 0, 2);
     }
 
     #endregion