Removing blocking code on NodeFunctionInvoker async path

Author: fabiocav

src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs

@@ -116,7 +116,7 @@ protected override async Task InvokeCore(object[] parameters, FunctionInvocation
             DataType dataType = _trigger.DataType ?? DataType.String;
 
             var userTraceWriter = CreateUserTraceWriter(context.TraceWriter);
-            var scriptExecutionContext = CreateScriptExecutionContext(input, dataType, userTraceWriter, context);
+            var scriptExecutionContext = await CreateScriptExecutionContextAsync(input, dataType, userTraceWriter, context).ConfigureAwait(false);
             var bindingData = (Dictionary<string, object>)scriptExecutionContext["bindingData"];
 
             await ProcessInputBindingsAsync(context.Binder, scriptExecutionContext, bindingData);
@@ -253,7 +253,7 @@ protected override void OnScriptFileChanged(object sender, FileSystemEventArgs e
             }
         }
 
-        private Dictionary<string, object> CreateScriptExecutionContext(object input, DataType dataType, TraceWriter traceWriter, FunctionInvocationContext invocationContext)
+        private async Task<Dictionary<string, object>> CreateScriptExecutionContextAsync(object input, DataType dataType, TraceWriter traceWriter, FunctionInvocationContext invocationContext)
         {
             // create a TraceWriter wrapper that can be exposed to Node.js
             var log = (Func<object, Task<object>>)(p =>
@@ -303,12 +303,11 @@ private Dictionary<string, object> CreateScriptExecutionContext(object input, Da
                 context["_entryPoint"] = _entryPoint;
             }
 
-            if (input is HttpRequestMessage)
+            // convert the request to a json object
+            if (input is HttpRequestMessage request)
             {
-                // convert the request to a json object
-                HttpRequestMessage request = (HttpRequestMessage)input;
-                string rawBody = null;
-                var requestObject = CreateRequestObject(request, out rawBody);
+                (Dictionary<string, object> requestObject, string rawBody) = await CreateRequestObjectAsync(request).ConfigureAwait(false);
+
                 input = requestObject;
 
                 if (rawBody != null)
@@ -458,9 +457,9 @@ internal static bool IsEdgeSupportedType(Type type)
             return false;
         }
 
-        private static Dictionary<string, object> CreateRequestObject(HttpRequestMessage request, out string rawBody)
+        private static async Task<(Dictionary<string, object> request, string rawBody)> CreateRequestObjectAsync(HttpRequestMessage request)
         {
-            rawBody = null;
+            string rawBody = null;
 
             // TODO: need to provide access to remaining request properties
             Dictionary<string, object> requestObject = new Dictionary<string, object>();
@@ -483,7 +482,7 @@ private static Dictionary<string, object> CreateRequestObject(HttpRequestMessage
                 {
                     if (contentType.MediaType == "application/json")
                     {
-                        body = request.Content.ReadAsStringAsync().Result;
+                        body = await request.Content.ReadAsStringAsync().ConfigureAwait(false);
                         if (TryConvertJson((string)body, out jsonObject))
                         {
                             // if the content - type of the request is json, deserialize into an object or array
@@ -493,14 +492,14 @@ private static Dictionary<string, object> CreateRequestObject(HttpRequestMessage
                     }
                     else if (contentType.MediaType == "application/octet-stream")
                     {
-                        body = request.Content.ReadAsByteArrayAsync().Result;
+                        body = await request.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
                     }
                 }
 
                 if (body == null)
                 {
                     // if we don't have a content type, default to reading as string
-                    body = rawBody = request.Content.ReadAsStringAsync().Result;
+                    body = rawBody = await request.Content.ReadAsStringAsync().ConfigureAwait(false);
                 }
 
                 requestObject["body"] = body;
@@ -514,7 +513,7 @@ private static Dictionary<string, object> CreateRequestObject(HttpRequestMessage
                 requestObject["params"] = routeData;
             }
 
-            return requestObject;
+            return (requestObject, rawBody);
         }
 
         /// <summary>

src/WebJobs.Script/GlobalSuppressions.cs

@@ -152,9 +152,11 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.ScriptHost.#Initialize()")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.ScriptHost.#LoadCustomExtensions(Newtonsoft.Json.Linq.JObject)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.ScriptHost.#LoadCustomExtensions()")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1009:Closing parenthesis must be spaced correctly", Justification = "<Pending>", Scope = "member", Target = "~T:Microsoft.Azure.WebJobs.Script.Description.NodeFunctionInvoker")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.ScriptHost.#LoadCustomExtensions()")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.Binding.HttpTriggerAttribute.#Methods")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.Description.FunctionDescriptor.#InputBindings")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.Description.FunctionDescriptor.#OutputBindings")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.Description.HttpTriggerBindingMetadata.#Methods")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Scope = "member", Target = "Microsoft.Azure.WebJobs.HttpJobHostConfigurationExtensions.#UseHttp(Microsoft.Azure.WebJobs.JobHostConfiguration,Microsoft.Azure.WebJobs.Script.Binding.Http.HttpConfiguration)")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1014:MarkAssembliesWithClsCompliant")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1014:MarkAssembliesWithClsCompliant")]