Release 0.1.0 (#12)

Rushabhshroff · web-flow · commit 58753678e1ff · 2023-08-07T19:15:10.000+05:30
* use Android Proxy Selector instead or env vars.

* use minSDKVersion 31 in example

* ios: use min platform version 11.0 for example

* fix: use Foundation Lib for executing pac

* return error string instead of "Error"

* clean code

* release 0.1.0

* update: Homepage

* modify project details
diff --git a/android/src/main/java/com/browserstack/fluttersystemproxy/flutter_system_proxy/FlutterSystemProxyPlugin.java b/android/src/main/java/com/browserstack/fluttersystemproxy/flutter_system_proxy/FlutterSystemProxyPlugin.java
@@ -3,6 +3,10 @@
 import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,12 +35,26 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
   @Override
   public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
     if (call.method.equals("getDeviceProxy")) {
-      Map map = new HashMap<String, String>();
-      map.put("http.proxyHost", System.getProperty("http.proxyHost"));
-      map.put("http.proxyPort", System.getProperty("http.proxyPort"));
-      map.put("https.proxyHost", System.getProperty("https.proxyHost"));
-      map.put("https.proxyPort", System.getProperty("https.proxyPort"));
-      result.success(map);
+      HashMap<String, String> _map = new HashMap<String, String>() {
+        {
+          put("host", null);
+          put("port", null);
+        }
+      };
+      String url = call.argument("url");
+      ProxySelector selector = ProxySelector.getDefault();
+      try {
+        for (Proxy proxy : selector.select(new URI(url))) {
+          if (proxy.type() == Proxy.Type.HTTP) {
+            InetSocketAddress addr = (InetSocketAddress) proxy.address();
+            _map.put("host", addr.getHostName());
+            _map.put("port", Integer.toString(addr.getPort()));
+          }
+        }
+        result.success(_map);
+      } catch (Exception ex) {
+        result.error("URL Error",ex.getMessage(),null);
+      }
     } else {
       result.notImplemented();
     }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_system_proxy/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_system_proxy: 96eb97e3857a1d1bc533a6f7387a1f0dcb63d782
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -68,7 +68,6 @@
 				3D695DD80D4DCA36C1B83028 /* Pods-Runner.release.xcconfig */,
 				2B955829EF2302761365E6DB /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -263,7 +262,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -340,7 +339,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -358,8 +357,11 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.browserstack.fluttersystemproxy.flutterSystemProxyExample;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.browserstack.fluttersystemproxy.flutterSystemProxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -414,7 +416,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -463,7 +465,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -482,8 +484,11 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.browserstack.fluttersystemproxy.flutterSystemProxyExample;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.browserstack.fluttersystemproxy.flutterSystemProxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -501,8 +506,11 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.browserstack.fluttersystemproxy.flutterSystemProxyExample;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.browserstack.fluttersystemproxy.flutterSystemProxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -90,6 +90,6 @@ Future<String> fetchLocalHost() async {
     return response.toString();
   } catch (e) {
     print(e);
-    return "Error";
+    return e.toString();
   }
 }
diff --git a/ios/Classes/SwiftFlutterSystemProxyPlugin.swift b/ios/Classes/SwiftFlutterSystemProxyPlugin.swift
@@ -11,28 +11,77 @@ public class SwiftFlutterSystemProxyPlugin: NSObject, FlutterPlugin {
   public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
     switch call.method {
     case "getDeviceProxy":
-      let systemProxySettings = CFNetworkCopySystemProxySettings()?.takeUnretainedValue() ?? [:] as CFDictionary
-      result(systemProxySettings as NSDictionary)
-      break
-    case "executePAC":
-      let systemProxySettings = CFNetworkCopySystemProxySettings()?.takeUnretainedValue() ?? [:] as CFDictionary
-      let proxyDict = systemProxySettings as NSDictionary
-      if(proxyDict.value(forKey:"ProxyAutoConfigEnable")as! Bool){
-        let args = call.arguments as! NSDictionary
-        let url = args.value(forKey:"url") as! String
-        let host = args.value(forKey:"host") as! String
-        let js = args.value(forKey:"js") as! String
-        let jsEngine:JSContext = JSContext()
-        jsEngine.evaluateScript(js)
-        let fn = "FindProxyForURL(\"" + url + "\",\""+host+"\")"
-        let proxy = jsEngine.evaluateScript(fn)
-        result(proxy?.toString())
-      }else{
-        result("DIRECT")
-      }
+      let args = call.arguments as! NSDictionary
+      let url = args.value(forKey:"url") as! String
+      var dict:[String:Any] = [:]
+      findProxyFromEnvironment(url: url,callback: { host, port in 
+        dict["host"] = host 
+        dict["port"] = port
+        result(dict)
+      })
       break
     default:
       result(FlutterMethodNotImplemented)
     }
   }
+
+  func findProxyFromEnvironment(url: String,callback: @escaping (_ host:String?,_ port:Int?)->Void) {
+        let proxConfigDict = CFNetworkCopySystemProxySettings()?.takeUnretainedValue() as NSDictionary?
+        if(proxConfigDict != nil){
+            if(proxConfigDict!["ProxyAutoConfigEnable"] as? Int == 1){
+                let pacUrl = proxConfigDict!["ProxyAutoConfigURLString"] as? String
+                let pacContent = proxConfigDict!["ProxyAutoConfigJavaScript"] as? String
+                if(pacContent != nil){
+                    self.handlePacContent(pacContent: pacContent! as String, url: url, callback: callback)
+                }
+                downloadPac(pacUrl: pacUrl!, callback: { pacContent,error in
+                    
+                    if(error != nil){
+                        callback(nil,nil)
+                    }else{
+                        self.handlePacContent(pacContent: pacContent!, url: url, callback: callback)
+                    }
+                })
+            } else if (proxConfigDict!["HTTPEnable"] as? Int == 1){
+                callback((proxConfigDict!["HTTPProxy"] as? String),(proxConfigDict!["HTTPPort"] as? Int))
+            } else if ( proxConfigDict!["HTTPSEnable"] as? Int == 1){
+                callback((proxConfigDict!["HTTPSProxy"] as? String),(proxConfigDict!["HTTPSPort"] as? Int))
+            } else {
+                callback(nil,nil)
+            }
+        }
+    }
+    
+    func handlePacContent(pacContent: String,url: String, callback:(_ host:String?,_ port:Int?)->Void){
+        let proxies = CFNetworkCopyProxiesForAutoConfigurationScript(pacContent as CFString, CFURLCreateWithString(kCFAllocatorDefault, url as CFString, nil), nil)!.takeUnretainedValue() as? [[CFString: Any]] ?? [];
+        if(proxies.count > 0){
+            let proxy = proxies.first{$0[kCFProxyTypeKey] as! CFString == kCFProxyTypeHTTP || $0[kCFProxyTypeKey] as! CFString == kCFProxyTypeHTTPS}
+            if(proxy != nil){
+                let host = proxy?[kCFProxyHostNameKey] ?? nil
+                let port = proxy?[kCFProxyPortNumberKey] ?? nil
+                callback(host as? String,port as? Int)
+            }else{
+               callback(nil,nil)
+            }
+        }else{
+            callback(nil,nil)
+        }
+    }
+    
+    
+    func downloadPac(pacUrl:String, callback:@escaping (_ pacContent:String?,_ error: Error?)->Void) {
+        var pacContent:String = ""
+        let config = URLSessionConfiguration.default
+        config.connectionProxyDictionary = [AnyHashable: Any]()
+        let session = URLSession.init(configuration: config,delegate: nil,delegateQueue: OperationQueue.current)
+        session.dataTask(with: URL(string: pacUrl)!, completionHandler: { data, response, error in
+            if(error != nil){
+                callback(nil,error)
+            }
+            pacContent = String(bytes: data!,encoding: String.Encoding.utf8)!
+            callback(pacContent,nil)
+        }).resume()
+
+    }
+
 }
diff --git a/lib/flutter_system_proxy.dart b/lib/flutter_system_proxy.dart
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,6 @@ Future<String> fetchLocalHost() async {`
`90`	`90`	`return response.toString();`
`91`	`91`	`} catch (e) {`
`92`	`92`	`print(e);`
`93`		`- return "Error";`
	`93`	`+ return e.toString();`
`94`	`94`	`}`
`95`	`95`	`}`