Chore: Streamline the architecture of Connective Rooms

Explorer/Assets/DCL/Multiplayer/Connections/Archipelago/Rooms/ArchipelagoIslandRoom.cs → Explorer/Assets/DCL/Multiplayer/Connections/Archipelago/Rooms/Archipelago/ArchipelagoIslandRoomStrategy.cs

@@ -1,84 +1,47 @@
-using Cysharp.Threading.Tasks;
+using Cysharp.Threading.Tasks;
 using DCL.Character;
 using DCL.Diagnostics;
-using DCL.Multiplayer.Connections.Archipelago.AdapterAddress.Current;
 using DCL.Multiplayer.Connections.Archipelago.LiveConnections;
 using DCL.Multiplayer.Connections.Archipelago.SignFlow;
+using DCL.Multiplayer.Connections.Rooms;
 using DCL.Multiplayer.Connections.Rooms.Connective;
 using DCL.Multiplayer.Connections.Typing;
 using DCL.Utilities.Extensions;
 using DCL.Web3.Identities;
-using LiveKit.Internal.FFIClients.Pools;
-using LiveKit.Internal.FFIClients.Pools.Memory;
-using LiveKit.Rooms;
 using System;
-using System.Buffers;
-using System.Net.WebSockets;
 using System.Threading;
 using UnityEngine;
 using Utility.Multithreading;
 
 namespace DCL.Multiplayer.Connections.Archipelago.Rooms
 {
-    public class ArchipelagoIslandRoom : IArchipelagoIslandRoom
+    internal class ArchipelagoIslandRoomStrategy : IRealmRoomStrategy
     {
         private readonly IWeb3IdentityCache web3IdentityCache;
         private readonly IArchipelagoSignFlow signFlow;
         private readonly ICharacterObject characterObject;
-        private readonly IConnectiveRoom connectiveRoom;
-        private readonly ICurrentAdapterAddress currentAdapterAddress;
+        private readonly string currentAdapterAddress;
 
-        private ConnectToRoomAsyncDelegate? connectToRoomAsyncDelegate;
+        public ConnectiveRoom ConnectiveRoom { get; }
 
-        public ArchipelagoIslandRoom(ICharacterObject characterObject, IWeb3IdentityCache web3IdentityCache, IMultiPool multiPool, ICurrentAdapterAddress currentAdapterAddress) : this(
-            web3IdentityCache,
-            new LiveConnectionArchipelagoSignFlow(
-                new WebSocketArchipelagoLiveConnection(
-                    () => new ClientWebSocket(),
-                    new ArrayMemoryPool(ArrayPool<byte>.Shared!)
-                ).WithLog(),
-                new ArrayMemoryPool(ArrayPool<byte>.Shared!),
-                multiPool
-            ).WithLog(),
-            characterObject,
-            currentAdapterAddress
-        ) { }
+        private ConnectToRoomAsyncDelegate? connectToRoomAsyncDelegate;
 
-        public ArchipelagoIslandRoom(
+        public ArchipelagoIslandRoomStrategy(
+            InteriorRoom sharedRoom,
             IWeb3IdentityCache web3IdentityCache,
             IArchipelagoSignFlow signFlow,
             ICharacterObject characterObject,
-            ICurrentAdapterAddress currentAdapterAddress
+            string currentAdapterAddress
         )
         {
             this.web3IdentityCache = web3IdentityCache;
             this.signFlow = signFlow;
             this.characterObject = characterObject;
             this.currentAdapterAddress = currentAdapterAddress;
 
-            connectiveRoom = new RenewableConnectiveRoom(
-                () => new ConnectiveRoom(
-                    PrewarmAsync,
-                    SendHeartbeatAsync
-                )
-            );
+            ConnectiveRoom = new ConnectiveRoom(sharedRoom, PrewarmAsync, SendHeartbeatAsync);
         }
 
-        public void Start() =>
-            connectiveRoom.Start();
-
-        public UniTask StopAsync() =>
-            UniTask.WhenAll(
-                //signFlow.DisconnectAsync(CancellationToken.None),
-                connectiveRoom.StopAsync()
-            );
-
-        public IConnectiveRoom.State CurrentState() =>
-            connectiveRoom.CurrentState();
-
-        public IRoom Room() =>
-            connectiveRoom.Room();
-
         private async UniTask PrewarmAsync(CancellationToken token)
         {
             await ConnectToArchipelagoAsync(token);
@@ -102,15 +65,14 @@ private async UniTask SendHeartbeatAsync(ConnectToRoomAsyncDelegate connectDeleg
 
         private void OnNewConnectionString(string connectionString, CancellationToken token)
         {
-            if (CurrentState() is IConnectiveRoom.State.Stopped) throw new InvalidOperationException("Room is not running");
+            if (ConnectiveRoom.CurrentState() is IConnectiveRoom.State.Stopped) throw new InvalidOperationException("Room is not running");
             connectToRoomAsyncDelegate.EnsureNotNull("Connection delegate is not passed yet");
             connectToRoomAsyncDelegate!(connectionString, token).Forget();
         }
 
         private async UniTask ConnectToArchipelagoAsync(CancellationToken token)
         {
-            string adapterUrl = await currentAdapterAddress.AdapterUrlAsync(token);
-            LightResult<string> welcomePeerId = await WelcomePeerIdAsync(adapterUrl, token);
+            LightResult<string> welcomePeerId = await WelcomePeerIdAsync(currentAdapterAddress, token);
             welcomePeerId.EnsureSuccess("Cannot authorize with current address and signature, peer id is invalid");
         }
 

Explorer/Assets/DCL/Multiplayer/Connections/Archipelago/Rooms/Fixed/FixedConnectiveRoom.cs → Explorer/Assets/DCL/Multiplayer/Connections/Archipelago/Rooms/Fixed/FixedConnectionRoomStrategy.cs

@@ -1,47 +1,39 @@
-using Cysharp.Threading.Tasks;
+using Cysharp.Threading.Tasks;
 using DCL.Diagnostics;
-using DCL.Multiplayer.Connections.Archipelago.AdapterAddress.Current;
+using DCL.Multiplayer.Connections.Rooms;
 using DCL.Multiplayer.Connections.Rooms.Connective;
 using DCL.WebRequests;
-using LiveKit.Rooms;
 using System;
 using System.Threading;
 using UnityEngine;
 
 namespace DCL.Multiplayer.Connections.Archipelago.Rooms.Fixed
 {
-    public class FixedConnectiveRoom : IConnectiveRoom
+    /// <summary>
+    /// No need for any abstractions - it's a unique behaviour that we can't replace
+    /// </summary>
+    internal class FixedConnectionRoomStrategy : IRealmRoomStrategy
     {
         private readonly IWebRequestController webRequests;
-        private readonly IConnectiveRoom connectiveRoom;
-        private readonly ICurrentAdapterAddress currentAdapterAddress;
+        private readonly string currentAdapterAddress;
 
-        public FixedConnectiveRoom(IWebRequestController webRequests, ICurrentAdapterAddress currentAdapterAddress)
+        public ConnectiveRoom ConnectiveRoom { get; }
+
+        public FixedConnectionRoomStrategy(InteriorRoom sharedRoom, IWebRequestController webRequests, string currentAdapterAddress)
         {
             this.webRequests = webRequests;
             this.currentAdapterAddress = currentAdapterAddress;
 
-            connectiveRoom = new ConnectiveRoom(
+            ConnectiveRoom = new ConnectiveRoom(
+                sharedRoom,
                 static _ => UniTask.CompletedTask,
                 RunConnectCycleStepAsync
             );
         }
 
-        public void Start() =>
-            connectiveRoom.Start();
-
-        public UniTask StopAsync() =>
-            connectiveRoom.StopAsync();
-
-        public IConnectiveRoom.State CurrentState() =>
-            connectiveRoom.CurrentState();
-
-        public IRoom Room() =>
-            connectiveRoom.Room();
-
         private async UniTask RunConnectCycleStepAsync(ConnectToRoomAsyncDelegate connectToRoomAsyncDelegate, CancellationToken token)
         {
-            if (connectiveRoom.CurrentState() is not IConnectiveRoom.State.Running)
+            if (ConnectiveRoom.CurrentState() is not IConnectiveRoom.State.Running)
             {
                 string connectionString = await ConnectionStringAsync(token);
                 await connectToRoomAsyncDelegate(connectionString, token);
@@ -50,9 +42,8 @@ private async UniTask RunConnectCycleStepAsync(ConnectToRoomAsyncDelegate connec
 
         private async UniTask<string> ConnectionStringAsync(CancellationToken token)
         {
-            string adapterUrl = await currentAdapterAddress.AdapterUrlAsync(token);
             string metadata = FixedMetadata.Default.ToJson();
-            GenericPostRequest result = await webRequests.SignedFetchPostAsync(adapterUrl, metadata, token);
+            GenericPostRequest result = await webRequests.SignedFetchPostAsync(currentAdapterAddress, metadata, token);
             AdapterResponse response = await result.CreateFromJson<AdapterResponse>(WRJsonParser.Unity);
             string connectionString = response.fixedAdapter;
             ReportHub.WithReport(ReportCategory.ARCHIPELAGO_REQUEST).Log($"String is: {connectionString}");

Explorer/Assets/DCL/Multiplayer/Connections/Archipelago/Rooms/IRealmRoomStrategy.cs

@@ -0,0 +1,9 @@
+using DCL.Multiplayer.Connections.Rooms.Connective;
+
+namespace DCL.Multiplayer.Connections.Archipelago.Rooms
+{
+    internal interface IRealmRoomStrategy
+    {
+        ConnectiveRoom ConnectiveRoom { get; }
+    }
+}

Explorer/Assets/DCL/Multiplayer/Connections/Archipelago/Rooms/IRealmRoomsProvider.cs

@@ -0,0 +1,6 @@
+namespace DCL.Multiplayer.Connections.Archipelago.Rooms
+{
+    public interface IRealmRoomsProvider : IRoomProvider
+    {
+    }
+}