craft-native 0.0.223 → 0.0.225

package/dist/android/src/index.js

@@ -549,6 +549,7 @@ function writeNativeShellSources(output, packagePath, packageName, config) {
   };
   write("CraftBluetooth.kt.template", "CraftBluetooth.kt");
   write("CraftNativeShell.kt.template", "CraftNativeShell.kt");
+  write("CraftNativeImageCache.kt.template", "CraftNativeImageCache.kt");
   write("CraftNativeBackground.kt.template", "CraftNativeBackground.kt");
   write(config.enableHealthConnect ? "CraftNativeHealth.kt.template" : "CraftNativeHealthStub.kt.template", "CraftNativeHealth.kt");
   write("CraftNativeServices.kt.template", "CraftNativeServices.kt", (source) => source.replace("{{NATIVE_PUSH_IMPORTS}}", config.enablePushNotifications ? "import com.google.firebase.messaging.FirebaseMessaging" : "").replace("{{NATIVE_PUSH_REGISTER}}", config.enablePushNotifications ? `        try {

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

@@ -0,0 +1,141 @@
+package {{PACKAGE_NAME}}
+
+import java.io.File
+import java.io.BufferedInputStream
+import java.io.DataInputStream
+import java.io.DataOutputStream
+import java.io.IOException
+import java.io.OutputStream
+import java.security.MessageDigest
+import java.util.Locale
+
+internal data class CraftNativeImagePolicy(val expiresAt: Long)
+
+internal fun craftNativeImagePolicy(
+    requestHeaders: Map<String, String>,
+    responseHeaders: Map<String, List<String>>,
+    now: Long,
+): CraftNativeImagePolicy? {
+    // Persist only the anonymous content the server explicitly calls public.
+    // A custom header can carry an account credential just like Authorization.
+    if (requestHeaders.isNotEmpty()) return null
+    fun values(name: String) = responseHeaders.entries
+        .filter { it.key.equals(name, ignoreCase = true) }.flatMap { it.value }
+    val variants = values("Vary").flatMap { it.split(',') }.map { it.trim().lowercase(Locale.ROOT) }
+    if (values("Set-Cookie").isNotEmpty() || variants.any { it in setOf("*", "cookie", "authorization") }) return null
+    val directives = values("Cache-Control").flatMap { it.split(',') }.map { it.trim().lowercase(Locale.ROOT) }
+    if ("public" !in directives || directives.any { it.substringBefore('=').trim() in setOf("private", "no-store", "no-cache") }) return null
+    val ages = directives.filter { it.substringBefore('=').trim() == "max-age" }
+    if (ages.isEmpty()) return null
+    val seconds = ages.map {
+        it.substringAfter('=', "").trim().removeSurrounding("\"").toLongOrNull()?.takeIf { age -> age > 0 } ?: return null
+    }.min().coerceAtMost(31_536_000L)
+    val ageHeader = values("Age").firstOrNull()
+    val age = if (ageHeader == null) 0L else ageHeader.trim().toLongOrNull()?.takeIf { it >= 0 } ?: return null
+    val remaining = seconds - age
+    if (remaining <= 0) return null
+    return runCatching { CraftNativeImagePolicy(Math.addExact(now, remaining * 1000)) }.getOrNull()
+}
+
+internal class CraftNativeImageCache(
+    private val root: File,
+    private val maxBytes: Long = 32L * 1024 * 1024,
+    private val maxEntryBytes: Long = 8L * 1024 * 1024,
+    private val maxEntries: Int = 128,
+    private val now: () -> Long = System::currentTimeMillis,
+) {
+    init {
+        require(maxBytes > 0 && maxEntryBytes > 0 && maxEntries > 0)
+        // A process killed while encoding can leave a staging file behind.
+        // All instances share this lock, so another writer cannot own it now.
+        synchronized(lock) {
+            runCatching {
+                root.listFiles().orEmpty().filter { it.name.endsWith(".tmp") }.forEach(File::delete)
+                prune()
+            }
+        }
+    }
+
+    private fun file(address: String): File {
+        val digest = MessageDigest.getInstance("SHA-256").digest(address.toByteArray(Charsets.UTF_8))
+        val name = digest.joinToString("") { (it.toInt() and 255).toString(16).padStart(2, '0') }
+        return File(root, "$name.cache")
+    }
+
+    fun read(address: String): ByteArray? = synchronized(lock) {
+        runCatching {
+            val target = file(address)
+            if (!target.isFile) return@runCatching null
+            if (target.length() <= HEADER_BYTES || target.length() > HEADER_BYTES + minOf(maxEntryBytes, maxBytes)) {
+                target.delete()
+                return@runCatching null
+            }
+            val data = DataInputStream(BufferedInputStream(target.inputStream())).use { input ->
+                if (input.readInt() != MAGIC || input.readLong() <= now()) null else input.readBytes()
+            }
+            if (data == null || data.isEmpty()) { target.delete(); null }
+            else { target.setLastModified(now()); data }
+        }.getOrNull()
+    }
+
+    fun write(address: String, policy: CraftNativeImagePolicy, encode: (OutputStream) -> Boolean): Boolean = synchronized(lock) {
+        var staging: File? = null
+        try {
+            if (policy.expiresAt <= now() || (!root.isDirectory && !root.mkdirs())) return@synchronized false
+            val target = file(address)
+            staging = File.createTempFile(target.name, ".tmp", root)
+            staging.outputStream().buffered().use { raw ->
+                val header = DataOutputStream(raw)
+                header.writeInt(MAGIC)
+                header.writeLong(policy.expiresAt)
+                val payload = BoundedImageOutput(raw, minOf(maxEntryBytes, maxBytes))
+                if (!encode(payload) || payload.written == 0L) throw IOException("Incomplete cached image")
+                payload.flush()
+            }
+            // Freshness and pixels are committed together; a failed write
+            // never replaces an earlier, complete image with a partial file.
+            if (!staging.renameTo(target)) return@synchronized false
+            target.setLastModified(now())
+            prune()
+            true
+        }
+        catch (error: Exception) { false }
+        finally { staging?.delete() }
+    }
+
+    fun remove(address: String) = synchronized(lock) { runCatching { file(address).delete() }; Unit }
+
+    private fun prune() {
+        val entries = root.listFiles().orEmpty().filter { entryName.matches(it.name) }.sortedBy(File::lastModified)
+        var count = entries.size
+        var bytes = entries.sumOf { (it.length() - HEADER_BYTES).coerceAtLeast(0) }
+        for (entry in entries) {
+            if (count <= maxEntries && bytes <= maxBytes) break
+            val size = (entry.length() - HEADER_BYTES).coerceAtLeast(0)
+            if (entry.delete()) { count--; bytes -= size }
+        }
+    }
+
+    private class BoundedImageOutput(private val output: OutputStream, private val limit: Long) : OutputStream() {
+        var written = 0L
+            private set
+        override fun write(value: Int) {
+            if (written >= limit) throw IOException("Cached image is too large")
+            output.write(value)
+            written++
+        }
+        override fun write(bytes: ByteArray, offset: Int, length: Int) {
+            if (written + length > limit) throw IOException("Cached image is too large")
+            output.write(bytes, offset, length)
+            written += length
+        }
+        override fun flush() = output.flush()
+    }
+
+    private companion object {
+        const val MAGIC = 0x43494d31
+        const val HEADER_BYTES = 12L
+        val entryName = Regex("^[a-f0-9]{64}\\.cache$")
+        val lock = Any()
+    }
+}

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

@@ -92,6 +92,7 @@ import android.widget.Switch
 import android.widget.TextView
 import android.widget.MediaController
 import android.widget.VideoView
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -121,6 +122,8 @@ import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 import org.json.JSONArray
 import org.json.JSONObject
+import java.io.File
+import java.net.HttpURLConnection
 import java.net.URL
 import java.text.SimpleDateFormat
 import java.util.Calendar
@@ -3804,6 +3807,7 @@ class MainActivity : AppCompatActivity() {
     private var windowSafeInsets = intArrayOf(0, 0, 0, 0)
     private var useMessagePorts = false
     private val imageExecutor = Executors.newFixedThreadPool(2)
+    private val imageCache by lazy { CraftNativeImageCache(File(cacheDir, "craft-native-images")) }
     /** Lays out each isolate's prelude (the synchronous stores) off the main thread. */
     private val preludeExecutor = Executors.newSingleThreadExecutor()
     private val imageSources = mutableMapOf<ImageView, String>()
@@ -3826,6 +3830,9 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         applyConfiguredAppearance()
         super.onCreate(savedInstanceState)
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() = handleNativeBack()
+        })
         initialDeepLink = savedInstanceState?.getString("craft.initialDeepLink")?.let(Uri::parse) ?: intent?.data
         initialDeepLinkClaimed = savedInstanceState?.getBoolean("craft.initialDeepLinkClaimed", false) ?: false
         deliveredInitialDeepLink = savedInstanceState?.getBoolean("craft.deliveredInitialDeepLink", false) ?: false
@@ -3987,8 +3994,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun onBackPressedDispatcherCompat() {
-        @Suppress("DEPRECATION")
-        onBackPressed()
+        onBackPressedDispatcher.onBackPressed()
     }
 
     private fun haptic() {
@@ -4153,13 +4159,22 @@ class MainActivity : AppCompatActivity() {
      * page on the app's site in the in-app browser. Another site's address
      * opens in the browser too.
      */
-    private fun navigateOpen(target: String, fromLink: Boolean = false) {
+    private fun navigateOpen(target: String, fromLink: Boolean = false, replace: Boolean = false) {
         val path = routes.appPath(target, urlSchemes)
         if (path == null) {
             openExternal(target)
             return
         }
         val match = routes.match(path)
+        if (replace && match != null && screens.isNotEmpty()) {
+            val stack = screens
+            val removed = stack.removeAt(stack.lastIndex)
+            val previous = stack.lastOrNull()
+            closeScreen(removed) {
+                if (screens === stack && stack.lastOrNull() === previous) navigateOpen(path, fromLink)
+            }
+            return
+        }
         val tab = routes.tabFor(path)
         if (tab != null) {
             selectTab(routes.tabs.indexOf(tab))
@@ -4767,6 +4782,12 @@ class MainActivity : AppCompatActivity() {
                 // app script has no stack of its own; it uses NAVIGATE_OPEN.
                 if (visibleScreen !== screen) return
                 val route = payload.optString("screen").takeIf { it.isNotBlank() } ?: return
+                // Resolve and replace in one host operation. A pop followed by
+                // open would send the second message from a closing isolate.
+                if (message.optString("type") == "NAVIGATE_REPLACE" && route.startsWith("/")) {
+                    navigateOpen(route, replace = true)
+                    return
+                }
                 if (message.optString("type") == "NAVIGATE_REPLACE") {
                     val stack = screens
                     val removed = stack.removeAt(stack.lastIndex)
@@ -6098,7 +6119,9 @@ class MainActivity : AppCompatActivity() {
             null
         } else defaultBackground
         val overflow = craftNativeOptionalString(style.opt("overflow"))
-        view.clipToOutline = overflow == "hidden"
+        // A replaced image clips its own pixels to border-radius, including
+        // when its surrounding layout permits visible overflow.
+        view.clipToOutline = overflow == "hidden" || (view is ImageView && (radius > 0 || hasCornerRadii))
         if (view is ViewGroup) view.clipChildren = overflow == "hidden"
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P &&
             (style.has("shadowColor") || style.has("shadowOpacity") || style.has("shadowRadius"))
@@ -6496,12 +6519,38 @@ class MainActivity : AppCompatActivity() {
         }
         imageJobs[view] = imageExecutor.submit {
             val bitmap = runCatching {
-                val connection = URL(uri).openConnection().apply {
+                val publicRequest = headers.isEmpty() && Uri.parse(uri).userInfo.isNullOrEmpty()
+                if (publicRequest) {
+                    val bytes = imageCache.read(uri)
+                    if (bytes != null) {
+                        val saved = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
+                        if (saved != null) return@runCatching saved
+                        imageCache.remove(uri)
+                    }
+                }
+                val connection = (URL(uri).openConnection() as HttpURLConnection).apply {
                     connectTimeout = 10_000
                     readTimeout = 10_000
+                    // This loader owns its bounded public cache. Do not let
+                    // an application's global ResponseCache retain requests.
+                    useCaches = false
                     headers.forEach { (name, value) -> setRequestProperty(name, value) }
                 }
-                connection.getInputStream().use(BitmapFactory::decodeStream)
+                try {
+                    val downloaded = connection.inputStream.use(BitmapFactory::decodeStream)
+                    if (publicRequest) {
+                        val responseHeaders = connection.headerFields.entries.filter { it.key != null }
+                            .associate { it.key!! to it.value.orEmpty() }
+                        val policy = if (connection.responseCode == HttpURLConnection.HTTP_OK)
+                            craftNativeImagePolicy(headers, responseHeaders, System.currentTimeMillis()) else null
+                        if (downloaded != null && policy != null) {
+                            // Encode only after a complete decode, then commit
+                            // before onLoad so a cold offline reopen is safe.
+                            imageCache.write(uri, policy) { downloaded.compress(Bitmap.CompressFormat.PNG, 100, it) }
+                        } else imageCache.remove(uri)
+                    }
+                    downloaded
+                } finally { connection.disconnect() }
             }.getOrNull()
             runOnUiThread {
                 if (imageSources[view] != requestKey) return@runOnUiThread
@@ -7286,7 +7335,9 @@ class MainActivity : AppCompatActivity() {
     }
 
     @Deprecated("Uses the activity back callback for native route navigation")
-    override fun onBackPressed() {
+    override fun onBackPressed() = handleNativeBack()
+
+    private fun handleNativeBack() {
         val screen = screens.lastOrNull() ?: return back()
         val modal = screen.modalVisibility.entries.lastOrNull { (view, visible) -> visible && view.visibility == View.VISIBLE }
         if (modal != null) {

package/dist/cli.js

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

package/dist/ios/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/dist/ios/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
@@ -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()

package/package.json

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