Merged with latest dev

Author: abedelaziz-deriv

lib/services/connection/api_manager/binary_api.dart

@@ -4,6 +4,7 @@ import 'dart:developer' as dev;
 import 'dart:io';
 
 import 'package:flutter/widgets.dart';
+import 'package:flutter_system_proxy/flutter_system_proxy.dart';
 import 'package:web_socket_channel/io.dart';
 
 import 'package:flutter_deriv_api/api/models/enums.dart';
@@ -23,8 +24,10 @@ import 'package:flutter_deriv_api/services/connection/call_manager/subscription_
 /// This class is for handling Binary API connection and calling Binary APIs.
 class BinaryAPI extends BaseAPI {
   /// Initializes [BinaryAPI] instance.
-  BinaryAPI({String? key, bool enableDebug = false})
-      : super(key: key ?? '${UniqueKey()}', enableDebug: enableDebug);
+  BinaryAPI({
+    String? key,
+    bool enableDebug = false,
+  }) : super(key: key ?? '${UniqueKey()}', enableDebug: enableDebug);
 
   static const Duration _disconnectTimeOut = Duration(seconds: 5);
   static const Duration _websocketConnectTimeOut = Duration(seconds: 10);
@@ -74,12 +77,14 @@ class BinaryAPI extends BaseAPI {
     _logDebugInfo('connecting to $uri.');
 
     await _setUserAgent();
+    final String proxy = await FlutterSystemProxy.findProxyFromEnvironment(
+        uri.toString().replaceAll('wss', 'https'));
+
+    final HttpClient client = HttpClient()..findProxy = (Uri uri) => proxy;
 
     // Initialize connection to websocket server.
-    _webSocketChannel = IOWebSocketChannel.connect(
-      '$uri',
-      pingInterval: _websocketConnectTimeOut,
-    );
+    _webSocketChannel = IOWebSocketChannel.connect('$uri',
+        pingInterval: _websocketConnectTimeOut, customClient: client);
 
     _webSocketListener = _webSocketChannel?.stream
         .map<Map<String, dynamic>?>((Object? result) => jsonDecode('$result'))

lib/state/connection/connection_cubit.dart

@@ -25,7 +25,11 @@ class ConnectionCubit extends Cubit<ConnectionState> {
     this.printResponse = false,
   }) : super(const ConnectionInitialState()) {
     APIInitializer().initialize(
-      api: api ?? BinaryAPI(key: _key, enableDebug: enableDebug),
+      api: api ??
+          BinaryAPI(
+            key: _key,
+            enableDebug: enableDebug,
+          ),
     );
 
     _api = Injector()<BaseAPI>();

pubspec.yaml

@@ -28,8 +28,11 @@ dependencies:
   meta: ^1.8.0
   recase: ^4.0.0
   rxdart: ^0.27.7
-  web_socket_channel: ^2.3.0
   device_info_plus: ^8.1.0
+  flutter_system_proxy:
+    git:
+      url: [email protected]:BrowserStackCE/flutter_system_proxy.git
+      ref: main
   package_info_plus: ^4.2.0
   connectivity_plus: ^5.0.2