craft-native 0.0.198 → 0.0.199

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.199";
 
 // 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.199";
 
 // 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.198";
+var version = "0.0.199";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

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.199",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",