com.beamable 5.0.0-PREVIEW.RC10 → 5.0.0-PREVIEW.RC12

package/Editor/BeamCli/Commands/BeamChecksLockedFiles.cs

@@ -0,0 +1,65 @@
+
+namespace Beamable.Editor.BeamCli.Commands
+{
+    using Beamable.Common;
+    using Beamable.Common.BeamCli;
+    
+    public partial class ChecksLockedFilesArgs : Beamable.Common.BeamCli.IBeamCommandArgs
+    {
+        /// <summary>The folder path to check for locked files</summary>
+        public string folderPath;
+        /// <summary>The file pattern to check for</summary>
+        public string pattern;
+        /// <summary>Serializes the arguments for command line usage.</summary>
+        public virtual string Serialize()
+        {
+            // Create a list of arguments for the command
+            System.Collections.Generic.List<string> genBeamCommandArgs = new System.Collections.Generic.List<string>();
+            // If the folderPath value was not default, then add it to the list of args.
+            if ((this.folderPath != default(string)))
+            {
+                genBeamCommandArgs.Add(("--folder-path=" + this.folderPath));
+            }
+            // If the pattern value was not default, then add it to the list of args.
+            if ((this.pattern != default(string)))
+            {
+                genBeamCommandArgs.Add(("--pattern=" + this.pattern));
+            }
+            string genBeamCommandStr = "";
+            // Join all the args with spaces
+            genBeamCommandStr = string.Join(" ", genBeamCommandArgs);
+            return genBeamCommandStr;
+        }
+    }
+    public partial class BeamCommands
+    {
+        public virtual ChecksLockedFilesWrapper ChecksLockedFiles(ChecksLockedFilesArgs lockedFilesArgs)
+        {
+            // Create a list of arguments for the command
+            System.Collections.Generic.List<string> genBeamCommandArgs = new System.Collections.Generic.List<string>();
+            genBeamCommandArgs.Add("beam");
+            genBeamCommandArgs.Add(defaultBeamArgs.Serialize());
+            genBeamCommandArgs.Add("checks");
+            genBeamCommandArgs.Add("locked-files");
+            genBeamCommandArgs.Add(lockedFilesArgs.Serialize());
+            // Create an instance of an IBeamCommand
+            Beamable.Common.BeamCli.IBeamCommand command = this._factory.Create();
+            // Join all the command paths and args into one string
+            string genBeamCommandStr = string.Join(" ", genBeamCommandArgs);
+            // Configure the command with the command string
+            command.SetCommand(genBeamCommandStr);
+            ChecksLockedFilesWrapper genBeamCommandWrapper = new ChecksLockedFilesWrapper();
+            genBeamCommandWrapper.Command = command;
+            // Return the command!
+            return genBeamCommandWrapper;
+        }
+    }
+    public partial class ChecksLockedFilesWrapper : Beamable.Common.BeamCli.BeamCommandWrapper
+    {
+        public virtual ChecksLockedFilesWrapper OnStreamLockedFilesCheckCommandResult(System.Action<ReportDataPoint<BeamLockedFilesCheckCommandResult>> cb)
+        {
+            this.Command.On("stream", cb);
+            return this;
+        }
+    }
+}

package/Editor/BeamCli/Commands/BeamChecksLockedFiles.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4adf20c7a53ecdd2215f6d97ac8b806c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/BeamCli/Commands/BeamLockedFilesCheckCommandResult.cs

@@ -0,0 +1,12 @@
+
+namespace Beamable.Editor.BeamCli.Commands
+{
+    using Beamable.Common;
+    using Beamable.Common.BeamCli;
+    
+    [System.SerializableAttribute()]
+    public partial class BeamLockedFilesCheckCommandResult
+    {
+        public System.Collections.Generic.List<BeamProcessInfo> ProcessLockedFiles;
+    }
+}

package/Editor/BeamCli/Commands/BeamLockedFilesCheckCommandResult.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fffa22bc38d6cac9560e59585a1179a1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/BeamCli/Commands/BeamProcessInfo.cs

@@ -0,0 +1,14 @@
+
+namespace Beamable.Editor.BeamCli.Commands
+{
+    using Beamable.Common;
+    using Beamable.Common.BeamCli;
+    
+    [System.SerializableAttribute()]
+    public partial class BeamProcessInfo
+    {
+        public int ProcessId;
+        public string CommandLine;
+        public System.Collections.Generic.List<string> LockingFiles;
+    }
+}

package/Editor/BeamCli/Commands/BeamProcessInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 804435e99601c3ca4515c9eee7628070
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/BeamCli/Commands/BeamProjectStop.cs

@@ -12,6 +12,8 @@ namespace Beamable.Editor.BeamCli.Commands
         public bool exactIds;
         /// <summary>Kill the task instead of sending a graceful shutdown signal via the socket</summary>
         public bool killTask;
+        /// <summary>The reason for stopping the service</summary>
+        public string reason;
         /// <summary>Serializes the arguments for command line usage.</summary>
         public virtual string Serialize()
         {
@@ -36,6 +38,11 @@ namespace Beamable.Editor.BeamCli.Commands
             {
                 genBeamCommandArgs.Add(("--kill-task=" + this.killTask));
             }
+            // If the reason value was not default, then add it to the list of args.
+            if ((this.reason != default(string)))
+            {
+                genBeamCommandArgs.Add(("--reason=" + this.reason));
+            }
             string genBeamCommandStr = "";
             // Join all the args with spaces
             genBeamCommandStr = string.Join(" ", genBeamCommandArgs);

package/Editor/BeamEditor.cs

@@ -200,7 +200,10 @@ namespace Beamable
 		static void Initialize()
 		{
 			if (IsInitialized) return;
-
+#if !DISABLE_BEAMABLE_TOOLBAR_EXTENDER
+			// Initialize toolbar
+			BeamableToolbarExtender.LoadToolbarExtender();
+#endif
 			initializeAttemptCount++;
 
 			if (initializeAttemptCount > WARN_ON_INITIALIZE_ATTEMPT)
@@ -362,11 +365,6 @@ namespace Beamable
 
 					IsInitialized = true;
 
-#if !DISABLE_BEAMABLE_TOOLBAR_EXTENDER
-					// Initialize toolbar
-					BeamableToolbarExtender.LoadToolbarExtender();
-#endif
-
 				}
 				catch (Exception ex)
 				{
@@ -616,6 +614,7 @@ namespace Beamable
 		/// </param>
 		public void Logout(bool clearRealmPid)
 		{
+			changeRealmPromise?.CompleteSuccess();
 			BeamCli.Logout().Then(_ =>
 			{
 				OnUserChange?.Invoke(null);
@@ -690,20 +689,46 @@ namespace Beamable
 				ServiceScope.GetService<ConfigDatabaseProvider>().Reload();
 			}
 		}
+
 		
+		
+		private Promise changeRealmPromise;
+
+		public bool IsSwitchingRealms
+		{
+			get
+			{
+				if (changeRealmPromise == null) return false;
+				if (changeRealmPromise.IsCompleted) return false;
+				if (changeRealmPromise.IsFailed) return false;
+				return true;
+			}
+		} 
 		public async Promise SwitchRealm(RealmView realm)
 		{
 			await SwitchRealm(realm.Pid);
 		}
 		public async Promise SwitchRealm(string pid)
 		{
-			await BeamCli.SwitchRealms(pid);
-			
-			ApplyRequesterToken();
+			if (changeRealmPromise != null)
+			{
+				changeRealmPromise.CompleteSuccess();
+			}
+			changeRealmPromise = new Promise();
+			try
+			{
+				await BeamCli.SwitchRealms(pid);
 
-			await CliContentService.Reload();
-			
-			OnRealmChange?.Invoke(BeamCli.CurrentRealm);
+				ApplyRequesterToken();
+
+				await CliContentService.Reload();
+
+				OnRealmChange?.Invoke(BeamCli.CurrentRealm);
+			}
+			finally
+			{
+				changeRealmPromise.CompleteSuccess();
+			}
 		}
 
 		public static async Task StopAll()

package/Editor/Toolbar/BeamableToolbarAssetPostProcessor.cs

@@ -1,6 +1,7 @@
 using Beamable.Editor.Reflection;
 using System.Linq;
 using UnityEditor;
+using UnityEngine;
 
 #if !DISABLE_BEAMABLE_TOOLBAR_EXTENDER
 using Beamable.Editor.ToolbarExtender;
@@ -15,9 +16,6 @@ namespace Beamable.Editor
 	{
 		public static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
 		{
-			if (!BeamEditor.IsInitialized)
-				return;
-
 #if !DISABLE_BEAMABLE_TOOLBAR_EXTENDER
 			var toolbarExtendedRelatedAssets = importedAssets.Union(movedAssets)
 															 .Select(path => (path, type: AssetDatabase.GetMainAssetTypeAtPath(path)))

package/Editor/Toolbar/BeamableToolbarCallbacks.cs

@@ -55,7 +55,7 @@ namespace Beamable.Editor.ToolbarExtender
 
 		static void OnUpdate()
 		{
-			if (!BeamEditor.IsInitialized) return;
+			// if (!BeamEditor.IsInitialized) return;
 			
 			// Relying on the fact that toolbar is ScriptableObject and gets deleted when layout changes
 			if (m_currentToolbar == null)

package/Editor/Toolbar/BeamableToolbarExtender.cs

@@ -35,14 +35,16 @@ namespace Beamable.Editor.ToolbarExtender
 				BeamableToolbarCallbacks.m_toolbarType.GetMethod("RepaintToolbar", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static).Invoke(null, null);
 			};
 
+			BeamGUI.LoadNonConfigurableIcons();
 
 			BeamableToolbarCallbacks.OnToolbarGUI = OnGUI;
 
 			if (!BeamEditor.IsInitialized)
 			{
-				Debug.LogError("Beamable Toolbar cannot load because Beamable is not initialized. ");
+				// Debug.LogError("Beamable Toolbar cannot load because Beamable is not initialized. ");
 				return;
 			}
+			
 
 			var api = BeamEditorContext.Default;
 			_editorAPI = api;
@@ -61,11 +63,16 @@ namespace Beamable.Editor.ToolbarExtender
 
 		}
 
+		private const string LAST_REALM_SESSION_KEY = "beam-toolbar-last-realm-name";
 		static void OnGUI(IMGUIContainer container)
 		{
-			if (_editorAPI == null) return;
+			// if (_editorAPI == null) return;
 			
-			BeamGUI.LoadAllIcons();
+			if (_editorAPI == null && BeamEditor.IsInitialized)
+			{
+				LoadToolbarExtender();
+				
+			}
 
 			EditorGUILayout.BeginHorizontal(new GUIStyle
 			{
@@ -75,31 +82,42 @@ namespace Beamable.Editor.ToolbarExtender
 			try
 			{
 				var badgeColor = new Color(0,0,0,.3f);
-				if (_editorAPI.BeamCli.CurrentRealm?.IsProduction ?? false)
+				if (_editorAPI?.BeamCli.CurrentRealm?.IsProduction ?? false)
 				{
 					badgeColor = new Color(1, 0, 0, .5f);
 				}
-				else if (_editorAPI.BeamCli.CurrentRealm?.IsStaging ?? false)
+				else if (_editorAPI?.BeamCli.CurrentRealm?.IsStaging ?? false)
 				{
 					badgeColor = new Color(1, .5f, 0, .5f);
 				}
 
-				var realmDisplay = _editorAPI.BeamCli.CurrentRealm?.DisplayName ?? "<no realm>";
-				var versionDisplay = _editorAPI.BeamCli.PackageVersion.ToString();
-				if (_editorAPI.BeamCli.PackageVersion.IsNightly)
+				var realmDisplay = _editorAPI?.BeamCli.CurrentRealm?.DisplayName ?? "<no realm>";
+				if (_editorAPI == null)
+				{
+					realmDisplay = SessionState.GetString(LAST_REALM_SESSION_KEY, "<loading>");
+				}
+				else
+				{
+					SessionState.SetString(LAST_REALM_SESSION_KEY, realmDisplay);
+				}
+				
+				var versionDisplay = BeamableEnvironment.SdkVersion.ToString();
+				if (BeamableEnvironment.SdkVersion.IsNightly)
 				{
 					versionDisplay = "nightly";
 				}
 				var titleContent = new GUIContent(realmDisplay + " (" + versionDisplay + ")");
 
+				GUI.enabled = _editorAPI != null;
 				var didClick = GUILayout.Button(titleContent, new GUIStyle(EditorStyles.toolbarButton)
 				{
 					alignment = TextAnchor.MiddleLeft,
 					padding = new RectOffset(24, 0, 0, 0),
 					fixedHeight = EditorStyles.toolbarButton.fixedHeight - 4,
 				});
+				GUI.enabled = true;
 				var buttonRect = GUILayoutUtility.GetLastRect();
-				if (didClick)
+				if (didClick && _editorAPI != null)
 				{
 					// create the menu and add items to it
 					var menu = new GenericMenu();
@@ -122,7 +140,17 @@ namespace Beamable.Editor.ToolbarExtender
 				var badgeRect = new Rect(buttonRect.x, buttonRect.y-1, badgeWidth, buttonRect.height+2);
 				
 				var iconRect = new Rect(buttonRect.x+3, buttonRect.y-1, 20, 18);
-				GUI.DrawTexture(iconRect, BeamGUI.iconBeamableSmall);
+
+				if (_editorAPI == null || _editorAPI.IsSwitchingRealms)
+				{
+					var inset = 3;
+					GUI.DrawTexture(new Rect(iconRect.x + inset, iconRect.y + inset, iconRect.width - inset*2, iconRect.height - inset*2), BeamGUI.GetSpinner());
+				}
+				else
+				{
+					GUI.DrawTexture(iconRect, BeamGUI.iconBeamableSmall);
+				}
+				
 				EditorGUI.DrawRect(badgeRect, badgeColor);
 			}
 			finally

package/Editor/Toolbar/MenuItems/BeamableRealmMenuItem.cs

@@ -2,6 +2,7 @@ using Beamable.Common.Api.Realms;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Beamable.Common;
 using Beamable.Config;
 using Beamable.Editor.BeamCli;
 using UnityEditor;
@@ -14,10 +15,13 @@ namespace Beamable.Editor.ToolbarExtender
 #endif
 	public class BeamableRealmMenuItem : BeamableToolbarMenuItem
 	{
-	
 		public override void ContextualizeMenu(BeamEditorContext editor, GenericMenu menu)
 		{
 			var rootDisplay = RenderLabel(editor);
+			if (string.IsNullOrEmpty(rootDisplay?.text))
+			{
+				return;
+			}
 
 			var projects = new List<RealmView>();
 
@@ -46,23 +50,31 @@ namespace Beamable.Editor.ToolbarExtender
 			var buildPid = editor.ServiceScope.GetService<ConfigDatabaseProvider>()?.Pid ?? "";
 			var buildName = buildPid.ToString();
 			var sameEditorAndBuildPids = buildPid == editor.BeamCli?.Pid;
-			foreach (var proj in projects)
+			if (editor.IsSwitchingRealms)
 			{
-				var capturedProj = proj;
-				var enabled = proj.Pid == editor.BeamCli?.Pid;
-				
-				var display = !sameEditorAndBuildPids && buildPid == proj.Pid ? $"{proj.GetDisplayName()} [build]" : proj.GetDisplayName();
-				if (buildPid == proj.Pid)
-				{
-					buildName = proj.ProjectName;
-				}
-				menu.AddItem(new GUIContent(rootDisplay.text + "/" + display), enabled, () =>
+				menu.AddDisabledItem(new GUIContent(rootDisplay.text + "/(Switching Realms...)"));
+			}
+			else
+			{
+
+				foreach (var proj in projects)
 				{
-					var _ = editor.SwitchRealm(capturedProj).Then(_ =>
+					var capturedProj = proj;
+					var enabled = proj.Pid == editor.BeamCli?.Pid;
+
+					var display = !sameEditorAndBuildPids && buildPid == proj.Pid
+						? $"{proj.GetDisplayName()} [build]"
+						: proj.GetDisplayName();
+					if (buildPid == proj.Pid)
 					{
-						GUI.changed = true;
+						buildName = proj.ProjectName;
+					}
+
+					menu.AddItem(new GUIContent(rootDisplay.text + "/" + display), enabled, () =>
+					{
+						var _ = editor.SwitchRealm(capturedProj).Then(_ => { GUI.changed = true; });
 					});
-				});
+				}
 			}
 
 			if (projects.Count > 0)
@@ -81,6 +93,7 @@ namespace Beamable.Editor.ToolbarExtender
 
 		public override GUIContent RenderLabel(BeamEditorContext beamableApi)
 		{
+			if (!beamableApi.IsAuthenticated) return null;
 			var realmName = beamableApi?.BeamCli?.CurrentRealm?.DisplayName;
 			if (string.IsNullOrEmpty(realmName))
 			{

package/Editor/UI/BeamGUI/BeamGUI_Icons.cs

@@ -64,16 +64,9 @@ namespace Beamable.Editor.Util
 			var spinnerIndex = (int)( ((Time.realtimeSinceStartup*12f)+offset) % BeamGUI.unitySpinnerTextures.Length);
 			return unitySpinnerTextures[spinnerIndex];
 		}
-		
-		public static void LoadAllIcons()
+
+		public static void LoadNonConfigurableIcons()
 		{
-			var reflectionCache = Beam.GetReflectionSystem<ContentTypeReflectionCache>();
-			var allTypes = reflectionCache.GetAll().ToList();
-			if (ContentConfiguration.Instance.ContentTextureConfiguration == null || ContentConfiguration.Instance.ContentTextureConfiguration?.TextureConfigurations?.Count != allTypes.Count)
-			{
-				ContentConfiguration.Instance.ContentTextureConfiguration = new  ContentTextureConfiguration(allTypes);
-			}
-			
 			
 			if (unitySpinnerTextures == null)
 			{
@@ -326,5 +319,21 @@ namespace Beamable.Editor.Util
 				iconContentSnapshotColor = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ContentSnapshot.png");
 			}
 		}
+
+		public static void LoadConfigurableIcons()
+		{
+			var reflectionCache = Beam.GetReflectionSystem<ContentTypeReflectionCache>();
+			var allTypes = reflectionCache.GetAll().ToList();
+			if (ContentConfiguration.Instance.ContentTextureConfiguration == null || ContentConfiguration.Instance.ContentTextureConfiguration?.TextureConfigurations?.Count != allTypes.Count)
+			{
+				ContentConfiguration.Instance.ContentTextureConfiguration = new  ContentTextureConfiguration(allTypes);
+			}
+		}
+		
+		public static void LoadAllIcons()
+		{
+			LoadConfigurableIcons();
+			LoadNonConfigurableIcons();
+		}
 	}
 }

package/Runtime/Environment/Resources/env-default.json

@@ -5,5 +5,5 @@
     "beamMongoExpressUrl": "https://storage.beamable.com",
     "dockerRegistryUrl": "https://microservices.beamable.com/v2/",
     "isUnityVsp": "false",
-    "sdkVersion": "5.0.0-PREVIEW.RC10"
+    "sdkVersion": "5.0.0-PREVIEW.RC12"
 }

package/Runtime/Environment/Resources/versions-default.json

@@ -1,3 +1,3 @@
 {
-     "nugetPackageVersion": "7.0.0-PREVIEW.RC9"
+     "nugetPackageVersion": "7.0.0-PREVIEW.RC10"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.beamable",
-  "version": "5.0.0-PREVIEW.RC10",
+  "version": "5.0.0-PREVIEW.RC12",
   "displayName": "Beamable",
   "description": "A better way to build games in Unity\n",
   "unity": "2021.3",