IJavascriptObjectRepositry - Add ObjectBoundInJavascript event

Executed on the thread pool when objects are bound in JS

Author: amaitland

CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp

@@ -472,6 +472,21 @@ namespace CefSharp
                                 callback->Success(CefV8Value::CreateBool(true));
 
                                 //TODO: JSB deal with failure - no object matching bound
+
+                                //Send message notifying Browser Process of which objects were bound
+                                auto msg = CefProcessMessage::Create(kJavascriptObjectsBoundInJavascript);
+                                auto args = msg->GetArgumentList();
+
+                                auto names = CefListValue::Create();
+                                args->SetList(0, names);
+
+                                for (auto i = 0; i < javascriptObjects->Count; i++)
+                                {
+                                    auto name = javascriptObjects[i]->JavascriptName;
+                                    names->SetString(i, StringUtils::ToNative(name));
+                                }
+
+                                browser->SendProcessMessage(CefProcessId::PID_BROWSER, msg);
                             }
                         }
                         finally

CefSharp.Core/Internals/ClientAdapter.cpp

@@ -1138,7 +1138,7 @@ namespace CefSharp
             auto argList = message->GetArgumentList();
             IJavascriptCallbackFactory^ callbackFactory = _browserAdapter->JavascriptCallbackFactory;
 
-            //TODO: Rename messages (remove Root from name)
+            //TODO: JSB Rename messages (remove Root from name)
             if (name == kJavascriptRootObjectRequest)
             {
                 if (!Object::ReferenceEquals(_browserAdapter, nullptr) && !_browserAdapter->IsDisposed)
@@ -1171,6 +1171,24 @@ namespace CefSharp
 
                 handled = true;
             }
+            else if (name == kJavascriptObjectsBoundInJavascript)
+            {
+                if (!Object::ReferenceEquals(_browserAdapter, nullptr) && !_browserAdapter->IsDisposed)
+                {
+                    auto objectRepository = _browserAdapter->JavascriptObjectRepository;
+
+                    auto objectNames = argList->GetList(0);
+                    auto names = gcnew List<String^>(objectNames->GetSize());
+                    for (auto i = 0; i < objectNames->GetSize(); i++)
+                    {
+                        names->Add(StringUtils::ToClr(objectNames->GetString(i)));
+                    }
+                    
+                    objectRepository->ObjectsBound(names);
+                }
+
+                handled = true;
+            }
             else if (name == kOnContextCreatedRequest)
             {
                 _browserControl->SetCanExecuteJavascriptOnMainFrame(true);

CefSharp.Core/Internals/Messaging/Messages.h

@@ -41,6 +41,8 @@ namespace CefSharp
             // optional message via command line argument when the subprocess is
             // created.
             const CefString kOnFocusedNodeChanged = "OnFocusedNodeChanged";
+            //Message containing a request/notification that JSB objects have been bound
+            const CefString kJavascriptObjectsBoundInJavascript = "JavascriptObjectsBoundInJavascript";
         }
     }
 }

CefSharp/IJavascriptObjectRepository.cs

@@ -41,5 +41,10 @@ public interface IJavascriptObjectRepository : IDisposable
         /// registered with the repository
         /// </summary>
         event EventHandler<JavascriptBindingEventArgs> ResolveObject;
+
+        /// <summary>
+        /// Event handler is triggered when a object has been successfully bound on javascript
+        /// </summary>
+        event EventHandler<JavascriptBindingEventArgs> ObjectBoundInJavascript;
     }
 }

CefSharp/Internals/JavascriptObjectRepository.cs

@@ -9,6 +9,7 @@
 using System.Threading;
 using CefSharp.ModelBinding;
 using CefSharp.Event;
+using System.Threading.Tasks;
 
 namespace CefSharp.Internals
 {
@@ -34,6 +35,7 @@ public class JavascriptObjectRepository : IJavascriptObjectRepository
         private static long lastId;
 
         public event EventHandler<JavascriptBindingEventArgs> ResolveObject;
+        public event EventHandler<JavascriptBindingEventArgs> ObjectBoundInJavascript;		
 
         /// <summary>
         /// A hash from assigned object ids to the objects,
@@ -83,6 +85,29 @@ public List<JavascriptObject> GetObjects(List<string> names = null)
             return objects.Values.Where(x => names.Contains(x.JavascriptName)).ToList();
         }
 
+
+        public void ObjectsBound(List<string> names)
+        {
+            //TODO: JSB Should this be a single event invocation or
+            // one per object that was bound??? (Currently one per object)
+            
+            //Execute on Threadpool so we don't unnessicarily block the CEF IO thread
+            var handler = ObjectBoundInJavascript;
+            if(handler != null)
+            { 
+                Task.Run(() =>
+                {
+                    foreach (var name in names)
+                    {
+                        if (handler != null)
+                        {
+                            handler(this, new JavascriptBindingEventArgs(this, name));
+                        }
+                    }
+                });			
+            }
+        }
+
         private JavascriptObject CreateJavascriptObject(bool camelCaseJavascriptNames)
         {
             var id = Interlocked.Increment(ref lastId);