craft-native 0.0.187 → 0.0.189

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/templates/CraftHybrid.swift

@@ -992,7 +992,10 @@ final class CraftHybridWebSlot: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        (parent?.parent as? CraftHybridController)?.adoptWeb(into: self)
+        if let controller = parent?.parent as? CraftHybridController {
+            controller.prepareWebTransition(to: self)
+            controller.adoptWeb(into: self)
+        }
     }
 }
 
@@ -1011,11 +1014,18 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     private var shownStacks: [ObjectIdentifier: [UIViewController]] = [:]
     /// A tab whose page has not caught up yet; shown when it has, or soon.
     private var pendingTab: (id: String, deadline: DispatchWorkItem)?
+    /// The live WebView moves to the destination before UIKit animates a web
+    /// push. Keep the outgoing page visible until that transition completes.
+    private var webTransitionSnapshots: [UIView] = []
     private var openingWeb = false
     private var firstFrameLogged = false
     private var tabBarHeight: CGFloat = 0
     private var tabSwipeRecognizers: [UIGestureRecognizer] = []
     private var activeTabSwipeTarget: String?
+    /// The edge the incoming tab started from for the current gesture. Keep
+    /// this separate from the live frame: deriving it after the drag begins
+    /// makes the target jump when the translation crosses the midpoint.
+    private var tabSwipeFrom: CGFloat = 0
 
     init(config: CraftConfig) {
         self.config = config
@@ -1134,7 +1144,8 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         }
         target.view.isHidden = false
         let width = view.bounds.width
-        target.view.frame = view.bounds.offsetBy(dx: direction * width, dy: 0)
+        tabSwipeFrom = -direction * width
+        target.view.frame = view.bounds.offsetBy(dx: tabSwipeFrom, dy: 0)
         view.bringSubviewToFront(target.view)
         CraftChrome.shared.beginTabSwipe(to: id)
         return true
@@ -1144,9 +1155,8 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard let targetId = activeTabSwipeTarget, let current = visibleStack,
               let target = stacks[targetId] else { return }
         let width = max(1, view.bounds.width)
-        let start = target.view.frame.minX >= width * 0.5 ? width : -width
         let offset = min(width, max(-width, translation))
-        target.view.frame.origin.x = start + offset
+        target.view.frame.origin.x = tabSwipeFrom + offset
         current.view.frame.origin.x = offset
     }
 
@@ -1244,6 +1254,26 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         ])
     }
 
+    /// UIKit calls the destination's viewWillAppear before it starts a push.
+    /// Since the hybrid shell has one WebView shared by all web entries, moving
+    /// it at that point would leave the outgoing slot blank for the whole
+    /// transition. A snapshot gives that slot the page it was showing while
+    /// the live WebView is adopted by the destination.
+    func prepareWebTransition(to slot: CraftHybridWebSlot) {
+        guard let nav = slot.navigationController,
+              nav === visibleStack,
+              let from = nav.transitionCoordinator?.viewController(forKey: .from),
+              let source = from as? CraftHybridWebSlot,
+              source !== slot,
+              let webHost,
+              webHost.view.superview === source.view,
+              let snapshot = webHost.view.snapshotView(afterScreenUpdates: false) else { return }
+        snapshot.frame = source.view.bounds
+        snapshot.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        source.view.addSubview(snapshot)
+        webTransitionSnapshots.append(snapshot)
+    }
+
     private var visibleStack: UINavigationController? { stacks[currentTab] }
 
     var webIsVisible: Bool {
@@ -1593,6 +1623,8 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         if let depth = removed.compactMap({ ($0 as? CraftHybridWebSlot)?.depth }).min() {
             hybrid.pageBack(to: depth - 1)
         }
+        for snapshot in webTransitionSnapshots { snapshot.removeFromSuperview() }
+        webTransitionSnapshots.removeAll()
         // Back at a tab's native root while the page, with no history left
         // to go back through (it reloaded on the screen just popped), still
         // shows that screen: it moves to the root's path. Left there, the

package/dist/ios/templates/CraftNativeActions.swift

@@ -31,7 +31,7 @@ enum CraftNativeActions {
     private static let fetchSession: URLSession = {
         let configuration = URLSessionConfiguration.default
         configuration.timeoutIntervalForRequest = craftNativeFetchTimeoutSeconds
-        configuration.timeoutIntervalForResource = craftNativeFetchTimeoutSeconds
+        configuration.timeoutIntervalForResource = 600
         return URLSession(configuration: configuration)
     }()
     private static var initialDeepLinkClaimed = false
@@ -219,6 +219,12 @@ enum CraftNativeActions {
                 CraftNativeFiles.pickImage(options, cameraEnabled: config.enableCamera) { complete(requestToken, $0, completion) }
             }
             return
+        case ("Files", "pickVideo"):
+            let options = args.first as? [String: Any] ?? [:]
+            DispatchQueue.main.async {
+                CraftNativeFiles.pickVideo(options) { complete(requestToken, $0, completion) }
+            }
+            return
         case ("Files", "download"):
             download(requestToken: requestToken, args: args, completion: completion)
             return
@@ -594,6 +600,7 @@ enum CraftNativeActions {
                 request.setValue(value, forHTTPHeaderField: name)
             }
         }
+        var uploadFile: URL?
         if let form = options["form"] as? [Any] {
             // A screen's FormData: text fields, and files craft.files made.
             guard method != "GET", method != "HEAD" else {
@@ -604,8 +611,9 @@ enum CraftNativeActions {
             case .failure(let error):
                 complete(requestToken, .failure(error), completion)
                 return
-            case .success(let (data, boundary)):
-                request.httpBody = data
+            case .success(let (file, boundary)):
+                uploadFile = file
+                request.timeoutInterval = 600
                 request.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
             }
         } else if let body = options["body"] as? String {
@@ -619,7 +627,8 @@ enum CraftNativeActions {
             return
         }
 
-        let task = fetchSession.dataTask(with: request) { data, response, error in
+        let responseHandler: (Data?, URLResponse?, Error?) -> Void = { data, response, error in
+            if let uploadFile { CraftNativeFiles.remove(uploadFile.path) }
             cancellationLock.lock()
             fetchTasks.removeValue(forKey: requestToken)
             cancellationLock.unlock()
@@ -656,11 +665,14 @@ enum CraftNativeActions {
                 "body": String(decoding: body, as: UTF8.self),
             ]), completion)
         }
+        let task: URLSessionTask = uploadFile.map { fetchSession.uploadTask(with: request, fromFile: $0, completionHandler: responseHandler) }
+            ?? fetchSession.dataTask(with: request, completionHandler: responseHandler)
         cancellationLock.lock()
         let alreadyCancelled = cancelledRequests.contains(requestToken)
         if !alreadyCancelled { fetchTasks[requestToken] = task }
         cancellationLock.unlock()
         if !alreadyCancelled { task.resume() }
+        else if let uploadFile { CraftNativeFiles.remove(uploadFile.path) }
     }
 
     /// `craft.files.download`: a GET straight to a file made here (for the

package/dist/ios/templates/CraftNativeFiles.swift

@@ -274,41 +274,147 @@ enum CraftNativeFiles {
         }
     }
 
+    // MARK: Picking a video
+
+    /// System pickers grant access to just the selected video. Copy it while
+    /// the provider's URL is valid; no movie bytes cross JavaScriptCore.
+    static func pickVideo(_ options: [String: Any], done: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
+        guard activePicker == nil else {
+            done(.failure(CraftNativeActionError(code: "BUSY", message: "A picker is already open")))
+            return
+        }
+        let limit = min(512 * 1024 * 1024, max(1, (options["maxBytes"] as? NSNumber)?.intValue ?? 512 * 1024 * 1024))
+        let finish: (Result<Any, CraftNativeActionError>) -> Void = { result in
+            DispatchQueue.main.async { activePicker = nil; done(result) }
+        }
+        if options["source"] as? String == "files" {
+            let delegate = VideoDocumentDelegate(limit: limit, done: finish)
+            var types: [UTType] = [.movie]
+            if let webm = UTType(filenameExtension: "webm") { types.append(webm) }
+            let picker = UIDocumentPickerViewController(forOpeningContentTypes: types, asCopy: true)
+            picker.allowsMultipleSelection = false
+            picker.delegate = delegate
+            activePicker = delegate
+            if !CraftPresenter.present(picker, from: nil) {
+                activePicker = nil
+                done(.failure(CraftNativeActionError(code: "PICKER_ERROR", message: "Unable to present the video picker")))
+            }
+        } else {
+            var configuration = PHPickerConfiguration()
+            configuration.filter = .videos
+            configuration.selectionLimit = 1
+            configuration.preferredAssetRepresentationMode = .current
+            let delegate = VideoLibraryDelegate(limit: limit, 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 video picker")))
+            }
+        }
+    }
+
+    static func copyVideo(_ source: URL, limit: Int) -> Result<Any, CraftNativeActionError> {
+        let ext = source.pathExtension.lowercased()
+        let types = ["mp4": "video/mp4", "m4v": "video/x-m4v", "mov": "video/quicktime", "webm": "video/webm"]
+        guard let type = types[ext] else {
+            return .failure(CraftNativeActionError(code: "INVALID_VIDEO", message: "Choose an MP4, MOV or WebM video."))
+        }
+        do {
+            let size = ((try FileManager.default.attributesOfItem(atPath: source.path))[.size] as? NSNumber)?.intValue ?? 0
+            guard size > 0, size <= limit else {
+                return .failure(CraftNativeActionError(code: "FILE_TOO_LARGE", message: "Choose a nonempty video under \(limit / 1024 / 1024)MB."))
+            }
+            let destination = try newFile(named: source.lastPathComponent)
+            do { try FileManager.default.copyItem(at: source, to: destination) }
+            catch { try? FileManager.default.removeItem(at: destination.deletingLastPathComponent()); throw error }
+            return .success(describe(destination, type: type))
+        } catch {
+            return .failure(CraftNativeActionError(code: "READ_ERROR", message: error.localizedDescription))
+        }
+    }
+
+    private final class VideoLibraryDelegate: NSObject, PHPickerViewControllerDelegate {
+        let limit: Int
+        let done: (Result<Any, CraftNativeActionError>) -> Void
+        init(limit: Int, done: @escaping (Result<Any, CraftNativeActionError>) -> Void) { self.limit = limit; 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 }
+            let (limit, done) = (self.limit, self.done)
+            provider.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { url, error in
+                guard let url else {
+                    done(.failure(CraftNativeActionError(code: "READ_ERROR", message: error?.localizedDescription ?? "The video could not be read")))
+                    return
+                }
+                done(CraftNativeFiles.copyVideo(url, limit: limit))
+            }
+        }
+    }
+
+    private final class VideoDocumentDelegate: NSObject, UIDocumentPickerDelegate {
+        let limit: Int
+        let done: (Result<Any, CraftNativeActionError>) -> Void
+        init(limit: Int, done: @escaping (Result<Any, CraftNativeActionError>) -> Void) { self.limit = limit; self.done = done }
+        func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) { done(.success(NSNull())) }
+        func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+            guard let url = urls.first else { done(.success(NSNull())); return }
+            let (limit, done) = (self.limit, self.done)
+            DispatchQueue.global(qos: .userInitiated).async {
+                let granted = url.startAccessingSecurityScopedResource()
+                defer { if granted { url.stopAccessingSecurityScopedResource() } }
+                done(CraftNativeFiles.copyVideo(url, limit: limit))
+            }
+        }
+    }
+
     // 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> {
+    static func multipart(_ parts: [Any]) -> Result<(URL, 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"))
+        var temporary: URL?
+        do {
+            let destination = try newFile(named: "upload.multipart")
+            temporary = destination
+            FileManager.default.createFile(atPath: destination.path, contents: nil)
+            let output = try FileHandle(forWritingTo: destination)
+            defer { try? output.close() }
+            func append(_ text: String) throws { try output.write(contentsOf: Data(text.utf8)) }
+            for item in parts {
+                guard let part = item as? [String: Any], let name = part["name"] as? String else {
+                    throw CraftNativeActionError(code: "INVALID_ARGUMENT", message: "A form part needs a name")
                 }
-                guard let data = try? Data(contentsOf: url, options: .mappedIfSafe) else {
-                    return .failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "A form file could not be read"))
+                try append("--\(boundary)\r\n")
+                if let path = part["path"] as? String {
+                    guard let url = owned(path) else {
+                        throw CraftNativeActionError(code: "INVALID_ARGUMENT", message: "A form file must be one craft.files made, and still there")
+                    }
+                    let filename = (part["filename"] as? String).map(safeName) ?? url.lastPathComponent
+                    let type = (part["type"] as? String).flatMap { $0.isEmpty ? nil : $0 } ?? "application/octet-stream"
+                    try append("Content-Disposition: form-data; name=\"\(quoted(name))\"; filename=\"\(quoted(filename))\"\r\n")
+                    try append("Content-Type: \(type.replacingOccurrences(of: "\r", with: "").replacingOccurrences(of: "\n", with: ""))\r\n\r\n")
+                    let input = try FileHandle(forReadingFrom: url)
+                    defer { try? input.close() }
+                    while let chunk = try input.read(upToCount: 64 * 1024), !chunk.isEmpty {
+                        try output.write(contentsOf: chunk)
+                    }
+                    try append("\r\n")
+                } else {
+                    try append("Content-Disposition: form-data; name=\"\(quoted(name))\"\r\n\r\n")
+                    try append(part["value"] as? String ?? "")
+                    try append("\r\n")
                 }
-                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")
             }
+            try append("--\(boundary)--\r\n")
+            return .success((destination, boundary))
+        } catch {
+            if let temporary { remove(temporary.path) }
+            return .failure((error as? CraftNativeActionError) ?? CraftNativeActionError(code: "WRITE_ERROR", message: error.localizedDescription))
         }
-        append("--\(boundary)--\r\n")
-        return .success((body, boundary))
     }
 
     /// A name inside a quoted header value, escaped as browsers send it.