@capacitor/ios 6.0.0-beta.2 → 6.0.0-dev-8046d907.0

package/Capacitor/Capacitor/AppUUID.swift

@@ -41,13 +41,11 @@ public class AppUUID {
     }
 
     private static func readUUID() -> String {
-        let defaults = UserDefaults.standard
-        return defaults.string(forKey: key) ?? ""
+        KeyValueStore.standard[key] ?? ""
     }
 
     private static func writeUUID(_ uuid: String) {
-        let defaults = UserDefaults.standard
-        defaults.set(uuid, forKey: key)
+        KeyValueStore.standard[key] = uuid
     }
 
 }

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -18,9 +18,9 @@ import Cordova
     public lazy final var isNewBinary: Bool = {
         if let curVersionCode = Bundle.main.infoDictionary?["CFBundleVersion"] as? String,
            let curVersionName = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
-            if let lastVersionCode = UserDefaults.standard.string(forKey: "lastBinaryVersionCode"),
-               let lastVersionName = UserDefaults.standard.string(forKey: "lastBinaryVersionName") {
-                return (curVersionCode.isEqual(lastVersionCode) == false || curVersionName.isEqual(lastVersionName) == false)
+            if let lastVersionCode = KeyValueStore.standard["lastBinaryVersionCode", as: String.self],
+               let lastVersionName = KeyValueStore.standard["lastBinaryVersionName", as: String.self] {
+                return curVersionCode != lastVersionCode || curVersionName != lastVersionName
             }
             return true
         }
@@ -34,10 +34,6 @@ import Cordova
         CAPLog.enableLogging = configuration.loggingEnabled
         logWarnings(for: configDescriptor)
 
-        if configDescriptor.instanceType == .fixed {
-            updateBinaryVersion()
-        }
-
         setStatusBarDefaults()
         setScreenOrientationDefaults()
 
@@ -55,6 +51,10 @@ import Cordova
                                           assetHandler: assetHandler,
                                           delegationHandler: delegationHandler)
         capacitorDidLoad()
+
+        if configDescriptor.instanceType == .fixed {
+            updateBinaryVersion()
+        }
     }
 
     override open func viewDidLoad() {
@@ -79,7 +79,7 @@ import Cordova
     open func instanceDescriptor() -> InstanceDescriptor {
         let descriptor = InstanceDescriptor.init()
         if !isNewBinary && !descriptor.cordovaDeployDisabled {
-            if let persistedPath = UserDefaults.standard.string(forKey: "serverBasePath"), !persistedPath.isEmpty {
+            if let persistedPath = KeyValueStore.standard["serverBasePath", as: String.self], !persistedPath.isEmpty {
                 if let libPath = NSSearchPathForDirectoriesInDomains(.libraryDirectory, .userDomainMask, true).first {
                     descriptor.appLocation = URL(fileURLWithPath: libPath, isDirectory: true)
                         .appendingPathComponent("NoCloud")
@@ -319,11 +319,10 @@ extension CAPBridgeViewController {
               let versionName = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
             return
         }
-        let prefs = UserDefaults.standard
-        prefs.set(versionCode, forKey: "lastBinaryVersionCode")
-        prefs.set(versionName, forKey: "lastBinaryVersionName")
-        prefs.set("", forKey: "serverBasePath")
-        prefs.synchronize()
+        let store = KeyValueStore.standard
+        store["lastBinaryVersionCode"] = versionCode
+        store["lastBinaryVersionName"] = versionName
+        store["serverBasePath"] = nil as String?
     }
 
     private func logWarnings(for descriptor: InstanceDescriptor) {

package/Capacitor/Capacitor/CAPPluginCall.swift

@@ -80,17 +80,24 @@ extension CAPPluginCall: JSValueContainer {
 
 // MARK: Codable Support
 public extension CAPPluginCall {
-    /// Encodes the given value to a ``JSObject`` and resolves the call.
+    /// Encodes the given value to a ``JSObject`` and resolves the call. If an error is thrown during encoding, ``reject(_:_:_:_:)`` is called.
     /// - Parameters:
-    ///  - data: The value to encode.
-    ///  - encoder: The encoder to use. Defaults to `JSValueEncoder()`.
-    /// - Throws: If the value cannot be encoded.
-    ///
-    /// The data paramater _must_ be encodable as a
-    /// ``JSObject``, otherwise this method will throw.
-    func resolve<T: Encodable>(with data: T, encoder: JSValueEncoder = JSValueEncoder()) throws {
-        let encoded = try encoder.encodeJSObject(data)
-        resolve(encoded)
+    ///   - data: The value to encode
+    ///   - encoder: The encoder to use. Defaults to `JSValueEncoder()`
+    ///   - messageForRejectionFromError: A closure that takes the error thrown from ``JSValueEncoder/encodeJSObject(_:)``
+    ///   and returns a string to be provided to ``reject(_:_:_:_:)``. Defaults to a function that returns "Failed encoding response".
+    func resolve<T: Encodable>(
+        with data: T,
+        encoder: JSValueEncoder = JSValueEncoder(),
+        messageForRejectionFromError: (Error) -> String = { _ in "Failed encoding response" }
+    ) {
+        do {
+            let encoded = try encoder.encodeJSObject(data)
+            resolve(encoded)
+        } catch {
+            let message = messageForRejectionFromError(error)
+            reject(message, nil, error)
+        }
     }
 
     /// Decodes the options to the given type.

package/Capacitor/Capacitor/CapacitorBridge.swift

@@ -5,6 +5,10 @@ import Cordova
 
 internal typealias CapacitorPlugin = CAPPlugin & CAPBridgedPlugin
 
+struct RegistrationList: Codable {
+    let packageClassList: Set<String>
+}
+
 /**
  An internal class adopting a public protocol means that we have a lot of `public` methods
  but that is by design not a mistake. And since the bridge is the center of the whole project
@@ -90,6 +94,8 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     static let tmpVCAppeared = Notification(name: Notification.Name(rawValue: "tmpViewControllerAppeared"))
     public static let capacitorSite = "https://capacitorjs.com/"
     public static let fileStartIdentifier = "/_capacitor_file_"
+    public static let httpInterceptorStartIdentifier = "/_capacitor_http_interceptor_"
+    public static let httpsInterceptorStartIdentifier = "/_capacitor_https_interceptor_"
     public static let defaultScheme = "capacitor"
 
     public private(set) var webViewAssetHandler: WebViewAssetHandler
@@ -277,30 +283,34 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
      Register all plugins that have been declared
      */
     func registerPlugins() {
-        if autoRegisterPlugins {
-            let classCount = objc_getClassList(nil, 0)
-            let classes = UnsafeMutablePointer<AnyClass?>.allocate(capacity: Int(classCount))
+        var pluginList: [AnyClass] = [CAPHttpPlugin.self, CAPConsolePlugin.self, CAPWebViewPlugin.self, CAPCookiesPlugin.self]
 
-            let releasingClasses = AutoreleasingUnsafeMutablePointer<AnyClass>(classes)
-            let numClasses: Int32 = objc_getClassList(releasingClasses, classCount)
-
-            for classIndex in 0..<Int(numClasses) {
-                if let aClass: AnyClass = classes[classIndex] {
-                    if class_getSuperclass(aClass) == CDVPlugin.self {
-                        injectCordovaFiles = true
-                    }
-                    if class_conformsToProtocol(aClass, CAPBridgedPlugin.self),
-                       let pluginType = aClass as? CapacitorPlugin.Type {
-                        if aClass is CAPInstancePlugin.Type { continue }
-                        registerPlugin(pluginType)
+        if autoRegisterPlugins {
+            do {
+                if let pluginJSON = Bundle.main.url(forResource: "capacitor.config", withExtension: "json") {
+                    let pluginData = try Data(contentsOf: pluginJSON)
+                    let registrationList = try JSONDecoder().decode(RegistrationList.self, from: pluginData)
+
+                    for plugin in registrationList.packageClassList {
+                        if let pluginClass = NSClassFromString(plugin) {
+                            if pluginClass == CDVPlugin.self {
+                                injectCordovaFiles = true
+                            } else {
+                                pluginList.append(pluginClass)
+                            }
+                        }
                     }
                 }
+            } catch {
+                CAPLog.print("Error registering plugins: \(error)")
+            }
+        }
+
+        for plugin in pluginList {
+            if plugin is CAPInstancePlugin.Type { continue }
+            if let capPlugin = plugin as? CapacitorPlugin.Type {
+                registerPlugin(capPlugin)
             }
-            classes.deallocate()
-        } else {
-            // register core plugins only
-            [CAPHttpPlugin.self, CAPConsolePlugin.self, CAPWebViewPlugin.self, CAPCookiesPlugin.self]
-                .forEach { registerPluginType($0) }
         }
     }
 

package/Capacitor/Capacitor/Codable/JSValueDecoder.swift

@@ -31,8 +31,8 @@ public final class JSValueDecoder: TopLevelDecoder {
 typealias CodingUserInfo = [CodingUserInfoKey: Any]
 
 private final class _JSValueDecoder {
-    internal var codingPath: [CodingKey] = []
-    internal var userInfo: CodingUserInfo = [:]
+    var codingPath: [CodingKey] = []
+    var userInfo: CodingUserInfo = [:]
     fileprivate var data: JSValue
 
     init(data: JSValue) {

package/Capacitor/Capacitor/Codable/JSValueEncoder.swift

@@ -123,7 +123,7 @@ extension Array: JSValueEncodingContainer where Element == EncodingContainer {
     var data: JSValue? {
         guard count != 0 else { return nil }
         guard count != 1 else { return self[0].data }
-        var data: (any JSValue)? = nil
+        var data: (any JSValue)?
 
         for container in self {
             if data == nil {
@@ -189,7 +189,7 @@ extension _JSValueEncoder: Encoder {
     }
 }
 
-fileprivate final class KeyedContainer<Key> where Key: CodingKey {
+private final class KeyedContainer<Key> where Key: CodingKey {
     var object: JSObject? {
         encodedKeyedValue?.reduce(into: [:]) { obj, next in
             let (key, value) = next
@@ -239,7 +239,7 @@ extension KeyedContainer: KeyedEncodingContainerProtocol {
 
     // This is a perectly valid name for this method. The underscore is to avoid a conflict with the
     // protocol requirement.
-    //swiftlint:disable:next identifier_name
+    // swiftlint:disable:next identifier_name
     func _encodeIfPresent<T>(_ value: T?, forKey key: Key) throws where T: Encodable {
         switch optionalEncodingStrategy {
         case .explicitNulls:

package/Capacitor/Capacitor/KeyValueStore.swift

@@ -0,0 +1,296 @@
+//
+//  KeyValueStore.swift
+//  Capacitor
+//
+//  Created by Steven Sherry on 1/5/24.
+//  Copyright © 2024 Drifty Co. All rights reserved.
+//
+
+import Foundation
+
+/// A generic KeyValueStore that allows storing and retrieving values associated with string keys.
+/// The store supports both ephemeral (in-memory) storage and persistent (file-based) storage backends
+/// by default, however it can also take anything that conforms to ``KeyValueStoreBackend`` as
+/// a backend.
+///
+/// This class provides methods to get, set and delete key-value pairs for any type of value, provided the
+/// types conform to `Codable`. The default ``Backend/ephemeral`` and ``Backend/persistent(suiteName:)``
+/// backends are thread-safe.
+///
+/// ## Usage Examples
+///
+/// ### Non-throwing API
+/// ```swift
+/// let store = KeyValueStore.standard
+/// // Set
+/// store["key"] = "value"
+///
+/// // Get
+/// if let value = store["key", as: String.self] {
+///   // Do something with value
+/// }
+///
+/// // Delete
+/// // The type here is a required argument because
+/// // it is unable to be inferred
+/// store["key", as: String.self] = nil
+/// // or
+/// store["key"] = nil as String?
+/// ```
+///
+///
+/// ### Throwing API
+///
+/// ```swift
+/// let store = KeyValueStore.standard
+/// do {
+///     // Set
+///     try store.set("key", value: "value")
+///
+///     // Get
+///     if let value = try store.get("key", as: String.self) {
+///         // Do something with value
+///     }
+///
+///     // Delete
+///     try store.delete("key")
+/// } catch {
+///     print(error.localizedDescription)
+/// }
+/// ```
+///
+/// ### Throwing vs Non-throwing
+///
+/// Of the built-in backends, both ``Backend/ephemeral`` and ``Backend/persistent(suiteName:)`` will throw in the following cases:
+/// * The data read from the file retrieved during ``get(_:as:)`` is unable to be decoded as the type provided.
+/// * The value provided to ``set(_:value:)`` encounters an error during encoding.
+///     * This is more likely to happen with types that have custom `Encodable` implementations
+///
+/// ``Backend/persistent(suiteName:)`` will throw for the following additional cases:
+/// * A file is unable to be read from disk during ``get(_:as:)``
+///     * The existence of the file on disk is checked before attempting to read the file, so out of the
+///       [possible file reading errors](https://developer.apple.com/documentation/foundation/1448136-nserror_codes#file-reading-errors),
+///       the only likely candidate would be
+///       [NSFileReadCorruptFileError](https://developer.apple.com/documentation/foundation/1448136-nserror_codes/nsfilereadcorruptfileerror).
+///       In practice, this should never happen since writes happen atomically.
+/// * The data from the value encoded in ``set(_:value:)`` is unable to be written to disk
+///     * Of the [possible file writing errors](https://developer.apple.com/documentation/foundation/1448136-nserror_codes#file-writing-errors),
+///       the only likely candidates are
+///       [NSFileWriteInvalidFileNameError](https://developer.apple.com/documentation/foundation/1448136-nserror_codes/nsfilewriteinvalidfilenameerror)
+///       if the key provided makes for an invalid file name and
+///       [NSFileWriteOutOfSpaceError](https://developer.apple.com/documentation/foundation/1448136-nserror_codes/nsfilewriteoutofspaceerror)
+///       if the user has no space left on disk
+///
+/// The throwing API should be used in cases where detailed error information is needed for logging or diagnostics. The non-throwing API should be used
+/// in cases where silent failure is preferred.
+public class KeyValueStore {
+
+    /// The built-in storage backends
+    public enum Backend {
+        /// An in-memory backing store
+        case ephemeral
+        /// A persistent file-based backing store using the
+        /// `suiteName` as an identifier for the collection of files
+        case persistent(suiteName: String)
+    }
+
+    private let backend: any KeyValueStoreBackend
+
+    /// Creates an instance of ``KeyValueStore`` with a custom backend
+    /// - Parameter backend: The custom backend implementation
+    public init(backend: any KeyValueStoreBackend) {
+        self.backend = backend
+    }
+
+    /// Creates an instance of ``KeyValueStore`` with the provided built-in ``Backend``
+    /// - Parameter type: The type of ``Backend`` to use
+    public init(type: Backend) {
+        switch type {
+        case .ephemeral:
+            backend = InMemoryStore()
+        case .persistent(suiteName: let name):
+            backend = FileStore.with(name: name)
+        }
+    }
+
+    /// Creates an instance of ``KeyValueStore`` with ``Backend/persistent(suiteName:)``
+    /// - Parameter suiteName: The suite name to provide ``Backend/persistent(suiteName:)``
+    public convenience init(suiteName: String) {
+        self.init(type: .persistent(suiteName: suiteName))
+    }
+
+    /// Retrieves a value of the specified type and key
+    /// - Parameters:
+    ///   - key: The unique identifier for the value
+    ///   - type: The expected type of the value being retried
+    /// - Returns: A decoded value of the given type or `nil` if there is no such value
+    public func `get`<T>(_ key: String, as type: T.Type = T.self) throws -> T? where T: Decodable {
+        try backend.get(key, as: type)
+    }
+
+    /// Stores the value under the specified key
+    /// - Parameters:
+    ///   - key: The unique identifier
+    ///   - value: The value to be stored
+    public func `set`<T>(_ key: String, value: T) throws where T: Encodable {
+        try backend.set(key, value: value)
+    }
+
+    /// Deletes the value for the specified key
+    public func `delete`(_ key: String) throws {
+        try backend.delete(key)
+    }
+
+    /// Convenience for accessing and modifying values in the store without calling ``get(_:as:)``, ``set(_:value:)``, or ``delete(_:)``
+    /// - Parameters:
+    ///     - key: The unique identifier for the value to access or modify
+    ///     - type: The type the value is stored as
+    ///
+    /// This method is only really necessary when accessing a key and the type cannot be inferred from it's context.
+    /// ```swift
+    /// let store = KeyValueStore.standard
+    ///
+    /// // Get
+    /// let value = store["key", as: String.self]
+    ///
+    /// // If the type can be inferred then it may be omitted
+    /// let value: String? = store["key"]
+    /// let value = store["key"] as String?
+    /// let value = store["key"] ?? "default"
+    ///
+    /// // Delete
+    /// store["key", as: String.self] = nil
+    /// store["key"] = nil as String?
+    /// ```
+    public subscript<T> (_ key: String, as type: T.Type = T.self) -> T? where T: Codable {
+        get { try? self.get(key) }
+        set {
+            if let newValue {
+                try? self.set(key, value: newValue)
+            } else {
+                try? self.delete(key)
+            }
+        }
+    }
+
+    /// A shared persistent instance of ``KeyValueStore``
+    public static let standard = KeyValueStore(type: .persistent(suiteName: "standard"))
+}
+
+public protocol KeyValueStoreBackend {
+    func `get`<T>(_ key: String, as type: T.Type) throws -> T? where T: Decodable
+    func `set`<T>(_ key: String, value: T) throws where T: Encodable
+    func `delete`(_ key: String) throws
+}
+
+private class FileStore: KeyValueStoreBackend {
+    private let cache = ConcurrentDictionary<Data>()
+    private let decoder = JSONDecoder()
+    private let encoder = JSONEncoder()
+    private let baseUrl: URL
+
+    private init(baseUrl: URL) {
+        self.baseUrl = baseUrl
+    }
+
+    func get<T>(_ key: String, as type: T.Type) throws -> T? where T: Decodable {
+        if let cached = cache[key],
+           let value = try? decoder.decode(type, from: cached) {
+            return value
+        }
+
+        let fileCacheLocation = baseUrl.appendingPathComponent(key)
+        guard FileManager.default.fileExists(atPath: fileCacheLocation.path) else { return nil }
+
+        let data = try Data(contentsOf: fileCacheLocation)
+        let decoded = try decoder.decode(type, from: data)
+
+        cache[key] = data
+        return decoded
+    }
+
+    func set<T>(_ key: String, value: T) throws where T: Encodable {
+        let encoded = try encoder.encode(value)
+        try encoded.write(to: url(for: key), options: .atomic)
+        cache[key] = encoded
+    }
+
+    func delete(_ key: String) throws {
+        cache[key] = nil
+        try FileManager.default.removeItem(at: url(for: key))
+    }
+
+    private func url(for key: String) -> URL {
+        baseUrl.appendingPathComponent(key)
+    }
+
+    private static let instances = ConcurrentDictionary<FileStore>()
+
+    // This ensures we essentially have singletons for accessing file based resources
+    // so we don't have a scenario where two separate instances may be writing to
+    // the same files.
+    static func with(name: String) -> FileStore {
+        if let existing = instances[name] { return existing }
+        guard let library = try? FileManager
+                .default
+                .url(
+                    for: .libraryDirectory,
+                    in: .userDomainMask,
+                    appropriateFor: nil,
+                    create: true
+                )
+        else { fatalError("⚡️ ❌ Library URL unable to be accessed or created by the current application. This is an impossible state.") }
+
+        let url = library.appendingPathComponent("kvstore").appendingPathComponent(name)
+
+        // Create the folder if it doesn't exist. This should never throw for the current base directory, so we ignore the exception.
+        try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true, attributes: nil)
+
+        let new = FileStore(baseUrl: url)
+        instances[name] = new
+        return new
+    }
+}
+
+private class InMemoryStore: KeyValueStoreBackend {
+    private let storage = ConcurrentDictionary<Data>()
+    private let decoder = JSONDecoder()
+    private let encoder = JSONEncoder()
+
+    func get<T>(_ key: String, as type: T.Type) throws -> T? where T: Decodable {
+        guard let data = storage[key] else { return nil }
+        return try decoder.decode(type, from: data)
+    }
+
+    func set<T>(_ key: String, value: T) throws where T: Encodable {
+        let data = try encoder.encode(value)
+        storage[key] = data
+    }
+
+    func delete(_ key: String) {
+        storage[key] = nil
+    }
+}
+
+private class ConcurrentDictionary<Value> {
+    private var storage: [String: Value]
+    private let lock = NSLock()
+
+    init(_ initial: [String: Value] = [:]) {
+        storage = initial
+    }
+
+    subscript (_ key: String) -> Value? {
+        get {
+            lock.withLock {
+                storage[key]
+            }
+        }
+
+        set {
+            lock.withLock {
+                storage[key] = newValue
+            }
+        }
+    }
+}

package/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift

@@ -51,7 +51,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         return nil
     }
 
-    public func getRequestDataAsMultipartFormData(_ data: JSValue) throws -> Data {
+    public func getRequestDataAsMultipartFormData(_ data: JSValue, _ contentType: String) throws -> Data {
         guard let obj = data as? JSObject else {
             // Throw, other data types explicitly not supported.
             throw CapacitorUrlRequestError.serializationError("[ data ] argument for request with content-type [ application/x-www-form-urlencoded ] may only be a plain javascript object")
@@ -62,11 +62,12 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         }
 
         var data = Data()
-        let boundary = UUID().uuidString
-        let contentType = "multipart/form-data; boundary=\(boundary)"
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        headers["Content-Type"] = contentType
-
+        var boundary = UUID().uuidString
+        if contentType.contains("="), let contentBoundary = contentType.components(separatedBy: "=").last {
+            boundary = contentBoundary
+        } else {
+            overrideContentType(boundary)
+        }
         strings.forEach { key, value in
             data.append("\r\n--\(boundary)\r\n".data(using: .utf8)!)
             data.append("Content-Disposition: form-data; name=\"\(key)\"\r\n\r\n".data(using: .utf8)!)
@@ -77,6 +78,12 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         return data
     }
 
+    private func overrideContentType(_ boundary: String) {
+        let contentType = "multipart/form-data; boundary=\(boundary)"
+        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+        headers["Content-Type"] = contentType
+    }
+
     public func getRequestDataAsString(_ data: JSValue) throws -> Data {
         guard let stringData = data as? String else {
             throw CapacitorUrlRequestError.serializationError("[ data ] argument could not be parsed as string")
@@ -93,20 +100,18 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         return normalized[index.lowercased()]
     }
 
-    func getRequestDataFromFormData(_ data: JSValue) throws -> Data? {
+    public func getRequestDataFromFormData(_ data: JSValue, _ contentType: String) throws -> Data? {
         guard let list = data as? JSArray else {
             // Throw, other data types explicitly not supported.
             throw CapacitorUrlRequestError.serializationError("Data must be an array for FormData")
         }
-
         var data = Data()
-
-        // Update the contentType with the new boundary
-        let boundary = UUID().uuidString
-        let contentType = "multipart/form-data; boundary=\(boundary)"
-        request.setValue(contentType, forHTTPHeaderField: "Content-Type")
-        headers["Content-Type"] = contentType
-
+        var boundary = UUID().uuidString
+        if contentType.contains("="), let contentBoundary = contentType.components(separatedBy: "=").last {
+            boundary = contentBoundary
+        } else {
+            overrideContentType(boundary)
+        }
         for entry in list {
             guard let item = entry as? [String: String] else {
                 throw CapacitorUrlRequestError.serializationError("Data must be an array for FormData")
@@ -120,7 +125,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
                 let fileName = item["fileName"]
                 let fileContentType = item["contentType"]
 
-                data.append("\r\n--\(boundary)\r\n".data(using: .utf8)!)
+                data.append("--\(boundary)\r\n".data(using: .utf8)!)
                 data.append("Content-Disposition: form-data; name=\"\(key!)\"; filename=\"\(fileName!)\"\r\n".data(using: .utf8)!)
                 data.append("Content-Type: \(fileContentType!)\r\n".data(using: .utf8)!)
                 data.append("Content-Transfer-Encoding: binary\r\n".data(using: .utf8)!)
@@ -130,16 +135,14 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
 
                 data.append("\r\n".data(using: .utf8)!)
             } else if type == "string" {
-                data.append("\r\n--\(boundary)\r\n".data(using: .utf8)!)
+                data.append("--\(boundary)\r\n".data(using: .utf8)!)
                 data.append("Content-Disposition: form-data; name=\"\(key!)\"\r\n".data(using: .utf8)!)
                 data.append("\r\n".data(using: .utf8)!)
                 data.append(value.data(using: .utf8)!)
                 data.append("\r\n".data(using: .utf8)!)
             }
-
         }
-
-        data.append("\r\n--\(boundary)--\r\n".data(using: .utf8)!)
+        data.append("--\(boundary)--\r\n".data(using: .utf8)!)
 
         return data
     }
@@ -151,7 +154,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
             }
             return Data(base64Encoded: stringData)
         } else if dataType == "formData" {
-            return try getRequestDataFromFormData(body)
+            return try getRequestDataFromFormData(body, contentType)
         }
 
         // If data can be parsed directly as a string, return that without processing.
@@ -162,7 +165,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
         } else if contentType.contains("application/x-www-form-urlencoded") {
             return try getRequestDataAsFormUrlEncoded(body)
         } else if contentType.contains("multipart/form-data") {
-            return try getRequestDataAsMultipartFormData(body)
+            return try getRequestDataAsMultipartFormData(body, contentType)
         } else {
             throw CapacitorUrlRequestError.serializationError("[ data ] argument could not be parsed for content type [ \(contentType) ]")
         }

package/Capacitor/Capacitor/Plugins/DefaultPlugins.m

@@ -24,6 +24,7 @@ CAP_PLUGIN(CAPConsolePlugin, "Console",
 )
 
 CAP_PLUGIN(CAPWebViewPlugin, "WebView",
+  CAP_PLUGIN_METHOD(setServerAssetPath, CAPPluginReturnPromise);
   CAP_PLUGIN_METHOD(setServerBasePath, CAPPluginReturnPromise);
   CAP_PLUGIN_METHOD(getServerBasePath, CAPPluginReturnPromise);
   CAP_PLUGIN_METHOD(persistServerBasePath, CAPPluginReturnPromise);

package/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift

@@ -37,6 +37,18 @@ func tryParseJson(_ data: Data) -> Any {
     }
 }
 
+/// Helper to convert the headers dictionary to lower case keys. This allows case-insensitive querying in the bridge javascript.
+/// - Parameters:
+///     - headers: The headers as dictionary. The type is unspecific because the incoming headers are coming from the
+///       allHeaderFields property of the HttpResponse.
+/// - Returns: The modified headers dictionary with lowercase keys
+private func lowerCaseHeaderDictionary(_ headers: [AnyHashable: Any]) -> [String: Any] {
+    // Lowercases the key of the headers dictionary.
+    return Dictionary(uniqueKeysWithValues: headers.map({ (key: AnyHashable, value: Any) in
+        return (String(describing: key).lowercased(), value)
+    }))
+}
+
 open class HttpRequestHandler {
     open class CapacitorHttpRequestBuilder {
         public var url: URL?
@@ -121,7 +133,14 @@ open class HttpRequestHandler {
         var output = [:] as [String: Any]
 
         output["status"] = response.statusCode
-        output["headers"] = response.allHeaderFields
+
+        // HTTP Headers are case insensitive. The allHeaderFields dictionary returned by Apple Foundation Code has its keys capitalized.
+        // According to the documentation at https://developer.apple.com/documentation/foundation/httpurlresponse/1417930-allheaderfields
+        // "HTTP headers are case insensitive. To simplify your code, URL Loading System canonicalizes certain header field names into
+        // their standard form. For example, if the server sends a content-length header, it’s automatically adjusted to be Content-Length."
+        // To handle the case insevitivy, we are converting the header keys to lower case here. When querying for headers in the native bridge,
+        // we are lowercasing the key as well.
+        output["headers"] = lowerCaseHeaderDictionary(response.allHeaderFields)
         output["url"] = response.url?.absoluteString
 
         guard let data = data else {

package/Capacitor/Capacitor/Plugins/WebView.swift

@@ -3,6 +3,13 @@ import Foundation
 @objc(CAPWebViewPlugin)
 public class CAPWebViewPlugin: CAPPlugin {
 
+    @objc func setServerAssetPath(_ call: CAPPluginCall) {
+        if let path = call.getString("path"), let viewController = bridge?.viewController as? CAPBridgeViewController {
+            viewController.setServerBasePath(path: Bundle.main.url(forResource: path, withExtension: nil)?.path ?? path)
+            call.resolve()
+        }
+    }
+
     @objc func setServerBasePath(_ call: CAPPluginCall) {
         if let path = call.getString("path"), let viewController = bridge?.viewController as? CAPBridgeViewController {
             viewController.setServerBasePath(path: path)
@@ -22,8 +29,7 @@ public class CAPWebViewPlugin: CAPPlugin {
     @objc func persistServerBasePath(_ call: CAPPluginCall) {
         if let viewController = bridge?.viewController as? CAPBridgeViewController {
             let path = viewController.getServerBasePath()
-            let defaults = UserDefaults.standard
-            defaults.set(path, forKey: "serverBasePath")
+            KeyValueStore.standard["serverBasePath"] = path
             call.resolve()
         }
     }

package/Capacitor/Capacitor/PrivacyInfo.xcprivacy

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-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>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -20,10 +20,25 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         self.serverUrl = serverUrl
     }
 
+    private func isUsingLiveReload(_ localUrl: URL) -> Bool {
+        return self.serverUrl != nil && self.serverUrl?.scheme != localUrl.scheme
+    }
+
     open func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
         let startPath: String
         let url = urlSchemeTask.request.url!
         let stringToLoad = url.path
+        let localUrl = URL.init(string: url.absoluteString)!
+
+        if url.path.starts(with: CapacitorBridge.httpInterceptorStartIdentifier) {
+            handleCapacitorHttpRequest(urlSchemeTask, localUrl, false)
+            return
+        }
+
+        if url.path.starts(with: CapacitorBridge.httpsInterceptorStartIdentifier) {
+            handleCapacitorHttpRequest(urlSchemeTask, localUrl, true)
+            return
+        }
 
         if stringToLoad.starts(with: CapacitorBridge.fileStartIdentifier) {
             startPath = stringToLoad.replacingOccurrences(of: CapacitorBridge.fileStartIdentifier, with: "")
@@ -31,7 +46,6 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
             startPath = router.route(for: stringToLoad)
         }
 
-        let localUrl = URL.init(string: url.absoluteString)!
         let fileUrl = URL.init(fileURLWithPath: startPath)
 
         do {
@@ -43,9 +57,9 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
             ]
 
             // if using live reload, then set CORS headers
-            if self.serverUrl != nil && self.serverUrl?.scheme != localUrl.scheme {
+            if isUsingLiveReload(localUrl) {
                 headers["Access-Control-Allow-Origin"] = self.serverUrl?.absoluteString
-                headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+                headers["Access-Control-Allow-Methods"] = "GET, HEAD, OPTIONS, TRACE"
             }
 
             if let rangeString = urlSchemeTask.request.value(forHTTPHeaderField: "Range"),
@@ -121,6 +135,68 @@ open class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         return false
     }
 
+    func handleCapacitorHttpRequest(_ urlSchemeTask: WKURLSchemeTask, _ localUrl: URL, _ isHttpsRequest: Bool) {
+        var urlRequest = urlSchemeTask.request
+        guard let url = urlRequest.url else { return }
+        var targetUrl = url.absoluteString
+            .replacingOccurrences(of: CapacitorBridge.httpInterceptorStartIdentifier, with: "")
+            .replacingOccurrences(of: CapacitorBridge.httpsInterceptorStartIdentifier, with: "")
+        // Only replace first occurrence of the scheme
+        if let range = targetUrl.range(of: localUrl.scheme ?? InstanceDescriptorDefaults.scheme) {
+            targetUrl = targetUrl.replacingCharacters(in: range, with: isHttpsRequest ? "https" : "http")
+        }
+
+        // Only replace first occurrence of the hostname
+        if let range = targetUrl.range(of: (localUrl.host ?? InstanceDescriptorDefaults.hostname) + "/") {
+            targetUrl = targetUrl.replacingCharacters(in: range, with: "")
+        }
+
+        urlRequest.url = URL(string: targetUrl.removingPercentEncoding ?? targetUrl)
+
+        let urlSession = URLSession.shared
+        let task = urlSession.dataTask(with: urlRequest) { (data, response, error) in
+            if let error = error {
+                urlSchemeTask.didFailWithError(error)
+                return
+            }
+
+            if let response = response as? HTTPURLResponse {
+                let existingHeaders = response.allHeaderFields
+                var newHeaders: [AnyHashable: Any] = [:]
+
+                // if using live reload, then set CORS headers
+                if self.isUsingLiveReload(url) {
+                    newHeaders = [
+                        "Access-Control-Allow-Origin": self.serverUrl?.absoluteString ?? "",
+                        "Access-Control-Allow-Methods": "GET, HEAD, OPTIONS, TRACE"
+                    ]
+                }
+
+                if let mergedHeaders = existingHeaders.merging(newHeaders, uniquingKeysWith: { (_, newHeaders) in newHeaders }) as? [String: String] {
+
+                    if let responseUrl = response.url {
+                        if let modifiedResponse = HTTPURLResponse(
+                            url: responseUrl,
+                            statusCode: response.statusCode,
+                            httpVersion: nil,
+                            headerFields: mergedHeaders
+                        ) {
+                            urlSchemeTask.didReceive(modifiedResponse)
+                        }
+                    }
+
+                    if let data = data {
+                        urlSchemeTask.didReceive(data)
+                    }
+                }
+            }
+            urlSchemeTask.didFinish()
+            return
+        }
+
+        task.resume()
+    }
+
     public let mimeTypes = [
         "aaf": "application/octet-stream",
         "aca": "application/octet-stream",

package/Capacitor/Capacitor/assets/native-bridge.js

@@ -111,13 +111,9 @@ var nativeBridge = (function (exports) {
         }
         else if (body instanceof FormData) {
             const formData = await convertFormData(body);
-            const boundary = `${Date.now()}`;
             return {
                 data: formData,
                 type: 'formData',
-                headers: {
-                    'Content-Type': `multipart/form-data; boundary=--${boundary}`,
-                },
             };
         }
         else if (body instanceof File) {
@@ -130,6 +126,26 @@ var nativeBridge = (function (exports) {
         }
         return { data: body, type: 'json' };
     };
+    const CAPACITOR_HTTP_INTERCEPTOR = '/_capacitor_http_interceptor_';
+    const CAPACITOR_HTTPS_INTERCEPTOR = '/_capacitor_https_interceptor_';
+    // TODO: export as Cap function
+    const isRelativeOrProxyUrl = (url) => !url ||
+        !(url.startsWith('http:') || url.startsWith('https:')) ||
+        url.indexOf(CAPACITOR_HTTP_INTERCEPTOR) > -1 ||
+        url.indexOf(CAPACITOR_HTTPS_INTERCEPTOR) > -1;
+    // TODO: export as Cap function
+    const createProxyUrl = (url, win) => {
+        var _a, _b;
+        if (isRelativeOrProxyUrl(url))
+            return url;
+        const proxyUrl = new URL(url);
+        const bridgeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : '');
+        const isHttps = proxyUrl.protocol === 'https:';
+        bridgeUrl.search = proxyUrl.search;
+        bridgeUrl.hash = proxyUrl.hash;
+        bridgeUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${encodeURIComponent(proxyUrl.host)}${proxyUrl.pathname}`;
+        return bridgeUrl.toString();
+    };
     const initBridge = (w) => {
         const getPlatformId = (win) => {
             var _a, _b;
@@ -279,6 +295,10 @@ var nativeBridge = (function (exports) {
                     callback(result.path);
                 });
             };
+            IonicWebView.setServerAssetPath = (path) => {
+                var _a;
+                (_a = Plugins === null || Plugins === void 0 ? void 0 : Plugins.WebView) === null || _a === void 0 ? void 0 : _a.setServerAssetPath({ path });
+            };
             IonicWebView.setServerBasePath = (path) => {
                 var _a;
                 (_a = Plugins === null || Plugins === void 0 ? void 0 : Plugins.WebView) === null || _a === void 0 ? void 0 : _a.setServerBasePath({ path });
@@ -355,15 +375,15 @@ var nativeBridge = (function (exports) {
                     typeof c.dir === 'function');
             };
             const serializeConsoleMessage = (msg) => {
-                if (typeof msg === 'object') {
-                    try {
+                try {
+                    if (typeof msg === 'object') {
                         msg = JSON.stringify(msg);
                     }
-                    catch (e) {
-                        // ignore
-                    }
+                    return String(msg);
+                }
+                catch (e) {
+                    return '';
                 }
-                return String(msg);
             };
             const platform = getPlatformId(win);
             if (platform == 'android' || platform == 'ios') {
@@ -472,6 +492,19 @@ var nativeBridge = (function (exports) {
                         if (request.url.startsWith(`${cap.getServerUrl()}/`)) {
                             return win.CapacitorWebFetch(resource, options);
                         }
+                        if (!(options === null || options === void 0 ? void 0 : options.method) ||
+                            options.method.toLocaleUpperCase() === 'GET' ||
+                            options.method.toLocaleUpperCase() === 'HEAD' ||
+                            options.method.toLocaleUpperCase() === 'OPTIONS' ||
+                            options.method.toLocaleUpperCase() === 'TRACE') {
+                            if (typeof resource === 'string') {
+                                return await win.CapacitorWebFetch(createProxyUrl(resource, win), options);
+                            }
+                            else if (resource instanceof Request) {
+                                const modifiedRequest = new Request(createProxyUrl(resource.url, win), resource);
+                                return await win.CapacitorWebFetch(modifiedRequest, options);
+                            }
+                        }
                         const tag = `CapacitorHttp fetch ${Date.now()} ${resource}`;
                         console.time(tag);
                         try {
@@ -541,12 +574,11 @@ var nativeBridge = (function (exports) {
                         });
                         xhr.readyState = 0;
                         const prototype = win.CapacitorWebXMLHttpRequest.prototype;
-                        const isRelativeURL = (url) => !url || !(url.startsWith('http:') || url.startsWith('https:'));
                         const isProgressEventAvailable = () => typeof ProgressEvent !== 'undefined' &&
                             ProgressEvent.prototype instanceof Event;
                         // XHR patch abort
                         prototype.abort = function () {
-                            if (isRelativeURL(this._url)) {
+                            if (isRelativeOrProxyUrl(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.abort.call(this);
                             }
                             this.readyState = 0;
@@ -557,10 +589,18 @@ var nativeBridge = (function (exports) {
                         };
                         // XHR patch open
                         prototype.open = function (method, url) {
+                            this._method = method.toLocaleUpperCase();
                             this._url = url;
-                            this._method = method;
-                            if (isRelativeURL(url)) {
-                                return win.CapacitorWebXMLHttpRequest.open.call(this, method, url);
+                            if (!this._method ||
+                                this._method === 'GET' ||
+                                this._method === 'HEAD' ||
+                                this._method === 'OPTIONS' ||
+                                this._method === 'TRACE') {
+                                if (isRelativeOrProxyUrl(url)) {
+                                    return win.CapacitorWebXMLHttpRequest.open.call(this, method, url);
+                                }
+                                this._url = createProxyUrl(this._url, win);
+                                return win.CapacitorWebXMLHttpRequest.open.call(this, method, this._url);
                             }
                             setTimeout(() => {
                                 this.dispatchEvent(new Event('loadstart'));
@@ -569,14 +609,14 @@ var nativeBridge = (function (exports) {
                         };
                         // XHR patch set request header
                         prototype.setRequestHeader = function (header, value) {
-                            if (isRelativeURL(this._url)) {
+                            if (isRelativeOrProxyUrl(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.setRequestHeader.call(this, header, value);
                             }
                             this._headers[header] = value;
                         };
                         // XHR patch send
                         prototype.send = function (body) {
-                            if (isRelativeURL(this._url)) {
+                            if (isRelativeOrProxyUrl(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.send.call(this, body);
                             }
                             const tag = `CapacitorHttp XMLHttpRequest ${Date.now()} ${this._url}`;
@@ -638,7 +678,8 @@ var nativeBridge = (function (exports) {
                                             else {
                                                 this.response = nativeResponse.data;
                                             }
-                                            this.responseText = ((_a = nativeResponse.headers['Content-Type']) === null || _a === void 0 ? void 0 : _a.startsWith('application/json'))
+                                            this.responseText = ((_a = (nativeResponse.headers['Content-Type'] ||
+                                                nativeResponse.headers['content-type'])) === null || _a === void 0 ? void 0 : _a.startsWith('application/json'))
                                                 ? JSON.stringify(nativeResponse.data)
                                                 : nativeResponse.data;
                                             this.responseURL = nativeResponse.url;
@@ -695,7 +736,7 @@ var nativeBridge = (function (exports) {
                         };
                         // XHR patch getAllResponseHeaders
                         prototype.getAllResponseHeaders = function () {
-                            if (isRelativeURL(this._url)) {
+                            if (isRelativeOrProxyUrl(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.getAllResponseHeaders.call(this);
                             }
                             let returnString = '';
@@ -708,7 +749,7 @@ var nativeBridge = (function (exports) {
                         };
                         // XHR patch getResponseHeader
                         prototype.getResponseHeader = function (name) {
-                            if (isRelativeURL(this._url)) {
+                            if (isRelativeOrProxyUrl(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                             }
                             return this._headers[name];

package/Capacitor.podspec

@@ -16,10 +16,9 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.authors = { 'Ionic Team' => 'hi@ionicframework.com' }
   s.source = { git: 'https://github.com/ionic-team/capacitor.git', tag: package['version'] }
-  s.source_files = "#{prefix}Capacitor/Capacitor/*.{swift,h,m}", "#{prefix}Capacitor/Capacitor/Codable/*.{swift,h,m}",
-                   "#{prefix}Capacitor/Capacitor/Plugins/*.{swift,h,m}", "#{prefix}Capacitor/Capacitor/Plugins/**/*.{swift,h,m}"
+  s.source_files = "#{prefix}Capacitor/Capacitor/**/*.{swift,h,m}"
   s.module_map = "#{prefix}Capacitor/Capacitor/Capacitor.modulemap"
-  s.resources = ["#{prefix}Capacitor/Capacitor/assets/native-bridge.js"]
+  s.resources = ["#{prefix}Capacitor/Capacitor/assets/native-bridge.js", "#{prefix}Capacitor/Capacitor/PrivacyInfo.xcprivacy"]
   s.dependency 'CapacitorCordova'
   s.swift_version = '5.1'
 end

package/CapacitorCordova/CapacitorCordova/PrivacyInfo.xcprivacy

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-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>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>

package/CapacitorCordova.podspec

@@ -20,6 +20,7 @@ Pod::Spec.new do |s|
   s.public_header_files = "#{prefix}CapacitorCordova/CapacitorCordova/Classes/Public/*.h",
                           "#{prefix}CapacitorCordova/CapacitorCordova/CapacitorCordova.h"
   s.module_map = "#{prefix}CapacitorCordova/CapacitorCordova/CapacitorCordova.modulemap"
+  s.resources = ["#{prefix}CapacitorCordova/CapacitorCordova/PrivacyInfo.xcprivacy"]
   s.requires_arc = true
   s.framework    = 'WebKit'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0-dev-8046d907.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -26,9 +26,10 @@
     "xc:build:xcframework": "scripts/build.sh xcframework"
   },
   "peerDependencies": {
-    "@capacitor/core": "^6.0.0-beta.2"
+    "@capacitor/core": "^6.0.0-rc.2"
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "8046d907d2d2c0779316adbcabda426acee2dfc3"
 }