From 56bfccccc25bccd0bbb306713bbaf77b81ea79e5 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Thu, 16 Jul 2026 17:10:58 -0500 Subject: [PATCH] scope extensions doesn't work on c10y :( --- src/client/initMatrix.ts | 21 ++++++++++-------- src/client/slidingSync.test.ts | 40 +++++++++++++++++++++++++++++++++- src/client/slidingSync.ts | 27 +++++++++++++++++++++++ 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index 6e612b7be..fc29e6826 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -23,7 +23,7 @@ import { pushSessionToSW } from '../sw-session'; import { SessionOidcTokenRefresher } from './oidcTokenRefresher'; import { cryptoCallbacks } from './secretStorageKeys'; import type { SlidingSyncDiagnostics } from './slidingSync'; -import { SlidingSyncManager } from './slidingSync'; +import { scopeEphemeralExtensions, SlidingSyncManager } from './slidingSync'; import { PresenceSyncManager } from './presenceSync'; import { SlidingSyncSidebarCache } from './slidingSyncSidebarCache'; @@ -106,7 +106,7 @@ type MatrixClientWithWritableFetchRoomEvent = MatrixClient & { const fetchRoomEventStartupCleanupByClient = new WeakMap void>(); -const slidingSyncConnIdCleanupByClient = new WeakMap void>(); +const slidingSyncRequestCleanupByClient = new WeakMap void>(); type SlidingSyncMethod = ( reqBody: MSC3575SlidingSyncRequest, @@ -124,8 +124,8 @@ type SlidingSyncRequestWithConnId = MSC3575SlidingSyncRequest & { const SLIDING_SYNC_CONN_ID = 'sable-main'; -function installSlidingSyncConnId(mx: MatrixClient): void { - slidingSyncConnIdCleanupByClient.get(mx)?.(); +function installSlidingSyncRequestPatch(mx: MatrixClient, manager: SlidingSyncManager): void { + slidingSyncRequestCleanupByClient.get(mx)?.(); const mxWritable = mx as MatrixClientWithWritableSlidingSync; const original = mx.slidingSync.bind(mx) as SlidingSyncMethod; @@ -135,11 +135,14 @@ function installSlidingSyncConnId(mx: MatrixClient): void { req.conn_id = SLIDING_SYNC_CONN_ID; } + const roomIds = manager.getActiveRoomSubscriptionIds(); + scopeEphemeralExtensions(req.extensions, roomIds); + return original(reqBody, baseUrl, abortSignal); }; - slidingSyncConnIdCleanupByClient.set(mx, () => { - slidingSyncConnIdCleanupByClient.delete(mx); + slidingSyncRequestCleanupByClient.set(mx, () => { + slidingSyncRequestCleanupByClient.delete(mx); mxWritable.slidingSync = original; }); } @@ -456,7 +459,7 @@ export const startClient = async (mx: MatrixClient, config?: StartClientConfig): }); installStartupFetchRoomEventPatch(mx, manager); - installSlidingSyncConnId(mx); + installSlidingSyncRequestPatch(mx, manager); manager.attach(); manager.prepareSidebarCacheHydration(); @@ -486,7 +489,7 @@ export const startClient = async (mx: MatrixClient, config?: StartClientConfig): stack: err instanceof Error ? err.stack : undefined, }); fetchRoomEventStartupCleanupByClient.get(mx)?.(); - slidingSyncConnIdCleanupByClient.get(mx)?.(); + slidingSyncRequestCleanupByClient.get(mx)?.(); membershipActionCleanupByClient.get(mx)?.(); disposeSlidingSync(mx); disposePresenceSync(mx); @@ -498,7 +501,7 @@ export const stopClient = (mx: MatrixClient): void => { log.log('stopClient', mx.getUserId()); debugLog.info('sync', 'Stopping client', { userId: mx.getUserId() }); fetchRoomEventStartupCleanupByClient.get(mx)?.(); - slidingSyncConnIdCleanupByClient.get(mx)?.(); + slidingSyncRequestCleanupByClient.get(mx)?.(); disposeSlidingSync(mx); disposePresenceSync(mx); mx.stopClient(); diff --git a/src/client/slidingSync.test.ts b/src/client/slidingSync.test.ts index e3f8b8d7e..fc7d846d2 100644 --- a/src/client/slidingSync.test.ts +++ b/src/client/slidingSync.test.ts @@ -6,7 +6,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'; import type { MatrixClient, MSC3575List } from '$types/matrix-sdk'; import { EventType, KnownMembership, SlidingSyncEvent, SlidingSyncState } from '$types/matrix-sdk'; -import { SlidingSyncManager } from './slidingSync'; +import { scopeEphemeralExtensions, SlidingSyncManager } from './slidingSync'; // ── vi.hoisted mocks ───────────────────────────────────────────────────────── // Must be defined via vi.hoisted @@ -407,6 +407,44 @@ describe('SlidingSyncManager room subscription coordination', () => { }); }); +describe('scopeEphemeralExtensions', () => { + it('limits typing and receipts to active rooms without changing other extensions', () => { + const extensions = { + typing: { enabled: true }, + receipts: { enabled: true }, + account_data: { enabled: true }, + }; + + scopeEphemeralExtensions(extensions, ['!space:example.com', '!room:example.com']); + + expect(extensions).toEqual({ + typing: { + enabled: true, + lists: [], + rooms: ['!space:example.com', '!room:example.com'], + }, + receipts: { + enabled: true, + lists: [], + rooms: ['!space:example.com', '!room:example.com'], + }, + account_data: { enabled: true }, + }); + }); + + it('uses an empty room scope when no timeline is open', () => { + const extensions = { + typing: { enabled: true, lists: ['joined'], rooms: ['!old:example.com'] }, + receipts: { enabled: true, lists: ['joined'], rooms: ['!old:example.com'] }, + }; + + scopeEphemeralExtensions(extensions, []); + + expect(extensions.typing).toMatchObject({ lists: [], rooms: [] }); + expect(extensions.receipts).toMatchObject({ lists: [], rooms: [] }); + }); +}); + describe('SlidingSyncManager local membership reconciliation', () => { it('updates an existing invite immediately after a successful join', () => { const updateMyMembership = vi.fn<() => void>(); diff --git a/src/client/slidingSync.ts b/src/client/slidingSync.ts index 5b090dfce..0e3a2c469 100644 --- a/src/client/slidingSync.ts +++ b/src/client/slidingSync.ts @@ -190,6 +190,29 @@ const getListEndIndex = (list: MSC3575List | null): number => { return list.ranges.reduce((max, range) => Math.max(max, range[1] ?? -1), -1); }; +type RoomScopedExtension = { + enabled?: boolean; + lists?: string[]; + rooms?: string[]; +}; + +export const scopeEphemeralExtensions = ( + extensions: object | undefined, + roomIds: readonly string[] +): void => { + if (!extensions) return; + const extensionMap = extensions as Record; + + ['typing', 'receipts'].forEach((name) => { + const extension = extensionMap[name]; + if (!extension || typeof extension !== 'object') return; + + const scopedExtension = extension as RoomScopedExtension; + scopedExtension.lists = []; + scopedExtension.rooms = [...roomIds]; + }); +}; + export class SlidingSyncManager { private disposed = false; @@ -1120,6 +1143,10 @@ export class SlidingSyncManager { this.reportActiveSubscriptionCount(); } + public getActiveRoomSubscriptionIds(): string[] { + return [...this.activeRoomSubscriptions]; + } + public subscribeToRoom(roomId: string): void { if (this.disposed || !this.addActiveRoomSubscription(roomId)) return; this.syncRoomSubscriptions();