@capacitor/ios 5.7.4 → 5.7.6

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -107,7 +107,7 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
     }
 
     func webView(_ webView: WKWebView, stop urlSchemeTask: WKURLSchemeTask) {
-        CAPLog.print("scheme stop")
+        urlSchemeTask.stopped = true
     }
 
     func mimeTypeForExtension(pathExtension: String) -> String {
@@ -155,43 +155,46 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
 
         let urlSession = URLSession.shared
         let task = urlSession.dataTask(with: urlRequest) { (data, response, error) in
-            if let error = error {
-                urlSchemeTask.didFailWithError(error)
-                return
-            }
+            DispatchQueue.main.async {
+                guard !urlSchemeTask.stopped else { return }
+                if let error = error {
+                    urlSchemeTask.didFailWithError(error)
+                    return
+                }
 
-            if let response = response as? HTTPURLResponse {
-                let existingHeaders = response.allHeaderFields
-                var newHeaders: [AnyHashable: Any] = [:]
+                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 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 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 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)
+                        if let data = data {
+                            urlSchemeTask.didReceive(data)
+                        }
                     }
                 }
+                urlSchemeTask.didFinish()
+                return
             }
-            urlSchemeTask.didFinish()
-            return
         }
 
         task.resume()
@@ -546,3 +549,16 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         "zip": "application/x-zip-compressed"
     ]
 }
+
+private var stoppedKey = malloc(1)
+
+private extension WKURLSchemeTask {
+    var stopped: Bool {
+        get {
+            return objc_getAssociatedObject(self, &stoppedKey) as? Bool ?? false
+        }
+        set {
+            objc_setAssociatedObject(self, &stoppedKey, newValue, .OBJC_ASSOCIATION_ASSIGN)
+        }
+    }
+}

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

@@ -109,6 +109,12 @@ var nativeBridge = (function (exports) {
                 headers: { 'Content-Type': contentType || 'application/octet-stream' },
             };
         }
+        else if (body instanceof URLSearchParams) {
+            return {
+                data: body.toString(),
+                type: 'text',
+            };
+        }
         else if (body instanceof FormData) {
             const formData = await convertFormData(body);
             const boundary = `${Date.now()}`;
@@ -379,15 +385,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') {
@@ -496,11 +502,11 @@ 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') {
+                        const { method } = request;
+                        if (method.toLocaleUpperCase() === 'GET' ||
+                            method.toLocaleUpperCase() === 'HEAD' ||
+                            method.toLocaleUpperCase() === 'OPTIONS' ||
+                            method.toLocaleUpperCase() === 'TRACE') {
                             if (typeof resource === 'string') {
                                 return await win.CapacitorWebFetch(createProxyUrl(resource, win), options);
                             }
@@ -512,8 +518,7 @@ var nativeBridge = (function (exports) {
                         const tag = `CapacitorHttp fetch ${Date.now()} ${resource}`;
                         console.time(tag);
                         try {
-                            // intercept request & pass to the bridge
-                            const { body, method } = request;
+                            const { body } = request;
                             const optionHeaders = Object.fromEntries(request.headers.entries());
                             const { data: requestData, type, headers, } = await convertBody((options === null || options === void 0 ? void 0 : options.body) || body || undefined, optionHeaders['Content-Type'] || optionHeaders['content-type']);
                             const nativeResponse = await cap.nativePromise('CapacitorHttp', 'request', {
@@ -564,20 +569,7 @@ var nativeBridge = (function (exports) {
                                 value: xhr.method,
                                 writable: true,
                             },
-                            readyState: {
-                                get: function () {
-                                    var _a;
-                                    return (_a = this._readyState) !== null && _a !== void 0 ? _a : 0;
-                                },
-                                set: function (val) {
-                                    this._readyState = val;
-                                    setTimeout(() => {
-                                        this.dispatchEvent(new Event('readystatechange'));
-                                    });
-                                },
-                            },
                         });
-                        xhr.readyState = 0;
                         const prototype = win.CapacitorWebXMLHttpRequest.prototype;
                         const isProgressEventAvailable = () => typeof ProgressEvent !== 'undefined' &&
                             ProgressEvent.prototype instanceof Event;
@@ -607,6 +599,20 @@ var nativeBridge = (function (exports) {
                                 this._url = createProxyUrl(this._url, win);
                                 return win.CapacitorWebXMLHttpRequest.open.call(this, method, this._url);
                             }
+                            Object.defineProperties(this, {
+                                readyState: {
+                                    get: function () {
+                                        var _a;
+                                        return (_a = this._readyState) !== null && _a !== void 0 ? _a : 0;
+                                    },
+                                    set: function (val) {
+                                        this._readyState = val;
+                                        setTimeout(() => {
+                                            this.dispatchEvent(new Event('readystatechange'));
+                                        });
+                                    },
+                                },
+                            });
                             setTimeout(() => {
                                 this.dispatchEvent(new Event('loadstart'));
                             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "5.7.4",
+  "version": "5.7.6",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",