craft-native 0.0.169 → 0.0.171

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

@@ -109,7 +109,7 @@ internal class CraftNativeServices(
                 "Speech" -> speech(method, args, done)
                 "Location" -> location(method, args, done)
                 "Media" -> when (method) {
-                    "keep" -> CraftNativeMedia.keep(context, args.optString(0), args.optJSONObject(1)?.optJSONObject("headers") ?: JSONObject(), done)
+                    "keep" -> CraftNativeMedia.keep(context, args.optString(0), args.optJSONObject(1)?.optJSONObject("headers") ?: JSONObject(), args.optJSONObject(1)?.optBoolean("cellular", true) ?: true, done)
                     "path" -> done(success(CraftNativeMedia.local(context, args.optString(0))?.absolutePath ?: JSONObject.NULL))
                     "prune" -> {
                         val keep = args.optJSONArray(0) ?: JSONArray()

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

@@ -808,12 +808,21 @@ internal object CraftNativeMedia {
 
     private fun describe(address: String, file: File) = JSONObject().put("ok", true).put("url", address).put("path", file.absolutePath).put("size", file.length())
 
-    fun keep(context: Context, address: String, headers: JSONObject, done: (CraftNativeCapabilityResult) -> Unit) {
+    /**
+     * `cellular = false` keeps it off a metered connection (mobile data, a
+     * hotspot): nothing is fetched and the answer is `{ ok: false, reason:
+     * "cellular" }`, so the screen can say it is waiting for Wi-Fi. A copy
+     * already kept still answers, whatever the connection.
+     */
+    fun keep(context: Context, address: String, headers: JSONObject, cellular: Boolean, done: (CraftNativeCapabilityResult) -> Unit) {
         val uri = runCatching { Uri.parse(address) }.getOrNull()
         if (uri == null || uri.scheme?.lowercase() !in setOf("http", "https") || uri.host.isNullOrBlank()) {
             return done(CraftNativeCapabilityResult(code = "INVALID_ARGUMENT", message = "media.keep needs an absolute http or https URL"))
         }
         local(context, address)?.let { return done(CraftNativeCapabilityResult(data = describe(address, it))) }
+        if (!cellular && metered(context)) {
+            return done(CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("reason", "cellular")))
+        }
         synchronized(inFlight) {
             inFlight[address]?.let { waiting ->
                 waiting.add(done)
@@ -851,6 +860,12 @@ internal object CraftNativeMedia {
         }
     }
 
+    /** Whether the connection now is one the person pays for by the byte. */
+    private fun metered(context: Context): Boolean = runCatching {
+        val connectivity = context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as android.net.ConnectivityManager
+        connectivity.isActiveNetworkMetered
+    }.getOrDefault(false)
+
     /** Removes every copy whose address is not in `keep`; answers how many. */
     fun prune(context: Context, keep: List<String>): Int {
         val wanted = keep.map { file(context, it).name }.toSet()

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/templates/CraftNativeActions.swift

@@ -647,6 +647,12 @@ enum CraftNativeActions {
     /// offline, fetched once (a copy already there answers at once, and two
     /// screens asking at the same time share one download). A refused answer
     /// (not 2xx) keeps nothing and says its status. Cancelled like fetch.
+    ///
+    /// `cellular: false` keeps it off a metered connection: iOS refuses the
+    /// download on cellular, a personal hotspot and Low Data Mode, and the
+    /// answer is `{ ok: false, reason: "cellular" }` straight away, so the
+    /// screen can say it is waiting for Wi-Fi instead of failing. A copy
+    /// already kept still answers, whatever the connection.
     private static func keepMedia(
         requestToken: String,
         args: [Any],
@@ -675,12 +681,21 @@ enum CraftNativeActions {
                 request.setValue(value, forHTTPHeaderField: name)
             }
         }
+        if options["cellular"] as? Bool == false {
+            request.allowsExpensiveNetworkAccess = false
+            request.allowsConstrainedNetworkAccess = false
+        }
         if CraftNativeMedia.join(address, { complete(requestToken, $0, completion) }) { return }
         let task = fetchSession.downloadTask(with: request) { location, response, error in
             cancellationLock.lock()
             fetchTasks.removeValue(forKey: requestToken)
             cancellationLock.unlock()
             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"]))
+                    return
+                }
                 let code = (error as? URLError)?.code == .timedOut ? "TIMEOUT" : "NETWORK_ERROR"
                 CraftNativeMedia.finish(address, failure(code, error.localizedDescription))
                 return

package/dist/ios/templates/CraftNativeMutation.swift

@@ -150,6 +150,11 @@ final class CraftNativeMutationDocument {
         materialize(id, nodes: nodes)
     }
 
+    /// The committed parent of a node: nil for the root or a node it does not hold.
+    func parentId(of id: String) -> String? {
+        nodes[id]?.parent
+    }
+
     private func createNode(
         _ operation: [String: Any],
         nodes: inout [String: Node],
@@ -291,8 +296,21 @@ final class CraftNativeMutationDocument {
         return values.compactMap { $0 as? String }
     }
 
+    /// Every type the renderer draws children of (CraftNativeScreen's
+    /// reconcile), by the names it accepts (`canonicalType`, so `svg` is
+    /// `Svg`). Only View, SafeAreaView and ScrollView used to be here, so a
+    /// drawing revealed after the first paint (an `:if` around an `<svg>`)
+    /// had its shapes refused as INVALID_PARENT, and the whole screen was
+    /// drawn again; Android's host already took the same list.
+    static let containerTypes: Set<String> = [
+        "View", "SafeAreaView", "ScrollView", "KeyboardAvoidingView", "Modal", "Pressable",
+        "TouchableOpacity", "TouchableHighlight", "ImageBackground", "FlatList", "SectionList",
+        "Fragment", "Svg", "G",
+    ]
+    private static let containerTypeKeys = Set(containerTypes.map { $0.lowercased() })
+
     private func acceptsChildren(_ type: String) -> Bool {
-        type == "View" || type == "SafeAreaView" || type == "ScrollView"
+        Self.containerTypeKeys.contains(type.lowercased())
     }
 
     private func descendants(of id: String, nodes: [String: Node]) -> Set<String> {

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3816,7 +3816,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let focused = firstResponder(in: rootStack) ?? lastFocusedInput
         var applied = Set<String>()
         for id in ids {
-            let target = flatListOwners[id] ?? svgOwners[id] ?? id
+            guard let target = drawnTarget(id) else { return false }
             guard applied.insert(target).inserted else { continue }
             guard let document = mutationDocument.node(target), let previous = renderedNode(target) else { return false }
             let next = reconcile(document, identity: previous.identity, path: target, previous: previous)
@@ -3828,6 +3828,21 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         return true
     }
 
+    /// The drawn node a change to `id` redraws: the list or drawing a row or
+    /// shape belongs to, else the node itself. A node this batch created is
+    /// not drawn yet (a drawing an `:if` just revealed, its shapes inserted
+    /// into it), so its nearest drawn ancestor draws it, rather than the whole
+    /// screen being reconciled again for want of it.
+    private func drawnTarget(_ id: String) -> String? {
+        var current: String? = id
+        while let candidate = current {
+            let target = flatListOwners[candidate] ?? svgOwners[candidate] ?? candidate
+            if renderedNode(target) != nil { return target }
+            current = mutationDocument.parentId(of: candidate)
+        }
+        return nil
+    }
+
     private func renderedNode(_ id: String, below node: RenderedNode? = nil) -> RenderedNode? {
         guard let node = node ?? renderedRoot else { return nil }
         if node.protocolId == id { return node }

package/package.json

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