@craft-native/ios 0.0.224 → 0.0.226

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.224",
+  "version": "0.0.226",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftHybrid.swift

@@ -266,6 +266,8 @@ protocol CraftHybridScreenEvents: AnyObject {
     func nativeScreen(_ screen: CraftNativeScreenController, didFail message: String)
     /// `craft.navigation.open(path)`.
     func nativeScreen(_ screen: CraftNativeScreenController, open path: String)
+    /// `craft.navigation.replace(path)`: finish the current flow atomically.
+    func nativeScreen(_ screen: CraftNativeScreenController, replace path: String)
 }
 
 // MARK: - The shell
@@ -938,6 +940,10 @@ extension CraftHybrid: CraftHybridScreenEvents {
     func nativeScreen(_ screen: CraftNativeScreenController, open path: String) {
         open(path)
     }
+
+    func nativeScreen(_ screen: CraftNativeScreenController, replace path: String) {
+        controller?.showNative(path: path, replace: true)
+    }
 }
 
 /// The page's `craftHybrid` channel, only from a trusted origin's main frame.
@@ -1519,6 +1525,10 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         interruptTabSwipe(restoringSelection: true)
         let tabs = hybrid.tabIds
         if let tab = tabs.first(where: { CraftHybridRoutes.normalize($0) == match.path }) {
+            // Finish the flow in its original tab before selecting another.
+            if replace, let current = visibleStack, current.viewControllers.count > 1 {
+                current.setViewControllers(Array(current.viewControllers.dropLast()), animated: false)
+            }
             if tab != currentTab {
                 selectTabAsIfTapped(tab)
             }
@@ -1541,7 +1551,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             return
         }
         let screen = entry(for: raw, isTabRoot: false, depth: nil)
-        if replace, nav.viewControllers.count > 1 {
+        if replace, !nav.viewControllers.isEmpty {
             nav.setViewControllers(Array(nav.viewControllers.dropLast()) + [screen], animated: true)
         } else {
             nav.pushViewController(screen, animated: true)
@@ -1900,6 +1910,11 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         open(path)
     }
 
+    func nativeScreen(_ screen: CraftNativeScreenController, replace path: String) {
+        guard screen.navigationController?.topViewController === screen else { return }
+        showNative(path: path, replace: true)
+    }
+
     private func log(_ message: String) {
         #if DEBUG
         NSLog("[craft hybrid] %@", message)

package/templates/CraftNativeActions.swift

@@ -254,6 +254,12 @@ enum CraftNativeActions {
             return
         case ("Media", "usage"):
             sync = .success(CraftNativeMedia.usage())
+        case ("Media", "clear"):
+            DispatchQueue.global(qos: .utility).async {
+                do { complete(requestToken, .success(try CraftNativeMedia.clear()), completion) }
+                catch { complete(requestToken, failure("IO_ERROR", "The video cache could not be cleared"), completion) }
+            }
+            return
         case ("Lifecycle", "getState"):
             sync = .success(currentAppState())
         case ("DeepLinks", "getInitialURL"):
@@ -782,7 +788,7 @@ enum CraftNativeActions {
             request.allowsExpensiveNetworkAccess = false
             request.allowsConstrainedNetworkAccess = false
         }
-        if CraftNativeMedia.join(address, { complete(requestToken, $0, completion) }) { return }
+        guard let flight = CraftNativeMedia.begin(address, { complete(requestToken, $0, completion) }) else { return }
         let task = fetchSession.downloadTask(with: request) { location, response, error in
             cancellationLock.lock()
             fetchTasks.removeValue(forKey: requestToken)
@@ -790,25 +796,25 @@ enum CraftNativeActions {
             if let error = error {
                 // Refused only because the connection is metered: not a failure, a wait.
                 if let reason = (error as? URLError)?.networkUnavailableReason, reason == .expensive || reason == .constrained {
-                    CraftNativeMedia.finish(address, .success(["ok": false, "url": address, "reason": "cellular"]))
+                    CraftNativeMedia.finish(address, flight: flight, .success(["ok": false, "url": address, "reason": "cellular"]))
                     return
                 }
                 let code = (error as? URLError)?.code == .timedOut ? "TIMEOUT" : "NETWORK_ERROR"
-                CraftNativeMedia.finish(address, failure(CraftNativeMedia.errorCode(error, fallback: code), error.localizedDescription))
+                CraftNativeMedia.finish(address, flight: flight, failure(CraftNativeMedia.errorCode(error, fallback: code), error.localizedDescription))
                 return
             }
             guard let http = response as? HTTPURLResponse, let location else {
-                CraftNativeMedia.finish(address, failure("NETWORK_ERROR", "media.keep received a response that is not HTTP"))
+                CraftNativeMedia.finish(address, flight: flight, failure("NETWORK_ERROR", "media.keep received a response that is not HTTP"))
                 return
             }
             // The system deletes `location` once this returns: move it now.
-            CraftNativeMedia.finish(address, CraftNativeMedia.store(address, at: location, response: http))
+            CraftNativeMedia.finish(address, flight: flight, CraftNativeMedia.store(address, at: location, response: http, flight: flight))
         }
         cancellationLock.lock()
         let alreadyCancelled = cancelledRequests.contains(requestToken)
         if !alreadyCancelled { fetchTasks[requestToken] = task }
         cancellationLock.unlock()
-        if alreadyCancelled { CraftNativeMedia.finish(address, failure("CANCELLED", "media.keep was cancelled")) }
+        if alreadyCancelled { CraftNativeMedia.finish(address, flight: flight, failure("CANCELLED", "media.keep was cancelled")) }
         else { task.resume() }
     }
 

package/templates/CraftNativeFiles.swift

@@ -514,7 +514,11 @@ enum CraftNativeMedia {
 
     private static let lock = NSLock()
     /// Addresses being fetched now, so a second `keep` waits for the first.
-    private static var inFlight: [String: [(Result<Any, CraftNativeActionError>) -> Void]] = [:]
+    private struct Flight {
+        let id: UUID
+        var waiting: [(Result<Any, CraftNativeActionError>) -> Void]
+    }
+    private static var inFlight: [String: Flight] = [:]
 
     /// Where `address`'s copy lives (whether or not it is there yet). The
     /// extension is the address's, because AVPlayer reads the type from it.
@@ -537,28 +541,29 @@ enum CraftNativeMedia {
         return ["ok": true, "url": address, "path": url.path, "size": size]
     }
 
-    /// Joins a fetch of `address` already under way; true when one was.
-    static func join(_ address: String, _ done: @escaping (Result<Any, CraftNativeActionError>) -> Void) -> Bool {
+    /// A new download's identity, or nil after joining an existing download.
+    static func begin(_ address: String, _ done: @escaping (Result<Any, CraftNativeActionError>) -> Void) -> UUID? {
         lock.lock()
         defer { lock.unlock() }
         if inFlight[address] != nil {
-            inFlight[address]!.append(done)
-            return true
+            inFlight[address]!.waiting.append(done)
+            return nil
         }
-        inFlight[address] = [done]
-        return false
+        let id = UUID()
+        inFlight[address] = Flight(id: id, waiting: [done])
+        return id
     }
 
-    static func finish(_ address: String, _ result: Result<Any, CraftNativeActionError>) {
+    static func finish(_ address: String, flight: UUID, _ result: Result<Any, CraftNativeActionError>) {
         lock.lock()
-        let waiting = inFlight.removeValue(forKey: address) ?? []
+        let waiting = inFlight[address]?.id == flight ? inFlight.removeValue(forKey: address)?.waiting ?? [] : []
         lock.unlock()
         for done in waiting { done(result) }
     }
 
     /// A finished download moved into place (atomically, so a half-written
     /// file is never played), or a refusal with the server's status.
-    static func store(_ address: String, at location: URL, response: HTTPURLResponse) -> Result<Any, CraftNativeActionError> {
+    static func store(_ address: String, at location: URL, response: HTTPURLResponse, flight: UUID? = nil) -> Result<Any, CraftNativeActionError> {
         guard response.statusCode == 200 else {
             return .success(["ok": false, "url": address, "status": response.statusCode])
         }
@@ -566,6 +571,9 @@ enum CraftNativeMedia {
         // Commit and prune share a lock; neither can remove a file being committed.
         lock.lock()
         defer { lock.unlock() }
+        if let flight, inFlight[address]?.id != flight {
+            return .failure(CraftNativeActionError(code: "CANCELLED", message: "The video cache was cleared"))
+        }
         let staging = root.appendingPathComponent(UUID().uuidString + ".part")
         defer { try? fm.removeItem(at: staging) }
         do {
@@ -596,6 +604,25 @@ enum CraftNativeMedia {
         }
     }
 
+    /// End an account's cache lifetime.
+    static func clear() throws -> Int {
+        lock.lock()
+        let waiting = inFlight.values.flatMap { $0.waiting }
+        inFlight.removeAll()
+        let fm = FileManager.default
+        let files = (try? fm.contentsOfDirectory(at: root, includingPropertiesForKeys: nil)) ?? []
+        var removed = 0
+        var failure: Error?
+        for url in files {
+            do { try fm.removeItem(at: url); removed += 1 }
+            catch { failure = error }
+        }
+        lock.unlock()
+        for done in waiting { done(.failure(CraftNativeActionError(code: "CANCELLED", message: "The video cache was cleared"))) }
+        if let failure { throw failure }
+        return removed
+    }
+
     /// Removes every copy whose address is not in `keep`; answers how many.
     static func prune(keep: [String]) -> Int {
         lock.lock()

package/templates/CraftNativeScreen.swift

@@ -5416,6 +5416,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             guard !isAppScript, navigationController?.topViewController === self,
                   let screen = payload["screen"] as? String, !screen.isEmpty,
                   let navigation = navigationController else { return }
+            if type == "NAVIGATE_REPLACE", screen.hasPrefix("/") {
+                hybridEvents?.nativeScreen(self, replace: screen)
+                return
+            }
             let params = payload["params"] as? [String: Any] ?? [:]
             let next = CraftNativeScreenController(config: config, routeName: screen, routeParams: params)
             next.hybridEvents = hybridEvents
@@ -6067,7 +6071,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if let current = image.image { image.image = imageForDisplay(current, view: image) }
             let requestedResizeMode = style["resizeMode"] as? String ?? props["resizeMode"] as? String
             image.contentMode = imageContentMode(requestedResizeMode)
-            image.clipsToBounds = image.contentMode == .scaleAspectFill
+            image.clipsToBounds = image.clipsToBounds || image.contentMode == .scaleAspectFill
             updateAuxiliaryHandler(events["onLoadStart"], in: &imageLoadStartHandlers, for: image)
             updateAuxiliaryHandler(events["onLoad"], in: &imageLoadHandlers, for: image)
             updateAuxiliaryHandler(events["onLoadEnd"], in: &imageLoadEndHandlers, for: image)
@@ -6086,7 +6090,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if let current = background.image { background.image = imageForDisplay(current, view: background) }
             let requestedResizeMode = style["resizeMode"] as? String ?? props["resizeMode"] as? String
             background.contentMode = imageContentMode(requestedResizeMode)
-            background.clipsToBounds = background.contentMode == .scaleAspectFill
+            background.clipsToBounds = background.clipsToBounds || background.contentMode == .scaleAspectFill
             updateAuxiliaryHandler(events["onLoadStart"], in: &imageLoadStartHandlers, for: background)
             updateAuxiliaryHandler(events["onLoad"], in: &imageLoadHandlers, for: background)
             updateAuxiliaryHandler(events["onLoadEnd"], in: &imageLoadEndHandlers, for: background)
@@ -7006,6 +7010,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         view.clipsToBounds = overflow == "hidden"
             || (view is UIScrollView && overflow != "visible")
             || (view is UILabel && (view.craftRequestedCornerRadius ?? 0) > 0)
+            || (view is UIImageView && (borderRadius > 0 || hasCornerRadii))
         view.layer.masksToBounds = view.clipsToBounds
         view.craftLayoutStyle = CraftNativeLayoutStyle(style)
         (view as? CraftNativeFlowView)?.invalidateMeasurements()