Refactoring for HttpInvoker (#4920)

Author: pragnagopa

src/WebJobs.Script.Grpc/Abstractions/IWorkerProvider.cs

@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Azure.WebJobs.Logging;
 using Microsoft.Azure.WebJobs.Script.Eventing;
-using Microsoft.Azure.WebJobs.Script.Rpc;
+using Microsoft.Azure.WebJobs.Script.OutOfProc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -45,7 +45,7 @@ public ILogger CreateLogger(string categoryName)
 
         private bool IsUserLogCategory(string categoryName)
         {
-            return LogCategories.IsFunctionUserCategory(categoryName) || categoryName.Equals(LanguageWorkerConstants.FunctionConsoleLogCategoryName, StringComparison.OrdinalIgnoreCase);
+            return LogCategories.IsFunctionUserCategory(categoryName) || categoryName.Equals(OutOfProcConstants.FunctionConsoleLogCategoryName, StringComparison.OrdinalIgnoreCase);
         }
 
         public void Dispose()

src/WebJobs.Script.Grpc/Abstractions/WorkerDescription.cs

@@ -15,6 +15,7 @@ public static class ConfigurationSectionNames
         public const string ExtensionBundle = "extensionBundle";
         public const string ManagedDependency = "managedDependency";
         public const string Extensions = "extensions";
+        public const string HttpInvoker = "httpInvoker";
         public const string Http = Extensions + ":http";
         public const string Hsts = Http + ":hsts";
         public const string CustomHttpHeaders = Http + ":customHeaders";

src/WebJobs.Script.Grpc/Abstractions/WorkerDescriptionExtensions.cs

@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.Azure.WebJobs.Script.Extensibility;
+using Microsoft.Azure.WebJobs.Script.Rpc;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Azure.WebJobs.Script.Description
+{
+    internal class HttpFunctionDescriptorProvider : OutOfProcDescriptorProvider
+    {
+        public HttpFunctionDescriptorProvider(ScriptHost host, ScriptJobHostOptions config, ICollection<IScriptBindingProvider> bindingProviders,
+            IFunctionDispatcher dispatcher, ILoggerFactory loggerFactory)
+            : base(host, config, bindingProviders, dispatcher, loggerFactory)
+        {
+        }
+    }
+}

src/WebJobs.Script.WebHost/Diagnostics/SystemLoggerProvider.cs

@@ -16,19 +16,17 @@
 
 namespace Microsoft.Azure.WebJobs.Script.Description
 {
-    internal class WorkerFunctionDescriptorProvider : FunctionDescriptorProvider
+    internal abstract class OutOfProcDescriptorProvider : FunctionDescriptorProvider
     {
         private readonly ILoggerFactory _loggerFactory;
         private IFunctionDispatcher _dispatcher;
-        private string _workerRuntime;
 
-        public WorkerFunctionDescriptorProvider(ScriptHost host, string workerRuntime, ScriptJobHostOptions config, ICollection<IScriptBindingProvider> bindingProviders,
+        public OutOfProcDescriptorProvider(ScriptHost host, ScriptJobHostOptions config, ICollection<IScriptBindingProvider> bindingProviders,
             IFunctionDispatcher dispatcher, ILoggerFactory loggerFactory)
             : base(host, config, bindingProviders)
         {
             _dispatcher = dispatcher;
             _loggerFactory = loggerFactory;
-            _workerRuntime = workerRuntime;
         }
 
         public override async Task<(bool, FunctionDescriptor)> TryCreate(FunctionMetadata functionMetadata)
@@ -37,18 +35,12 @@ public WorkerFunctionDescriptorProvider(ScriptHost host, string workerRuntime, S
             {
                 throw new ArgumentNullException(nameof(functionMetadata));
             }
-
-            if (!_dispatcher.IsSupported(functionMetadata, _workerRuntime))
-            {
-                return (false, null);
-            }
-
             return await base.TryCreate(functionMetadata);
         }
 
         protected override IFunctionInvoker CreateFunctionInvoker(string scriptFilePath, BindingMetadata triggerMetadata, FunctionMetadata functionMetadata, Collection<FunctionBinding> inputBindings, Collection<FunctionBinding> outputBindings)
         {
-            return new WorkerLanguageInvoker(Host, triggerMetadata, functionMetadata, _loggerFactory, inputBindings, outputBindings, _dispatcher);
+            return new OutOfProcInvoker(Host, triggerMetadata, functionMetadata, _loggerFactory, inputBindings, outputBindings, _dispatcher);
         }
 
         protected override async Task<Collection<ParameterDescriptor>> GetFunctionParametersAsync(IFunctionInvoker functionInvoker, FunctionMetadata functionMetadata,

src/WebJobs.Script/Config/ConfigurationSectionNames.cs

@@ -11,14 +11,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Script.Binding;
+using Microsoft.Azure.WebJobs.Script.OutOfProc;
 using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Azure.WebJobs.Script.Description
 {
-    internal class WorkerLanguageInvoker : FunctionInvokerBase
+    internal class OutOfProcInvoker : FunctionInvokerBase
     {
         private readonly Collection<FunctionBinding> _inputBindings;
         private readonly Collection<FunctionBinding> _outputBindings;
@@ -27,15 +28,15 @@ internal class WorkerLanguageInvoker : FunctionInvokerBase
         private readonly Action<ScriptInvocationResult> _handleScriptReturnValue;
         private readonly IFunctionDispatcher _functionDispatcher;
 
-        internal WorkerLanguageInvoker(ScriptHost host, BindingMetadata bindingMetadata, FunctionMetadata functionMetadata, ILoggerFactory loggerFactory,
-            Collection<FunctionBinding> inputBindings, Collection<FunctionBinding> outputBindings, IFunctionDispatcher fuctionDispatcher)
+        internal OutOfProcInvoker(ScriptHost host, BindingMetadata bindingMetadata, FunctionMetadata functionMetadata, ILoggerFactory loggerFactory,
+            Collection<FunctionBinding> inputBindings, Collection<FunctionBinding> outputBindings, IFunctionDispatcher functionDispatcher)
             : base(host, functionMetadata, loggerFactory)
         {
             _bindingMetadata = bindingMetadata;
             _inputBindings = inputBindings;
             _outputBindings = outputBindings;
-            _functionDispatcher = fuctionDispatcher;
-            _logger = loggerFactory.CreateLogger<WorkerLanguageInvoker>();
+            _functionDispatcher = functionDispatcher;
+            _logger = loggerFactory.CreateLogger<OutOfProcInvoker>();
 
             InitializeFileWatcherIfEnabled();
 
@@ -76,10 +77,9 @@ protected override async Task<object> InvokeCore(object[] parameters, FunctionIn
                 Logger = context.Logger
             };
 
-            ScriptInvocationResult result;
             _logger.LogDebug($"Sending invocation id:{invocationId}");
             await _functionDispatcher.InvokeAsync(invocationContext);
-            result = await invocationContext.ResultSource.Task;
+            ScriptInvocationResult result = await invocationContext.ResultSource.Task;
 
             await BindOutputsAsync(triggerValue, context.Binder, result);
             return result.Return;
@@ -90,7 +90,7 @@ private async Task DelayUntilFunctionDispatcherInitialized()
             if (_functionDispatcher != null && _functionDispatcher.State == FunctionDispatcherState.Initializing)
             {
                 _logger.LogDebug($"functionDispatcher state: {_functionDispatcher.State}");
-                await Utility.DelayAsync(LanguageWorkerConstants.ProcessStartTimeoutSeconds, 25, () =>
+                await Utility.DelayAsync(OutOfProcConstants.ProcessStartTimeoutSeconds, 25, () =>
                 {
                     return _functionDispatcher.State != FunctionDispatcherState.Initialized;
                 });

src/WebJobs.Script/Description/OutOfProc/Http/HttpFunctionDescriptorProvider.cs

@@ -0,0 +1,39 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs.Script.Extensibility;
+using Microsoft.Azure.WebJobs.Script.Rpc;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Azure.WebJobs.Script.Description
+{
+    internal class RpcFunctionDescriptorProvider : OutOfProcDescriptorProvider
+    {
+        private string _workerRuntime;
+
+        public RpcFunctionDescriptorProvider(ScriptHost host, string workerRuntime, ScriptJobHostOptions config, ICollection<IScriptBindingProvider> bindingProviders,
+            IFunctionDispatcher dispatcher, ILoggerFactory loggerFactory)
+            : base(host, config, bindingProviders, dispatcher, loggerFactory)
+        {
+            _workerRuntime = workerRuntime;
+        }
+
+        public override async Task<(bool, FunctionDescriptor)> TryCreate(FunctionMetadata functionMetadata)
+        {
+            if (functionMetadata == null)
+            {
+                throw new ArgumentNullException(nameof(functionMetadata));
+            }
+
+            if (!Utility.IsFunctionMetadataLanguageSupportedByWorkerRuntime(functionMetadata, _workerRuntime))
+            {
+                return (false, null);
+            }
+
+            return await base.TryCreate(functionMetadata);
+        }
+    }
+}