Don't override all output binding data when return result present (#273)

* Don't override all output binding data set through context.bindings if return value present

* Update worker version

Author: mhoeger

Worker.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>Microsoft.Azure.Functions.NodeJsWorker</id>
-    <version>2.0.0$version$</version>
+    <version>2.0.1$version$</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables: {
-  WORKER_VERSION: '2.0.0',
+  WORKER_VERSION: '2.0.1',
   NODE_8: '8.x',
   NODE_10: '10.x',
   NODE_12: '12.x'

e2e-nightly-cli-azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables: {
-  WORKER_VERSION: '2.0.0',
+  WORKER_VERSION: '2.0.1',
   NODE_12: '12.x'
 }
 name: $(WORKER_VERSION)-$(Date:yyyyMMdd)$(Rev:.r)

e2e-nightly-site-azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables: {
-  WORKER_VERSION: '2.0.0',
+  WORKER_VERSION: '2.0.1',
   NODE_12: '12.x'
 }
 name: $(WORKER_VERSION)-$(Date:yyyyMMdd)$(Rev:.r)

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "azure-functions-nodejs-worker",
   "author": "Microsoft Corporation",
-  "version": "1.2.0",
+  "version": "2.0.1",
   "description": "Microsoft Azure Functions NodeJS Worker",
   "license": "(MIT OR Apache-2.0)",
   "dependencies": {

package.json

@@ -186,9 +186,12 @@ export class WorkerChannel implements IWorkerChannel {
         invocationId: msg.invocationId,
         result: this.getStatus(err)
       }
+      // explicitly set outputData to empty array to concat later
+      response.outputData = [];
 
       try {
         if (result) {
+          // Set results from return / context.done
           if (result.return) {
             if (this._v1WorkerBehavior) {
               response.returnValue = toTypedData(result.return);
@@ -208,14 +211,15 @@ export class WorkerChannel implements IWorkerChannel {
               }
             }
           }
-          // Data from return supersedes data from context.bindings
-          if (result.bindings && !response.outputData) {
-            response.outputData = Object.keys(info.outputBindings)
-              .filter(key => result.bindings[key] !== undefined)
+          // Set results from context.bindings
+          if (result.bindings) {
+            response.outputData = response.outputData.concat(Object.keys(info.outputBindings)
+              // Data from return prioritized over data from context.bindings
+              .filter(key => result.bindings[key] !== undefined && (!result.return || result.return[key] === undefined))
               .map(key => <rpc.IParameterBinding>{
                 name: key,
                 data: info.outputBindings[key].converter(result.bindings[key])
-              });
+              }));
           }
         }
       } catch (e) {

src/WorkerChannel.ts

@@ -52,6 +52,11 @@ describe('WorkerChannel', () => {
     direction: 1,
     dataType: 1
   };
+  const queueOutputBinding = {
+    type: "queue",
+    direction: 1,
+    dataType: 1
+  };
   const httpReturnBinding = { 
     bindings: { 
       req: httpInputBinding, 
@@ -64,6 +69,14 @@ describe('WorkerChannel', () => {
       res: httpOutputBinding 
     } 
   };
+  const multipleBinding = { 
+    bindings: { 
+      req: httpInputBinding, 
+      res: httpOutputBinding,
+      queueOutput: queueOutputBinding,
+      overriddenQueueOutput: queueOutputBinding
+    } 
+  };
 
   beforeEach(() => {
     stream = new TestEventStream();
@@ -472,9 +485,63 @@ describe('WorkerChannel', () => {
     });
   });
 
+  it ('serializes multiple output bindings through context.done and context.bindings', () => {
+    loader.getFunc.returns((context) => {
+      context.bindings.queueOutput = "queue message";
+      context.bindings.overriddenQueueOutput = "start message";
+      context.done(null, { 
+        res: { body: { hello: "world" } },
+        overriddenQueueOutput: "override"
+      });
+    });
+    loader.getInfo.returns(new FunctionInfo(multipleBinding));
+
+    var actualInvocationRequest: rpc.IInvocationRequest = <rpc.IInvocationRequest> {
+      functionId: 'id',
+      invocationId: '1',
+      inputData: [httpInputData],
+      triggerMetadata: getTriggerDataMock(),
+    };
+
+    stream.addTestMessage({
+      invocationRequest: actualInvocationRequest
+    });
+
+    sinon.assert.calledWithMatch(stream.written, <rpc.IStreamingMessage> {
+      invocationResponse: {
+        invocationId: '1',
+        result:  {
+          status: rpc.StatusResult.Status.Success
+        },
+        outputData: [{
+          data: {
+            http: {
+              body: { json: "{\"hello\":\"world\"}" },
+              cookies: [],
+              headers: { },
+              statusCode: undefined
+            }
+          },
+          name: "res"
+        },
+        {
+          data: {
+            string: "override"
+          },
+          name: "overriddenQueueOutput"
+        },
+        {
+          data: {
+            string: "queue message"
+          },
+          name: "queueOutput"
+        }]
+      }
+    });
+  });
+
   it ('serializes output binding data through context.done with V2 compat', () => {
-    let httpResponse;
-    loader.getFunc.returns((context) => { httpResponse = context.res; context.done(null, { res: { body: { hello: "world" }}})});
+    loader.getFunc.returns((context) => context.done(null, { res: { body: { hello: "world" }}}));
     loader.getInfo.returns(new FunctionInfo(httpResBinding));
 
     stream.addTestMessage({
@@ -503,12 +570,7 @@ describe('WorkerChannel', () => {
         result:  {
           status: rpc.StatusResult.Status.Success
         },
-        outputData: [{
-          data: {
-            http: httpResponse
-          },
-          name: "res"
-        }],
+        outputData: [],
         returnValue: {
           json: "{\"res\":{\"body\":{\"hello\":\"world\"}}}"
         }

test/WorkerChannelTests.ts

@@ -1,6 +1,6 @@
 {
   "name": "@azure/functions",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Azure Functions types for Typescript",
   "repository": {
     "type": "git",