@capacitor-plus/ios 8.3.9 → 8.3.11

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -10,6 +10,12 @@ import Cordova
 
     public fileprivate(set) var webView: WKWebView?
 
+    // WKHTTPCookieStore does not retain observers, so we hold a strong reference here
+    // (else it deallocs immediately and `cookiesDidChange` never fires) plus the store
+    // it was added to, so the observer can be removed in `deinit` as the docs require.
+    private var cookieObserver: CapacitorWKCookieObserver?
+    private weak var cookieObserverStore: WKHTTPCookieStore?
+
     public var isStatusBarVisible = true
     public var statusBarStyle: UIStatusBarStyle = .default
     public var statusBarAnimation: UIStatusBarAnimation = .fade
@@ -27,6 +33,12 @@ import Cordova
         return false
     }()
 
+    deinit {
+        if let cookieObserver = cookieObserver {
+            cookieObserverStore?.remove(cookieObserver)
+        }
+    }
+
     override public final func loadView() {
         // load the configuration and set the logging flag
         let configDescriptor = instanceDescriptor()
@@ -118,7 +130,11 @@ import Cordova
      */
     open func webViewConfiguration(for instanceConfiguration: InstanceConfiguration) -> WKWebViewConfiguration {
         let webViewConfiguration = WKWebViewConfiguration()
-        webViewConfiguration.websiteDataStore.httpCookieStore.add(CapacitorWKCookieObserver())
+        let cookieObserver = CapacitorWKCookieObserver()
+        let cookieStore = webViewConfiguration.websiteDataStore.httpCookieStore
+        cookieStore.add(cookieObserver)
+        self.cookieObserver = cookieObserver
+        self.cookieObserverStore = cookieStore
         webViewConfiguration.allowsInlineMediaPlayback = true
         webViewConfiguration.suppressesIncrementalRendering = false
         webViewConfiguration.allowsAirPlayForMediaPlayback = true

package/Capacitor/Capacitor/CAPInstanceConfiguration.h

@@ -13,6 +13,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
 @property (nonatomic, readonly, nonnull) NSArray<NSString*> *allowedNavigationHostnames;
 @property (nonatomic, readonly, nonnull) NSURL *localURL;
 @property (nonatomic, readonly, nonnull) NSURL *serverURL;
+@property (nonatomic, readonly, nullable) NSURL *configURL;
 @property (nonatomic, readonly, nullable) NSString *errorPath;
 @property (nonatomic, readonly, nonnull) NSDictionary *pluginConfigurations;
 @property (nonatomic, readonly) BOOL loggingEnabled;

package/Capacitor/Capacitor/CAPInstanceConfiguration.m

@@ -49,6 +49,13 @@
         else {
             _serverURL = _localURL;
         }
+        
+        if (descriptor.configUrl != nil) {
+            _configURL = descriptor.configUrl;
+        }
+        else {
+            _configURL = [[NSURL alloc] initWithString:(@"capacitor.config.json")];
+        }
         _errorPath = descriptor.errorPath;
         // extract the one value we care about from the cordova configuration
         _cordovaDeployDisabled = [descriptor cordovaDeployDisabled];

package/Capacitor/Capacitor/CAPInstanceDescriptor.h

@@ -68,6 +68,11 @@ NS_SWIFT_NAME(InstanceDescriptor)
  @discussion Defaults to nil, in which case the server URL will be constructed from @c urlScheme and @c urlHostname. If set, it will override the other properties. Set by @c server.url in the configuration file.
  */
 @property (nonatomic, copy, nullable) NSString *serverURL;
+/**
+ @brief The file URL from which Capacitor will load configuration
+ @discussion Defaults to @c capacitor.config.json located at the root of the application bundle.
+ */
+@property (nonatomic, copy, nullable) NSURL *configUrl;
 /**
  @brief The JSON dictionary that contains the plugin-specific configuration information.
  @discussion Set by @c plugins in the configuration file.

package/Capacitor/Capacitor/CAPInstanceDescriptor.swift

@@ -30,6 +30,8 @@ internal extension InstanceDescriptor {
     // swiftlint:disable function_body_length
     // swiftlint:disable:next identifier_name
     @objc func _parseConfiguration(at capacitorURL: URL?, cordovaConfiguration cordovaURL: URL?) {
+        configUrl = capacitorURL
+        
         // sanity check that the app directory is valid
         var isDirectory: ObjCBool = ObjCBool(false)
         if warnings.contains(.missingAppDir) == false,

package/Capacitor/Capacitor/CapacitorBridge.swift

@@ -305,9 +305,9 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     func registerPlugins() {
         var pluginList: [AnyClass] = [CAPHttpPlugin.self, CAPConsolePlugin.self, CAPWebViewPlugin.self, CAPCookiesPlugin.self, CAPSystemBarsPlugin.self]
 
-        if autoRegisterPlugins {
+        if autoRegisterPlugins && config.configURL != nil {
             do {
-                if let pluginJSON = Bundle.main.url(forResource: "capacitor.config", withExtension: "json") {
+                if let pluginJSON = Bundle.main.url(forResource: (config.configURL!.path as NSString).deletingPathExtension, withExtension: "json") {
                     let pluginData = try Data(contentsOf: pluginJSON)
                     let registrationList = try JSONDecoder().decode(RegistrationList.self, from: pluginData)
 

package/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift

@@ -172,7 +172,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
     }
 
     public func getRequestData(_ body: JSValue, _ contentType: String, _ dataType: String? = nil) throws -> Data? {
-        if dataType == "file" {
+        if dataType == "file" || dataType == "binary" {
             guard let stringData = body as? String else {
                 throw CapacitorUrlRequestError.serializationError("[ data ] argument could not be parsed as string")
             }

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

@@ -44,6 +44,33 @@ var nativeBridge = (function (exports) {
         reader.onerror = reject;
         reader.readAsBinaryString(file);
     });
+    const readArrayBufferAsBase64 = (arrayBuffer) => {
+        const bytes = new Uint8Array(arrayBuffer);
+        const chunkSize = 0x8000;
+        let binary = '';
+        for (let i = 0; i < bytes.length; i += chunkSize) {
+            binary += String.fromCharCode(...bytes.subarray(i, i + chunkSize));
+        }
+        return btoa(binary);
+    };
+    const readBlobAsBase64 = (blob) => new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onload = () => {
+            const result = reader.result;
+            resolve(result.indexOf(',') >= 0 ? result.split(',')[1] : result);
+        };
+        reader.onerror = reject;
+        reader.readAsDataURL(blob);
+    });
+    const readDataViewAsBase64 = (dataView) => readArrayBufferAsBase64(dataView.buffer.slice(dataView.byteOffset, dataView.byteOffset + dataView.byteLength));
+    const base64StringToArrayBuffer = (base64) => {
+        const binary = atob(base64);
+        const bytes = new Uint8Array(binary.length);
+        for (let i = 0; i < binary.length; i++) {
+            bytes[i] = binary.charCodeAt(i);
+        }
+        return bytes.buffer;
+    };
     const convertFormData = async (formData) => {
         const newFormData = [];
         for (const pair of formData.entries()) {
@@ -65,9 +92,38 @@ var nativeBridge = (function (exports) {
         return newFormData;
     };
     const convertBody = async (body, contentType) => {
-        if (body instanceof ReadableStream || body instanceof Uint8Array) {
+        if (body instanceof File) {
+            const fileData = await readFileAsBase64(body);
+            return {
+                data: fileData,
+                type: 'file',
+                headers: { 'Content-Type': body.type },
+            };
+        }
+        else if (body instanceof Blob) {
+            return {
+                data: await readBlobAsBase64(body),
+                type: 'binary',
+                headers: { 'Content-Type': contentType || body.type || 'application/octet-stream' },
+            };
+        }
+        else if (body instanceof ArrayBuffer) {
+            return {
+                data: readArrayBufferAsBase64(body),
+                type: 'binary',
+                headers: { 'Content-Type': contentType || 'application/octet-stream' },
+            };
+        }
+        else if (ArrayBuffer.isView(body)) {
+            return {
+                data: readDataViewAsBase64(body),
+                type: 'binary',
+                headers: { 'Content-Type': contentType || 'application/octet-stream' },
+            };
+        }
+        if ((typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) || body instanceof Uint8Array) {
             let encodedData;
-            if (body instanceof ReadableStream) {
+            if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) {
                 const reader = body.getReader();
                 const chunks = [];
                 while (true) {
@@ -87,7 +143,9 @@ var nativeBridge = (function (exports) {
             else {
                 encodedData = body;
             }
-            let data = new TextDecoder().decode(encodedData);
+            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) || contentType === 'application/octet-stream'
+                ? readDataViewAsBase64(encodedData)
+                : new TextDecoder().decode(encodedData);
             let type;
             if (contentType === 'application/json') {
                 try {
@@ -102,7 +160,7 @@ var nativeBridge = (function (exports) {
                 type = 'formData';
             }
             else if (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) {
-                type = 'image';
+                type = 'binary';
             }
             else if (contentType === 'application/octet-stream') {
                 type = 'binary';
@@ -128,14 +186,6 @@ var nativeBridge = (function (exports) {
                 type: 'formData',
             };
         }
-        else if (body instanceof Blob) {
-            const fileData = await readFileAsBase64(body);
-            return {
-                data: fileData,
-                type: 'file',
-                headers: { 'Content-Type': body.type },
-            };
-        }
         return { data: body, type: 'json' };
     };
     const CAPACITOR_HTTP_INTERCEPTOR = '/_capacitor_http_interceptor_';
@@ -535,15 +585,15 @@ var nativeBridge = (function (exports) {
                                 data: requestData,
                                 dataType: type,
                                 headers: nativeHeaders,
+                                responseType: 'arraybuffer',
                             });
                             const contentType = nativeResponse.headers['Content-Type'] || nativeResponse.headers['content-type'];
-                            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('application/json'))
-                                ? JSON.stringify(nativeResponse.data)
-                                : nativeResponse.data;
                             // use null data for 204 No Content HTTP response
-                            if (nativeResponse.status === 204) {
-                                data = null;
-                            }
+                            const data = nativeResponse.status === 204
+                                ? null
+                                : (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('application/json'))
+                                    ? JSON.stringify(nativeResponse.data)
+                                    : base64StringToArrayBuffer(nativeResponse.data);
                             // intercept & parse response before returning
                             const response = new Response(data, {
                                 headers: nativeResponse.headers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-plus/ios",
-  "version": "8.3.9",
+  "version": "8.3.11",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
   "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",