基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
syncplay: tls support && tiny fix in room event
Predidit03067f086be5
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dartindex 673cecc0..3f81828e 100644--- a/lib/pages/player/player_controller.dart+++ b/lib/pages/player/player_controller.dart@@ -496,14 +496,14 @@ abstract class _PlayerController with Store {}Future<void> createSyncPlayRoom(- String room, String username, Function changeEpisode) async {+ String room, String username, Function changeEpisode, {bool enableTLS = false}) async {await syncplayController?.disconnect();syncplayController = SyncplayClient(host: 'syncplay.pl', port: 8995);try {- await syncplayController!.connect();+ await syncplayController!.connect(enableTLS: enableTLS);syncplayController!.onGeneralMessage.listen((message) {- print('SyncPlay: general message: ${message.toString()}');+ // print('SyncPlay: general message: ${message.toString()}');},onError: (error) {print('SyncPlay: error: ${error.message}');diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dartindex 0a3913ec..2a45d766 100644--- a/lib/pages/player/player_item.dart+++ b/lib/pages/player/player_item.dart@@ -559,7 +559,7 @@ class _PlayerItemState extends State<PlayerItem>final TextEditingController usernameController = TextEditingController();KazumiDialog.show(builder: (BuildContext context) {return AlertDialog(- title: const Text('创建房间'),+ title: const Text('加入房间'),content: Form(key: formKey,child: Column(diff --git a/lib/utils/syncplay.dart b/lib/utils/syncplay.dartindex 364bb0c5..00a5e8a9 100644--- a/lib/utils/syncplay.dart+++ b/lib/utils/syncplay.dart@@ -107,6 +107,7 @@ class StateMessage extends SyncplayMessage {class SetMessage extends SyncplayMessage {final double? duration;final String? fileName;+ final String? username;final int? size;final String? setBy;final String? room;@@ -116,6 +117,7 @@ class SetMessage extends SyncplayMessage {SetMessage({this.duration,this.fileName,+ this.username,this.size,this.setBy,this.room,@@ -125,12 +127,14 @@ class SetMessage extends SyncplayMessage {@overrideMap<String, dynamic> toJson() {- if (setJoined != null && room != null) {+ if (setJoined != null && room != null && username != null) {return {"Set": {- "32421321": {- room: {"name": room},- "event": {"joined": true}+ "user": {+ username: {+ "room": {"name": room},+ "event": {"joined": true}+ }}}};@@ -161,9 +165,25 @@ class SetMessage extends SyncplayMessage {}}+class TLSMessage extends SyncplayMessage {+ final String message;++ TLSMessage({+ required this.message,+ });++ @override+ Map<String, dynamic> toJson() => {+ 'TLS': {+ 'startTLS': message,+ },+ };+}+class SyncplayClient {final String _host;final int _port;+ bool _isTLS = false;Socket? _socket;String? _username;String? _currentRoom;@@ -191,6 +211,7 @@ class SyncplayClient {int _serverIgnoringOnTheFly = 0;bool get isConnected => _socket != null;+ bool get isTLS => _isTLS;String? get username => _username;String? get currentRoom => _currentRoom;String? get currentFileName => _currentFileName;@@ -223,7 +244,7 @@ class SyncplayClient {: _host = host,_port = port;- Future<void> connect() async {+ Future<void> connect({bool enableTLS = true}) async {if (_generalMessageController?.isClosed ?? true) {_generalMessageController = StreamController.broadcast();}@@ -240,6 +261,9 @@ class SyncplayClient {_socket = await Socket.connect(_host, _port);print('SyncPlay: connected to Syncplay server: $_host:$_port');_setupSocketHandlers();+ if (enableTLS) {+ requestTLS();+ }} on SocketException catch (e) {_generalMessageController?.addError(SyncplayConnectionException(@@ -248,6 +272,11 @@ class SyncplayClient {}}+ Future<void> requestTLS() async {+ print('SyncPlay: requesting TLS connection upgrade');+ await _sendMessage(TLSMessage(message: 'send'));+ }+Future<void> joinRoom(String room, String username) async {print('SyncPlay: joining room: $room as $username');await _sendMessage(HelloMessage(@@ -301,6 +330,7 @@ class SyncplayClient {_currentFileName = null;_currentPositon = 0.0;_isPaused = true;+ _isTLS = false;_lastLatencyCalculation = null;_clientIgnoringOnTheFly = 0;_serverIgnoringOnTheFly = 0;@@ -369,8 +399,29 @@ class SyncplayClient {);}- void _handleMessage(dynamic data) {+ void _handleMessage(dynamic data) async {final json = data as Map<String, dynamic>;+ if (json.containsKey('TLS')) {+ if (json['TLS'].containsKey('startTLS')) {+ if (json['TLS']['startTLS'] == 'true') {+ var plainSocket = _socket;+ try {+ _socket = await SecureSocket.secure(plainSocket!);+ _setupSocketHandlers();+ _isTLS = true;+ print('SyncPlay: TLS connection established');+ try {+ plainSocket.close();+ } catch (_) {}+ } catch (e) {+ print('SyncPlay: TLS connection upgrade failed: $e');+ _socket = plainSocket;+ _isTLS = false;+ }+ }+ }+ return;+ }if (json.containsKey('Hello')) {if (json['Hello'].containsKey('room') &&json['Hello']['room'].containsKey('name')) {@@ -481,6 +532,7 @@ class SyncplayClient {await _sendMessage(SetMessage(setJoined: true,+ username: _username,room: _currentRoom,),);