craft-native 0.0.225 → 0.0.227

package/dist/android/templates/CraftNativeImageCache.kt.template

@@ -100,6 +100,7 @@ internal class CraftNativeImageCache(
             true
         }
         catch (error: Exception) { false }
+        catch (error: OutOfMemoryError) { false }
         finally { staging?.delete() }
     }
 

package/dist/android/templates/CraftNativeServices.kt.template

@@ -120,6 +120,7 @@ internal class CraftNativeServices(
                         done(success(CraftNativeMedia.prune(context, (0 until keep.length()).map { keep.optString(it) })))
                     }
                     "usage" -> done(success(CraftNativeMedia.usage(context)))
+                    "clear" -> done(success(CraftNativeMedia.clear(context)))
                     else -> done(failure("UNKNOWN_ACTION", "Unsupported Media method"))
                 }
                 "Background" -> {

package/dist/android/templates/CraftNativeShell.kt.template

@@ -643,6 +643,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private var accessorySpec: JSONObject? = null
     private val tabViews = mutableListOf<Pair<TextView, TextView>>()
     private val tabIconText = mutableMapOf<String, String>()
+    private val tabTitles = mutableMapOf<String, String>()
+    private val tabAccessibilityLabels = mutableMapOf<String, String>()
+    private val tabIconTints = mutableMapOf<String, Int>()
+    private val tabIconPulses = mutableSetOf<String>()
     private val tabImageURLs = mutableMapOf<String, String>()
     private val tabImages = mutableMapOf<String, android.graphics.drawable.Drawable>()
     private val navButtonSpecs = mutableMapOf<TextView, JSONObject>()
@@ -706,6 +710,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             cell.gravity = Gravity.CENTER
             cell.background = rippleBackground()
             cell.contentDescription = tab.title
+            cell.tag = "craft-tab-${tab.id}"
             val icon = TextView(context)
             icon.text = CraftNativeSymbols.glyph(tab.symbol)
             icon.textSize = 22f
@@ -716,6 +721,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
             val label = TextView(context)
             label.text = tab.title
             label.textSize = 12f
+            label.fontFeatureSettings = "tnum"
             label.gravity = Gravity.CENTER
             label.isSingleLine = true
             cell.addView(icon, LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT))
@@ -844,12 +850,25 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val id = item.optString("id")
         val index = tabs.indexOfFirst { it.id == id }
         if (index < 0) return
-        val cell = tabBar.getChildAt(index)
-        if (item.has("accessibilityLabel")) cell.contentDescription = item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() } ?: tabs[index].title
+        if (item.has("accessibilityLabel")) {
+            tabAccessibilityLabels.remove(id)
+            item.optString("accessibilityLabel").takeUnless { item.isNull("accessibilityLabel") || it.isBlank() }?.let { tabAccessibilityLabels[id] = it.take(160) }
+        }
         if (item.has("iconText")) {
             tabIconText.remove(id)
             item.optString("iconText").takeUnless { item.isNull("iconText") || it.isBlank() }?.let { tabIconText[id] = it.take(8) }
         }
+        if (item.has("title")) {
+            tabTitles.remove(id)
+            item.optString("title").takeUnless { item.isNull("title") || it.isBlank() }?.let { tabTitles[id] = it.take(40) }
+        }
+        if (item.has("iconTint")) {
+            tabIconTints.remove(id)
+            if (!item.isNull("iconTint")) runCatching { Color.parseColor(item.optString("iconTint")) }.getOrNull()?.let { tabIconTints[id] = it }
+        }
+        if (item.has("iconPulse")) {
+            if (item.optBoolean("iconPulse", false)) tabIconPulses.add(id) else tabIconPulses.remove(id)
+        }
         if (item.has("image")) {
             val address = item.optString("image").takeIf { !item.isNull("image") && it.startsWith("https://") }
             if (address != tabImageURLs[id]) {
@@ -896,16 +915,41 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         tabViews.forEachIndexed { index, (icon, label) ->
             tabBar.getChildAt(index).isSelected = index == selectedTab
             val color = if (index == selectedTab) accent else muted
-            val number = tabIconText[tabs[index].id]
-            icon.setTextColor(if (number != null) Color.parseColor("#FF2D55") else color)
+            val id = tabs[index].id
+            val number = tabIconText[id]
+            val iconColor = tabIconTints[id] ?: if (number != null) Color.parseColor("#FF2D55") else color
+            icon.setTextColor(iconColor)
+            label.text = tabTitles[id] ?: tabs[index].title
+            tabBar.getChildAt(index).contentDescription = tabAccessibilityLabels[id] ?: label.text
             label.setTextColor(color)
-            val vector = tabImages[tabs[index].id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, color) else null
+            val vector = tabImages[id] ?: if (number == null) CraftNativeIcons.drawable(context, null, tabs[index].symbol, iconColor) else null
+            val pulse = tabIconPulses.contains(id) && number == null && tabImages[id] == null && hasWindowFocus() && android.animation.ValueAnimator.areAnimatorsEnabled()
+            if (pulse && icon.animation == null) {
+                icon.startAnimation(android.view.animation.AlphaAnimation(1f, 0.55f).apply {
+                    duration = 700
+                    repeatCount = android.view.animation.Animation.INFINITE
+                    repeatMode = android.view.animation.Animation.REVERSE
+                })
+            } else if (!pulse) {
+                icon.clearAnimation()
+                icon.alpha = 1f
+            }
             icon.foreground = vector
             icon.text = if (vector != null) "" else number ?: CraftNativeSymbols.glyph(tabs[index].symbol)
         }
         navButtonSpecs.forEach { (view, spec) -> applyNavButtonTint(view, spec, dark) }
     }
 
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        super.onWindowFocusChanged(hasWindowFocus)
+        if (hasWindowFocus) refreshColors() else tabViews.forEach { (icon, _) -> icon.clearAnimation() }
+    }
+
+    override fun onDetachedFromWindow() {
+        tabViews.forEach { (icon, _) -> icon.clearAnimation() }
+        super.onDetachedFromWindow()
+    }
+
     private fun navButton(button: JSONObject): View {
         val id = button.optString("id")
         val title = button.optString("title")
@@ -1021,7 +1065,8 @@ internal object CraftNativeSymbols {
  * A native Video given an address with a copy here plays the copy.
  */
 internal object CraftNativeMedia {
-    private val inFlight = HashMap<String, MutableList<(CraftNativeCapabilityResult) -> Unit>>()
+    private data class Flight(val id: String, val waiting: MutableList<(CraftNativeCapabilityResult) -> Unit>)
+    private val inFlight = HashMap<String, Flight>()
     private val executor = Executors.newFixedThreadPool(2)
     private val main = Handler(Looper.getMainLooper())
 
@@ -1054,12 +1099,12 @@ internal object CraftNativeMedia {
         if (!cellular && metered(context)) {
             return done(CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("reason", "cellular")))
         }
-        synchronized(inFlight) {
+        val flight = synchronized(inFlight) {
             inFlight[address]?.let { waiting ->
-                waiting.add(done)
+                waiting.waiting.add(done)
                 return
             }
-            inFlight[address] = mutableListOf(done)
+            Flight(java.util.UUID.randomUUID().toString(), mutableListOf(done)).also { inFlight[address] = it }
         }
         executor.execute {
             val result = runCatching {
@@ -1073,7 +1118,7 @@ internal object CraftNativeMedia {
                     val target = file(context, address)
                     target.parentFile?.mkdirs()
                     // Written aside and moved into place, so a half-written file is never played.
-                    val staging = File(target.parentFile, "${target.name}.part")
+                    val staging = File(target.parentFile, "${target.name}.${flight.id}.part")
                     try {
                         val size = connection.inputStream.use { input -> staging.outputStream().use { input.copyTo(it) } }
                         val expected = connection.contentLengthLong
@@ -1081,6 +1126,9 @@ internal object CraftNativeMedia {
                             return@runCatching CraftNativeCapabilityResult(code = "NETWORK_ERROR", message = "media.keep received an incomplete file")
                         }
                         synchronized(inFlight) {
+                            if (inFlight[address]?.id != flight.id) {
+                                return@runCatching CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")
+                            }
                             if (!staging.renameTo(target)) {
                                 return@runCatching CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file")
                             }
@@ -1098,7 +1146,7 @@ internal object CraftNativeMedia {
                 }
                 CraftNativeCapabilityResult(code = if (full) "NO_SPACE" else if (error is java.net.SocketTimeoutException) "TIMEOUT" else "NETWORK_ERROR", message = error.message ?: "media.keep failed")
             }
-            val waiting = synchronized(inFlight) { inFlight.remove(address) ?: mutableListOf() }
+            val waiting = synchronized(inFlight) { if (inFlight[address]?.id == flight.id) inFlight.remove(address)?.waiting.orEmpty() else emptyList() }
             main.post { waiting.forEach { it(result) } }
         }
     }
@@ -1115,12 +1163,31 @@ internal object CraftNativeMedia {
         var removed = 0
         synchronized(inFlight) {
             // A concurrent keep owns its target and staging file until it finishes.
-            val active = inFlight.keys.map { file(context, it).name }.toSet()
+            val active = inFlight.flatMap { (address, flight) ->
+                val name = file(context, address).name
+                listOf(name, "$name.${flight.id}.part")
+            }.toSet()
+            root(context).listFiles()?.forEach { file ->
+                if (file.name !in active && file.name !in wanted && file.delete()) removed++
+            }
+        }
+        return removed
+    }
+
+    /** Invalidates old transfers before deleting files; a later keep starts afresh. */
+    fun clear(context: Context): Int {
+        var removed = 0
+        var failure: java.io.IOException? = null
+        val waiting = synchronized(inFlight) {
+            val callbacks = inFlight.values.flatMap { it.waiting }
+            inFlight.clear()
             root(context).listFiles()?.forEach { file ->
-                val target = file.name.removeSuffix(".part")
-                if (target !in active && file.name !in wanted && file.delete()) removed++
+                if (file.delete()) removed++ else failure = java.io.IOException("The video cache could not be cleared")
             }
+            callbacks
         }
+        main.post { waiting.forEach { it(CraftNativeCapabilityResult(code = "CANCELLED", message = "The video cache was cleared")) } }
+        failure?.let { throw it }
         return removed
     }
 

package/dist/android/templates/MainActivityNative.kt.template

@@ -4091,6 +4091,7 @@ class MainActivity : AppCompatActivity() {
                 show(target)
             } else {
                 host.removeView(target.view)
+                target.view.translationX = 0f
                 current.view.translationX = 0f
                 chrome?.selectTab(currentTab)
                 tabSwipeTarget = null
@@ -4504,6 +4505,11 @@ class MainActivity : AppCompatActivity() {
      * screen shown before hears true (its `navigation.onAppear`).
      */
     private fun show(screen: Screen) {
+        // A retained tab may have been the offscreen preview of a cancelled
+        // swipe, or the outgoing view of a completed swipe. Its animator can
+        // finish after the peer animator, so clear that ownership on display.
+        screen.view.animate().withEndAction(null).setListener(null).cancel()
+        screen.view.translationX = 0f
         // A navigation breadcrumb: the trail a crash report carries.
         if (visibleScreen !== screen) CraftCrashReporter.screenAppeared(screen.route ?: "home")
         val bars = chrome

package/dist/browser.js

@@ -283,6 +283,13 @@ async function createBrowserPlatform(options = {}) {
   };
   const lifetime = new AbortController;
   let account = new AbortController;
+  let mediaTransfers = new AbortController;
+  let mediaWrites = Promise.resolve();
+  const writeMedia = (work) => {
+    const write = mediaWrites.then(work);
+    mediaWrites = write.catch(() => {});
+    return write;
+  };
   let mediaScope = persistence.scope();
   let wakeLock = null;
   let disposed = false;
@@ -365,6 +372,7 @@ async function createBrowserPlatform(options = {}) {
       if (!("caches" in window))
         return url;
       const scope = persistence.scope();
+      const transfer = mediaTransfers.signal;
       const existing = mediaURLs.get(url);
       if (existing)
         return existing;
@@ -372,7 +380,7 @@ async function createBrowserPlatform(options = {}) {
       if (!saved)
         return url;
       const local = URL.createObjectURL(await saved.blob());
-      if (disposed || scope !== persistence.scope()) {
+      if (disposed || transfer.aborted || scope !== persistence.scope()) {
         URL.revokeObjectURL(local);
         return url;
       }
@@ -629,6 +637,25 @@ async function createBrowserPlatform(options = {}) {
       if (module === "Media") {
         if (!("caches" in window))
           return unsupported(module, method);
+        if (method === "clear") {
+          mediaTransfers.abort();
+          mediaTransfers = new AbortController;
+          const name = cacheName();
+          return writeMedia(async () => {
+            const cache2 = await caches.open(name);
+            let removed = 0;
+            for (const entry of await cache2.keys()) {
+              if (await cache2.delete(entry))
+                removed++;
+              const local = mediaURLs.get(entry.url);
+              if (local)
+                URL.revokeObjectURL(local);
+              mediaURLs.delete(entry.url);
+            }
+            return removed;
+          });
+        }
+        signal = AbortSignal.any([signal, mediaTransfers.signal]);
         const cache = await caches.open(cacheName());
         if (method === "keep") {
           const url = String(args[0]);
@@ -646,7 +673,11 @@ async function createBrowserPlatform(options = {}) {
           signal.throwIfAborted();
           const headers = new Headers(response.headers);
           headers.set("x-craft-size", String(body.size));
-          await cache.put(url, new Response(body, { headers, status: response.status }));
+          await writeMedia(async () => {
+            signal.throwIfAborted();
+            await cache.put(url, new Response(body, { headers, status: response.status }));
+            signal.throwIfAborted();
+          });
           return { ok: true, url, path: url, size: body.size };
         }
         if (method === "path")

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.225";
+var version = "0.0.227";
 
 // 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.225";
+var version = "0.0.227";
 
 // 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.225";
+var version = "0.0.227";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftApp.swift

@@ -616,6 +616,10 @@ final class CraftChrome: ObservableObject {
         let symbol: String
         var badge: String?
         var iconText: String? = nil
+        var titleOverride: String? = nil
+        var iconTint: String? = nil
+        var iconPulse = false
+        var displayTitle: String { titleOverride ?? title }
         var accessibilityLabel: String? = nil
         var image: String? = nil
     }
@@ -673,12 +677,21 @@ final class CraftChrome: ObservableObject {
     /// the next screen shown says again. The page's own hideTabBar is apart.
     private(set) var hiddenByScreen = false
 
-    /// Change one tab's icon without replacing tabs, navigation stacks or selection.
+    /// Change one tab's caption or icon without replacing stacks or selection.
     func updateTab(_ item: [String: Any]) {
         guard let id = item["id"] as? String, let index = tabs.firstIndex(where: { $0.id == id }) else { return }
         if item.keys.contains("iconText") {
             tabs[index].iconText = (item["iconText"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) }
         }
+        if item.keys.contains("title") {
+            tabs[index].titleOverride = (item["title"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(40)) }
+        }
+        if item.keys.contains("iconTint") {
+            tabs[index].iconTint = (item["iconTint"] as? String).flatMap { UIColor(hex: $0) == nil ? nil : $0 }
+        }
+        if item.keys.contains("iconPulse") {
+            tabs[index].iconPulse = item["iconPulse"] as? Bool ?? false
+        }
         if item.keys.contains("accessibilityLabel") {
             tabs[index].accessibilityLabel = (item["accessibilityLabel"] as? String).map { String($0.prefix(160)) }
         }
@@ -923,6 +936,7 @@ struct CraftTabBarView: View {
     @ObservedObject private var chrome = CraftChrome.shared
     @Namespace private var selection
     @Environment(\.accessibilityReduceMotion) private var reduceMotion
+    @Environment(\.scenePhase) private var scenePhase
     // Dynamic Type, relative to the styles UIKit's own bar uses. The bar is
     // capped at the largest standard size (below), as UITabBar is; past that
     // a long press shows the large content viewer instead.
@@ -1030,9 +1044,7 @@ struct CraftTabBarView: View {
                                     .minimumScaleFactor(0.7)
                                     .frame(height: iconSize + 6)
                             } else {
-                                Image(systemName: symbol(tab.symbol, selected: isSelected))
-                                    .font(.system(size: iconSize, weight: isSelected ? .semibold : .regular))
-                                    .frame(height: iconSize + 6)
+                                tabSymbol(tab, selected: isSelected)
                             }
                             if let badge = tab.badge {
                                 Text(badge)
@@ -1044,8 +1056,9 @@ struct CraftTabBarView: View {
                                     .offset(x: 10, y: -4)
                             }
                         }
-                        Text(tab.title)
+                        Text(tab.displayTitle)
                             .font(.system(size: labelSize, weight: isSelected ? .semibold : .medium))
+                            .monospacedDigit()
                             .lineLimit(1)
                             .minimumScaleFactor(0.8)
                     }
@@ -1063,9 +1076,10 @@ struct CraftTabBarView: View {
                 .buttonStyle(.plain)
                 .accessibilityShowsLargeContentViewer {
                     Image(systemName: symbol(tab.symbol, selected: isSelected))
-                    Text(tab.title)
+                    Text(tab.displayTitle)
                 }
-                .accessibilityLabel(tab.accessibilityLabel ?? tab.badge.map { "\(tab.title), \($0)" } ?? tab.title)
+                .accessibilityIdentifier("craft-tab-\(tab.id)")
+                .accessibilityLabel(tab.accessibilityLabel ?? tab.badge.map { "\(tab.displayTitle), \($0)" } ?? tab.displayTitle)
                 .accessibilityAddTraits(isSelected ? [.isSelected, .isButton] : .isButton)
             }
         }
@@ -1075,6 +1089,20 @@ struct CraftTabBarView: View {
         chrome.tint.map { Color($0) } ?? Color.primary
     }
 
+    /// Live styling belongs to the icon, leaving selection and the caption clear.
+    @ViewBuilder private func tabSymbol(_ tab: CraftChrome.Tab, selected: Bool) -> some View {
+        let color = tab.iconTint.flatMap { UIColor(hex: $0) }.map { Color($0) } ?? (selected ? selectedColor : Color.primary)
+        let icon = Image(systemName: symbol(tab.symbol, selected: selected))
+            .font(.system(size: iconSize, weight: selected ? .semibold : .regular))
+            .foregroundStyle(color)
+            .frame(height: iconSize + 6)
+        if #available(iOS 17.0, *) {
+            icon.symbolEffect(.pulse, options: .repeating, isActive: tab.iconPulse && !reduceMotion && scenePhase == .active)
+        } else {
+            icon
+        }
+    }
+
     /// The filled variant for the current tab, when the symbol has one.
     private func symbol(_ name: String, selected: Bool) -> String {
         guard selected, !name.hasSuffix(".fill"), UIImage(systemName: "\(name).fill") != nil else { return name }

package/dist/ios/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/dist/ios/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/dist/ios/templates/CraftNativeScreen.swift

@@ -6071,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)
@@ -6090,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)

package/dist/mobile-testing.js

@@ -149,6 +149,8 @@ ${await Bun.file(join(fixtures, "media-cache.swift.fixture")).text()}`);
         print(await run(["xcrun", "simctl", "spawn", simulator, executable, base, "recover"]));
         if (counts.get("/ios/slow.mp4") !== 1)
           throw new Error("iOS duplicate fetch: keep did not coalesce");
+        if (counts.get("/ios/account/slow.mp4") !== 2)
+          throw new Error("iOS account switch did not start a fresh transfer");
         print("PASS: iOS simulator interruption, restart, retry, prune and cached video decode");
       }
     }
@@ -232,6 +234,8 @@ ${await Bun.file(join(fixtures, "media-cache.kt")).text()}`);
         await probe("recover");
         if (counts.get("/android/slow.mp4") !== 1)
           throw new Error("Android duplicate fetch: keep did not coalesce");
+        if (counts.get("/android/account/slow.mp4") !== 2)
+          throw new Error("Android account switch did not start a fresh transfer");
         print("PASS: Android emulator interruption, restart, retry, prune and cached video decode");
       }
     }

package/dist/testing/media-cache/media-cache.kt

@@ -75,10 +75,11 @@ class DownloadProbe : android.app.Instrumentation() {
                 "interrupt" -> {
                     CraftNativeMedia.prune(targetContext, emptyList())
                     CraftNativeMedia.keep(targetContext, restart, JSONObject(), true) {}
-                    val part = File(CraftNativeMedia.file(targetContext, restart).absolutePath + ".part")
+                    val target = CraftNativeMedia.file(targetContext, restart)
+                    fun partial() = target.parentFile!!.listFiles()?.any { it.name.startsWith(target.name + ".") && it.name.endsWith(".part") && it.length() > 0 } == true
                     val until = System.currentTimeMillis() + 25000
-                    while ((!part.exists() || part.length() == 0L) && System.currentTimeMillis() < until) Thread.sleep(25)
-                    check(part.length() > 0, "download is in progress before process death")
+                    while (!partial() && System.currentTimeMillis() < until) Thread.sleep(25)
+                    check(partial(), "download is in progress before process death")
                     android.os.Process.killProcess(android.os.Process.myPid())
                 }
                 "recover" -> {
@@ -111,6 +112,26 @@ class DownloadProbe : android.app.Instrumentation() {
                     check(answers.size == 2 && answers.all { it }, "concurrent downloads coalesce and survive prune")
                     check(root.listFiles()?.none { it.name.endsWith(".part") } != false, "no abandoned staging files remain")
                     CraftNativeMedia.prune(targetContext, emptyList())
+                    val privateVideo = "$base/account/slow.mp4"
+                    val previous = java.util.concurrent.CountDownLatch(1)
+                    var cancelled = false
+                    CraftNativeMedia.keep(targetContext, privateVideo, JSONObject(), true) { cancelled = it.code == "CANCELLED"; previous.countDown() }
+                    val privateTarget = CraftNativeMedia.file(targetContext, privateVideo)
+                    fun downloading() = root.listFiles()?.any { it.name.startsWith(privateTarget.name + ".") && it.name.endsWith(".part") && it.length() > 0 } == true
+                    val deadline = System.currentTimeMillis() + 25000
+                    while (!downloading() && System.currentTimeMillis() < deadline) Thread.sleep(10)
+                    check(downloading(), "the previous athlete's download is in progress before sign-out")
+                    CraftNativeMedia.clear(targetContext)
+                    check(previous.await(5, java.util.concurrent.TimeUnit.SECONDS) && cancelled, "sign-out cancels the previous athlete's download")
+                    check(CraftNativeMedia.local(targetContext, privateVideo) == null, "signed-out video is not playable from cache")
+                    check(keep(privateVideo), "the next athlete downloads the same URL in a new transfer")
+                    val media = android.media.MediaMetadataRetriever()
+                    try {
+                        media.setDataSource(CraftNativeMedia.local(targetContext, privateVideo)!!.absolutePath)
+                        check(media.getFrameAtTime(1000000) != null, "the next athlete's local video decodes after the old download settles")
+                    } finally { media.release() }
+                    CraftNativeMedia.clear(targetContext)
+                    check(CraftNativeMedia.local(targetContext, privateVideo) == null, "sign-out removes the next athlete's cached copy too")
                 }
             }
             result.putString("stream", "${proof}PASS: ${args.getString("phase")} native download probe")

package/dist/testing/media-cache/media-cache.swift.fixture

@@ -17,16 +17,16 @@ var latestTask: URLSessionTask?
 var latestErrorCode: String?
 func start(_ address: String, _ done: @escaping (Bool) -> Void) {
     if let local = CraftNativeMedia.local(address) { done((CraftNativeMedia.describe(address, local)["size"] as? Int ?? 0) > 0); return }
-    if CraftNativeMedia.join(address, { result in
+    guard let flight = CraftNativeMedia.begin(address, { result in
         if case .success(let data) = result { done((data as? [String: Any])?["ok"] as? Bool == true) }
         else if case .failure(let error) = result { latestErrorCode = error.code; done(false) }
-    }) { return }
+    }) else { return }
     let task = URLSession.shared.downloadTask(with: URL(string: address)!) { location, response, error in
         let result: Result<Any, CraftNativeActionError>
         if error != nil { result = .failure(CraftNativeActionError(code: "NETWORK_ERROR", message: "Interrupted")) }
-        else if let location, let response = response as? HTTPURLResponse { result = CraftNativeMedia.store(address, at: location, response: response) }
+        else if let location, let response = response as? HTTPURLResponse { result = CraftNativeMedia.store(address, at: location, response: response, flight: flight) }
         else { result = .failure(CraftNativeActionError(code: "NETWORK_ERROR", message: "No file")) }
-        CraftNativeMedia.finish(address, result)
+        CraftNativeMedia.finish(address, flight: flight, result)
     }
     latestTask = task
     task.resume()
@@ -116,3 +116,19 @@ check(answers == [true, true], "concurrent downloads coalesce and survive prune"
 let parts = (try? fm.contentsOfDirectory(atPath: CraftNativeMedia.root.path))?.filter { $0.hasSuffix(".part") } ?? []
 check(parts.isEmpty, "no abandoned staging files remain")
 _ = CraftNativeMedia.prune(keep: [])
+let privateVideo = base + "/account/slow.mp4"
+var previousAnswer: Bool?
+start(privateVideo) { previousAnswer = $0 }
+let previousTask = latestTask!
+wait { previousTask.countOfBytesReceived > 0 }
+_ = try CraftNativeMedia.clear()
+check(previousAnswer == false && latestErrorCode == "CANCELLED", "sign-out cancels the previous athlete's download")
+check(CraftNativeMedia.local(privateVideo) == nil, "signed-out video is not playable from cache")
+check(keep(privateVideo), "the next athlete downloads the same URL in a new transfer")
+wait { previousTask.state == .completed }
+let cached = CraftNativeMedia.local(privateVideo)!
+let generator = AVAssetImageGenerator(asset: AVURLAsset(url: cached))
+_ = try generator.copyCGImage(at: CMTime(seconds: 1, preferredTimescale: 600), actualTime: nil)
+check(true, "the next athlete's local video decodes after the old download settles")
+_ = try CraftNativeMedia.clear()
+check(CraftNativeMedia.local(privateVideo) == nil, "sign-out removes the next athlete's cached copy too")

package/package.json

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