Create a new UnityWebEngine.Shared project

Author: Voltstro

.gitignore

@@ -59,3 +59,4 @@ sysinfo.txt
 # Crashlytics generated file
 crashlytics-build.properties
 
+bin/

src/CefBrowserProcess/Browser/BrowserProcessCEFClient.cs

@@ -1,6 +1,6 @@
 using System;
 using CefBrowserProcess.Models;
-using UnityWebBrowser.EventData;
+using UnityWebBrowser.Shared.Events;
 using Xilium.CefGlue;
 
 namespace CefBrowserProcess.Browser
@@ -105,7 +105,7 @@ public void ProcessKeyboardEvent(KeyboardEvent keyboardEvent)
 		}
 
 		/// <summary>
-		///		Process a <see cref="UnityWebBrowser.EventData.MouseMoveEvent"/>
+		///		Process a <see cref="UnityWebBrowser.Shared.Events.MouseMoveEvent"/>
 		/// </summary>
 		/// <param name="mouseEvent"></param>
 		public void ProcessMouseMoveEvent(MouseMoveEvent mouseEvent)
@@ -118,7 +118,7 @@ public void ProcessMouseMoveEvent(MouseMoveEvent mouseEvent)
 		}
 
 		/// <summary>
-		///		Process a <see cref="UnityWebBrowser.EventData.MouseClickEvent"/>
+		///		Process a <see cref="UnityWebBrowser.Shared.Events.MouseClickEvent"/>
 		/// </summary>
 		/// <param name="mouseClickEvent"></param>
 		public void ProcessMouseClickEvent(MouseClickEvent mouseClickEvent)
@@ -133,7 +133,7 @@ public void ProcessMouseClickEvent(MouseClickEvent mouseClickEvent)
 		}
 
 		/// <summary>
-		///		Process a <see cref="UnityWebBrowser.EventData.MouseScrollEvent"/>
+		///		Process a <see cref="UnityWebBrowser.Shared.Events.MouseScrollEvent"/>
 		/// </summary>
 		/// <param name="mouseScrollEvent"></param>
 		public void ProcessMouseScrollEvent(MouseScrollEvent mouseScrollEvent)

src/CefBrowserProcess/CefBrowserProcess.csproj

@@ -31,21 +31,11 @@
   <ItemGroup>
     <ProjectReference Include="..\ThirdParty\CefGlue\CefGlue\CefGlue.csproj" />
     <ProjectReference Include="..\ThirdParty\ClrZmq4\ZeroMQ.netcore.csproj" />
-    <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="MessagePack.MSBuild.Tasks" Version="2.3.58-alpha">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <ProjectReference Include="..\UnityWebBrowser.Shared\UnityWebBrowser.Shared.csproj" />
 
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <MessagePackGeneratedResolverNamespace>MessagePack</MessagePackGeneratedResolverNamespace>
-    <MessagePackGeneratedResolverName>GeneratedResolver</MessagePackGeneratedResolverName>
-    <MessagePackGeneratedUsesMapMode>false</MessagePackGeneratedUsesMapMode>
-  </PropertyGroup>
-
   <!-- We need to copy different files depending on the OS -->
   <ItemGroup Condition="'$(IsWindowsBuild)'=='true'">
     <ContentWithTargetPath Include="..\ThirdParty\Libs\zmq\libzmq.dll" Link="Libs/%(Filename)%(Extension)">
@@ -139,10 +129,6 @@
     <PublishReadyToRunExclude Include="System.Diagnostics.Process.dll" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\UnityWebBrowser\Runtime\EventData\*.cs" LinkBase="EventData/" />
-  </ItemGroup>
-
   <Import Project="../NatvieDefines.targets" />
 
 </Project>

src/CefBrowserProcess/Core/CefBrowserProcess.cs

@@ -1,9 +1,8 @@
 using System;
 using CefBrowserProcess.Browser;
 using CefBrowserProcess.Models;
-using MessagePack;
-using MessagePack.Resolvers;
-using UnityWebBrowser.EventData;
+using UnityWebBrowser.Shared;
+using UnityWebBrowser.Shared.Events;
 using Xilium.CefGlue;
 using ZeroMQ;
 
@@ -128,11 +127,13 @@ public CefBrowserProcess(LaunchArguments launchArguments, string[] cefArgs)
 				throw new Exception();
 			}
 
+			/*
 			var options = MessagePackSerializerOptions.Standard.WithResolver(
 				CompositeResolver.Create(
 					GeneratedResolver.Instance,
 					StandardResolver.Instance
 				));
+				*/
 		}
 
 		/// <summary>
@@ -156,7 +157,7 @@ public void HandelEventsLoop()
 
 				try
 				{
-					IEventData data = MessagePackSerializer.Deserialize<IEventData>(rawData);
+					IEventData data = EventsSerializer.Deserialize(rawData);
 					if (data == null)
 						continue;
 

src/Properties.props

@@ -0,0 +1,7 @@
+<Project>
+    <PropertyGroup>
+        <Authors>Voltstro-Studios</Authors>
+        <Company>Voltstro-Studios</Company>
+        <Copyright>Copyright © 2021 Voltstro-Studios</Copyright>
+    </PropertyGroup>
+</Project>

src/UnityWebBrowser/Runtime/EventData/ButtonEvent.cs renamed to src/UnityWebBrowser.Shared/Events/ButtonEvent.cs

@@ -1,6 +1,6 @@
 using MessagePack;
 
-namespace UnityWebBrowser.EventData
+namespace UnityWebBrowser.Shared.Events
 {
     public enum ButtonType
     {
@@ -9,10 +9,7 @@ public enum ButtonType
         Refresh,
         NavigateUrl
     }
-
-#if !BROWSER_PROCESS
-    [UnityEngine.Scripting.Preserve]
-#endif
+    
     [MessagePackObject]
     public class ButtonEvent : IEventData
     {

src/UnityWebBrowser/Runtime/EventData/EventType.cs renamed to src/UnityWebBrowser.Shared/Events/EventType.cs

@@ -1,8 +1,5 @@
-namespace UnityWebBrowser.EventData
+namespace UnityWebBrowser.Shared.Events
 {
-#if !BROWSER_PROCESS
-    [UnityEngine.Scripting.Preserve]
-#endif
     public enum EventType
     {
         Ping = 1,

src/UnityWebBrowser/Runtime/EventData/ExecuteJSEvent.cs renamed to src/UnityWebBrowser.Shared/Events/ExecuteJSEvent.cs

@@ -1,10 +1,7 @@
 using MessagePack;
 
-namespace UnityWebBrowser.EventData
+namespace UnityWebBrowser.Shared.Events
 {
-#if !BROWSER_PROCESS
-    [UnityEngine.Scripting.Preserve]
-#endif
     [MessagePackObject]
     public class ExecuteJsEvent : IEventData
     {

src/UnityWebBrowser/Runtime/EventData/IEventData.cs renamed to src/UnityWebBrowser.Shared/Events/IEventData.cs

@@ -1,10 +1,7 @@
 using MessagePack;
 
-namespace UnityWebBrowser.EventData
+namespace UnityWebBrowser.Shared.Events
 {
-#if !BROWSER_PROCESS
-    [UnityEngine.Scripting.Preserve]
-#endif
     [MessagePackObject]
     [Union(0, typeof(PingEvent))]
     [Union(1, typeof(ShutdownEvent))]

src/UnityWebBrowser/Runtime/EventData/KeyboardEvent.cs renamed to src/UnityWebBrowser.Shared/Events/KeyboardEvent.cs

@@ -1,10 +1,7 @@
 using MessagePack;
 
-namespace UnityWebBrowser.EventData
+namespace UnityWebBrowser.Shared.Events
 {
-#if !BROWSER_PROCESS
-    [UnityEngine.Scripting.Preserve]
-#endif
     [MessagePackObject]
     public class KeyboardEvent : IEventData
     {