forked from Foxyz/sync_replay_project
Restructure step 3: your server, Invite, version gate, AppGraph
- One server per app run (loopback, no password); Invite attaches an all-interfaces listener to the same server and Stop sharing detaches it (guests told with 4016); members, media and Up next never reset. No solo mode: you're home on your own server unless in a friend's. - Navigation: none / yours / friend; a join passes a version gate on /health first (clear "they/you need to update", update offer). - Invite as a value (host, port, name, password flag, version, fp reserved); addresses filtered (loopback, link-local, 198.18/15, bridges) and ranked; Sharing chip, Copy invite, Stop sharing. - Alone looks like a plain player (alone replaces solo). - AppGraph builds and disposes systems; widgets use AppScope; SessionState deleted; a test caps the remaining singletons. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
629be0d9ed
commit
4d00b7455e
86 files changed
+2993
-2071
No files matched your search
@@ -0,0 +1,207 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:io' show InternetAddress;
|
||||
import 'dart:math';
|
||||
|
||||
import 'package:flutter/foundation.dart' show debugPrint, visibleForTesting;
|
||||
import 'package:signals/signals.dart';
|
||||
import 'package:sync_relay_core/core.dart';
|
||||
|
||||
import '../jellyfin/accounts.dart';
|
||||
import '../jellyfin/session_media.dart' show relayCredentialFor;
|
||||
import '../state/connect_prefs.dart';
|
||||
import '../state/server_isolate.dart';
|
||||
import 'invite.dart';
|
||||
|
||||
/// A fresh key per app run: this app's own client sends it in hello to be
|
||||
/// recognised as the host (`members[].host`; it also stands in for the
|
||||
/// password).
|
||||
String newHostKey() {
|
||||
final r = Random.secure();
|
||||
return base64Url.encode([for (var i = 0; i < 24; i++) r.nextInt(256)]);
|
||||
}
|
||||
|
||||
/// Starts the server isolate (tests may pass their own).
|
||||
typedef ServerStarter = Future<ServerIsolate> Function(
|
||||
AppConfig config, {
|
||||
bool loopbackOnly,
|
||||
String? logDir,
|
||||
required void Function(String line) onLog,
|
||||
required void Function(String error) onCrash,
|
||||
});
|
||||
|
||||
Future<ServerIsolate> _startIsolate(
|
||||
AppConfig config, {
|
||||
bool loopbackOnly = false,
|
||||
String? logDir,
|
||||
required void Function(String line) onLog,
|
||||
required void Function(String error) onCrash,
|
||||
}) =>
|
||||
ServerIsolate.start(config, loopbackOnly: loopbackOnly, logDir: logDir, onLog: onLog, onCrash: onCrash);
|
||||
|
||||
/// "Your server": the one server this app runs for its whole life (a
|
||||
/// [ServerIsolate] running `serve`). It starts on 127.0.0.1 and a free
|
||||
/// port, so only this app reaches it; [invite] attaches a second
|
||||
/// listener on every interface at the configured port (Settings → Party
|
||||
/// & network: port and password) and [stopSharing] detaches it. Members,
|
||||
/// what plays and Up next never restart or reconnect for either. Made
|
||||
/// by the composition root.
|
||||
class YourServer {
|
||||
YourServer({
|
||||
required this.forms,
|
||||
this.jellyfin,
|
||||
Future<String> Function()? ytDlpDir,
|
||||
String? Function()? logDir,
|
||||
ServerStarter? starter,
|
||||
Future<List<({String name, InternetAddress address})>> Function()? interfaces,
|
||||
}) : _ytDlpDir = ytDlpDir ?? (() async => ''),
|
||||
_logDir = logDir ?? (() => null),
|
||||
_starter = starter ?? _startIsolate,
|
||||
_interfaces = interfaces ?? machineInterfaces;
|
||||
|
||||
final ConnectStore forms;
|
||||
/// Linked Jellyfin servers (default: the app's): the relay login.
|
||||
final JellyfinAccounts? jellyfin;
|
||||
final Future<String> Function() _ytDlpDir;
|
||||
final String? Function() _logDir;
|
||||
final ServerStarter _starter;
|
||||
final Future<List<({String name, InternetAddress address})>> Function() _interfaces;
|
||||
|
||||
/// Sent by this app's own client (see [newHostKey]).
|
||||
final String hostKey = newHostKey();
|
||||
|
||||
/// The loopback port while it runs; null before [start] and after
|
||||
/// [stop] or a crash.
|
||||
final port = signal<int?>(null);
|
||||
|
||||
/// The invite while shared (the listener attached); null when only this
|
||||
/// app can reach it.
|
||||
final shared = signal<Invite?>(null);
|
||||
|
||||
/// An [invite] or [stopSharing] is under way.
|
||||
final busy = signal(false);
|
||||
|
||||
/// Set when the server died without being stopped; the shell says so
|
||||
/// and clears it. The next [start] makes a new one.
|
||||
final crash = signal<String?>(null);
|
||||
|
||||
/// Called after a crash (the navigation reconnects home).
|
||||
void Function()? onCrash;
|
||||
|
||||
ServerIsolate? _server;
|
||||
Future<int>? _starting;
|
||||
|
||||
@visibleForTesting
|
||||
ServerIsolate? get server => _server;
|
||||
|
||||
JellyfinAccounts get _accounts => jellyfin ?? JellyfinAccounts.instance;
|
||||
|
||||
/// Starts it once (later calls get the same port); a new one after a
|
||||
/// crash. [name]: what `/health` calls it ("Bob's server").
|
||||
Future<int> start({String name = ''}) {
|
||||
final running = _server;
|
||||
if (running != null && running.isRunning) return Future.value(running.port);
|
||||
return _starting ??= _start(name).whenComplete(() => _starting = null);
|
||||
}
|
||||
|
||||
Future<int> _start(String name) async {
|
||||
final who = name.trim();
|
||||
late final ServerIsolate server;
|
||||
server = await _starter(
|
||||
AppConfig(
|
||||
port: 0,
|
||||
secret: '',
|
||||
name: who.isEmpty ? 'server' : "$who's server",
|
||||
hostKey: hostKey,
|
||||
ytDlpDir: await _ytDlpDir(),
|
||||
),
|
||||
loopbackOnly: true,
|
||||
// Its session log (every member's shared diagnostics and its own
|
||||
// records) goes next to the app's.
|
||||
logDir: _logDir(),
|
||||
// Its records join the app's log as `server.<logger>`.
|
||||
onLog: (line) => relogLine('server', line),
|
||||
onCrash: (cause) => _onCrash(server, cause),
|
||||
);
|
||||
_server = server;
|
||||
port.value = server.port;
|
||||
return server.port;
|
||||
}
|
||||
|
||||
void _onCrash(ServerIsolate server, String cause) {
|
||||
if (!identical(_server, server)) return;
|
||||
_server = null;
|
||||
port.value = null;
|
||||
shared.value = null;
|
||||
final message = 'server crashed: $cause';
|
||||
debugPrint('[server] $message');
|
||||
crash.value = message;
|
||||
onCrash?.call();
|
||||
}
|
||||
|
||||
/// Opens it to friends (attaching the network listener if it is not
|
||||
/// yet) and returns the invite to hand out. Throws when the port can't
|
||||
/// be opened (in use) or the server is not running.
|
||||
Future<Invite> invite() async {
|
||||
final server = _server;
|
||||
if (server == null || !server.isRunning) throw StateError('your server is not running');
|
||||
final current = shared.peek();
|
||||
if (current != null) return current;
|
||||
busy.value = true;
|
||||
try {
|
||||
final form = forms.form;
|
||||
final want = int.tryParse(form.hostPort.trim()) ?? 8080;
|
||||
await _accounts.ensureLoaded(validate: false);
|
||||
final bound = await server.share(
|
||||
port: want,
|
||||
secret: form.hostSecret,
|
||||
// Guests without an account watch Jellyfin items through the
|
||||
// server, with this app's own sign-in.
|
||||
jellyfin: relayCredentialFor(_accounts),
|
||||
);
|
||||
final invite = await inviteFor(bound, password: form.hostSecret.isNotEmpty);
|
||||
shared.value = invite;
|
||||
return invite;
|
||||
} finally {
|
||||
busy.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// The invite for [port] from this machine's best address (see
|
||||
/// [inviteAddresses]); 127.0.0.1 when there is none.
|
||||
Future<Invite> inviteFor(int port, {required bool password}) async {
|
||||
final addresses = inviteAddresses(await _interfaces());
|
||||
return Invite(
|
||||
host: addresses.isEmpty ? '127.0.0.1' : addresses.first,
|
||||
port: port,
|
||||
password: password,
|
||||
version: appVersion,
|
||||
);
|
||||
}
|
||||
|
||||
/// Closes it to friends again: everyone but you leaves (told, so their
|
||||
/// apps do not retry); you, what plays and Up next stay.
|
||||
Future<void> stopSharing() async {
|
||||
final server = _server;
|
||||
if (server == null || shared.peek() == null) return;
|
||||
busy.value = true;
|
||||
try {
|
||||
await server.unshare();
|
||||
shared.value = null;
|
||||
} finally {
|
||||
busy.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Makes [path] the hosted file (a File put up here; `/m` serves it).
|
||||
Future<({String name, int size})?> setFile(String path) async => _server?.setFile(path);
|
||||
|
||||
/// The app closes: the server stops (sockets closed, port freed).
|
||||
Future<void> stop() async {
|
||||
final server = _server;
|
||||
_server = null;
|
||||
port.value = null;
|
||||
shared.value = null;
|
||||
await server?.stop();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user