more fixes back to a good state hopefully

Author: dooly123

Basis Server/BasisNetworkCore/BasisServerConfiguration.cs

@@ -115,7 +115,7 @@ public class Configuration
     /// Clients fall back to keyframe+delta when this is false, and also whenever they hold a direct
     /// P2P session — see BasisNetworkAvatarCompressor for why.
     /// </summary>
-    public bool EnableUplinkAvatarStream = true;
+    public bool EnableUplinkAvatarStream = false;
     public bool EnableBSRProfiling = false;
     /// <summary>
     /// Worker cap for the BSR tick's parallel phases (send loop, message processing, distance

Basis Server/BasisNetworkServer/BasisServerHandleEvents.cs

@@ -347,6 +347,16 @@ public static void OnNetworkError(IPEndPoint endPoint, SocketError socketError)
         /// </summary>
         private static bool CleanupPeerSubsystems(NetPeer peer, int id)
         {
+            // A predecessor's disconnect can land after a reconnect has already taken the same id.
+            // Every teardown below is keyed by id alone, so running it for a peer that no longer
+            // owns the slot dismantles the live peer's state instead — the "direct connect works,
+            // then dies after a rejoin" symptom. An id held by nobody still cleans up, so a peer
+            // rejected before auth completed keeps releasing whatever partial state it made.
+            if (NetworkServer.AuthenticatedPeers.TryGetValue(id, out NetPeer holder) && !ReferenceEquals(holder, peer))
+            {
+                return false;
+            }
+
             // The auth-identity map is the primary UUID source, but it is empty when
             // UseAuthIdentity is off and can already be evicted on a reconnect collision. The
             // stored connect metadata carries the same server-computed UUID (OnNetworkAccepted
@@ -381,7 +391,10 @@ private static bool CleanupPeerSubsystems(NetPeer peer, int id)
             BasisServerMessageRegistry.ClearSubscription(id);
             JoinBroadcast.UnregisterPeer(id);
 
-            return NetworkServer.AuthenticatedPeers.TryRemove(id, out _);
+            // Value-matched, mirroring RejectWithReason(NetPeer): the guard above raced against a
+            // reconnect that may have claimed the id since.
+            return ((ICollection<KeyValuePair<int, NetPeer>>)NetworkServer.AuthenticatedPeers)
+                .Remove(new KeyValuePair<int, NetPeer>(id, peer));
         }
 
         public static void HandlePeerDisconnected(NetPeer peer, DisconnectInfo info)

Basis Server/BasisServerTests/ConfigAndRegistryTests.cs

@@ -107,7 +107,7 @@ public void Defaults_V42BandwidthFeatures()
         Assert.Equal(2000, cfg.AvatarDeltaKeyframeMaxIntervalMs);
         Assert.True(cfg.StripAdditionalDataAtLowQuality);
         Assert.True(cfg.EnableUplinkAvatarDelta);
-        Assert.True(cfg.EnableUplinkAvatarStream);
+        Assert.False(cfg.EnableUplinkAvatarStream);
     }
 
     [Fact]

Basis/Assets/Resources/PerformanceTestRunInfo.json

@@ -115,7 +115,7 @@ public class Configuration
     /// Clients fall back to keyframe+delta when this is false, and also whenever they hold a direct
     /// P2P session — see BasisNetworkAvatarCompressor for why.
     /// </summary>
-    public bool EnableUplinkAvatarStream = true;
+    public bool EnableUplinkAvatarStream = false;
     public bool EnableBSRProfiling = false;
     /// <summary>
     /// Worker cap for the BSR tick's parallel phases (send loop, message processing, distance

Basis/Assets/Resources/PerformanceTestRunInfo.json.meta

@@ -347,6 +347,16 @@ public static void OnNetworkError(IPEndPoint endPoint, SocketError socketError)
         /// </summary>
         private static bool CleanupPeerSubsystems(NetPeer peer, int id)
         {
+            // A predecessor's disconnect can land after a reconnect has already taken the same id.
+            // Every teardown below is keyed by id alone, so running it for a peer that no longer
+            // owns the slot dismantles the live peer's state instead — the "direct connect works,
+            // then dies after a rejoin" symptom. An id held by nobody still cleans up, so a peer
+            // rejected before auth completed keeps releasing whatever partial state it made.
+            if (NetworkServer.AuthenticatedPeers.TryGetValue(id, out NetPeer holder) && !ReferenceEquals(holder, peer))
+            {
+                return false;
+            }
+
             // The auth-identity map is the primary UUID source, but it is empty when
             // UseAuthIdentity is off and can already be evicted on a reconnect collision. The
             // stored connect metadata carries the same server-computed UUID (OnNetworkAccepted
@@ -381,7 +391,10 @@ private static bool CleanupPeerSubsystems(NetPeer peer, int id)
             BasisServerMessageRegistry.ClearSubscription(id);
             JoinBroadcast.UnregisterPeer(id);
 
-            return NetworkServer.AuthenticatedPeers.TryRemove(id, out _);
+            // Value-matched, mirroring RejectWithReason(NetPeer): the guard above raced against a
+            // reconnect that may have claimed the id since.
+            return ((ICollection<KeyValuePair<int, NetPeer>>)NetworkServer.AuthenticatedPeers)
+                .Remove(new KeyValuePair<int, NetPeer>(id, peer));
         }
 
         public static void HandlePeerDisconnected(NetPeer peer, DisconnectInfo info)

Basis/Assets/Resources/PerformanceTestRunSettings.json

@@ -152,8 +152,6 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 11400000, guid: cf469a9a31a25dc449c2537cb0b17ad6, type: 2}
   - {fileID: -944628639613478452, guid: 5e4c3601c6a155f43af19da3bdd35a64, type: 3}
-  - {fileID: 4183660298247459095, guid: ad3dbbd57db07a1488d166f19ed6e7dc, type: 2}
-  - {fileID: -5957691810772215966, guid: 1d5aae00e097ba9419be9ec26ccae856, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   xboxOneDisableKinectGpuReservation: 1