Consume proto file repo and add enableContentNegotiation (#2696)

* Added subtree from https://github.com/azure/azure-functions-language-worker-protobuf. Branch: dev. Commit: 894bebb

* remove old files

* updated nodejs worker nuget package and updated tests/behavior accordingly

* fix tests

* updates to tests

* remove unused variable

* update nodejs worker with grpc message siz

Author: mhoeger

src/WebJobs.Script.Grpc/.gitignore

@@ -1,2 +1,3 @@
 Messages
-node_modules
+node_modules
+Proto

src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj

@@ -30,7 +30,7 @@
     <Folder Include="Messages\DotNet\" />
   </ItemGroup>
 
-  <Target Name="GenerateProtoFiles" BeforeTargets="BeforeBuild" Inputs="Proto/FunctionRpc.proto" Outputs="Messages/DotNet/FunctionRpc.cs;Messages/DotNet/FunctionRpcGrpc.cs">
+  <Target Name="GenerateProtoFiles" BeforeTargets="BeforeBuild" Inputs="Proto/src/proto/FunctionRpc.proto" Outputs="Messages/DotNet/FunctionRpc.cs;Messages/DotNet/FunctionRpcGrpc.cs">
     <Exec Command="./generate_protos.$(Ext)" />
     <ItemGroup>
       <Compile Include="**/*$(DefaultLanguageSourceExtension)" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(BaseIntermediateOutputPath)**;$(BaseOutputPath)**;@(Compile)" />

src/WebJobs.Script.Grpc/generate_protos.bat

@@ -35,15 +35,15 @@ setlocal
 cd /d %~dp0
 
 set NUGET_PATH=%UserProfile%\.nuget\packages\grpc.tools\1.4.1\tools\windows_x86
-set PROTO=.\Proto\FunctionRpc.proto
+set PROTO=.\Proto\src\proto\FunctionRpc.proto
 set MSGDIR=.\Messages
 
 if exist %MSGDIR% rmdir /s /q %MSGDIR%
 mkdir %MSGDIR%
 
 set OUTDIR=%MSGDIR%\DotNet
 mkdir %OUTDIR%
-%NUGET_PATH%\protoc.exe %PROTO% --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%NUGET_PATH%\grpc_csharp_plugin.exe --proto_path=.\Proto
+%NUGET_PATH%\protoc.exe %PROTO% --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%NUGET_PATH%\grpc_csharp_plugin.exe --proto_path=.\Proto\src\proto
 
 @rem add pragma warning disable labels to generated files
 

src/WebJobs.Script.Grpc/generate_protos.sh

@@ -48,7 +48,7 @@ if [ -z "$NUGET_ROOT" ]; then
 else
 	NUGET_PATH=$NUGET_ROOT/packages/grpc.tools/1.4.1/tools/$PLATFORM
 fi
-PROTO=./Proto/FunctionRpc.proto
+PROTO=./Proto/src/proto/FunctionRpc.proto
 MSGDIR=./Messages
 
 if [ ! -d "$NUGET_PATH" ]; then
@@ -61,7 +61,7 @@ mkdir $MSGDIR
 
 OUTDIR=$MSGDIR/DotNet
 mkdir $OUTDIR
-$NUGET_PATH/protoc $PROTO --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$NUGET_PATH/grpc_csharp_plugin --proto_path=./Proto
+$NUGET_PATH/protoc $PROTO --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$NUGET_PATH/grpc_csharp_plugin --proto_path=./Proto/src/proto
 
 # add #pragma warning disable labels
 

src/WebJobs.Script/Binding/Http/HttpBinding.cs

@@ -82,20 +82,20 @@ internal static IActionResult CreateResult(HttpRequest request, object content)
 
             int statusCode = StatusCodes.Status200OK;
             IDictionary<string, object> responseHeaders = null;
-            bool isRawResponse = false;
+            bool enableContentNegotiation = false;
             if (responseObject != null)
             {
-                ParseResponseObject(responseObject, ref content, out responseHeaders, out statusCode, out isRawResponse);
+                ParseResponseObject(responseObject, ref content, out responseHeaders, out statusCode, out enableContentNegotiation);
             }
 
-            return CreateResult(request, statusCode, content, responseHeaders, isRawResponse);
+            return CreateResult(request, statusCode, content, responseHeaders, enableContentNegotiation);
         }
 
-        internal static void ParseResponseObject(IDictionary<string, object> responseObject, ref object content, out IDictionary<string, object> headers, out int statusCode, out bool isRawResponse)
+        internal static void ParseResponseObject(IDictionary<string, object> responseObject, ref object content, out IDictionary<string, object> headers, out int statusCode, out bool enableContentNegotiation)
         {
             headers = null;
             statusCode = StatusCodes.Status200OK;
-            isRawResponse = false;
+            enableContentNegotiation = false;
 
             // TODO: Improve this logic
             // Sniff the object to see if it looks like a response object
@@ -116,9 +116,9 @@ internal static void ParseResponseObject(IDictionary<string, object> responseObj
                     statusCode = responseStatusCode.Value;
                 }
 
-                if (responseObject.TryGetValue<bool>("isRaw", out bool isRawValue, ignoreCase: true))
+                if (responseObject.TryGetValue<bool>("enableContentNegotiation", out bool enableContentNegotiationValue, ignoreCase: true))
                 {
-                    isRawResponse = isRawValue;
+                    enableContentNegotiation = enableContentNegotiationValue;
                 }
             }
         }
@@ -161,17 +161,17 @@ statusValue is long ||
             return false;
         }
 
-        private static IActionResult CreateResult(HttpRequest request, int statusCode, object content, IDictionary<string, object> headers, bool isRawResponse)
+        private static IActionResult CreateResult(HttpRequest request, int statusCode, object content, IDictionary<string, object> headers, bool enableContentNegotiation)
         {
-            if (isRawResponse)
+            if (enableContentNegotiation)
             {
                 // We only write the response through one of the formatters if
-                // the function hasn't indicated that it wants to write the raw response
-                return new RawScriptResult(statusCode, content) { Headers = headers };
+                // the function has indicated that it wants to enable content negotiation
+                return new ScriptObjectResult(content, headers) { StatusCode = statusCode };
             }
             else
             {
-                return new ScriptObjectResult(content, headers) { StatusCode = statusCode };
+                return new RawScriptResult(statusCode, content) { Headers = headers };
             }
         }
 

src/WebJobs.Script/Rpc/MessageExtensions/Utilities.cs

@@ -23,7 +23,7 @@ public static object ConvertFromHttpMessageToExpando(RpcHttp inputMessage)
             expando.query = inputMessage.Query as IDictionary<string, string>;
             expando.statusCode = inputMessage.StatusCode;
             expando.headers = inputMessage.Headers.ToDictionary(p => p.Key, p => (object)p.Value);
-            expando.isRaw = inputMessage.IsRaw;
+            expando.enableContentNegotiation = inputMessage.EnableContentNegotiation;
 
             if (inputMessage.Body != null)
             {

src/WebJobs.Script/WebJobs.Script.csproj

@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.1.0-beta2-10025">
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta1-10026">
+    <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta1-10031">
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-beta5" />