craft-native 0.0.198 → 0.0.200

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

@@ -917,7 +917,7 @@ internal object CraftNativeMedia {
     }
 
     fun local(context: Context, address: String): File? =
-        address.takeIf { it.isNotBlank() }?.let { file(context, it) }?.takeIf(File::exists)
+        address.takeIf { it.isNotBlank() }?.let { file(context, it) }?.takeIf { it.isFile && it.length() > 0 }
 
     private fun describe(address: String, file: File) = JSONObject().put("ok", true).put("url", address).put("path", file.absolutePath).put("size", file.length())
 
@@ -951,15 +951,24 @@ internal object CraftNativeMedia {
                 headers.keys().forEach { name -> connection.setRequestProperty(name, headers.optString(name)) }
                 try {
                     val status = connection.responseCode
-                    if (status !in 200..299) return@runCatching CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("status", status))
+                    if (status != 200) return@runCatching CraftNativeCapabilityResult(data = JSONObject().put("ok", false).put("url", address).put("status", status))
                     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, "${java.util.UUID.randomUUID()}.part")
-                    connection.inputStream.use { input -> staging.outputStream().use { input.copyTo(it) } }
-                    if (!staging.renameTo(target)) {
+                    val staging = File(target.parentFile, "${target.name}.part")
+                    try {
+                        val size = connection.inputStream.use { input -> staging.outputStream().use { input.copyTo(it) } }
+                        val expected = connection.contentLengthLong
+                        if (size <= 0 || (expected >= 0 && size != expected)) {
+                            return@runCatching CraftNativeCapabilityResult(code = "NETWORK_ERROR", message = "media.keep received an incomplete file")
+                        }
+                        synchronized(inFlight) {
+                            if (!staging.renameTo(target)) {
+                                return@runCatching CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file")
+                            }
+                        }
+                    } finally {
                         staging.delete()
-                        return@runCatching CraftNativeCapabilityResult(code = "IO_ERROR", message = "media.keep could not store the file")
                     }
                     CraftNativeCapabilityResult(data = describe(address, target))
                 } finally {
@@ -983,7 +992,14 @@ internal object CraftNativeMedia {
     fun prune(context: Context, keep: List<String>): Int {
         val wanted = keep.map { file(context, it).name }.toSet()
         var removed = 0
-        root(context).listFiles()?.forEach { file -> if (file.name !in wanted && file.delete()) removed++ }
+        synchronized(inFlight) {
+            // A concurrent keep owns its target and staging file until it finishes.
+            val active = inFlight.keys.map { file(context, it).name }.toSet()
+            root(context).listFiles()?.forEach { file ->
+                val target = file.name.removeSuffix(".part")
+                if (target !in active && file.name !in wanted && file.delete()) removed++
+            }
+        }
         return removed
     }
 

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.198";
+var version = "0.0.200";
 
 // 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.198";
+var version = "0.0.200";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -10403,11 +10403,17 @@ ${e.stdout ?? ""}`;
   };
 }
 async function verifyBundleTrust(appPath, policy = {}) {
-  const identity = await readBundleIdentity(appPath);
-  const requireNotarized = policy.requireNotarized ?? true;
   if (!import_fs3.existsSync(appPath)) {
-    return { ok: false, identity, gatekeeperSource: null, reason: "unreadable", detail: `No such bundle: ${appPath}` };
+    return {
+      ok: false,
+      identity: { identifier: null, teamId: null, authority: null },
+      gatekeeperSource: null,
+      reason: "unreadable",
+      detail: `No such bundle: ${appPath}`
+    };
   }
+  const identity = await readBundleIdentity(appPath);
+  const requireNotarized = policy.requireNotarized ?? true;
   try {
     await execFileAsync("codesign", ["--verify", "--deep", "--strict", "--verbose=2", appPath]);
   } catch (error) {

package/dist/index.js

@@ -57,7 +57,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.198";
+var version = "0.0.200";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -10162,11 +10162,17 @@ ${e.stdout ?? ""}`;
   };
 }
 async function verifyBundleTrust(appPath, policy = {}) {
-  const identity = await readBundleIdentity(appPath);
-  const requireNotarized = policy.requireNotarized ?? true;
   if (!existsSync4(appPath)) {
-    return { ok: false, identity, gatekeeperSource: null, reason: "unreadable", detail: `No such bundle: ${appPath}` };
+    return {
+      ok: false,
+      identity: { identifier: null, teamId: null, authority: null },
+      gatekeeperSource: null,
+      reason: "unreadable",
+      detail: `No such bundle: ${appPath}`
+    };
   }
+  const identity = await readBundleIdentity(appPath);
+  const requireNotarized = policy.requireNotarized ?? true;
   try {
     await execFileAsync("codesign", ["--verify", "--deep", "--strict", "--verbose=2", appPath]);
   } catch (error) {

package/dist/ios/templates/CraftHybrid.swift

@@ -1022,6 +1022,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     private var tabBarHeight: CGFloat = 0
     private var tabSwipeRecognizers: [UIGestureRecognizer] = []
     private var activeTabSwipeTarget: String?
+    private var tabSwipeSettling = false
     /// 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.
@@ -1077,6 +1078,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     }
 
     @objc private func tabSwipeRecognized(_ recognizer: UIPanGestureRecognizer) {
+        guard !tabSwipeSettling else { return }
         let tabs = hybrid.tabIds
         guard let index = tabs.firstIndex(of: currentTab), tabs.count > 1 else { return }
         let translation = recognizer.translation(in: view).x
@@ -1101,9 +1103,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
                 CraftChrome.shared.swipe(to: tabs[next])
                 return
             }
-            activeTabSwipeTarget = nil
-            let complete = recognizer.state == .ended && (abs(translation) >= max(32, view.bounds.width * 0.28) || abs(velocity) > 700)
+            // Keep the target until the settling animation has read it and
+            // finished. Clearing it here made finishInteractiveTabSwipe return
+            // early, leaving cancelled screens offset and completed swipes
+            // jumping straight to their destination.
+            tabSwipeSettling = true
+            let direction: CGFloat = tabSwipeFrom > 0 ? -1 : 1
+            let progress = translation * direction
+            let speed = velocity * direction
+            let complete = recognizer.state == .ended && speed > -700
+                && (progress >= max(32, view.bounds.width * 0.28) || speed > 700)
             finishInteractiveTabSwipe(completed: complete) { [weak self] in
+                self?.activeTabSwipeTarget = nil
+                self?.tabSwipeSettling = false
                 guard complete else {
                     CraftChrome.shared.cancelTabSwipe()
                     return
@@ -1121,8 +1133,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     /// transparent until its page route catches up. Two web roots still use
     /// the route-aware fallback because one WebView cannot render both pages.
     private func beginInteractiveTabSwipe(to id: String, direction: CGFloat) -> Bool {
-        guard let current = visibleStack, let target = stacks[id],
-              current.view !== target.view,
+        guard let current = visibleStack, view.bounds.width > 0 else { return false }
+        let target: UINavigationController
+        if let mounted = stacks[id] {
+            target = mounted
+        } else {
+            // A native tab must also follow the first swipe to it. Do not
+            // create a second web root here: the shared WebView cannot draw
+            // both pages during the same gesture.
+            guard hybrid.routes.match(id) != nil else { return false }
+            target = makeStack(tab: id, rootPath: id)
+            (target.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(false)
+        }
+        guard current.view !== target.view,
               !(current.topViewController is CraftHybridWebSlot && target.topViewController is CraftHybridWebSlot),
               view.bounds.width > 0 else { return false }
         if let slot = target.topViewController as? CraftHybridWebSlot {
@@ -1155,7 +1178,11 @@ 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 offset = min(width, max(-width, translation))
+        // Reversing past the start stays at zero progress, rather than
+        // pulling both screens away and exposing the background.
+        let offset = tabSwipeFrom > 0
+            ? min(0, max(-width, translation))
+            : max(0, min(width, translation))
         target.view.frame.origin.x = tabSwipeFrom + offset
         current.view.frame.origin.x = offset
     }
@@ -1164,14 +1191,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard let targetId = activeTabSwipeTarget, let current = visibleStack,
               let target = stacks[targetId] else { completion(); return }
         let width = view.bounds.width
-        let direction: CGFloat = target.view.frame.minX >= 0 ? 1 : -1
+        let direction: CGFloat = tabSwipeFrom > 0 ? 1 : -1
         let end = completed ? 0 : direction * width
-        let duration = CraftChrome.motion(.easeOut(duration: completed ? 0.22 : 0.18)) == nil ? 0 : 0.22
-        UIView.animate(withDuration: duration, animations: {
+        let settlingDuration = completed ? 0.22 : 0.18
+        let duration = CraftChrome.motion(.easeOut(duration: settlingDuration)) == nil ? 0 : settlingDuration
+        UIView.animate(withDuration: duration, delay: 0, options: [.curveEaseOut, .beginFromCurrentState], animations: {
             target.view.frame.origin.x = end
             current.view.frame.origin.x = completed ? -direction * width : 0
         }, completion: { _ in
-            if !completed {
+            if completed {
+                current.view.isHidden = true
+                current.view.frame = self.view.bounds
+                target.view.frame = self.view.bounds
+            } else {
                 target.view.isHidden = true
                 target.view.frame = self.view.bounds
                 current.view.frame = self.view.bounds
@@ -1690,7 +1722,8 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         if tabSwipeRecognizers.contains(where: { $0 === gestureRecognizer }) {
-            guard hybrid.tabIds.count > 1, let nav = visibleStack, let top = nav.topViewController else { return false }
+            guard activeTabSwipeTarget == nil, !tabSwipeSettling,
+                  hybrid.tabIds.count > 1, let nav = visibleStack, let top = nav.topViewController else { return false }
             guard CraftChrome.shared.tabSwipeEnabled else { return false }
             // Only between the tabs' own first screens, as the bar shows them:
             // deeper in a tab a swipe to the right is Back, and a screen that

package/dist/ios/templates/CraftNativeFiles.swift

@@ -515,7 +515,7 @@ enum CraftNativeMedia {
     static func local(_ address: String) -> URL? {
         guard !address.isEmpty else { return nil }
         let url = file(for: address)
-        return FileManager.default.fileExists(atPath: url.path) ? url : nil
+        return ((try? url.resourceValues(forKeys: [.fileSizeKey]).fileSize) ?? 0) > 0 ? url : nil
     }
 
     static func describe(_ address: String, _ url: URL) -> [String: Any] {
@@ -545,11 +545,23 @@ enum CraftNativeMedia {
     /// 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> {
-        guard (200..<300).contains(response.statusCode) else {
+        guard response.statusCode == 200 else {
             return .success(["ok": false, "url": address, "status": response.statusCode])
         }
         let fm = FileManager.default
+        // Commit and prune share a lock; neither can remove a file being committed.
+        lock.lock()
+        defer { lock.unlock() }
+        let staging = root.appendingPathComponent(UUID().uuidString + ".part")
+        defer { try? fm.removeItem(at: staging) }
         do {
+            let size = (try location.resourceValues(forKeys: [.fileSizeKey])).fileSize ?? 0
+            // URLSession normally rejects a truncated transfer; also guard this boundary.
+            let expected = response.expectedContentLength
+            let encoded = response.value(forHTTPHeaderField: "Content-Encoding")
+            if size <= 0 || (encoded == nil && expected >= 0 && Int64(size) != expected) {
+                return .failure(CraftNativeActionError(code: "NETWORK_ERROR", message: "media.keep received an incomplete file"))
+            }
             var folder = root
             if !fm.fileExists(atPath: folder.path) {
                 try fm.createDirectory(at: folder, withIntermediateDirectories: true)
@@ -558,7 +570,6 @@ enum CraftNativeMedia {
                 try? folder.setResourceValues(values)
             }
             let target = file(for: address)
-            let staging = root.appendingPathComponent(UUID().uuidString + ".part")
             try fm.moveItem(at: location, to: staging)
             _ = try? fm.removeItem(at: target)
             try fm.moveItem(at: staging, to: target)
@@ -571,10 +582,13 @@ enum CraftNativeMedia {
 
     /// Removes every copy whose address is not in `keep`; answers how many.
     static func prune(keep: [String]) -> Int {
+        lock.lock()
+        defer { lock.unlock() }
         let wanted = Set(keep.map { file(for: $0).lastPathComponent })
         let files = (try? FileManager.default.contentsOfDirectory(at: root, includingPropertiesForKeys: nil)) ?? []
         var removed = 0
-        for url in files where !wanted.contains(url.lastPathComponent) {
+        let active = Set(inFlight.keys.map { file(for: $0).lastPathComponent })
+        for url in files where !wanted.contains(url.lastPathComponent) && !active.contains(url.lastPathComponent) {
             if (try? FileManager.default.removeItem(at: url)) != nil { removed += 1 }
         }
         return removed

package/package.json

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