optimize HttpRequestMessageSerializer and remove AspNetCoreServers's dependency on RuntimeSupport

ppittle · ppittle · commit 4b75b9274349 · 2025-04-21T14:49:07.000-07:00
diff --git a/Libraries/src/Amazon.Lambda.AspNetCoreServer/AbstractAspNetCoreFunction.cs b/Libraries/src/Amazon.Lambda.AspNetCoreServer/AbstractAspNetCoreFunction.cs
@@ -337,19 +337,17 @@ protected void Start()
                 {
                     var invokeTimes = 5;
 
-                    var json = await HttpRequestMessageSerializer.SerializeToJson<TREQUEST>(httpRequest);
-
-                    var request = HttpRequestMessageSerializer.Deserialize<TREQUEST>(json);
+                    var request = await HttpRequestMessageSerializer.ConvertToLambdaRequest<TREQUEST>(httpRequest);
 
                     InvokeFeatures features = new InvokeFeatures();
                     MarshallRequest(features, request, new SnapStartEmptyLambdaContext());
 
                     var context = CreateContext(features);
 
-                    var lambdaContext = new SnapStartEmptyLambdaContext();
-
                     for (var i = 0; i < invokeTimes; i++)
                     {
+                        var lambdaContext = new SnapStartEmptyLambdaContext();
+
                         await ProcessRequest(lambdaContext, context, features);
                     }
                 }
diff --git a/Libraries/src/Amazon.Lambda.AspNetCoreServer/Amazon.Lambda.AspNetCoreServer.csproj b/Libraries/src/Amazon.Lambda.AspNetCoreServer/Amazon.Lambda.AspNetCoreServer.csproj
@@ -31,7 +31,6 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <ProjectReference Include="..\Amazon.Lambda.RuntimeSupport\Amazon.Lambda.RuntimeSupport.csproj" />
     <ProjectReference Include="..\Amazon.Lambda.Serialization.SystemTextJson\Amazon.Lambda.Serialization.SystemTextJson.csproj" />
   </ItemGroup>
 
diff --git a/Libraries/src/Amazon.Lambda.AspNetCoreServer/Internal/HttpRequestMessageSerializer.cs b/Libraries/src/Amazon.Lambda.AspNetCoreServer/Internal/HttpRequestMessageSerializer.cs
@@ -1,3 +1,4 @@
+#if NET8_0_OR_GREATER
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,9 +9,10 @@
 using System.Threading.Tasks;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.ApplicationLoadBalancerEvents;
+using Microsoft.AspNetCore.Identity.Data;
 using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Primitives;
 
-#if NET8_0_OR_GREATER
 namespace Amazon.Lambda.AspNetCoreServer.Internal
 {
     /// <summary>
@@ -26,8 +28,18 @@ namespace Amazon.Lambda.AspNetCoreServer.Internal
     public class HttpRequestMessageSerializer
     {
         private static readonly Uri _baseUri = new Uri("http://localhost");
+        
+        internal class DuckRequest
+        {
+            public string Body { get; set; }
+            public Dictionary<string, string> Headers { get; set; } = new();
+            public string HttpMethod { get; set; }
+            public string Path { get; set; }
+            public string RawQuery { get; set; }
+            public Dictionary<string, StringValues> Query { get; set; } = new();
+        }
 
-        public static async Task<string> SerializeToJson<TRequest>(HttpRequestMessage request)
+        public static async Task<TRequest> ConvertToLambdaRequest<TRequest>(HttpRequestMessage request)
         {
             if (null == request.RequestUri)
             {
@@ -42,7 +54,7 @@ public static async Task<string> SerializeToJson<TRequest>(HttpRequestMessage re
             // make request absolut (relative to localhost) otherwise parsing the query will not work
             request.RequestUri = new Uri(_baseUri, request.RequestUri);
 
-            var duckRequest = new
+            var duckRequest = new DuckRequest
             {
                 Body = await ReadContent(request),
                 Headers = request.Headers
@@ -56,52 +68,75 @@ public static async Task<string> SerializeToJson<TRequest>(HttpRequestMessage re
                 Query = QueryHelpers.ParseNullableQuery(request.RequestUri?.Query)
             };
 
+            if (typeof(TRequest) == typeof(ApplicationLoadBalancerRequest))
+            {
+                return (TRequest)(object) new ApplicationLoadBalancerRequest
+                {
+                    Body = duckRequest.Body,
+                    Headers = duckRequest.Headers,
+                    Path = duckRequest.Path,
+                    HttpMethod = duckRequest.HttpMethod,
+                    QueryStringParameters = duckRequest.Query?.ToDictionary(k => k.Key, v => v.Value.ToString())
+                };
+            }
+
+            if (typeof(TRequest) == typeof(APIGatewayHttpApiV2ProxyRequest))
+            {
+                return (TRequest)(object)new APIGatewayHttpApiV2ProxyRequest
+                {
+                    Body = duckRequest.Body,
+                    Headers = duckRequest.Headers,
+                    RawPath = duckRequest.Path,
+                    RequestContext = new APIGatewayHttpApiV2ProxyRequest.ProxyRequestContext
+                    {
+                        Http = new APIGatewayHttpApiV2ProxyRequest.HttpDescription
+                        {
+                            Method = duckRequest.HttpMethod,
+                            Path = duckRequest.Path
+                        }
+                    },
+                    QueryStringParameters = duckRequest.Query?.ToDictionary(k => k.Key, v => v.Value.ToString()),
+                    RawQueryString = duckRequest.RawQuery
+                };
+            }
+
+            if (typeof(TRequest) == typeof(APIGatewayProxyRequest))
+            {
+                return (TRequest)(object)new APIGatewayProxyRequest
+                {
+                    Body = duckRequest.Body,
+                    Headers = duckRequest.Headers,
+                    Path = duckRequest.Path,
+                    HttpMethod = duckRequest.HttpMethod,
+                    RequestContext = new APIGatewayProxyRequest.ProxyRequestContext
+                    {
+                        HttpMethod = duckRequest.HttpMethod
+                    },
+                    QueryStringParameters = duckRequest.Query?.ToDictionary(k => k.Key, v => v.Value.ToString())
+                };
+            }
+
+            throw new NotImplementedException(
+                $"Unknown request type: {typeof(TRequest).FullName}");
+        }
+
+        public static async Task<string> SerializeToJson<TRequest>(HttpRequestMessage request)
+        {
+            var lambdaRequest = await ConvertToLambdaRequest<TRequest>(request);
+            
             string translatedRequestJson = typeof(TRequest) switch
             {
                 var t when t == typeof(ApplicationLoadBalancerRequest) =>
                     JsonSerializer.Serialize(
-                        new ApplicationLoadBalancerRequest
-                        {
-                            Body = duckRequest.Body,
-                            Headers = duckRequest.Headers,
-                            Path = duckRequest.Path,
-                            HttpMethod = duckRequest.HttpMethod,
-                            QueryStringParameters = duckRequest.Query?.ToDictionary(k => k.Key, v => v.Value.ToString())
-                        },
+                        lambdaRequest,
                         LambdaRequestTypeClasses.Default.ApplicationLoadBalancerRequest),
                 var t when t == typeof(APIGatewayHttpApiV2ProxyRequest) =>
                     JsonSerializer.Serialize(
-                        new APIGatewayHttpApiV2ProxyRequest
-                        {
-                            Body = duckRequest.Body,
-                            Headers = duckRequest.Headers,
-                            RawPath = duckRequest.Path,
-                            RequestContext = new APIGatewayHttpApiV2ProxyRequest.ProxyRequestContext
-                            {
-                                Http = new APIGatewayHttpApiV2ProxyRequest.HttpDescription
-                                {
-                                    Method = duckRequest.HttpMethod,
-                                    Path = duckRequest.Path
-                                }
-                            },
-                            QueryStringParameters = duckRequest.Query?.ToDictionary(k => k.Key, v => v.Value.ToString()),
-                            RawQueryString = duckRequest.RawQuery
-                        },
+                        lambdaRequest,
                         LambdaRequestTypeClasses.Default.APIGatewayHttpApiV2ProxyRequest),
                 var t when t == typeof(APIGatewayProxyRequest) =>
                     JsonSerializer.Serialize(
-                        new APIGatewayProxyRequest
-                        {
-                            Body = duckRequest.Body,
-                            Headers = duckRequest.Headers,
-                            Path = duckRequest.Path,
-                            HttpMethod = duckRequest.HttpMethod,
-                            RequestContext = new APIGatewayProxyRequest.ProxyRequestContext
-                            {
-                                HttpMethod = duckRequest.HttpMethod
-                            },
-                            QueryStringParameters = duckRequest.Query?.ToDictionary(k => k.Key, v => v.Value.ToString())
-                        },
+                        lambdaRequest,
                         LambdaRequestTypeClasses.Default.APIGatewayProxyRequest),
                 _ => throw new NotImplementedException(
                     $"Unknown request type: {typeof(TRequest).FullName}")
@@ -110,37 +145,18 @@ public static async Task<string> SerializeToJson<TRequest>(HttpRequestMessage re
             return translatedRequestJson;
         }
 
-        /// <summary>
-        /// Specialized Deserializer that uses the AOT Compatible
-        /// <see cref="LambdaRequestTypeClasses"/> to deserialize common
-        /// Request types.
-        /// </summary>
-        public static TRequest Deserialize<TRequest>(string json)
-        {
-            return typeof(TRequest) switch
-            {
-                var t when t == typeof(ApplicationLoadBalancerRequest) =>
-                    JsonSerializer.Deserialize<TRequest>(json, LambdaRequestTypeClasses.Default.ApplicationLoadBalancerRequest),
-                var t when t == typeof(APIGatewayHttpApiV2ProxyRequest) =>
-                    JsonSerializer.Deserialize<TRequest>(json, LambdaRequestTypeClasses.Default.APIGatewayHttpApiV2ProxyRequest),
-                var t when t == typeof(APIGatewayProxyRequest) =>
-                JsonSerializer.Deserialize<TRequest>(json, LambdaRequestTypeClasses.Default.APIGatewayProxyRequest),
-                _ => throw new NotImplementedException(
-                    $"Unknown request type: {typeof(TRequest).FullName}")
-            };
-        }
-
         private static async Task<string> ReadContent(HttpRequestMessage r)
         {
             if (r.Content == null)
                 return string.Empty;
 
             return await r.Content.ReadAsStringAsync();
         }
+    }
 
-        [JsonSourceGenerationOptions(WriteIndented = true)]
-        [JsonSerializable(typeof(ApplicationLoadBalancerRequest))]
-        [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest))]
+    [JsonSourceGenerationOptions]
+    [JsonSerializable(typeof(ApplicationLoadBalancerRequest))]
+    [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest))]
     [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest.ProxyRequestContext))]
     [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest.ProxyRequestAuthentication))]
     [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest.ProxyRequestClientCert))]
@@ -150,14 +166,13 @@ private static async Task<string> ReadContent(HttpRequestMessage r)
     [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest.AuthorizerDescription.IAMDescription))]
     [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest.AuthorizerDescription.CognitoIdentityDescription))]
     [JsonSerializable(typeof(APIGatewayHttpApiV2ProxyRequest.AuthorizerDescription.JwtDescription))]
-        [JsonSerializable(typeof(APIGatewayProxyRequest))]
-        [JsonSerializable(typeof(APIGatewayProxyRequest.ClientCertValidity))]
-        [JsonSerializable(typeof(APIGatewayProxyRequest.ProxyRequestClientCert))]
-        [JsonSerializable(typeof(APIGatewayProxyRequest.ProxyRequestContext))]
-        [JsonSerializable(typeof(APIGatewayProxyRequest.RequestIdentity))]
-        internal partial class LambdaRequestTypeClasses : JsonSerializerContext
-        {
-        }
+    [JsonSerializable(typeof(APIGatewayProxyRequest))]
+    [JsonSerializable(typeof(APIGatewayProxyRequest.ClientCertValidity))]
+    [JsonSerializable(typeof(APIGatewayProxyRequest.ProxyRequestClientCert))]
+    [JsonSerializable(typeof(APIGatewayProxyRequest.ProxyRequestContext))]
+    [JsonSerializable(typeof(APIGatewayProxyRequest.RequestIdentity))]
+    internal partial class LambdaRequestTypeClasses : JsonSerializerContext
+    {
     }
 }
 #endif
diff --git a/Libraries/src/Amazon.Lambda.AspNetCoreServer/Internal/SnapStartEmptyLambdaContext.cs b/Libraries/src/Amazon.Lambda.AspNetCoreServer/Internal/SnapStartEmptyLambdaContext.cs
@@ -1,29 +1,64 @@
-﻿// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
 using System.Collections.Generic;
 using Amazon.Lambda.Core;
-using Amazon.Lambda.RuntimeSupport;
 
 namespace Amazon.Lambda.AspNetCoreServer.Internal;
 
 internal class SnapStartEmptyLambdaContext : ILambdaContext, ICognitoIdentity, IClientContext
 {
-    private LambdaEnvironment _lambdaEnvironment = new();
+    private static Dictionary<string, string> _environmentVariables = new();
+
+    // Copied from Amazon.Lambda.RuntimeSupport.LambdaEnvironment to avoid adding
+    // a reference to that project
+    private const string EnvVarFunctionMemorySize = "AWS_LAMBDA_FUNCTION_MEMORY_SIZE";
+    private const string EnvVarFunctionName = "AWS_LAMBDA_FUNCTION_NAME";
+    private const string EnvVarFunctionVersion = "AWS_LAMBDA_FUNCTION_VERSION";
+    private const string EnvVarHandler = "_HANDLER";
+    private const string EnvVarLogGroupName = "AWS_LAMBDA_LOG_GROUP_NAME";
+    private const string EnvVarLogStreamName = "AWS_LAMBDA_LOG_STREAM_NAME";
+    
+
+    static SnapStartEmptyLambdaContext()
+    {
+        AddEnvValue(EnvVarFunctionMemorySize, "128");
+        AddEnvValue(EnvVarFunctionName, "fallbackFunctionName");
+        AddEnvValue(EnvVarFunctionVersion, "0");
+        AddEnvValue(EnvVarLogGroupName, "fallbackLogGroup");
+        AddEnvValue(EnvVarLogStreamName, "fallbackLogStream");
+    }
+
+    private static void AddEnvValue(string envName, string fallback)
+    {
+        var val = System.Environment.GetEnvironmentVariable(envName);
+
+        val = string.IsNullOrEmpty(val) ? fallback : val;
+
+        _environmentVariables[envName] = val;
+    }
+
+    public SnapStartEmptyLambdaContext()
+    {
+        // clone the static environment variables into the local instance
+        foreach (var k in _environmentVariables.Keys)
+            Environment[k] = _environmentVariables[k];
+    }
+
 
     public string TraceId => string.Empty;
     public string AwsRequestId => string.Empty;
     public IClientContext ClientContext => this;
-    public string FunctionName => _lambdaEnvironment.FunctionName;
-    public string FunctionVersion => _lambdaEnvironment.FunctionVersion;
+    public string FunctionName => Environment[EnvVarFunctionName];
+    public string FunctionVersion => Environment[EnvVarFunctionVersion];
     public ICognitoIdentity Identity => this;
     public string InvokedFunctionArn => string.Empty;
     public ILambdaLogger Logger => null;
-    public string LogGroupName => _lambdaEnvironment.LogGroupName;
-    public string LogStreamName => _lambdaEnvironment.LogStreamName;
-    public int MemoryLimitInMB => 128;
-    public TimeSpan RemainingTime => TimeSpan.FromMilliseconds(100);
+    public string LogGroupName => Environment[EnvVarLogGroupName];
+    public string LogStreamName => Environment[EnvVarLogStreamName];
+    public int MemoryLimitInMB => int.Parse(Environment[EnvVarFunctionMemorySize]);
+    public TimeSpan RemainingTime => TimeSpan.FromSeconds(5);
     public string IdentityId { get; }
     public string IdentityPoolId { get; }
     public IDictionary<string, string> Environment { get; } = new Dictionary<string, string>();

Original file line number	Diff line number	Diff line change
`@@ -337,19 +337,17 @@ protected void Start()`
`337`	`337`	`{`
`338`	`338`	`var invokeTimes = 5;`
`339`	`339`
`340`		`- var json = await HttpRequestMessageSerializer.SerializeToJson<TREQUEST>(httpRequest);`
`341`		`-`
`342`		`- var request = HttpRequestMessageSerializer.Deserialize<TREQUEST>(json);`
	`340`	`+ var request = await HttpRequestMessageSerializer.ConvertToLambdaRequest<TREQUEST>(httpRequest);`
`343`	`341`
`344`	`342`	`InvokeFeatures features = new InvokeFeatures();`
`345`	`343`	`MarshallRequest(features, request, new SnapStartEmptyLambdaContext());`
`346`	`344`
`347`	`345`	`var context = CreateContext(features);`
`348`	`346`
`349`		`- var lambdaContext = new SnapStartEmptyLambdaContext();`
`350`		`-`
`351`	`347`	`for (var i = 0; i < invokeTimes; i++)`
`352`	`348`	`{`
	`349`	`+ var lambdaContext = new SnapStartEmptyLambdaContext();`
	`350`	`+`
`353`	`351`	`await ProcessRequest(lambdaContext, context, features);`
`354`	`352`	`}`
`355`	`353`	`}`