chore(iOS): Redefining bridge API

ios/Capacitor/Capacitor.xcodeproj/project.pbxproj

@@ -15,6 +15,9 @@
 		621ECCBC2542046400D3D615 /* JSTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621ECCBB2542046400D3D615 /* JSTypes.swift */; };
 		621ECCC3254204B700D3D615 /* BridgedTypesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621ECCC2254204B700D3D615 /* BridgedTypesTests.swift */; };
 		621ECCC8254204BE00D3D615 /* JSONSerializationWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 621ECCC6254204BE00D3D615 /* JSONSerializationWrapper.m */; };
+		621ECCD6254205BD00D3D615 /* CAPBridgeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621ECCD4254205BD00D3D615 /* CAPBridgeProtocol.swift */; };
+		621ECCDA254205C400D3D615 /* CapacitorBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621ECCD9254205C400D3D615 /* CapacitorBridge.swift */; };
+		621ECCE3254206A600D3D615 /* CAPApplicationDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621ECCE2254206A600D3D615 /* CAPApplicationDelegateProxy.swift */; };
 		622BB9C42541FE3000A5DBCA /* capacitor.config.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = 622BB9BE2541FDFE00A5DBCA /* capacitor.config.json */; };
 		62959B162524DA7800A3D7F1 /* CAPPluginCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 62959AE22524DA7700A3D7F1 /* CAPPluginCall.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62959B172524DA7800A3D7F1 /* JSExport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62959AE32524DA7700A3D7F1 /* JSExport.swift */; };
@@ -115,9 +118,13 @@
 		621ECCC6254204BE00D3D615 /* JSONSerializationWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONSerializationWrapper.m; sourceTree = "<group>"; };
 		621ECCC7254204BE00D3D615 /* JSONSerializationWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONSerializationWrapper.h; sourceTree = "<group>"; };
 		621ECCCD254204C400D3D615 /* CapacitorTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CapacitorTests-Bridging-Header.h"; sourceTree = "<group>"; };
+		621ECCD4254205BD00D3D615 /* CAPBridgeProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CAPBridgeProtocol.swift; sourceTree = "<group>"; };
+		621ECCD9254205C400D3D615 /* CapacitorBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CapacitorBridge.swift; sourceTree = "<group>"; };
+		621ECCE2254206A600D3D615 /* CAPApplicationDelegateProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CAPApplicationDelegateProxy.swift; sourceTree = "<group>"; };
 		622BB9BE2541FDFE00A5DBCA /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
 		62959AE22524DA7700A3D7F1 /* CAPPluginCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CAPPluginCall.h; sourceTree = "<group>"; };
 		62959AE32524DA7700A3D7F1 /* JSExport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSExport.swift; sourceTree = "<group>"; };
+		62959AE42524DA7700A3D7F1 /* CAPBridgedJSTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CAPBridgedJSTypes.m; sourceTree = "<group>"; };
 		62959AE52524DA7700A3D7F1 /* CAPBridgedPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CAPBridgedPlugin.h; sourceTree = "<group>"; };
 		62959AE62524DA7700A3D7F1 /* CAPPluginCall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CAPPluginCall.swift; sourceTree = "<group>"; };
 		62959AE72524DA7700A3D7F1 /* CAPFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CAPFile.swift; sourceTree = "<group>"; };
@@ -206,6 +213,7 @@
 				6296A77C253A2E49005A202A /* TestsHostApp */,
 				50503EE01FC08594003606DC /* Products */,
 				501CBAA51FC0A723009B0D4D /* Frameworks */,
+				621ECCD12542059800D3D615 /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -232,40 +240,52 @@
 			path = CapacitorTests;
 			sourceTree = "<group>";
 		};
+		621ECCD12542059800D3D615 /* Recovered References */ = {
+			isa = PBXGroup;
+			children = (
+				62959AE42524DA7700A3D7F1 /* CAPBridgedJSTypes.m */,
+			);
+			name = "Recovered References";
+			sourceTree = "<group>";
+		};
 		62959AE12524DA7700A3D7F1 /* Capacitor */ = {
 			isa = PBXGroup;
 			children = (
 				62959B0F2524DA7700A3D7F1 /* Capacitor.h */,
 				62959B132524DA7700A3D7F1 /* CAPPlugin.h */,
-				62959AE22524DA7700A3D7F1 /* CAPPluginCall.h */,
+				62959B012524DA7700A3D7F1 /* CAPPlugin.m */,
 				62959AE52524DA7700A3D7F1 /* CAPBridgedPlugin.h */,
 				62959B092524DA7700A3D7F1 /* CAPPluginMethod.h */,
-				62959AE32524DA7700A3D7F1 /* JSExport.swift */,
-				62959AE62524DA7700A3D7F1 /* CAPPluginCall.swift */,
-				62959AE72524DA7700A3D7F1 /* CAPFile.swift */,
 				62959AE82524DA7700A3D7F1 /* CAPPluginMethod.m */,
-				62959AE92524DA7700A3D7F1 /* UIColor.swift */,
+				62959AE22524DA7700A3D7F1 /* CAPPluginCall.h */,
+				62959B062524DA7700A3D7F1 /* CAPPluginCall.m */,
+				62959AE62524DA7700A3D7F1 /* CAPPluginCall.swift */,
 				621ECCBB2542046400D3D615 /* JSTypes.swift */,
 				621ECCB62542045900D3D615 /* CAPBridgedJSTypes.h */,
 				621ECCB42542045900D3D615 /* CAPBridgedJSTypes.m */,
-				62959AEA2524DA7700A3D7F1 /* Plugins */,
-				62959AFE2524DA7700A3D7F1 /* UIStatusBarManager+CAPHandleTapAction.m */,
 				62959AFF2524DA7700A3D7F1 /* JS.swift */,
-				62959B012524DA7700A3D7F1 /* CAPPlugin.m */,
+				62959AE32524DA7700A3D7F1 /* JSExport.swift */,
+				621ECCD4254205BD00D3D615 /* CAPBridgeProtocol.swift */,
+				621ECCD9254205C400D3D615 /* CapacitorBridge.swift */,
+				62959B142524DA7700A3D7F1 /* CAPBridge.swift */,
 				62959B042524DA7700A3D7F1 /* CAPBridgeViewController.swift */,
+				621ECCE2254206A600D3D615 /* CAPApplicationDelegateProxy.swift */,
+				62959B0A2524DA7700A3D7F1 /* CAPBridgeDelegate.swift */,
+				62959AEA2524DA7700A3D7F1 /* Plugins */,
 				62959B052524DA7700A3D7F1 /* CAPConfig.swift */,
-				62959B062524DA7700A3D7F1 /* CAPPluginCall.m */,
-				62959B072524DA7700A3D7F1 /* CapacitorExtension.swift */,
 				62959B082524DA7700A3D7F1 /* CAPLog.swift */,
-				62959B0A2524DA7700A3D7F1 /* CAPBridgeDelegate.swift */,
+				62959AE72524DA7700A3D7F1 /* CAPFile.swift */,
 				62959B0B2524DA7700A3D7F1 /* CAPMessageHandlerWrapper.swift */,
+				62959B022524DA7700A3D7F1 /* CAPUNUserNotificationCenterDelegate.swift */,
 				62959B0D2524DA7700A3D7F1 /* CAPAssetHandler.swift */,
 				62959B0E2524DA7700A3D7F1 /* TmpViewController.swift */,
 				62959B102524DA7700A3D7F1 /* DocLinks.swift */,
+				62959B152524DA7700A3D7F1 /* CAPNotifications.swift */,
+				62959B072524DA7700A3D7F1 /* CapacitorExtension.swift */,
 				62959B112524DA7700A3D7F1 /* Data+Capacitor.swift */,
+				62959AE92524DA7700A3D7F1 /* UIColor.swift */,
+				62959AFE2524DA7700A3D7F1 /* UIStatusBarManager+CAPHandleTapAction.m */,
 				62959B122524DA7700A3D7F1 /* Info.plist */,
-				62959B142524DA7700A3D7F1 /* CAPBridge.swift */,
-				62959B152524DA7700A3D7F1 /* CAPNotifications.swift */,
 				62959B8225253A9500A3D7F1 /* Capacitor.modulemap */,
 			);
 			path = Capacitor;
@@ -478,8 +498,10 @@
 				621ECCB72542045900D3D615 /* CAPBridgedJSTypes.m in Sources */,
 				62959B402524DA7800A3D7F1 /* TmpViewController.swift in Sources */,
 				62959B372524DA7800A3D7F1 /* CAPConfig.swift in Sources */,
+				621ECCD6254205BD00D3D615 /* CAPBridgeProtocol.swift in Sources */,
 				62959B432524DA7800A3D7F1 /* Data+Capacitor.swift in Sources */,
 				621ECCBC2542046400D3D615 /* JSTypes.swift in Sources */,
+				621ECCDA254205C400D3D615 /* CapacitorBridge.swift in Sources */,
 				62959B382524DA7800A3D7F1 /* CAPPluginCall.m in Sources */,
 				62959B1B2524DA7800A3D7F1 /* CAPFile.swift in Sources */,
 				62959B462524DA7800A3D7F1 /* CAPBridge.swift in Sources */,
@@ -500,6 +522,7 @@
 				62959B2F2524DA7800A3D7F1 /* DefaultPlugins.m in Sources */,
 				62959B222524DA7800A3D7F1 /* Console.swift in Sources */,
 				62959B3A2524DA7800A3D7F1 /* CAPLog.swift in Sources */,
+				621ECCE3254206A600D3D615 /* CAPApplicationDelegateProxy.swift in Sources */,
 				62959B262524DA7800A3D7F1 /* WebView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -694,6 +717,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.capacitorjs.ios.Capacitor;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -722,6 +746,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.capacitorjs.ios.Capacitor;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/Capacitor/Capacitor/CAPApplicationDelegateProxy.swift

@@ -0,0 +1,32 @@
+import Foundation
+
+@objc(CAPApplicationDelegateProxy)
+public class ApplicationDelegateProxy: NSObject, UIApplicationDelegate {
+    static let shared = ApplicationDelegateProxy()
+
+    private(set) var lastURL: URL?
+
+    public func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+        NotificationCenter.default.post(name: .capacitorOpenURL, object: [
+            "url": url,
+            "options": options
+        ])
+        NotificationCenter.default.post(name: NSNotification.Name.CDVPluginHandleOpenURL, object: url)
+        lastURL = url
+        return true
+    }
+
+    public func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        // TODO: Support other types, emit to rest of plugins
+        if userActivity.activityType != NSUserActivityTypeBrowsingWeb || userActivity.webpageURL == nil {
+            return false
+        }
+
+        let url = userActivity.webpageURL
+        lastURL = url
+        NotificationCenter.default.post(name: .capacitorOpenUniversalLink, object: [
+            "url": url
+        ])
+        return true
+    }
+}

ios/Capacitor/Capacitor/CAPAssetHandler.swift

@@ -1,7 +1,7 @@
 import Foundation
 import MobileCoreServices
 
-class CAPAssetHandler: NSObject, WKURLSchemeHandler {
+internal class CAPAssetHandler: NSObject, WKURLSchemeHandler {
 
     private var basePath: String = ""
 
@@ -14,8 +14,8 @@ class CAPAssetHandler: NSObject, WKURLSchemeHandler {
         let url = urlSchemeTask.request.url!
         let stringToLoad = url.path
 
-        if stringToLoad.starts(with: CAPBridge.fileStartIdentifier) {
-            startPath = stringToLoad.replacingOccurrences(of: CAPBridge.fileStartIdentifier, with: "")
+        if stringToLoad.starts(with: CapacitorBridge.fileStartIdentifier) {
+            startPath = stringToLoad.replacingOccurrences(of: CapacitorBridge.fileStartIdentifier, with: "")
         } else if stringToLoad.isEmpty || url.pathExtension.isEmpty {
             startPath.append("/index.html")
         } else {