Merge branch 'dev' into flutter-version-3

Author: hamed-rezaee

lib/api/response/p2p_ping_response_result.dart

@@ -2,7 +2,14 @@
 
 import 'package:equatable/equatable.dart';
 
+import 'package:deriv_dependency_injector/dependency_injector.dart';
+import 'package:flutter_deriv_api/api/exceptions/exceptions.dart';
+import 'package:flutter_deriv_api/api/models/base_exception_model.dart';
+import 'package:flutter_deriv_api/basic_api/generated/p2p_ping_receive.dart';
+import 'package:flutter_deriv_api/basic_api/generated/p2p_ping_send.dart';
+
 import 'package:flutter_deriv_api/helpers/helpers.dart';
+import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 
 /// P2p ping response model class.
 abstract class P2pPingResponseModel {
@@ -44,6 +51,40 @@ class P2pPingResponse extends P2pPingResponseModel {
     return resultMap;
   }
 
+  static final BaseAPI _api = Injector()<BaseAPI>();
+
+  /// Requests the p2p ping request to the server.
+  ///
+  /// Mostly used to test the connection or to keep it alive.
+  /// Throws a [APIBaseException] if API response contains an error.
+  static Future<P2pPingReceive> p2pPingMethodRaw([
+    P2pPingRequest? request,
+  ]) async {
+    final P2pPingReceive response = await _api.call(
+      request: request ?? const P2pPingRequest(),
+    );
+
+    checkException(
+      response: response,
+      exceptionCreator: ({BaseExceptionModel? baseExceptionModel}) =>
+          APIBaseException(baseExceptionModel: baseExceptionModel),
+    );
+
+    return response;
+  }
+
+  /// Requests the p2p ping request to the server.
+  ///
+  /// Mostly used to test the connection or to keep it alive.
+  /// Throws a [APIBaseException] if API response contains an error.
+  static Future<P2pPingResponse> p2pPingMethod([
+    P2pPingRequest? request,
+  ]) async {
+    final P2pPingReceive response = await p2pPingMethodRaw(request);
+
+    return P2pPingResponse.fromJson(response.p2pPing);
+  }
+
   /// Creates a copy of instance with given parameters.
   P2pPingResponse copyWith({
     P2pPingEnum? p2pPing,

lib/basic_api/generated/methods/p2p_ping_receive_methods.json

@@ -1,4 +1,4 @@
 {
-  "methods": "",
-  "imports": "import 'package:flutter_deriv_api/helpers/helpers.dart';\n"
+  "methods": "static final BaseAPI _api = Injector()<BaseAPI>(); \n \n  /// Requests the p2p ping request to the server. \n  /// \n  /// Mostly used to test the connection or to keep it alive. \n  /// Throws a [APIBaseException] if API response contains an error. \n  static Future<P2pPingReceive> p2pPingMethodRaw([ \n    P2pPingRequest? request, \n  ]) async { \n    final P2pPingReceive response = await _api.call( \n      request: request ?? const P2pPingRequest(), \n    ); \n \n    checkException( \n      response: response, \n      exceptionCreator: ({BaseExceptionModel? baseExceptionModel}) => \n          APIBaseException(baseExceptionModel: baseExceptionModel), \n    ); \n \n    return response; \n  } \n \n  /// Requests the p2p ping request to the server. \n  /// \n  /// Mostly used to test the connection or to keep it alive. \n  /// Throws a [APIBaseException] if API response contains an error. \n  static Future<P2pPingResponse> p2pPingMethod([ \n    P2pPingRequest? request, \n  ]) async { \n    final P2pPingReceive response = await p2pPingMethodRaw(request); \n \n    return P2pPingResponse.fromJson(response.p2pPing); \n  }",
+  "imports": "import 'package:deriv_dependency_injector/dependency_injector.dart'; \nimport 'package:flutter_deriv_api/api/exceptions/exceptions.dart'; \nimport 'package:flutter_deriv_api/api/models/base_exception_model.dart'; \nimport 'package:flutter_deriv_api/basic_api/generated/p2p_ping_receive.dart'; \nimport 'package:flutter_deriv_api/basic_api/generated/p2p_ping_send.dart'; \n \nimport 'package:flutter_deriv_api/helpers/helpers.dart'; \nimport 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';\n"
 }

lib/state/connection/connection_cubit.dart

@@ -111,11 +111,9 @@ class ConnectionCubit extends Cubit<ConnectionState> {
           emit(const ConnectionConnectedState());
         }
       },
-      onDone: (String key) async {
+      onDone: (String key) {
         if (_key == key) {
-          await _api!.disconnect();
-
-          emit(const ConnectionDisconnectedState());
+          unawaited(reconnect());
         }
       },
       onError: (String key) {

lib/state/server_time/server_time_cubit.dart

@@ -27,6 +27,9 @@ class ServerTimeCubit extends Cubit<ServerTimeState> {
   void _connectionListener(ConnectionState state) {
     _fetchServerTime(state);
 
+    if (_serverTimeInterval != null && _serverTimeInterval!.isActive) {
+      _serverTimeInterval!.cancel();
+    }
     _serverTimeInterval = Timer.periodic(
       _fetchServerTimeDuration,
       (Timer timer) => _fetchServerTime(state),