com.beamable 5.0.0-PREVIEW.RC2 → 5.0.0-PREVIEW.RC4

package/Editor/BeamCli/BeamCommand.cs

@@ -26,6 +26,7 @@ namespace Beamable.Editor.BeamCli.Commands
 
 		public Action<BeamArgs> argModifier = null;
 		public Stack<Action<BeamArgs>> argStackModifier = new Stack<Action<BeamArgs>>();
+		private readonly BeamCli _beamCli;
 
 		public void ModifierNextDefault(Action<BeamArgs> modifier) => argStackModifier.Push(modifier);
 		
@@ -43,9 +44,10 @@ namespace Beamable.Editor.BeamCli.Commands
 			}
 		}
 
-		public BeamCommands(IBeamCommandFactory factory)
+		public BeamCommands(IBeamCommandFactory factory, BeamCli beamCli)
 		{
 			_factory = factory;
+			_beamCli = beamCli;
 		}
 
 		public IBeamCommand CreateCustom(string args)
@@ -73,7 +75,8 @@ namespace Beamable.Editor.BeamCli.Commands
 				emitLogStreams = true,
 				engine = "unity",
 				engineVersion = Application.unityVersion,
-				engineSdkVersion = BeamableEnvironment.SdkVersion.ToString()
+				engineSdkVersion = BeamableEnvironment.SdkVersion.ToString(),
+				preferRemoteFederation = _beamCli.CurrentRealm?.IsProduction ?? false
 			};
 			return beamArgs;
 		}

package/Editor/BeamCli/BeamWebCommand.cs

@@ -96,13 +96,13 @@ namespace Beamable.Editor.BeamCli
 		public BeamWebCommandFactory(
 			BeamableDispatcher dispatcher, 
 			BeamWebCliCommandHistory history, 
-			BeamWebCommandFactoryOptions options)
+			BeamWebCommandFactoryOptions options, BeamCli beamCli)
 		{
 			this.dispatcher = dispatcher;
 			_history = history;
 			_options = options;
 			processFactory = new BeamCommandFactory(dispatcher);
-			processCommands = new BeamCommands(processFactory);
+			processCommands = new BeamCommands(processFactory, beamCli);
 			_options.port = _options.startPortOverride.GetOrElse(8432);
 			
 			dispatcher.Run("cli-server-discovery", ServerDiscoveryLoop());

package/Editor/BeamCli/Extensions/DiscoveryExtensions.cs

@@ -8,8 +8,24 @@ namespace Beamable.Editor.BeamCli.Extensions
 	{
 		public static bool IsLocal(this BeamServiceInstance instance)
 		{
-			return instance.latestHostEvent != null || instance.latestDockerEvent != null;
+			return (instance.latestHostEvent != null && instance.latestHostEvent.IsValid()) ||
+			       (instance.latestDockerEvent != null && instance.latestDockerEvent.IsValid());
 		}
+
+		public static bool IsValid(this BeamDockerServiceDescriptor instance)
+		{
+			return !string.IsNullOrEmpty(instance.containerId) 
+			       || !string.IsNullOrEmpty(instance.routingKey)
+			       || !string.IsNullOrEmpty(instance.service)
+			       || !string.IsNullOrEmpty(instance.serviceType); 
+		}
+
+		public static bool IsValid(this BeamHostServiceDescriptor instance)
+		{
+			return !string.IsNullOrEmpty(instance.service)
+			       || !string.IsNullOrEmpty(instance.routingKey);
+		}
+		
 		public static bool IsRemote(this BeamServiceInstance instance)
 		{
 			return instance.latestRemoteEvent != null;

package/Editor/BeamCli/UI/BeamCliWindow_Commands.cs

@@ -48,10 +48,12 @@ namespace Beamable.Editor.BeamCli.UI
 		public CommandStatusFilterView completedFilter = new CommandStatusFilterView();
 		public CommandStatusFilterView errorFilter = new CommandStatusFilterView();
 		public CommandStatusFilterView lostFilter = new CommandStatusFilterView();
+		public CommandStatusFilterView createdFilter = new CommandStatusFilterView();
 
 
 		public enum CommandStatus
 		{
+			Created,
 			Running,
 			Completed,
 			Error,
@@ -60,6 +62,7 @@ namespace Beamable.Editor.BeamCli.UI
 
 		private readonly Dictionary<CommandStatus, string> commandsStatusIconMap = new Dictionary<CommandStatus, string>()
 		{
+			{CommandStatus.Created, "sv_icon_dot0_sml"},
 			{CommandStatus.Running, "sv_icon_dot13_sml"},
 			{CommandStatus.Completed, "sv_icon_dot11_sml"},
 			{CommandStatus.Error, "sv_icon_dot14_sml"},
@@ -122,6 +125,7 @@ namespace Beamable.Editor.BeamCli.UI
 			DrawCommandStatusFilter(CommandStatus.Completed, completedFilter);
 			DrawCommandStatusFilter(CommandStatus.Error, errorFilter);
 			DrawCommandStatusFilter(CommandStatus.Lost, lostFilter);
+			DrawCommandStatusFilter(CommandStatus.Created, createdFilter);
 
 			EditorGUILayout.EndHorizontal();
 
@@ -327,6 +331,7 @@ namespace Beamable.Editor.BeamCli.UI
 		public List<CommandDescriptionView> FilterCommands()
 		{
 			var lostCount = 0;
+			var createdCount = 0;
 			var completedCount = 0;
 			var runningCount = 0;
 			var errorCount = 0;
@@ -338,75 +343,92 @@ namespace Beamable.Editor.BeamCli.UI
 				var parsedCommand = ParseCommandString(commandDescriptor.commandString);
 				var status = GetCommandStatus(commandDescriptor);
 
-				if (status == CommandStatus.Error)
+				switch (status)
 				{
-					if (errorFilter.enabled)
+					case CommandStatus.Running:
 					{
-						filteredList.Add(new CommandDescriptionView()
+						if (runningFilter.enabled)
 						{
-							command = parsedCommand.command,
-							timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
-							status = status,
-							id = commandDescriptor.id,
-						});
-					}
-
-					errorCount++;
-				}
-
-				if (status == CommandStatus.Running)
-				{
-					if (runningFilter.enabled)
+							filteredList.Add(new CommandDescriptionView()
+							{
+								command = parsedCommand.command,
+								timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
+								status = status,
+								id = commandDescriptor.id,
+							});
+						}
+
+						runningCount++;
+					} break;
+					case CommandStatus.Created:
 					{
-						filteredList.Add(new CommandDescriptionView()
+						if (createdFilter.enabled)
 						{
-							command = parsedCommand.command,
-							timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
-							status = status,
-							id = commandDescriptor.id,
-						});
-					}
-
-					runningCount++;
-				}
-
-				if (status == CommandStatus.Completed)
-				{
-					if (completedFilter.enabled)
+							filteredList.Add(new CommandDescriptionView()
+							{
+								command = parsedCommand.command,
+								timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
+								status = status,
+								id = commandDescriptor.id,
+							});
+						}
+
+						createdCount++;
+					} break;
+					case CommandStatus.Error:
 					{
-						filteredList.Add(new CommandDescriptionView()
+						if (errorFilter.enabled)
 						{
-							command = parsedCommand.command,
-							timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
-							status = status,
-							id = commandDescriptor.id,
-						});
-					}
-
-					completedCount++;
-				}
-
-				if (status == CommandStatus.Lost)
-				{
-					if (lostFilter.enabled)
+							filteredList.Add(new CommandDescriptionView()
+							{
+								command = parsedCommand.command,
+								timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
+								status = status,
+								id = commandDescriptor.id,
+							});
+						}
+
+						errorCount++;
+					} break;
+					case CommandStatus.Lost:
+					{
+						if (lostFilter.enabled)
+						{
+							filteredList.Add(new CommandDescriptionView()
+							{
+								command = parsedCommand.command,
+								timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
+								status = status,
+								id = commandDescriptor.id,
+							});
+						}
+
+						lostCount++;
+					} break;
+					case CommandStatus.Completed:
 					{
-						filteredList.Add(new CommandDescriptionView()
+						if (completedFilter.enabled)
 						{
-							command = parsedCommand.command,
-							timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
-							status = status,
-							id = commandDescriptor.id,
-						});
-					}
-
-					lostCount++;
+							filteredList.Add(new CommandDescriptionView()
+							{
+								command = parsedCommand.command,
+								timeStamp = TimeDisplayUtil.GetLogDisplayTime(commandDescriptor.createdTime),
+								status = status,
+								id = commandDescriptor.id,
+							});
+						}
+
+						completedCount++;
+					} break;
 				}
+				
 			}
 
 			errorFilter.count = errorCount;
 			completedFilter.count = completedCount;
 			runningFilter.count = runningCount;
 			lostFilter.count = lostCount;
+			createdFilter.count = createdCount;
 
 			return filteredList;
 		}
@@ -481,6 +503,11 @@ namespace Beamable.Editor.BeamCli.UI
 				return command.errors.Count > 0 ? CommandStatus.Error : CommandStatus.Completed;
 			}
 
+			if (command.startTime < 0)
+			{
+				return CommandStatus.Created;
+			}
+
 			return CommandStatus.Running;
 		}
 

package/Editor/ContentService/CliContentService.cs

@@ -97,10 +97,10 @@ namespace Beamable.Editor.ContentService
 			string propertiesJson = ClientContentSerializer.SerializeProperties(selectedContentObject);
 			bool hasValidationError = selectedContentObject.HasValidationErrors(GetValidationContext(), out List<string> _);
 			UpdateContentValidationStatus(selectedContentObject.Id, hasValidationError);
-			SaveContent(selectedContentObject.Id, propertiesJson);
+			SaveContent(selectedContentObject.Id, propertiesJson, () => SetContentTags(selectedContentObject.Id, selectedContentObject.Tags));
 		}
 
-		public void SaveContent(string contentId, string contentPropertiesJson)
+		public void SaveContent(string contentId, string contentPropertiesJson, Action onCompleted = null)
 		{
 			var saveCommand = _cli.ContentSave(new ContentSaveArgs()
 			{
@@ -108,7 +108,7 @@ namespace Beamable.Editor.ContentService
 				contentIds = new[] {contentId},
 				contentProperties = new[] {contentPropertiesJson}
 			});
-			saveCommand.Run();
+			saveCommand.Run().Then(_ => { onCompleted?.Invoke(); });
 		}
 		
 		public async Task<BeamContentSnapshotListResult> GetContentSnapshots()
@@ -340,6 +340,8 @@ namespace Beamable.Editor.ContentService
 				AddContentToCache(entry);
 			}
 
+			ManifestChangedCount++;
+
 			BeamUnityFileUtils.RenameFile(originalPath, fullName);
 			
 			return newFullId;
@@ -387,12 +389,6 @@ namespace Beamable.Editor.ContentService
 		{
 			EditorUtility.DisplayProgressBar(PUBLISH_OPERATION_TITLE, "Publishing contents...", 0);
 			publishedContents = 0;
-
-			if (_contentWatcher != null)
-			{
-				_contentWatcher.Cancel();
-				_contentWatcher = null;
-			}
 			
 			try
 			{

package/Editor/Server/Usam/UsamService.cs

@@ -392,6 +392,8 @@ namespace Beamable.Server.Editor.Usam
 		
 		public void ListenForStatus()
 		{
+			if (_ctx.BeamCli.IsLoggedOut) return;
+			
 			if (_watchCommand != null)
 			{
 				_watchCommand.Cancel();
@@ -814,7 +816,7 @@ namespace Beamable.Server.Editor.Usam
 		
 		void StopStorage(BeamManifestStorageEntry storage)
 		{
-			var stopCommand = _cli.ServicesStop(new ServicesStopArgs()
+			var stopCommand = _cli.ProjectStop(new ()
 			{
 				ids = new string[] {storage.beamoId},
 			});

package/Editor/UI/AccountWindow/AccountWindow.cs

@@ -19,7 +19,8 @@ namespace Beamable.Editor.Accounts
 		public BeamEditorContext context;
 
 		private GUIStyle _errorStyle;
-		private static readonly Vector2 WindowMinSize = new(300, 660);
+		private static readonly Vector2 LoggedWindowMinSize = new(630, 660);
+		private static readonly Vector2 WindowMinSize = new(330, 660);
 
 		[MenuItem(
 			Constants.MenuItems.Windows.Paths.MENU_ITEM_PATH_WINDOW_BEAMABLE + "/" +
@@ -96,7 +97,7 @@ namespace Beamable.Editor.Accounts
 				}
 				else
 				{
-					minSize = WindowMinSize;
+					minSize = LoggedWindowMinSize;
 					Draw_SignedIn();
 				}
 			}

package/Editor/UI/ContentWindow/ContentWindow_ItemsPanel.cs

@@ -690,14 +690,21 @@ namespace Beamable.Editor.UI.ContentWindow
 
 				if (shouldShowMenu)
 				{
-					// AddDelayedAction(() =>
 					var evt = Event.current;
-					var mousePosition = evt.mousePosition;
+					var screenMousePosition = GUIUtility.GUIToScreenPoint(evt.mousePosition);
 					Event.current.Use();
 					Repaint();
-					ShowItemOptionsMenu(mousePosition);
+					// Fix: https://github.com/beamable/BeamableProduct/issues/4479
+					// We need to do a double-delay call to ensure that the ActiveSelected items will be properly drawn as
+					// selected, the second delay is necessary because when setting the Selection.activeObject Unity forces
+					// a repaint, but the IMGUI can still access the old selection state.
+					// So we need to wait another frame to make it right
+					EditorApplication.delayCall += () =>
+					{
+						Repaint();
+						EditorApplication.delayCall += () => ShowItemOptionsMenu(screenMousePosition);
+					};
 					return;
-
 				}
 
 				
@@ -714,7 +721,7 @@ namespace Beamable.Editor.UI.ContentWindow
 			Repaint();
 		}
 
-		private void ShowItemOptionsMenu(Vector2 menuPosition)
+		private void ShowItemOptionsMenu(Vector2 screenPosition)
 		{
 			GenericMenu menu = new GenericMenu();
 
@@ -746,18 +753,7 @@ namespace Beamable.Editor.UI.ContentWindow
 					             () => { InternalEditorUtility.OpenFileAtLineExternal(entry.JsonFilePath, 1); });
 					menu.AddItem(new GUIContent("Duplicate Item"), false, () =>
 					{
-						if (_contentService.TryGetContentObject(entry.FullId, out var contentObject))
-						{
-							var duplicatedObject = Instantiate(contentObject);
-							string baseName = $"{contentObject.ContentName}_Copy";
-							int itemsWithBaseNameCount = _contentService.GetContentsFromType(contentObject.GetType())
-							                                            .Count(item => item.Name.StartsWith(baseName));
-							duplicatedObject.SetContentName($"{baseName}{itemsWithBaseNameCount}");
-							duplicatedObject.ContentStatus = ContentStatus.Created;
-							_contentService.SaveContent(duplicatedObject);
-							Selection.activeObject = duplicatedObject;
-						}
-
+						DuplicateContent(entry);
 					});
 
 					menu.AddItem(new GUIContent("Rename Item"), false, () =>
@@ -786,7 +782,7 @@ namespace Beamable.Editor.UI.ContentWindow
 					});
 				}
 
-				if (entry.StatusEnum is not ContentStatus.UpToDate)
+				if (entry.StatusEnum is not ContentStatus.UpToDate and not ContentStatus.Created)
 				{
 					menu.AddItem(new GUIContent("Revert Item"), false,
 					             () =>
@@ -872,7 +868,23 @@ namespace Beamable.Editor.UI.ContentWindow
 				
 			}
 
-			menu.DropDown(new Rect(menuPosition, Vector2.zero));
+			menu.DropDown(new Rect(GUIUtility.ScreenToGUIPoint(screenPosition), Vector2.zero));
+		}
+
+		private void DuplicateContent(LocalContentManifestEntry entry)
+		{
+			if (_contentService.TryGetContentObject(entry.FullId, out var contentObject))
+			{
+				var duplicatedObject = Instantiate(contentObject);
+				string baseName = $"{contentObject.ContentName}_Copy";
+				int itemsWithBaseNameCount = _contentService.GetContentsFromType(contentObject.GetType())
+				                                            .Count(item => item.Name.StartsWith(baseName));
+				duplicatedObject.SetContentName($"{baseName}{itemsWithBaseNameCount}");
+				duplicatedObject.ContentStatus = ContentStatus.Created;
+				duplicatedObject.Tags = entry.Tags;
+				_contentService.SaveContent(duplicatedObject);
+				Selection.activeObject = duplicatedObject;
+			}
 		}
 
 		private void StartEditEntryName(LocalContentManifestEntry entry)

package/Editor/Utility/UnityOtelManager.cs

@@ -35,7 +35,8 @@ namespace Beamable.Editor.Utility
 		private ConcurrentDictionary<string, CliOtelLogRecord> _cachedLogs = new();
 		private ConcurrentDictionary<string, List<string>> _cachedTimestamps = new();
 		private readonly BeamCommands _cli;
-		
+		private readonly BeamEditorContext _ctx;
+
 		private List<string> BeamableNamespaces = new()
 		{
 			"Beamable.Editor",
@@ -69,9 +70,10 @@ namespace Beamable.Editor.Utility
 
 		public static string UnityOtelLogsFolder => Path.Join(Application.temporaryCachePath, "OtelLogs");
 		
-		public UnityOtelManager(BeamCommands cli)
+		public UnityOtelManager(BeamCommands cli, BeamEditorContext ctx)
 		{
 			_cli = cli;
+			_ctx = ctx;
 			EditorApplication.update += HandleUpdate;
 			Application.logMessageReceived += OnUnityLogReceived;
 			Application.wantsToQuit += OnUnityQuitting;
@@ -148,6 +150,8 @@ namespace Beamable.Editor.Utility
 
 		public async Promise PublishLogs(int maxLogFileCount = 10)
 		{
+			if (_ctx.BeamCli.IsLoggedOut) return;
+			
 			_lastTimePublished = EditorApplication.timeSinceStartup;
 			try
 			{

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.RC2"
+    "sdkVersion": "5.0.0-PREVIEW.RC4"
 }

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

@@ -1,3 +1,3 @@
 {
-     "nugetPackageVersion": "7.0.0-PREVIEW.RC3"
+     "nugetPackageVersion": "7.0.0-PREVIEW.RC4"
 }

package/package.json

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