Restructure step 6: what's next and watch tracking
ci / core (push) Successful in 29s
ci / server (push) Successful in 53s
ci / updater-windows (push) Failing after 7m45s

- What's next is the server's: state.advance counts down (10 s) when the
  media finishes with an Up next item first, holds while its performer or
  warm source is gone, and sets queuePlay at its end; cancel is shared, a
  seek or swap ends it; the server skips items nobody can put up. Shared
  rules in core whats_next.dart; the app's janitor, per-screen countdown
  and end-of-episode card are gone.
- The continuation (next Jellyfin episode, next file of a local show
  with its gaps) is an auto item under "Continues with", prepared like
  Up next's first item.
- Watch tracking by time In (D3): only time played while this viewer is
  in counts; away, paused, held, jumps and stalls never do (P7, P9).
  WatchTracker + device WatchHistory (files, links); Jellyfin progress
  reads the same watch; records are the AniList seam.
- A server restart no longer loses what played: apps hold their media
  and one offers it back (swap.restore, first offer wins), Up next is
  re-added, the source re-feeds, and the watch carries on.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
foxyzandClaude Opus 5.5 committed 2026-10-16 02:06:04 +03:00
1 parent a87ee98faa
commit 741b258ac1
55 files changed
+2724 -964

No files matched your search

+106
View File
@@ -141,4 +141,110 @@ void main() {
expect(back.queue.single.by, aliceId, reason: 'the same member: its items are its own again');
expect(back.members.where((m) => m.name == 'alice'), hasLength(1));
});
test('after a restart, the first offer of what played wins; later ones are ignored', () async {
final a = await _Peer.join(server.boundPort, 'alice');
final b = await _Peer.join(server.boundPort, 'bob');
const media = HelloMedia(name: 'v', size: 0, duration: 600, url: 'https://example.com/v.mp4');
a.send(const SwapIntent(media: media, restore: SwapRestore(position: 120.5, transport: 'playing')).toJson());
final back = await b.state((s) => s.media != null);
expect((back.position, back.transport), (120.5, 'held'));
final line = await b.until((m) => m['t'] == 'feed' && m['action'] == 'swap');
expect(line['reason'], 'restore');
b.send(const SwapIntent(
media: HelloMedia(name: 'w', size: 0, duration: 0, url: 'https://example.com/w.mp4'),
restore: SwapRestore(position: 3))
.toJson());
a.msgs.clear();
final later = await a.state((s) => true);
expect((later.mediaId, later.media?['name'], later.position), (back.mediaId, 'v', 120.5));
});
group('the countdown (state.advance), on a fake clock', () {
late DateTime t;
late SyncServer clocked;
setUp(() async {
t = DateTime.utc(2026, 1, 1);
clocked = SyncServer(const AppConfig(port: 0, secret: 's', name: 't'), clock: () => t);
await clocked.start();
});
tearDown(() => clocked.stop());
/// Moves the clock on; everyone keeps talking; one heartbeat.
void step(int secs) {
t = t.add(Duration(seconds: secs));
final engine = clocked.hub.engine;
for (final token in engine.members.keys) {
engine.touch(token);
}
clocked.hub.heartbeat();
}
/// Alice and bob in; a 20 s video up, both ready with a full buffer,
/// then played to its end; [queue] what bob adds first.
Future<(_Peer, _Peer)> playToEnd(List<QueueItem> queue) async {
final a = await _Peer.join(clocked.boundPort, 'alice');
final b = await _Peer.join(clocked.boundPort, 'bob');
a.send(const SwapIntent(media: HelloMedia(name: 'Ep01', size: 0, duration: 20, url: 'https://example.com/1.mp4'))
.toJson());
final up = await b.state((s) => s.media != null);
for (final p in [a, b]) {
p.send(const ReadyIntent(ready: true).toJson());
p.send(ReportMessage(position: 0, buffered: 100, eventId: up.eventId + 1, mediaId: up.mediaId).toJson());
}
await b.state((s) => s.transport == 'playing');
for (final q in queue) {
b.send(QueueIntent.add(q).toJson());
}
await b.state((s) => s.queue.length == queue.length);
step(21);
return (a, b);
}
const next = QueueItem(
media: HelloMedia(name: 'n', size: 0, duration: 0, url: 'https://example.com/n.mp4'),
how: QueueHow.direct,
title: 'Next');
test('everyone sees the same countdown; at its end the first item is asked for', () async {
final (a, b) = await playToEnd([next]);
final s = await a.state((s) => s.advance != null);
expect(s.transport, 'finished');
expect([s.advance!.id, s.advance!.secs], [s.queue.first.id, RelayConstants.advanceSecs]);
expect((await b.state((s) => s.advance != null)).advance!.at, s.advance!.at);
step(5);
expect((await a.state((s) => true)).queuePlay, isNull);
step(5);
final due = await a.state((s) => s.queuePlay != null);
expect(due.queuePlay, s.queue.first.id);
expect(due.advance, isNull);
});
test('cancel is shared: the countdown stops for everyone', () async {
final (a, b) = await playToEnd([next]);
await a.state((s) => s.advance != null);
b.send(const QueueIntent.cancel().toJson());
await a.state((s) => s.advance == null);
final line = await a.until((m) => m['t'] == 'feed' && m['action'] == 'advance-cancel');
expect(line['actor'], 'bob');
step(15);
expect(clocked.hub.engine.queue.play, isNull);
});
test('an item whose adder left is skipped by the server, with why', () async {
final (a, b) = await playToEnd([
const QueueItem(
media: HelloMedia(name: 'f.mkv', size: 10, duration: 0), how: QueueHow.file, title: 'Bobs', key: 'k1234567890'),
]);
await a.state((s) => s.advance != null);
b.send(const ByeMessage().toJson());
await a.until((m) => m['t'] == 'feed' && m['action'] == 'leave');
step(10);
final skip = await a.until((m) => m['t'] == 'feed' && m['action'] == 'queue-skip');
expect([skip['actorId'], skip['target'], skip['reason']], ['server', 'Bobs', 'bob left']);
expect((await a.state((s) => true)).queue, isEmpty);
});
});
}