@capacitor/ios 4.0.0-alpha.1 → 4.0.0-beta.1

package/CHANGELOG.md

@@ -3,6 +3,93 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0-beta.1](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.0...4.0.0-beta.1) (2022-06-27)
+
+
+### Bug Fixes
+
+* **ios:** Remove Cordova as an embedded framework ([#5709](https://github.com/ionic-team/capacitor/issues/5709)) ([bbf6d24](https://github.com/ionic-team/capacitor/commit/bbf6d248bf9217a5c5c6c15c7bcfeda209aba5b1))
+
+
+### Features
+
+* **ios:** Allow to configure popover size ([#5717](https://github.com/ionic-team/capacitor/issues/5717)) ([ca1a125](https://github.com/ionic-team/capacitor/commit/ca1a125e5ab05d6066dd303bc75e99dfe21f210a))
+
+
+
+
+
+# [4.0.0-beta.0](https://github.com/ionic-team/capacitor/compare/3.6.0...4.0.0-beta.0) (2022-06-17)
+
+
+### Bug Fixes
+
+* **ios:** make removeAllListeners return a promise ([#5526](https://github.com/ionic-team/capacitor/issues/5526)) ([815f71b](https://github.com/ionic-team/capacitor/commit/815f71b6b62f6c4d5f66e6a36c190bb00a96fdcc))
+
+
+### Features
+
+* **ios:** add getConfig to CAPPlugin ([#5495](https://github.com/ionic-team/capacitor/issues/5495)) ([224a9d0](https://github.com/ionic-team/capacitor/commit/224a9d075629d9c9da9ddc658eb282617fc46d09))
+* **ios:** Add preferredContentMode configuration option ([#5583](https://github.com/ionic-team/capacitor/issues/5583)) ([5b6dfa3](https://github.com/ionic-team/capacitor/commit/5b6dfa3fe29c85632546b299f03cc04a77cf7475))
+* **ios:** Support of range requests on WebViewAssetHandler ([#5659](https://github.com/ionic-team/capacitor/issues/5659)) ([348c08d](https://github.com/ionic-team/capacitor/commit/348c08d511e9d57a1b2ecedc3290c65fa9ba3924))
+
+
+
+
+
+# [3.6.0](https://github.com/ionic-team/capacitor/compare/3.5.1...3.6.0) (2022-06-17)
+
+
+### Bug Fixes
+
+* **ios:** Use `URL(fileURLWithPath:)` instead of `URL(string:)` ([#5603](https://github.com/ionic-team/capacitor/issues/5603)) ([5fac1b2](https://github.com/ionic-team/capacitor/commit/5fac1b2da5aa5882087716cb2aa862d89173f4a1))
+
+
+### Features
+
+* **iOS, Android:** add AppUUID Lib for plugins ([#5690](https://github.com/ionic-team/capacitor/issues/5690)) ([05e76cf](https://github.com/ionic-team/capacitor/commit/05e76cf526a44e07fa75f9482fa2223a13918638))
+
+
+
+
+
+# [4.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.2) (2022-05-12)
+
+
+### Bug Fixes
+
+* **ios:** make removeAllListeners return a promise ([#5526](https://github.com/ionic-team/capacitor/issues/5526)) ([815f71b](https://github.com/ionic-team/capacitor/commit/815f71b6b62f6c4d5f66e6a36c190bb00a96fdcc))
+
+
+### Features
+
+* **ios:** add getConfig to CAPPlugin ([#5495](https://github.com/ionic-team/capacitor/issues/5495)) ([224a9d0](https://github.com/ionic-team/capacitor/commit/224a9d075629d9c9da9ddc658eb282617fc46d09))
+* **ios:** Add preferredContentMode configuration option ([#5583](https://github.com/ionic-team/capacitor/issues/5583)) ([5b6dfa3](https://github.com/ionic-team/capacitor/commit/5b6dfa3fe29c85632546b299f03cc04a77cf7475))
+
+
+
+
+
+
+## [3.5.1](https://github.com/ionic-team/capacitor/compare/3.5.0...3.5.1) (2022-05-04)
+
+**Note:** Version bump only for package @capacitor/ios
+
+
+
+
+
+# [3.5.0](https://github.com/ionic-team/capacitor/compare/3.4.3...3.5.0) (2022-04-22)
+
+
+### Features
+
+* **ios:** Add overrideable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa))
+
+
+
+
+
 # [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
 
 
@@ -14,6 +101,21 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
+
+**Note:** Version bump only for package @capacitor/ios
+
+
+
+
+
+## [3.4.2](https://github.com/ionic-team/capacitor/compare/3.4.1...3.4.2) (2022-03-03)
+
+**Note:** Version bump only for package @capacitor/ios
+
+
+
+
 ## [3.4.1](https://github.com/ionic-team/capacitor/compare/3.4.0...3.4.1) (2022-02-09)
 
 

package/Capacitor/Capacitor/AppUUID.swift

@@ -0,0 +1,53 @@
+import CommonCrypto
+import Foundation
+
+private func hexString(_ iterator: Array<UInt8>.Iterator) -> String {
+    return iterator.map { String(format: "%02x", $0) }.joined()
+}
+
+extension Data {
+    public var sha256: String {
+        var digest = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+        self.withUnsafeBytes { bytes in
+            _ = CC_SHA256(bytes.baseAddress, CC_LONG(self.count), &digest)
+        }
+        return hexString(digest.makeIterator())
+    }
+}
+
+public class AppUUID {
+    private static let key: String = "CapacitorAppUUID"
+
+    public static func getAppUUID() -> String {
+        assertAppUUID()
+        return readUUID()
+    }
+
+    public static func regenerateAppUUID() {
+        let uuid = generateUUID()
+        writeUUID(uuid)
+    }
+
+    private static func assertAppUUID() {
+        let uuid = readUUID()
+        if uuid == "" {
+            regenerateAppUUID()
+        }
+    }
+
+    private static func generateUUID() -> String {
+        let uuid: String = UUID.init().uuidString
+        return uuid.data(using: .utf8)!.sha256
+    }
+
+    private static func readUUID() -> String {
+        let defaults = UserDefaults.standard
+        return defaults.string(forKey: key) ?? ""
+    }
+
+    private static func writeUUID(_ uuid: String) {
+        let defaults = UserDefaults.standard
+        defaults.set(uuid, forKey: key)
+    }
+
+}

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -42,7 +42,7 @@ import Cordova
         setScreenOrientationDefaults()
 
         // get the web view
-        let assetHandler = WebViewAssetHandler()
+        let assetHandler = WebViewAssetHandler(router: router())
         assetHandler.setAssetPath(configuration.appLocation.path)
         let delegationHandler = WebViewDelegationHandler()
         prepareWebView(with: configuration, assetHandler: assetHandler, delegationHandler: delegationHandler)
@@ -90,6 +90,10 @@ import Cordova
         return descriptor
     }
 
+    open func router() -> Router {
+        return _Router()
+    }
+
     /**
      The WKWebViewConfiguration to use for the webview.
 
@@ -115,6 +119,15 @@ import Cordova
                 webViewConfiguration.applicationNameForUserAgent = appendUserAgent
             }
         }
+        if let preferredContentMode = instanceConfiguration.preferredContentMode {
+            var mode = WKWebpagePreferences.ContentMode.recommended
+            if preferredContentMode == "mobile" {
+                mode = WKWebpagePreferences.ContentMode.mobile
+            } else if preferredContentMode == "desktop" {
+                mode = WKWebpagePreferences.ContentMode.desktop
+            }
+            webViewConfiguration.defaultWebpagePreferences.preferredContentMode = mode
+        }
         return webViewConfiguration
     }
 

package/Capacitor/Capacitor/CAPInstanceConfiguration.h

@@ -23,6 +23,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
 @property (nonatomic, readonly, nonnull) NSURL *appLocation;
 @property (nonatomic, readonly, nullable) NSString *appStartPath;
 @property (nonatomic, readonly) BOOL limitsNavigationsToAppBoundDomains;
+@property (nonatomic, readonly, nullable) NSString *preferredContentMode;
 
 @property (nonatomic, readonly, nonnull) NSDictionary *legacyConfig DEPRECATED_MSG_ATTRIBUTE("Use direct properties instead");
 

package/Capacitor/Capacitor/CAPInstanceConfiguration.m

@@ -35,6 +35,7 @@
         _appLocation = descriptor.appLocation;
         _appStartPath = descriptor.appStartPath;
         _limitsNavigationsToAppBoundDomains = descriptor.limitsNavigationsToAppBoundDomains;
+        _preferredContentMode = descriptor.preferredContentMode;
         _pluginConfigurations = descriptor.pluginConfigurations;
         _legacyConfig = descriptor.legacyConfig;
         // construct the necessary URLs

package/Capacitor/Capacitor/CAPInstanceDescriptor.h

@@ -108,6 +108,11 @@ NS_SWIFT_NAME(InstanceDescriptor)
  @discussion Defaults to @c false. Set by @c ios.limitsNavigationsToAppBoundDomains in the configuration file.  Required to be @c true for plugins to work if the app includes @c WKAppBoundDomains in the Info.plist.
  */
 @property (nonatomic, assign) BOOL limitsNavigationsToAppBoundDomains;
+/**
+ @brief The content mode for the web view to use when it loads and renders web content.
+ @discussion Defaults to  @c recommended. Set by @c ios.preferredContentMode in the configuration file.
+ */
+@property (nonatomic, copy, nullable) NSString *preferredContentMode;
 /**
  @brief The parser used to load the cofiguration for Cordova plugins.
  */

package/Capacitor/Capacitor/CAPInstanceDescriptor.swift

@@ -125,6 +125,9 @@ internal extension InstanceDescriptor {
             if let limitsNavigations = config[keyPath: "ios.limitsNavigationsToAppBoundDomains"] as? Bool {
                 limitsNavigationsToAppBoundDomains = limitsNavigations
             }
+            if let preferredMode = (config[keyPath: "ios.preferredContentMode"] as? String) {
+                preferredContentMode = preferredMode
+            }
         }
     }
     // swiftlint:enable cyclomatic_complexity

package/Capacitor/Capacitor/CAPLog.swift

@@ -4,7 +4,7 @@ public class CAPLog {
     public static func print(_ items: Any..., separator: String = " ", terminator: String = "\n") {
         if enableLogging {
             for (itemIndex, item) in items.enumerated() {
-                Swift.print(item, terminator: itemIndex == items.count - 1 ? terminator : separator)
+                Swift.print("\(item)".prefix(4068), terminator: itemIndex == items.count - 1 ? terminator : separator)
             }
         }
     }

package/Capacitor/Capacitor/CAPPlugin.h

@@ -48,7 +48,8 @@
 -(NSString* _Nullable)getString:(CAPPluginCall* _Nonnull)call field:(NSString* _Nonnull)field defaultValue:(NSString* _Nonnull)defaultValue DEPRECATED_MSG_ATTRIBUTE("Use accessors on CAPPluginCall instead. See CAPBridgedJSTypes.h for Obj-C implementations.");
 -(id _Nullable)getConfigValue:(NSString* _Nonnull)key __deprecated_msg("use getConfig() and access config values using the methods available depending on the type.");
 -(PluginConfig* _Nonnull)getConfig;
--(void)setCenteredPopover:(UIViewController* _Nonnull)vc;
--(BOOL)supportsPopover;
+-(void)setCenteredPopover:(UIViewController* _Nonnull) vc;
+-(void)setCenteredPopover:(UIViewController* _Nonnull) vc size:(CGSize) size;
+-(BOOL)supportsPopover DEPRECATED_MSG_ATTRIBUTE("All iOS 13+ devices support popover");
 
 @end

package/Capacitor/Capacitor/CAPPlugin.m

@@ -109,6 +109,7 @@
 
 - (void)removeAllListeners:(CAPPluginCall *)call {
   [self.eventListeners removeAllObjects];
+  [call resolve];
 }
 
 - (NSArray<CAPPluginCall *>*)getListeners:(NSString *)eventName {
@@ -144,12 +145,17 @@
   }
 }
 
+-(void)setCenteredPopover:(UIViewController* _Nonnull) vc size:(CGSize) size {
+    if (self.bridge.viewController != nil) {
+      vc.popoverPresentationController.sourceRect = CGRectMake(self.bridge.viewController.view.center.x, self.bridge.viewController.view.center.y, 0, 0);
+      vc.preferredContentSize = size;
+      vc.popoverPresentationController.sourceView = self.bridge.viewController.view;
+      vc.popoverPresentationController.permittedArrowDirections = 0;
+    }
+}
+
 -(BOOL)supportsPopover {
-  if (@available(iOS 13, *)) {
     return YES;
-  } else {
-    return UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad;
-  }
 }
 
 - (NSNumber*)shouldOverrideLoad:(WKNavigationAction*)navigationAction {

package/Capacitor/Capacitor/JSExport.swift

@@ -97,7 +97,7 @@ internal class JSExport {
             let methods = [
                 PluginHeaderMethod(name: "addListener", rtype: nil),
                 PluginHeaderMethod(name: "removeListener", rtype: nil),
-                PluginHeaderMethod(name: "removeAllListeners", rtype: nil),
+                PluginHeaderMethod(name: "removeAllListeners", rtype: "promise"),
                 PluginHeaderMethod(name: "checkPermissions", rtype: "promise"),
                 PluginHeaderMethod(name: "requestPermissions", rtype: "promise")
             ]

package/Capacitor/Capacitor/PluginConfig.swift

@@ -9,39 +9,39 @@ import Foundation
         self.config = config
     }
 
-    public func getString(configKey: String, defaultValue: String? = nil) -> String? {
+    @objc public func getString(_ configKey: String, _ defaultValue: String? = nil) -> String? {
         if let val = (self.config)[keyPath: KeyPath(configKey)] as? String {
             return val
         }
         return defaultValue
     }
 
-    public func getBoolean(configKey: String, defaultValue: Bool) -> Bool {
+    @objc public func getBoolean(_ configKey: String, _ defaultValue: Bool) -> Bool {
         if let val = (self.config)[keyPath: KeyPath(configKey)] as? Bool {
             return val
         }
         return defaultValue
     }
 
-    public func getInt(configKey: String, defaultValue: Int) -> Int {
+    @objc public func getInt(_ configKey: String, _ defaultValue: Int) -> Int {
         if let val = (self.config)[keyPath: KeyPath(configKey)] as? Int {
             return val
         }
         return defaultValue
     }
 
-    public func getArray(configKey: String, defaultValue: JSArray? = nil) -> JSArray? {
+    public func getArray(_ configKey: String, _ defaultValue: JSArray? = nil) -> JSArray? {
         if let val = (self.config)[keyPath: KeyPath(configKey)] as? JSArray {
             return val
         }
         return defaultValue
     }
 
-    public func getObject(configKey: String) -> JSObject? {
+    public func getObject(_ configKey: String) -> JSObject? {
         return (self.config)[keyPath: KeyPath(configKey)] as? JSObject
     }
 
-    public func isEmpty() -> Bool {
+    @objc public func isEmpty() -> Bool {
         return self.config.isEmpty
     }
 

package/Capacitor/Capacitor/Router.swift

@@ -0,0 +1,29 @@
+//
+//  Router.swift
+//  Capacitor
+//
+//  Created by Steven Sherry on 3/29/22.
+//  Copyright © 2022 Drifty Co. All rights reserved.
+//
+
+import Foundation
+
+public protocol Router {
+    func route(for path: String) -> String
+    var basePath: String { get set }
+}
+
+// swiftlint:disable:next type_name
+internal struct _Router: Router {
+    var basePath: String = ""
+    func route(for path: String) -> String {
+        let pathUrl = URL(fileURLWithPath: path)
+
+        // If there's no path extension it also means the path is empty or a SPA route
+        if pathUrl.pathExtension.isEmpty {
+            return basePath + "/index.html"
+        }
+
+        return basePath + path
+    }
+}

package/Capacitor/Capacitor/UIColor.swift

@@ -26,14 +26,14 @@ public extension CapacitorExtensionTypeWrapper where T: UIColor {
             with: ""
         )
 
-        var argb: UInt32 = 0
+        var argb: UInt64 = 0
 
         var red: CGFloat = 0.0
         var green: CGFloat = 0.0
         var blue: CGFloat = 0.0
         var alpha: CGFloat = 1.0
 
-        guard Scanner(string: hexString).scanHexInt32(&argb) else { return nil }
+        guard Scanner(string: hexString).scanHexInt64(&argb) else { return nil }
 
         if hexString.count == 6 {
             red = CGFloat((argb & 0xFF0000) >> 16) / 255.0

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -3,49 +3,73 @@ import MobileCoreServices
 
 @objc(CAPWebViewAssetHandler)
 internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
+    private var router: Router
 
-    private var basePath: String = ""
+    init(router: Router) {
+        self.router = router
+        super.init()
+    }
 
     func setAssetPath(_ assetPath: String) {
-        self.basePath = assetPath
+        router.basePath = assetPath
     }
 
     func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
-        var startPath = self.basePath
+        let startPath: String
         let url = urlSchemeTask.request.url!
         let stringToLoad = url.path
 
         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 {
-            startPath.append(stringToLoad)
+            startPath = router.route(for: stringToLoad)
         }
+
         let localUrl = URL.init(string: url.absoluteString)!
         let fileUrl = URL.init(fileURLWithPath: startPath)
 
         do {
             var data = Data()
-            if !stringToLoad.contains("cordova.js") {
-                if isMediaExtension(pathExtension: url.pathExtension) {
-                    data = try Data(contentsOf: fileUrl, options: Data.ReadingOptions.mappedIfSafe)
-                } else {
-                    data = try Data(contentsOf: fileUrl)
-                }
-            }
             let mimeType = mimeTypeForExtension(pathExtension: url.pathExtension)
-            let expectedContentLength = data.count
-            let headers =  [
+            var headers =  [
                 "Content-Type": mimeType,
                 "Cache-Control": "no-cache"
             ]
-            let urlResponse = URLResponse(url: localUrl, mimeType: mimeType, expectedContentLength: expectedContentLength, textEncodingName: nil)
-            let httpResponse = HTTPURLResponse(url: localUrl, statusCode: 200, httpVersion: nil, headerFields: headers)
-            if isMediaExtension(pathExtension: url.pathExtension) {
-                urlSchemeTask.didReceive(urlResponse)
+            if let rangeString = urlSchemeTask.request.value(forHTTPHeaderField: "Range"),
+               let totalSize = try fileUrl.resourceValues(forKeys: [.fileSizeKey]).fileSize,
+               isMediaExtension(pathExtension: url.pathExtension) {
+                let fileHandle = try FileHandle(forReadingFrom: fileUrl)
+                let parts = rangeString.components(separatedBy: "=")
+                let streamParts = parts[1].components(separatedBy: "-")
+                let fromRange = Int(streamParts[0]) ?? 0
+                var toRange = totalSize - 1
+                if streamParts.count > 1 {
+                    toRange = Int(streamParts[1]) ?? toRange
+                }
+                let rangeLength = toRange - fromRange + 1
+                try fileHandle.seek(toOffset: UInt64(fromRange))
+                data = fileHandle.readData(ofLength: rangeLength)
+                headers["Accept-Ranges"] = "bytes"
+                headers["Content-Range"] = "bytes \(fromRange)-\(toRange)/\(totalSize)"
+                headers["Content-Length"] = String(data.count)
+                let response = HTTPURLResponse(url: localUrl, statusCode: 206, httpVersion: nil, headerFields: headers)
+                urlSchemeTask.didReceive(response!)
+                try fileHandle.close()
             } else {
-                urlSchemeTask.didReceive(httpResponse!)
+                if !stringToLoad.contains("cordova.js") {
+                    if isMediaExtension(pathExtension: url.pathExtension) {
+                        data = try Data(contentsOf: fileUrl, options: Data.ReadingOptions.mappedIfSafe)
+                    } else {
+                        data = try Data(contentsOf: fileUrl)
+                    }
+                }
+                let urlResponse = URLResponse(url: localUrl, mimeType: mimeType, expectedContentLength: data.count, textEncodingName: nil)
+                let httpResponse = HTTPURLResponse(url: localUrl, statusCode: 200, httpVersion: nil, headerFields: headers)
+                if isMediaExtension(pathExtension: url.pathExtension) {
+                    urlSchemeTask.didReceive(urlResponse)
+                } else {
+                    urlSchemeTask.didReceive(httpResponse!)
+                }
             }
             urlSchemeTask.didReceive(data)
         } catch let error as NSError {

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -46,9 +46,7 @@ internal class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDel
         // Reset the bridge on each navigation
         bridge?.reset()
     }
-    
-    // TODO: remove once Xcode 12 support is dropped
-    #if compiler(>=5.5)
+
     @available(iOS 15, *)
     func webView(
         _ webView: WKWebView,
@@ -62,12 +60,11 @@ internal class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDel
 
     @available(iOS 15, *)
     func webView(_ webView: WKWebView,
-    requestDeviceOrientationAndMotionPermissionFor origin: WKSecurityOrigin,
-         initiatedByFrame frame: WKFrameInfo,
-          decisionHandler: @escaping (WKPermissionDecision) -> Void) {
+                 requestDeviceOrientationAndMotionPermissionFor origin: WKSecurityOrigin,
+                 initiatedByFrame frame: WKFrameInfo,
+                 decisionHandler: @escaping (WKPermissionDecision) -> Void) {
         decisionHandler(.grant)
     }
-    #endif
 
     public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         // post a notification for any listeners

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.1",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -24,10 +24,10 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.4.0"
+    "@capacitor/core": "next"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7faec09fd724a0af7436f3d30c83856b7bb5ce51"
+  "gitHead": "8520516c0883cb11df3b0097ac793290235c27de"
 }