feat: asset bundle fallback

Explorer/Assets/DCL/Browser/DecentralandUrls/DecentralandUrl.cs

@@ -45,5 +45,7 @@ public enum DecentralandUrl
         CameraReelImages,
         CameraReelPlaces,
         CameraReelLink,
+        AssetBundleRegistry
+
     }
 }

Explorer/Assets/DCL/Browser/DecentralandUrls/DecentralandUrlsSource.cs

@@ -102,6 +102,7 @@ private static string RawUrl(DecentralandUrl decentralandUrl) =>
                 DecentralandUrl.CameraReelImages => $"https://camera-reel-service.decentraland.{ENV}/api/images",
                 DecentralandUrl.CameraReelPlaces => $"https://camera-reel-service.decentraland.{ENV}/api/places",
                 DecentralandUrl.CameraReelLink => $"https://reels.decentraland.{ENV}",
+                DecentralandUrl.AssetBundleRegistry => $"https://asset-bundle-registry.decentraland.{ENV}",
                 _ => throw new ArgumentOutOfRangeException(nameof(decentralandUrl), decentralandUrl, null!)
             };
     }

Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs

@@ -20,6 +20,7 @@ public static class FeatureFlagsStrings
         public const string SKYBOX_SETTINGS = "alfa-skybox-settings";
         public const string SKYBOX_SETTINGS_VARIANT = "settings";
         public const string VIDEO_PRIORITIZATION = "alfa-video-prioritization";
+        public const string ASSET_BUNDLE_FALLBACK = "alfa-asset-bundle-fallback";
 
         public const string CAMERA_REEL = "alpha-camera-reel";
     }

Explorer/Assets/DCL/InWorldCamera/InWorldCamera/Playground/ScreenRecorderTester.cs

@@ -15,6 +15,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
+using DCL.Browser.DecentralandUrls;
+using DCL.Multiplayer.Connections.DecentralandUrls;
 using UnityEngine;
 using Utility;
 
@@ -72,6 +74,7 @@ private SelfProfile CreateProfile()
                         web3IdentityCache,
                         IWebRequestController.DEFAULT,
                         URLDomain.FromString("TestRealm"),
+                        URLDomain.EMPTY,
                         new ServerAbout(
                             lambdas: new ContentEndpoint(profileUrl)
                         )

Explorer/Assets/DCL/InWorldCamera/InWorldCamera/ScreencaptureCamera.asmdef

@@ -25,7 +25,8 @@
         "GUID:e169fa6683c924c7e99a85981a91d953",
         "GUID:9ca29a7d75ab84bab806a20bbd350fd8",
         "GUID:029c1c1b674aaae47a6841a0b89ad80e",
-        "GUID:e7751264a6735a942a64770d71eb49e0"
+        "GUID:e7751264a6735a942a64770d71eb49e0",
+        "GUID:91cf8206af184dac8e30eb46747e9939"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Explorer/Assets/DCL/Ipfs/DCL.Ipfs.asmdef

@@ -8,7 +8,9 @@
         "GUID:f51ebe6a0ceec4240a699833d6309b23",
         "GUID:5ab29fa8ae5769b49ab29e390caca7a4",
         "GUID:4a12c0b1b77ec6b418a8d7bd5c925be3",
-        "GUID:166b65e6dfc848bb9fb075f53c293a38"
+        "GUID:166b65e6dfc848bb9fb075f53c293a38",
+        "GUID:91cf8206af184dac8e30eb46747e9939",
+        "GUID:ace653ac543d483ba8abee112a3ba2a6"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Explorer/Assets/DCL/Ipfs/IIpfsRealm.cs

@@ -12,6 +12,7 @@ public interface IIpfsRealm
         public URLDomain LambdasBaseUrl { get; }
         public IReadOnlyList<string> SceneUrns { get; }
         public URLDomain EntitiesActiveEndpoint { get; }
+        public URLDomain AssetBundleRegistry { get; }
 
         UniTask PublishAsync<T>(EntityDefinitionGeneric<T> entity, CancellationToken ct, IReadOnlyDictionary<string, byte[]>? contentFiles = null);
 

Explorer/Assets/DCL/Ipfs/InvalidIpfsRealm.cs

@@ -23,6 +23,7 @@ public static InvalidIpfsRealm Instance
         public URLDomain LambdasBaseUrl => URLDomain.EMPTY;
         public IReadOnlyList<string> SceneUrns { get; } = new List<string>();
         public URLDomain EntitiesActiveEndpoint => URLDomain.EMPTY;
+        public URLDomain AssetBundleRegistry => URLDomain.EMPTY;
 
         public UniTask PublishAsync<T>(EntityDefinitionGeneric<T> entity, CancellationToken ct, IReadOnlyDictionary<string, byte[]>? contentFiles = null) =>
             throw new NotSupportedException();

Explorer/Assets/DCL/Ipfs/IpfsRealm.cs

@@ -25,12 +25,15 @@ public class IpfsRealm : IIpfsRealm, IEquatable<IpfsRealm>
         public URLDomain ContentBaseUrl { get; }
         public URLDomain LambdasBaseUrl { get; }
         public URLDomain EntitiesActiveEndpoint { get; }
+        public URLDomain AssetBundleRegistry { get; }
 
         public IReadOnlyList<string> SceneUrns => sceneUrns;
 
         public IpfsRealm(IWeb3IdentityCache web3IdentityCache,
             IWebRequestController webRequestController,
-            URLDomain realmName, ServerAbout? serverAbout = null)
+            URLDomain realmName,
+            URLDomain assetBundleRegistry,
+            ServerAbout? serverAbout = null)
         {
             this.web3IdentityCache = web3IdentityCache;
             this.webRequestController = webRequestController;
@@ -48,13 +51,16 @@ public IpfsRealm(IWeb3IdentityCache web3IdentityCache,
                 //Note: Content url requires the subdirectory content, but the actives endpoint requires the base one.
                 EntitiesActiveEndpoint = URLBuilder.Combine(ContentBaseUrl, URLSubdirectory.FromString("entities/active"));
                 ContentBaseUrl = URLBuilder.Combine(ContentBaseUrl, URLSubdirectory.FromString("contents/"));
+
+                AssetBundleRegistry = assetBundleRegistry.IsEmpty ? EntitiesActiveEndpoint : assetBundleRegistry;
             }
             else
             {
                 sceneUrns = new List<string>();
                 entitiesBaseUrl = URLBuilder.Combine(CatalystBaseUrl, URLSubdirectory.FromString("content/entities/"));
                 ContentBaseUrl = URLBuilder.Combine(CatalystBaseUrl, URLSubdirectory.FromString("content/contents/"));
                 EntitiesActiveEndpoint = URLBuilder.Combine(CatalystBaseUrl, URLSubdirectory.FromString("content/entities/active"));
+                AssetBundleRegistry = assetBundleRegistry.IsEmpty ? EntitiesActiveEndpoint : assetBundleRegistry;
             }
         }
 

Explorer/Assets/DCL/Ipfs/LocalIpfsRealm.cs

@@ -16,11 +16,13 @@ public class LocalIpfsRealm : IIpfsRealm
         public URLDomain LambdasBaseUrl { get; }
         public IReadOnlyList<string> SceneUrns => Array.Empty<string>();
         public URLDomain EntitiesActiveEndpoint => URLDomain.EMPTY;
+        public URLDomain AssetBundleRegistry { get; }
 
         public LocalIpfsRealm(URLDomain fullPath)
         {
             CatalystBaseUrl = fullPath;
             ContentBaseUrl = fullPath;
+            AssetBundleRegistry = fullPath;
             LambdasBaseUrl = URLDomain.FromString("https://peer.decentraland.org/explorer/");
         }
 

Explorer/Assets/DCL/Ipfs/LogIpfsRealm.cs

@@ -77,6 +77,18 @@ public URLDomain EntitiesActiveEndpoint
             }
         }
 
+        public URLDomain AssetBundleRegistry
+        {
+            get
+            {
+                var result = origin.AssetBundleRegistry;
+                ReportHub
+                    .WithReport(ReportCategory.REALM)
+                    .Log($"IpfsRealm AssetBundleRegistry requested, result: {result}");
+                return result;
+            }
+        }
+
         public async UniTask PublishAsync<T>(EntityDefinitionGeneric<T> entity, CancellationToken ct, IReadOnlyDictionary<string, byte[]>? contentFiles = null)
         {
             var sb = new StringBuilder();

Explorer/Assets/DCL/Multiplayer/Connections/GateKeeper/Meta/SceneRoomMetaDataSource.cs

@@ -52,7 +52,8 @@ public async UniTask<MetaData> MetaDataAsync(MetaData.Input input, CancellationT
             // TODO: instead of making a new request, Room Change request should be initiated when the scene definition is loaded by ECS,
             // currently these processes are completely separated
             var promise = AssetPromise<SceneDefinitions, GetSceneDefinitionList>.Create(world,
-                new GetSceneDefinitionList(entityDefinitionList, pointersList, new CommonLoadingArguments(realmData.Ipfs.EntitiesActiveEndpoint)),
+                new GetSceneDefinitionList(entityDefinitionList, pointersList,
+                    new CommonLoadingArguments(realmData.Ipfs.AssetBundleRegistry)),
                 PartitionComponent.TOP_PRIORITY);
 
             promise = await promise.ToUniTaskAsync(world, cancellationToken: token);

Explorer/Assets/DCL/ParcelsService/RetrieveSceneFromVolatileWorld.cs

@@ -43,7 +43,8 @@ public RetrieveSceneFromVolatileWorld(IRealmData realmData)
             pointersList.Value.Add(parcel.ToInt2());
 
             var promise = AssetPromise<SceneDefinitions, GetSceneDefinitionList>.Create(World,
-                new GetSceneDefinitionList(targetCollection.Value, pointersList.Value, new CommonLoadingArguments(realmIpfs.EntitiesActiveEndpoint)),
+                new GetSceneDefinitionList(targetCollection.Value, pointersList.Value,
+                    new CommonLoadingArguments(realmIpfs.AssetBundleRegistry)),
                 PartitionComponent.TOP_PRIORITY);
 
             promise = await promise.ToUniTaskAsync(World, cancellationToken: ct);

Explorer/Assets/DCL/Profiles/DCL.Profiles.asmdef

@@ -21,7 +21,8 @@
         "GUID:166b65e6dfc848bb9fb075f53c293a38",
         "GUID:3c7b57a14671040bd8c549056adc04f5",
         "GUID:ca4e81cdd6a34d1aa54c32ad41fc5b3b",
-        "GUID:543b8f091a5947a3880b7f2bca2358bd"
+        "GUID:543b8f091a5947a3880b7f2bca2358bd",
+        "GUID:91cf8206af184dac8e30eb46747e9939"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Explorer/Assets/DCL/Profiles/Self/Playground/SelfProfilePlayground.cs

@@ -11,6 +11,8 @@
 using ECS;
 using System.Collections.Generic;
 using System.Threading;
+using DCL.Browser.DecentralandUrls;
+using DCL.Multiplayer.Connections.DecentralandUrls;
 using UnityEngine;
 
 namespace DCL.Profiles.Self.Playground
@@ -39,6 +41,7 @@ private async UniTaskVoid ExecuteAsync(CancellationToken ct)
                                     web3IdentityCache,
                                     IWebRequestController.DEFAULT,
                                     URLDomain.FromString(url),
+                                    URLDomain.EMPTY,
                                     new ServerAbout(
                                         lambdas: new ContentEndpoint(url)
                                     )

Explorer/Assets/Scripts/ECS/SceneLifeCycle/IncreasingRadius/LoadPointersByIncreasingRadiusSystem.cs

@@ -127,7 +127,7 @@ private void StartLoadingFromVolatilePointers(ref RealmComponent realm, ref Vola
             volatileScenePointers.ActivePromise
                 = AssetPromise<SceneDefinitions, GetSceneDefinitionList>.Create(World,
                     new GetSceneDefinitionList(volatileScenePointers.RetrievedReusableList, input,
-                        new CommonLoadingArguments(realm.Ipfs.EntitiesActiveEndpoint)),
+                        new CommonLoadingArguments(realm.Ipfs.AssetBundleRegistry)),
                     volatileScenePointers.ActivePartitionComponent);
         }
 

Explorer/Assets/Scripts/ECS/SceneLifeCycle/Systems/LoadStaticPointersSystem.cs

@@ -35,7 +35,7 @@ private void ResolvePromise(ref RealmComponent realm, ref StaticScenePointers st
                 // start loading
                 staticScenePointers.Promise = AssetPromise<SceneDefinitions, GetSceneDefinitionList>.Create(World,
                     new GetSceneDefinitionList(new List<SceneEntityDefinition>(staticScenePointers.Value.Count), staticScenePointers.Value,
-                        new CommonLoadingArguments(realm.Ipfs.EntitiesActiveEndpoint)), PartitionComponent.TOP_PRIORITY);
+                        new CommonLoadingArguments(realm.Ipfs.AssetBundleRegistry)), PartitionComponent.TOP_PRIORITY);
             }
             else
             {

Explorer/Assets/Scripts/ECS/SceneLifeCycle/Tests/TestIpfsRealm.cs

@@ -14,6 +14,7 @@ public class TestIpfsRealm : IIpfsRealm
         public URLDomain LambdasBaseUrl { get; }
         public IReadOnlyList<string> SceneUrns { get; }
         public URLDomain EntitiesActiveEndpoint { get; }
+        public URLDomain AssetBundleRegistry { get; }
 
         public URLDomain CatalystBaseUrl { get; }
         public URLDomain ContentBaseUrl { get; }
@@ -24,6 +25,7 @@ public TestIpfsRealm(string[] sceneUrns = null)
             CatalystBaseUrl = URLDomain.FromString($"file://{Application.dataPath + "/../TestResources/"}");
             ContentBaseUrl = CatalystBaseUrl.Append(URLSubdirectory.FromString("Content/"));
             EntitiesActiveEndpoint = URLDomain.FromString($"{ContentBaseUrl.Value}ActiveEntitiesByPointer.json");
+            AssetBundleRegistry = URLDomain.FromString($"{ContentBaseUrl.Value}ActiveEntitiesByPointer.json");
             LambdasBaseUrl = URLDomain.EMPTY;
         }
 

Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs

@@ -303,7 +303,9 @@ IMultiPool MultiPoolFactory() =>
                 debugBuilder,
                 staticContainer.ComponentsContainer.ComponentPoolsRegistry
                                .GetReferenceTypePool<PartitionComponent>(),
-                localSceneDevelopment);
+                localSceneDevelopment,
+                bootstrapContainer.DecentralandUrlsSource,
+                staticContainer.FeatureFlagsCache);
 
             container.reloadSceneController = new ECSReloadScene(staticContainer.ScenesCache, globalWorld, playerEntity, localSceneDevelopment);
 

Explorer/Assets/Scripts/Global/Dynamic/PortableExperiences/ECSPortableExperiencesController.cs

@@ -17,6 +17,7 @@
 using ECS.LifeCycle.Components;
 using SceneRunner.Scene;
 using System.Linq;
+using DCL.Multiplayer.Connections.DecentralandUrls;
 
 namespace PortableExperiences.Controller
 {
@@ -28,6 +29,7 @@ public class ECSPortableExperiencesController : IPortableExperiencesController
         private readonly World globalWorld;
         private readonly List<IPortableExperiencesController.SpawnResponse> spawnResponsesList = new ();
         private readonly FeatureFlagsCache featureFlagsCache;
+        private readonly IDecentralandUrlsSource urlsSources;
         public Dictionary<ENS, Entity> PortableExperienceEntities { get; } = new ();
 
 
@@ -36,13 +38,15 @@ public ECSPortableExperiencesController(
             IWeb3IdentityCache web3IdentityCache,
             IWebRequestController webRequestController,
             IScenesCache scenesCache,
-            FeatureFlagsCache featureFlagsCache)
+            FeatureFlagsCache featureFlagsCache,
+            IDecentralandUrlsSource urlsSources)
         {
             this.globalWorld = globalWorld;
             this.web3IdentityCache = web3IdentityCache;
             this.webRequestController = webRequestController;
             this.scenesCache = scenesCache;
             this.featureFlagsCache = featureFlagsCache;
+            this.urlsSources = urlsSources;
         }
 
         public async UniTask<IPortableExperiencesController.SpawnResponse> CreatePortableExperienceByEnsAsync(ENS ens, CancellationToken ct, bool isGlobalPortableExperience = false, bool force = false)
@@ -82,9 +86,16 @@ public ECSPortableExperiencesController(
                 throw new Exception($"Scene not Available in provided Portable Experience with ens: {ens}");
             }
 
+            var assetBundleRegistry =
+                featureFlagsCache.Configuration.IsEnabled(FeatureFlagsStrings.ASSET_BUNDLE_FALLBACK)
+                    ? URLBuilder.Combine(URLDomain.FromString(urlsSources.Url(DecentralandUrl.AssetBundleRegistry)),
+                        URLSubdirectory.FromString("entities/active"))
+                    : URLDomain.EMPTY;
+
             var realmData = new RealmData();
             realmData.Reconfigure(
-                new IpfsRealm(web3IdentityCache, webRequestController, portableExperiencePath, result),
+                new IpfsRealm(web3IdentityCache, webRequestController, portableExperiencePath, assetBundleRegistry,
+                    result),
                 result.configurations.realmName.EnsureNotNull("Realm name not found"),
                 result.configurations.networkId,
                 result.comms?.adapter ?? string.Empty,

Explorer/Assets/Scripts/Global/Dynamic/PortableExperiences/PortableExperiencesController.asmdef

@@ -14,7 +14,8 @@
         "GUID:101b8b6ebaf64668909b49c4b7a1420d",
         "GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
         "GUID:ace653ac543d483ba8abee112a3ba2a6",
-        "GUID:3640f3c0b42946b0b8794a1ed8e06ca5"
+        "GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
+        "GUID:91cf8206af184dac8e30eb46747e9939"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Explorer/Assets/Scripts/Global/Dynamic/RealmController.cs

@@ -23,6 +23,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using DCL.DebugUtilities;
+using DCL.FeatureFlags;
+using DCL.Multiplayer.Connections.DecentralandUrls;
 using ECS.SceneLifeCycle.Realm;
 using Unity.Mathematics;
 
@@ -49,13 +51,15 @@ public class RealmController : IGlobalRealmController
         private readonly SceneAssetLock sceneAssetLock;
         private readonly IComponentPool<PartitionComponent> partitionComponentPool;
         private readonly bool isLocalSceneDevelopment;
+        private readonly IDecentralandUrlsSource urlsSource;
 
         private GlobalWorld? globalWorld;
         private Entity realmEntity;
 
         public IRealmData RealmData => realmData;
 
         private readonly RealmNavigatorDebugView realmNavigatorDebugView;
+        private readonly FeatureFlagsCache featureFlagsCache;
 
         public RealmType Type
         {
@@ -95,8 +99,9 @@ public RealmController(
             SceneAssetLock sceneAssetLock,
             IDebugContainerBuilder debugContainerBuilder,
             IComponentPool<PartitionComponent> partitionComponentPool,
-            bool isLocalSceneDevelopment
-        )
+            bool isLocalSceneDevelopment,
+            IDecentralandUrlsSource urlsSource,
+            FeatureFlagsCache featureFlagsCache)
         {
             this.web3IdentityCache = web3IdentityCache;
             this.webRequestController = webRequestController;
@@ -110,6 +115,8 @@ bool isLocalSceneDevelopment
             this.sceneAssetLock = sceneAssetLock;
             this.partitionComponentPool = partitionComponentPool;
             this.isLocalSceneDevelopment = isLocalSceneDevelopment;
+            this.urlsSource = urlsSource;
+            this.featureFlagsCache = featureFlagsCache;
             realmNavigatorDebugView = new RealmNavigatorDebugView(debugContainerBuilder);
         }
 
@@ -129,8 +136,15 @@ public async UniTask SetRealmAsync(URLDomain realm, CancellationToken ct)
 
             string hostname = ResolveHostname(realm, result);
 
+
+            var assetBundleRegistry =
+                featureFlagsCache.Configuration.IsEnabled(FeatureFlagsStrings.ASSET_BUNDLE_FALLBACK)
+                    ? URLBuilder.Combine(URLDomain.FromString(urlsSource.Url(DecentralandUrl.AssetBundleRegistry)),
+                        URLSubdirectory.FromString("entities/active"))
+                    : URLDomain.EMPTY;
+
             realmData.Reconfigure(
-                new IpfsRealm(web3IdentityCache, webRequestController, realm, result),
+                new IpfsRealm(web3IdentityCache, webRequestController, realm, assetBundleRegistry, result),
                 result.configurations.realmName.EnsureNotNull("Realm name not found"),
                 result.configurations.networkId,
                 result.comms?.adapter ?? result.comms?.fixedAdapter ?? "offline:offline", //"offline property like in previous implementation"
@@ -185,7 +199,7 @@ await UniTask.WaitUntil(() => GlobalWorld.EcsWorld.TryGet(realmEntity, out fixed
 
             var promise = AssetPromise<SceneDefinitions, GetSceneDefinitionList>.Create(GlobalWorld.EcsWorld,
                 new GetSceneDefinitionList(new List<SceneEntityDefinition>(staticLoadPositions.Count), staticLoadPositions,
-                    new CommonLoadingArguments(RealmData.Ipfs.EntitiesActiveEndpoint)), PartitionComponent.TOP_PRIORITY);
+                    new CommonLoadingArguments(RealmData.Ipfs.AssetBundleRegistry)), PartitionComponent.TOP_PRIORITY);
 
             promise = await promise.ToUniTaskAsync(GlobalWorld.EcsWorld, cancellationToken: ct);
 

Explorer/Assets/Scripts/Global/StaticContainer.cs

@@ -203,7 +203,9 @@ await UniTask.WhenAll(
 
             container.PhysicsTickProvider = new PhysicsTickProvider();
             container.FeatureFlagsCache = new FeatureFlagsCache();
-            container.PortableExperiencesController = new ECSPortableExperiencesController(globalWorld, web3IdentityProvider, container.WebRequestsContainer.WebRequestController, container.ScenesCache, container.FeatureFlagsCache);
+            container.PortableExperiencesController = new ECSPortableExperiencesController(globalWorld,
+                web3IdentityProvider, container.WebRequestsContainer.WebRequestController, container.ScenesCache,
+                container.FeatureFlagsCache, decentralandUrlsSource);
 
             container.FeatureFlagsProvider = new HttpFeatureFlagsProvider(container.WebRequestsContainer.WebRequestController,
                 container.FeatureFlagsCache);