RTC: Increase polling intervals, increase polling on primary room only (#76704)

alecgeatches · alecgeatches · ingeniumed · web-flow · commit 466db06ea2af · 2026-03-20T11:48:08.000+09:00
* Bump polling intervals up by 4x

* Reset `hasCollaborators` flag on awareness check

* Use the first registered room as the primaryRoom, and only pay attention to awareness results from that entity to avoid poll increases from shared entities like categores

* Simplify primaryRoom and enforceConnectionLimit

* Fix the collaboration utility setup for collaboration tests

---------

Co-authored-by: alecgeatches &lt;alecgeatches@git.wordpress.org&gt;
Co-authored-by: ingeniumed &lt;ingeniumed@git.wordpress.org&gt;
Co-authored-by: chriszarate &lt;czarate@git.wordpress.org&gt;
Co-authored-by: t-hamano &lt;wildworks@git.wordpress.org&gt;
diff --git a/packages/editor/src/components/sync-connection-error-modal/index.tsx b/packages/editor/src/components/sync-connection-error-modal/index.tsx
@@ -35,11 +35,11 @@ const { BlockCanvasCover } = unlock( privateApis );
 const { retrySyncConnection } = unlock( coreDataPrivateApis );
 
 // Debounce time for initial disconnected status to allow connection to establish.
-const INITIAL_DISCONNECTED_DEBOUNCE_MS = 5000;
+const INITIAL_DISCONNECTED_DEBOUNCE_MS = 20000;
 
 // Debounce time for showing the disconnect dialog after the intial connection,
 // allowing brief network interruptions to resolve.
-const DISCONNECTED_DEBOUNCE_MS = 2000;
+const DISCONNECTED_DEBOUNCE_MS = 8000;
 
 export interface SyncConnectionErrorModalProps {
 	description: string; // Modal description.
diff --git a/packages/sync/src/providers/http-polling/config.ts b/packages/sync/src/providers/http-polling/config.ts
@@ -9,12 +9,12 @@ export const MAX_UPDATE_SIZE_IN_BYTES = 1 * 1024 * 1024; // 1 MB
 
 export const POLLING_INTERVAL_IN_MS = applyFilters(
 	'sync.pollingManager.pollingInterval',
-	1000 // 1 second or 1000 milliseconds
+	4000 // 4 seconds
 ) as number;
 
 export const POLLING_INTERVAL_WITH_COLLABORATORS_IN_MS = applyFilters(
 	'sync.pollingManager.pollingIntervalWithCollaborators',
-	250 // 250 milliseconds
+	1000 // 1 second
 ) as number;
 
 // Must be less than the server-side AWARENESS_TIMEOUT (30 s) to avoid
diff --git a/packages/sync/src/providers/http-polling/polling-manager.ts b/packages/sync/src/providers/http-polling/polling-manager.ts
@@ -66,7 +66,7 @@ interface RoomState {
 	clientId: number;
 	createCompactionUpdate: () => SyncUpdate;
 	endCursor: number;
-	enforceConnectionLimit: boolean;
+	isPrimaryRoom: boolean;
 	localAwarenessState: LocalAwarenessState;
 	log: LogFunction;
 	onStatusChange: ( status: ConnectionStatus ) => void;
@@ -267,12 +267,12 @@ function checkConnectionLimit(
 	awareness: AwarenessState,
 	roomState: RoomState
 ): boolean {
-	if ( ! roomState.enforceConnectionLimit ) {
+	if ( ! roomState.isPrimaryRoom || hasCheckedConnectionLimit ) {
 		return false;
 	}
 
 	// Limits are only enforced on the initial connection.
-	roomState.enforceConnectionLimit = false;
+	hasCheckedConnectionLimit = true;
 
 	const maxClientsPerRoom = applyFilters(
 		'sync.pollingProvider.maxClientsPerRoom',
@@ -300,6 +300,7 @@ function checkConnectionLimit(
 }
 
 let areListenersRegistered = false;
+let hasCheckedConnectionLimit = false;
 let hasCollaborators = false;
 let isActiveBrowser = 'visible' === document.visibilityState;
 let isPolling = false;
@@ -418,6 +419,9 @@ function poll(): void {
 				state.onStatusChange( { status: 'connected' } );
 			} );
 
+			// Reset before checking each room
+			hasCollaborators = false;
+
 			rooms.forEach( ( room ) => {
 				if ( ! roomStates.has( room.room ) ) {
 					return;
@@ -442,9 +446,14 @@ function poll(): void {
 				// Process awareness update.
 				roomState.processAwarenessUpdate( room.awareness );
 
-				// If there is another collaborator, resume the queue for the next poll
-				// and increase polling frequency.
-				if ( Object.keys( room.awareness ).length > 1 ) {
+				// If there is another collaborator on the primary entity,
+				// resume the queue for the next poll and increase polling
+				// frequency. We only check the primary room to avoid false
+				// positives from shared collection rooms (e.g. taxonomy/category).
+				if (
+					roomState.isPrimaryRoom &&
+					Object.keys( room.awareness ).length > 1
+				) {
 					hasCollaborators = true;
 					roomState.updateQueue.resume();
 				}
@@ -576,7 +585,7 @@ function registerRoom( {
 	 * How might this approach be improved? We could develop some way to annotate
 	 * entity loading so that the consumer can indicate which entity is primary.
 	 */
-	const enforceConnectionLimit = 0 === roomStates.size;
+	const isPrimaryRoom = 0 === roomStates.size;
 
 	function onAwarenessUpdate(): void {
 		roomState.localAwarenessState = awareness.getLocalState() ?? {};
@@ -628,7 +637,7 @@ function registerRoom( {
 				SyncUpdateType.COMPACTION
 			),
 		endCursor: 0,
-		enforceConnectionLimit,
+		isPrimaryRoom,
 		localAwarenessState: awareness.getLocalState() ?? {},
 		log,
 		onStatusChange,
@@ -685,6 +694,7 @@ function unregisterRoom( room: string ): void {
 			handleVisibilityChange
 		);
 		areListenersRegistered = false;
+		hasCheckedConnectionLimit = false;
 	}
 }
 
diff --git a/test/e2e/specs/editor/collaboration/fixtures/index.ts b/test/e2e/specs/editor/collaboration/fixtures/index.ts
@@ -7,7 +7,10 @@ export { expect } from '@wordpress/e2e-test-utils-playwright';
 /**
  * Internal dependencies
  */
-import CollaborationUtils, { SECOND_USER } from './collaboration-utils';
+import CollaborationUtils, {
+	SECOND_USER,
+	setCollaboration,
+} from './collaboration-utils';
 
 type Fixtures = {
 	collaborationUtils: CollaborationUtils;
@@ -27,7 +30,9 @@ export const test = base.extend< Fixtures >( {
 		// Clean up any leftover users from previous runs before creating.
 		await requestUtils.deleteAllUsers();
 		await requestUtils.createUser( SECOND_USER );
+		await setCollaboration( requestUtils, true );
 		await use( utils );
 		await utils.teardown();
+		await setCollaboration( requestUtils, false );
 	},
 } );
