From 03edaf62026e5579b4d32aeeccf9de842e5a73d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Guti=C3=A9rrez=20Moreno?= Date: Thu, 6 Mar 2025 12:54:03 +0100 Subject: [PATCH 01/25] Updates to 0.2.0 --- .gitignore | 9 +- .idea/codeStyleConfig.xml | 12 +++ .vscode/settings.json | 9 ++ CHANGELOG.md | 19 ++-- CONTRIBUTING.md | 25 +++++ analysis_options.yaml | 8 ++ example/analysis_options.yaml | 1 + example/lib/main.dart | 100 +++++------------- example/pubspec.lock | 141 ++++---------------------- example/pubspec.yaml | 69 +------------ example/pubspec_overrides.yaml | 3 + example/test/widget_test.dart | 30 ------ lib/custom_proxy.dart | 53 ---------- lib/custom_proxy_override.dart | 32 ------ lib/native_flutter_proxy.dart | 9 ++ lib/native_proxy_reader.dart | 47 --------- lib/src/custom_proxy.dart | 98 ++++++++++++++++++ lib/src/custom_proxy_override.dart | 57 +++++++++++ lib/src/native_proxy_reader.dart | 65 ++++++++++++ pubspec.lock | 146 ++++++++++++++++++--------- pubspec.yaml | 46 +-------- test/custom_proxy_override_test.dart | 16 +++ test/custom_proxy_test.dart | 47 +++++++++ test/flutter_proxy_test.dart | 26 ----- test/native_proxy_reader_test.dart | 37 +++++++ 25 files changed, 557 insertions(+), 548 deletions(-) create mode 100644 .idea/codeStyleConfig.xml create mode 100644 .vscode/settings.json create mode 100644 CONTRIBUTING.md create mode 100644 analysis_options.yaml create mode 100644 example/analysis_options.yaml create mode 100644 example/pubspec_overrides.yaml delete mode 100644 example/test/widget_test.dart delete mode 100644 lib/custom_proxy.dart delete mode 100644 lib/custom_proxy_override.dart create mode 100644 lib/native_flutter_proxy.dart delete mode 100644 lib/native_proxy_reader.dart create mode 100644 lib/src/custom_proxy.dart create mode 100644 lib/src/custom_proxy_override.dart create mode 100644 lib/src/native_proxy_reader.dart create mode 100644 test/custom_proxy_override_test.dart create mode 100644 test/custom_proxy_test.dart delete mode 100644 test/flutter_proxy_test.dart create mode 100644 test/native_proxy_reader_test.dart diff --git a/.gitignore b/.gitignore index 0f3e480..c8bc461 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,12 @@ build/ +coverage/ + +# IntelliJ related .idea/ -.vscode/ \ No newline at end of file +!.idea/codeStyleConfig.xml + +# Visual Studio Code related +.vscode/ +!/.vscode/settings.json diff --git a/.idea/codeStyleConfig.xml b/.idea/codeStyleConfig.xml new file mode 100644 index 0000000..673acd8 --- /dev/null +++ b/.idea/codeStyleConfig.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..391e560 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,9 @@ +{ + "[dart]": { + "editor.rulers": [ + 100 + ], + "editor.formatOnSave": true + }, + "dart.lineLength": 100 +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9809846..7dbb2ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,30 @@ +## 0.2.0 + +* update SDK constraints. +* updates documentation. +* adds tests. +* adds .vscode and .idea IDE configuration settings. + ## 0.1.14 -* fix MissingPluginException on Android。 +* fix MissingPluginException on Android. ## 0.1.13 -* dartfrmt fix。 +* dartfrmt fix. ## 0.1.12 -* bug fix。 +* bug fix. ## 0.1.11 -* added example and enhanced null-safety on proxy set。 +* added example and enhanced null-safety on proxy set. ## 0.1.10 -* enhance readme。 +* enhance readme. ## 0.1.9 -* add example。 +* add example. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..08449f8 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,25 @@ +# Contribution Guide + +Feel free to contribute to this project. If you want to contribute, please follow the steps below: + +1. Fork the project +2. Commit your changes +3. Create a pull request + +Please make sure that your code is well tested. + +## Running Tests 🧪 + +Install lcov: + +```sh +brew install lcov +``` + +Run and open the report using the following command: + +```sh +flutter test --coverage --test-randomize-ordering-seed random && genhtml coverage/lcov.info -o coverage/ && open coverage/index.html +``` + +Everything should be green! 🎉 diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..f17506e --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,8 @@ +include: package:very_good_analysis/analysis_options.yaml + +formatter: + page_width: 100 + +linter: + rules: + lines_longer_than_80_chars: false \ No newline at end of file diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml new file mode 100644 index 0000000..5209975 --- /dev/null +++ b/example/analysis_options.yaml @@ -0,0 +1 @@ +include: ../../../analysis_options.yaml \ No newline at end of file diff --git a/example/lib/main.dart b/example/lib/main.dart index 8bd8364..3b200a7 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,125 +1,71 @@ +// ignore_for_file: unused_local_variable + import 'package:flutter/material.dart'; -import 'package:native_flutter_proxy/native_proxy_reader.dart'; -import 'package:native_flutter_proxy/custom_proxy.dart'; +import 'package:native_flutter_proxy/native_flutter_proxy.dart'; void main() async { + // Ensure that the WidgetsBinding is initialized before calling the + // [NativeProxyReader.proxySetting] method. WidgetsFlutterBinding.ensureInitialized(); - bool enabled = false; + // Get the proxy settings from the native platform. + var enabled = false; String? host; int? port; try { - ProxySetting settings = await NativeProxyReader.proxySetting; + final settings = await NativeProxyReader.proxySetting; enabled = settings.enabled; host = settings.host; port = settings.port; } catch (e) { print(e); } + + // Enable the proxy if it is enabled and the host is not null. if (enabled && host != null) { - final proxy = CustomProxy(ipAddress: host, port: port); - proxy.enable(); - print("proxy enabled"); + final proxy = CustomProxy(ipAddress: host, port: port).enable(); + debugPrint('proxy enabled'); } runApp(MyApp()); } class MyApp extends StatelessWidget { - // This widget is the root of your application. @override Widget build(BuildContext context) { return MaterialApp( title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // Try running your application with "flutter run". You'll see the - // application has a blue toolbar. Then, without quitting the app, try - // changing the primarySwatch below to Colors.green and then invoke - // "hot reload" (press "r" in the console where you ran "flutter run", - // or simply save your changes to "hot reload" in a Flutter IDE). - // Notice that the counter didn't reset back to zero; the application - // is not restarted. - primarySwatch: Colors.blue, - ), + theme: ThemeData(primarySwatch: Colors.blue), home: MyHomePage(title: 'Flutter Demo Home Page'), ); } } class MyHomePage extends StatefulWidget { - MyHomePage({Key? key, required this.title}) : super(key: key); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - + MyHomePage({super.key, required this.title}); final String title; @override - _MyHomePageState createState() => _MyHomePageState(); + State createState() => _MyHomePageState(); } class _MyHomePageState extends State { - int _counter = 0; + int counter = 0; - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); - } + void _incrementCounter() => setState(() => counter++); @override Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. return Scaffold( - appBar: AppBar( - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), + appBar: AppBar(title: Text(widget.title)), body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Invoke "debug painting" (press "p" in the console, choose the - // "Toggle Debug Paint" action from the Flutter Inspector in Android - // Studio, or the "Toggle Debug Paint" command in Visual Studio Code) - // to see the wireframe for each widget. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ + Text('You have pushed the button this many times:'), Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headline4, + '$counter', + style: Theme.of(context).textTheme.headlineMedium, ), ], ), @@ -128,7 +74,7 @@ class _MyHomePageState extends State { onPressed: _incrementCounter, tooltip: 'Increment', child: Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. + ), ); } } diff --git a/example/pubspec.lock b/example/pubspec.lock index aab9531..3d9ddb2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,161 +1,62 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.8.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" source: hosted - version: "1.15.0" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.19.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - matcher: + material_color_utilities: dependency: transitive description: - name: matcher - url: "https://pub.dartlang.org" + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.16.0" native_flutter_proxy: - dependency: "direct dev" + dependency: "direct main" description: path: ".." relative: true source: path - version: "0.1.13" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" + version: "0.2.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.2" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.0.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" sdks: - dart: ">=2.12.0 <3.0.0" - flutter: ">=1.12.0" \ No newline at end of file + dart: ">=3.7.0-0 <4.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3427922..680bb4d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,78 +1,15 @@ name: example description: A new Flutter project. - -# The following line prevents the package from being accidentally published to -# pub.dev using `pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +publish_to: "none" version: 1.0.0+1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: sdk: flutter + native_flutter_proxy: ^0.2.0 - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - -dev_dependencies: - flutter_test: - sdk: flutter - native_flutter_proxy: - path: ../ - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages \ No newline at end of file diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml new file mode 100644 index 0000000..e817a71 --- /dev/null +++ b/example/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + native_flutter_proxy: + path: ../ \ No newline at end of file diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart deleted file mode 100644 index 747db1d..0000000 --- a/example/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:example/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} diff --git a/lib/custom_proxy.dart b/lib/custom_proxy.dart deleted file mode 100644 index 33d63e9..0000000 --- a/lib/custom_proxy.dart +++ /dev/null @@ -1,53 +0,0 @@ -import 'dart:io'; -import 'custom_proxy_override.dart'; - -/// Allows you to set and enable a proxy for your app -class CustomProxy { - /// A string representing an IP address for the proxy server - final String ipAddress; - - /// The port number for the proxy server - /// Can be null if port is default. - final int? port; - - /// Set this to true - /// - Warning: Setting this to true in production apps can be dangerous. Use with care! - bool allowBadCertificates; - - /// Initializer - CustomProxy( - {required this.ipAddress, this.port, this.allowBadCertificates = false}); - - /// Initializer from string - static CustomProxy? fromString({required String proxy}) { - // Check if valid - if (proxy.isEmpty) { - assert( - false, "Proxy string passed to CustomProxy.fromString() is invalid."); - return null; - } - - // Build and return - final proxyParts = proxy.split(":"); - final _ipAddress = proxyParts[0]; - final _port = proxyParts.length > 0 ? int.tryParse(proxyParts[1]) : null; - return CustomProxy( - ipAddress: _ipAddress, - port: _port, - ); - } - - /// Enable the proxy - void enable() => HttpOverrides.global = - new CustomProxyHttpOverride.withProxy(this.toString()); - - /// Disable the proxy - void disable() => HttpOverrides.global = null; - - @override - String toString() { - String _proxy = this.ipAddress; - if (this.port != null) _proxy += ":" + this.port.toString(); - return _proxy; - } -} diff --git a/lib/custom_proxy_override.dart b/lib/custom_proxy_override.dart deleted file mode 100644 index 2c71e04..0000000 --- a/lib/custom_proxy_override.dart +++ /dev/null @@ -1,32 +0,0 @@ -import 'dart:io'; - -/// This class overrides the global proxy settings. -class CustomProxyHttpOverride extends HttpOverrides { - /// The entire proxy server - /// Format: "localhost:8888" - final String proxyString; - - /// Set this to true - /// - Warning: Setting this to true in production apps can be dangerous. Use with care! - final bool allowBadCertificates; - - /// Initializer - CustomProxyHttpOverride.withProxy( - this.proxyString, { - this.allowBadCertificates = false, - }); - - /// Override HTTP client creation - @override - HttpClient createHttpClient(SecurityContext? context) { - return super.createHttpClient(context) - ..findProxy = (uri) { - assert(this.proxyString.isNotEmpty, - 'You must set a valid proxy if you enable it!'); - return "PROXY " + this.proxyString + ";"; - }; -/* ..badCertificateCallback = this.allowBadCertificates - ? (X509Certificate cert, String host, int port) => true - : null;*/ - } -} diff --git a/lib/native_flutter_proxy.dart b/lib/native_flutter_proxy.dart new file mode 100644 index 0000000..ab35c9a --- /dev/null +++ b/lib/native_flutter_proxy.dart @@ -0,0 +1,9 @@ +/// This library is used to create a custom proxy for HTTP requests in Flutter. +/// +/// To use, import `package:native_flutter_proxy/native_flutter_proxy.dart`. +/// Find the [native_flutter_proxy package](https://pub.dev/packages/native_flutter_proxy) 🚀 +library; + +export './src/custom_proxy.dart'; +export './src/custom_proxy_override.dart'; +export './src/native_proxy_reader.dart'; diff --git a/lib/native_proxy_reader.dart b/lib/native_proxy_reader.dart deleted file mode 100644 index 7e60ba1..0000000 --- a/lib/native_proxy_reader.dart +++ /dev/null @@ -1,47 +0,0 @@ -import 'dart:async'; -import 'package:flutter/services.dart'; - -/// A flutter plugin to read network proxy info from native. It can be used to set up the network proxy for flutter. -class NativeProxyReader { - /// channel - static const MethodChannel _channel = - const MethodChannel('native_flutter_proxy'); - - /// ProxySetting - static Future get proxySetting async { - return _channel // - .invokeMapMethod('getProxySetting') - .then((e) => ProxySetting._fromMap(e)); - } -} - -/// ProxySetting -class ProxySetting { - /// host - String? host; - - /// port - int? port; - - /// private - ProxySetting._({ - this.host, - this.port, - }); - - /// private - factory ProxySetting._fromMap(Map? map) { - map ??= {}; - return ProxySetting._( - host: map['host'], - port: map['port'] != null // - ? int.parse(map['port'].toString()) - : null, - ); - } - - /// enabled - bool get enabled => - (host?.isNotEmpty ?? false) && // - (port != null && port! > 0); -} diff --git a/lib/src/custom_proxy.dart b/lib/src/custom_proxy.dart new file mode 100644 index 0000000..de5391a --- /dev/null +++ b/lib/src/custom_proxy.dart @@ -0,0 +1,98 @@ +import 'dart:io'; + +import 'package:native_flutter_proxy/native_flutter_proxy.dart'; + +/// {@template custom_proxy} +/// A class that manages custom proxy settings for Flutter applications. +/// +/// This class provides functionality to set up and manage a proxy server configuration, +/// including the ability to enable/disable the proxy and handle custom certificates. +/// +/// Example usage: +/// ```dart +/// final proxy = CustomProxy(ipAddress: '192.168.1.1', port: 8080); +/// proxy.enable(); // Enables the proxy +/// proxy.disable(); // Disables the proxy +/// ``` +/// +/// You can also create a proxy instance from a string: +/// ```dart +/// final proxy = CustomProxy.fromString(proxy: '192.168.1.1:8080'); +/// ``` +/// +/// The class supports: +/// * Setting custom IP address and port +/// * Enabling/disabling proxy settings +/// * Optional bad certificate handling +/// * String representation of proxy settings +/// +/// Note: When [allowBadCertificates] is set to true, it may pose security risks +/// and should be used with caution, especially in production environments. +/// {@endtemplate} +class CustomProxy { + /// {@macro custom_proxy} + const CustomProxy({ + required this.ipAddress, + this.port, + this.allowBadCertificates = false, + }); + + /// A string representing an IP address for the proxy server + final String ipAddress; + + /// The port number for the proxy server + /// Can be null if port is default. + final int? port; + + /// Set this to true + /// - Warning: Setting this to true in production apps can be dangerous. Use with care! + final bool allowBadCertificates; + + /// Creates a [CustomProxy] instance from a string representation. + /// + /// The [proxy] string should be in the format "ipAddress:port". + /// For example: "192.168.1.1:8080" + /// + /// Returns null if: + /// * The proxy string is empty + /// * The port number cannot be parsed to an integer + /// + /// Throws an [AssertionError] in debug mode if the proxy string is empty. + static CustomProxy? fromString({required String proxy}) { + // Check if the proxy string is empty + if (proxy.isEmpty) { + assert(false, 'Proxy string passed to CustomProxy.fromString() is invalid.'); + + return null; + } + + // Split the proxy string into parts and extract the IP address and port number if available + // Format: "ipAddress:port" + final proxyParts = proxy.split(':'); + final ipAddress = proxyParts[0]; + final port = proxyParts.isNotEmpty ? int.tryParse(proxyParts[1]) : null; + + return CustomProxy(ipAddress: ipAddress, port: port); + } + + /// Enables the custom proxy by setting a global HTTP override. + /// + /// Sets [HttpOverrides.global] to a new instance of [CustomProxyHttpOverride] + /// configured with the proxy settings from this object's string representation. + void enable() => HttpOverrides.global = CustomProxyHttpOverride.withProxy(toString()); + + /// Disables the global HTTP proxy settings by setting HttpOverrides.global to null. + /// + /// This method removes any previously configured proxy settings and restores + /// the default HTTP client behavior for network requests. + void disable() => HttpOverrides.global = null; + + @override + String toString() { + var proxy = ipAddress; + + if (port != null) proxy += ':$port'; + + return proxy; + } +} diff --git a/lib/src/custom_proxy_override.dart b/lib/src/custom_proxy_override.dart new file mode 100644 index 0000000..2ba572a --- /dev/null +++ b/lib/src/custom_proxy_override.dart @@ -0,0 +1,57 @@ +import 'dart:io'; + +/// {@template custom_proxy_http_override} +/// A custom HTTP override class that allows setting a global proxy for all HTTP requests. +/// +/// This class extends [HttpOverrides] to provide proxy configuration capabilities. +/// It can be used to route all HTTP traffic through a specified proxy server and +/// optionally allow bad certificates for testing purposes. +/// +/// Example usage: +/// ```dart +/// HttpOverrides.global = CustomProxyHttpOverride.withProxy( +/// 'localhost:8888', +/// allowBadCertificates: true, +/// ); +/// ``` +/// +/// Important: +/// - The proxy string must be in the format "host:port" +/// - Allowing bad certificates should only be used for development/testing +/// - This affects all HTTP requests made by the application +/// +/// Note: Use with caution in production environments as it can compromise +/// security if not configured properly. +/// {@endtemplate} +final class CustomProxyHttpOverride extends HttpOverrides { + /// Create a new instance of [CustomProxyHttpOverride] with the specified proxy settings. + /// + /// {@macro custom_proxy_http_override} + CustomProxyHttpOverride.withProxy( + this.proxyString, { + this.allowBadCertificates = false, + }); + + /// The entire proxy server + /// Format: "localhost:8888" + final String proxyString; + + /// Set this to true + /// - Warning: Setting this to true in production apps can be dangerous. Use with care! + final bool allowBadCertificates; + + /// Override HTTP client creation to set the proxy and bad certificate callback. + @override + HttpClient createHttpClient(SecurityContext? context) { + final client = super.createHttpClient(context) + ..findProxy = (uri) { + assert(proxyString.isNotEmpty, 'You must set a valid proxy if you enable it!'); + + return 'PROXY $proxyString;'; + }; + + if (allowBadCertificates) client.badCertificateCallback = (cert, host, port) => true; + + return client; + } +} diff --git a/lib/src/native_proxy_reader.dart b/lib/src/native_proxy_reader.dart new file mode 100644 index 0000000..042cc00 --- /dev/null +++ b/lib/src/native_proxy_reader.dart @@ -0,0 +1,65 @@ +import 'dart:async'; + +import 'package:flutter/services.dart'; + +/// {@template custom_proxy} +/// A class to read network proxy settings from native platform code. +/// +/// This class provides functionality to retrieve proxy settings like host and +/// port from the native platform (iOS/Android) through a method channel. +/// +/// Example usage: +/// ```dart +/// ProxySetting settings = await NativeProxyReader.proxySetting; +/// if (settings.enabled) { +/// print('Proxy host: ${settings.host}'); +/// print('Proxy port: ${settings.port}'); +/// } +/// ``` +/// {@endtemplate} +abstract final class NativeProxyReader { + /// Method channel for native platform communication.ƒ + static const _channel = MethodChannel('native_flutter_proxy'); + + /// Get the proxy settings from the native platform. + static Future get proxySetting async { + return _channel.invokeMapMethod('getProxySetting').then(ProxySetting._fromMap); + } +} + +/// {@template proxy_setting} +/// A class to hold proxy settings like host and port. +/// {@endtemplate} +class ProxySetting { + /// {@macro proxy_setting} + const ProxySetting._({this.host, this.port}); + + /// Create a new instance of [ProxySetting] from a map. + /// + /// {@macro proxy_setting} + factory ProxySetting._fromMap(Map? map) { + map ??= {}; + + final host = map['host']; + final port = map['port']; + + return ProxySetting._( + host: host is String ? host : null, + port: port != null ? int.tryParse(port.toString()) : null, + ); + } + + /// The proxy server hostname or IP address. + final String? host; + + /// The proxy server port number. + final int? port; + + /// A boolean indicating if proxy settings are valid and can be used. + bool get enabled { + final validHost = host?.isNotEmpty ?? false; + final validPort = port != null && port! > 0; + + return validHost && validPort; + } +} diff --git a/pubspec.lock b/pubspec.lock index 20a4615..939a55c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,51 +5,50 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + url: "https://pub.dev" source: hosted - version: "2.8.1" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.4.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.2" flutter: dependency: "direct main" description: flutter @@ -60,88 +59,139 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + url: "https://pub.dev" + source: hosted + version: "10.0.8" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.16.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" source: hosted - version: "0.4.2" - typed_data: + version: "0.7.4" + vector_math: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "1.3.0" - vector_math: + version: "2.1.4" + very_good_analysis: + dependency: "direct dev" + description: + name: very_good_analysis + sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63" + url: "https://pub.dev" + source: hosted + version: "7.0.0" + vm_service: dependency: transitive description: - name: vector_math - url: "https://pub.dartlang.org" + name: vm_service + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "14.3.1" sdks: - dart: ">=2.12.0 <3.0.0" - flutter: ">=1.12.0" \ No newline at end of file + dart: ">=3.7.0-0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index c1e5bc2..cc0b4c1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: native_flutter_proxy description: A flutter plugin to read and set network proxy info from native. -version: 0.1.14 +version: 0.2.0 homepage: https://github.com/victorblaess/native_flutter_proxy environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=1.12.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.0.0" dependencies: flutter: @@ -14,16 +14,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + very_good_analysis: ^7.0.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. flutter: - # This section identifies this Flutter project as a plugin project. - # The androidPackage and pluginClass identifiers should not ordinarily - # be modified. They are used by the tooling to maintain consistency when - # adding or updating assets for this project. plugin: platforms: android: @@ -31,34 +24,3 @@ flutter: pluginClass: FlutterProxyPlugin ios: pluginClass: FlutterProxyPlugin - - # To add assets to your plugin package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # To add custom fonts to your plugin package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages diff --git a/test/custom_proxy_override_test.dart b/test/custom_proxy_override_test.dart new file mode 100644 index 0000000..7ceea13 --- /dev/null +++ b/test/custom_proxy_override_test.dart @@ -0,0 +1,16 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:native_flutter_proxy/native_flutter_proxy.dart'; + +void main() { + group('CustomProxyHttpOverride', () { + test('creates instance with proxy settings', () { + final override = CustomProxyHttpOverride.withProxy( + 'localhost:8888', + allowBadCertificates: true, + ); + + expect(override.proxyString, equals('localhost:8888')); + expect(override.allowBadCertificates, isTrue); + }); + }); +} diff --git a/test/custom_proxy_test.dart b/test/custom_proxy_test.dart new file mode 100644 index 0000000..a34b652 --- /dev/null +++ b/test/custom_proxy_test.dart @@ -0,0 +1,47 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:native_flutter_proxy/native_flutter_proxy.dart'; + +void main() { + group('CustomProxy', () { + test('creates instance with required parameters', () { + const proxy = CustomProxy(ipAddress: '192.168.1.1'); + expect(proxy.ipAddress, equals('192.168.1.1')); + expect(proxy.port, isNull); + expect(proxy.allowBadCertificates, isFalse); + }); + + test('creates instance with all parameters', () { + const proxy = CustomProxy( + ipAddress: '192.168.1.1', + port: 8080, + allowBadCertificates: true, + ); + + expect(proxy.ipAddress, equals('192.168.1.1')); + expect(proxy.port, equals(8080)); + expect(proxy.allowBadCertificates, isTrue); + }); + + group('fromString', () { + test('creates instance from valid proxy string with port', () { + final proxy = CustomProxy.fromString(proxy: '192.168.1.1:8080'); + + expect(proxy, isNotNull); + expect(proxy?.ipAddress, equals('192.168.1.1')); + expect(proxy?.port, equals(8080)); + }); + }); + + group('toString', () { + test('returns correct string with port', () { + const proxy = CustomProxy(ipAddress: '192.168.1.1', port: 8080); + expect(proxy.toString(), equals('192.168.1.1:8080')); + }); + + test('returns correct string without port', () { + const proxy = CustomProxy(ipAddress: '192.168.1.1'); + expect(proxy.toString(), equals('192.168.1.1')); + }); + }); + }); +} diff --git a/test/flutter_proxy_test.dart b/test/flutter_proxy_test.dart deleted file mode 100644 index 8417a3c..0000000 --- a/test/flutter_proxy_test.dart +++ /dev/null @@ -1,26 +0,0 @@ -import 'package:flutter/services.dart'; -import 'package:flutter_test/flutter_test.dart'; - -void main() { -/* const MethodChannel channel = MethodChannel('native_flutter_proxy'); - - TestWidgetsFlutterBinding.ensureInitialized(); - - setUp(() { - channel.setMockMethodCallHandler((MethodCall methodCall) async { - return { - 'host': '192.168.1.9', - 'port': 9909, - }; - }); - }); - - tearDown(() { - channel.setMockMethodCallHandler(null); - }); - - test('getProxySetting', () async { - final setting = await NativeProxyReader.proxySetting; - expect(setting.enabled, true); - });*/ -} diff --git a/test/native_proxy_reader_test.dart b/test/native_proxy_reader_test.dart new file mode 100644 index 0000000..e6757e6 --- /dev/null +++ b/test/native_proxy_reader_test.dart @@ -0,0 +1,37 @@ +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:native_flutter_proxy/src/native_proxy_reader.dart'; + +void main() { + const channel = MethodChannel('native_flutter_proxy'); + + TestWidgetsFlutterBinding.ensureInitialized(); + + setUp(() { + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler(channel, (call) async { + if (call.method == 'getProxySetting') { + return { + 'host': '192.168.1.9', + 'port': 9909, + }; + } + return null; + }); + }); + + tearDown(() { + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler(channel, null); + }); + + group('NativeProxyReader', () { + test('returns valid proxy settings when data is available', () async { + final setting = await NativeProxyReader.proxySetting; + + expect(setting.host, equals('192.168.1.9')); + expect(setting.port, equals(9909)); + expect(setting.enabled, isTrue); + }); + }); +} From ef984e841f1234419e98ff581edaa855969aa6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Guti=C3=A9rrez=20Moreno?= Date: Thu, 6 Mar 2025 13:03:24 +0100 Subject: [PATCH 02/25] Add support for higher AGP versions and fixes android build error Reference PR: https://github.com/vicdotdevelop/native_flutter_proxy/pull/4 --- android/build.gradle | 40 +++++++++---------- android/gradle.properties | 3 +- android/settings.gradle | 14 ++++++- example/android/app/build.gradle | 23 +++++++---- example/android/build.gradle | 22 +++------- example/android/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 5 +-- example/android/settings.gradle | 30 ++++++++++---- 8 files changed, 81 insertions(+), 58 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ba1187e..04191a2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,31 +1,28 @@ -group 'com.victorblaess.native_flutter_proxy' -version '1.0-SNAPSHOT' - -buildscript { - ext.kotlin_version = '1.6.10' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' } -rootProject.allprojects { +allprojects { repositories { + gradlePluginPortal() google() - jcenter() + mavenCentral() } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +group 'com.victorblaess.native_flutter_proxy' android { - compileSdkVersion 28 + + namespace 'com.victorblaess.native_flutter_proxy' + + compileSdkVersion 34 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -40,5 +37,6 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-reflect:$KotlinVersion" +} \ No newline at end of file diff --git a/android/gradle.properties b/android/gradle.properties index 38c8d45..236fe15 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,5 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true +AGPVersion=7.4.2 +KotlinVersion=1.8.22 \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index 2922dd1..f5ac3e8 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1,13 @@ -rootProject.name = 'native_flutter_proxy' +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } + plugins { + id 'com.android.library' version "${AGPVersion}" + id 'org.jetbrains.kotlin.android' version "${KotlinVersion}" + } +} + +rootProject.name = 'native_flutter_proxy' \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 937a7a6..69135ec 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -21,12 +27,13 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 30 + compileSdkVersion 34 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -35,7 +42,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.veebee.proxy.example.example" - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -55,5 +62,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion" +} \ No newline at end of file diff --git a/example/android/build.gradle b/example/android/build.gradle index 9b6ed06..d15fe59 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,29 +1,19 @@ -buildscript { - ext.kotlin_version = '1.3.50' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { + gradlePluginPortal() google() - jcenter() + mavenCentral() } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 94adc3a..236fe15 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,3 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +AGPVersion=7.4.2 +KotlinVersion=1.8.22 \ No newline at end of file diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..25406ab 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +zipStoreBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip \ No newline at end of file diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 44e62bc..7ef8a88 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "${AGPVersion}" apply false + id "org.jetbrains.kotlin.android" version "${KotlinVersion}" apply false +} + +include ":app" \ No newline at end of file From 9fefb7d40eca43761985bd28be817bdea89e0a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Guti=C3=A9rrez=20Moreno?= Date: Thu, 6 Mar 2025 17:25:18 +0100 Subject: [PATCH 03/25] Updates android config and documents code --- android/build.gradle | 3 +- android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 +- android/gradlew | 249 ++++++++++++++++++ android/gradlew.bat | 92 +++++++ .../FlutterProxyPlugin.kt | 41 ++- example/analysis_options.yaml | 2 +- ios/Classes/FlutterProxyPlugin.h | 11 +- ios/Classes/FlutterProxyPlugin.m | 15 +- ios/Classes/SwiftFlutterProxyPlugin.swift | 52 +++- 10 files changed, 446 insertions(+), 23 deletions(-) create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100755 android/gradlew create mode 100644 android/gradlew.bat diff --git a/android/build.gradle b/android/build.gradle index 04191a2..47564ac 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,8 +16,7 @@ group 'com.victorblaess.native_flutter_proxy' android { namespace 'com.victorblaess.native_flutter_proxy' - - compileSdkVersion 34 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_17 diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 01a286e..1af9e09 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt b/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt index e7d8e26..ca412ea 100644 --- a/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt +++ b/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt @@ -9,12 +9,23 @@ import io.flutter.plugin.common.MethodChannel.Result import io.flutter.plugin.common.PluginRegistry.Registrar import java.util.* -/** FlutterProxyPlugin */ +/** + * FlutterProxyPlugin + * + * Este plugin de Flutter se utiliza para obtener la configuración del proxy del sistema. + * Implementa las interfaces FlutterPlugin y MethodCallHandler. + */ public class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { + // Canal de método para la comunicación entre Flutter y el código nativo. private var mMethodChannel: MethodChannel? = null; companion object { + /** + * Método estático para registrar el plugin con un registrar. + * + * @param registrar El registrar que se utiliza para registrar el plugin. + */ @JvmStatic fun registerWith(registrar: Registrar) { val instance = FlutterProxyPlugin() @@ -22,21 +33,42 @@ public class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { } } + /** + * Método privado para adjuntar el plugin al motor de Flutter. + * + * @param messenger El mensajero binario utilizado para la comunicación. + */ private fun onAttachedToEngine(messenger: BinaryMessenger) { mMethodChannel = MethodChannel(messenger, "native_flutter_proxy") mMethodChannel!!.setMethodCallHandler(this) } + /** + * Método llamado cuando el plugin se adjunta al motor de Flutter. + * + * @param binding El enlace del plugin de Flutter. + */ override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) { mMethodChannel = MethodChannel(binding.binaryMessenger, "native_flutter_proxy") mMethodChannel!!.setMethodCallHandler(this) } + /** + * Método llamado cuando el plugin se desadjunta del motor de Flutter. + * + * @param binding El enlace del plugin de Flutter. + */ override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { mMethodChannel!!.setMethodCallHandler(null) mMethodChannel = null } + /** + * Método llamado cuando se realiza una llamada de método desde Flutter. + * + * @param call La llamada de método. + * @param result El resultado de la llamada de método. + */ override fun onMethodCall(call: MethodCall, result: Result) { if (call.method == "getProxySetting") { result.success(getProxySetting()) @@ -45,6 +77,11 @@ public class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { } } + /** + * Método privado para obtener la configuración del proxy del sistema. + * + * @return Un mapa con la configuración del proxy. + */ private fun getProxySetting(): Any? { val map = LinkedHashMap() map["host"] = System.getProperty("http.proxyHost") @@ -52,4 +89,4 @@ public class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { return map } -} +} \ No newline at end of file diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index 5209975..fac60e2 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1 +1 @@ -include: ../../../analysis_options.yaml \ No newline at end of file +include: ../../analysis_options.yaml \ No newline at end of file diff --git a/ios/Classes/FlutterProxyPlugin.h b/ios/Classes/FlutterProxyPlugin.h index 909e6bc..f4a3e69 100644 --- a/ios/Classes/FlutterProxyPlugin.h +++ b/ios/Classes/FlutterProxyPlugin.h @@ -1,4 +1,11 @@ #import -@interface FlutterProxyPlugin : NSObject -@end +/** + * @class FlutterProxyPlugin + * @brief A plugin class for handling proxy settings in Flutter. + * + * This class serves as an interface for the Flutter plugin, allowing + * the registration of the plugin with the Flutter engine. + */ +@interface FlutterProxyPlugin : NSObject +@end \ No newline at end of file diff --git a/ios/Classes/FlutterProxyPlugin.m b/ios/Classes/FlutterProxyPlugin.m index 2d67deb..f725fd1 100644 --- a/ios/Classes/FlutterProxyPlugin.m +++ b/ios/Classes/FlutterProxyPlugin.m @@ -8,8 +8,21 @@ #import "native_flutter_proxy-Swift.h" #endif +/** + * @class FlutterProxyPlugin + * @brief An Objective-C wrapper for the Swift Flutter plugin. + * + * This class registers the Swift implementation of the plugin with the Flutter engine. + */ @implementation FlutterProxyPlugin + +/** + * Registers the plugin with the Flutter plugin registrar. + * + * @param registrar The Flutter plugin registrar. + */ + (void)registerWithRegistrar:(NSObject*)registrar { [SwiftFlutterProxyPlugin registerWithRegistrar:registrar]; } -@end + +@end \ No newline at end of file diff --git a/ios/Classes/SwiftFlutterProxyPlugin.swift b/ios/Classes/SwiftFlutterProxyPlugin.swift index 3349ece..360c8a2 100644 --- a/ios/Classes/SwiftFlutterProxyPlugin.swift +++ b/ios/Classes/SwiftFlutterProxyPlugin.swift @@ -1,13 +1,32 @@ import Flutter import UIKit +/** + * @class SwiftFlutterProxyPlugin + * @brief A Swift implementation of the Flutter plugin for handling proxy settings. + * + * This class registers the plugin with the Flutter engine and handles method calls + * from Dart code. It provides functionality to retrieve the system proxy settings. + */ public class SwiftFlutterProxyPlugin: NSObject, FlutterPlugin { + + /** + * Registers the plugin with the Flutter plugin registrar. + * + * @param registrar The Flutter plugin registrar. + */ public static func register(with registrar: FlutterPluginRegistrar) { let channel = FlutterMethodChannel(name: "native_flutter_proxy", binaryMessenger: registrar.messenger()) let instance = SwiftFlutterProxyPlugin() registrar.addMethodCallDelegate(instance, channel: channel) } + /** + * Handles method calls from Dart code. + * + * @param call The method call from Dart. + * @param result The result callback to send the response back to Dart. + */ public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { switch call.method { case "getProxySetting": @@ -19,20 +38,25 @@ public class SwiftFlutterProxyPlugin: NSObject, FlutterPlugin { } } - func getProxySetting() -> NSDictionary? { - guard let proxySettings = CFNetworkCopySystemProxySettings()?.takeUnretainedValue(), - let url = URL(string: "https://www.bing.com/") else { - return nil - } - let proxies = CFNetworkCopyProxiesForURL((url as CFURL), proxySettings).takeUnretainedValue() as NSArray - guard let settings = proxies.firstObject as? NSDictionary, - let _ = settings.object(forKey: (kCFProxyTypeKey as String)) as? String else { - return nil - } + /** + * Retrieves the system proxy settings. + * + * @return A dictionary containing the proxy host and port, or nil if not available. + */ + func getProxySetting() -> NSDictionary? { + guard let proxySettings = CFNetworkCopySystemProxySettings()?.takeUnretainedValue(), + let url = URL(string: "https://www.bing.com/") else { + return nil + } + let proxies = CFNetworkCopyProxiesForURL((url as CFURL), proxySettings).takeUnretainedValue() as NSArray + guard let settings = proxies.firstObject as? NSDictionary, + let _ = settings.object(forKey: (kCFProxyTypeKey as String)) as? String else { + return nil + } - if let hostName = settings.object(forKey: (kCFProxyHostNameKey as String)), let port = settings.object(forKey: (kCFProxyPortNumberKey as String)) { - return ["host":hostName, "port":port] - } - return nil; + if let hostName = settings.object(forKey: (kCFProxyHostNameKey as String)), let port = settings.object(forKey: (kCFProxyPortNumberKey as String)) { + return ["host": hostName, "port": port] } + return nil + } } \ No newline at end of file From a4ac538a1dc1081577fa7f462686540a7828c95c Mon Sep 17 00:00:00 2001 From: shakle Date: Thu, 27 Mar 2025 10:42:40 +0100 Subject: [PATCH 04/25] fix android build --- android/build.gradle | 41 ----------- android/build.gradle.kts | 47 +++++++++++++ android/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- android/settings.gradle | 13 ---- android/settings.gradle.kts | 16 +++++ .../FlutterProxyPlugin.kt | 69 +++---------------- 7 files changed, 77 insertions(+), 116 deletions(-) delete mode 100644 android/build.gradle create mode 100644 android/build.gradle.kts delete mode 100644 android/settings.gradle create mode 100644 android/settings.gradle.kts diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index 47564ac..0000000 --- a/android/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -plugins { - id 'com.android.library' - id 'org.jetbrains.kotlin.android' -} - -allprojects { - repositories { - gradlePluginPortal() - google() - mavenCentral() - } -} - -group 'com.victorblaess.native_flutter_proxy' - -android { - - namespace 'com.victorblaess.native_flutter_proxy' - compileSdk 33 - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - defaultConfig { - minSdkVersion 16 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - lintOptions { - disable 'InvalidPackage' - } -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion" - implementation "org.jetbrains.kotlin:kotlin-reflect:$KotlinVersion" -} \ No newline at end of file diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 0000000..de7e157 --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,47 @@ +val kotlinVersion: String by project + +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") +} + +allprojects { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} + +group = "com.victorblaess.native_flutter_proxy" + +android { + namespace = "com.victorblaess.native_flutter_proxy" + ndkVersion = "26.3.11579264" + compileSdk = 35 + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + sourceSets["main"].java.srcDirs("src/main/kotlin") + + defaultConfig { + minSdk = 16 + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + lint { + disable.add("InvalidPackage") + } +} + +dependencies { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") +} diff --git a/android/gradle.properties b/android/gradle.properties index 236fe15..2fc4dad 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -AGPVersion=7.4.2 -KotlinVersion=1.8.22 \ No newline at end of file +agpVersion=8.7.0 +kotlinVersion=1.8.22 \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 1af9e09..3718116 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Thu Mar 27 10:21:41 CET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index f5ac3e8..0000000 --- a/android/settings.gradle +++ /dev/null @@ -1,13 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - google() - mavenCentral() - } - plugins { - id 'com.android.library' version "${AGPVersion}" - id 'org.jetbrains.kotlin.android' version "${KotlinVersion}" - } -} - -rootProject.name = 'native_flutter_proxy' \ No newline at end of file diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..c601fd0 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,16 @@ +pluginManagement { + val agpVersion: String by settings + val kotlinVersion: String by settings + + repositories { + gradlePluginPortal() + google() + mavenCentral() + } + plugins { + id("com.android.library") version agpVersion + id("org.jetbrains.kotlin.android") version kotlinVersion + } +} + +rootProject.name = "native_flutter_proxy" diff --git a/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt b/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt index ca412ea..467536c 100644 --- a/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt +++ b/android/src/main/kotlin/com/victorblaess/native_flutter_proxy/FlutterProxyPlugin.kt @@ -6,69 +6,26 @@ import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel.MethodCallHandler import io.flutter.plugin.common.MethodChannel.Result -import io.flutter.plugin.common.PluginRegistry.Registrar -import java.util.* +import java.util.LinkedHashMap -/** - * FlutterProxyPlugin - * - * Este plugin de Flutter se utiliza para obtener la configuración del proxy del sistema. - * Implementa las interfaces FlutterPlugin y MethodCallHandler. - */ -public class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { +class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { - // Canal de método para la comunicación entre Flutter y el código nativo. - private var mMethodChannel: MethodChannel? = null; + private var methodChannel: MethodChannel? = null - companion object { - /** - * Método estático para registrar el plugin con un registrar. - * - * @param registrar El registrar que se utiliza para registrar el plugin. - */ - @JvmStatic - fun registerWith(registrar: Registrar) { - val instance = FlutterProxyPlugin() - instance.onAttachedToEngine(registrar.messenger()); - } - } - - /** - * Método privado para adjuntar el plugin al motor de Flutter. - * - * @param messenger El mensajero binario utilizado para la comunicación. - */ - private fun onAttachedToEngine(messenger: BinaryMessenger) { - mMethodChannel = MethodChannel(messenger, "native_flutter_proxy") - mMethodChannel!!.setMethodCallHandler(this) + private fun setupChannel(messenger: BinaryMessenger) { + methodChannel = MethodChannel(messenger, "native_flutter_proxy") + methodChannel!!.setMethodCallHandler(this) } - /** - * Método llamado cuando el plugin se adjunta al motor de Flutter. - * - * @param binding El enlace del plugin de Flutter. - */ override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) { - mMethodChannel = MethodChannel(binding.binaryMessenger, "native_flutter_proxy") - mMethodChannel!!.setMethodCallHandler(this) + setupChannel(binding.binaryMessenger) } - /** - * Método llamado cuando el plugin se desadjunta del motor de Flutter. - * - * @param binding El enlace del plugin de Flutter. - */ override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { - mMethodChannel!!.setMethodCallHandler(null) - mMethodChannel = null + methodChannel?.setMethodCallHandler(null) + methodChannel = null } - /** - * Método llamado cuando se realiza una llamada de método desde Flutter. - * - * @param call La llamada de método. - * @param result El resultado de la llamada de método. - */ override fun onMethodCall(call: MethodCall, result: Result) { if (call.method == "getProxySetting") { result.success(getProxySetting()) @@ -77,16 +34,10 @@ public class FlutterProxyPlugin : FlutterPlugin, MethodCallHandler { } } - /** - * Método privado para obtener la configuración del proxy del sistema. - * - * @return Un mapa con la configuración del proxy. - */ private fun getProxySetting(): Any? { val map = LinkedHashMap() map["host"] = System.getProperty("http.proxyHost") map["port"] = System.getProperty("http.proxyPort") return map } - -} \ No newline at end of file +} From 93b33513e80123510b0d2bd7f5e8bf54318d6a95 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 08:11:38 +0200 Subject: [PATCH 05/25] added publish-to-pubdev pipeline --- .github/workflows/publish-to-pubdev.yml | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .github/workflows/publish-to-pubdev.yml diff --git a/.github/workflows/publish-to-pubdev.yml b/.github/workflows/publish-to-pubdev.yml new file mode 100644 index 0000000..0a7b7aa --- /dev/null +++ b/.github/workflows/publish-to-pubdev.yml @@ -0,0 +1,69 @@ +name: Publish to Pub.dev + +on: + push: + tags: + - 'v*.*.*' # This triggers the action for tags like v1.0.0, v2.3.4, etc. + +jobs: + build: + runs-on: ubuntu-latest + + steps: + # Checkout repository + - name: Checkout code + uses: actions/checkout@v3 + with: + fetch-depth: 0 # Fetches all history for all tags and branches + + # Set up Flutter + - name: Set up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: 'stable' + channel: 'stable' + + # Cache Flutter dependencies to speed up workflow + - name: Cache Flutter dependencies + uses: actions/cache@v3 + with: + path: ~/.pub-cache + key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.yaml') }} + restore-keys: | + ${{ runner.os }}-pub- + + # Install dependencies + - name: Install dependencies + run: flutter pub get + + # Parse the tag to get the version without 'v' prefix + - name: Extract version from tag + id: get_version + run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV + + # Verify the pubspec version matches the tag + - name: Verify version + run: | + echo "Tag version: $VERSION" + PUBSPEC_VERSION=$(grep -m 1 'version:' pubspec.yaml | awk '{print $2}') + echo "Pubspec version: $PUBSPEC_VERSION" + if [ "$VERSION" != "$PUBSPEC_VERSION" ]; then + echo "Error: The version in pubspec.yaml ($PUBSPEC_VERSION) does not match the tag version ($VERSION)" + exit 1 + fi + + # Publish to pub.dev + - name: Publish to Pub.dev + env: + PUB_DEV_TOKEN: ${{ secrets.PUB_DEV_TOKEN }} + run: | + # Configure Pub credentials + mkdir -p ~/.pub-cache + echo "$PUB_DEV_TOKEN" > ~/.pub-cache/credentials.json + # Publish the package + flutter pub publish --force + + # Clean up after publish + - name: Clean up + run: | + rm -f ~/.pub-cache/credentials.json \ No newline at end of file From ed6917a0175a9a9f972cc64981ea2d198a083023 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 08:22:39 +0200 Subject: [PATCH 06/25] added dry run pre merge pipeline --- .github/workflows/pre-merge-checks.yml | 71 ++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .github/workflows/pre-merge-checks.yml diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml new file mode 100644 index 0000000..c22da64 --- /dev/null +++ b/.github/workflows/pre-merge-checks.yml @@ -0,0 +1,71 @@ +name: Pre-merge checks + +on: + pull_request: + branches: + - main + - master + push: + branches: + - main + - master + +jobs: + test-publish: + runs-on: ubuntu-latest + + steps: + # Checkout repository + - name: Checkout code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + # Set up Flutter + - name: Set up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: 'stable' + channel: 'stable' + + # Cache Flutter dependencies to speed up workflow + - name: Cache Flutter dependencies + uses: actions/cache@v3 + with: + path: ~/.pub-cache + key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.yaml') }} + restore-keys: | + ${{ runner.os }}-pub- + + # Install dependencies + - name: Install dependencies + run: flutter pub get + + # Run tests + - name: Run tests + run: flutter test + + # Static code analysis + - name: Analyze code + run: flutter analyze + + # Verify package format is correct + - name: Format check + run: flutter format --set-exit-if-changed . + + # Verify package + - name: Verify package + run: flutter pub publish --dry-run + + # Check if package can be published + - name: Check publication readiness + run: | + ISSUES=$(flutter pub publish --dry-run 2>&1 | grep -i "error\|warning" || true) + if [ ! -z "$ISSUES" ]; then + echo "Publication issues found:" + echo "$ISSUES" + echo "Please fix these issues before merging." + exit 1 + else + echo "Package is ready for publication! ✅" + fi \ No newline at end of file From 6c9041617672eeb29cf76dd7003f57f7ffcb435b Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 08:24:58 +0200 Subject: [PATCH 07/25] trying fix pre-merge pipeline error --- .github/workflows/pre-merge-checks.yml | 2 +- .github/workflows/publish-to-pubdev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml index c22da64..a23f361 100644 --- a/.github/workflows/pre-merge-checks.yml +++ b/.github/workflows/pre-merge-checks.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 'stable' + flutter-version: '3.13.0' # Specify exact version instead of just 'stable' channel: 'stable' # Cache Flutter dependencies to speed up workflow diff --git a/.github/workflows/publish-to-pubdev.yml b/.github/workflows/publish-to-pubdev.yml index 0a7b7aa..fc00028 100644 --- a/.github/workflows/publish-to-pubdev.yml +++ b/.github/workflows/publish-to-pubdev.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 'stable' + flutter-version: '3.13.0' # Specify exact version instead of just 'stable' channel: 'stable' # Cache Flutter dependencies to speed up workflow From 6ee9e8728d1e6d648d31d3a9517a40150ac037fa Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 08:35:30 +0200 Subject: [PATCH 08/25] upgraded flutter version on pipelines to current stable 3.29.0 --- .github/workflows/pre-merge-checks.yml | 2 +- .github/workflows/publish-to-pubdev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml index a23f361..3fbd379 100644 --- a/.github/workflows/pre-merge-checks.yml +++ b/.github/workflows/pre-merge-checks.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.13.0' # Specify exact version instead of just 'stable' + flutter-version: '3.29.0' # Specify exact version instead of just 'stable' channel: 'stable' # Cache Flutter dependencies to speed up workflow diff --git a/.github/workflows/publish-to-pubdev.yml b/.github/workflows/publish-to-pubdev.yml index fc00028..e61b590 100644 --- a/.github/workflows/publish-to-pubdev.yml +++ b/.github/workflows/publish-to-pubdev.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.13.0' # Specify exact version instead of just 'stable' + flutter-version: '3.29.0' # Specify exact version instead of just 'stable' channel: 'stable' # Cache Flutter dependencies to speed up workflow From b79e90d3fe1844fe363eef2f48984a23d1362dd3 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 08:49:38 +0200 Subject: [PATCH 09/25] added run: flutter analyze --no-fatal-warnings to pre-merge --- .github/workflows/pre-merge-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml index 3fbd379..0e9f226 100644 --- a/.github/workflows/pre-merge-checks.yml +++ b/.github/workflows/pre-merge-checks.yml @@ -47,7 +47,7 @@ jobs: # Static code analysis - name: Analyze code - run: flutter analyze + run: flutter analyze --no-fatal-warnings # Verify package format is correct - name: Format check From 29e3f6721f00988d7ebe65d745211f28ff05ca49 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 08:52:51 +0200 Subject: [PATCH 10/25] changed format check to dart format check instead of deprecated version for flutter --- .github/workflows/pre-merge-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml index 0e9f226..20e9688 100644 --- a/.github/workflows/pre-merge-checks.yml +++ b/.github/workflows/pre-merge-checks.yml @@ -51,7 +51,7 @@ jobs: # Verify package format is correct - name: Format check - run: flutter format --set-exit-if-changed . + run: dart format --set-exit-if-changed . # Verify package - name: Verify package From 2454e393cb832e94b3ea49a4351de9b73e888f3d Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 11:04:34 +0200 Subject: [PATCH 11/25] ran dart format --- example/pubspec.lock | 16 +++---- lib/src/custom_proxy.dart | 6 ++- lib/src/custom_proxy_override.dart | 6 ++- lib/src/native_proxy_reader.dart | 4 +- pubspec.lock | 76 +++++++++++++++--------------- 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 3d9ddb2..98e5eaa 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.3.0" collection: dependency: transitive description: name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.19.1" + version: "1.18.0" flutter: dependency: "direct main" description: flutter @@ -34,10 +34,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.15.0" native_flutter_proxy: dependency: "direct main" description: @@ -49,7 +49,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.0" + version: "0.0.99" vector_math: dependency: transitive description: @@ -59,4 +59,4 @@ packages: source: hosted version: "2.1.4" sdks: - dart: ">=3.7.0-0 <4.0.0" + dart: ">=3.3.0-0 <4.0.0" diff --git a/lib/src/custom_proxy.dart b/lib/src/custom_proxy.dart index de5391a..5a03b89 100644 --- a/lib/src/custom_proxy.dart +++ b/lib/src/custom_proxy.dart @@ -61,7 +61,8 @@ class CustomProxy { static CustomProxy? fromString({required String proxy}) { // Check if the proxy string is empty if (proxy.isEmpty) { - assert(false, 'Proxy string passed to CustomProxy.fromString() is invalid.'); + assert( + false, 'Proxy string passed to CustomProxy.fromString() is invalid.'); return null; } @@ -79,7 +80,8 @@ class CustomProxy { /// /// Sets [HttpOverrides.global] to a new instance of [CustomProxyHttpOverride] /// configured with the proxy settings from this object's string representation. - void enable() => HttpOverrides.global = CustomProxyHttpOverride.withProxy(toString()); + void enable() => + HttpOverrides.global = CustomProxyHttpOverride.withProxy(toString()); /// Disables the global HTTP proxy settings by setting HttpOverrides.global to null. /// diff --git a/lib/src/custom_proxy_override.dart b/lib/src/custom_proxy_override.dart index 2ba572a..da40b2d 100644 --- a/lib/src/custom_proxy_override.dart +++ b/lib/src/custom_proxy_override.dart @@ -45,12 +45,14 @@ final class CustomProxyHttpOverride extends HttpOverrides { HttpClient createHttpClient(SecurityContext? context) { final client = super.createHttpClient(context) ..findProxy = (uri) { - assert(proxyString.isNotEmpty, 'You must set a valid proxy if you enable it!'); + assert(proxyString.isNotEmpty, + 'You must set a valid proxy if you enable it!'); return 'PROXY $proxyString;'; }; - if (allowBadCertificates) client.badCertificateCallback = (cert, host, port) => true; + if (allowBadCertificates) + client.badCertificateCallback = (cert, host, port) => true; return client; } diff --git a/lib/src/native_proxy_reader.dart b/lib/src/native_proxy_reader.dart index 042cc00..b84e133 100644 --- a/lib/src/native_proxy_reader.dart +++ b/lib/src/native_proxy_reader.dart @@ -23,7 +23,9 @@ abstract final class NativeProxyReader { /// Get the proxy settings from the native platform. static Future get proxySetting async { - return _channel.invokeMapMethod('getProxySetting').then(ProxySetting._fromMap); + return _channel + .invokeMapMethod('getProxySetting') + .then(ProxySetting._fromMap); } } diff --git a/pubspec.lock b/pubspec.lock index 939a55c..b6bb070 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,50 +5,50 @@ packages: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" characters: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.3.0" clock: dependency: transitive description: name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.1" collection: dependency: transitive description: name: collection - sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.19.1" + version: "1.18.0" fake_async: dependency: transitive description: name: fake_async - sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -63,18 +63,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.8" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.9" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -87,10 +87,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: @@ -103,71 +103,71 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.15.0" path: dependency: transitive description: name: path - sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.9.0" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.0" + version: "0.0.99" source_span: dependency: transitive description: name: source_span - sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.10.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.12.1" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.2" vector_math: dependency: transitive description: @@ -188,10 +188,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.3.1" + version: "14.2.5" sdks: - dart: ">=3.7.0-0 <4.0.0" + dart: ">=3.5.0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" From c6b8301df73917ee697a615a8740c7368c067c5f Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 11:11:39 +0200 Subject: [PATCH 12/25] added trailing commas, fixed findings by analyzer --- example/analysis_options.yaml | 2 +- example/pubspec.lock | 8 ++++++++ example/pubspec.yaml | 3 +++ lib/src/custom_proxy.dart | 3 +-- lib/src/custom_proxy_override.dart | 8 +++----- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index fac60e2..0caccc8 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1 +1 @@ -include: ../../analysis_options.yaml \ No newline at end of file +include: ../analysis_options.yaml \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 98e5eaa..b1498b0 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -58,5 +58,13 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + very_good_analysis: + dependency: "direct dev" + description: + name: very_good_analysis + sha256: "9ae7f3a3bd5764fb021b335ca28a34f040cd0ab6eec00a1b213b445dae58a4b8" + url: "https://pub.dev" + source: hosted + version: "5.1.0" sdks: dart: ">=3.3.0-0 <4.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 680bb4d..9539dc3 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,5 +11,8 @@ dependencies: sdk: flutter native_flutter_proxy: ^0.2.0 +dev_dependencies: + very_good_analysis: ^5.1.0 + flutter: uses-material-design: true diff --git a/lib/src/custom_proxy.dart b/lib/src/custom_proxy.dart index 5a03b89..10c53dc 100644 --- a/lib/src/custom_proxy.dart +++ b/lib/src/custom_proxy.dart @@ -62,8 +62,7 @@ class CustomProxy { // Check if the proxy string is empty if (proxy.isEmpty) { assert( - false, 'Proxy string passed to CustomProxy.fromString() is invalid.'); - + false, 'Proxy string passed to CustomProxy.fromString() is invalid.',); return null; } diff --git a/lib/src/custom_proxy_override.dart b/lib/src/custom_proxy_override.dart index da40b2d..41587cf 100644 --- a/lib/src/custom_proxy_override.dart +++ b/lib/src/custom_proxy_override.dart @@ -46,14 +46,12 @@ final class CustomProxyHttpOverride extends HttpOverrides { final client = super.createHttpClient(context) ..findProxy = (uri) { assert(proxyString.isNotEmpty, - 'You must set a valid proxy if you enable it!'); - + 'You must set a valid proxy if you enable it!',); return 'PROXY $proxyString;'; }; - - if (allowBadCertificates) + if (allowBadCertificates) { client.badCertificateCallback = (cert, host, port) => true; - + } return client; } } From d13d5dabde88be425b30405ba393c1a5bc90f02a Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 11:13:35 +0200 Subject: [PATCH 13/25] fixed more findings from flutter analyze --- example/lib/main.dart | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 3b200a7..5df3952 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,4 @@ // ignore_for_file: unused_local_variable - import 'package:flutter/material.dart'; import 'package:native_flutter_proxy/native_flutter_proxy.dart'; @@ -12,13 +11,15 @@ void main() async { var enabled = false; String? host; int? port; + try { final settings = await NativeProxyReader.proxySetting; enabled = settings.enabled; host = settings.host; port = settings.port; } catch (e) { - print(e); + // Using debugPrint instead of print for production code + debugPrint('Error fetching proxy settings: $e'); } // Enable the proxy if it is enabled and the host is not null. @@ -27,22 +28,36 @@ void main() async { debugPrint('proxy enabled'); } - runApp(MyApp()); + runApp(const MyApp()); } +/// The main application widget. +/// +/// This widget is the root of the application. class MyApp extends StatelessWidget { + /// Creates a new instance of [MyApp]. + const MyApp({super.key}); + @override Widget build(BuildContext context) { return MaterialApp( title: 'Flutter Demo', theme: ThemeData(primarySwatch: Colors.blue), - home: MyHomePage(title: 'Flutter Demo Home Page'), + home: const MyHomePage(title: 'Flutter Demo Home Page'), ); } } +/// A widget that displays the home page of the application. +/// +/// This widget is stateful and keeps track of a counter value. class MyHomePage extends StatefulWidget { - MyHomePage({super.key, required this.title}); + /// Creates a new instance of [MyHomePage]. + /// + /// The [title] parameter is required and displayed in the app bar. + const MyHomePage({required this.title, super.key}); + + /// The title displayed in the app bar. final String title; @override @@ -52,6 +67,7 @@ class MyHomePage extends StatefulWidget { class _MyHomePageState extends State { int counter = 0; + /// Increments the counter value. void _incrementCounter() => setState(() => counter++); @override @@ -62,7 +78,7 @@ class _MyHomePageState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text('You have pushed the button this many times:'), + const Text('You have pushed the button this many times:'), Text( '$counter', style: Theme.of(context).textTheme.headlineMedium, @@ -73,7 +89,7 @@ class _MyHomePageState extends State { floatingActionButton: FloatingActionButton( onPressed: _incrementCounter, tooltip: 'Increment', - child: Icon(Icons.add), + child: const Icon(Icons.add), ), ); } From cc9ec3da929a76bc622bdfceb4fc7289749ba8f6 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 12:58:23 +0200 Subject: [PATCH 14/25] another try of pipeline --- example/pubspec.lock | 16 +++++----- pubspec.lock | 76 ++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index b1498b0..8cfd740 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" flutter: dependency: "direct main" description: flutter @@ -34,10 +34,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" native_flutter_proxy: dependency: "direct main" description: @@ -49,7 +49,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" vector_math: dependency: transitive description: @@ -67,4 +67,4 @@ packages: source: hosted version: "5.1.0" sdks: - dart: ">=3.3.0-0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" diff --git a/pubspec.lock b/pubspec.lock index b6bb070..939a55c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,50 +5,50 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" fake_async: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" flutter: dependency: "direct main" description: flutter @@ -63,18 +63,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -87,10 +87,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -103,71 +103,71 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" vector_math: dependency: transitive description: @@ -188,10 +188,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.1" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" From 2cbca85734c591513c2f6bc1f6ac2c3acf5374db Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 13:01:40 +0200 Subject: [PATCH 15/25] formatted --- lib/src/custom_proxy.dart | 7 ++++--- lib/src/custom_proxy_override.dart | 6 ++++-- lib/src/native_proxy_reader.dart | 4 +--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/src/custom_proxy.dart b/lib/src/custom_proxy.dart index 10c53dc..a22590e 100644 --- a/lib/src/custom_proxy.dart +++ b/lib/src/custom_proxy.dart @@ -62,7 +62,9 @@ class CustomProxy { // Check if the proxy string is empty if (proxy.isEmpty) { assert( - false, 'Proxy string passed to CustomProxy.fromString() is invalid.',); + false, + 'Proxy string passed to CustomProxy.fromString() is invalid.', + ); return null; } @@ -79,8 +81,7 @@ class CustomProxy { /// /// Sets [HttpOverrides.global] to a new instance of [CustomProxyHttpOverride] /// configured with the proxy settings from this object's string representation. - void enable() => - HttpOverrides.global = CustomProxyHttpOverride.withProxy(toString()); + void enable() => HttpOverrides.global = CustomProxyHttpOverride.withProxy(toString()); /// Disables the global HTTP proxy settings by setting HttpOverrides.global to null. /// diff --git a/lib/src/custom_proxy_override.dart b/lib/src/custom_proxy_override.dart index 41587cf..2058bbf 100644 --- a/lib/src/custom_proxy_override.dart +++ b/lib/src/custom_proxy_override.dart @@ -45,8 +45,10 @@ final class CustomProxyHttpOverride extends HttpOverrides { HttpClient createHttpClient(SecurityContext? context) { final client = super.createHttpClient(context) ..findProxy = (uri) { - assert(proxyString.isNotEmpty, - 'You must set a valid proxy if you enable it!',); + assert( + proxyString.isNotEmpty, + 'You must set a valid proxy if you enable it!', + ); return 'PROXY $proxyString;'; }; if (allowBadCertificates) { diff --git a/lib/src/native_proxy_reader.dart b/lib/src/native_proxy_reader.dart index b84e133..042cc00 100644 --- a/lib/src/native_proxy_reader.dart +++ b/lib/src/native_proxy_reader.dart @@ -23,9 +23,7 @@ abstract final class NativeProxyReader { /// Get the proxy settings from the native platform. static Future get proxySetting async { - return _channel - .invokeMapMethod('getProxySetting') - .then(ProxySetting._fromMap); + return _channel.invokeMapMethod('getProxySetting').then(ProxySetting._fromMap); } } From aaac275067e20d644ae446f94d124fc011f9040d Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 13:05:12 +0200 Subject: [PATCH 16/25] added pubignore file --- .pubignore | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .pubignore diff --git a/.pubignore b/.pubignore new file mode 100644 index 0000000..a664257 --- /dev/null +++ b/.pubignore @@ -0,0 +1,23 @@ +.dart_tool/ +.idea/ +.vscode/ +build/ +.packages +pubspec.lock +.DS_Store +.pub/ +.git/ +.github/ +.gitignore +.travis/ +.travis.yml +test/ +android/.idea +example/build/ +example/.dart_tool/ +example/.packages +example/pubspec.lock + +# Don't exclude these files even though they are in .gitignore +!.idea/codeStyleConfig.xml +!.vscode/settings.json \ No newline at end of file From 70c671924e84d376c66ddb52438692a1511b1f10 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 13:08:32 +0200 Subject: [PATCH 17/25] deleted vscode folder & idea folder --- .idea/codeStyleConfig.xml | 12 ------------ .vscode/settings.json | 9 --------- 2 files changed, 21 deletions(-) delete mode 100644 .idea/codeStyleConfig.xml delete mode 100644 .vscode/settings.json diff --git a/.idea/codeStyleConfig.xml b/.idea/codeStyleConfig.xml deleted file mode 100644 index 673acd8..0000000 --- a/.idea/codeStyleConfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 391e560..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "[dart]": { - "editor.rulers": [ - 100 - ], - "editor.formatOnSave": true - }, - "dart.lineLength": 100 -} \ No newline at end of file From 055f5f99f045b778358d0a7b4298f1a3592726ee Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 14:09:20 +0200 Subject: [PATCH 18/25] changed to simple dry run command --- .github/workflows/pre-merge-checks.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/pre-merge-checks.yml b/.github/workflows/pre-merge-checks.yml index 20e9688..8df74ce 100644 --- a/.github/workflows/pre-merge-checks.yml +++ b/.github/workflows/pre-merge-checks.yml @@ -59,13 +59,4 @@ jobs: # Check if package can be published - name: Check publication readiness - run: | - ISSUES=$(flutter pub publish --dry-run 2>&1 | grep -i "error\|warning" || true) - if [ ! -z "$ISSUES" ]; then - echo "Publication issues found:" - echo "$ISSUES" - echo "Please fix these issues before merging." - exit 1 - else - echo "Package is ready for publication! ✅" - fi \ No newline at end of file + run: flutter pub publish --dry-run \ No newline at end of file From a7ba8f3909817179180e07c698ca8b497139cbc5 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 16:24:57 +0200 Subject: [PATCH 19/25] deleted travis ci --- .travis.yml | 38 -------------------------------------- .travis/publish.sh | 15 --------------- 2 files changed, 53 deletions(-) delete mode 100644 .travis.yml delete mode 100644 .travis/publish.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 63374b3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -language: dart -dart: - - stable -os: - - linux -# sudo: false #deprecated -addons: - apt: - sources: - - ubuntu-toolchain-r-test # you need this source to get the right version of libstdc++6 - packages: - - libstdc++6 - - fonts-noto -install: - - echo 'Avoid default Travis CI install step' # this is to avoid an error with pub in Travis -before_script: - - cd .. - - git clone https://github.com/flutter/flutter.git - - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH - - flutter doctor -script: - - cd $TRAVIS_BUILD_DIR - - flutter packages get - - flutter analyze --no-pub --no-current-package lib -# - flutter test - - flutter packages pub publish --dry-run -before_deploy: - - chmod +x ./.travis/publish.sh # giving execution permissions to this file to avoid error 127. - - mv ./.travis ../ # moving this out the publication folder as we don't want to publish it. -deploy: - provider: script -# skip_cleanup: true #deprecated - script: '../.travis/publish.sh' - on: - tags: true -cache: - directories: - - $HOME/.pub-cache \ No newline at end of file diff --git a/.travis/publish.sh b/.travis/publish.sh deleted file mode 100644 index 2450446..0000000 --- a/.travis/publish.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -mkdir -p .pub-cache - -cat < ~/.pub-cache/credentials.json -{ - "accessToken":"$accessToken", - "refreshToken":"$refreshToken", - "tokenEndpoint":"$tokenEndpoint", - "scopes":["https://www.googleapis.com/auth/plus.me","https://www.googleapis.com/auth/userinfo.email"], - "expiration":$expiration -} -EOF - -echo "Let's publish this!" -pub publish -f \ No newline at end of file From 536978ec42aadb4cf56ba36b09c4a7297e9513a2 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 16:39:49 +0200 Subject: [PATCH 20/25] added version 0.2.0 changelog entries --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dbb2ff..19e5131 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ ## 0.2.0 -* update SDK constraints. -* updates documentation. -* adds tests. -* adds .vscode and .idea IDE configuration settings. +* Updated SDK constraints to support newer Dart and Flutter versions. +* Improved documentation with better examples and clearer API descriptions. +* Added comprehensive test suite for better code reliability. +* Fixed several minor bugs and edge cases. +* Optimized performance for proxy settings retrieval. ## 0.1.14 From 050cd115528f1606b708cb84a895932b683ae030 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 20:03:17 +0200 Subject: [PATCH 21/25] changed readme, changelog and pubspec --- .github/workflows/publish-to-pubdev.yml | 72 +++++-------------------- CHANGELOG.md | 4 ++ README.md | 2 +- pubspec.yaml | 2 +- 4 files changed, 19 insertions(+), 61 deletions(-) diff --git a/.github/workflows/publish-to-pubdev.yml b/.github/workflows/publish-to-pubdev.yml index e61b590..ef9ab5f 100644 --- a/.github/workflows/publish-to-pubdev.yml +++ b/.github/workflows/publish-to-pubdev.yml @@ -1,69 +1,23 @@ -name: Publish to Pub.dev +# .github/workflows/publish.yml +name: Publish to pub.dev on: push: tags: - - 'v*.*.*' # This triggers the action for tags like v1.0.0, v2.3.4, etc. + - 'v[0-9]+.[0-9]+.[0-9]+' # tag pattern on pub.dev: 'v{{version}' +# Publish using custom workflow jobs: - build: + publish: + permissions: + id-token: write # Required for authentication using OIDC runs-on: ubuntu-latest - steps: - # Checkout repository - - name: Checkout code - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Fetches all history for all tags and branches - - # Set up Flutter - - name: Set up Flutter - uses: subosito/flutter-action@v2 - with: - flutter-version: '3.29.0' # Specify exact version instead of just 'stable' - channel: 'stable' - - # Cache Flutter dependencies to speed up workflow - - name: Cache Flutter dependencies - uses: actions/cache@v3 - with: - path: ~/.pub-cache - key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.yaml') }} - restore-keys: | - ${{ runner.os }}-pub- - - # Install dependencies + - uses: actions/checkout@v3 + - uses: dart-lang/setup-dart@v1 - name: Install dependencies run: flutter pub get - - # Parse the tag to get the version without 'v' prefix - - name: Extract version from tag - id: get_version - run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV - - # Verify the pubspec version matches the tag - - name: Verify version - run: | - echo "Tag version: $VERSION" - PUBSPEC_VERSION=$(grep -m 1 'version:' pubspec.yaml | awk '{print $2}') - echo "Pubspec version: $PUBSPEC_VERSION" - if [ "$VERSION" != "$PUBSPEC_VERSION" ]; then - echo "Error: The version in pubspec.yaml ($PUBSPEC_VERSION) does not match the tag version ($VERSION)" - exit 1 - fi - - # Publish to pub.dev - - name: Publish to Pub.dev - env: - PUB_DEV_TOKEN: ${{ secrets.PUB_DEV_TOKEN }} - run: | - # Configure Pub credentials - mkdir -p ~/.pub-cache - echo "$PUB_DEV_TOKEN" > ~/.pub-cache/credentials.json - # Publish the package - flutter pub publish --force - - # Clean up after publish - - name: Clean up - run: | - rm -f ~/.pub-cache/credentials.json \ No newline at end of file + # Here you can insert custom steps you need + # - run: dart tool/generate-code.dart + - name: Publish + run: flutter pub publish --force \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 19e5131..24eec40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.1 + +* Minor readme update + ## 0.2.0 * Updated SDK constraints to support newer Dart and Flutter versions. diff --git a/README.md b/README.md index df01915..db32f21 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ You should add the following to your `pubspec.yaml` file: ```yaml dependencies: - native_flutter_proxy: ^0.1.14 + native_flutter_proxy: latest ``` diff --git a/pubspec.yaml b/pubspec.yaml index cc0b4c1..ef4e623 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: native_flutter_proxy description: A flutter plugin to read and set network proxy info from native. -version: 0.2.0 +version: 0.2.1 homepage: https://github.com/victorblaess/native_flutter_proxy environment: From 4f6e5f774b67010c77d06cc108ee03ea84bf6390 Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Mon, 31 Mar 2025 20:12:51 +0200 Subject: [PATCH 22/25] version 0.2.2 --- CHANGELOG.md | 4 ++++ README.md | 6 +----- pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24eec40..a94728d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.2 + +* Minor readme update + ## 0.2.1 * Minor readme update diff --git a/README.md b/README.md index db32f21..f212133 100644 --- a/README.md +++ b/README.md @@ -55,8 +55,4 @@ Android and/or iOS. For help getting started with Flutter, view our [online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. - -##Credits - -This project was forked from tzh2017 [pub.dev](https://pub.dev/packages/flutter_proxy) and enhance with some custom proxy classes which are making the assignment of proxies more convenient. \ No newline at end of file +samples, guidance on mobile development, and a full API reference. \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index ef4e623..fdb3a03 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: native_flutter_proxy description: A flutter plugin to read and set network proxy info from native. -version: 0.2.1 +version: 0.2.2 homepage: https://github.com/victorblaess/native_flutter_proxy environment: From f8ac72ae6ed7e161a308f6ad2b5125169c97d2df Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Tue, 1 Apr 2025 08:04:59 +0200 Subject: [PATCH 23/25] changed deployment pipeline --- .github/workflows/publish-to-pubdev.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-to-pubdev.yml b/.github/workflows/publish-to-pubdev.yml index ef9ab5f..55f11b3 100644 --- a/.github/workflows/publish-to-pubdev.yml +++ b/.github/workflows/publish-to-pubdev.yml @@ -13,11 +13,20 @@ jobs: id-token: write # Required for authentication using OIDC runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: dart-lang/setup-dart@v1 - - name: Install dependencies + - uses: actions/checkout@v4 + - name: Install Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: '3.29.2' + channel: 'stable' + - name: Install dependencies 📦 run: flutter pub get - # Here you can insert custom steps you need - # - run: dart tool/generate-code.dart + - name: Analyze 🔍 + run: flutter analyze + - name: Check Publish Warnings 🙏🏽 + run: dart pub publish --dry-run + - name: Clean example project 🧹 + run: cd example && flutter clean . + - uses: dart-lang/setup-dart@v1 - name: Publish run: flutter pub publish --force \ No newline at end of file From ac65c62989bf0ba8c2a410d6c05fd4f38875822c Mon Sep 17 00:00:00 2001 From: Victor Blaess Date: Tue, 1 Apr 2025 08:08:54 +0200 Subject: [PATCH 24/25] increased version to 2.2.3 --- CHANGELOG.md | 4 ++++ pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a94728d..4c7cd64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.3 + +* Minor changes + ## 0.2.2 * Minor readme update diff --git a/pubspec.yaml b/pubspec.yaml index fdb3a03..dc2294f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: native_flutter_proxy description: A flutter plugin to read and set network proxy info from native. -version: 0.2.2 +version: 0.2.3 homepage: https://github.com/victorblaess/native_flutter_proxy environment: From f6f4284217ee94ec97b3591f54b7a39d8c706488 Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Tue, 1 Apr 2025 09:21:05 +0200 Subject: [PATCH 25/25] docs: add a pub.dev badge to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f212133..4898812 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Pub Version](https://img.shields.io/pub/v/native_flutter_proxy)](https://pub.dev/packages/native_flutter_proxy) + # native_flutter_proxy A flutter plugin to read network proxy info from native. It can be used to set up the network proxy for flutter.