Разовая инициализация свойств веб-запроса и ответа, плюс рефакторинг возвращаемых типов

Author: EvilBeaver

src/OneScript.Web.Server/HttpRequestWrapper.cs

@@ -5,43 +5,34 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 using Microsoft.AspNetCore.Http;
-using OneScript.Commons;
 using OneScript.Contexts;
-using OneScript.StandardLibrary;
 using OneScript.StandardLibrary.Binary;
-using OneScript.Web.Server;
-using OneScript.StandardLibrary.Http;
-using OneScript.StandardLibrary.Processes;
-using OneScript.StandardLibrary.Text;
 using OneScript.Values;
 using ScriptEngine.Machine;
 using ScriptEngine.Machine.Contexts;
-using System;
-using System.Text;
-using System.Threading.Tasks;
 using OneScript.StandardLibrary.Collections;
-using OneScript.Types;
 
 namespace OneScript.Web.Server
 {
     [ContextClass("HTTPСервисЗапрос", "HTTPServiceRequest")]
     public class HttpRequestWrapper : AutoContext<HttpRequestWrapper>
     {
         private readonly HttpRequest _request;
+        private readonly PropertyWrappersCollection _wrappers = new ();
 
         public HttpRequestWrapper(HttpRequest request)
         {
             _request = request;
         }
 
         [ContextProperty("Параметры", "Parameters", CanWrite = false)]
-        public FixedMapImpl Query => _request.Query.ToFixedMap();
+        public FixedMapImpl Query => _wrappers.Get(nameof(Query), () => _request.Query.ToFixedMap());
 
         [ContextProperty("ЕстьФормыВТипеКонтента", "HasFormContentType", CanWrite = false)]
-        public IValue HasFormContentType => BslBooleanValue.Create(_request.HasFormContentType);
+        public bool HasFormContentType => _request.HasFormContentType;
 
         [ContextProperty("Тело", "Body", CanWrite = false)]
-        public GenericStream Body => new(_request.Body);
+        public GenericStream Body => _wrappers.Get(nameof(Body), () => new GenericStream(_request.Body));
 
         [ContextProperty("ТипКонтента", "ContentType", CanWrite = false)]
         public IValue ContentType
@@ -68,13 +59,13 @@ public IValue ContentLength
         }
 
         [ContextProperty("Куки", "Cookie", CanWrite = false)]
-        public RequestCookieCollectionWrapper Cookies => new(_request.Cookies);
+        public RequestCookieCollectionWrapper Cookies => _wrappers.Get(nameof(Cookies), () => new RequestCookieCollectionWrapper(_request.Cookies));
 
         [ContextProperty("Заголовки", "Headers", CanWrite = false)]
-        public HeaderDictionaryWrapper Headers => new(_request.Headers);
+        public HeaderDictionaryWrapper Headers => _wrappers.Get(nameof(Headers), () => new HeaderDictionaryWrapper(_request.Headers));
 
         [ContextProperty("Протокол", "Protocol", CanWrite = false)]
-        public IValue Protocol => BslStringValue.Create(_request.Protocol);
+        public string Protocol => _request.Protocol;
 
         [ContextProperty("СтрокаПараметров", "ParametersString", CanWrite = false)]
         public IValue QueryString
@@ -125,21 +116,21 @@ public IValue Host
         }
 
         [ContextProperty("ЭтоHttps", "IsHttps", CanWrite = false)]
-        public IValue IsHttps => BslBooleanValue.Create(_request.IsHttps);
+        public bool IsHttps => _request.IsHttps;
 
         [ContextProperty("Схема", "Scheme", CanWrite = false)]
-        public IValue Scheme => BslStringValue.Create(_request.Scheme);
+        public string Scheme => _request.Scheme;
 
         [ContextProperty("Метод", "Method", CanWrite = false)]
-        public IValue Method => BslStringValue.Create(_request.Method);
+        public string Method => _request.Method;
 
         [ContextProperty("Форма", "Form", CanWrite = false)]
         public IValue Form
         {
             get
             {
                 if (_request.HasFormContentType)
-                    return new FormCollectionWrapper(_request.Form);
+                    return _wrappers.Get(nameof(Form), () => new FormCollectionWrapper(_request.Form));
                 else
                     return BslUndefinedValue.Instance;
             }

src/OneScript.Web.Server/HttpResponseWrapper.cs

@@ -4,12 +4,10 @@ This Source Code Form is subject to the terms of the
 was not distributed with this file, You can obtain one
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
+
 using Microsoft.AspNetCore.Http;
-using Microsoft.Net.Http.Headers;
-using Newtonsoft.Json;
 using OneScript.Contexts;
 using OneScript.StandardLibrary.Binary;
-using OneScript.Web.Server;
 using OneScript.StandardLibrary.Json;
 using OneScript.StandardLibrary.Text;
 using OneScript.Values;
@@ -19,11 +17,11 @@ This Source Code Form is subject to the terms of the
 
 namespace OneScript.Web.Server
 {
-
     [ContextClass("HTTPСервисОтвет", "HTTPServiceResponse")]
-    public class HttpResponseWrapper: AutoContext<HttpResponseWrapper>
+    public class HttpResponseWrapper : AutoContext<HttpResponseWrapper>
     {
         private readonly HttpResponse _response;
+        private readonly PropertyWrappersCollection _wrappers = new();
 
         public HttpResponseWrapper(HttpResponse response)
         {
@@ -60,23 +58,21 @@ public IValue ContentLength
         }
 
         [ContextProperty("Тело", "Body", CanWrite = false)]
-        public GenericStream Body => new(_response.Body);
+        public GenericStream Body => _wrappers.Get(nameof(Body), () => new GenericStream(_response.Body));
 
         [ContextProperty("Заголовки", "Headers", CanWrite = false)]
-        public HeaderDictionaryWrapper Headers => new HeaderDictionaryWrapper(_response.Headers);
+        public HeaderDictionaryWrapper Headers =>
+            _wrappers.Get(nameof(Headers), () => new HeaderDictionaryWrapper(_response.Headers));
 
         [ContextProperty("КодСостояния", "StatusCode")]
-        public IValue StatusCode
+        public int StatusCode
         {
-            get => BslNumericValue.Create(_response.StatusCode);
-            set
-            {
-                _response.StatusCode = (int)value.AsNumber();
-            }
+            get => _response.StatusCode;
+            set => _response.StatusCode = value;
         }
 
         [ContextProperty("Куки", "Cookie", CanWrite = false)]
-        public ResponseCookiesWrapper Cookies => new ResponseCookiesWrapper(_response.Cookies);
+        public ResponseCookiesWrapper Cookies => _wrappers.Get(nameof(Cookies), () => new ResponseCookiesWrapper(_response.Cookies));
 
         [ContextMethod("Записать", "Write")]
         public void Write(string strData, IValue encoding = null)
@@ -105,4 +101,4 @@ public void WriteJson(IValue obj, IValue encoding = null)
             _response.WriteAsync(data, enc).Wait();
         }
     }
-}
+}

src/OneScript.Web.Server/PropertyWrappersCollection.cs

@@ -0,0 +1,30 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+using System;
+using System.Collections.Generic;
+
+namespace OneScript.Web.Server;
+
+/// <summary>
+/// Класс, обеспечивающий создание оберток свойств запроса один только раз.
+/// </summary>
+public class PropertyWrappersCollection
+{
+    private readonly Dictionary<string, object> _objects = new();
+    
+    public T Get<T>(string propName, Func<T> factory)
+    {
+        if (_objects.TryGetValue(propName, out var value))
+            return (T)value;
+        
+        value = factory();
+        _objects.Add(propName, value);
+
+        return (T)value;
+    }
+}