WIP: trying to integrate SOCKS5 tunneling as VPN

Author: AlaaElattar

lib/features/home/home_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+// import 'package:mycelmob/mycelmob.dart';
 import '../../app/widgets/app_scaffold.dart';
 import '../../app/widgets/app_button.dart';
 import '../../app/widgets/app_card.dart';
@@ -60,6 +61,7 @@ class HomeScreen extends ConsumerWidget {
             onDisconnect: () async {
               await service.stop();
             },
+            service: service,
           ),
           const SizedBox(height: AppSpacing.xxl),
           const _StatsRow(),
@@ -74,11 +76,13 @@ class _HeaderCard extends StatefulWidget {
   final NodeStatus status;
   final Future<void> Function() onConnect;
   final Future<void> Function() onDisconnect;
+  final dynamic service;
 
   const _HeaderCard({
     required this.status,
     required this.onConnect,
     required this.onDisconnect,
+    required this.service,
   });
 
   @override
@@ -87,6 +91,7 @@ class _HeaderCard extends StatefulWidget {
 
 class _HeaderCardState extends State<_HeaderCard> {
   bool _isLoading = false;
+  bool _isSocks5Enabled = false;
 
   bool get isRestartVisible =>
       widget.status == NodeStatus.connected && !_isLoading;
@@ -181,14 +186,35 @@ class _HeaderCardState extends State<_HeaderCard> {
           const SizedBox(height: AppSpacing.lg),
           AppCard(
             margin: EdgeInsets.zero,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: const [
-                Flexible(
-                  child:
-                      Text('Advanced Options', overflow: TextOverflow.ellipsis),
+            child: ExpansionTile(
+              title: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: const [
+                  Flexible(
+                    child: Text('Advanced Options',
+                        overflow: TextOverflow.ellipsis),
+                  ),
+                  Icon(Icons.expand_more),
+                ],
+              ),
+              children: [
+                ListTile(
+                  title: const Text('Enable SOCKS5 tunneling as VPN'),
+                  trailing: Switch(
+                    value: _isSocks5Enabled,
+                    onChanged: (value) async {
+                      setState(() => _isSocks5Enabled = value);
+                      if (value) {
+                        final result =
+                            await widget.service.proxyConnect('127.0.0.1:1080');
+                        debugPrint('Proxy connect result: $result');
+                      } else {
+                        final result = await widget.service.proxyDisconnect();
+                        debugPrint('Proxy disconnect result: $result');
+                      }
+                    },
+                  ),
                 ),
-                Icon(Icons.chevron_right),
               ],
             ),
           ),

lib/features/settings/settings_screen.dart

@@ -71,7 +71,7 @@ class SettingsScreen extends ConsumerWidget {
                   ),
                   title: 'Mycelium Core',
                   subtitle: 'Network Protocol Version',
-                  value: 'v2.1.4',
+                  value: 'v0.6.2',
                 ),
                 const SizedBox(height: AppSpacing.lg),
                 _InfoRowWithSubtitle(

lib/main.dart

@@ -43,14 +43,14 @@ Future<void> main() async {
   runApp(const ProviderScope(child: MyApp()));
 }
 
-class MyApp extends StatefulWidget {
+class MyApp extends ConsumerStatefulWidget {
   const MyApp({super.key});
 
   @override
-  State<MyApp> createState() => _MyAppState();
+  ConsumerState<MyApp> createState() => _MyAppState();
 }
 
-class _MyAppState extends State<MyApp> {
+class _MyAppState extends ConsumerState<MyApp> {
   static const platform = MethodChannel("tech.threefold.mycelium/tun");
   String _nodeAddr = '';
   var privKey = Uint8List(0);
@@ -199,9 +199,7 @@ class _MyAppState extends State<MyApp> {
   @override
   Widget build(BuildContext context) {
     //_logger.info("ratio: ${MediaQuery.devicePixelRatioOf(context)}");
-    final settings = ProviderScope.containerOf(context, listen: true)
-        .read(appSettingsProvider)
-        .themeMode;
+    final settings = ref.watch(appSettingsProvider).themeMode;
     return MaterialApp.router(
       theme: AppTheme.light(),
       darkTheme: AppTheme.dark(),

lib/myceliumflut_ffi_binding.dart

@@ -3,6 +3,8 @@ import 'package:ffi/ffi.dart';
 import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:path/path.dart' show join;
+import 'dart:ffi';
+import 'dart:typed_data';
 
 ffi.DynamicLibrary loadDll() {
   var dllPath = 'assets/dll/winmycelium.dll';
@@ -200,3 +202,46 @@ Future<List<String>> myFFGetPeerStatus() async {
 
   return peerStatusList;
 }
+
+final DynamicLibrary _dylib = Platform.isMacOS || Platform.isWindows
+    ? DynamicLibrary.open('libmycelium.dylib')
+    : DynamicLibrary.open('libmycelium.so');
+
+typedef _ffiProxyConnectC = Pointer<Utf8> Function(Pointer<Utf8>);
+typedef _ffiProxyConnectDart = Pointer<Utf8> Function(Pointer<Utf8>);
+
+typedef _ffiProxyDisconnectC = Pointer<Utf8> Function();
+typedef _ffiProxyDisconnectDart = Pointer<Utf8> Function();
+
+final _ffiProxyConnect =
+    _dylib.lookupFunction<_ffiProxyConnectC, _ffiProxyConnectDart>(
+        'ffi_proxy_connect');
+
+final _ffiProxyDisconnect =
+    _dylib.lookupFunction<_ffiProxyDisconnectC, _ffiProxyDisconnectDart>(
+        'ffi_proxy_disconnect');
+
+/// Helper to free strings
+typedef _ffiFreeStringC = Void Function(Pointer<Utf8>);
+typedef _ffiFreeStringDart = void Function(Pointer<Utf8>);
+final _ffiFreeString = _dylib
+    .lookupFunction<_ffiFreeStringC, _ffiFreeStringDart>('ffi_free_string');
+
+List<String> myFFProxyConnect(String remote) {
+  final remotePtr = remote.toNativeUtf8();
+  final resultPtr = _ffiProxyConnect(remotePtr);
+  calloc.free(remotePtr);
+
+  final result = resultPtr.toDartString();
+  _ffiFreeString(resultPtr);
+
+  return result.split(','); // convert "a,b,c" -> ["a","b","c"]
+}
+
+List<String> myFFProxyDisconnect() {
+  final resultPtr = _ffiProxyDisconnect();
+  final result = resultPtr.toDartString();
+  _ffiFreeString(resultPtr);
+
+  return result.split(',');
+}

lib/services/ffi/mycelium_service.dart

@@ -8,9 +8,11 @@ import '../../myceliumflut_ffi_binding.dart';
 enum NodeStatus { disconnected, connecting, connected, failed }
 
 class MyceliumService {
-  static const MethodChannel _platform = MethodChannel("tech.threefold.mycelium/tun");
+  static const MethodChannel _platform =
+      MethodChannel("tech.threefold.mycelium/tun");
 
-  final StreamController<NodeStatus> _statusController = StreamController<NodeStatus>.broadcast();
+  final StreamController<NodeStatus> _statusController =
+      StreamController<NodeStatus>.broadcast();
   NodeStatus _status = NodeStatus.disconnected;
   Uint8List? _privKey;
 
@@ -29,7 +31,8 @@ class MyceliumService {
     if (isUseDylib()) {
       privKey = myFFGenerateSecretKey();
     } else {
-      privKey = (await _platform.invokeMethod<Uint8List>('generateSecretKey')) as Uint8List;
+      privKey = (await _platform.invokeMethod<Uint8List>('generateSecretKey'))
+          as Uint8List;
     }
     await file.writeAsBytes(privKey);
     _privKey = privKey;
@@ -59,18 +62,22 @@ class MyceliumService {
 
   String? validatePeer(String peer) {
     final prefixRegex = RegExp(r'^tcp://');
-    final ipv4Regex = RegExp(r'((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)');
-    final ipv6Regex = RegExp(r'\[(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))\]');
+    final ipv4Regex = RegExp(
+        r'((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)');
+    final ipv6Regex = RegExp(
+        r'\[(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))\]');
     final portRegex = RegExp(r':9651$');
     if (!prefixRegex.hasMatch(peer)) return 'peer must start with tcp://';
     final ipPortPart = peer.substring(peer.indexOf('://') + 3);
-    if (!ipv4Regex.hasMatch(ipPortPart) && !ipv6Regex.hasMatch(ipPortPart)) return 'peer must contain a valid IPv4 or IPv6 address';
+    if (!ipv4Regex.hasMatch(ipPortPart) && !ipv6Regex.hasMatch(ipPortPart))
+      return 'peer must contain a valid IPv4 or IPv6 address';
     if (!portRegex.hasMatch(ipPortPart)) return 'peer must end with :9651';
     return null;
   }
 
   String? validatePeers(List<String> peers) {
-    if (peers.isEmpty || (peers.length == 1 && peers[0].isEmpty)) return "peers can't be empty";
+    if (peers.isEmpty || (peers.length == 1 && peers[0].isEmpty))
+      return "peers can't be empty";
     for (final p in peers) {
       final e = validatePeer(p);
       if (e != null) return 'invalid peer:`$p` $e';
@@ -147,7 +154,8 @@ class MyceliumService {
         peerStatus = await myFFGetPeerStatus();
       } else {
         // Android/iOS platform - use platform channel
-        final result = await _platform.invokeMethod<List<dynamic>>('getPeerStatus');
+        final result =
+            await _platform.invokeMethod<List<dynamic>>('getPeerStatus');
         peerStatus = result?.cast<String>() ?? [];
       }
 
@@ -165,6 +173,34 @@ class MyceliumService {
   void dispose() {
     _statusController.close();
   }
-}
 
+  Future<List<String>> proxyConnect(String remote) async {
+    try {
+      if (isUseDylib()) {
+        return myFFProxyConnect(remote);
+      } else {
+        final result = await _platform.invokeMethod<List<dynamic>>(
+          'proxyConnect',
+          {'remote': remote},
+        );
+        return result?.cast<String>() ?? [];
+      }
+    } catch (e) {
+      throw Exception("Failed to proxyConnect: $e");
+    }
+  }
 
+  Future<List<String>> proxyDisconnect() async {
+    try {
+      if (isUseDylib()) {
+        return myFFProxyDisconnect();
+      } else {
+        final result =
+            await _platform.invokeMethod<List<dynamic>>('proxyDisconnect');
+        return result?.cast<String>() ?? [];
+      }
+    } catch (e) {
+      throw Exception("Failed to proxyDisconnect: $e");
+    }
+  }
+}

mycelffi/src/lib.rs

@@ -1,8 +1,8 @@
-use mobile;
-
+use mobile::proxy::{proxy_connect, proxy_disconnect};
 use std::ffi::{CStr, CString};
 use std::os::raw::c_char;
 
+
 #[no_mangle]
 pub extern "C" fn ff_generate_secret_key(out_ptr: *mut *mut u8, out_len: *mut usize) {
     let secret_key = mobile::generate_secret_key();
@@ -115,3 +115,19 @@ pub extern "C" fn free_peer_status(ptr: *mut *mut c_char, len: usize) {
         Vec::from_raw_parts(ptr, len, len);
     }
 }
+
+#[no_mangle]
+pub extern "C" fn ff_proxy_connect(remote_str: *const c_char) -> bool {
+    let c_str = unsafe { CStr::from_ptr(remote_str) };
+    let remote_str = c_str.to_string_lossy();
+    let rt = tokio::runtime::Runtime::new().unwrap();
+    let result = rt.block_on(proxy_connect(&remote_str));
+    result == "ok"
+}
+
+#[no_mangle]
+pub extern "C" fn ff_proxy_disconnect() -> bool {
+    let rt = tokio::runtime::Runtime::new().unwrap();
+    let result = rt.block_on(proxy_disconnect());
+    result == "ok"
+}

mycelmob/Cargo.toml

@@ -11,14 +11,17 @@ name = "mycelmob"
 
 [dependencies]
 uniffi = { version = "0.28.2", features = ["cli"] }
-mobile = { git = "http://github.com/threefoldtech/mycelium", package = "mobile", tag = "v0.6.1", features = [
+mobile = { git = "http://github.com/threefoldtech/mycelium", package = "mobile", tag = "v0.6.2", features = [
     "mactunfd",
 ] }
+tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync"] }
+once_cell = "1.19"
+
 #mobile = { path = "../../mycelium/mobile" }
 
 [build-dependencies]
 uniffi = { version = "0.28.2", features = ["build"] }
 
 [[bin]]
 name = "uniffi-bindgen"
-path = "uniffi-bindgen.rs"
+path = "uniffi-bindgen.rs"