merge latest

internalsdk/auth/auth.go

@@ -58,7 +58,7 @@ func NewClient(baseURL string, userConfig func() common.UserConfig) AuthClient {
 		// iOS
 		// There is no use of chnained proxy in iOS since all requests will fail
 		httpClient = &http.Client{
-			Transport: proxied.Fronted(""),
+			Transport: proxied.Fronted("authClient-ios"),
 			Timeout:   30 * time.Second,
 		}
 	} else {

internalsdk/ios/config.go

@@ -106,7 +106,7 @@ type UserConfig struct {
 func (cf *configurer) Configure(userID int, proToken string, refreshProxies bool) (*ConfigResult, error) {
 	// Log the full method run time.
 	defer func(start time.Time) {
-		log.Debugf("Configured completed in %v", time.Since(start))
+		log.Debugf("Configured completed in %v seconds", time.Since(start).Seconds())
 	}(time.Now())
 	result := &ConfigResult{}
 	if err := cf.writeUserConfig(); err != nil {
@@ -128,12 +128,13 @@ func (cf *configurer) Configure(userID int, proToken string, refreshProxies bool
 	var globalUpdated, proxiesUpdated bool
 
 	setupFronting := func() error {
+		start := time.Now()
 		log.Debug("Setting up fronting")
-		defer log.Debug("Set up fronting")
-		if frontingErr := cf.configureFronting(global, shortFrontedAvailableTimeout); frontingErr != nil {
+		defer log.Debugf("Setting up fronting completed in %v", time.Since(start).Seconds())
+		if frontingErr := cf.configureFronting(global); frontingErr != nil {
 			log.Errorf("Unable to configure fronting on first try, update global config directly from GitHub and try again: %v", frontingErr)
 			global, globalUpdated = cf.updateGlobal(http.DefaultTransport, global, globalEtag, "https://raw.githubusercontent.com/getlantern/lantern-binaries/main/cloud.yaml.gz")
-			return cf.configureFronting(global, longFrontedAvailableTimeout)
+			return cf.configureFronting(global)
 		}
 		return nil
 	}
@@ -158,10 +159,11 @@ func (cf *configurer) Configure(userID int, proToken string, refreshProxies bool
 				log.Errorf("Unable to save updated UserConfig with country and allow probes: %v", err)
 			}
 		}()
-
+		globalStart := time.Now()
 		log.Debug("Updating global config")
 		global, globalUpdated = cf.updateGlobal(cf.rt, global, globalEtag, "https://globalconfig.flashlightproxy.com/global.yaml.gz")
 		log.Debug("Updated global config")
+		log.Debugf("Global config update completed in %v seconds", time.Since(globalStart).Seconds())
 		if refreshProxies {
 			log.Debug("Refreshing proxies")
 			proxies, proxiesUpdated = cf.updateProxies(proxies, proxiesEtag)
@@ -409,7 +411,7 @@ func (cf *configurer) doUpdateFromWeb(rt http.RoundTripper, name string, etag st
 	return bytes, newEtag, nil
 }
 
-func (cf *configurer) configureFronting(global *config.Global, timeout time.Duration) error {
+func (cf *configurer) configureFronting(global *config.Global) error {
 	log.Debug("Configuring fronting")
 	certs, err := global.TrustedCACerts()
 	if err != nil {

internalsdk/ios/ios.go

@@ -24,8 +24,6 @@ const (
 	maxDNSGrabAge = 1 * time.Hour // this doesn't need to be long because our fake DNS records have a TTL of only 1 second. We use a smaller value than on Android to be conservative with memory usag.
 
 	quotaSaveInterval            = 1 * time.Minute
-	shortFrontedAvailableTimeout = 30 * time.Second
-	longFrontedAvailableTimeout  = 5 * time.Minute
 
 	logMemoryInterval = 5 * time.Second
 	forceGCInterval   = 250 * time.Millisecond

internalsdk/pro/pro.go

@@ -73,7 +73,7 @@ func NewClient(baseURL string, userConfig func() common.UserConfig) ProClient {
 	if common.Platform == "ios" {
 		//For iOS use fronted proxy chined proxy does not work with iOS at the moment
 		httpClient = &http.Client{
-			Transport: proxied.Fronted(""),
+			Transport: proxied.Fronted("proclient-ios"),
 			Timeout:   30 * time.Second,
 		}
 	} else {

internalsdk/session_model.go

@@ -208,7 +208,7 @@ func (m *SessionModel) setupIosConfigure(configPath string, userId int, token st
 					return
 				}
 				m.iosConfigurer = global
-				log.Debugf("Found global config IOS configure done %v", global)
+				log.Debug("Found global config IOS configure done")
 				return // Exit the loop after success
 			}
 			log.Debugf("global config not available, retrying...")

ios/Runner/AppDelegate.swift

@@ -21,6 +21,7 @@ import UIKit
   private var lanternModel: LanternModel!
   private var vpnModel: VpnModel!
   private var messagingModel: MessagingModel!
+  private var vpnHelper: VpnHelper!
 
   override func application(
     _ application: UIApplication,
@@ -61,9 +62,17 @@ import UIKit
     }
     lanternModel = LanternModel(flutterBinary: self.flutterbinaryMessenger)
     sessionModel = try SessionModel(flutterBinary: self.flutterbinaryMessenger)
+    vpnHelper = VpnHelper(
+      constants: Constants(process: .app),
+      fileManager: .default,
+      userDefaults: Constants.appGroupDefaults,
+      notificationCenter: .default,
+      flashlightManager: FlashlightManager.appDefault,
+      vpnManager: (isSimulator() ? MockVPNManager() : VPNManager.appDefault))
+
     vpnModel = try VpnModel(
       flutterBinary: self.flutterbinaryMessenger, vpnBase: VPNManager.appDefault,
-      sessionModel: sessionModel)
+      sessionModel: sessionModel, vpnHelper: vpnHelper)
     messagingModel = try MessagingModel(flutterBinary: flutterbinaryMessenger)
   }
 

ios/Runner/Lantern/Core/Vpn/VPNManager.swift

@@ -190,11 +190,11 @@ class VPNManager: VPNBase {
     _ completion: @escaping (Result<Void, VPNManagerError>) -> Void
   ) {
     provider.saveToPreferences { saveError in
-      if let _ = saveError {
+      if saveError != nil {
         completion(.failure(.savingProviderFailed))
       } else {
         provider.loadFromPreferences { loadError in
-          if let _ = loadError {
+          if loadError != nil {
             completion(.failure(.loadingProviderFailed))
           } else {
             completion(.success(()))

ios/Runner/Lantern/Core/Vpn/VpnHelper.swift

@@ -10,13 +10,7 @@ import UIKit
 import UserNotifications
 
 class VpnHelper: NSObject {
-  static let shared = VpnHelper(
-    constants: Constants(process: .app),
-    fileManager: .default,
-    userDefaults: Constants.appGroupDefaults,
-    notificationCenter: .default,
-    flashlightManager: FlashlightManager.appDefault,
-    vpnManager: (isSimulator() ? MockVPNManager() : VPNManager.appDefault))
+
   // MARK: State
   static let didUpdateStateNotification = Notification.Name("Lantern.didUpdateState")
   enum VPNState: Equatable {

ios/Runner/Lantern/Models/VpnModel.swift

@@ -10,10 +10,13 @@ import Sentry
 
 class VpnModel: BaseModel<InternalsdkVPNModel>, InternalsdkVPNManagerProtocol {
   let vpnManager: VPNBase
-  let vpnHelper = VpnHelper.shared
+  let vpnHelper: VpnHelper
   var sessionModel: SessionModel!
 
-  init(flutterBinary: FlutterBinaryMessenger, vpnBase: VPNBase, sessionModel: SessionModel) throws {
+  init(
+    flutterBinary: FlutterBinaryMessenger, vpnBase: VPNBase, sessionModel: SessionModel,
+    vpnHelper: VpnHelper
+  ) throws {
     logger.log("Initializing VPNModel")
     self.vpnManager = vpnBase
     var error: NSError?
@@ -23,6 +26,7 @@ class VpnModel: BaseModel<InternalsdkVPNModel>, InternalsdkVPNManagerProtocol {
       throw error!
     }
     self.sessionModel = sessionModel
+    self.vpnHelper = vpnHelper
     try super.init(flutterBinary, model)
     model.setManager(self)
 

ios/Runner/Lantern/Utils/RunningEnv.swift

@@ -30,7 +30,7 @@ func isRunningInTestFlightEnvironment() -> Bool {
 }
 
 private func hasEmbeddedMobileProvision() -> Bool {
-  if let _ = Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") {
+  if Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") != nil {
     return true
   }
   return false