MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build as Self Contained and Selfhost CefSharp SubProcess (#693)

Browse Source 
* Added self contained parameter to builds

* Remove dotnet install from installer

* Fixed missing SubProcessExe

* Self hot browser subprocess

---------

Co-authored-by: Natsumi <cmcooper123@hotmail.com>
This commit is contained in:
Usman Shafiq
2023-12-04 02:52:34 -05:00
committed by GitHub
parent 312519bcf6
commit f053f2bec1
7 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dotnet/Cef/CefService.cs
View File

@@ -26,7 +26,8 @@ namespace VRCX
WindowlessRenderingEnabled = true,
PersistSessionCookies = true,
PersistUserPreferences = true,
UserAgent = Program.Version
UserAgent = Program.Version,
BrowserSubprocessPath = Environment.ProcessPath
};
cefSettings.RegisterScheme(new CefCustomScheme
@@ -59,7 +60,7 @@ namespace VRCX
//CefSharpSettings.WcfEnabled = true; // TOOD: REMOVE THIS LINE YO (needed for synchronous configRepository)
CefSharpSettings.ShutdownOnExit = false;
if (Cef.Initialize(cefSettings) == false)
if (Cef.Initialize(cefSettings, false) == false)
{
throw new Exception("Cef.Initialize()");
}

54
Dotnet/Cef/SubProcess.cs Normal file
View File

@@ -0,0 +1,54 @@
using CefSharp.Internals;
using System;
using System.IO;
namespace VRCX;
public class BrowserSubprocess
{
/// <summary>
/// This function should be called from the application entry point function (typically Program.Main)
/// to execute a secondary process e.g. gpu, renderer, utility
/// This overload is specifically used for .Net Core. For hosting your own BrowserSubProcess
/// it's preferable to use the Main method provided by this class.
/// - Pass in command line args
/// </summary>
/// <param name="args">command line args</param>
/// <returns>
/// If called for the browser process (identified by no "type" command-line value) it will return immediately
/// with a value of -1. If called for a recognized secondary process it will block until the process should exit
/// and then return the process exit code.
/// </returns>
public static void Start()
{
var args = Environment.GetCommandLineArgs();
var type = CommandLineArgsParser.GetArgumentValue(args, CefSharpArguments.SubProcessTypeArgument);
if (string.IsNullOrEmpty(type))
{
// If --type param missing from command line CEF/Chromium assums
// this is the main process (as all subprocesses must have a type param).
return;
}
var browserSubprocessDllPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "CefSharp.BrowserSubprocess.Core.dll");
if (!File.Exists(browserSubprocessDllPath))
{
browserSubprocessDllPath = Path.Combine(Path.GetDirectoryName(typeof(CefSharp.Core.BrowserSettings).Assembly.Location), "CefSharp.BrowserSubprocess.Core.dll");
}
var browserSubprocessDll = System.Runtime.Loader.AssemblyLoadContext.Default.LoadFromAssemblyPath(browserSubprocessDllPath);
var browserSubprocessExecutableType = browserSubprocessDll.GetType("CefSharp.BrowserSubprocess.BrowserSubprocessExecutable");
var browserSubprocessExecutable = Activator.CreateInstance(browserSubprocessExecutableType);
var mainMethod = browserSubprocessExecutableType.GetMethod("MainSelfHost", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
var argCount = mainMethod.GetParameters();
var methodArgs = new object[] { args };
var exitCode = mainMethod.Invoke(null, methodArgs);
Environment.Exit((int)exitCode);
}
}