add per-app tunnel

Author: code3-dev

android/app/build.gradle.kts

@@ -26,8 +26,8 @@ android {
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = 16
-        versionName = "2.4.0"
+        versionCode = 17
+        versionName = "2.5.0"
     }
 
     buildTypes {

lib/models/app_update.dart

@@ -6,7 +6,7 @@ class AppUpdate {
   final String messText;
 
   // Current app version - manually set
-  static const String currentAppVersion = '2.4.0';
+  static const String currentAppVersion = '2.5.0';
 
   AppUpdate({required this.version, required this.url, required this.messText});
 

lib/providers/v2ray_provider.dart

@@ -715,6 +715,28 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
     notifyListeners();
   }
 
+  // Add method to ping all servers
+  Future<void> pingAllServers() async {
+    if (_configs.isEmpty) return;
+    
+    try {
+      // Use the batch ping method from the service
+      await _v2rayService.batchPingServers(
+        _configs,
+        maxConcurrent: 3,
+        onProgress: (completed, total) {
+          // Progress updates could be handled here if needed
+          debugPrint('Ping progress: $completed/$total');
+        },
+      );
+      
+      // Notify listeners to refresh the UI
+      notifyListeners();
+    } catch (e) {
+      debugPrint('Error pinging all servers: $e');
+    }
+  }
+
   // تغییر وضعیت بین حالت پروکسی و تونل
   void toggleProxyMode(bool isProxy) {
     _isProxyMode = isProxy;

lib/screens/about_screen.dart

@@ -48,7 +48,7 @@ class AboutScreen extends StatelessWidget {
 
             // App Version
             const Text(
-              'Version 2.4.0',
+              'Version 2.5.0',
               style: TextStyle(fontSize: 16, color: Colors.grey),
             ),
 

lib/screens/server_selection_screen.dart

@@ -684,6 +684,49 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
         elevation: 0,
         actions: [
           ...appBarActions,
+          IconButton(
+            icon: Icon(
+              Icons.network_ping,
+              color: _isPingingServers ? AppTheme.primaryGreen : null,
+            ),
+            onPressed: _isPingingServers ? null : () async {
+              setState(() {
+                _isPingingServers = true;
+              });
+              
+              try {
+                final provider = Provider.of<V2RayProvider>(context, listen: false);
+                await provider.pingAllServers();
+                
+                if (mounted) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text('Ping test completed!'),
+                      backgroundColor: Colors.green,
+                      duration: Duration(seconds: 2),
+                    ),
+                  );
+                }
+              } catch (e) {
+                if (mounted) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text('Ping test failed: $e'),
+                      backgroundColor: Colors.red,
+                      duration: const Duration(seconds: 3),
+                    ),
+                  );
+                }
+              } finally {
+                if (mounted) {
+                  setState(() {
+                    _isPingingServers = false;
+                  });
+                }
+              }
+            },
+            tooltip: 'Ping All Servers',
+          ),
           if (_selectedFilter != 'Local')
             IconButton(
               icon: const Icon(Icons.refresh),

lib/services/v2ray_service.dart

@@ -383,134 +383,29 @@ class V2RayService extends ChangeNotifier {
     }
   }
 
-  // Modern crash-proof ping handling with rate limiting and proper async patterns
-  static final Map<String, Future<int?>> _ongoingPings = {};
-  static const int _maxConcurrentPings = 5; // Limit concurrent pings
-  static int _currentPingCount = 0;
-  
+  /// Simple and reliable ping method similar to flutter_v2ray example
   Future<int?> getServerDelay(V2RayConfig config) async {
-    return _safeExecute<int?>(
-      operation: () => _performPingWithRateLimit(config),
-      fallbackValue: null,
-      context: 'getServerDelay for ${config.remark}',
-    );
-  }
-
-  Future<int?> _performPingWithRateLimit(V2RayConfig config) async {
-    final configId = config.id;
-    final hostKey = '${config.address}:${config.port}';
-
-    // Return cached result if available and not expired (5 minutes cache)
-    final cachedTime = _pingCacheTime[hostKey];
-    if (_pingCache.containsKey(hostKey) && 
-        cachedTime != null && 
-        DateTime.now().difference(cachedTime).inMinutes < 5) {
-      return _pingCache[hostKey];
-    }
-
-    // Check if ping is already in progress for this host
-    if (_ongoingPings.containsKey(hostKey)) {
-      try {
-        return await _ongoingPings[hostKey]!.timeout(
-          const Duration(seconds: 15),
-          onTimeout: () => null,
-        );
-      } catch (e) {
-        debugPrint('Error waiting for ongoing ping: $e');
-        _ongoingPings.remove(hostKey);
-        return null;
-      }
-    }
-
-    // Rate limiting - wait if too many concurrent pings
-    while (_currentPingCount >= _maxConcurrentPings) {
-      await Future.delayed(const Duration(milliseconds: 100));
-    }
-
-    // Start new ping operation
-    _currentPingCount++;
-    final pingFuture = _executePingOperation(config, hostKey);
-    _ongoingPings[hostKey] = pingFuture;
-
     try {
-      final result = await pingFuture;
-      return result;
-    } finally {
-      _currentPingCount--;
-      _ongoingPings.remove(hostKey);
-    }
-  }
-
-  Future<int?> _executePingOperation(V2RayConfig config, String hostKey) async {
-    try {
-      // Ensure V2Ray is initialized with timeout
-      await _safeInitialize();
-
-      // Parse config with comprehensive error handling
-      final parser = await _safeParseConfig(config);
-      if (parser == null) {
-        _updatePingCache(hostKey, null);
-        return null;
-      }
-
-      // Execute ping with multiple fallback strategies
-      final delay = await _performPingWithFallback(parser, config);
+      // Ensure V2Ray is initialized
+      await initialize();
 
-      // Cache result with timestamp
-      _updatePingCache(hostKey, delay);
-      return delay;
+      // Parse the configuration
+      final parser = FlutterV2ray.parseFromURL(config.fullConfig);
 
-    } catch (e) {
-      debugPrint('Ping operation failed for ${config.remark}: $e');
-      _updatePingCache(hostKey, null);
-      return null;
-    }
-  }
-
-  Future<int?> _performPingWithFallback(V2RayURL parser, V2RayConfig config) async {
-    const maxAttempts = 2;
-    
-    for (int attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        final delay = await _flutterV2ray.getServerDelay(
-          config: parser.getFullConfiguration(),
-        ).timeout(
-          Duration(seconds: 6 + attempt), // Progressive timeout
-          onTimeout: () => throw TimeoutException('Ping timeout', Duration(seconds: 6 + attempt)),
-        );
-
-        if (_isValidPing(delay)) {
-          return delay;
-        }
-        
-        if (attempt < maxAttempts) {
-          await Future.delayed(Duration(milliseconds: 500 * attempt));
-        }
-      } on TimeoutException catch (e) {
-        debugPrint('Ping timeout attempt $attempt for ${config.remark}: $e');
-        if (attempt == maxAttempts) return null;
-      } catch (e) {
-        debugPrint('Ping error attempt $attempt for ${config.remark}: $e');
-        if (attempt == maxAttempts) return null;
-      }
-    }
-    
-    return null;
-  }
-
-  bool _isValidPing(int? delay) {
-    return delay != null && delay >= 0 && delay < 30000; // Max 30 seconds
-  }
-
-  void _updatePingCache(String hostKey, int? delay) {
-    try {
-      _pingCache[hostKey] = delay;
-      _pingCacheTime[hostKey] = DateTime.now();
+      // Get server delay with timeout
+      final delay = await _flutterV2ray.getServerDelay(
+        config: parser.getFullConfiguration(),
+      ).timeout(
+        const Duration(seconds: 8),
+        onTimeout: () => -1,
+      );
+      
+      // Return valid ping or null for invalid/timeout results
+      return (delay >= 0) ? delay : null;
 
-      // Cleanup old cache entries to prevent memory leaks
-      _cleanupPingCache();
     } catch (e) {
-      debugPrint('Error updating ping cache: $e');
+      debugPrint('Error getting server delay for ${config.remark}: $e');
+      return null;
     }
   }
 
@@ -1213,27 +1108,4 @@ class V2RayService extends ChangeNotifier {
     return results;
   }
 
-  /// Enhanced memory management
-  void _performMemoryCleanup() {
-    try {
-      // Cleanup ping cache and stale timestamps
-      _cleanupPingCache();
-      debugPrint('Memory cleanup completed');
-    } catch (e) {
-      debugPrint('Error during memory cleanup: $e');
-    }
-  }
-
-  /// Force cleanup all resources
-  void forceCleanup() {
-    try {
-      _currentPingCount = 0;
-      _ongoingPings.clear();
-      _performMemoryCleanup();
-      
-      debugPrint('Force cleanup completed');
-    } catch (e) {
-      debugPrint('Error in force cleanup: $e');
-    }
-  }
 }

lib/widgets/server_list_item.dart

@@ -97,7 +97,26 @@ class _ServerListItemState extends State<ServerListItem> {
                           ),
                           overflow: TextOverflow.ellipsis,
                         ),
-                        // Removed delay display as requested
+                        const SizedBox(height: 4),
+                        // Show ping information
+                        Row(
+                          children: [
+                            Icon(
+                              Icons.network_ping,
+                              size: 12,
+                              color: _getPingColor(),
+                            ),
+                            const SizedBox(width: 4),
+                            Text(
+                              _getPingText(),
+                              style: TextStyle(
+                                fontSize: 12,
+                                color: _getPingColor(),
+                                fontWeight: FontWeight.w500,
+                              ),
+                            ),
+                          ],
+                        ),
                       ],
                     ),
                   ),
@@ -226,7 +245,31 @@ class _ServerListItemState extends State<ServerListItem> {
     }
   }
 
-  // Removed _getPingColor method
+  Color _getPingColor() {
+    if (_isLoadingPing) {
+      return Colors.orange;
+    }
+    if (_ping == null) {
+      return Colors.red;
+    }
+    if (_ping! < 2000) {
+      return Colors.green;
+    } else if (_ping! < 3000) {
+      return Colors.orange;
+    } else {
+      return Colors.red;
+    }
+  }
+
+  String _getPingText() {
+    if (_isLoadingPing) {
+      return 'Testing...';
+    }
+    if (_ping == null) {
+      return 'Timeout';
+    }
+    return '${_ping}ms';
+  }
 
   String _getSubscriptionName(BuildContext context) {
     final provider = Provider.of<V2RayProvider>(context, listen: false);