Merge branch 'JsBinding/Wip2' into JsBinding_WIP

Author: amaitland

CefSharp.BrowserSubprocess.Core/TypeUtils.cpp

@@ -182,28 +182,20 @@ namespace CefSharp
                 std::vector<CefString> keys;
                 if (obj->GetKeys(keys))
                 {
-                    Dictionary<String^, Object^>^ result = gcnew Dictionary<String^, Object^>();
+                    auto array = gcnew List<Object^>();
 
                     for (int i = 0; i < arrLength; i++)
                     {
-                        std::string p_key = keys[i].ToString();
-                        String^ p_keyStr = stdToString(p_key);
-
-                        if ((obj->HasValue(keys[i])) && (!p_keyStr->StartsWith("__")))
+                        auto data = obj->GetValue(keys[i]);
+                        if (data != nullptr)
                         {
-                            CefRefPtr<CefV8Value> data;
-
-                            data = obj->GetValue(keys[i]);
-                            if (data != nullptr)
-                            {
-                                Object^ p_data = TypeUtils::ConvertFromCef(data);
+                            auto p_data = TypeUtils::ConvertFromCef(data);
 
-                                result->Add(p_keyStr, p_data);
-                            }
+                            array->Add(p_data);
                         }
                     }
 
-                    return result;
+                    return array->ToArray();
                 }
             }
 

CefSharp.BrowserSubprocess/CefRenderProcess.cs

@@ -113,7 +113,21 @@ public Task<JavascriptResponse> EvaluateScriptAsync(int browserId, long frameId,
 
             var task = factory.StartNew(() =>
             {
-                return browser.DoEvaluateScript(frameId, script);
+                try
+                {
+                    var response = browser.DoEvaluateScript(frameId, script);
+
+                    return response;
+                }
+                catch (Exception ex)
+                {
+                    return new JavascriptResponse
+                    {
+                        Success = false,
+                        Message = ex.ToString()
+                    };
+                }
+
             }, TaskCreationOptions.AttachedToParent);
 
             return timeout.HasValue ? task.WithTimeout(timeout.Value) : task;

CefSharp.Example/Resources/BindingTest.html

@@ -19,6 +19,19 @@
             }
         </script>
         </p>
+        
+        <p>
+            Function delegate to c# method
+            <br />
+            <script type="text/javascript">
+                function myFunction(functionParam)
+                {
+                    return functionParam();
+                }
+
+                document.write("echoMyProperty result: " + myFunction(bound.echoMyProperty));
+            </script>
+        </p>
 
         Methods on bound object 'bound':<br />
         <ul>

CefSharp/Internals/BrowserProcessServiceHost.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Net.Security;
 using System.ServiceModel;
+using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.Threading.Tasks;
 
@@ -66,11 +67,22 @@ protected override void OnClosed()
             operationContextTaskCompletionSource = null;
         }
 
-        public static NetNamedPipeBinding CreateBinding()
+        public static CustomBinding CreateBinding()
         {
             var binding = new NetNamedPipeBinding(NetNamedPipeSecurityMode.None);
             binding.MaxReceivedMessageSize = SixteenMegaBytesInBytes;
-            return binding;
+            binding.ReceiveTimeout = TimeSpan.MaxValue;
+            binding.SendTimeout = TimeSpan.MaxValue;
+            binding.OpenTimeout = TimeSpan.MaxValue;
+            binding.CloseTimeout = TimeSpan.MaxValue;
+
+            // Ensure binding connection stays open indefinitely until closed
+            var customBinding = new CustomBinding(binding);
+            var connectionSettings = customBinding.Elements.Find<NamedPipeTransportBindingElement>().ConnectionPoolSettings;
+            connectionSettings.IdleTimeout = TimeSpan.MaxValue;
+            connectionSettings.MaxOutboundConnectionsPerEndpoint = 0;
+
+            return customBinding;
         }
     }
 }

CefSharp/JavascriptResponse.cs

@@ -1,8 +1,11 @@
-using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace CefSharp
 {
 	[DataContract]
+	[KnownType(typeof(object[]))]
+	[KnownType(typeof(Dictionary<string,object>))]
 	public class JavascriptResponse
 	{
 		[DataMember]

CefSharp3.sln

@@ -55,6 +55,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CefSharp.BrowserSubprocess.
 		{7B495581-2271-4F41-9476-ACB86E8C864F} = {7B495581-2271-4F41-9476-ACB86E8C864F}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9F4008EF-0182-48C6-B0E8-972252DC3F72}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms