feat: define vuplex symbol on load

CodeSchwert · CodeSchwert · commit 8ae2f740f3dd · 2025-09-24T12:52:40.000+12:00
diff --git a/src/Packages/Passport/Editor/VuplexSymbolManager.cs b/src/Packages/Passport/Editor/VuplexSymbolManager.cs
@@ -0,0 +1,108 @@
+using UnityEngine;
+using UnityEditor;
+using System.Linq;
+
+namespace Immutable.Passport.Editor
+{
+    /// <summary>
+    /// Automatically manages VUPLEX_WEBVIEW scripting define symbol
+    /// based on whether Vuplex WebView is present in the project
+    /// </summary>
+    [InitializeOnLoad]
+    public static class VuplexSymbolManager
+    {
+        private const string VUPLEX_SYMBOL = "VUPLEX_WEBVIEW";
+        
+        static VuplexSymbolManager()
+        {
+            // Run on editor startup and after assembly reload
+            EditorApplication.delayCall += CheckAndUpdateVuplexSymbol;
+        }
+        
+        private static void CheckAndUpdateVuplexSymbol()
+        {
+            try
+            {
+                // Check if Vuplex WebView assembly exists
+                bool vuplexExists = DoesVuplexAssemblyExist();
+                
+                // Get current build target group
+                var buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+                
+                // Get current scripting define symbols
+                var currentSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup);
+                var symbolList = currentSymbols.Split(';').Where(s => !string.IsNullOrEmpty(s)).ToList();
+                
+                bool symbolExists = symbolList.Contains(VUPLEX_SYMBOL);
+                
+                // Update symbol if needed
+                if (vuplexExists && !symbolExists)
+                {
+                    // Add symbol
+                    symbolList.Add(VUPLEX_SYMBOL);
+                    var newSymbols = string.Join(";", symbolList);
+                    PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, newSymbols);
+                    Debug.Log($"[VuplexSymbolManager] Added {VUPLEX_SYMBOL} symbol - Vuplex WebView detected");
+                }
+                else if (!vuplexExists && symbolExists)
+                {
+                    // Remove symbol
+                    symbolList.Remove(VUPLEX_SYMBOL);
+                    var newSymbols = string.Join(";", symbolList);
+                    PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, newSymbols);
+                    Debug.Log($"[VuplexSymbolManager] Removed {VUPLEX_SYMBOL} symbol - Vuplex WebView not found");
+                }
+                
+                // Log current status (only once per session to avoid spam)
+                if (!SessionState.GetBool("VuplexSymbolManager.LoggedStatus", false))
+                {
+                    if (vuplexExists)
+                    {
+                        Debug.Log($"[VuplexSymbolManager] Vuplex WebView available, {VUPLEX_SYMBOL} symbol active");
+                    }
+                    else
+                    {
+                        Debug.Log($"[VuplexSymbolManager] Vuplex WebView not found");
+                    }
+                    SessionState.SetBool("VuplexSymbolManager.LoggedStatus", true);
+                }
+            }
+            catch (System.Exception ex)
+            {
+                Debug.LogError($"[VuplexSymbolManager] Error managing Vuplex symbol: {ex.Message}");
+            }
+        }
+        
+        private static bool DoesVuplexAssemblyExist()
+        {
+            // Check for Vuplex assembly in multiple ways
+            
+            // Method 1: Check compiled assemblies
+            var assemblies = System.AppDomain.CurrentDomain.GetAssemblies();
+            if (assemblies.Any(a => a.GetName().Name == "Vuplex.WebView"))
+            {
+                return true;
+            }
+            
+            // Method 2: Check for Vuplex types
+            var vuplexType = System.Type.GetType("Vuplex.WebView.CanvasWebViewPrefab, Vuplex.WebView");
+            if (vuplexType != null)
+            {
+                return true;
+            }
+            
+            // Method 3: Check for Vuplex assets in project
+            var vuplexAssets = AssetDatabase.FindAssets("CanvasWebViewPrefab");
+            foreach (var guid in vuplexAssets)
+            {
+                var path = AssetDatabase.GUIDToAssetPath(guid);
+                if (path.Contains("Vuplex"))
+                {
+                    return true;
+                }
+            }
+            
+            return false;
+        }
+    }
+}
diff --git a/src/Packages/Passport/Editor/VuplexSymbolManager.cs.meta b/src/Packages/Passport/Editor/VuplexSymbolManager.cs.meta
diff --git a/src/Packages/Passport/Runtime/Scripts/Private/UI/WebViews/MacOSPassportWebView.cs b/src/Packages/Passport/Runtime/Scripts/Private/UI/WebViews/MacOSPassportWebView.cs
@@ -6,9 +6,8 @@
 using UnityEngine.UI;
 using Immutable.Passport.Core.Logging;
 
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
+#if (UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX) && VUPLEX_WEBVIEW
 using Vuplex.WebView;
-#endif
 
 namespace Immutable.Passport
 {
@@ -21,9 +20,7 @@ public class MacOSPassportWebView : IPassportWebView
     {
         private const string TAG = "[MacOSPassportWebView]";
 
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
         private CanvasWebViewPrefab? _webViewPrefab;
-#endif
         private readonly Dictionary<string, Action<string>> _jsHandlers = new Dictionary<string, Action<string>>();
         private readonly RawImage _canvasReference;
         private bool _isInitialized = false;
@@ -33,14 +30,8 @@ public class MacOSPassportWebView : IPassportWebView
         public event Action? OnLoadFinished;
         public event Action? OnLoadStarted;
 
-        // Safe access - check initialization
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
         public bool IsVisible => _webViewPrefab?.Visible ?? false;
         public string CurrentUrl => _webViewPrefab?.WebView?.Url ?? "";
-#else
-        public bool IsVisible => false;
-        public string CurrentUrl => "";
-#endif
 
         public MacOSPassportWebView(RawImage canvasReference)
         {
@@ -55,7 +46,6 @@ public void Initialize(PassportWebViewConfig config)
                 return;
             }
 
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             try
             {
                 PassportLogger.Info($"{TAG} Initializing MacOS WebView...");
@@ -68,13 +58,8 @@ public void Initialize(PassportWebViewConfig config)
                 PassportLogger.Error($"{TAG} Failed to initialize: {ex.Message}");
                 throw;
             }
-#else
-            PassportLogger.Warn($"{TAG} Vuplex WebView is only supported on MacOS builds, not in editor");
-            _isInitialized = true;
-#endif
         }
 
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
         private async UniTaskVoid InitializeAsync(PassportWebViewConfig config)
         {
             try
@@ -162,11 +147,9 @@ private async UniTaskVoid InitializeAsync(PassportWebViewConfig config)
                 throw;
             }
         }
-#endif
 
         public void LoadUrl(string url)
         {
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             if (!_isInitialized || _webViewPrefab?.WebView == null)
             {
                 PassportLogger.Info($"{TAG} WebView not ready, queueing URL: {url}");
@@ -176,50 +159,35 @@ public void LoadUrl(string url)
 
             PassportLogger.Info($"{TAG} Loading URL: {url}");
             _webViewPrefab.WebView.LoadUrl(url);
-#else
-            PassportLogger.Warn($"{TAG} LoadUrl not supported in MacOS editor mode");
-#endif
         }
 
         public void Show()
         {
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             if (_webViewPrefab != null)
             {
                 _webViewPrefab.Visible = true;
                 PassportLogger.Info($"{TAG} WebView shown");
             }
-#else
-            PassportLogger.Info($"{TAG} Show() called (editor mode)");
-#endif
         }
 
         public void Hide()
         {
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             if (_webViewPrefab != null)
             {
                 _webViewPrefab.Visible = false;
                 PassportLogger.Info($"{TAG} WebView hidden");
             }
-#else
-            PassportLogger.Info($"{TAG} Hide() called (editor mode)");
-#endif
         }
 
         public void ExecuteJavaScript(string js)
         {
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             if (!_isInitialized || _webViewPrefab?.WebView == null)
             {
                 PassportLogger.Error($"{TAG} Cannot execute JavaScript - MacOS WebView not initialized");
                 return;
             }
 
             _webViewPrefab.WebView.ExecuteJavaScript(js);
-#else
-            PassportLogger.Warn($"{TAG} ExecuteJavaScript not supported in MacOS editor mode");
-#endif
         }
 
         public void RegisterJavaScriptMethod(string methodName, Action<string> handler)
@@ -233,17 +201,16 @@ public void RegisterJavaScriptMethod(string methodName, Action<string> handler)
 
         public void Dispose()
         {
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
             if (_webViewPrefab != null)
             {
                 PassportLogger.Info($"{TAG} Disposing MacOS WebView");
                 _webViewPrefab.Destroy();
                 _webViewPrefab = null;
             }
-#endif
 
             _jsHandlers.Clear();
             _isInitialized = false;
         }
     }
 }
+#endif
diff --git a/src/Packages/Passport/Runtime/Scripts/Public/PassportUI.cs b/src/Packages/Passport/Runtime/Scripts/Public/PassportUI.cs
@@ -408,7 +408,7 @@ private IPassportWebView CreatePlatformWebView()
 #elif UNITY_ANDROID
             PassportLogger.Info($"{TAG} Creating Android WebView (Vuplex)");
             return new AndroidVuplexWebView(rawImage);
-#elif UNITY_STANDALONE_OSX
+#elif (UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX) && VUPLEX_WEBVIEW
             PassportLogger.Info($"{TAG} Creating MacOS WebView (Vuplex)");
             return new MacOSPassportWebView(rawImage);
 #else

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,8 @@`
`6`	`6`	`using UnityEngine.UI;`
`7`	`7`	`using Immutable.Passport.Core.Logging;`
`8`	`8`
`9`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
	`9`	`+#if (UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX) && VUPLEX_WEBVIEW`
`10`	`10`	`using Vuplex.WebView;`
`11`		`-#endif`
`12`	`11`
`13`	`12`	`namespace Immutable.Passport`
`14`	`13`	`{`
`@@ -21,9 +20,7 @@ public class MacOSPassportWebView : IPassportWebView`
`21`	`20`	`{`
`22`	`21`	`private const string TAG = "[MacOSPassportWebView]";`
`23`	`22`
`24`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`25`	`23`	`private CanvasWebViewPrefab? _webViewPrefab;`
`26`		`-#endif`
`27`	`24`	`private readonly Dictionary<string, Action<string>> _jsHandlers = new Dictionary<string, Action<string>>();`
`28`	`25`	`private readonly RawImage _canvasReference;`
`29`	`26`	`private bool _isInitialized = false;`
`@@ -33,14 +30,8 @@ public class MacOSPassportWebView : IPassportWebView`
`33`	`30`	`public event Action? OnLoadFinished;`
`34`	`31`	`public event Action? OnLoadStarted;`
`35`	`32`
`36`		`- // Safe access - check initialization`
`37`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`38`	`33`	`public bool IsVisible => _webViewPrefab?.Visible ?? false;`
`39`	`34`	`public string CurrentUrl => _webViewPrefab?.WebView?.Url ?? "";`
`40`		`-#else`
`41`		`- public bool IsVisible => false;`
`42`		`- public string CurrentUrl => "";`
`43`		`-#endif`
`44`	`35`
`45`	`36`	`public MacOSPassportWebView(RawImage canvasReference)`
`46`	`37`	`{`
`@@ -55,7 +46,6 @@ public void Initialize(PassportWebViewConfig config)`
`55`	`46`	`return;`
`56`	`47`	`}`
`57`	`48`
`58`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`59`	`49`	`try`
`60`	`50`	`{`
`61`	`51`	`PassportLogger.Info($"{TAG} Initializing MacOS WebView...");`
`@@ -68,13 +58,8 @@ public void Initialize(PassportWebViewConfig config)`
`68`	`58`	`PassportLogger.Error($"{TAG} Failed to initialize: {ex.Message}");`
`69`	`59`	`throw;`
`70`	`60`	`}`
`71`		`-#else`
`72`		`- PassportLogger.Warn($"{TAG} Vuplex WebView is only supported on MacOS builds, not in editor");`
`73`		`- _isInitialized = true;`
`74`		`-#endif`
`75`	`61`	`}`
`76`	`62`
`77`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`78`	`63`	`private async UniTaskVoid InitializeAsync(PassportWebViewConfig config)`
`79`	`64`	`{`
`80`	`65`	`try`
`@@ -162,11 +147,9 @@ private async UniTaskVoid InitializeAsync(PassportWebViewConfig config)`
`162`	`147`	`throw;`
`163`	`148`	`}`
`164`	`149`	`}`
`165`		`-#endif`
`166`	`150`
`167`	`151`	`public void LoadUrl(string url)`
`168`	`152`	`{`
`169`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`170`	`153`	`if (!_isInitialized \|\| _webViewPrefab?.WebView == null)`
`171`	`154`	`{`
`172`	`155`	`PassportLogger.Info($"{TAG} WebView not ready, queueing URL: {url}");`
`@@ -176,50 +159,35 @@ public void LoadUrl(string url)`
`176`	`159`
`177`	`160`	`PassportLogger.Info($"{TAG} Loading URL: {url}");`
`178`	`161`	`_webViewPrefab.WebView.LoadUrl(url);`
`179`		`-#else`
`180`		`- PassportLogger.Warn($"{TAG} LoadUrl not supported in MacOS editor mode");`
`181`		`-#endif`
`182`	`162`	`}`
`183`	`163`
`184`	`164`	`public void Show()`
`185`	`165`	`{`
`186`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`187`	`166`	`if (_webViewPrefab != null)`
`188`	`167`	`{`
`189`	`168`	`_webViewPrefab.Visible = true;`
`190`	`169`	`PassportLogger.Info($"{TAG} WebView shown");`
`191`	`170`	`}`
`192`		`-#else`
`193`		`- PassportLogger.Info($"{TAG} Show() called (editor mode)");`
`194`		`-#endif`
`195`	`171`	`}`
`196`	`172`
`197`	`173`	`public void Hide()`
`198`	`174`	`{`
`199`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`200`	`175`	`if (_webViewPrefab != null)`
`201`	`176`	`{`
`202`	`177`	`_webViewPrefab.Visible = false;`
`203`	`178`	`PassportLogger.Info($"{TAG} WebView hidden");`
`204`	`179`	`}`
`205`		`-#else`
`206`		`- PassportLogger.Info($"{TAG} Hide() called (editor mode)");`
`207`		`-#endif`
`208`	`180`	`}`
`209`	`181`
`210`	`182`	`public void ExecuteJavaScript(string js)`
`211`	`183`	`{`
`212`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`213`	`184`	`if (!_isInitialized \|\| _webViewPrefab?.WebView == null)`
`214`	`185`	`{`
`215`	`186`	`PassportLogger.Error($"{TAG} Cannot execute JavaScript - MacOS WebView not initialized");`
`216`	`187`	`return;`
`217`	`188`	`}`
`218`	`189`
`219`	`190`	`_webViewPrefab.WebView.ExecuteJavaScript(js);`
`220`		`-#else`
`221`		`- PassportLogger.Warn($"{TAG} ExecuteJavaScript not supported in MacOS editor mode");`
`222`		`-#endif`
`223`	`191`	`}`
`224`	`192`
`225`	`193`	`public void RegisterJavaScriptMethod(string methodName, Action<string> handler)`
`@@ -233,17 +201,16 @@ public void RegisterJavaScriptMethod(string methodName, Action<string> handler)`
`233`	`201`
`234`	`202`	`public void Dispose()`
`235`	`203`	`{`
`236`		`-#if UNITY_STANDALONE_OSX \|\| UNITY_EDITOR_OSX`
`237`	`204`	`if (_webViewPrefab != null)`
`238`	`205`	`{`
`239`	`206`	`PassportLogger.Info($"{TAG} Disposing MacOS WebView");`
`240`	`207`	`_webViewPrefab.Destroy();`
`241`	`208`	`_webViewPrefab = null;`
`242`	`209`	`}`
`243`		`-#endif`
`244`	`210`
`245`	`211`	`_jsHandlers.Clear();`
`246`	`212`	`_isInitialized = false;`
`247`	`213`	`}`
`248`	`214`	`}`
`249`	`215`	`}`
	`216`	`+#endif`