Protocol 12: Up next (a shared queue) and where the video comes from
Up next: a server-side queue anyone edits by item id (add at end or next, move, remove, play now, skip); each item says who added it and how it plays. At the real end the first item swaps in after the end card's countdown, put up by whoever can (its adder for through-me links and files, someone with access for Jellyfin, else anyone); items that can't play are skipped with the reason. The next item's link is resolved ahead. Greyed "Continues with" episodes below. A chip with the controls opens it as a popover (leaf_widgets, local path dependency for now); "Add to queue" next to Put it up everywhere. Delivery: the server measures the source's rate, the media's bitrate and each member's read rate; the members card shows a source line (who passes it on, through what, keeping up or not, source left) and each member's route and buffer. A slow source is told once per media. A failed server fetch is announced to everyone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
foxyzandClaude Opus 5.5 committed
1 parent
95cd668cfb
commit
6b10cae4e6
50 files changed
+4239
-157
No files matched your search
@@ -0,0 +1,141 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:sync_relay_core/core.dart';
|
||||
import 'package:watch_together/src/session/delivery.dart';
|
||||
import 'package:watch_together/src/shell/delivery_line.dart';
|
||||
|
||||
MemberView _m(String id, String name, {double buffered = 30, bool host = false, int rate = 0}) =>
|
||||
MemberView(id: id, name: name, ready: true, inSet: true, buffered: buffered, stale: false, host: host, rate: rate);
|
||||
|
||||
StateBroadcast _state(Map<String, Object?>? media, List<MemberView> members, {String transport = 'playing'}) =>
|
||||
StateBroadcast(
|
||||
eventId: 1,
|
||||
transport: transport,
|
||||
position: 10,
|
||||
serverTime: DateTime.now().toUtc(),
|
||||
mediaId: 2,
|
||||
media: media,
|
||||
members: members,
|
||||
);
|
||||
|
||||
Map<String, Object?> _relayed(MediaRelay relay) =>
|
||||
{'name': 'x.mkv', 'size': 0, 'duration': 1000, 'relay': relay.toJson()};
|
||||
|
||||
void main() {
|
||||
final foxyz = _m('m1', 'Foxyz');
|
||||
final bob = _m('m2', 'Bob', rate: 3200000);
|
||||
final ann = _m('m3', 'Ann');
|
||||
|
||||
test('a member relay: who passes it on, how many read it, how fast', () {
|
||||
final r = _state(
|
||||
_relayed(const MediaRelay(source: 'm1', live: true, rate: 4100000, need: 2300000)), [foxyz, bob, ann]);
|
||||
final d = deliveryOf(r, selfId: 'm2')!;
|
||||
expect(d.kind, DeliveryKind.memberRelay);
|
||||
expect(d.state, SourceState.ok);
|
||||
expect(d.title, 'Foxyz passes it on through the server');
|
||||
expect(d.detail, '2 through the server · 4.1 MB/s, needs 2.3 MB/s');
|
||||
expect(d.headroom, closeTo(4.1 / 2.3, 0.01));
|
||||
expect(deliveryOf(r, selfId: 'm1')!.title, 'You pass it on through the server');
|
||||
final mb = memberDeliveryOf(bob, r, d);
|
||||
expect(mb.route, DeliveryRoute.server);
|
||||
expect(mb.detail, 'via server · 3.2 MB/s · 30 s buffered');
|
||||
expect(memberDeliveryOf(foxyz, r, d).route, DeliveryRoute.source);
|
||||
});
|
||||
|
||||
test('slow source: amber for everyone, the warning for the source only', () {
|
||||
final r = _state(
|
||||
_relayed(const MediaRelay(source: 'm1', live: true, rate: 1200000, need: 2300000)), [foxyz, bob]);
|
||||
expect(deliveryOf(r, selfId: 'm2')!.state, SourceState.slow);
|
||||
expect(deliveryOf(r, selfId: 'm2')!.title, "Foxyz's upload is slower than the video");
|
||||
expect(slowSourceWarning(r, 'm1'), contains('Your upload (1.2 MB/s) is slower than this video needs (2.3 MB/s)'));
|
||||
expect(slowSourceWarning(r, 'm2'), isNull);
|
||||
// Bitrate unknown: rates without a comparison, no warning.
|
||||
final unknown = _state(_relayed(const MediaRelay(source: 'm1', live: true, rate: 1200000)), [foxyz, bob]);
|
||||
expect(deliveryOf(unknown, selfId: 'm2')!.state, SourceState.ok);
|
||||
expect(deliveryOf(unknown, selfId: 'm2')!.detail, '1 through the server · 1.2 MB/s');
|
||||
expect(slowSourceWarning(unknown, 'm1'), isNull);
|
||||
});
|
||||
|
||||
test('the source left: named from before, no rates', () {
|
||||
final names = MemberNames()..observe(_state(null, [foxyz, bob]));
|
||||
final r = _state(_relayed(const MediaRelay(source: 'm1', rate: 4100000, need: 2300000)), [bob, ann]);
|
||||
final d = deliveryOf(r, selfId: 'm2', names: names)!;
|
||||
expect(d.state, SourceState.left);
|
||||
expect(d.title, 'Foxyz left: playing what the server has');
|
||||
expect(d.detail, '2 through the server');
|
||||
});
|
||||
|
||||
test('channel down: waiting', () {
|
||||
final r = _state(_relayed(const MediaRelay(source: 'm1')), [foxyz, bob]);
|
||||
expect(deliveryOf(r, selfId: 'm2')!.title, 'Waiting for Foxyz to reconnect');
|
||||
});
|
||||
|
||||
test('links are direct, the host file is the host\'s, solo shows nothing', () {
|
||||
final link = _state({'name': 'v', 'url': 'https://example.com/v.mp4'}, [foxyz, bob]);
|
||||
final d = deliveryOf(link, selfId: 'm2')!;
|
||||
expect(d.title, 'Everyone plays the link directly');
|
||||
expect(d.detail, isEmpty);
|
||||
expect(memberDeliveryOf(bob, link, d).short, 'direct');
|
||||
final file = _state({'name': 'f.mkv'}, [_m('m1', 'Foxyz', host: true), bob]);
|
||||
expect(deliveryOf(file, selfId: 'm2')!.title, 'Foxyz hosts the file');
|
||||
expect(deliveryOf(_state({'name': 'f.mkv'}, [bob]), selfId: 'm2'), isNull);
|
||||
expect(deliveryOf(_state(null, [foxyz, bob]), selfId: 'm2'), isNull);
|
||||
});
|
||||
|
||||
test('Jellyfin: own accounts direct, the rest via server', () {
|
||||
const ref = {'serverId': 'srv', 'itemId': '0123456789abcdef0123456789abcdef', 'title': 'Pilot'};
|
||||
MemberView jf(String id, String name, bool own) =>
|
||||
MemberView(id: id, name: name, ready: true, inSet: true, buffered: 30, stale: false, jf: {'srv': own});
|
||||
final all = [jf('m1', 'Foxyz', true), jf('m2', 'Bob', true)];
|
||||
final media = {'name': 'Pilot', 'jellyfin': ref, 'relay': const MediaRelay(source: 'm1', live: true).toJson()};
|
||||
final d = deliveryOf(_state(media, all), selfId: 'm2')!;
|
||||
expect(d.title, 'Everyone streams it from Jellyfin', reason: 'the relay stands by');
|
||||
final mixed = _state(media, [...all, jf('m3', 'Guest', false)]);
|
||||
final m = deliveryOf(mixed, selfId: 'm2')!;
|
||||
expect(m.kind, DeliveryKind.memberRelay);
|
||||
expect(m.detail, '1 with their own account · 1 through the server');
|
||||
expect(memberDeliveryOf(jf('m2', 'Bob', true), mixed, m).short, 'own Jellyfin account');
|
||||
});
|
||||
|
||||
test('buffer health: enough, low, empty while playing', () {
|
||||
final r = _state({'name': 'v', 'url': 'https://e/v', 'duration': 1000}, [foxyz, bob]);
|
||||
final d = deliveryOf(r, selfId: 'm2')!;
|
||||
expect(memberDeliveryOf(_m('a', 'A', buffered: 30), r, d).health, BufferHealth.good);
|
||||
expect(memberDeliveryOf(_m('a', 'A', buffered: 2), r, d).health, BufferHealth.low);
|
||||
expect(memberDeliveryOf(_m('a', 'A', buffered: 0), r, d).health, BufferHealth.starving);
|
||||
final held = _state(r.media, [foxyz, bob], transport: 'held');
|
||||
expect(memberDeliveryOf(_m('a', 'A', buffered: 0), held, d).health, BufferHealth.low);
|
||||
});
|
||||
|
||||
test('rates read as MB/s or kB/s', () {
|
||||
expect(formatRate(4100000), '4.1 MB/s');
|
||||
expect(formatRate(12000000), '12 MB/s');
|
||||
expect(formatRate(850000), '850 kB/s');
|
||||
});
|
||||
|
||||
testWidgets('the source line and a member\'s status fit the members card', (tester) async {
|
||||
final r = _state(
|
||||
_relayed(const MediaRelay(source: 'm1', live: true, rate: 1200000, need: 2300000)), [foxyz, bob, ann]);
|
||||
final d = deliveryOf(r, selfId: 'm2')!;
|
||||
await tester.pumpWidget(MaterialApp(
|
||||
theme: ThemeData.dark(),
|
||||
home: Scaffold(
|
||||
body: Center(
|
||||
child: SizedBox(
|
||||
width: 340,
|
||||
child: Column(mainAxisSize: MainAxisSize.min, children: [
|
||||
SourceLine(delivery: d),
|
||||
DeliveryStatus(status: 'ready', delivery: memberDeliveryOf(bob, r, d)),
|
||||
]),
|
||||
),
|
||||
),
|
||||
),
|
||||
));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text("Foxyz's upload is slower than the video"), findsOneWidget);
|
||||
expect(find.byKey(const ValueKey('headroom-bar')), findsOneWidget);
|
||||
expect(find.text('ready · via server · 3.2 MB/s'), findsOneWidget);
|
||||
expect(find.byKey(const ValueKey('health-dot')), findsOneWidget);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
}
|
||||
@@ -12,9 +12,9 @@ import 'package:watch_together/src/jellyfin/session_media.dart';
|
||||
import 'package:watch_together/src/jellyfin/track_prefs.dart';
|
||||
import 'package:watch_together/src/screens/home/media_picker.dart';
|
||||
import 'package:watch_together/src/screens/session/jellyfin_widgets.dart';
|
||||
import 'package:watch_together/src/session/delivery.dart';
|
||||
import 'package:watch_together/src/session/session_coordinator.dart' show AutoAdvance;
|
||||
import 'package:watch_together/src/shell/library_tab.dart' show putUpJellyfinMedia;
|
||||
import 'package:watch_together/src/shell/party_strip.dart' show viaHostOf;
|
||||
|
||||
import 'jellyfin_accounts_test.dart';
|
||||
import 'jellyfin_browser_test.dart' show app, setSize, settle;
|
||||
@@ -341,11 +341,13 @@ void main() {
|
||||
expect(compareMemberIds('m9', 'm10'), lessThan(0));
|
||||
});
|
||||
|
||||
test('member badge: via host only for relay viewers of the current item', () {
|
||||
expect(viaHostOf(member('m1', 'G', jf: {fixtureServerId: false}), episodeRef), isTrue);
|
||||
expect(viaHostOf(member('m1', 'G', jf: {fixtureServerId: true}), episodeRef), isFalse);
|
||||
expect(viaHostOf(member('m1', 'G'), episodeRef), isFalse);
|
||||
expect(viaHostOf(member('m1', 'G', jf: {fixtureServerId: false}), null), isFalse);
|
||||
test('member route: via server only for relay viewers of the current item', () {
|
||||
DeliveryRoute? route(MemberView m, {bool relay = true}) =>
|
||||
routeOf(m, DeliveryKind.jellyfin, '', episodeRef, relay);
|
||||
expect(route(member('m1', 'G', jf: {fixtureServerId: false})), DeliveryRoute.server);
|
||||
expect(route(member('m1', 'G', jf: {fixtureServerId: false}), relay: false), isNull);
|
||||
expect(route(member('m1', 'G', jf: {fixtureServerId: true})), DeliveryRoute.direct);
|
||||
expect(route(member('m1', 'G')), isNull);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:sync_relay_core/core.dart';
|
||||
import 'package:watch_together/src/queue/queue_logic.dart';
|
||||
|
||||
MemberView member(String id,
|
||||
{bool stale = false, bool out = false, Map<String, bool> jf = const {}, String name = ''}) =>
|
||||
MemberView(
|
||||
id: id, name: name.isEmpty ? id : name, ready: false, inSet: true, buffered: 0, stale: stale, out: out, jf: jf);
|
||||
|
||||
QueueItem item(QueueHow how, {String by = 'm2', String byName = 'Bob'}) => QueueItem(
|
||||
id: 'q1',
|
||||
media: how == QueueHow.jellyfin
|
||||
? const HelloMedia(name: 'ep', size: 0, duration: 0, jellyfin: JellyfinRef(serverId: 'S', itemId: 'i'))
|
||||
: const HelloMedia(name: 'x', size: 0, duration: 0, url: 'https://x/y'),
|
||||
how: how,
|
||||
title: 'x',
|
||||
by: by,
|
||||
byName: byName,
|
||||
);
|
||||
|
||||
void main() {
|
||||
group('queuePerformer', () {
|
||||
test('a link passed on or a file: only its adder; gone means skipped', () {
|
||||
for (final how in [QueueHow.through, QueueHow.file]) {
|
||||
expect(queuePerformer(item(how), [member('m1'), member('m2', out: true)]).id, 'm2');
|
||||
final gone = queuePerformer(item(how), [member('m1'), member('m3')]);
|
||||
expect(gone.id, isNull);
|
||||
expect(gone.why, 'Bob left');
|
||||
}
|
||||
});
|
||||
|
||||
test('Jellyfin: the adder with access, else the lowest member with access, else skipped', () {
|
||||
final access = {'S': true};
|
||||
expect(queuePerformer(item(QueueHow.jellyfin), [member('m1', jf: access), member('m2', jf: access)]).id, 'm2');
|
||||
expect(
|
||||
queuePerformer(item(QueueHow.jellyfin), [member('m10', jf: access), member('m3', jf: access), member('m2')])
|
||||
.id,
|
||||
'm3');
|
||||
expect(queuePerformer(item(QueueHow.jellyfin), [member('m3', jf: access, out: true), member('m2')]).why,
|
||||
isNotNull);
|
||||
});
|
||||
|
||||
test('a link everyone opens or the server fetches: the adder, else the lowest active member', () {
|
||||
for (final how in [QueueHow.direct, QueueHow.server]) {
|
||||
expect(queuePerformer(item(how), [member('m1'), member('m2')]).id, 'm2');
|
||||
expect(queuePerformer(item(how), [member('m4'), member('m2', stale: true), member('m3')]).id, 'm3');
|
||||
final nobody = queuePerformer(item(how), [member('m2', out: true)]);
|
||||
expect((nobody.id, nobody.why), (null, null), reason: 'nobody around is not a skip');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test('the janitor is the lowest member that is not stale', () {
|
||||
expect(queueJanitor([member('m9'), member('m1', stale: true), member('m2')]), 'm2');
|
||||
});
|
||||
|
||||
test('warming starts in the last 90 s, once buffered to the end, or at the end', () {
|
||||
bool due(double pos, {double buffered = 0, String t = 'playing'}) =>
|
||||
queueWarmDue(transport: t, position: pos, duration: 1000, bufferedTo: pos + buffered);
|
||||
expect(due(100), isFalse);
|
||||
expect(due(911), isTrue);
|
||||
expect(due(100, buffered: 900), isTrue);
|
||||
expect(due(0, t: 'finished'), isTrue);
|
||||
expect(queueWarmDue(transport: 'playing', position: 5, duration: 0, bufferedTo: 5), isFalse);
|
||||
});
|
||||
|
||||
test('labels', () {
|
||||
expect(queueHowLabel(item(QueueHow.through), selfId: 'm2'), 'through you');
|
||||
expect(queueHowLabel(item(QueueHow.through), selfId: 'm1'), 'through Bob');
|
||||
expect(queueHowLabel(item(QueueHow.file), selfId: 'm1'), "Bob's file");
|
||||
expect(queueClock(3725), '1:02:05');
|
||||
expect(queueClock(65), '1:05');
|
||||
expect(queueClock(0), '');
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user