TF-3157 Remove unnecessary background service worker
This commit is contained in:
@@ -7,5 +7,4 @@ class Constant {
|
|||||||
static const octetStreamMimeType = 'application/octet-stream';
|
static const octetStreamMimeType = 'application/octet-stream';
|
||||||
static const pdfExtension = '.pdf';
|
static const pdfExtension = '.pdf';
|
||||||
static const imageType = 'image';
|
static const imageType = 'image';
|
||||||
static const wsServiceWorkerBroadcastChannel = 'background-message';
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
|
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||||
|
|
||||||
abstract class WebSocketDatasource {
|
abstract class WebSocketDatasource {
|
||||||
Stream<dynamic> getWebSocketChannel(Session session, AccountId accountId);
|
Future<WebSocketChannel> getWebSocketChannel(
|
||||||
|
Session session,
|
||||||
|
AccountId accountId);
|
||||||
}
|
}
|
||||||
+13
-41
@@ -1,21 +1,17 @@
|
|||||||
|
|
||||||
import 'package:core/data/constants/constant.dart';
|
import 'dart:async';
|
||||||
import 'package:core/utils/app_logger.dart';
|
|
||||||
import 'package:core/utils/broadcast_channel/broadcast_channel.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
|
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/capability/websocket_capability.dart';
|
import 'package:jmap_dart_client/jmap/core/capability/websocket_capability.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:model/extensions/session_extension.dart';
|
import 'package:model/extensions/session_extension.dart';
|
||||||
import 'package:rxdart/transformers.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/data/datasource/web_socket_datasource.dart';
|
import 'package:tmail_ui_user/features/push_notification/data/datasource/web_socket_datasource.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/data/model/connect_web_socket_message.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/data/network/web_socket_api.dart';
|
import 'package:tmail_ui_user/features/push_notification/data/network/web_socket_api.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/exceptions/web_socket_exceptions.dart';
|
import 'package:tmail_ui_user/features/push_notification/domain/exceptions/web_socket_exceptions.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/model/web_socket_action.dart';
|
|
||||||
import 'package:tmail_ui_user/main/error/capability_validator.dart';
|
import 'package:tmail_ui_user/main/error/capability_validator.dart';
|
||||||
import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
|
import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
|
||||||
import 'package:universal_html/html.dart';
|
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||||
|
|
||||||
class WebSocketDatasourceImpl implements WebSocketDatasource {
|
class WebSocketDatasourceImpl implements WebSocketDatasource {
|
||||||
final WebSocketApi _webSocketApi;
|
final WebSocketApi _webSocketApi;
|
||||||
@@ -23,35 +19,21 @@ class WebSocketDatasourceImpl implements WebSocketDatasource {
|
|||||||
|
|
||||||
const WebSocketDatasourceImpl(this._webSocketApi, this._exceptionThrower);
|
const WebSocketDatasourceImpl(this._webSocketApi, this._exceptionThrower);
|
||||||
|
|
||||||
static const String _webSocketClosed = 'webSocketClosed';
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Stream getWebSocketChannel(Session session, AccountId accountId) {
|
Future<WebSocketChannel> getWebSocketChannel(Session session, AccountId accountId) {
|
||||||
return Stream
|
return Future.sync(() async {
|
||||||
.castFrom(_getWebSocketChannel(session, accountId))
|
|
||||||
.doOnError(_exceptionThrower.throwException);
|
|
||||||
}
|
|
||||||
|
|
||||||
Stream _getWebSocketChannel(
|
|
||||||
Session session,
|
|
||||||
AccountId accountId,
|
|
||||||
) async* {
|
|
||||||
final broadcastChannel = BroadcastChannel(Constant.wsServiceWorkerBroadcastChannel);
|
|
||||||
try {
|
|
||||||
_verifyWebSocketCapabilities(session, accountId);
|
_verifyWebSocketCapabilities(session, accountId);
|
||||||
final webSocketTicket = await _webSocketApi.getWebSocketTicket(session, accountId);
|
final webSocketTicket = await _webSocketApi.getWebSocketTicket(session, accountId);
|
||||||
final webSocketUri = _getWebSocketUri(session, accountId);
|
final webSocketUri = _getWebSocketUri(session, accountId);
|
||||||
window.navigator.serviceWorker?.controller?.postMessage(ConnectWebSocketMessage(
|
final webSocketChannel = WebSocketChannel.connect(
|
||||||
webSocketAction: WebSocketAction.connect,
|
Uri.parse('$webSocketUri?ticket=$webSocketTicket'),
|
||||||
webSocketUrl: webSocketUri.toString(),
|
protocols: ["jmap"],
|
||||||
webSocketTicket: webSocketTicket
|
);
|
||||||
).toJson());
|
|
||||||
|
|
||||||
yield* _webSocketListener(broadcastChannel);
|
await webSocketChannel.ready;
|
||||||
} catch (e) {
|
|
||||||
logError('RemoteWebSocketDatasourceImpl::getWebSocketChannel():error: $e');
|
return webSocketChannel;
|
||||||
rethrow;
|
}).catchError(_exceptionThrower.throwException);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _verifyWebSocketCapabilities(Session session, AccountId accountId) {
|
void _verifyWebSocketCapabilities(Session session, AccountId accountId) {
|
||||||
@@ -77,14 +59,4 @@ class WebSocketDatasourceImpl implements WebSocketDatasource {
|
|||||||
|
|
||||||
return webSocketUri;
|
return webSocketUri;
|
||||||
}
|
}
|
||||||
|
|
||||||
Stream _webSocketListener(BroadcastChannel broadcastChannel) {
|
|
||||||
return broadcastChannel.onMessage.map((event) {
|
|
||||||
if (event.data == _webSocketClosed) {
|
|
||||||
throw WebSocketClosedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
return event.data;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import 'package:json_annotation/json_annotation.dart';
|
|
||||||
|
|
||||||
part 'web_socket_echo.g.dart';
|
|
||||||
|
|
||||||
@JsonSerializable(includeIfNull: false)
|
|
||||||
class WebSocketEcho {
|
|
||||||
@JsonKey(name: '@type')
|
|
||||||
final String? type;
|
|
||||||
final String? requestId;
|
|
||||||
final List<List<dynamic>>? methodResponses;
|
|
||||||
|
|
||||||
WebSocketEcho({
|
|
||||||
this.type,
|
|
||||||
this.requestId,
|
|
||||||
this.methodResponses,
|
|
||||||
});
|
|
||||||
|
|
||||||
factory WebSocketEcho.fromJson(Map<String, dynamic> json) => _$WebSocketEchoFromJson(json);
|
|
||||||
|
|
||||||
Map<String, dynamic> toJson() => _$WebSocketEchoToJson(this);
|
|
||||||
|
|
||||||
static bool isValid(Map<String, dynamic> json) {
|
|
||||||
try {
|
|
||||||
final webSocketEcho = WebSocketEcho.fromJson(json);
|
|
||||||
final listResponses = webSocketEcho.methodResponses?.firstOrNull;
|
|
||||||
return listResponses?.contains('Core/echo') ?? false;
|
|
||||||
} catch (_) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
|
||||||
|
import 'package:tmail_ui_user/features/push_notification/data/model/web_socket_request.dart';
|
||||||
|
|
||||||
|
class WebSocketEchoRequest extends WebSocketRequest {
|
||||||
|
static const String type = 'Request';
|
||||||
|
static const String id = 'R1';
|
||||||
|
static final CapabilityIdentifier usingCapability = CapabilityIdentifier.jmapCore;
|
||||||
|
static const String method = 'Core/echo';
|
||||||
|
|
||||||
|
@override
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
return {
|
||||||
|
'@type': type,
|
||||||
|
'id': id,
|
||||||
|
'using': [usingCapability.value.toString()],
|
||||||
|
'methodCalls': [[method, {}, 'c0']],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import 'package:fcm/model/type_name.dart';
|
||||||
|
|
||||||
|
class WebSocketPushEnableRequest {
|
||||||
|
static const String type = 'WebSocketPushEnable';
|
||||||
|
|
||||||
|
static Map<String, dynamic> toJson({
|
||||||
|
required List<TypeName> dataTypes,
|
||||||
|
}) {
|
||||||
|
return {
|
||||||
|
'@type': type,
|
||||||
|
'dataTypes': dataTypes.map((typeName) => typeName.value).toList(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
abstract class WebSocketRequest {
|
||||||
|
const WebSocketRequest();
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson();
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/data/datasource/web_socket_datasource.dart';
|
import 'package:tmail_ui_user/features/push_notification/data/datasource/web_socket_datasource.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/repository/web_socket_repository.dart';
|
import 'package:tmail_ui_user/features/push_notification/domain/repository/web_socket_repository.dart';
|
||||||
|
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||||
|
|
||||||
class WebSocketRepositoryImpl implements WebSocketRepository {
|
class WebSocketRepositoryImpl implements WebSocketRepository {
|
||||||
final WebSocketDatasource _webSocketDatasource;
|
final WebSocketDatasource _webSocketDatasource;
|
||||||
@@ -9,6 +10,8 @@ class WebSocketRepositoryImpl implements WebSocketRepository {
|
|||||||
WebSocketRepositoryImpl(this._webSocketDatasource);
|
WebSocketRepositoryImpl(this._webSocketDatasource);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Stream getWebSocketChannel(Session session, AccountId accountId)
|
Future<WebSocketChannel> getWebSocketChannel(
|
||||||
=> _webSocketDatasource.getWebSocketChannel(session, accountId);
|
Session session,
|
||||||
|
AccountId accountId
|
||||||
|
) => _webSocketDatasource.getWebSocketChannel(session, accountId);
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
|
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||||
|
|
||||||
abstract class WebSocketRepository {
|
abstract class WebSocketRepository {
|
||||||
Stream getWebSocketChannel(Session session, AccountId accountId);
|
Future<WebSocketChannel> getWebSocketChannel(
|
||||||
|
Session session,
|
||||||
|
AccountId accountId);
|
||||||
}
|
}
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:jmap_dart_client/jmap/push/state_change.dart';
|
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||||
|
|
||||||
class InitializingWebSocketPushChannel extends LoadingState {}
|
class InitializingWebSocketPushChannel extends LoadingState {}
|
||||||
|
|
||||||
class WebSocketPushStateReceived extends UIState {
|
class WebSocketConnectionSuccess extends UIState {
|
||||||
final StateChange? stateChange;
|
final WebSocketChannel webSocketChannel;
|
||||||
|
|
||||||
WebSocketPushStateReceived(this.stateChange);
|
WebSocketConnectionSuccess(this.webSocketChannel);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => [stateChange];
|
List<Object?> get props => [webSocketChannel];
|
||||||
}
|
}
|
||||||
|
|
||||||
class WebSocketConnectionFailed extends FeatureFailure {
|
class WebSocketConnectionFailed extends FeatureFailure {
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
import 'dart:convert';
|
|
||||||
|
|
||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:core/utils/app_logger.dart';
|
import 'package:core/utils/app_logger.dart';
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/push/state_change.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/data/model/web_socket_echo.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/repository/web_socket_repository.dart';
|
import 'package:tmail_ui_user/features/push_notification/domain/repository/web_socket_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/state/web_socket_push_state.dart';
|
import 'package:tmail_ui_user/features/push_notification/domain/state/web_socket_push_state.dart';
|
||||||
|
|
||||||
@@ -22,31 +18,13 @@ class ConnectWebSocketInteractor {
|
|||||||
) async* {
|
) async* {
|
||||||
try {
|
try {
|
||||||
yield Right(InitializingWebSocketPushChannel());
|
yield Right(InitializingWebSocketPushChannel());
|
||||||
yield* _webSocketRepository
|
final webSocketChannel = await _webSocketRepository.getWebSocketChannel(
|
||||||
.getWebSocketChannel(session, accountId)
|
session,
|
||||||
.map(_toStateChange);
|
accountId);
|
||||||
|
yield Right(WebSocketConnectionSuccess(webSocketChannel));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError('ConnectWebSocketInteractor::execute: $e');
|
logError('ConnectWebSocketInteractor::execute: $e');
|
||||||
yield Left(WebSocketConnectionFailed(exception: e));
|
yield Left(WebSocketConnectionFailed(exception: e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Either<Failure, Success> _toStateChange(dynamic data) {
|
|
||||||
StateChange? possibleStateChange;
|
|
||||||
try {
|
|
||||||
if (data is String) {
|
|
||||||
data = jsonDecode(data);
|
|
||||||
}
|
|
||||||
possibleStateChange = StateChange.fromJson(data);
|
|
||||||
return Right(WebSocketPushStateReceived(possibleStateChange));
|
|
||||||
} catch (e) {
|
|
||||||
logError('ConnectWebSocketInteractor::_toStateChange: '
|
|
||||||
'websocket message is not StateChange: $data');
|
|
||||||
final dataIsWebSocketEcho = WebSocketEcho.isValid(data);
|
|
||||||
if (dataIsWebSocketEcho) {
|
|
||||||
return Right(WebSocketPushStateReceived(null));
|
|
||||||
}
|
|
||||||
return Left(WebSocketConnectionFailed(exception: e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -19,10 +19,8 @@ abstract class PushBaseController {
|
|||||||
Session? session;
|
Session? session;
|
||||||
AccountId? accountId;
|
AccountId? accountId;
|
||||||
|
|
||||||
StreamSubscription<Either<Failure, Success>>? _stateStreamSubscription;
|
|
||||||
|
|
||||||
void consumeState(Stream<Either<Failure, Success>> newStateStream) {
|
void consumeState(Stream<Either<Failure, Success>> newStateStream) {
|
||||||
_stateStreamSubscription = newStateStream.listen(
|
newStateStream.listen(
|
||||||
_handleStateStream,
|
_handleStateStream,
|
||||||
onError: handleErrorViewState,
|
onError: handleErrorViewState,
|
||||||
);
|
);
|
||||||
@@ -40,11 +38,6 @@ abstract class PushBaseController {
|
|||||||
logError('PushBaseController::handleErrorViewState():error: $error | stackTrace: $stackTrace');
|
logError('PushBaseController::handleErrorViewState():error: $error | stackTrace: $stackTrace');
|
||||||
}
|
}
|
||||||
|
|
||||||
void cancelStateStreamSubscription() {
|
|
||||||
_stateStreamSubscription?.cancel();
|
|
||||||
_stateStreamSubscription = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
void initialize({AccountId? accountId, Session? session}) {
|
void initialize({AccountId? accountId, Session? session}) {
|
||||||
this.accountId = accountId;
|
this.accountId = accountId;
|
||||||
this.session = session;
|
this.session = session;
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:core/utils/app_logger.dart';
|
import 'package:core/utils/app_logger.dart';
|
||||||
|
import 'package:fcm/model/type_name.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/exceptions/web_socket_exceptions.dart';
|
import 'package:jmap_dart_client/jmap/push/state_change.dart';
|
||||||
|
import 'package:tmail_ui_user/features/push_notification/data/model/web_socket_echo_request.dart';
|
||||||
|
import 'package:tmail_ui_user/features/push_notification/data/model/web_socket_push_enable_request.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/state/web_socket_push_state.dart';
|
import 'package:tmail_ui_user/features/push_notification/domain/state/web_socket_push_state.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/usecases/connect_web_socket_interactor.dart';
|
import 'package:tmail_ui_user/features/push_notification/domain/usecases/connect_web_socket_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/presentation/controller/push_base_controller.dart';
|
import 'package:tmail_ui_user/features/push_notification/presentation/controller/push_base_controller.dart';
|
||||||
@@ -11,6 +17,7 @@ import 'package:tmail_ui_user/features/push_notification/presentation/extensions
|
|||||||
import 'package:tmail_ui_user/features/push_notification/presentation/listener/email_change_listener.dart';
|
import 'package:tmail_ui_user/features/push_notification/presentation/listener/email_change_listener.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/presentation/listener/mailbox_change_listener.dart';
|
import 'package:tmail_ui_user/features/push_notification/presentation/listener/mailbox_change_listener.dart';
|
||||||
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||||
|
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||||
|
|
||||||
class WebSocketController extends PushBaseController {
|
class WebSocketController extends PushBaseController {
|
||||||
WebSocketController._internal();
|
WebSocketController._internal();
|
||||||
@@ -22,11 +29,16 @@ class WebSocketController extends PushBaseController {
|
|||||||
ConnectWebSocketInteractor? _connectWebSocketInteractor;
|
ConnectWebSocketInteractor? _connectWebSocketInteractor;
|
||||||
|
|
||||||
int _retryRemained = 3;
|
int _retryRemained = 3;
|
||||||
|
WebSocketChannel? _webSocketChannel;
|
||||||
|
Timer? _webSocketPingTimer;
|
||||||
|
StreamSubscription? _webSocketSubscription;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void handleFailureViewState(Failure failure) {
|
void handleFailureViewState(Failure failure) {
|
||||||
logError('WebSocketController::handleFailureViewState():Failure $failure');
|
logError('WebSocketController::handleFailureViewState():Failure $failure');
|
||||||
cancelStateStreamSubscription();
|
_webSocketSubscription?.cancel();
|
||||||
|
_webSocketChannel = null;
|
||||||
|
_webSocketPingTimer?.cancel();
|
||||||
if (failure is WebSocketConnectionFailed) {
|
if (failure is WebSocketConnectionFailed) {
|
||||||
_handleWebSocketConnectionRetry();
|
_handleWebSocketConnectionRetry();
|
||||||
}
|
}
|
||||||
@@ -35,18 +47,15 @@ class WebSocketController extends PushBaseController {
|
|||||||
@override
|
@override
|
||||||
void handleSuccessViewState(Success success) {
|
void handleSuccessViewState(Success success) {
|
||||||
log('WebSocketController::handleSuccessViewState():Success $success');
|
log('WebSocketController::handleSuccessViewState():Success $success');
|
||||||
if (success is WebSocketPushStateReceived) {
|
if (success is WebSocketConnectionSuccess) {
|
||||||
_handleWebSocketPushStateReceived(success);
|
_handleWebSocketConnectionSuccess(success);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void handleErrorViewState(Object error, StackTrace stackTrace) {
|
void handleErrorViewState(Object error, StackTrace stackTrace) {
|
||||||
super.handleErrorViewState(error, stackTrace);
|
super.handleErrorViewState(error, stackTrace);
|
||||||
cancelStateStreamSubscription();
|
handleFailureViewState(WebSocketConnectionFailed());
|
||||||
if (error is WebSocketClosedException) {
|
|
||||||
_handleWebSocketConnectionRetry();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -65,26 +74,69 @@ class WebSocketController extends PushBaseController {
|
|||||||
consumeState(_connectWebSocketInteractor!.execute(session, accountId));
|
consumeState(_connectWebSocketInteractor!.execute(session, accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handleWebSocketPushStateReceived(WebSocketPushStateReceived success) {
|
void _handleWebSocketConnectionSuccess(WebSocketConnectionSuccess success) {
|
||||||
log('WebSocketController::_handleWebSocketPushStateReceived(): $success');
|
log('WebSocketController::_handleWebSocketConnectionSuccess(): $success');
|
||||||
_retryRemained = 3;
|
_retryRemained = 3;
|
||||||
if (accountId == null || session == null) return;
|
_webSocketChannel = success.webSocketChannel;
|
||||||
final stateChange = success.stateChange;
|
_enableWebSocketPush();
|
||||||
if (stateChange == null) return;
|
_pingWebSocket();
|
||||||
final mapTypeState = stateChange.getMapTypeState(accountId!);
|
_listenToWebSocket();
|
||||||
mappingTypeStateToAction(
|
|
||||||
mapTypeState,
|
|
||||||
accountId!,
|
|
||||||
emailChangeListener: EmailChangeListener.instance,
|
|
||||||
mailboxChangeListener: MailboxChangeListener.instance,
|
|
||||||
session!.username,
|
|
||||||
session: session);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handleWebSocketConnectionRetry() {
|
void _handleWebSocketConnectionRetry() {
|
||||||
|
_webSocketSubscription?.cancel();
|
||||||
|
_webSocketChannel = null;
|
||||||
|
_webSocketPingTimer?.cancel();
|
||||||
if (_retryRemained > 0) {
|
if (_retryRemained > 0) {
|
||||||
_retryRemained--;
|
_retryRemained--;
|
||||||
_connectWebSocket(accountId, session);
|
_connectWebSocket(accountId, session);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _enableWebSocketPush() {
|
||||||
|
_webSocketChannel?.sink.add(jsonEncode(WebSocketPushEnableRequest.toJson(
|
||||||
|
dataTypes: [TypeName.emailType, TypeName.mailboxType]
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
void _pingWebSocket() {
|
||||||
|
_webSocketPingTimer = Timer.periodic(const Duration(seconds: 10), (_) {
|
||||||
|
_webSocketChannel?.sink.add(jsonEncode(WebSocketEchoRequest().toJson()));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _listenToWebSocket() {
|
||||||
|
_webSocketSubscription = _webSocketChannel?.stream.listen(
|
||||||
|
(data) {
|
||||||
|
log('WebSocketController::_listenToWebSocket(): $data');
|
||||||
|
if (session == null || accountId == null) return;
|
||||||
|
if (data is String) {
|
||||||
|
data = jsonDecode(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
final stateChange = StateChange.fromJson(data);
|
||||||
|
final mapTypeState = stateChange.getMapTypeState(accountId!);
|
||||||
|
mappingTypeStateToAction(
|
||||||
|
mapTypeState,
|
||||||
|
accountId!,
|
||||||
|
emailChangeListener: EmailChangeListener.instance,
|
||||||
|
mailboxChangeListener: MailboxChangeListener.instance,
|
||||||
|
session!.username,
|
||||||
|
session: session);
|
||||||
|
} catch (e) {
|
||||||
|
logError('WebSocketController::_listenToWebSocket(): Data is not StateChange');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
cancelOnError: true,
|
||||||
|
onError: (error) {
|
||||||
|
logError('WebSocketController::_listenToWebSocket():Error: $error');
|
||||||
|
handleFailureViewState(WebSocketConnectionFailed(exception: error));
|
||||||
|
},
|
||||||
|
onDone: () {
|
||||||
|
log('WebSocketController::_listenToWebSocket():onDone');
|
||||||
|
_handleWebSocketConnectionRetry();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,7 @@
|
|||||||
import 'package:core/utils/app_logger.dart';
|
import 'package:core/utils/app_logger.dart';
|
||||||
import 'package:core/utils/broadcast_channel/broadcast_channel.dart';
|
|
||||||
import 'package:core/utils/platform_info.dart';
|
|
||||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/presentation/controller/fcm_message_controller.dart';
|
import 'package:tmail_ui_user/features/push_notification/presentation/controller/fcm_message_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
|
import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
|
||||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
|
||||||
import 'package:universal_html/html.dart' as html show MessageEvent, DomException;
|
|
||||||
|
|
||||||
@pragma('vm:entry-point')
|
@pragma('vm:entry-point')
|
||||||
Future<void> handleFirebaseBackgroundMessage(RemoteMessage message) async {
|
Future<void> handleFirebaseBackgroundMessage(RemoteMessage message) async {
|
||||||
@@ -23,32 +19,11 @@ class FcmReceiver {
|
|||||||
|
|
||||||
static const int MAX_COUNT_RETRY_TO_GET_FCM_TOKEN = 3;
|
static const int MAX_COUNT_RETRY_TO_GET_FCM_TOKEN = 3;
|
||||||
|
|
||||||
int _countRetryToGetFcmToken = 0;
|
|
||||||
|
|
||||||
Future onInitialFcmListener() async {
|
Future onInitialFcmListener() async {
|
||||||
_countRetryToGetFcmToken = 0;
|
|
||||||
_onForegroundMessage();
|
_onForegroundMessage();
|
||||||
_onBackgroundMessage();
|
_onBackgroundMessage();
|
||||||
|
|
||||||
if (PlatformInfo.isWeb) {
|
await _onHandleFcmToken();
|
||||||
_onMessageBroadcastChannel();
|
|
||||||
await _requestNotificationPermissionOnWeb();
|
|
||||||
} else {
|
|
||||||
await _onHandleFcmToken();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _requestNotificationPermissionOnWeb() async {
|
|
||||||
NotificationSettings notificationSetting = await FirebaseMessaging.instance.getNotificationSettings();
|
|
||||||
log('FcmReceiver::_requestNotificationPermissionOnWeb: authorizationStatus = ${notificationSetting.authorizationStatus}');
|
|
||||||
if (notificationSetting.authorizationStatus != AuthorizationStatus.authorized) {
|
|
||||||
notificationSetting = await FirebaseMessaging.instance.requestPermission();
|
|
||||||
if (notificationSetting.authorizationStatus == AuthorizationStatus.authorized) {
|
|
||||||
await _onHandleFcmToken();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
await _onHandleFcmToken();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onForegroundMessage() {
|
void _onForegroundMessage() {
|
||||||
@@ -59,38 +34,17 @@ class FcmReceiver {
|
|||||||
FirebaseMessaging.onBackgroundMessage(handleFirebaseBackgroundMessage);
|
FirebaseMessaging.onBackgroundMessage(handleFirebaseBackgroundMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onMessageBroadcastChannel() {
|
|
||||||
final broadcast = BroadcastChannel('background-message');
|
|
||||||
broadcast.onMessage.listen((event) {
|
|
||||||
if (event is html.MessageEvent) {
|
|
||||||
FcmService.instance.handleMessageEventBroadcastChannel(event);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<String?> _getInitialToken() async {
|
Future<String?> _getInitialToken() async {
|
||||||
try {
|
try {
|
||||||
final vapidKey = PlatformInfo.isWeb ? AppConfig.fcmVapidPublicKeyWeb : null;
|
final token = await FirebaseMessaging.instance.getToken();
|
||||||
final token = await FirebaseMessaging.instance.getToken(vapidKey: vapidKey);
|
|
||||||
log('FcmReceiver::_getInitialToken:token: $token');
|
log('FcmReceiver::_getInitialToken:token: $token');
|
||||||
return token;
|
return token;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError('FcmReceiver::_getInitialToken: TYPE = ${e.runtimeType} | Exception = $e');
|
logError('FcmReceiver::_getInitialToken: TYPE = ${e.runtimeType} | Exception = $e');
|
||||||
if (PlatformInfo.isWeb
|
|
||||||
&& e is html.DomException
|
|
||||||
&& _countRetryToGetFcmToken < MAX_COUNT_RETRY_TO_GET_FCM_TOKEN) {
|
|
||||||
return await _retryGetToken();
|
|
||||||
}
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String?> _retryGetToken() async {
|
|
||||||
_countRetryToGetFcmToken++;
|
|
||||||
log('FcmReceiver::_retryGetToken: CountRetry = $_countRetryToGetFcmToken');
|
|
||||||
return await _getInitialToken();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future _onHandleFcmToken() async {
|
Future _onHandleFcmToken() async {
|
||||||
final token = await _getInitialToken();
|
final token = await _getInitialToken();
|
||||||
FcmService.instance.handleToken(token);
|
FcmService.instance.handleToken(token);
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ class AppConfig {
|
|||||||
return supportedOtherPlatform == 'supported';
|
return supportedOtherPlatform == 'supported';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static String get fcmVapidPublicKeyWeb => dotenv.get('FIREBASE_WEB_VAPID_PUBLIC_KEY', fallback: '');
|
|
||||||
static List<String> get oidcScopes {
|
static List<String> get oidcScopes {
|
||||||
try {
|
try {
|
||||||
final envScopes = dotenv.get('OIDC_SCOPES', fallback: '');
|
final envScopes = dotenv.get('OIDC_SCOPES', fallback: '');
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
import 'package:flutter_test/flutter_test.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/data/model/web_socket_echo.dart';
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
group('web socket echo test:', () {
|
|
||||||
group('isValid():', () {
|
|
||||||
test(
|
|
||||||
'should return true '
|
|
||||||
'when json is web socket echo',
|
|
||||||
() {
|
|
||||||
// arrange
|
|
||||||
final json = {
|
|
||||||
"@type": "Response",
|
|
||||||
"requestId": "R1",
|
|
||||||
"methodResponses": [["Core/echo", {}, "c0"]]
|
|
||||||
};
|
|
||||||
|
|
||||||
// act
|
|
||||||
final result = WebSocketEcho.isValid(json);
|
|
||||||
|
|
||||||
// assert
|
|
||||||
expect(result, true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test(
|
|
||||||
'should return false '
|
|
||||||
'when json is not web socket echo',
|
|
||||||
() {
|
|
||||||
// arrange
|
|
||||||
final json = {
|
|
||||||
"@type": "Response",
|
|
||||||
"requestId": "R1",
|
|
||||||
"methodResponses": [["Core/not-echo", {}, "c0"]]
|
|
||||||
};
|
|
||||||
|
|
||||||
// act
|
|
||||||
final result = WebSocketEcho.isValid(json);
|
|
||||||
|
|
||||||
// assert
|
|
||||||
expect(result, false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
-121
@@ -1,121 +0,0 @@
|
|||||||
import 'package:dartz/dartz.dart';
|
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/push/state_change.dart';
|
|
||||||
import 'package:mockito/annotations.dart';
|
|
||||||
import 'package:mockito/mockito.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/repository/web_socket_repository.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/state/web_socket_push_state.dart';
|
|
||||||
import 'package:tmail_ui_user/features/push_notification/domain/usecases/connect_web_socket_interactor.dart';
|
|
||||||
|
|
||||||
import '../../../../fixtures/account_fixtures.dart';
|
|
||||||
import '../../../../fixtures/session_fixtures.dart';
|
|
||||||
import 'connect_web_socket_interactor_test.mocks.dart';
|
|
||||||
|
|
||||||
@GenerateNiceMocks([MockSpec<WebSocketRepository>()])
|
|
||||||
void main() {
|
|
||||||
late MockWebSocketRepository webSocketRepository;
|
|
||||||
late ConnectWebSocketInteractor connectWebSocketInteractor;
|
|
||||||
|
|
||||||
setUp(() {
|
|
||||||
webSocketRepository = MockWebSocketRepository();
|
|
||||||
connectWebSocketInteractor = ConnectWebSocketInteractor(webSocketRepository);
|
|
||||||
});
|
|
||||||
|
|
||||||
group('connect web socket interactor test:', () {
|
|
||||||
test(
|
|
||||||
'should yield WebSocketPushStateReceived with StateChange '
|
|
||||||
'when web socket repository yield StateChange',
|
|
||||||
() {
|
|
||||||
// arrange
|
|
||||||
final stateChangeJson = {
|
|
||||||
"@type": "StateChange",
|
|
||||||
"changed": <String, dynamic>{}
|
|
||||||
};
|
|
||||||
when(webSocketRepository.getWebSocketChannel(any, any))
|
|
||||||
.thenAnswer((_) => Stream.value(stateChangeJson));
|
|
||||||
|
|
||||||
// assert
|
|
||||||
expect(
|
|
||||||
connectWebSocketInteractor.execute(
|
|
||||||
SessionFixtures.aliceSession,
|
|
||||||
AccountFixtures.aliceAccountId),
|
|
||||||
emitsInOrder([
|
|
||||||
Right(InitializingWebSocketPushChannel()),
|
|
||||||
Right(WebSocketPushStateReceived(StateChange.fromJson(stateChangeJson))),
|
|
||||||
]));
|
|
||||||
});
|
|
||||||
|
|
||||||
test(
|
|
||||||
'should yield WebSocketPushStateReceived with null '
|
|
||||||
'when web socket repository yield WebSocketEcho',
|
|
||||||
() {
|
|
||||||
// arrange
|
|
||||||
final webSocketEchoJson = {
|
|
||||||
"@type": "Response",
|
|
||||||
"requestId": "R1",
|
|
||||||
"methodResponses": [["Core/echo", {}, "c0"]]
|
|
||||||
};
|
|
||||||
when(webSocketRepository.getWebSocketChannel(any, any))
|
|
||||||
.thenAnswer((_) => Stream.value(webSocketEchoJson));
|
|
||||||
|
|
||||||
// assert
|
|
||||||
expect(
|
|
||||||
connectWebSocketInteractor.execute(
|
|
||||||
SessionFixtures.aliceSession,
|
|
||||||
AccountFixtures.aliceAccountId),
|
|
||||||
emitsInOrder([
|
|
||||||
Right(InitializingWebSocketPushChannel()),
|
|
||||||
Right(WebSocketPushStateReceived(null)),
|
|
||||||
]));
|
|
||||||
});
|
|
||||||
|
|
||||||
test(
|
|
||||||
'should yield WebSocketConnectionFailed '
|
|
||||||
'when web socket repository throws exception',
|
|
||||||
() {
|
|
||||||
// arrange
|
|
||||||
final exception = Exception();
|
|
||||||
when(webSocketRepository.getWebSocketChannel(any, any))
|
|
||||||
.thenThrow(exception);
|
|
||||||
|
|
||||||
// assert
|
|
||||||
expect(
|
|
||||||
connectWebSocketInteractor.execute(
|
|
||||||
SessionFixtures.aliceSession,
|
|
||||||
AccountFixtures.aliceAccountId),
|
|
||||||
emitsInOrder([
|
|
||||||
Right(InitializingWebSocketPushChannel()),
|
|
||||||
Left(WebSocketConnectionFailed(exception: exception)),
|
|
||||||
]));
|
|
||||||
});
|
|
||||||
|
|
||||||
test(
|
|
||||||
'should yield WebSocketConnectionFailed '
|
|
||||||
'when web socket repository yield data '
|
|
||||||
'and data is not web socket echo',
|
|
||||||
() async {
|
|
||||||
// arrange
|
|
||||||
final notWebSocketEchoJson = {
|
|
||||||
"@type": "Response",
|
|
||||||
"requestId": "R1",
|
|
||||||
"methodResponses": [["Core/not-echo", {}, "c0"]]
|
|
||||||
};
|
|
||||||
when(webSocketRepository.getWebSocketChannel(any, any))
|
|
||||||
.thenAnswer((_) => Stream.value(notWebSocketEchoJson));
|
|
||||||
|
|
||||||
// act
|
|
||||||
final lastState = await connectWebSocketInteractor.execute(
|
|
||||||
SessionFixtures.aliceSession,
|
|
||||||
AccountFixtures.aliceAccountId).last;
|
|
||||||
|
|
||||||
// assert
|
|
||||||
expect(
|
|
||||||
lastState.fold(
|
|
||||||
(failure) => failure is WebSocketConnectionFailed,
|
|
||||||
(success) => false,
|
|
||||||
),
|
|
||||||
true
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
importScripts("https://www.gstatic.com/firebasejs/9.10.0/firebase-app-compat.js");
|
|
||||||
importScripts("https://www.gstatic.com/firebasejs/9.10.0/firebase-messaging-compat.js");
|
|
||||||
// Initialize the Firebase app in the service worker by passing in the messagingSenderId.
|
|
||||||
firebase.initializeApp({
|
|
||||||
apiKey: "...",
|
|
||||||
authDomain: "...",
|
|
||||||
databaseURL: "...",
|
|
||||||
projectId: "...",
|
|
||||||
storageBucket: "...",
|
|
||||||
messagingSenderId: "...",
|
|
||||||
appId: "...",
|
|
||||||
});
|
|
||||||
// Retrieve an instance of Firebase Messaging so that it can handle background messages.
|
|
||||||
const messaging = firebase.messaging();
|
|
||||||
|
|
||||||
const broadcast = new BroadcastChannel('background-message');
|
|
||||||
|
|
||||||
messaging.onBackgroundMessage((message) => {
|
|
||||||
broadcast.postMessage(message);
|
|
||||||
});
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
importScripts('flutter_service_worker.js?v={{flutter_service_worker_version}}');
|
|
||||||
|
|
||||||
var webSocket;
|
|
||||||
const broadcast = new BroadcastChannel("background-message");
|
|
||||||
var intervalId;
|
|
||||||
const pingIntervalInMs = 10000;
|
|
||||||
|
|
||||||
function connect(url, ticket) {
|
|
||||||
webSocket = new WebSocket(`${url}?ticket=${ticket}`, "jmap");
|
|
||||||
|
|
||||||
webSocket.onopen = () => {
|
|
||||||
console.log("websocket open");
|
|
||||||
webSocket.send(
|
|
||||||
JSON.stringify({
|
|
||||||
"@type": "WebSocketPushEnable",
|
|
||||||
dataTypes: ["Mailbox", "Email"],
|
|
||||||
})
|
|
||||||
);
|
|
||||||
intervalId = setInterval(() => {
|
|
||||||
webSocket.send(
|
|
||||||
JSON.stringify({
|
|
||||||
"@type": "Request",
|
|
||||||
id: "R1",
|
|
||||||
using: ["urn:ietf:params:jmap:core"],
|
|
||||||
methodCalls: [["Core/echo", {}, "c0"]],
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}, pingIntervalInMs);
|
|
||||||
};
|
|
||||||
|
|
||||||
webSocket.onmessage = (event) => {
|
|
||||||
console.log(`websocket received message: ${event.data}`);
|
|
||||||
broadcast.postMessage(event.data);
|
|
||||||
};
|
|
||||||
|
|
||||||
webSocket.onclose = (event) => {
|
|
||||||
console.log(
|
|
||||||
`websocket connection closed with code: "${event.code}" reason: "${event.reason}" and cleanly: "${event.wasClean}"`
|
|
||||||
);
|
|
||||||
broadcast.postMessage("webSocketClosed");
|
|
||||||
webSocket = null;
|
|
||||||
clearInterval(intervalId);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function disconnect() {
|
|
||||||
if (webSocket == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
webSocket.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
self.addEventListener("install", (event) => {
|
|
||||||
self.skipWaiting().then(() => {
|
|
||||||
console.log("Service worker installed");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
self.addEventListener("activate", (event) => {
|
|
||||||
event.waitUntil(
|
|
||||||
self.clients.claim().then(() => {
|
|
||||||
console.log("Service worker activated");
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
self.addEventListener("message", (event) => {
|
|
||||||
console.log(`web socket worker received message: ${event.data}`);
|
|
||||||
if (event.data.action === "connect") {
|
|
||||||
connect(event.data.url, event.data.ticket);
|
|
||||||
} else if (event.data.action === "disconnect") {
|
|
||||||
disconnect();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -23,7 +23,7 @@ function fetchServiceWorker() {
|
|||||||
// Wait for registration to finish before dropping the <script>tag.
|
// Wait for registration to finish before dropping the <script>tag.
|
||||||
// Otherwise, the browser will load the script multiple times,
|
// Otherwise, the browser will load the script multiple times,
|
||||||
// potentially different versions.
|
// potentially different versions.
|
||||||
navigator.serviceWorker.register('web-sockets-worker.js')
|
navigator.serviceWorker.register('flutter_service_worker.js?v={{flutter_service_worker_version}}')
|
||||||
.then((reg) => {
|
.then((reg) => {
|
||||||
function waitForActivation(serviceWorker) {
|
function waitForActivation(serviceWorker) {
|
||||||
serviceWorker.addEventListener('statechange', () => {
|
serviceWorker.addEventListener('statechange', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user