com.beamable 5.1.0-PREVIEW.RC5 → 5.1.0-PREVIEW.RC6

package/Editor/BeamCli/BeamWebCommand.cs

@@ -86,7 +86,6 @@ namespace Beamable.Editor.BeamCli
 		public BeamCommandFactory processFactory;
 		public BeamCommands processCommands;
 		public BeamableDispatcher dispatcher;
-		public HttpClient localClient;
 
 		private readonly BeamWebCliCommandHistory _history;
 		private readonly BeamWebCommandFactoryOptions _options;
@@ -105,9 +104,6 @@ namespace Beamable.Editor.BeamCli
 			processFactory = new BeamCommandFactory(dispatcher);
 			processCommands = new BeamCommands(processFactory, beamCli);
 			_options.port = _options.startPortOverride.GetOrElse(8432);
-			// Shared across all BeamWebCommand instances; per-call HttpClient
-			// churns TCP connections and amplifies Mono's transport flakiness.
-			localClient = new HttpClient { Timeout = TimeSpan.FromDays(7) };
 
 			dispatcher.Run("cli-server-discovery", ServerDiscoveryLoop());
 		}
@@ -150,13 +146,6 @@ namespace Beamable.Editor.BeamCli
 					$"Server invalidated: {cause.GetType().Name}: {cause.Message}");
 
 				KillServer();
-				// Mono's HttpClient pool can hold half-closed sockets pointing
-				// at the dead server; swap in a fresh client so the next
-				// command opens a clean connection. Don't dispose the old one
-				// — in-flight requests still reference it and disposing would
-				// throw ObjectDisposedException, re-triggering invalidation in
-				// a thundering herd. GC will collect it once requests drain.
-				localClient = new HttpClient { Timeout = TimeSpan.FromDays(7) };
 				port = _options.startPortOverride.GetOrElse(8432);
 				discoveryRequest++;
 			});
@@ -389,6 +378,7 @@ namespace Beamable.Editor.BeamCli
 		private BeamWebCommandFactory _factory;
 		private CancellationTokenSource _cts;
 		private BeamWebCliCommandHistory _history;
+		private Promise _runPromise;
 
 		public BeamWebCommand(BeamWebCommandFactory factory, BeamWebCliCommandHistory history)
 		{
@@ -406,7 +396,13 @@ namespace Beamable.Editor.BeamCli
 			_history.UpdateCommand(id, commandString);
 		}
 		
-		public async Promise Run()
+		public Promise Run()
+		{
+			_runPromise = RunImpl();
+			return _runPromise;
+		}
+
+		private async Promise RunImpl()
 		{
 			_history.UpdateResolvingHostTime(id);
 
@@ -424,7 +420,13 @@ namespace Beamable.Editor.BeamCli
 
 			try
 			{
-				var sendTask = _factory.localClient.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, _cts.Token);
+				// Per-call HttpClient. We tried sharing one on the factory but
+				// pooled connections to the localhost CLI server went bad on
+				// Windows (login would surface as TaskCanceledException from a
+				// poisoned half-closed socket); a fresh client per command
+				// avoids that.
+				using var client = new HttpClient { Timeout = TimeSpan.FromDays(7) };
+				var sendTask = client.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, _cts.Token);
 				_history.AddCustomLog(id, "[Unity] sent request...");
 
 				using HttpResponseMessage response = await sendTask;
@@ -484,11 +486,6 @@ namespace Beamable.Editor.BeamCli
 				}
 
 			}
-			catch (OperationCanceledException) when (_cts.IsCancellationRequested)
-			{
-				// Caller invoked Cancel(); exit quietly.
-				_history.AddCustomLog(id, "[Unity] cancelled by caller");
-			}
 			catch (Exception ex) when (
 				(IsTransportFailure(ex) || ex is OperationCanceledException)
 				&& !_cts.IsCancellationRequested)
@@ -518,6 +515,10 @@ namespace Beamable.Editor.BeamCli
 		public void Cancel()
 		{
 			if (_cts.IsCancellationRequested) return; // no-op
+			// Mark the run's promise as observed so the cancellation
+			// exception we're about to trigger isn't logged as an
+			// UncaughtPromiseException. Awaiters still see the throw.
+			_runPromise?.Error(_ => { });
 			_cts.Cancel();
 		}
 

package/Editor/BeamCli/Commands/BeamProjectNewPortalExtension.cs

@@ -26,7 +26,7 @@ namespace Beamable.Editor.BeamCli.Commands
         public int mountGroupOrder;
         /// <summary>Specify the order of the mount label</summary>
         public int mountLabelOrder;
-        /// <summary>UI framework template to scaffold the extension with. Allowed values: svelte, react</summary>
+        /// <summary>UI framework template to scaffold the extension with. Allowed values: react</summary>
         public string template;
         /// <summary>Serializes the arguments for command line usage.</summary>
         public virtual string Serialize()

package/Editor/Modules/Content/DefaultContent/currency/coins.asset

@@ -14,9 +14,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _tags:
   - base
-  _serializedValidationGUID: 00000000-0000-0000-0000-000000000003
+  _serializedValidationGUID: 00000000-0000-0000-0000-000000000008
   icon:
-    m_AssetGUID: ddded4a9a76c8ff439eab5570826ad89
+    m_AssetGUID: 819869afaafce0144b1fba88a5e4b040
     m_SubObjectName: 
     m_SubObjectType: 
     m_EditorAssetChanged: 0

package/Editor/Modules/Content/DefaultContent/currency/gems.asset

@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _tags:
   - base
-  _serializedValidationGUID: 00000000-0000-0000-0000-000000000003
+  _serializedValidationGUID: 00000000-0000-0000-0000-000000000009
   icon:
     m_AssetGUID: ddded4a9a76c8ff439eab5570826ad89
     m_SubObjectName: 

package/Editor/UI/BeamGUI/BeamGUI_LogoBanner.cs

@@ -11,6 +11,8 @@ namespace Beamable.Editor.Util
 
 			var logoRect = GUILayoutUtility.GetRect(GUIContent.none, GUIStyle.none, GUILayout.Height(50),
 			                                        GUILayout.ExpandWidth(true));
+			if (!logo) return;
+			
 			var logoAspect = logo.width / (float) logo.height;
 			var shadowWidth = logoAspect * logoRect.height;
 

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.1.0-PREVIEW.RC5"
+    "sdkVersion": "5.1.0-PREVIEW.RC6"
 }

package/Runtime/UI/Sprites/icon_coin.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 819869afaafce0144b1fba88a5e4b040
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/UI/Sprites/icon_gem.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: ddded4a9a76c8ff439eab5570826ad89
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: e3d51a0820e474fad8a4034eef1a5807
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

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