merge main and harden canonical media recovery

2026-08-30 20:49:22 +00:00 · 2026-08-25 16:58:15 +02:00
parent a477356d25 5fffeadded
commit a65fe2f576
81 changed files with 3422 additions and 1133 deletions
@@ -67,6 +67,18 @@ describe('canonical media state', () => {
        expect(target.mediaState).toMatchObject({ revision: 5, currentTime: 200, updatedBy: 'b' });
    });

+    it('ignores client-supplied playback state while seeking', () => {
+        const target = room({ revision: 3, playbackState: 'paused', currentTime: 10, updatedAt: 1000, updatedBy: 'a' });
+        expect(updateMediaStateFromControl(
+            target,
+            EVENTS.SEEK,
+            { targetTime: 100, playbackState: 'playing' },
+            'b',
+            { now: 2000, senderPlaybackState: 'playing' }
+        )).toBe(true);
+        expect(target.mediaState).toMatchObject({ revision: 4, playbackState: 'paused', currentTime: 100 });
+    });
+
    it('uses an observed sender state only to establish an otherwise ambiguous first SEEK', () => {
        const target = room();
        expect(updateMediaStateFromControl(target, EVENTS.SEEK, { targetTime: 50 }, 'a', { now: 1000 })).toBe(false);