Merge pull request #6754 from decentraland/chore/sync

chore: sync main to dev

Author: m3taphysics

Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs

@@ -55,6 +55,7 @@ public static class FeatureFlagsStrings
         public const string HEAD_SYNC = "alfa-head-sync";
         public const string PRIVATE_CHAT_REQUIRES_TOPIC = "alfa-private-chat-requires-topic";
         public const string DISCOVER = "alfa-discover";
+        public const string STOP_ON_DUPLICATE_IDENTITY = "alfa-stop-on-duplicate-identity";
 
         public static class Endpoints
         {

Explorer/Assets/DCL/FeatureFlags/FeaturesRegistry.cs

@@ -39,6 +39,7 @@ public FeaturesRegistry(
                 [FeatureId.CHAT_MESSAGE_RATE_LIMIT] = featureFlags.IsEnabled(FeatureFlagsStrings.CHAT_MESSAGE_RATE_LIMIT),
                 [FeatureId.CHAT_MESSAGE_BUFFER] = featureFlags.IsEnabled(FeatureFlagsStrings.CHAT_MESSAGE_BUFFER_CONFIG),
                 [FeatureId.HEAD_SYNC] = featureFlags.IsEnabled(FeatureFlagsStrings.HEAD_SYNC) || (appArgs.HasDebugFlag() && appArgs.HasFlag(AppArgsFlags.HEAD_SYNC)) || Application.isEditor,
+                [FeatureId.STOP_ON_DUPLICATE_IDENTITY] = featureFlags.IsEnabled(FeatureFlagsStrings.STOP_ON_DUPLICATE_IDENTITY),
                 [FeatureId.PRIVATE_CHAT_REQUIRES_TOPIC] = featureFlags.IsEnabled(FeatureFlagsStrings.PRIVATE_CHAT_REQUIRES_TOPIC),
                 // Note: COMMUNITIES feature is not cached here because it depends on user identity
             });
@@ -143,6 +144,7 @@ public enum FeatureId
         CHAT_MESSAGE_RATE_LIMIT,
         CHAT_MESSAGE_BUFFER,
         HEAD_SYNC,
+        STOP_ON_DUPLICATE_IDENTITY,
         PRIVATE_CHAT_REQUIRES_TOPIC,
     }
 }

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

@@ -993,10 +993,13 @@ await MapRendererContainer
                     mvcManager,
                     thumbnailProvider,
                     identityCache),
-                new DuplicateIdentityPlugin(roomHub, mvcManager, assetsProvisioner),
                 new AvatarLocomotionOverridesGlobalPlugin(),
             };
 
+            // ReSharper disable once MethodHasAsyncOverloadWithCancellation
+            if (FeaturesRegistry.Instance.IsEnabled(FeatureId.STOP_ON_DUPLICATE_IDENTITY))
+                globalPlugins.Add(new DuplicateIdentityPlugin(roomHub, mvcManager, assetsProvisioner));
+
             // ReSharper disable once MethodHasAsyncOverloadWithCancellation
             if (FeaturesRegistry.Instance.IsEnabled(FeatureId.VOICE_CHAT))
                 globalPlugins.Add(

Explorer/Assets/DCL/Multiplayer/Connections/DCL.Multiplayer.Connections.asmdef

@@ -20,8 +20,9 @@
         "GUID:9e314663ce958b746873cb22d57ede55",
         "GUID:d8b63aba1907145bea998dd612889d6b",
         "GUID:1087662aaf1c5462baa91fb9484296fd",
-        "GUID:45f6fff651a0a514f8edfdaf9cce45af",
-        "GUID:8baf705856414dad9a73b3f382f1bc8b"
+        "GUID:8baf705856414dad9a73b3f382f1bc8b",
+        "GUID:ace653ac543d483ba8abee112a3ba2a6",
+        "GUID:45f6fff651a0a514f8edfdaf9cce45af"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Explorer/Assets/DCL/Multiplayer/Connections/Rooms/Connective/ConnectiveRoom.cs

@@ -1,6 +1,6 @@
 using Cysharp.Threading.Tasks;
 using DCL.Diagnostics;
-using DCL.Multiplayer.Connections.Audio;
+using DCL.FeatureFlags;
 using DCL.Multiplayer.Connections.Credentials;
 using DCL.WebRequests;
 using LiveKit.Internal;
@@ -53,17 +53,14 @@ public abstract class ConnectiveRoom : IConnectiveRoom
     {
         private static readonly TimeSpan HEARTBEATS_INTERVAL = TimeSpan.FromSeconds(1);
         private static readonly TimeSpan CONNECTION_LOOP_RECOVER_INTERVAL = TimeSpan.FromSeconds(5);
-        private readonly string logPrefix;
 
+        private readonly string logPrefix;
         private readonly InteriorRoom room = new ();
-
         private readonly Atomic<IConnectiveRoom.ConnectionLoopHealth> connectionLoopHealth = new (IConnectiveRoom.ConnectionLoopHealth.Stopped);
-
         private readonly Atomic<AttemptToConnectState> attemptToConnectState = new (AttemptToConnectState.NONE);
-
         private readonly Atomic<IConnectiveRoom.State> roomState = new (IConnectiveRoom.State.Stopped);
-
         private readonly IObjectPool<IRoom> roomPool;
+        private readonly bool isDuplicateIdentityStopFeatureEnabled;
 
         private CancellationTokenSource? cancellationTokenSource;
         private bool isDuplicateIdentityDetected;
@@ -72,6 +69,8 @@ public abstract class ConnectiveRoom : IConnectiveRoom
 
         protected ConnectiveRoom()
         {
+            isDuplicateIdentityStopFeatureEnabled = FeaturesRegistry.Instance.IsEnabled(FeatureId.STOP_ON_DUPLICATE_IDENTITY);
+
             logPrefix = GetType().Name;
 
             roomPool = new ObjectPool<IRoom>(() =>
@@ -166,9 +165,10 @@ private async UniTaskVoid RunAsync(CancellationToken token)
                 await UniTask.Delay(HEARTBEATS_INTERVAL, cancellationToken: token);
             }
 
-            if (isDuplicateIdentityDetected)
+
+            if (isDuplicateIdentityDetected && isDuplicateIdentityStopFeatureEnabled)
             {
-                ReportHub.Log(ReportCategory.LIVEKIT, $"{logPrefix} - DuplicateIdentity detected, stopping reconnection loop");
+                ReportHub.LogWarning(ReportCategory.LIVEKIT, $"{logPrefix} - DuplicateIdentity detected, stopping reconnection loop");
                 connectionLoopHealth.Set(IConnectiveRoom.ConnectionLoopHealth.Stopped);
                 attemptToConnectState.Set(AttemptToConnectState.NO_CONNECTION_REQUIRED);
             }
@@ -294,13 +294,13 @@ protected async UniTask<RoomSelection> TryConnectToRoomAsync(string connectionSt
             return (connectResult, roomSelection);
         }
 
-        private void OnConnectionUpdated(IRoom room, ConnectionUpdate connectionUpdate, DisconnectReason? disconnectReason = null)
+        private void OnConnectionUpdated(IRoom _, ConnectionUpdate connectionUpdate, DisconnectReason? disconnectReason)
         {
-            if (connectionUpdate == ConnectionUpdate.Disconnected && disconnectReason == DisconnectReason.DuplicateIdentity)
+            if (connectionUpdate == ConnectionUpdate.Disconnected && disconnectReason is DisconnectReason.DuplicateIdentity && isDuplicateIdentityStopFeatureEnabled)
             {
                 isDuplicateIdentityDetected = true;
                 cancellationTokenSource?.SafeCancelAndDispose();
-                ReportHub.Log(ReportCategory.LIVEKIT, $"{logPrefix} - DuplicateIdentity disconnect reason received, interrupting reconnection attempts");
+                ReportHub.LogWarning(ReportCategory.LIVEKIT, $"{logPrefix} - DuplicateIdentity disconnect reason received, interrupting reconnection attempts");
             }
         }
     }