Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

fix(syncplay): disable tls for self hosted servers (#2388)

Predidit80f3f2785357
diff --git a/lib/pages/player/controller/player_syncplay_controller.dart b/lib/pages/player/controller/player_syncplay_controller.dart
index 121310cd..aa216aa3 100644
--- a/lib/pages/player/controller/player_syncplay_controller.dart
+++ b/lib/pages/player/controller/player_syncplay_controller.dart
@@ -72,8 +72,7 @@ abstract class _PlayerSyncPlayController with Store {
String room,
String username,
Future<void> Function(int episode, {int currentRoad, int offset})
- changeEpisode,
- {bool enableTLS = true}) async {
+ changeEpisode) async {
if (_connectionSessions.isClosed) {
return;
}
@@ -88,25 +87,17 @@ abstract class _PlayerSyncPlayController with Store {
}
final String syncPlayEndPoint =
GStorage.getSetting(SettingsKeys.syncPlayEndPoint);
- String syncPlayEndPointHost = '';
- int syncPlayEndPointPort = 0;
KazumiLogger().i('SyncPlay: connecting to $syncPlayEndPoint');
- try {
- final parsed = parseSyncPlayEndPoint(syncPlayEndPoint);
- if (parsed != null) {
- syncPlayEndPointHost = parsed.host;
- syncPlayEndPointPort = parsed.port;
- }
- } catch (_) {}
- if (syncPlayEndPointHost == '' || syncPlayEndPointPort == 0) {
+ final parsed = parseSyncPlayEndPoint(syncPlayEndPoint);
+ if (parsed == null) {
KazumiDialog.showToast(
message: 'SyncPlay: 服务器地址不合法 $syncPlayEndPoint',
);
KazumiLogger().e('SyncPlay: invalid server address $syncPlayEndPoint');
return;
}
- final client =
- SyncplayClient(host: syncPlayEndPointHost, port: syncPlayEndPointPort);
+ final enableTLS = isOfficialSyncPlayEndPoint(parsed);
+ final client = SyncplayClient(host: parsed.host, port: parsed.port);
syncplayController = client;
try {
await client.connect(enableTLS: enableTLS);
@@ -114,12 +105,9 @@ abstract class _PlayerSyncPlayController with Store {
await client.disconnect();
return;
}
- KazumiLogger().i(
- 'SyncPlay: connected to $syncPlayEndPointHost:$syncPlayEndPointPort');
+ KazumiLogger().i('SyncPlay: connected to ${parsed.host}:${parsed.port}');
client.onGeneralMessage.listen(
- (message) {
- // print('SyncPlay: general message: ${message.toString()}');
- },
+ null,
onError: (error) {
if (!_isCurrentConnection(session, client)) {
return;
@@ -134,8 +122,7 @@ abstract class _PlayerSyncPlayController with Store {
duration: const Duration(seconds: 5),
showActionButton: true,
actionLabel: '重新连接',
- onActionPressed: () => createRoom(room, username, changeEpisode,
- enableTLS: enableTLS),
+ onActionPressed: () => createRoom(room, username, changeEpisode),
);
}
},
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index f5967c31..e5abf82b 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -457,13 +457,11 @@ class PlayerController implements Disposable {
String room,
String username,
Future<void> Function(int episode, {int currentRoad, int offset})
- changeEpisode,
- {bool enableTLS = true}) async {
+ changeEpisode) async {
await syncplay.createRoom(
room,
username,
changeEpisode,
- enableTLS: enableTLS,
);
}
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 3c244317..13f41568 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -7,6 +7,7 @@ import 'package:kazumi/pages/player/player_panel_hold.dart';
import 'package:kazumi/pages/player/player_pointer_interaction.dart';
import 'package:kazumi/pages/player/player_screenshot_feedback_overlay.dart';
import 'package:kazumi/pages/player/smallest_player_item_panel.dart';
+import 'package:kazumi/services/player/syncplay_endpoint.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/services/logging/logger.dart';
import 'package:kazumi/services/player/pip_utils.dart';
@@ -1189,17 +1190,18 @@ class _PlayerItemState extends State<PlayerItem>
return;
}
- final String defaultCustomSyncPlayEndPoint = '自定义服务器';
- String customSyncPlayEndPoint = defaultCustomSyncPlayEndPoint;
+ const customServerOption = '自定义服务器';
+ String customSyncPlayEndPoint = customServerOption;
String selectedSyncPlayEndPoint =
GStorage.getSetting(SettingsKeys.syncPlayEndPoint);
KazumiDialog.show(
builder: (context) {
return StatefulBuilder(builder: (context, setDialogState) {
- List<String> syncPlayEndPoints = [];
- syncPlayEndPoints.addAll(defaultSyncPlayEndPoints);
- syncPlayEndPoints.add(customSyncPlayEndPoint);
+ final syncPlayEndPoints = <String>[
+ ...officialSyncPlayEndPoints,
+ customSyncPlayEndPoint,
+ ];
if (!syncPlayEndPoints.contains(selectedSyncPlayEndPoint)) {
syncPlayEndPoints.add(selectedSyncPlayEndPoint);
}
@@ -1234,7 +1236,7 @@ class _PlayerItemState extends State<PlayerItem>
},
onChanged: (String? newValue) {
if (newValue != null) {
- if (newValue == defaultCustomSyncPlayEndPoint) {
+ if (newValue == customServerOption) {
String serverText = '';
KazumiDialog.show(
builder: (context) {
diff --git a/lib/services/player/syncplay_client.dart b/lib/services/player/syncplay_client.dart
index d7e59d13..b919ded6 100644
--- a/lib/services/player/syncplay_client.dart
+++ b/lib/services/player/syncplay_client.dart
@@ -4,7 +4,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
-const double PING_MOVING_AVERAGE_WEIGHT = 0.85;
+const double _pingMovingAverageWeight = 0.85;
const Duration _tlsHandshakeTimeout = Duration(seconds: 10);
const Duration _socketWriteTimeout = Duration(seconds: 10);
@@ -179,10 +179,10 @@ class ChatMessage extends SyncplayMessage {
Map<String, dynamic> toJson() => {'Chat': message};
}
-class TLSMessage extends SyncplayMessage {
+class _TLSMessage extends SyncplayMessage {
final String message;
- TLSMessage({
+ _TLSMessage({
required this.message,
});
@@ -239,17 +239,9 @@ class SyncplayClient {
int _serverIgnoringOnTheFly = 0;
bool get isConnected =>
- !_closed &&
- _socket != null &&
- (_tlsHandshakeCompleter == null || _isTLS);
- bool get isTLS => _isTLS;
+ !_closed && _socket != null && (_tlsHandshakeCompleter == null || _isTLS);
String? get username => _username;
- String? get currentRoom => _currentRoom;
String? get currentFileName => _currentFileName;
- double get clientRtt => _clientRtt;
- double get serverRtt => _serverRtt;
- double get avgRtt => _avrRtt;
- double get fd => _fd;
Stream<Map<String, dynamic>> get onGeneralMessage {
_generalMessageController ??= StreamController.broadcast();
@@ -280,7 +272,8 @@ class SyncplayClient {
: _host = host,
_port = port;
- Future<void> connect({bool enableTLS = true}) async {
+ /// Opens the connection using the TLS policy selected by the caller.
+ Future<void> connect({required bool enableTLS}) async {
if (_closed) {
throw StateError('SyncplayClient cannot connect after disconnect');
}
@@ -289,7 +282,6 @@ class SyncplayClient {
}
_connectCalled = true;
try {
- print('SyncPlay: connecting to Syncplay server: $_host:$_port');
final socket = await RawSocket.connect(_host, _port);
if (_closed) {
await _forceCloseSocket(socket);
@@ -297,7 +289,6 @@ class SyncplayClient {
}
_socket = socket;
_transportSocket = socket;
- print('SyncPlay: connected to Syncplay server: $_host:$_port');
_setupSocketHandlers(socket);
if (enableTLS) {
final handshakeCompleter = Completer<void>();
@@ -305,7 +296,7 @@ class SyncplayClient {
try {
await Future.wait<void>(
[
- requestTLS(),
+ _requestTLS(),
handshakeCompleter.future,
],
eagerError: true,
@@ -348,18 +339,16 @@ class SyncplayClient {
}
}
- Future<void> requestTLS() async {
+ Future<void> _requestTLS() async {
if (_socket == null) {
throw SyncplayConnectionException(
'SyncPlay: cannot request TLS before connecting',
);
}
- print('SyncPlay: requesting TLS connection upgrade');
- await _sendMessage(TLSMessage(message: 'send'));
+ await _sendMessage(_TLSMessage(message: 'send'));
}
Future<void> joinRoom(String room, String username) async {
- print('SyncPlay: joining room: $room as $username');
await _sendMessage(HelloMessage(
username: username,
version: '1.7.0',
@@ -411,7 +400,6 @@ class SyncplayClient {
return;
}
_closed = true;
- print('SyncPlay: disconnecting from Syncplay server: $_host:$_port');
final exception =
SyncplayConnectionException('SyncPlay: connection closed');
_completeTLSHandshakeError(exception);
@@ -586,8 +574,7 @@ class SyncplayClient {
if (!identical(socket, _socket)) {
return;
}
- final handshakePending =
- !(_tlsHandshakeCompleter?.isCompleted ?? true);
+ final handshakePending = !(_tlsHandshakeCompleter?.isCompleted ?? true);
final closeFuture = _closeSockets(
pendingWriteError: exception,
stackTrace: stackTrace,
@@ -623,8 +610,6 @@ class SyncplayClient {
json['Hello']['room'].containsKey('name')) {
_username = json['Hello']['username'];
_currentRoom = json['Hello']['room']['name'];
- print(
- 'SyncPlay: joined room: $_currentRoom as $_username, version: ${json['Hello']['version']}');
_runInBackground(_setReady());
}
_generalMessageController?.add({
@@ -761,7 +746,6 @@ class SyncplayClient {
_socket = secureSocket;
_isTLS = true;
_setupSocketHandlers(secureSocket);
- print('SyncPlay: TLS connection established');
final handshakeCompleter = _tlsHandshakeCompleter;
if (handshakeCompleter != null && !handshakeCompleter.isCompleted) {
handshakeCompleter.complete();
@@ -775,7 +759,6 @@ class SyncplayClient {
final exception = SyncplayConnectionException(
'SyncPlay: TLS connection upgrade failed: $error',
);
- print(exception.message);
_completeTLSHandshakeError(exception, stackTrace);
}
}
@@ -955,8 +938,8 @@ class SyncplayClient {
}
// Use moving average to update RTT, smooth the delay data
- _avrRtt = _avrRtt * PING_MOVING_AVERAGE_WEIGHT +
- _clientRtt * (1 - PING_MOVING_AVERAGE_WEIGHT);
+ _avrRtt = _avrRtt * _pingMovingAverageWeight +
+ _clientRtt * (1 - _pingMovingAverageWeight);
// Calculate the forward delay based on the sender's RTT
if (senderRtt < _clientRtt) {
diff --git a/lib/services/player/syncplay_endpoint.dart b/lib/services/player/syncplay_endpoint.dart
index f982025d..8d4d141d 100644
--- a/lib/services/player/syncplay_endpoint.dart
+++ b/lib/services/player/syncplay_endpoint.dart
@@ -1,3 +1,15 @@
+/// Official endpoint selected for new and reset settings.
+const String defaultSyncPlayEndPoint = 'syncplay.pl:8996';
+
+/// Official public endpoints that must use STARTTLS.
+const Set<String> officialSyncPlayEndPoints = {
+ 'syncplay.pl:8995',
+ defaultSyncPlayEndPoint,
+ 'syncplay.pl:8997',
+ 'syncplay.pl:8998',
+ 'syncplay.pl:8999',
+};
+
class SyncPlayEndPoint {
final String host;
final int port;
@@ -47,3 +59,8 @@ SyncPlayEndPoint? parseSyncPlayEndPoint(String endPoint) {
return SyncPlayEndPoint(host: host, port: port);
}
+
+bool isOfficialSyncPlayEndPoint(SyncPlayEndPoint endPoint) {
+ final normalizedEndPoint = '${endPoint.host.toLowerCase()}:${endPoint.port}';
+ return officialSyncPlayEndPoints.contains(normalizedEndPoint);
+}
diff --git a/lib/services/storage/settings_keys.dart b/lib/services/storage/settings_keys.dart
index e77a2151..4bf55fc0 100644
--- a/lib/services/storage/settings_keys.dart
+++ b/lib/services/storage/settings_keys.dart
@@ -1,3 +1,5 @@
+import 'package:kazumi/services/player/syncplay_endpoint.dart';
+
enum SettingGroup {
player,
danmaku,
@@ -328,7 +330,7 @@ class SettingsKeys {
);
static const syncPlayEndPoint = SettingKey<String>(
_SettingBoxKey.syncPlayEndPoint,
- '127.0.0.1:8999',
+ defaultSyncPlayEndPoint,
group: SettingGroup.player,
);
static const androidEnableOpenSLES = SettingKey<bool>(
diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart
index 2a1b2829..9ec1ca1e 100644
--- a/lib/utils/constants.dart
+++ b/lib/utils/constants.dart
@@ -69,17 +69,6 @@ const List<String> userAgentsList = [
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0',
];
-/// 默认 SyncPlay 服务器列表
-const List<String> defaultSyncPlayEndPoints = [
- 'syncplay.pl:8995',
- 'syncplay.pl:8996',
- 'syncplay.pl:8997',
- 'syncplay.pl:8998',
- 'syncplay.pl:8999',
-];
-
-const String defaultSyncPlayEndPoint = 'syncplay.pl:8996';
-
/// 随机HTTP请求头accept-language字段列表
const List<String> acceptLanguageList = [
'zh-CN,zh;q=0.9',
diff --git a/test/syncplay_endpoint_test.dart b/test/syncplay_endpoint_test.dart
new file mode 100644
index 00000000..9dcd3a41
--- /dev/null
+++ b/test/syncplay_endpoint_test.dart
@@ -0,0 +1,48 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:kazumi/services/player/syncplay_endpoint.dart';
+import 'package:kazumi/services/storage/settings_keys.dart';
+
+void main() {
+ test('uses an official server as the default endpoint', () {
+ expect(SettingsKeys.syncPlayEndPoint.defaultValue, defaultSyncPlayEndPoint);
+ expect(officialSyncPlayEndPoints, contains(defaultSyncPlayEndPoint));
+ });
+
+ group('isOfficialSyncPlayEndPoint', () {
+ test('recognizes every built-in official server', () {
+ for (final endPoint in officialSyncPlayEndPoints) {
+ expect(
+ isOfficialSyncPlayEndPoint(parseSyncPlayEndPoint(endPoint)!),
+ isTrue,
+ );
+ }
+ });
+
+ test('normalizes host casing and surrounding whitespace', () {
+ expect(
+ isOfficialSyncPlayEndPoint(
+ parseSyncPlayEndPoint(' SYNCPLAY.PL:8996 ')!,
+ ),
+ isTrue,
+ );
+ });
+
+ test('rejects custom hosts and ports', () {
+ for (final endPoint in [
+ 'syncplay.example.com:8996',
+ 'syncplay.pl:9000',
+ 'localhost:8996',
+ ]) {
+ expect(
+ isOfficialSyncPlayEndPoint(parseSyncPlayEndPoint(endPoint)!),
+ isFalse,
+ );
+ }
+ });
+ });
+
+ test('parseSyncPlayEndPoint rejects invalid endpoints', () {
+ expect(parseSyncPlayEndPoint('syncplay.pl'), isNull);
+ expect(parseSyncPlayEndPoint(''), isNull);
+ });
+}