Перенос _RawStream в body

Author: asosnoviy

src/OneScript.StandardLibrary/Http/HttpResponseBody.cs

@@ -25,6 +25,7 @@ class HttpResponseBody : IDisposable
 
         private readonly bool _autoDecompress; 
         private long _contentSize = 0;
+        private Stream _rawStream;
 
         public HttpResponseBody(HttpWebResponse response, string dumpToFile)
         {
@@ -33,7 +34,8 @@ public HttpResponseBody(HttpWebResponse response, string dumpToFile)
                 _inMemBody = Array.Empty<byte>();
                 return;
             }
-            
+
+            _rawStream = response.GetResponseStream();
             _autoDecompress = string.Equals(response.ContentEncoding, "gzip", StringComparison.OrdinalIgnoreCase);
             _contentSize = _autoDecompress ? -1 : response.ContentLength;
 
@@ -72,7 +74,7 @@ private void InitInMemoryResponse(HttpWebResponse response)
 
         public long ContentSize => _contentSize < 0 ? 0 : _contentSize;
 
-        public Stream OpenReadStream(Stream rawStream)
+        public Stream OpenReadStream()
         {
             if (_backingFileName != null)
             {
@@ -83,7 +85,7 @@ public Stream OpenReadStream(Stream rawStream)
                return new MemoryStream(_inMemBody);
            }
             else
-                return rawStream;
+                return _rawStream;
         }
 
         private Stream GetResponseStream(HttpWebResponse response)

src/OneScript.StandardLibrary/Http/HttpResponseContext.cs

@@ -28,7 +28,6 @@ public class HttpResponseContext : AutoContext<HttpResponseContext>, IDisposable
         // TODO: Нельзя выделить массив размером больше чем 2GB
         // поэтому функционал сохранения в файл не должен использовать промежуточный буфер _body
         private HttpResponseBody _body;
-        private Stream _rawStream;
         private HttpWebResponse _response;
 
         private string _defaultCharset;
@@ -41,7 +40,6 @@ public HttpResponseContext(HttpWebResponse response, string dumpToFile)
 
             ProcessHeaders(response.Headers);
             ProcessResponseBody(response, dumpToFile);
-            _rawStream = response.GetResponseStream();
             _response = response;
 
             if (_body != null && _body.AutoDecompress)
@@ -128,7 +126,7 @@ public IValue GetBodyAsString(IValue encoding = null)
             else
                 enc = TextEncodingEnum.GetEncoding(encoding);
 
-            using(var reader = new StreamReader(_body.OpenReadStream(_rawStream), enc))
+            using(var reader = new StreamReader(_body.OpenReadStream(), enc))
             {
                 return ValueFactory.Create(reader.ReadToEnd());
             }
@@ -145,7 +143,7 @@ public IValue GetBodyAsBinaryData()
             if (_body == null)
                 return ValueFactory.Create();
 
-            using (var stream = _body.OpenReadStream(_rawStream))
+            using (var stream = _body.OpenReadStream())
             using (var memoryStream = new MemoryStream())
             {   
                 stream.CopyTo(memoryStream);
@@ -163,7 +161,7 @@ public IValue GetBodyAsStream()
             if (_body == null)
                 return ValueFactory.Create();
 
-            return new GenericStream(_body.OpenReadStream(_rawStream), true);
+            return new GenericStream(_body.OpenReadStream(), true);
         }
 
         /// <summary>