Revving version to 0.7 and a few other fixes

Author: mathewc

WebJobs.Script.proj

@@ -7,7 +7,7 @@
     <SkipStrongNamesXml>tools\SkipStrongNames.xml</SkipStrongNamesXml>
     <PublishPath Condition=" '$(PublishPath)' == '' ">bin</PublishPath>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
-    <SiteExtensionVersion>0.6.$(BuildNumber)</SiteExtensionVersion>
+    <SiteExtensionVersion>0.7.$(BuildNumber)</SiteExtensionVersion>
     <SiteExtensionBasePath>$(PublishPath)\Packages\SiteExtension</SiteExtensionBasePath>
     <SiteExtensionPath>$(SiteExtensionBasePath)\$(SiteExtensionVersion)</SiteExtensionPath>
     <ExtensionXml>src\SiteExtension\extension.xml</ExtensionXml>

sample/HttpTrigger-CSharp-CustomRoute/function.json

@@ -5,7 +5,7 @@
             "name": "info",
             "direction": "in",
             "methods": [ "get" ],
-            "route": "csharp/products/{category:alpha}/{id:int}"
+            "route": "csharp/products/{category:alpha}/{id:int?}"
         },
         {
             "type": "http",

sample/HttpTrigger-CSharp-CustomRoute/run.csx

@@ -8,10 +8,10 @@ using Microsoft.Azure.WebJobs.Host;
 public class ProductInfo
 {
     public string Category { get; set; }
-    public int Id { get; set; }
+    public int? Id { get; set; }
 }
 
-public static ProductInfo Run(ProductInfo info, string category, int id, TraceWriter log)
+public static ProductInfo Run(ProductInfo info, string category, int? id, TraceWriter log)
 {
     log.Info($"ProductInfo: Category={category} Id={id}");
     log.Info($"Parameters: category={category} id={id}");

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

@@ -201,9 +201,13 @@ internal static void ApplyBindingData(object target, IDictionary<string, object>
                         propertyHelper.Property.CanWrite)
                     {
                         object value = pair.Value;
-                        if (value != null && value.GetType() != propertyHelper.Property.PropertyType)
+                        Type targetType = propertyHelper.Property.PropertyType;
+                        if (value != null && value.GetType() != targetType)
                         {
-                            value = Convert.ChangeType(value, propertyHelper.Property.PropertyType);
+                            // if the type is nullable, we only need to convert to the
+                            // correct underlying type
+                            targetType = Nullable.GetUnderlyingType(targetType) ?? targetType;
+                            value = Convert.ChangeType(value, targetType);
                         }
                         propertyHelper.SetValue(target, value);
                     }
@@ -250,6 +254,9 @@ internal static async Task<IReadOnlyDictionary<string, object>> GetRequestBindin
                             bindingDataContract.TryGetValue(pair.Key, out type) &&
                             value.GetType() != type)
                         {
+                            // if the type is nullable, we only need to convert to the
+                            // correct underlying type
+                            type = Nullable.GetUnderlyingType(type) ?? type;
                             value = Convert.ChangeType(value, type);
                         }
 

src/WebJobs.Script/Content/Script/functions.js

@@ -70,7 +70,7 @@ function createFunction(f) {
         delete context._inputs;
 
         var result = f.apply(null, inputs);
-        if (result && typeof result.then === 'function') {
+        if (result && util.isFunction(result.then)) {
             context._promise = true;
             result.then((result) => context.done(null, result))
                 .catch((err) => context.done(err));
@@ -88,22 +88,19 @@ function getEntryPoint(f, context) {
         }
         else if (Object.keys(f).length == 1) {
             // a single named function was exported
-            f = f[Object.keys(f)[0]];
+            var name = Object.keys(f)[0];
+            f = f[name];
         }
         else {
             // finally, see if there is an exported function named
             // 'run' or 'index' by convention
-            f = f['run'] || f['index'];
+            f = f.run || f.index;
         }
     }
-    else if (!util.isFunction(f)) {
-        // the module must export an object or a function
-        f = null;
-    }
 
-    if (!f) {
+    if (!util.isFunction(f)) {
         throw "Unable to determine function entry point. If multiple functions are exported, " +
-            "you must indicate the entry point, either by naming it 'run', or by naming it " +
+            "you must indicate the entry point, either by naming it 'run' or 'index', or by naming it " +
             "explicitly via the 'entryPoint' metadata property.";
     }
 

src/WebJobs.Script/Host/ScriptHost.cs

@@ -171,6 +171,10 @@ internal void AddFunctionError(string functionName, string error)
 
         protected virtual void Initialize()
         {
+            string hostLogPath = Path.Combine(ScriptConfig.RootLogPath, "Host");
+            string debugSentinelFileName = Path.Combine(hostLogPath, ScriptConstants.DebugSentinelFileName);
+            this.LastDebugNotify = File.GetLastWriteTime(debugSentinelFileName);
+
             IMetricsLogger metricsLogger = ScriptConfig.HostConfig.GetService<IMetricsLogger>();
             if (metricsLogger == null)
             {
@@ -189,20 +193,13 @@ protected virtual void Initialize()
                     File.WriteAllText(hostConfigFilePath, "{}");
                 }
 
-                if (ScriptConfig.HostConfig.IsDevelopment)
+                if (ScriptConfig.HostConfig.IsDevelopment || InDebugMode)
                 {
+                    // If we're in debug/development mode, use optimal debug settings
                     ScriptConfig.HostConfig.UseDevelopmentSettings();
                 }
-                else
-                {
-                    // TEMP: Until https://github.com/Azure/azure-webjobs-sdk-script/issues/100 is addressed
-                    // we're using some presets that are a good middle ground
-                    ScriptConfig.HostConfig.Queues.MaxPollingInterval = TimeSpan.FromSeconds(10);
-                    ScriptConfig.HostConfig.Singleton.ListenerLockPeriod = TimeSpan.FromSeconds(15);
-                }
 
                 string json = File.ReadAllText(hostConfigFilePath);
-
                 JObject hostConfig;
                 try
                 {
@@ -251,10 +248,6 @@ protected virtual void Initialize()
                     TraceWriter = new ConsoleTraceWriter(hostTraceLevel);
                 }
 
-                string hostLogPath = Path.Combine(ScriptConfig.RootLogPath, "Host");
-                string debugSentinelFileName = Path.Combine(hostLogPath, ScriptConstants.DebugSentinelFileName);
-                this.LastDebugNotify = File.GetLastWriteTime(debugSentinelFileName);
-
                 _debugModeFileWatcher = new FileSystemWatcher(hostLogPath, ScriptConstants.DebugSentinelFileName)
                 {
                     EnableRaisingEvents = true

test/WebJobs.Script.Tests/SamplesEndToEndTests.cs

@@ -353,7 +353,17 @@ public async Task HttpTrigger_CSharp_CustomRoute_ReturnsExpectedResponse()
             string json = await response.Content.ReadAsStringAsync();
             var product = JObject.Parse(json);
             Assert.Equal("electronics", (string)product["Category"]);
-            Assert.Equal(123, (int)product["Id"]);
+            Assert.Equal(123, (int?)product["Id"]);
+
+            // now try again without specifying optional id parameter
+            uri = $"api/csharp/products/electronics?code={functionKey}";
+            request = new HttpRequestMessage(HttpMethod.Get, uri);
+            response = await this._fixture.HttpClient.SendAsync(request);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            json = await response.Content.ReadAsStringAsync();
+            product = JObject.Parse(json);
+            Assert.Equal("electronics", (string)product["Category"]);
+            Assert.Null((int?)product["Id"]);
 
             // test a constraint violation (invalid id)
             uri = $"api/csharp/products/electronics/1x3?code={functionKey}";

test/WebJobs.Script.Tests/TestScripts/Node/functions.tests.js

@@ -76,9 +76,13 @@ describe('functions', () => {
             expect(run).to.be.true;
         });
 
-        it('throws if no function', () => {
+        it('throws if not a function', () => {
             var func = functions.createFunction(1);
+            expect(() => func(context)).to.throw(/Unable to determine function entry point.*/);
+        });
 
+        it('throws if object does not contain a function', () => {
+            var func = functions.createFunction({ run: 1 });
             expect(() => func(context)).to.throw(/Unable to determine function entry point.*/);
         });
     });