feat(ww): harden mobileproxy integration (#411)

* fix(ww): harden mobileproxy integration

* ios error handling

* android toast

* fix typo

* don't show error: just retry and gracefully do nothing

* make port dynamic

* pass sdk version

* Update build_sdk_mobileproxy.sh

* Update build_sdk_mobileproxy.sh

* Update AppDelegate.swift

* fix issue

Author: daniellacosse

x/examples/website-wrapper-app/.scripts/build_sdk_mobileproxy.sh

@@ -15,8 +15,9 @@
 # limitations under the License.
 
 PLATFORM="$1"
+TAG="${2:-"x/v0.0.1"}"
 
-git clone https://github.com/Jigsaw-Code/outline-sdk.git output/outline-sdk
+git clone --depth 1 --branch "${TAG}" https://github.com/Jigsaw-Code/outline-sdk.git output/outline-sdk
 cd output/outline-sdk/x
 go build -o "$(pwd)/out/" golang.org/x/mobile/cmd/gomobile golang.org/x/mobile/cmd/gobind
 

x/examples/website-wrapper-app/wrapper_app_project/.scripts/build.mjs

@@ -47,6 +47,7 @@ const DEFAULT_SMART_DIALER_CONFIG = {
 export default async function main(
   {
     platform,
+    sdkVersion = "x/v0.0.1",
     entryDomain = "www.example.com",
     navigationUrl,
     smartDialerConfig = DEFAULT_SMART_DIALER_CONFIG,
@@ -56,7 +57,7 @@ export default async function main(
   if (!fs.existsSync(SDK_MOBILEPROXY_OUTPUT_DIR)) {
     console.log(`Building the Outline SDK mobileproxy library for ${platform}...`);
 
-    await promisify(exec)(`npm run build:sdk_mobileproxy ${platform}`);
+    await promisify(exec)(`npm run build:sdk_mobileproxy ${platform} ${sdkVersion}`);
   }
 
   const sourceFilepaths = await glob(

x/examples/website-wrapper-app/wrapper_app_project/template/android/app/src/main/java/org/getoutline/pwa/MainActivity.kt

@@ -17,6 +17,22 @@ class MainActivity : BridgeActivity() {
         super.onCreate(savedInstanceState)
 
         if (WebViewFeature.isFeatureSupported(WebViewFeature.PROXY_OVERRIDE)) {
+            if (!this.tryProxy()) {
+                // try one more time
+                this.tryProxy()
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        this.proxy?.stop(3000)
+        this.proxy = null
+
+        super.onDestroy()
+    }
+
+    private fun tryProxy(): Boolean {
+        try {
             this.proxy = Mobileproxy.runProxy(
                 "127.0.0.1:0",
                 Mobileproxy.newSmartStreamDialer(
@@ -41,13 +57,10 @@ class MainActivity : BridgeActivity() {
                     },
                     {}
                 )
+        } catch (e: Exception) {
+            return false
         }
-    }
-
-    override fun onDestroy() {
-        this.proxy?.stop(3000)
-        this.proxy = null
 
-        super.onDestroy()
+        return true
     }
 }

x/examples/website-wrapper-app/wrapper_app_project/template/ios/App/App/AppDelegate.swift

@@ -1,35 +1,28 @@
-import UIKit
 import Capacitor
 import Mobileproxy
+import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
-    
+
     private var proxy: MobileproxyProxy? = nil
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    ) -> Bool {
 
-        self.window?.rootViewController = OutlineBridgeViewController()
+        self.resetViewController()
 
         return true
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {
-        var dialerError: NSError?
-        if let dialer = MobileproxyNewSmartStreamDialer(
-            MobileproxyNewListFromLines(Config.domainList),
-            Config.smartDialer,
-            MobileproxyNewStderrLogWriter(),
-            &dialerError
-        ) {
-            var proxyError: NSError?
-            self.proxy = MobileproxyRunProxy(
-                "127.0.0.1:8080",
-                dialer,
-                &proxyError
-            )
+        if !self.tryProxy() {
+            // try one more time
+            self.tryProxy()
         }
     }
 
@@ -40,16 +33,57 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
     }
 
-    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+    func application(
+        _ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+    ) -> Bool {
         // Called when the app was launched with a url. Feel free to add additional processing here,
         // but if you want the App API to support tracking app url opens, make sure to keep this call
         return ApplicationDelegateProxy.shared.application(app, open: url, options: options)
     }
 
-    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+    func application(
+        _ application: UIApplication, continue userActivity: NSUserActivity,
+        restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
+    ) -> Bool {
         // Called when the app was launched with an activity, including Universal Links.
         // Feel free to add additional processing here, but if you want the App API to support
         // tracking app url opens, make sure to keep this call
-        return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
+        return ApplicationDelegateProxy.shared.application(
+            application, continue: userActivity, restorationHandler: restorationHandler)
+    }
+
+    @discardableResult
+    private func tryProxy() -> Bool {
+        var error: NSError?
+        if let dialer = MobileproxyNewSmartStreamDialer(
+            MobileproxyNewListFromLines(Config.domainList),
+            Config.smartDialer,
+            MobileproxyNewStderrLogWriter(),
+            &error
+        ) {
+            if error != nil {
+                return false
+            }
+
+            self.proxy = MobileproxyRunProxy(
+                "127.0.0.1:0",
+                dialer,
+                &error
+            )
+
+            self.resetViewController()
+            
+            Config.proxyPort = String(self.proxy?.port() ?? 0)
+
+            if error != nil {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    private func resetViewController() {
+        self.window?.rootViewController = OutlineBridgeViewController()
     }
 }

x/examples/website-wrapper-app/wrapper_app_project/template/ios/App/App/Config.swift.handlebars

@@ -3,4 +3,6 @@ import Foundation
 struct Config {
     static var domainList: String = "{{domainList}}"
     static var smartDialer: String = "{{{smartDialerConfig}}}"
+    static var proxyHost: String = "127.0.0.1"
+    static var proxyPort: String = "0"
 }

x/examples/website-wrapper-app/wrapper_app_project/template/ios/App/App/OutlineBridgeViewController.swift

@@ -1,22 +1,12 @@
-//
-//  OutlineBridgeViewController.swift
-//  App
-//
-//  Created by Daniel LaCosse on 10/9/24.
-//
-
 import UIKit
 import Capacitor
 
 class OutlineBridgeViewController: CAPBridgeViewController {
-    private let proxyHost: String = "127.0.0.1"
-    private let proxyPort: String = "8080"
-    
     override func webView(with frame: CGRect, configuration: WKWebViewConfiguration) -> WKWebView {
         if #available(iOS 17.0, *) {
             let endpoint = NWEndpoint.hostPort(
-                host: NWEndpoint.Host(self.proxyHost),
-                port: NWEndpoint.Port(self.proxyPort)!
+                host: NWEndpoint.Host(Config.proxyHost),
+                port: NWEndpoint.Port(Config.proxyPort)!
             )
             let proxyConfig = ProxyConfiguration.init(httpCONNECTProxy: endpoint)