refactor: app.js (#1291)

* refactor: frontend

* Fix avatar gallery sort

* Update .NET dependencies

* Update npm dependencies

electron v37.1.0

* bulkRefreshFriends

* fix dark theme

* Remove crowdin

* Fix config.json dialog not updating

* VRCX log file fixes & add Cef log

* Remove SharedVariable, fix startup

* Revert init theme change

* Logging date not working? Fix WinformThemer designer error

* Add Cef request hander, no more escaping main page

* clean

* fix

* fix

* clean

* uh

* Apply thememode at startup, fixes random user colours

* Split database into files

* Instance info remove empty lines

* Open external VRC links with VRCX

* Electron fixes

* fix userdialog style

* ohhhh

* fix store

* fix store

* fix: load all group members after kicking a user

* fix: world dialog favorite button style

* fix: Clear VRCX Cache Timer input value

* clean

* Fix VR overlay

* Fix VR overlay 2

* Fix Discord discord rich presence for RPC worlds

* Clean up age verified user tags

* Fix playerList being occupied after program reload

* no `this`

* Fix login stuck loading

* writable: false

* Hide dialogs on logout

* add flush sync option

* rm LOGIN event

* rm LOGOUT event

* remove duplicate event listeners

* remove duplicate event listeners

* clean

* remove duplicate event listeners

* clean

* fix theme style

* fix t

* clearable

* clean

* fix ipcEvent

* Small changes

* Popcorn Palace support

* Remove checkActiveFriends

* Clean up

* Fix dragEnterCef

* Block API requests when not logged in

* Clear state on login & logout

* Fix worldDialog instances not updating

* use <script setup>

* Fix avatar change event, CheckGameRunning at startup

* Fix image dragging

* fix

* Remove PWI

* fix updateLoop

* add webpack-dev-server to dev environment

* rm unnecessary chunks

* use <script setup>

* webpack-dev-server changes

* use <script setup>

* use <script setup>

* Fix UGC text size

* Split login event

* t

* use <script setup>

* fix

* Update .gitignore and enable checkJs in jsconfig

* fix i18n t

* use <script setup>

* use <script setup>

* clean

* global types

* fix

* use checkJs for debugging

* Add watchState for login watchers

* fix .vue template

* type fixes

* rm Vue.filter

* Cef v138.0.170, VC++ 2022

* Settings fixes

* Remove 'USER:CURRENT'

* clean up 2FA callbacks

* remove userApply

* rm i18n import

* notification handling to use notification store methods

* refactor favorite handling to use favorite store methods and clean up event emissions

* refactor moderation handling to use dedicated functions for player moderation events

* refactor friend handling to use dedicated functions for friend events

* Fix program startup, move lang init

* Fix friend state

* Fix status change error

* Fix user notes diff

* fix

* rm group event

* rm auth event

* rm avatar event

* clean

* clean

* getUser

* getFriends

* getFavoriteWorlds, getFavoriteAvatars

* AvatarGalleryUpload btn style & package.json update

* Fix friend requests

* Apply user

* Apply world

* Fix note diff

* Fix VR overlay

* Fixes

* Update build scripts

* Apply avatar

* Apply instance

* Apply group

* update hidden VRC+ badge

* Fix sameInstance "private"

* fix 502/504 API errors

* fix 502/504 API errors

* clean

* Fix friend in same instance on orange showing twice in friends list

* Add back in broken friend state repair methods

* add types

---------

Co-authored-by: Natsumi <cmcooper123@hotmail.com>

Dotnet/Cef/CefCustomDragHandler.cs

@@ -24,9 +24,10 @@ namespace VRCX
                     dragData.Dispose();
                     return true;
                 }
+                
+                if (MainForm.Instance?.Browser != null && !MainForm.Instance.Browser.IsLoading && MainForm.Instance.Browser.CanExecuteJavascriptInMainFrame)
+                    MainForm.Instance.Browser.ExecuteScriptAsync("$app.store.vrcx.dragEnterCef", file);
 
-                // forgive me father for i have sinned once again
-                Program.AppApiInstance.ExecuteAppFunction("dragEnterCef", file);
                 dragData.Dispose();
                 return false;
             }

Dotnet/Cef/CefCustomRequestHandler.cs

@@ -0,0 +1,74 @@
+// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
+// All rights reserved.
+//
+// This work is licensed under the terms of the MIT license.
+// For a copy, see <https://opensource.org/licenses/MIT>.
+
+using System.Security.Cryptography.X509Certificates;
+using CefSharp;
+using NLog;
+
+namespace VRCX
+{
+    public class CustomRequestHandler : IRequestHandler
+    {
+        private readonly Logger _logger = LogManager.GetCurrentClassLogger();
+        
+        public bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect)
+        {
+            if (Program.LaunchDebug ||
+                request.Url.StartsWith("file://vrcx/") ||
+                request.Url.StartsWith("chrome-extension://"))
+                return false;
+            
+            _logger.Error("Blocking navigation to: {Url}", request.Url);
+            return true;
+        }
+
+        public void OnDocumentAvailableInMainFrame(IWebBrowser chromiumWebBrowser, IBrowser browser)
+        {
+        }
+
+        public bool OnOpenUrlFromTab(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, string targetUrl,
+            WindowOpenDisposition targetDisposition, bool userGesture)
+        {
+            _logger.Debug("Blocking OnOpenUrlFromTab: {TargetUrl}",
+                targetUrl);
+
+            return true;
+        }
+
+        public IResourceRequestHandler GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame,
+            IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling)
+        {
+            return null;
+        }
+
+        public bool GetAuthCredentials(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, bool isProxy, string host,
+            int port, string realm, string scheme, IAuthCallback callback)
+        {
+            return false;
+        }
+
+        public bool OnCertificateError(IWebBrowser chromiumWebBrowser, IBrowser browser, CefErrorCode errorCode, string requestUrl,
+            ISslInfo sslInfo, IRequestCallback callback)
+        {
+            return true;
+        }
+
+        public bool OnSelectClientCertificate(IWebBrowser chromiumWebBrowser, IBrowser browser, bool isProxy, string host, int port,
+            X509Certificate2Collection certificates, ISelectClientCertificateCallback callback)
+        {
+            return false;
+        }
+
+        public void OnRenderViewReady(IWebBrowser chromiumWebBrowser, IBrowser browser)
+        {
+        }
+
+        public void OnRenderProcessTerminated(IWebBrowser chromiumWebBrowser, IBrowser browser, CefTerminationStatus status,
+            int errorCode, string errorMessage)
+        {
+        }
+    }
+}

Dotnet/Cef/CefService.cs

@@ -25,7 +25,8 @@ namespace VRCX
             {
                 RootCachePath = userDataDir,
                 CachePath = Path.Join(userDataDir, "cache"),
-                LogSeverity = LogSeverity.Disable,
+                LogSeverity = Program.LaunchDebug ? LogSeverity.Verbose : LogSeverity.Error,
+                LogFile = Path.Join(Program.AppDataDirectory, "logs", "cef.log"),
                 WindowlessRenderingEnabled = true,
                 PersistSessionCookies = true,
                 UserAgent = Program.Version,

Dotnet/Cef/JavascriptBindings.cs

@@ -8,7 +8,6 @@ namespace VRCX
         {
             repository.NameConverter = null;
             repository.Register("AppApi", Program.AppApiInstance);
-            repository.Register("SharedVariable", SharedVariable.Instance);
             repository.Register("WebApi", WebApi.Instance);
             repository.Register("VRCXStorage", VRCXStorage.Instance);
             repository.Register("SQLite", SQLiteLegacy.Instance);

Dotnet/Cef/MainForm.cs

@@ -5,8 +5,8 @@
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
-using System.Net;
 using System.Reflection;
 using System.Windows.Forms;
 using CefSharp;
@@ -15,6 +15,7 @@ using NLog;
 
 namespace VRCX
 {
+    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
     public partial class MainForm : WinformBase
     {
         public static MainForm Instance;
@@ -50,30 +51,40 @@ namespace VRCX
                 logger.Error(ex);
             }
 
-            Browser = new ChromiumWebBrowser("file://vrcx/index.html")
+            Browser = new ChromiumWebBrowser(Program.LaunchDebug ? "http://localhost:9000/index.html" : "file://vrcx/index.html")
             {
                 DragHandler = new CustomDragHandler(),
                 MenuHandler = new CustomMenuHandler(),
                 DownloadHandler = new CustomDownloadHandler(),
+                RequestHandler = new CustomRequestHandler(),
                 BrowserSettings =
                 {
                     DefaultEncoding = "UTF-8",
                 },
                 Dock = DockStyle.Fill
             };
-
-            Browser.IsBrowserInitializedChanged += (A, B) =>
+            Browser.IsBrowserInitializedChanged += (_, _) =>
             {
                 if (Program.LaunchDebug)
                     Browser.ShowDevTools();
             };
-
-            JavascriptBindings.ApplyAppJavascriptBindings(Browser.JavascriptObjectRepository);
-            Browser.ConsoleMessage += (_, args) =>
+            Browser.AddressChanged += (_, addressChangedEventArgs) =>
             {
-                logger.Debug(args.Message + " (" + args.Source + ":" + args.Line + ")");
+                logger.Debug("Address changed: " + addressChangedEventArgs.Address);
+            };
+            Browser.LoadingStateChanged += (_, loadingFailedEventArgs) =>
+            {
+                if (loadingFailedEventArgs.IsLoading)
+                    logger.Debug("Loading page");
+                else
+                    logger.Debug("Loaded page: " + loadingFailedEventArgs.Browser.MainFrame.Url);
+            };
+            Browser.ConsoleMessage += (_, consoleMessageEventArgs) =>
+            {
+                logger.Debug(consoleMessageEventArgs.Message + " (" + consoleMessageEventArgs.Source + ":" + consoleMessageEventArgs.Line + ")");
             };
 
+            JavascriptBindings.ApplyAppJavascriptBindings(Browser.JavascriptObjectRepository);
             Controls.Add(Browser);
         }
 

Dotnet/Cef/WinformBase.cs

@@ -12,7 +12,8 @@ namespace VRCX
     {
         protected override void OnHandleCreated(EventArgs e)
         {
-            WinformThemer.SetThemeToGlobal(this);
+            if (!DesignMode)
+                WinformThemer.SetThemeToGlobal(this);
             base.OnHandleCreated(e);
         }
     }