Server on an isolate, dedicated server binary, room -> server (proto 5)
- serve(Map config, events) is the one server entrypoint: the app hosts it via Isolate.spawn (crash surfaced on the Host card, logs forwarded as [server]); bin/server.dart is the dedicated server, compiled into the bundle as watch-together-server. --headless gone. - Host identity via a per-hosting hostKey in hello, replacing the loopback heuristic. - Rename room -> server across code, files and wire (t:"state", /health name); protocol bumped to 5. - CI compiles the server binary; isolate smoke tests in server and desktop suites. Docs updated. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
d8a0729029
commit
81cac1214d
48 files changed
+1073
-423
No files matched your search
@@ -0,0 +1,165 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'dart:isolate';
|
||||
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:hive_ce/hive.dart';
|
||||
import 'package:media_kit/media_kit.dart';
|
||||
import 'package:sync_relay_core/core.dart';
|
||||
import 'package:watch_together/src/session/session_coordinator.dart';
|
||||
import 'package:watch_together/src/state/server_isolate.dart';
|
||||
import 'package:watch_together/src/state/session_state.dart';
|
||||
|
||||
Future<void> _poll(
|
||||
FutureOr<bool> Function() cond,
|
||||
String what, {
|
||||
Duration timeout = const Duration(seconds: 15),
|
||||
}) async {
|
||||
final deadline = DateTime.now().add(timeout);
|
||||
while (DateTime.now().isBefore(deadline)) {
|
||||
if (await cond()) return;
|
||||
await Future.delayed(const Duration(milliseconds: 100));
|
||||
}
|
||||
fail('timed out waiting for $what');
|
||||
}
|
||||
|
||||
/// A bare WebSocket viewer: no player, just the wire.
|
||||
class _Raw {
|
||||
final WebSocket ws;
|
||||
final msgs = <Map<String, Object?>>[];
|
||||
_Raw(this.ws) {
|
||||
ws.listen((m) => msgs.add(Map<String, Object?>.from(jsonDecode('$m') as Map)));
|
||||
}
|
||||
|
||||
static Future<_Raw> join(int port, String name, {String secret = ''}) async {
|
||||
final r = _Raw(await WebSocket.connect('ws://127.0.0.1:$port/sync'));
|
||||
r.ws.add(jsonEncode(HelloMessage(
|
||||
proto: RelayConstants.protoVersion,
|
||||
secret: secret,
|
||||
user: HelloUser(name: name),
|
||||
media: const HelloMedia(name: '', size: 0, duration: 0))
|
||||
.toJson()));
|
||||
await r.next('welcome');
|
||||
return r;
|
||||
}
|
||||
|
||||
Future<Map<String, Object?>> next(String type, {bool Function(Map<String, Object?>)? where}) async {
|
||||
late Map<String, Object?> found;
|
||||
await _poll(() {
|
||||
for (final m in msgs) {
|
||||
if (m['t'] == type && (where == null || where(m))) {
|
||||
found = m;
|
||||
msgs.remove(m);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}, '$type from server');
|
||||
return found;
|
||||
}
|
||||
}
|
||||
|
||||
Future<int> _freePort() async {
|
||||
final s = await ServerSocket.bind(InternetAddress.anyIPv4, 0);
|
||||
final port = s.port;
|
||||
await s.close();
|
||||
return port;
|
||||
}
|
||||
|
||||
void main() {
|
||||
test('server isolate: logs, raw join, crash reported, stop frees port',
|
||||
timeout: const Timeout(Duration(minutes: 1)), () async {
|
||||
final logs = <String>[];
|
||||
final crashes = <String>[];
|
||||
final server = await ServerIsolate.start(
|
||||
const AppConfig(port: 0, secret: '', name: 'iso'),
|
||||
onLog: logs.add,
|
||||
onCrash: crashes.add);
|
||||
final viewer = await _Raw.join(server.port, 'viewer');
|
||||
await viewer.next('state');
|
||||
await _poll(() => logs.any((l) => l.contains('join viewer')), 'join log');
|
||||
await viewer.ws.close();
|
||||
server.isolate.kill(priority: Isolate.immediate);
|
||||
await _poll(() => crashes.isNotEmpty, 'crash callback');
|
||||
expect(server.isRunning, isFalse);
|
||||
await server.stop(); // no-op on a dead isolate
|
||||
|
||||
final clean = await ServerIsolate.start(
|
||||
const AppConfig(port: 0, secret: '', name: 'iso'),
|
||||
onLog: (_) {},
|
||||
onCrash: crashes.add);
|
||||
final port = clean.port;
|
||||
await clean.stop();
|
||||
expect(crashes, hasLength(1), reason: 'a requested stop is not a crash');
|
||||
final rebind = await ServerSocket.bind(InternetAddress.anyIPv4, port);
|
||||
await rebind.close();
|
||||
});
|
||||
|
||||
test('bind failure surfaces as a start error',
|
||||
timeout: const Timeout(Duration(seconds: 30)), () async {
|
||||
final blocker = await ServerSocket.bind(InternetAddress.anyIPv4, 0);
|
||||
try {
|
||||
await expectLater(
|
||||
ServerIsolate.start(AppConfig(port: blocker.port, secret: '', name: 'x'),
|
||||
onLog: (_) {}, onCrash: (_) {}),
|
||||
throwsA(isA<StateError>()));
|
||||
} finally {
|
||||
await blocker.close();
|
||||
}
|
||||
});
|
||||
|
||||
test('host path: isolate server, host unkickable, crash leaves the session',
|
||||
timeout: const Timeout(Duration(minutes: 2)), () async {
|
||||
MediaKit.ensureInitialized();
|
||||
Hive.init(
|
||||
'${Platform.environment['WT_TEST_TMP'] ?? Directory.systemTemp.path}/hive_isolate_test');
|
||||
final session = SessionState.instance;
|
||||
final port = await _freePort();
|
||||
_Raw? friend;
|
||||
try {
|
||||
await session.host(
|
||||
ConnectParams(host: '', port: port, secret: 'pw', name: 'host'),
|
||||
ConnectForm());
|
||||
expect(session.route.peek(), AppRoute.session);
|
||||
await session.coordinator.playback.player.setVolume(0);
|
||||
|
||||
friend = await _Raw.join(port, 'friend', secret: 'pw');
|
||||
final state = await friend.next('state',
|
||||
where: (m) => (m['members'] as List).any((x) => (x as Map)['name'] == 'host'));
|
||||
final hostId = ((state['members'] as List)
|
||||
.cast<Map>()
|
||||
.firstWhere((m) => m['name'] == 'host'))['id'];
|
||||
friend.ws.add(jsonEncode(KickRequest(target: '$hostId').toJson()));
|
||||
final err = await friend.next('err');
|
||||
expect(err['message'], "can't kick the host");
|
||||
|
||||
// The host can kick the friend (plain loopback peers are not hosts).
|
||||
final friendId = ((state['members'] as List)
|
||||
.cast<Map>()
|
||||
.firstWhere((m) => m['name'] == 'friend'))['id'];
|
||||
session.coordinator.kick('$friendId');
|
||||
await friend.next('kicked');
|
||||
|
||||
session.hostedServer!.isolate.kill(priority: Isolate.immediate);
|
||||
await _poll(() => session.route.peek() == AppRoute.home, 'leave after crash');
|
||||
expect(session.serverCrash.peek(), startsWith('server crashed'));
|
||||
expect(session.hostedServer, isNull);
|
||||
// The killed isolate's socket stays bound in-process; hosting again on
|
||||
// the same port must still work.
|
||||
session.serverCrash.value = null;
|
||||
await session.host(
|
||||
ConnectParams(host: '', port: port, secret: 'pw', name: 'host'),
|
||||
ConnectForm());
|
||||
expect(session.route.peek(), AppRoute.session);
|
||||
final again = await _Raw.join(port, 'again', secret: 'pw');
|
||||
await again.ws.close();
|
||||
await session.leave();
|
||||
expect(session.hostedServer, isNull);
|
||||
} finally {
|
||||
await friend?.ws.close();
|
||||
await session.coordinator.leave(silent: true);
|
||||
await session.stopServer();
|
||||
}
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user