craft-native 0.0.152 → 0.0.153

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.152";
+var version = "0.0.153";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -310,7 +310,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.152";
+var version = "0.0.153";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -58,7 +58,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.152";
+var version = "0.0.153";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/src/index.js

@@ -794,6 +794,7 @@ async function init(options) {
   cpSync(join(TEMPLATES_DIR, "CraftNativeMutation.swift"), join(output, "Sources", "CraftNativeMutation.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftNativeUI.swift"), join(output, "Sources", "CraftNativeUI.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftNativeServices.swift"), join(output, "Sources", "CraftNativeServices.swift"));
+  cpSync(join(TEMPLATES_DIR, "CraftNativeFiles.swift"), join(output, "Sources", "CraftNativeFiles.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftWebAudio.swift"), join(output, "Sources", "CraftWebAudio.swift"));
   cpSync(join(TEMPLATES_DIR, "CraftHybrid.swift"), join(output, "Sources", "CraftHybrid.swift"));
   const infoPlistTemplate = readFileSync(join(TEMPLATES_DIR, "Info.plist.template"), "utf-8");

package/dist/ios/templates/CraftNativeActions.swift

@@ -26,7 +26,7 @@ enum CraftNativeActions {
     private static let cancellationLock = NSLock()
     private static var cancelledRequests = Set<String>()
     private static var biometricContexts = [String: LAContext]()
-    private static var fetchTasks = [String: URLSessionDataTask]()
+    private static var fetchTasks = [String: URLSessionTask]()
     private static let fetchSession: URLSession = {
         let configuration = URLSessionConfiguration.default
         configuration.timeoutIntervalForRequest = craftNativeFetchTimeoutSeconds
@@ -64,6 +64,12 @@ enum CraftNativeActions {
         // A heart-rate strap is the app's own service (CraftHeartRate.swift),
         // so it needs no web view.
         if config.enableHeartRate { values.append("heartRate") }
+        // Photos picked from the library, files downloaded for the share
+        // sheet and sent in a form (CraftNativeFiles.swift): the photo picker
+        // runs out of process and asks no permission. Taking a photo needs
+        // the camera, which the app declares.
+        values.append("files")
+        if config.enableCamera { values.append("camera") }
         return values
     }
 
@@ -155,6 +161,18 @@ enum CraftNativeActions {
         case ("Network", "fetch"):
             fetch(requestToken: requestToken, args: args, completion: completion)
             return
+        case ("Files", "pickImage"):
+            // A person picks, so the bridge never times it out.
+            let options = args.first as? [String: Any] ?? [:]
+            DispatchQueue.main.async {
+                CraftNativeFiles.pickImage(options, cameraEnabled: config.enableCamera) { complete(requestToken, $0, completion) }
+            }
+            return
+        case ("Files", "download"):
+            download(requestToken: requestToken, args: args, completion: completion)
+            return
+        case ("Files", "remove"):
+            sync = .success(CraftNativeFiles.remove(args.first as? String ?? ""))
         case ("Lifecycle", "getState"):
             sync = .success(currentAppState())
         case ("DeepLinks", "getInitialURL"):
@@ -434,7 +452,21 @@ enum CraftNativeActions {
                 request.setValue(value, forHTTPHeaderField: name)
             }
         }
-        if let body = options["body"] as? String {
+        if let form = options["form"] as? [Any] {
+            // A screen's FormData: text fields, and files craft.files made.
+            guard method != "GET", method != "HEAD" else {
+                complete(requestToken, failure("INVALID_ARGUMENT", "A GET or HEAD request cannot have a body"), completion)
+                return
+            }
+            switch CraftNativeFiles.multipart(form) {
+            case .failure(let error):
+                complete(requestToken, .failure(error), completion)
+                return
+            case .success(let (data, boundary)):
+                request.httpBody = data
+                request.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
+            }
+        } else if let body = options["body"] as? String {
             guard method != "GET", method != "HEAD" else {
                 complete(requestToken, failure("INVALID_ARGUMENT", "A GET or HEAD request cannot have a body"), completion)
                 return
@@ -483,6 +515,62 @@ enum CraftNativeActions {
         if !alreadyCancelled { task.resume() }
     }
 
+    /// `craft.files.download`: a GET straight to a file made here (for the
+    /// share sheet), with the screen's headers, so a large file never passes
+    /// through JavaScriptCore. A refused answer (not 2xx) keeps no file and
+    /// hands back its status and the start of its body. Cancelled like fetch.
+    private static func download(
+        requestToken: String,
+        args: [Any],
+        completion: @escaping (Result<Any, CraftNativeActionError>) -> Void
+    ) {
+        guard let address = args.first as? String,
+              let url = URL(string: address),
+              let scheme = url.scheme?.lowercased(), scheme == "https" || scheme == "http",
+              url.host?.isEmpty == false else {
+            complete(requestToken, failure("INVALID_ARGUMENT", "files.download needs an absolute http or https URL"), completion)
+            return
+        }
+        let options = args.count > 1 ? args[1] as? [String: Any] ?? [:] : [:]
+        var request = URLRequest(url: url, timeoutInterval: craftNativeFetchTimeoutSeconds)
+        request.httpMethod = "GET"
+        if let headers = options["headers"] as? [String: Any] {
+            for (name, value) in headers {
+                guard let value = value as? String else {
+                    complete(requestToken, failure("INVALID_ARGUMENT", "files.download header values must be strings"), completion)
+                    return
+                }
+                request.setValue(value, forHTTPHeaderField: name)
+            }
+        }
+        let name = options["name"] as? String
+        let task = fetchSession.downloadTask(with: request) { location, response, error in
+            cancellationLock.lock()
+            fetchTasks.removeValue(forKey: requestToken)
+            cancellationLock.unlock()
+            if let error = error {
+                let code = (error as? URLError)?.code == .timedOut ? "TIMEOUT" : "NETWORK_ERROR"
+                complete(requestToken, failure(code, error.localizedDescription), completion)
+                return
+            }
+            guard let http = response as? HTTPURLResponse else {
+                complete(requestToken, failure("NETWORK_ERROR", "files.download received a response that is not HTTP"), completion)
+                return
+            }
+            // The system deletes `location` once this returns: keep or read it now.
+            guard (200..<300).contains(http.statusCode), let location else {
+                complete(requestToken, .success(CraftNativeFiles.refusedDownload(at: location, response: http)), completion)
+                return
+            }
+            complete(requestToken, CraftNativeFiles.keepDownload(at: location, response: http, name: name), completion)
+        }
+        cancellationLock.lock()
+        let alreadyCancelled = cancelledRequests.contains(requestToken)
+        if !alreadyCancelled { fetchTasks[requestToken] = task }
+        cancellationLock.unlock()
+        if !alreadyCancelled { task.resume() }
+    }
+
     private static func claimInitialDeepLink() -> URL? {
         cancellationLock.lock()
         defer { cancellationLock.unlock() }

package/dist/ios/templates/CraftNativeFiles.swift

@@ -0,0 +1,343 @@
+import Foundation
+import ImageIO
+import PhotosUI
+import UIKit
+import UniformTypeIdentifiers
+
+// `craft.files` on a native screen: a photo picked from the library (or taken
+// with the camera), a file downloaded for the share sheet, and those files
+// sent as a multipart form through the screen's `fetch`.
+//
+// A file is a path in the app's temporary directory (tmp/craft-files/<id>/
+// <name>), described to JavaScript as `{ path, name, type, size }`. Its bytes
+// never cross the bridge: a picked photo goes from the picker to disk to the
+// upload without becoming a base64 string in JavaScriptCore, so a photo costs
+// what its file costs rather than a third more, twice over, in the screen's
+// memory. `fetch` and the share sheet take the path; only files made here are
+// read back for a form, so a screen cannot post an arbitrary file of the app's.
+
+enum CraftNativeFiles {
+    /// The longest side of a picked photo unless the screen asks otherwise:
+    /// sharp on any phone screen and in a share card, a few hundred kilobytes
+    /// as JPEG, where the original can be 48 megapixels of HEIC.
+    static let defaultMaxPixels = 2048
+    static let largestMaxPixels = 8192
+    static let defaultQuality = 0.85
+    /// The part of a refused download's answer handed back, for its error.
+    static let errorBodyLimit = 64 * 1024
+
+    static var root: URL {
+        FileManager.default.temporaryDirectory.appendingPathComponent("craft-files", isDirectory: true)
+    }
+
+    private static let lock = NSLock()
+    private static var swept = false
+    /// The picker on screen, kept alive until it answers. One at a time.
+    private static var activePicker: NSObject?
+
+    // MARK: Files of our own
+
+    /// A new file called `name`, in a folder of its own so two files can share
+    /// a name (the share sheet shows it).
+    static func newFile(named name: String) throws -> URL {
+        sweepOnce()
+        let folder = root.appendingPathComponent(UUID().uuidString, isDirectory: true)
+        try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true)
+        return folder.appendingPathComponent(safeName(name))
+    }
+
+    /// The file at `path` when it is one made here and still there, else nil.
+    static func owned(_ path: String) -> URL? {
+        let url = URL(fileURLWithPath: path).standardizedFileURL.resolvingSymlinksInPath()
+        let base = root.standardizedFileURL.resolvingSymlinksInPath().path + "/"
+        var isDirectory: ObjCBool = false
+        guard url.path.hasPrefix(base),
+              FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory),
+              !isDirectory.boolValue else { return nil }
+        return url
+    }
+
+    /// A file name with no path in it.
+    static func safeName(_ name: String) -> String {
+        let parts = name.components(separatedBy: CharacterSet(charactersIn: "/\\:\u{0}\r\n"))
+        var cleaned = parts.joined(separator: "-").trimmingCharacters(in: .whitespacesAndNewlines)
+        while cleaned.hasPrefix(".") { cleaned.removeFirst() }
+        return cleaned.isEmpty ? "file" : String(cleaned.prefix(120))
+    }
+
+    static func describe(_ url: URL, type: String, extra: [String: Any] = [:]) -> [String: Any] {
+        let size = ((try? FileManager.default.attributesOfItem(atPath: url.path))?[.size] as? NSNumber)?.intValue ?? 0
+        var info: [String: Any] = ["path": url.path, "name": url.lastPathComponent, "type": type, "size": size]
+        for (key, value) in extra { info[key] = value }
+        return info
+    }
+
+    /// Forget a file made here. True when there was one.
+    @discardableResult
+    static func remove(_ path: String) -> Bool {
+        guard let url = owned(path) else { return false }
+        try? FileManager.default.removeItem(at: url.deletingLastPathComponent())
+        return true
+    }
+
+    /// Files from earlier launches that nobody removed: the system clears tmp
+    /// eventually, this clears what is a day old the first time a file is made.
+    private static func sweepOnce() {
+        lock.lock()
+        let first = !swept
+        swept = true
+        lock.unlock()
+        guard first else { return }
+        let fm = FileManager.default
+        let dayAgo = Date().addingTimeInterval(-86_400)
+        let folders = (try? fm.contentsOfDirectory(at: root, includingPropertiesForKeys: [.creationDateKey])) ?? []
+        for folder in folders {
+            let created = (try? folder.resourceValues(forKeys: [.creationDateKey]))?.creationDate ?? .distantPast
+            if created < dayAgo { try? fm.removeItem(at: folder) }
+        }
+    }
+
+    // MARK: Picking a photo
+
+    /// A photo from the library (PHPickerViewController: no permission asked,
+    /// the person sees only the picker) or, with `source: 'camera'` and the
+    /// camera enabled, a new one (UIImagePickerController). Saved as a JPEG no
+    /// larger than `maxPixels` on its longest side, upright, with no metadata
+    /// (no location) left in it. Answers the file, or null when the person
+    /// closed the picker. Main thread.
+    static func pickImage(_ options: [String: Any], cameraEnabled: Bool, done: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
+        let maxPixels = min(largestMaxPixels, max(64, (options["maxPixels"] as? NSNumber)?.intValue ?? defaultMaxPixels))
+        let quality = min(1, max(0.1, (options["quality"] as? NSNumber)?.doubleValue ?? defaultQuality))
+        let source = options["source"] as? String ?? "library"
+        guard activePicker == nil else {
+            done(.failure(CraftNativeActionError(code: "BUSY", message: "A picker is already open")))
+            return
+        }
+        let finish: (Result<Any, CraftNativeActionError>) -> Void = { result in
+            DispatchQueue.main.async {
+                activePicker = nil
+                done(result)
+            }
+        }
+
+        if source == "camera" {
+            guard cameraEnabled else {
+                done(.failure(CraftNativeActionError(code: "CAPABILITY_DISABLED", message: "The camera is disabled")))
+                return
+            }
+            guard UIImagePickerController.isSourceTypeAvailable(.camera) else {
+                done(.failure(CraftNativeActionError(code: "UNAVAILABLE", message: "This device has no camera")))
+                return
+            }
+            let delegate = CameraDelegate(maxPixels: maxPixels, quality: quality, done: finish)
+            let picker = UIImagePickerController()
+            picker.sourceType = .camera
+            picker.delegate = delegate
+            activePicker = delegate
+            if !CraftPresenter.present(picker, from: nil) {
+                activePicker = nil
+                done(.failure(CraftNativeActionError(code: "PICKER_ERROR", message: "Unable to present the camera")))
+            }
+            return
+        }
+        guard source == "library" else {
+            done(.failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "files.pickImage source is 'library' or 'camera'")))
+            return
+        }
+
+        var configuration = PHPickerConfiguration()
+        configuration.filter = .images
+        configuration.selectionLimit = 1
+        // The file as it is (HEIC stays HEIC): it is decoded once, below, at the size wanted.
+        configuration.preferredAssetRepresentationMode = .current
+        let delegate = LibraryDelegate(maxPixels: maxPixels, quality: quality, done: finish)
+        let picker = PHPickerViewController(configuration: configuration)
+        picker.delegate = delegate
+        activePicker = delegate
+        if !CraftPresenter.present(picker, from: nil) {
+            activePicker = nil
+            done(.failure(CraftNativeActionError(code: "PICKER_ERROR", message: "Unable to present the photo picker")))
+        }
+    }
+
+    /// Decode `source` at no more than `maxPixels` on its longest side, turned
+    /// upright, and write it as a JPEG. ImageIO's thumbnail reads only what
+    /// that size needs, so a huge original never sits in memory whole.
+    static func writeJPEG(from source: CGImageSource, maxPixels: Int, quality: Double, name: String) -> Result<Any, CraftNativeActionError> {
+        let thumbnail: [CFString: Any] = [
+            kCGImageSourceCreateThumbnailFromImageAlways: true,
+            kCGImageSourceCreateThumbnailWithTransform: true,
+            kCGImageSourceShouldCacheImmediately: true,
+            kCGImageSourceThumbnailMaxPixelSize: maxPixels,
+        ]
+        guard let image = CGImageSourceCreateThumbnailAtIndex(source, 0, thumbnail as CFDictionary) else {
+            return .failure(CraftNativeActionError(code: "DECODE_ERROR", message: "The photo could not be read"))
+        }
+        return writeJPEG(image, quality: quality, name: name)
+    }
+
+    static func writeJPEG(_ image: CGImage, quality: Double, name: String) -> Result<Any, CraftNativeActionError> {
+        do {
+            let url = try newFile(named: name)
+            guard let destination = CGImageDestinationCreateWithURL(url as CFURL, UTType.jpeg.identifier as CFString, 1, nil) else {
+                return .failure(CraftNativeActionError(code: "WRITE_ERROR", message: "The photo could not be saved"))
+            }
+            CGImageDestinationAddImage(destination, image, [kCGImageDestinationLossyCompressionQuality: quality] as CFDictionary)
+            guard CGImageDestinationFinalize(destination) else {
+                return .failure(CraftNativeActionError(code: "WRITE_ERROR", message: "The photo could not be saved"))
+            }
+            return .success(describe(url, type: "image/jpeg", extra: ["width": image.width, "height": image.height]))
+        } catch {
+            return .failure(CraftNativeActionError(code: "WRITE_ERROR", message: error.localizedDescription))
+        }
+    }
+
+    /// `IMG_1234.jpg` for the picker's `IMG_1234`, `photo.jpg` without one.
+    static func jpegName(_ suggested: String?) -> String {
+        var base = safeName(suggested ?? "photo")
+        if let dot = base.lastIndex(of: "."), dot > base.startIndex { base = String(base[..<dot]) }
+        return "\(base).jpg"
+    }
+
+    private final class LibraryDelegate: NSObject, PHPickerViewControllerDelegate {
+        let maxPixels: Int
+        let quality: Double
+        let done: (Result<Any, CraftNativeActionError>) -> Void
+
+        init(maxPixels: Int, quality: Double, done: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
+            self.maxPixels = maxPixels
+            self.quality = quality
+            self.done = done
+        }
+
+        func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
+            picker.dismiss(animated: true)
+            guard let provider = results.first?.itemProvider else {
+                done(.success(NSNull()))
+                return
+            }
+            guard provider.hasItemConformingToTypeIdentifier(UTType.image.identifier) else {
+                done(.failure(CraftNativeActionError(code: "DECODE_ERROR", message: "That is not a photo")))
+                return
+            }
+            let name = CraftNativeFiles.jpegName(provider.suggestedName)
+            let (maxPixels, quality, done) = (self.maxPixels, self.quality, self.done)
+            // The file is only there for the length of this callback.
+            provider.loadFileRepresentation(forTypeIdentifier: UTType.image.identifier) { url, error in
+                guard let url, let source = CGImageSourceCreateWithURL(url as CFURL, nil) else {
+                    done(.failure(CraftNativeActionError(code: "DECODE_ERROR", message: error?.localizedDescription ?? "The photo could not be read")))
+                    return
+                }
+                done(CraftNativeFiles.writeJPEG(from: source, maxPixels: maxPixels, quality: quality, name: name))
+            }
+        }
+    }
+
+    private final class CameraDelegate: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+        let maxPixels: Int
+        let quality: Double
+        let done: (Result<Any, CraftNativeActionError>) -> Void
+
+        init(maxPixels: Int, quality: Double, done: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
+            self.maxPixels = maxPixels
+            self.quality = quality
+            self.done = done
+        }
+
+        func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+            picker.dismiss(animated: true)
+            guard let image = info[.originalImage] as? UIImage else {
+                done(.failure(CraftNativeActionError(code: "DECODE_ERROR", message: "The photo could not be read")))
+                return
+            }
+            // Drawn at the size wanted, which also turns it upright.
+            let longest = max(image.size.width * image.scale, image.size.height * image.scale)
+            let factor = min(1, CGFloat(maxPixels) / max(1, longest))
+            let size = CGSize(width: (image.size.width * image.scale * factor).rounded(), height: (image.size.height * image.scale * factor).rounded())
+            let format = UIGraphicsImageRendererFormat()
+            format.scale = 1
+            format.opaque = true
+            let drawn = UIGraphicsImageRenderer(size: size, format: format).image { _ in image.draw(in: CGRect(origin: .zero, size: size)) }
+            guard let cgImage = drawn.cgImage else {
+                done(.failure(CraftNativeActionError(code: "DECODE_ERROR", message: "The photo could not be read")))
+                return
+            }
+            let formatter = DateFormatter()
+            formatter.dateFormat = "yyyyMMdd_HHmmss"
+            done(CraftNativeFiles.writeJPEG(cgImage, quality: quality, name: "IMG_\(formatter.string(from: Date())).jpg"))
+        }
+
+        func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+            picker.dismiss(animated: true)
+            done(.success(NSNull()))
+        }
+    }
+
+    // MARK: Sending files
+
+    /// A multipart/form-data body from a screen's `FormData`: parts are
+    /// `{ name, value }` or `{ name, path, filename?, type? }`, a file made
+    /// here. Answers the body and its boundary.
+    static func multipart(_ parts: [Any]) -> Result<(Data, String), CraftNativeActionError> {
+        let boundary = "craft-\(UUID().uuidString)"
+        var body = Data()
+        func append(_ text: String) { body.append(Data(text.utf8)) }
+        for item in parts {
+            guard let part = item as? [String: Any], let name = part["name"] as? String else {
+                return .failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "A form part needs a name"))
+            }
+            append("--\(boundary)\r\n")
+            if let path = part["path"] as? String {
+                guard let url = owned(path) else {
+                    return .failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "A form file must be one craft.files made, and still there"))
+                }
+                guard let data = try? Data(contentsOf: url, options: .mappedIfSafe) else {
+                    return .failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "A form file could not be read"))
+                }
+                let filename = (part["filename"] as? String).map(safeName) ?? url.lastPathComponent
+                let type = (part["type"] as? String).flatMap { $0.isEmpty ? nil : $0 } ?? "application/octet-stream"
+                append("Content-Disposition: form-data; name=\"\(quoted(name))\"; filename=\"\(quoted(filename))\"\r\n")
+                append("Content-Type: \(type.replacingOccurrences(of: "\r", with: "").replacingOccurrences(of: "\n", with: ""))\r\n\r\n")
+                body.append(data)
+                append("\r\n")
+            } else {
+                append("Content-Disposition: form-data; name=\"\(quoted(name))\"\r\n\r\n")
+                append(part["value"] as? String ?? "")
+                append("\r\n")
+            }
+        }
+        append("--\(boundary)--\r\n")
+        return .success((body, boundary))
+    }
+
+    /// A name inside a quoted header value, escaped as browsers send it.
+    static func quoted(_ value: String) -> String {
+        value.replacingOccurrences(of: "\"", with: "%22").replacingOccurrences(of: "\r", with: "%0D").replacingOccurrences(of: "\n", with: "%0A")
+    }
+
+    /// Keep a downloaded body as a file made here: the name the screen gave,
+    /// else the server's (`Content-Disposition`), else the address's.
+    static func keepDownload(at location: URL, response: HTTPURLResponse, name: String?) -> Result<Any, CraftNativeActionError> {
+        let chosen = name.flatMap { $0.isEmpty ? nil : $0 } ?? response.suggestedFilename ?? "download"
+        do {
+            let url = try newFile(named: chosen)
+            try FileManager.default.moveItem(at: location, to: url)
+            let type = (response.mimeType ?? "application/octet-stream")
+            return .success(describe(url, type: type, extra: ["ok": true, "status": response.statusCode]))
+        } catch {
+            return .failure(CraftNativeActionError(code: "WRITE_ERROR", message: error.localizedDescription))
+        }
+    }
+
+    /// A refused download: its status and the start of its answer, so the
+    /// screen can say what the server said. No file is kept.
+    static func refusedDownload(at location: URL?, response: HTTPURLResponse) -> [String: Any] {
+        var text = ""
+        if let location, let handle = try? FileHandle(forReadingFrom: location) {
+            let data = handle.readData(ofLength: errorBodyLimit)
+            try? handle.close()
+            text = String(decoding: data, as: UTF8.self)
+        }
+        return ["ok": false, "status": response.statusCode, "body": text]
+    }
+}

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3060,11 +3060,17 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                     "message": "Native API request timed out",
                 ], correlationId: id)
             }
-            pendingCapabilityDeadlines[requestToken] = deadline
-            DispatchQueue.main.asyncAfter(
-                deadline: .now() + .milliseconds(craftNativeCapabilityTimeoutMilliseconds),
-                execute: deadline
-            )
+            // A request a person answers (a share sheet, a dialog, the photo
+            // picker, Face ID) says so (`untimed`, stx's callPersonFacingAPI)
+            // and waits for them: a deadline would answer TIMEOUT while the
+            // sheet is still up and they are still choosing.
+            if payload["untimed"] as? Bool != true {
+                pendingCapabilityDeadlines[requestToken] = deadline
+                DispatchQueue.main.asyncAfter(
+                    deadline: .now() + .milliseconds(craftNativeCapabilityTimeoutMilliseconds),
+                    execute: deadline
+                )
+            }
             let module = payload["module"] as? String ?? ""
             let method = payload["method"] as? String ?? ""
             let reply: (Result<Any, CraftNativeActionError>) -> Void = { [weak self] answer in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.152",
+  "version": "0.0.153",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",