Performing JSON -> object conversions for Javascript input bindings

Author: mathewc

sample/ManualTrigger/function.json

@@ -3,6 +3,18 @@
     {
       "type": "manualTrigger",
       "direction": "in"
+    },
+    {
+      "type": "blob",
+      "name": "status",
+      "direction": "in",
+      "path": "samples-input/status"
+    },
+    {
+      "type": "blob",
+      "name": "result",
+      "direction": "out",
+      "path": "samples-output/result"
     }
   ]
 }

sample/ManualTrigger/index.js

@@ -1,4 +1,10 @@
 module.exports = function (context, input) {
     context.log('Node.js manually triggered function called with input', input);
+
+    var status = context.bindings.status;
+    context.log('Status: Level:%d Detail:%s', status.level, status.detail);
+
+    context.bindings.result = status.detail;
+
     context.done();
 }

src/WebJobs.Script/Description/NodeFunctionInvoker.cs

@@ -144,7 +144,7 @@ private async Task ProcessInputBindingsAsync(IBinderEx binder, Dictionary<string
             var nonTriggerInputBindings = _inputBindings.Where(p => !p.Metadata.IsTrigger);
             foreach (var inputBinding in nonTriggerInputBindings)
             {
-                string value = null;
+                string stringValue = null;
                 using (MemoryStream stream = new MemoryStream())
                 {
                     BindingContext bindingContext = new BindingContext
@@ -157,12 +157,15 @@ private async Task ProcessInputBindingsAsync(IBinderEx binder, Dictionary<string
 
                     stream.Seek(0, SeekOrigin.Begin);
                     StreamReader sr = new StreamReader(stream);
-                    value = sr.ReadToEnd();
+                    stringValue = sr.ReadToEnd();
                 }
 
-                bindings.Add(inputBinding.Metadata.Name, value);
+                // if the string input is json, convert to an object
+                object convertedValue = stringValue;
+                convertedValue = TryConvertJsonToObject(stringValue);
 
-                inputs.Add(value);
+                bindings.Add(inputBinding.Metadata.Name, convertedValue);
+                inputs.Add(convertedValue);
             }
 
             executionContext["inputs"] = inputs;
@@ -280,12 +283,8 @@ private Dictionary<string, object> CreateScriptExecutionContext(object input, Tr
             Type triggerParameterType = input.GetType();
             if (triggerParameterType == typeof(string))
             {
-                // if the input is json, convert to a json object
-                Dictionary<string, object> jsonObject;
-                if (TryDeserializeJsonObject((string)input, out jsonObject))
-                {
-                    input = jsonObject;
-                }
+                // if the input is json, convert to an object
+                input = TryConvertJsonToObject((string)input);
             }
             else if (triggerParameterType == typeof(HttpRequestMessage))
             {
@@ -335,6 +334,20 @@ private Dictionary<string, object> CreateScriptExecutionContext(object input, Tr
             return context;
         }
 
+        private object TryConvertJsonToObject(string input)
+        {
+            object result = input;
+
+            // if the input is json, convert to an object
+            Dictionary<string, object> jsonObject;
+            if (TryDeserializeJsonObject(input, out jsonObject))
+            {
+                result = jsonObject;
+            }
+
+            return result;
+        }
+
         private Dictionary<string, object> CreateRequestObject(HttpRequestMessage request)
         {
             // TODO: need to provide access to remaining request properties

src/WebJobs.Script/FileTraceWriter.cs

@@ -112,7 +112,6 @@ public override void Trace(TraceEvent traceEvent)
                 throw new ArgumentNullException("traceEvent");
             }
 
-            // TODO: buffer logs and write only periodically
             AppendLine(traceEvent.Message);
             if (traceEvent.Exception != null)
             {

test/WebJobs.Script.Tests/SamplesEndToEndTests.cs

@@ -29,6 +29,31 @@ public SamplesEndToEndTests(TestFixture fixture)
             _fixture = fixture;
         }
 
+        [Fact]
+        public async Task ManualTrigger_Invoke_Succeeds()
+        {
+            CloudBlobContainer outputContainer = _fixture.BlobClient.GetContainerReference("samples-output");
+            CloudBlockBlob outputBlob = outputContainer.GetBlockBlobReference("result");
+            outputBlob.DeleteIfExists();
+
+            CloudBlobContainer inputContainer = _fixture.BlobClient.GetContainerReference("samples-input");
+            CloudBlockBlob statusBlob = inputContainer.GetBlockBlobReference("status");
+            statusBlob.UploadText("{ \"level\": 4, \"detail\": \"All systems are normal :)\" }");
+
+            string uri = "admin/functions/manualtrigger";
+            HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, uri);
+            request.Headers.Add("x-functions-key", "t8laajal0a1ajkgzoqlfv5gxr4ebhqozebw4qzdy");
+            request.Content = new StringContent("{ 'input': 'Hello Manual Trigger!' }");
+            request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+            HttpResponseMessage response = await this._fixture.HttpClient.SendAsync(request);
+            Assert.Equal(HttpStatusCode.Accepted, response.StatusCode);
+
+            // wait for completion
+            string result = await TestHelpers.WaitForBlobAsync(outputBlob);
+            Assert.Equal("All systems are normal :)", result);
+        }
+
         [Fact]
         public async Task Home_Get_Succeeds()
         {