Merge branch 'master' into feature/headless

Voltstro · Voltstro · commit b850635a20b7 · 2025-02-19T21:25:55.000+10:00
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/DevScripts/sync_info.py b/src/DevScripts/sync_info.py
@@ -22,7 +22,7 @@ def sync_package(package: str, version: str, sub_version: str, license_path: str
 
     new_package_version = version
     if sub_version:
-        new_package_version += '-{0}'.format(sub_version)
+        new_package_version += '+{0}'.format(sub_version)
 
     # Set new package version
     package_json['version'] = new_package_version
@@ -58,11 +58,11 @@ def sync_package(package: str, version: str, sub_version: str, license_path: str
 # Sync CEF Engine version.json  
 cef_engine_version_json_path = path.abspath(path.join(__file__, '../../UnityWebBrowser.Engine.Cef/version.json'))
 cef_engine_version_json = read_json_from_file(cef_engine_version_json_path)
-cef_engine_versions = cef_engine_version_json['version'].split('-')
+cef_engine_versions = cef_engine_version_json['version'].split('+')
 
 cef_engine_versions[0] = version
 
-cef_engine_version = '-'.join(cef_engine_versions)
+cef_engine_version = '+'.join(cef_engine_versions)
 cef_engine_version_json['version'] = cef_engine_version
 write_json_to_file(cef_engine_version_json, cef_engine_version_json_path)
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
       <PrivateAssets>all</PrivateAssets>
-      <Version>3.6.146</Version>
+      <Version>3.7.115</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/src/Imports/Properties.props b/src/Imports/Properties.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <Authors>Voltstro-Studios</Authors>
         <Company>Voltstro-Studios</Company>
-        <Copyright>Copyright (c) 2021-2024 Voltstro-Studios</Copyright>
+        <Copyright>Copyright (c) 2021-2025 Voltstro-Studios</Copyright>
         <Configurations>Debug;Release;ReleaseUnity</Configurations>
         <Platforms>AnyCPU</Platforms>
         <LangVersion>10</LangVersion>
diff --git a/src/Packages/UnityWebBrowser.Communication.Pipes/LICENSE.md b/src/Packages/UnityWebBrowser.Communication.Pipes/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
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.3",
+  "version": "2.2.5",
   "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.3",
+    "dev.voltstro.unitywebbrowser": "2.2.5",
     "org.nuget.voltrpc.communication.pipes": "3.1.0"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/LICENSE.md b/src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
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.5-130.1.16",
+  "version": "2.2.5+130116",
   "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.5-130.1.16"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.5+130116"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/LICENSE.md b/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
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.5-130.1.16",
+  "version": "2.2.5+130116",
   "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.5-130.1.16"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.5+130116"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/LICENSE.md b/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
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.5-130.1.16",
+  "version": "2.2.5+130116",
   "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.5-130.1.16"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.5+130116"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/LICENSE.md b/src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
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.5-130.1.16",
+  "version": "2.2.5+130116",
   "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.5-130.1.16"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.5+130116"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef/LICENSE.md b/src/Packages/UnityWebBrowser.Engine.Cef/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
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.5-130.1.16",
+  "version": "2.2.5+130116",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
diff --git a/src/Packages/UnityWebBrowser/LICENSE.md b/src/Packages/UnityWebBrowser/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Voltstro-Studios
+Copyright (c) 2021-2025 Voltstro-Studios
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs b/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs
@@ -15,7 +15,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Voltstro-Studios")]
 [assembly: AssemblyProduct("Unity Web Browser")]
-[assembly: AssemblyCopyright("Copyright (c) 2021-2024 Voltstro-Studios")]
+[assembly: AssemblyCopyright("Copyright (c) 2021-2025 Voltstro-Studios")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs b/src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs
@@ -195,6 +195,12 @@ public Resolution Resolution
         /// </summary>
         [Tooltip("The log severity. Only messages of this severity level or higher will be logged")]
         public LogSeverity logSeverity = LogSeverity.Info;
+        
+        /// <summary>
+        ///     Ignores errors related to log messages from the engine process being in a non-json format
+        /// </summary>
+        [Tooltip("Ignores errors related to log messages from the engine process being in a non-json format")]
+        public bool ignoreLogProcessJsonErrors = false;
 
         /// <summary>
         ///     Texture that the browser will paint to
diff --git a/src/Packages/UnityWebBrowser/Runtime/Logging/ProcessLogHandler.cs b/src/Packages/UnityWebBrowser/Runtime/Logging/ProcessLogHandler.cs
@@ -19,10 +19,12 @@ namespace VoltstroStudios.UnityWebBrowser.Logging
     public class ProcessLogHandler
     {
         private readonly IWebBrowserLogger logger;
+        private readonly bool ignoreLogProcessJsonErrors;
 
         internal ProcessLogHandler(WebBrowserClient client)
         {
             logger = client.logger;
+            ignoreLogProcessJsonErrors = client.ignoreLogProcessJsonErrors;
         }
 
         public event Action<string> OnProcessOutputLog;
@@ -55,6 +57,13 @@ internal void HandleOutputProcessLog(object sender, DataReceivedEventArgs e)
                 else if (logStructure.Level == LogSeverity.Fatal)
                     logger.Error($"[{logStructure.Category}]: {logStructure.Message}\n{logStructure.Exception}");
             }
+            catch (JsonException)
+            {
+                if(ignoreLogProcessJsonErrors)
+                    return;
+                
+                logger.Error($"A log message from the UWB engine was not in a JSON format!\n\nRaw Log Message:\n{e.Data}");
+            }
             catch (Exception ex)
             {
                 logger.Error($"An error occured with processing a log event from the UWB engine!\n\nRaw Log Message:\n{e.Data}\n\nException:\n{ex}");
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.5-130.1.16",
+  "version": "2.2.5+130116",
   "publicReleaseRefSpec": [
     "^refs/heads/master$"
   ],
diff --git a/src/UnityWebBrowser.Pages/README.md b/src/UnityWebBrowser.Pages/README.md
@@ -6,11 +6,11 @@ This node project contains the files for building the HTML pages that are includ
 
 ```
 Node
-npm
+pnpm
 ```
 
-1. Run `npm install` in the root of the pages project
+1. Run `pnpm install` in the root of the pages project
 
-2. Run `npm run start` to preview the site in your local browser.
+2. Run `pnpm run start` to preview the site in your local browser.
 
-3. Run `npm run build` to build the pages. They will be placed in the `dist/` folder. The UWB CEF engine project will automatically included them as an embedded resources.
+3. Run `pnpm run build` to build the pages. They will be placed in the `dist/` folder. The UWB CEF engine project will automatically included them as an embedded resources.
diff --git a/src/UnityWebBrowser.Pages/dist/about.html b/src/UnityWebBrowser.Pages/dist/about.html
@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><title>UWB - About</title><script type="module">function u(){const o=window.uwb;if(!o){console.error("[UWB About] Failed to get version info! Probably not running in a UWB engine!");return}const r=o.EngineVersion,s=o.EngineName,i=o.EngineVersion;var e=document.getElementById("uwbEngineVersionText"),n=document.getElementById("webEngineNameText"),t=document.getElementById("webEngineVersionText");e!=null&&(e.textContent=r),n!=null&&(n.textContent=s),t!=null&&(t.textContent=i),console.log("[UWB About] Found version info!")}u();</script><style rel="stylesheet" crossorigin>.content{font-family:Avenir,Helvetica,Arial,sans-serif;margin:40px 25px 25px}.header{border-bottom:#000 2px solid}.bottom-spacer{margin-bottom:1.2em}.footer{position:absolute;bottom:0}.fuckyou-text{font-size:8px;color:gray}body{background-color:#fff}</style></head><body><div class="content"><h2 class="header bottom-spacer">Unity Web Browser About</h2><p>UWB by <a href="https://github.com/Voltstro-Studios">Voltstro-Studios</a>, under MIT license.</p><p class="bottom-spacer">UWB Engine Version: <span id="uwbEngineVersionText">Getting...</span><br>Web Engine Name: <span id="webEngineNameText">Getting...</span><br>Web Engine Version: <span id="webEngineVersionText">Getting...</span></p><p><a href="https://github.com/Voltstro-Studios/UnityWebBrowser">GitHub</a> | <a href="https://uwb.voltstro.dev">Site</a></p><p class="footer fuckyou-text">UwU Nyaa~. Rowan SUXS XDDDDD</p></div></body></html>
+<!DOCTYPE html><html><head><meta charset="utf-8"><title>UWB - About</title><script type="module">function u(){const o=window.uwb;if(!o){console.error("[UWB About] Failed to get version info! Probably not running in a UWB engine!");return}const r=o.EngineVersion,s=o.EngineName,i=o.EngineVersion;var e=document.getElementById("uwbEngineVersionText"),n=document.getElementById("webEngineNameText"),t=document.getElementById("webEngineVersionText");e!=null&&(e.textContent=r),n!=null&&(n.textContent=s),t!=null&&(t.textContent=i),console.log("[UWB About] Found version info!")}u();</script><style rel="stylesheet" crossorigin>.content{font-family:Avenir,Helvetica,Arial,sans-serif;margin:40px 25px 25px}.header{border-bottom:black 2px solid}.bottom-spacer{margin-bottom:1.2em}.footer{position:absolute;bottom:0}.fuckyou-text{font-size:8px;color:gray}body{background-color:#fff}</style></head><body><div class="content"><h2 class="header bottom-spacer">Unity Web Browser About</h2><p>UWB by <a href="https://github.com/Voltstro-Studios">Voltstro-Studios</a>, under MIT license.</p><p class="bottom-spacer">UWB Engine Version: <span id="uwbEngineVersionText">Getting...</span><br>Web Engine Name: <span id="webEngineNameText">Getting...</span><br>Web Engine Version: <span id="webEngineVersionText">Getting...</span></p><p><a href="https://github.com/Voltstro-Studios/UnityWebBrowser">GitHub</a> | <a href="https://uwb.voltstro.dev">Site</a></p><p class="footer fuckyou-text">UwU Nyaa~. Rowan SUXS XDDDDD</p></div></body></html>
diff --git a/src/UnityWebBrowser.Pages/package.json b/src/UnityWebBrowser.Pages/package.json
@@ -9,10 +9,16 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.10",
-    "vite-plugin-html": "^3.2.0",
-    "vite-plugin-singlefile": "^2.0.2"
+    "@types/node": "^22.0.0",
+    "typescript": "^5.7.3",
+    "vite": "^6.1.0",
+    "vite-plugin-minify": "^2.1.0",
+    "vite-plugin-singlefile": "^2.1.0"
+  },
+  "packageManager": "pnpm@10.4.0+sha512.6b849d0787d97f8f4e1f03a9b8ff8f038e79e153d6f11ae539ae7c435ff9e796df6a862c991502695c7f9e8fac8aeafc1ac5a8dab47e36148d183832d886dd52",
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "esbuild"
+    ]
   }
 }
diff --git a/src/UnityWebBrowser.Pages/pnpm-lock.yaml b/src/UnityWebBrowser.Pages/pnpm-lock.yaml
diff --git a/src/UnityWebBrowser.Pages/vite.config.ts b/src/UnityWebBrowser.Pages/vite.config.ts
diff --git a/src/UnityWebBrowser.Pages/yarn.lock b/src/UnityWebBrowser.Pages/yarn.lock
diff --git a/src/UnityWebBrowser.UnityProject/Assets/Scenes/UWB.unity b/src/UnityWebBrowser.UnityProject/Assets/Scenes/UWB.unity
diff --git a/src/UnityWebBrowser.UnityProject/Packages/packages-lock.json b/src/UnityWebBrowser.UnityProject/Packages/packages-lock.json
diff --git a/src/UnityWebBrowser.UnityProject/ProjectSettings/ProjectVersion.txt b/src/UnityWebBrowser.UnityProject/ProjectSettings/ProjectVersion.txt
diff --git a/src/VoltstroStudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj b/src/VoltstroStudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj
diff --git a/src/VoltstroStudios.UnityWebBrowser.Tests/VoltstroStudios.UnityWebBrowser.Tests.csproj b/src/VoltstroStudios.UnityWebBrowser.Tests/VoltstroStudios.UnityWebBrowser.Tests.csproj
