Add more functionality

Author: amaitland

CefSharp.OutOfProcess.BrowserProcess/BrowserProcessHandler.cs

@@ -59,7 +59,6 @@ protected override void OnContextInitialized()
 
                 _ = CefThread.ExecuteOnUiThread(() =>
                 {
-
                     var browser = new OutOfProcessChromiumWebBrowser(_jsonRpc, id, url);
 
                     var windowInfo = new WindowInfo();

CefSharp.OutOfProcess.BrowserProcess/CefSharp.OutOfProcess.BrowserProcess.csproj

@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="PInvoke.Kernel32" Version="0.7.104" />
+    <PackageReference Include="PInvoke.User32" Version="0.7.104" />
     <PackageReference Include="StreamJsonRpc" Version="2.11.35" />
   </ItemGroup>
 

CefSharp.OutOfProcess.BrowserProcess/OutOfProcessChromiumWebBrowser.cs

@@ -304,6 +304,8 @@ void IWebBrowserInternal.OnConsoleMessage(ConsoleMessageEventArgs args)
         void IWebBrowserInternal.OnStatusMessage(StatusMessageEventArgs args)
         {
             StatusMessage?.Invoke(this, args);
+
+            _ = _jsonRpc.NotifyAsync("StatusMessage", _id, args.Value);
         }
 
         /// <summary>
@@ -873,6 +875,8 @@ void IWebBrowserInternal.SetAddress(AddressChangedEventArgs args)
             Address = args.Address;
 
             AddressChanged?.Invoke(this, args);
+
+            _ = _jsonRpc.NotifyAsync("AddressChanged", _id, args.Address);
         }
 
         /// <summary>
@@ -884,6 +888,8 @@ partial void SetLoadingStateChange(LoadingStateChangedEventArgs args)
             CanGoBack = args.CanGoBack;
             CanGoForward = args.CanGoForward;
             IsLoading = args.IsLoading;
+
+            _ = _jsonRpc.NotifyAsync("LoadingStateChange", _id, args.CanGoBack, args.CanGoForward, args.IsLoading);
         }
 
         /// <summary>
@@ -893,6 +899,8 @@ partial void SetLoadingStateChange(LoadingStateChangedEventArgs args)
         void IWebBrowserInternal.SetTitle(TitleChangedEventArgs args)
         {
             TitleChanged?.Invoke(this, args);
+
+            _ = _jsonRpc.NotifyAsync("TitleChanged", _id, args.Title);
         }
 
         /// <summary>

CefSharp.OutOfProcess.Core/CefSharp.OutOfProcess.Core.csproj

@@ -13,4 +13,8 @@
     <ProjectReference Include="..\CefSharp.Puppeteer\lib\PuppeteerSharp\CefSharp.DevTools.OutOfProcess.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="EventArgs\" />
+  </ItemGroup>
+
 </Project>

CefSharp.OutOfProcess.Core/EventArgs/AddressChangedEventArgs.cs

@@ -0,0 +1,28 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+
+namespace CefSharp.OutOfProcess
+{
+    /// <summary>
+    /// Event arguments for the AddressChanged event handler.
+    /// </summary>
+    public class AddressChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The new address
+        /// </summary>
+        public string Address { get; private set; }
+
+        /// <summary>
+        /// Creates a new AddressChangedEventArgs event argument.
+        /// </summary>
+        /// <param name="address">the address</param>
+        public AddressChangedEventArgs(string address)
+        {
+            Address = address;
+        }
+    }
+}

CefSharp.OutOfProcess.Core/EventArgs/LoadingStateChangedEventArgs.cs

@@ -0,0 +1,41 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+
+namespace CefSharp.OutOfProcess
+{
+    /// <summary>
+    /// Event arguments to the LoadingStateChanged event handler set up in IWebBrowser.
+    /// </summary>
+    public class LoadingStateChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Returns true if the browser can navigate forwards. 
+        /// </summary>
+        public bool CanGoForward { get; private set; }
+        /// <summary>
+        /// Returns true if the browser can navigate backwards. 
+        /// </summary>
+        public bool CanGoBack { get; private set; }
+        /// <summary>
+        /// Returns true if the browser is loading. 
+        /// </summary>
+        public bool IsLoading { get; private set; }
+
+        /// <summary>
+        /// LoadingStateChangedEventArgs
+        /// </summary>
+        /// <param name="browser">browser</param>
+        /// <param name="canGoBack">can go back</param>
+        /// <param name="canGoForward">can go forward</param>
+        /// <param name="isLoading">is loading</param>
+        public LoadingStateChangedEventArgs(bool canGoBack, bool canGoForward, bool isLoading)
+        {
+            CanGoBack = canGoBack;
+            CanGoForward = canGoForward;
+            IsLoading = isLoading;
+        }
+    }
+}

CefSharp.OutOfProcess.Core/EventArgs/StatusMessageEventHandler.cs

@@ -0,0 +1,28 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+
+namespace CefSharp.OutOfProcess
+{
+    /// <summary>
+    /// Event arguments to the StatusMessage event handler.
+    /// </summary>
+    public class StatusMessageEventArgs : EventArgs
+    {
+        /// <summary>
+        /// StatusMessageEventArgs
+        /// </summary>
+        /// <param name="value">status message value</param>
+        public StatusMessageEventArgs(string value)
+        {
+            Value = value;
+        }
+
+        /// <summary>
+        /// The value of the status message.
+        /// </summary>
+        public string Value { get; private set; }
+    }
+}

CefSharp.OutOfProcess.Core/EventArgs/TitleChangedEventArgs.cs

@@ -0,0 +1,28 @@
+// Copyright © 2014 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+
+namespace CefSharp.OutOfProcess
+{
+    /// <summary>
+    /// Event arguments to the TitleChanged event handler.
+    /// </summary>
+    public class TitleChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The new title
+        /// </summary>
+        public string Title { get; private set; }
+
+        /// <summary>
+        /// Creates a new TitleChanged event arg
+        /// </summary>
+        /// <param name="title">the new title</param>
+        public TitleChangedEventArgs(string title)
+        {
+            Title = title;
+        }
+    }
+}

CefSharp.OutOfProcess.Core/IChromiumWebBrowser.cs

@@ -1,4 +1,5 @@
 using CefSharp.Puppeteer;
+using System;
 using System.Threading.Tasks;
 
 namespace CefSharp.OutOfProcess
@@ -8,6 +9,119 @@ namespace CefSharp.OutOfProcess
     /// </summary>
     public interface IChromiumWebBrowser
     {
+        /// <summary>
+        /// Occurs when the browser address changed.
+        /// </summary>
+        event EventHandler<AddressChangedEventArgs> AddressChanged;
+        /// <summary>
+        /// Occurs when document title changes.
+        /// </summary>
+        event EventHandler<TitleChangedEventArgs> TitleChanged;
+
+        /// <summary>
+        /// Event handler for changes to the status message.
+        /// </summary>
+        event EventHandler<StatusMessageEventArgs> StatusMessage;
+
+        /// <summary>
+        /// Event handler that will get called when the Loading state has changed.
+        /// This event will be fired twice. Once when loading is initiated either programmatically or
+        /// by user action, and once when loading is terminated due to completion, cancellation of failure. 
+        /// </summary>
+        event EventHandler<LoadingStateChangedEventArgs> LoadingStateChanged;
+
+        /// <summary>
+        /// Raised when the JavaScript <c>DOMContentLoaded</c> <see href="https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded"/> event is dispatched.
+        /// </summary>
+        event EventHandler DOMContentLoaded;
+
+        /// <summary>
+        /// Raised when the browser crashes
+        /// </summary>
+        event EventHandler<ErrorEventArgs> BrowserProcessCrashed;
+
+        /// <summary>
+        /// Raised when a frame is attached.
+        /// </summary>
+        event EventHandler<FrameEventArgs> FrameAttached;
+
+        /// <summary>
+        /// Raised when a frame is detached.
+        /// </summary>
+        event EventHandler<FrameEventArgs> FrameDetached;
+
+        /// <summary>
+        /// Raised when a frame is navigated to a new url.
+        /// </summary>
+        event EventHandler<FrameEventArgs> FrameNavigated;
+
+        /// <summary>
+        /// Raised when JavaScript within the page calls one of console API methods, e.g. <c>console.log</c> or <c>console.dir</c>. Also emitted if the page throws an error or a warning.
+        /// The arguments passed into <c>console.log</c> appear as arguments on the event handler.
+        /// </summary>
+        event EventHandler<ConsoleEventArgs> ConsoleMessage;
+
+        /// <summary>
+        /// Raised when the JavaScript <c>load</c> <see href="https://developer.mozilla.org/en-US/docs/Web/Events/load"/> event is dispatched.
+        /// </summary>
+        event EventHandler JavaScriptLoad;
+
+        /// <summary>
+        /// Raised when an uncaught exception happens within the browser.
+        /// </summary>
+        event EventHandler<PageErrorEventArgs> RuntimeExceptionThrown;
+
+        /// <summary>
+        /// Raised when the page opens a new tab or window.
+        /// </summary>
+        event EventHandler<PopupEventArgs> Popup;
+
+        /// <summary>
+        /// Raised when a browser issues a request. The <see cref="NetworkRequest"/> object is read-only.
+        /// In order to intercept and mutate requests, see <see cref="IDevToolsContext.SetRequestInterceptionAsync(bool)"/>
+        /// </summary>
+        event EventHandler<RequestEventArgs> NetworkRequest;
+
+        /// <summary>
+        /// Raised when a request fails, for example by timing out.
+        /// </summary>
+        event EventHandler<RequestEventArgs> NetworkRequestFailed;
+
+        /// <summary>
+        /// Raised when a request finishes successfully.
+        /// </summary>
+        event EventHandler<RequestEventArgs> NetworkRequestFinished;
+
+        /// <summary>
+        /// Raised when a request ended up loading from cache.
+        /// </summary>
+        event EventHandler<RequestEventArgs> NetworkRequestServedFromCache;
+
+        /// <summary>
+        /// Raised when a <see cref="NetworkResponse"/> is received.
+        /// </summary>
+        /// <example>
+        /// An example of handling <see cref="NetworkResponse"/> event:
+        /// <code>
+        /// <![CDATA[
+        /// var tcs = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
+        /// browser.Response += async(sender, e) =>
+        /// {
+        ///     if (e.Response.Url.Contains("script.js"))
+        ///     {
+        ///         tcs.TrySetResult(await e.Response.TextAsync());
+        ///     }
+        /// };
+        ///
+        /// await Task.WhenAll(
+        ///     browser.LoadUrlAsync(TestConstants.ServerUrl + "/grid.html"),
+        ///     tcs.Task);
+        /// Console.WriteLine(await tcs.Task);
+        /// ]]>
+        /// </code>
+        /// </example>
+        event EventHandler<ResponseCreatedEventArgs> NetworkResponse;
+
         /// <summary>
         /// Loads the specified <paramref name="url"/> in the Main Frame.
         /// </summary>
@@ -41,23 +155,23 @@ public interface IChromiumWebBrowser
         string Address { get; }
 
         /// <summary>
-        /// Gets all frames attached to the page.
+        /// Gets all frames attached to the browser.
         /// </summary>
-        /// <value>An array of all frames attached to the page.</value>
+        /// <value>An array of all frames attached to the browser.</value>
         Frame[] Frames { get; }
 
         /// <summary>
-        /// Gets page's main frame
+        /// Gets browser's main frame
         /// </summary>
         /// <remarks>
-        /// Page is guaranteed to have a main frame which persists during navigations.
+        /// Browser is guaranteed to have a main frame which persists during navigations.
         /// </remarks>
         Frame MainFrame { get; }
 
         /// <summary>
         /// Navigates to an url
         /// </summary>
-        /// <param name="url">URL to navigate page to. The url should include scheme, e.g. https://.</param>
+        /// <param name="url">URL to navigate to. The url should include scheme, e.g. https://.</param>
         /// <param name="timeout">Maximum navigation time in milliseconds, defaults to 30 seconds, pass <c>0</c> to disable timeout. </param>
         /// <param name="waitUntil">When to consider navigation succeeded, defaults to <see cref="WaitUntilNavigation.Load"/>. Given an array of <see cref="WaitUntilNavigation"/>, navigation is considered to be successful after all events have been fired</param>
         /// <returns>Task which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect</returns>

CefSharp.OutOfProcess.Core/Internal/IChromiumWebBrowserInternal.cs

@@ -25,5 +25,11 @@ public interface IChromiumWebBrowserInternal : IChromiumWebBrowser
         /// DevTools is ready in the browser process to create the DevToolsContext
         /// </summary>
         void OnDevToolsReady();
+
+        void SetStatusMessage(string msg);
+        void SetTitle(string title);
+
+        void SetAddress(string address);
+        void SetLoadingStateChange(bool canGoBack, bool canGoForward, bool isLoading);
     }
 }