@capacitor/ios 5.7.5 → 5.7.7

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

@@ -65,22 +65,29 @@ var nativeBridge = (function (exports) {
         return newFormData;
     };
     const convertBody = async (body, contentType) => {
-        if (body instanceof ReadableStream) {
-            const reader = body.getReader();
-            const chunks = [];
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                chunks.push(value);
+        if (body instanceof ReadableStream || body instanceof Uint8Array) {
+            let encodedData;
+            if (body instanceof ReadableStream) {
+                const reader = body.getReader();
+                const chunks = [];
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done)
+                        break;
+                    chunks.push(value);
+                }
+                const concatenated = new Uint8Array(chunks.reduce((acc, chunk) => acc + chunk.length, 0));
+                let position = 0;
+                for (const chunk of chunks) {
+                    concatenated.set(chunk, position);
+                    position += chunk.length;
+                }
+                encodedData = concatenated;
             }
-            const concatenated = new Uint8Array(chunks.reduce((acc, chunk) => acc + chunk.length, 0));
-            let position = 0;
-            for (const chunk of chunks) {
-                concatenated.set(chunk, position);
-                position += chunk.length;
+            else {
+                encodedData = body;
             }
-            let data = new TextDecoder().decode(concatenated);
+            let data = new TextDecoder().decode(encodedData);
             let type;
             if (contentType === 'application/json') {
                 try {
@@ -569,20 +576,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;
@@ -612,6 +606,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.5",
+  "version": "5.7.7",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",