feat: livekit cast improvements

Explorer/Assets/DCL/Infrastructure/CrdtEcsBridge/JsModulesImplementation/Communications/ISceneCommunicationPipe.cs → Explorer/Assets/DCL/Infrastructure/CrdtEcsBridge/ISceneCommunicationPipe.cs

@@ -1,6 +1,4 @@
-using DCL.Multiplayer.Connections.Messaging;
-using Decentraland.Kernel.Comms.Rfc4;
-using System;
+using System;
 using System.Threading;
 
 namespace CrdtEcsBridge.JsModulesImplementation.Communications
@@ -11,6 +9,7 @@ public enum MsgType
         {
             String = 1, // SDK scenes MessageBus messages
             Uint8Array = 2,
+            CommsData = 3, // CommsApi publish/subscribe topic-based data
         }
 
         public enum ConnectivityAssertiveness

Explorer/Assets/DCL/Infrastructure/Global/Dynamic/DebugSettings/DebugSettings.cs

@@ -5,6 +5,15 @@
 
 namespace Global.Dynamic.DebugSettings
 {
+    public enum GatekeeperMode
+    {
+        Org = 0,
+        Zone = 1,
+        Today = 2,
+        Localhost = 3,
+        Custom = 4,
+    }
+
     [Serializable]
     public class DebugSettings
     {
@@ -34,6 +43,13 @@ [SerializeField] [Tooltip("Make sure the ENS put here will be loaded as a Global
         private bool overrideConnectionQuality;
         [SerializeField]
         private LKConnectionQuality connectionQuality;
+        [Space]
+        [Header("Comms Gatekeeper")]
+        [SerializeField]
+        private GatekeeperMode gatekeeperMode;
+        [SerializeField] [Tooltip("Base gatekeeper URL used only when Gatekeeper Mode is set to Custom (e.g. http://localhost:3000)")]
+        private string customGatekeeperUrl = string.Empty;
+        [Space]
         [SerializeField]
         private string[] appParameters;
 
@@ -52,6 +68,8 @@ public static DebugSettings Release() =>
                 connectionQuality = LKConnectionQuality.QualityExcellent,
                 enableRemotePortableExperiences = true,
                 emotesToAddToUserProfile = null,
+                gatekeeperMode = GatekeeperMode.Org,
+                customGatekeeperUrl = string.Empty,
                 appParameters = Array.Empty<string>(),
             };
 
@@ -68,6 +86,8 @@ public static DebugSettings Release() =>
         public bool EnableEmulateNoLivekitConnection => Application.isEditor? this.enableEmulateNoLivekitConnection : RELEASE_SETTINGS.enableEmulateNoLivekitConnection;
         public bool OverrideConnectionQuality => Application.isEditor ? this.overrideConnectionQuality : RELEASE_SETTINGS.overrideConnectionQuality;
         public LKConnectionQuality ConnectionQuality => Application.isEditor ? this.connectionQuality : RELEASE_SETTINGS.connectionQuality;
-        public string[] AppParameters => appParameters;
+        public GatekeeperMode GatekeeperMode => Application.isEditor ? gatekeeperMode : RELEASE_SETTINGS.gatekeeperMode;
+        public string CustomGatekeeperUrl => Application.isEditor ? customGatekeeperUrl : RELEASE_SETTINGS.customGatekeeperUrl;
+        public string[] AppParameters => Application.isEditor ? appParameters : RELEASE_SETTINGS.appParameters;
     }
 }

Explorer/Assets/DCL/Infrastructure/Global/Dynamic/MainSceneLoader.cs

@@ -45,6 +45,7 @@
 using ECS.StreamableLoading.Common.Components;
 using Newtonsoft.Json.Linq;
 using Global.AppArgs;
+using Global.Dynamic.DebugSettings;
 using Global.Dynamic.RealmUrl;
 using Global.Dynamic.RealmUrl.Names;
 using Global.Versioning;
@@ -187,7 +188,9 @@ private async UniTask InitializeFlowAsync(CancellationToken ct)
             World world = World.Create();
 
             var realmData = new RealmData();
-            var decentralandUrlsSource = new GatewayUrlsSource(decentralandEnvironment, realmData, launchSettings);
+            string? gatekeeperBaseOverride = ResolveGatekeeperBaseOverride(debugSettings.GatekeeperMode, debugSettings.CustomGatekeeperUrl);
+            ReportHub.Log(ReportCategory.STARTUP, $"Gatekeeper mode: {debugSettings.GatekeeperMode}, base override: {gatekeeperBaseOverride ?? "(default)"}");
+            var decentralandUrlsSource = new GatewayUrlsSource(decentralandEnvironment, realmData, launchSettings, gatekeeperBaseOverride);
             DiagnosticInfoUtils.LogEnvironment(decentralandUrlsSource);
 
             var assetsProvisioner = new AddressablesProvisioner();
@@ -802,6 +805,17 @@ public void Dispose()
             }
         }
 
+        private static string? ResolveGatekeeperBaseOverride(GatekeeperMode mode, string customUrl) =>
+            mode switch
+            {
+                GatekeeperMode.Org => null,
+                GatekeeperMode.Zone => "https://comms-gatekeeper.decentraland.zone",
+                GatekeeperMode.Today => "https://comms-gatekeeper.decentraland.today",
+                GatekeeperMode.Localhost => "http://localhost:3000",
+                GatekeeperMode.Custom => string.IsNullOrEmpty(customUrl) ? null : customUrl,
+                _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
+            };
+
         [Serializable]
         public class SplashScreenRef : ComponentReference<SplashScreen>
         {

Explorer/Assets/DCL/Infrastructure/Global/Editor/DebugSettingsDrawer.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.Assertions;
 
 namespace Global.Editor
 {
@@ -157,11 +158,15 @@ private static Rect DrawDefaultProperties(Rect position, SerializedProperty prop
             SerializedProperty endProperty = property.GetEndProperty();
 
             bool enterChildren = true;
+            bool isCustomGatekeeper = IsCustomGatekeeperMode(property);
 
             while (iterator.NextVisible(enterChildren) && !SerializedProperty.EqualContents(iterator, endProperty))
             {
                 enterChildren = false;
 
+                if (iterator.name == "customGatekeeperUrl" && !isCustomGatekeeper)
+                    continue;
+
                 float propertyHeight = EditorGUI.GetPropertyHeight(iterator, true);
                 position.height = propertyHeight;
                 EditorGUI.PropertyField(position, iterator, true);
@@ -178,16 +183,28 @@ private static float GetDefaultPropertiesHeight(SerializedProperty property)
             SerializedProperty endProperty = property.GetEndProperty();
 
             bool enterChildren = true;
+            bool isCustomGatekeeper = IsCustomGatekeeperMode(property);
 
             while (iterator.NextVisible(enterChildren) && !SerializedProperty.EqualContents(iterator, endProperty))
             {
                 enterChildren = false;
+
+                if (iterator.name == "customGatekeeperUrl" && !isCustomGatekeeper)
+                    continue;
+
                 height += EditorGUI.GetPropertyHeight(iterator, true) + EditorGUIUtility.standardVerticalSpacing;
             }
 
             return height;
         }
 
+        private static bool IsCustomGatekeeperMode(SerializedProperty property)
+        {
+            SerializedProperty gatekeeperMode = property.FindPropertyRelative("gatekeeperMode");
+            Assert.IsNotNull(gatekeeperMode, "Failed to find 'gatekeeperMode' property.");
+            return gatekeeperMode.intValue == (int)GatekeeperMode.Custom;
+        }
+
         private static string? FindCreatorHubPath()
         {
             // Check default path

Explorer/Assets/DCL/Infrastructure/SceneRunner/SceneFactory.cs

@@ -225,7 +225,8 @@ private async UniTask<ISceneFacade> CreateSceneAsync(ISceneData sceneData, IJsAp
                     sceneData,
                     realmData,
                     portableExperiencesController,
-                    remoteMetadata
+                    remoteMetadata,
+                    messagePipesHub
                 );
             }
             else
@@ -253,7 +254,8 @@ private async UniTask<ISceneFacade> CreateSceneAsync(ISceneData sceneData, IJsAp
                     sceneData,
                     realmData,
                     portableExperiencesController,
-                    remoteMetadata
+                    remoteMetadata,
+                    messagePipesHub
                 );
             }