kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2026-05-08 16:24:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: show alert when new client connects

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2024-03-28 21:38:12 +06:00
parent 2f3a2e671d
commit 0ed358eeb8
4 changed files with 265 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/l10n/app_en.arb
View File

@ -317,5 +317,6 @@
"enable_connect": "Enable Connect", "enable_connect": "Enable Connect",
"enable_connect_description": "Control Spotube from other devices", "enable_connect_description": "Control Spotube from other devices",
"devices": "Devices", "devices": "Devices",
"select": "Select" "select": "Select",
"connect_client_alert": "You're being controlled by {client}"
} }

32
lib/pages/root/root_app.dart
View File

@ -16,6 +16,7 @@ import 'package:spotube/components/root/spotube_navigation_bar.dart';
import 'package:spotube/extensions/context.dart'; import 'package:spotube/extensions/context.dart';
import 'package:spotube/hooks/configurators/use_endless_playback.dart'; import 'package:spotube/hooks/configurators/use_endless_playback.dart';
import 'package:spotube/hooks/configurators/use_update_checker.dart'; import 'package:spotube/hooks/configurators/use_update_checker.dart';
import 'package:spotube/provider/connect/server.dart';
import 'package:spotube/provider/download_manager_provider.dart'; import 'package:spotube/provider/download_manager_provider.dart';
import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart'; import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
import 'package:spotube/services/connectivity_adapter.dart'; import 'package:spotube/services/connectivity_adapter.dart';
@ -54,8 +55,8 @@ class RootApp extends HookConsumerWidget {
} }
}); });
final subscription = ConnectionCheckerService final subscriptions = [
.instance.onConnectivityChanged ConnectionCheckerService.instance.onConnectivityChanged
.listen((status) { .listen((status) {
if (status) { if (status) {
scaffoldMessenger.showSnackBar( scaffoldMessenger.showSnackBar(
@ -94,10 +95,35 @@ class RootApp extends HookConsumerWidget {
), ),
); );
} }
}); }),
connectClientStream.listen((clientOrigin) {
scaffoldMessenger.showSnackBar(
SnackBar(
backgroundColor: Colors.yellow[600],
behavior: SnackBarBehavior.floating,
content: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
SpotubeIcons.error,
color: Colors.black,
),
const SizedBox(width: 10),
Text(
context.l10n.connect_client_alert(clientOrigin),
style: const TextStyle(color: Colors.black),
),
],
),
),
);
})
];
return () { return () {
for (final subscription in subscriptions) {
subscription.cancel(); subscription.cancel();
}
}; };
}, []); }, []);

13
lib/provider/connect/server.dart
View File

@ -22,6 +22,9 @@ import 'package:web_socket_channel/web_socket_channel.dart';
import 'package:spotube/provider/volume_provider.dart'; import 'package:spotube/provider/volume_provider.dart';
final logger = getLogger('ConnectServer'); final logger = getLogger('ConnectServer');
final _connectClientStreamController = StreamController<String>.broadcast();
Stream<String> get connectClientStream => _connectClientStreamController.stream;
final connectServerProvider = FutureProvider((ref) async { final connectServerProvider = FutureProvider((ref) async {
final enabled = final enabled =
@ -45,8 +48,14 @@ final connectServerProvider = FutureProvider((ref) async {
final subscriptions = <StreamSubscription>[]; final subscriptions = <StreamSubscription>[];
final websocket = webSocketHandler( FutureOr<Response> websocket(Request req) => webSocketHandler(
(WebSocketChannel channel, String? protocol) async { (WebSocketChannel channel, String? protocol) async {
final context =
(req.context["shelf.io.connection_info"] as HttpConnectionInfo?);
final origin =
"${context?.remoteAddress.host}:${context?.remotePort}";
_connectClientStreamController.add(origin);
ref.listen( ref.listen(
ProxyPlaylistNotifier.provider, ProxyPlaylistNotifier.provider,
(previous, next) { (previous, next) {
@ -207,7 +216,7 @@ final connectServerProvider = FutureProvider((ref) async {
), ),
]); ]);
}, },
); )(req);
final port = Random().nextInt(17000) + 3000; final port = Random().nextInt(17000) + 3000;

60
untranslated_messages.json
View File

@ -3,126 +3,144 @@
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"bn": [ "bn": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"ca": [ "ca": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"de": [ "de": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"es": [ "es": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"fa": [ "fa": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"fr": [ "fr": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"hi": [ "hi": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"it": [ "it": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"ja": [ "ja": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"ko": [ "ko": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"ne": [ "ne": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"nl": [ "nl": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"pl": [ "pl": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"pt": [ "pt": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"ru": [ "ru": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"tr": [ "tr": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"uk": [ "uk": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"vi": [ "vi": [
@ -131,13 +149,15 @@
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
], ],
"zh": [ "zh": [
"enable_connect", "enable_connect",
"enable_connect_description", "enable_connect_description",
"devices", "devices",
"select" "select",
"connect_client_alert"
] ]
} }