Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,14 @@ public static CommsContainer Create(
IAppArgs appArgs,
bool isolateScenesCommunication,
bool enableAnalytics,
bool localSceneDevelopment)
bool localSceneDevelopment,
string? localSceneDevelopmentRealm = null)
{
var entityParticipantTable = new EntityParticipantTable();
var movementInbox = new MovementInbox(entityParticipantTable, globalWorld);

SceneRoomLogMetaDataSource playSceneMetaDataSource = new SceneRoomMetaDataSource(staticContainer.RealmData, staticContainer.CharacterContainer.Transform, globalWorld, isolateScenesCommunication, bootstrapContainer.DecentralandUrlsSource).WithLog();
SceneRoomLogMetaDataSource localDevelopmentMetaDataSource = new LocalSceneDevelopmentSceneRoomMetaDataSource(staticContainer.WebRequestsContainer.WebRequestController).WithLog();
SceneRoomLogMetaDataSource localDevelopmentMetaDataSource = new LocalSceneDevelopmentSceneRoomMetaDataSource(staticContainer.WebRequestsContainer.WebRequestController, localSceneDevelopmentRealm).WithLog();

Option<HardwareFingerprintProvider> hardwareFingerprintProvider = FeaturesRegistry.Instance.IsEnabled(FeatureId.HardwareFingerprint)
? Option<HardwareFingerprintProvider>.Some(new HardwareFingerprintProvider())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public override void Dispose()

ExposedGlobalDataContainer exposedGlobalDataContainer = staticContainer.ExposedGlobalDataContainer;

var nftInfoAPIClient = new OpenSeaAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
var nftInfoApiClient = new OpenSeaAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
var characterPreviewFactory = new CharacterPreviewFactory(staticContainer.ComponentsContainer.ComponentPoolsRegistry, appArgs);
UnityAppWebBrowser webBrowser = bootstrapContainer.WebBrowser;

Expand Down Expand Up @@ -234,7 +234,8 @@ public override void Dispose()
appArgs,
dynamicWorldParams.IsolateScenesCommunication,
dynamicWorldParams.EnableAnalytics,
localSceneDevelopment);
localSceneDevelopment,
dynamicWorldParams.LocalSceneDevelopmentRealm);

IFriendsEventBus friendsEventBus = new DefaultFriendsEventBus();

Expand Down Expand Up @@ -425,15 +426,15 @@ await MapRendererContainer
AudioMixer generalAudioMixer = (await assetsProvisioner.ProvideMainAssetAsync(dynamicSettings.GeneralAudioMixer, ct)).Value;
var audioMixerVolumesController = new AudioMixerVolumesController(generalAudioMixer);

var badgesAPIClient = new BadgesAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
MarketplaceCreditsAPIClient marketplaceCreditsAPIClient = new MarketplaceCreditsAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
var badgesApiClient = new BadgesAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
MarketplaceCreditsAPIClient marketplaceCreditsApiClient = new MarketplaceCreditsAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);

var marketplaceShopAPIClient = new MarketplaceShopAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
var marketplaceShopApiClient = new MarketplaceShopAPIClient(staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource);
var creditsChainConfig = new CreditsChainConfig(bootstrapContainer.Environment);

ICreditsPurchaseService creditsPurchaseService = new CreditsPurchaseService(
marketplaceShopAPIClient,
marketplaceCreditsAPIClient,
marketplaceShopApiClient,
marketplaceCreditsApiClient,
new CreditsManagerMetaTxRelayer(dynamicWorldDependencies.CompositeWeb3Provider, staticContainer.WebRequestsContainer.WebRequestController, bootstrapContainer.DecentralandUrlsSource, creditsChainConfig),
new PolygonSettlementPoller(dynamicWorldDependencies.CompositeWeb3Provider, creditsChainConfig),
new ManaUsdRateReader(dynamicWorldDependencies.CompositeWeb3Provider, creditsChainConfig),
Expand Down Expand Up @@ -672,7 +673,7 @@ await MapRendererContainer
springBoneSimulationSettings,
voiceChatContainer.JoinedCommunitiesVoiceLiveTracker,
profileContainer.PendingTransferService,
marketplaceCreditsAPIClient
marketplaceCreditsApiClient
),
profileContainer.CreateGiftingPlugin(staticContainer, bootstrapContainer, assetsProvisioner, uiShellContainer, wearableContainer, chatContainer.ChatEventBus, identityCache),
new CharacterPreviewPlugin(staticContainer.ComponentsContainer.ComponentPoolsRegistry, assetsProvisioner, staticContainer.CacheCleaner),
Expand Down Expand Up @@ -705,7 +706,7 @@ await MapRendererContainer
else
chatContainer.ChatMessagesBus.SendWithUtcNowTimestamp(ChatChannel.NEARBY_CHANNEL, $"/{ChatCommandsUtils.COMMAND_GOTO} {realmUrl}", ChatMessageOrigin.RestrictedActionApi);
}),
new NftPromptPlugin(assetsProvisioner, webBrowser, uiShellContainer.MvcManager, nftInfoAPIClient, staticContainer.ImageControllerProvider, uiShellContainer.Cursor),
new NftPromptPlugin(assetsProvisioner, webBrowser, uiShellContainer.MvcManager, nftInfoApiClient, staticContainer.ImageControllerProvider, uiShellContainer.Cursor),
staticContainer.CharacterContainer.CreateGlobalPlugin(),
staticContainer.QualityContainer.CreatePlugin(),
multiplayerContainer.CreatePlugin(staticContainer, assetsProvisioner, debugBuilder, commsContainer, dynamicSettings.MultiplayerDebugSettings, appArgs),
Expand All @@ -729,7 +730,7 @@ await MapRendererContainer
profileContainer.SelfProfile,
webBrowser,
bootstrapContainer.DecentralandUrlsSource,
badgesAPIClient,
badgesApiClient,
staticContainer.InputBlock,
commsContainer.RemoteMetadata,
cameraReelContainer.StorageService,
Expand All @@ -752,13 +753,13 @@ await MapRendererContainer
wearableContainer.ThumbnailProvider,
staticContainer.ImageControllerProvider,
staticContainer.WebRequestsContainer.WebRequestController,
marketplaceShopAPIClient
marketplaceShopApiClient
),
new CreditPurchasePlugin(
assetsProvisioner,
uiShellContainer.MvcManager,
creditsPurchaseService,
marketplaceCreditsAPIClient,
marketplaceCreditsApiClient,
identityCache,
webBrowser,
staticContainer.ImageControllerProvider),
Expand Down Expand Up @@ -944,7 +945,7 @@ await MapRendererContainer
staticContainer.LoadingStatus,
hyperlinkTextFormatter,
staticContainer.ImageControllerProvider,
marketplaceCreditsAPIClient));
marketplaceCreditsApiClient));
}

if (communitiesContainer.IncludeCommunities)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@
using UnityEngine;
using UnityEngine.Networking;

// ReSharper disable InconsistentNaming
namespace DCL.Multiplayer.Connections.GateKeeper.Meta
{
public class LocalSceneDevelopmentSceneRoomMetaDataSource : ISceneRoomMetaDataSource
{
private readonly IWebRequestController webRequestController;
private readonly string realm;

public LocalSceneDevelopmentSceneRoomMetaDataSource(IWebRequestController webRequestController)
// realm is the local scene development realm the client was launched with (the `realm` deep link
// parameter). The scene server only listens on the port it was started with, so falling back to the
// default would make this source unreachable for any `sdk-commands start --port` but the default one.
public LocalSceneDevelopmentSceneRoomMetaDataSource(IWebRequestController webRequestController, string? realm = null)
{
this.webRequestController = webRequestController;
this.realm = string.IsNullOrWhiteSpace(realm) ? IRealmNavigator.LOCALHOST : realm;
}

public bool ScenesCommunicationIsIsolated => false;
Expand All @@ -27,7 +33,7 @@ public MetaData.Input GetMetadataInput() =>

public async UniTask<Result<MetaData>> MetaDataAsync(MetaData.Input input, CancellationToken token)
{
URLDomain baseUrl = URLDomain.FromString(IRealmNavigator.LOCALHOST);
URLDomain baseUrl = URLDomain.FromString(realm);
URLAddress sceneDefinitionEndpoint = baseUrl.Append(URLSubdirectory.FromString("scene.json"));
URLAddress idEndpoint = baseUrl.Append(URLSubdirectory.FromString("content/entities/active"));

Expand Down
Loading