Merge branch 'master' into 'release'

Voltstro · Voltstro · commit fe8bbac08b0f · 2024-10-20T18:05:24.000+10:00
Release 2.2.3

See merge request voltstro-studios/uwb/unitywebbrowser!6
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.3] - 2024-10-20
+
+### Added
+
+- Added `AudioMute`
+
+### Changed
+
+- Update CEF to 130.1.2
+- Bump deps
+- Change ready signal to fire when cef calls OnAfterCreated
+
 ## [2.2.2] - 2024-10-16
 
 ### Added
diff --git a/src/Packages/UnityWebBrowser.Communication.Pipes/package.json b/src/Packages/UnityWebBrowser.Communication.Pipes/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.communication.pipes",
   "displayName": "Unity Web Browser Pipes Communication",
   "description": "Adds support to use pipes in UWB.",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -18,7 +18,7 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser": "2.2.2",
+    "dev.voltstro.unitywebbrowser": "2.2.3",
     "org.nuget.voltrpc.communication.pipes": "3.1.0"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.linux.x64",
   "displayName": "Unity Web Browser CEF Engine (Linux x64)",
   "description": "CEF engine for Unity Web Browser (Linux x64).",
-  "version": "2.2.2-129.0.11",
+  "version": "2.2.3-130.1.2",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.macos.arm64",
   "displayName": "Unity Web Browser CEF Engine (MacOS arm64)",
   "description": "CEF engine for Unity Web Browser (MacOS arm64).",
-  "version": "2.2.2-129.0.11",
+  "version": "2.2.3-130.1.2",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.macos.x64",
   "displayName": "Unity Web Browser CEF Engine (MacOS x64)",
   "description": "CEF engine for Unity Web Browser (MacOS x64).",
-  "version": "2.2.2-129.0.11",
+  "version": "2.2.3-130.1.2",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.win.x64",
   "displayName": "Unity Web Browser CEF Engine (Win x64)",
   "description": "CEF engine for Unity Web Browser (Win x64).",
-  "version": "2.2.2-129.0.11",
+  "version": "2.2.3-130.1.2",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef/package.json b/src/Packages/UnityWebBrowser.Engine.Cef/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef",
   "displayName": "Unity Web Browser CEF Engine",
   "description": "CEF engine for Unity Web Browser.",
-  "version": "2.2.2-129.0.11",
+  "version": "2.2.3-130.1.2",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -18,6 +18,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser": "2.2.2"
+    "dev.voltstro.unitywebbrowser": "2.2.3"
   }
 }
diff --git a/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs b/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.2")]
-[assembly: AssemblyFileVersion("2.2.2")]
+[assembly: AssemblyVersion("2.2.3")]
+[assembly: AssemblyFileVersion("2.2.3")]
 
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Prj")]
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Editor")]
diff --git a/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs b/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs
@@ -951,6 +951,17 @@ public void Resize(Resolution newResolution)
             logger.Debug($"Resized to {newResolution}.");
         }
 
+        /// <summary>
+        ///     Mutes browser audio
+        /// </summary>
+        /// <param name="muted"></param>
+        public void AudioMute(bool muted)
+        {
+            CheckIfIsReadyAndConnected();
+            
+            communicationsManager.AudioMute(muted);
+        }
+
         [DebuggerStepThrough]
         private void CheckIfIsReadyAndConnected()
         {
diff --git a/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs b/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs
@@ -197,6 +197,11 @@ public void Resize(Resolution resolution)
             ExecuteTask(() => engineProxy.Resize(resolution));
         }
 
+        public void AudioMute(bool muted)
+        {
+            ExecuteTask(() => engineProxy.AudioMute(muted));
+        }
+
         public void Connect()
         {
             ipcClient.Connect();
diff --git a/src/Packages/UnityWebBrowser/package.json b/src/Packages/UnityWebBrowser/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser",
   "displayName": "Unity Web Browser",
   "description": "Unity Web Browser (UWB) is a Unity package that allows displaying and interacting with the web from within Unity.",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -20,8 +20,8 @@
   "dependencies": {
     "dev.voltstro.nativearrayspanextensions": "1.0.1",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
-    "com.cysharp.unitask": "2.5.5",
-    "org.nuget.voltrpc": "3.2.0"
+    "com.cysharp.unitask": "2.5.10",
+    "org.nuget.voltrpc": "3.2.1"
   },
   "samples": [
     {
diff --git a/src/ThirdParty/CefGlue b/src/ThirdParty/CefGlue
@@ -1 +1 @@
-Subproject commit 173a38fd3e4ccbd04f37e5791ec71a8b48c69b62
+Subproject commit 4adfde40b19089e0a0c2adf2a71c69492e87f71b
diff --git a/src/UnityWebBrowser.Engine.Cef/Main/Core/CefEngineControlsManager.cs b/src/UnityWebBrowser.Engine.Cef/Main/Core/CefEngineControlsManager.cs
@@ -329,6 +329,11 @@ public void Resize(Resolution resolution)
         cefClient.Resize(resolution);
     }
 
+    public void AudioMute(bool muted)
+    {
+        cefClient.AudioMute(muted);
+    }
+
     #endregion
 
     #region Destroy
diff --git a/src/UnityWebBrowser.Engine.Cef/Main/Core/UwbCefEngineEntry.cs b/src/UnityWebBrowser.Engine.Cef/Main/Core/UwbCefEngineEntry.cs
@@ -30,7 +30,7 @@ protected override void EntryPoint(LaunchArguments launchArguments, string[] arg
         cefEngineControlsManager.Init(ClientControlsActions, PopupManager);
 
         SetupIpc(cefEngineControlsManager, launchArguments);
-        Ready();
+        //Ready();
 
         //Calling run message loop will cause the main thread to lock (what we want)
         CefRuntime.RunMessageLoop();
diff --git a/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefClient.cs b/src/UnityWebBrowser.Engine.Cef/Shared/Browser/UwbCefClient.cs
@@ -9,6 +9,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using Microsoft.Extensions.Logging;
+using UnityWebBrowser.Engine.Cef.Core;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Js;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Messages;
 using UnityWebBrowser.Engine.Cef.Shared.Browser.Popups;
@@ -81,6 +82,7 @@ public UwbCefClient(
         {
             browser = cefBrowser;
             browserHost = cefBrowser.GetHost();
+            ClientControls.Ready();
         };
         displayHandler = new UwbCefDisplayHandler(this, mainLogger, browserConsoleLogger);
         requestHandler = new UwbCefRequestHandler(proxySettings, ignoreSslErrors, ignoreSslErrorsDomains);
@@ -414,6 +416,11 @@ public void Resize(Resolution resolution)
         browserHost.WasResized();
     }
 
+    public void AudioMute(bool muted)
+    {
+        browserHost.SetAudioMuted(muted);
+    }
+
     #endregion
 
     #region Messages
diff --git a/src/UnityWebBrowser.Engine.Cef/version.json b/src/UnityWebBrowser.Engine.Cef/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2.2-129.0.11",
+  "version": "2.2.3-130.1.2",
   "publicReleaseRefSpec": [
     "^refs/heads/master$"
   ],
diff --git a/src/UnityWebBrowser.UnityProject/Assets/Scripts/UWBPrjDebugUI.cs b/src/UnityWebBrowser.UnityProject/Assets/Scripts/UWBPrjDebugUI.cs
@@ -68,6 +68,9 @@ public sealed class UWBPrjDebugUI : MonoBehaviour
         
         //Zoom
         private double zoomLevel = double.MinValue;
+        
+        //Audio
+        private bool audioMuted = false;
 
         private void Awake()
         {
@@ -134,7 +137,7 @@ private void OnClientConnected()
             
             hasConnected = true;
         }
-
+        
         private void Update()
         {
             if(webBrowserUIBasic.browserClient.HasDisposed || !hasConnected)
@@ -195,6 +198,11 @@ private void OnImGuiLayout(UImGui.UImGui uImGui)
                     
                     //Buttons for getting details
                     {
+                        if(ImGui.Checkbox("Audio Mute", ref audioMuted))
+                            webBrowserUIBasic.browserClient.AudioMute(audioMuted);
+                        
+                        ImGui.SameLine();
+                        
                         if (ImGui.Button("Get Scroll Pos"))
                             Debug.Log(webBrowserUIBasic.browserClient.GetScrollPosition());
                         
diff --git a/src/UnityWebBrowser.UnityProject/Packages/packages-lock.json b/src/UnityWebBrowser.UnityProject/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.cysharp.unitask": {
-      "version": "2.5.5",
+      "version": "2.5.10",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -149,16 +149,16 @@
       "dependencies": {
         "dev.voltstro.nativearrayspanextensions": "1.0.1",
         "com.unity.nuget.newtonsoft-json": "3.2.1",
-        "com.cysharp.unitask": "2.5.5",
-        "org.nuget.voltrpc": "3.2.0"
+        "com.cysharp.unitask": "2.5.10",
+        "org.nuget.voltrpc": "3.2.1"
       }
     },
     "dev.voltstro.unitywebbrowser.communication.pipes": {
       "version": "file:../../Packages/UnityWebBrowser.Communication.Pipes",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "dev.voltstro.unitywebbrowser": "2.2.2",
+        "dev.voltstro.unitywebbrowser": "2.2.3",
         "org.nuget.voltrpc.communication.pipes": "3.1.0"
       }
     },
@@ -167,39 +167,39 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "dev.voltstro.unitywebbrowser": "2.2.2"
+        "dev.voltstro.unitywebbrowser": "2.2.3"
       }
     },
     "dev.voltstro.unitywebbrowser.engine.cef.linux.x64": {
       "version": "file:../../Packages/UnityWebBrowser.Engine.Cef.Linux-x64",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
       }
     },
     "dev.voltstro.unitywebbrowser.engine.cef.macos.arm64": {
       "version": "file:../../Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
       }
     },
     "dev.voltstro.unitywebbrowser.engine.cef.macos.x64": {
       "version": "file:../../Packages/UnityWebBrowser.Engine.Cef.MacOS-x64",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
       }
     },
     "dev.voltstro.unitywebbrowser.engine.cef.win.x64": {
       "version": "file:../../Packages/UnityWebBrowser.Engine.Cef.Win-x64",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
+        "dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
       }
     },
     "dev.voltstro.unitywebbrowser.unix-support": {
@@ -223,7 +223,7 @@
       "url": "https://upm-pkgs.voltstro.dev"
     },
     "org.nuget.voltrpc": {
-      "version": "3.2.0",
+      "version": "3.2.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
diff --git a/src/VoltstroStudios.UnityWebBrowser.Shared/Core/IEngineControls.cs b/src/VoltstroStudios.UnityWebBrowser.Shared/Core/IEngineControls.cs
@@ -114,4 +114,10 @@ internal interface IEngineControls
     /// </summary>
     /// <param name="resolution"></param>
     public void Resize(Resolution resolution);
+
+    /// <summary>
+    ///     Mutes browser audio
+    /// </summary>
+    /// <param name="muted"></param>
+    public void AudioMute(bool muted);
 }
diff --git a/src/VoltstroStudios.UnityWebBrowser.Shared/VoltstroStudios.UnityWebBrowser.Shared.csproj b/src/VoltstroStudios.UnityWebBrowser.Shared/VoltstroStudios.UnityWebBrowser.Shared.csproj
@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="VoltRpc" Version="3.2.0" />
+        <PackageReference Include="VoltRpc" Version="3.2.1" />
         <PackageReference Include="VoltRpc.Proxy.Generator" Version="2.3.0" />
 
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
diff --git a/src/version.json b/src/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "publicReleaseRefSpec": [
     "^refs/heads/release$"
   ],

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,11 @@ public void Resize(Resolution resolution)`
`197`	`197`	`ExecuteTask(() => engineProxy.Resize(resolution));`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ public void AudioMute(bool muted)`
	`201`	`+ {`
	`202`	`+ ExecuteTask(() => engineProxy.AudioMute(muted));`
	`203`	`+ }`
	`204`	`+`
`200`	`205`	`public void Connect()`
`201`	`206`	`{`
`202`	`207`	`ipcClient.Connect();`