craft-native 0.0.251 → 0.0.262

package/dist/mobile-testing.js

@@ -37,6 +37,16 @@ ${stderr}`.trim() };
 }
 
 // src/mobile-media-testing.ts
+function androidMediaProbeSource(shell) {
+  return ["internal object CraftNativeMedia", "internal class CraftResumableDownload", "internal class CraftNativeMediaWorker"].map((declaration) => {
+    const source = shell.match(new RegExp(`${declaration}\\b[\\s\\S]*?\\n\\}`))?.[0];
+    if (!source)
+      throw new Error(`Android media implementation missing: ${declaration}`);
+    return source;
+  }).join(`
+
+`);
+}
 async function verifyMobileMediaCache(options) {
   if (options.platform !== "ios" && options.platform !== "android")
     throw new Error("Choose ios or android");
@@ -129,7 +139,7 @@ Connection: close\r
         }
         const empty = path.endsWith("/empty.mp4");
         const partial = path.endsWith("/partial.mp4");
-        const cut = (path.endsWith("/broken.mp4") || path.endsWith("/restart.mp4")) && n === 1;
+        const cut = (path.endsWith("/broken.mp4") || path.endsWith("/retry.mp4") || path.endsWith("/restart.mp4")) && n === 1;
         const slow = path.endsWith("/slow.mp4") || path.endsWith("/restart.mp4") && n === 1;
         socket.write(`HTTP/1.1 ${partial ? "206 Partial Content" : "200 OK"}\r
 Content-Type: video/mp4\r
@@ -250,12 +260,7 @@ ${await Bun.file(join(fixtures, "media-cache.swift.fixture")).text()}`);
       if (!/^emulator-\d+$/.test(serial))
         throw new Error("Select a disposable Android emulator with ANDROID_SERIAL");
       const shell = await Bun.file(join(root, "android/templates/CraftNativeShell.kt.template")).text();
-      const pieces = ["internal object CraftNativeMedia {", "internal class CraftResumableDownload(", "internal class CraftNativeMediaWorker("].map((start) => shell.match(new RegExp(`${start.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?\\n\\}`))?.[0]);
-      if (pieces.some((piece) => !piece))
-        throw new Error("Android media implementation missing");
-      const media = pieces.join(`
-
-`);
+      const media = androidMediaProbeSource(shell);
       const android = join(scratch, "android");
       const app = join(android, "app");
       const sources = join(app, "src/main/java/dev/craft/mediaprobe");
@@ -267,9 +272,9 @@ include(":app")`);
       await Bun.write(join(android, "build.gradle.kts"), 'plugins { id("com.android.application") version "8.9.1" apply false; id("org.jetbrains.kotlin.android") version "2.0.21" apply false }');
       await Bun.write(join(android, "local.properties"), `sdk.dir=${sdk}
 `);
-      await Bun.write(join(android, "gradle.properties"), `org.gradle.jvmargs=-Xmx768m
+      await Bun.write(join(android, "gradle.properties"), `android.useAndroidX=true
+org.gradle.jvmargs=-Xmx768m
 org.gradle.workers.max=2
-android.useAndroidX=true
 `);
       await Bun.write(join(app, "build.gradle.kts"), `plugins { id("com.android.application");
   id("org.jetbrains.kotlin.android") }
@@ -291,8 +296,8 @@ import android.os.Handler
 import android.os.Looper
 import org.json.JSONObject
 import java.io.File
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
+import java.util.concurrent.ConcurrentHashMap
 internal data class CraftNativeCapabilityResult(val data: Any? = null, val code: String? = null, val message: String? = null)
 ${media}
 ${await Bun.file(join(fixtures, "media-cache.kt")).text()}`);
@@ -327,6 +332,10 @@ ${await Bun.file(join(fixtures, "media-cache.kt")).text()}`);
         if (counts.get("/android/restart.mp4") !== 1)
           throw new Error("Android process did not start interrupted download");
         await probe("recover");
+        if (counts.get("/android/retry.mp4") !== 2)
+          throw new Error("Android explicit retry did not fetch once more immediately");
+        if (counts.get("/android/settled.mp4") !== 1)
+          throw new Error("Android explicit keep did not replace the settled running attempt exactly once");
         if (!resumed.has("/android/restart.mp4"))
           throw new Error("Android did not resume the interrupted download from its part file");
         if (counts.get("/android/slow.mp4") !== 1)

package/dist/mobile.js

@@ -1725,7 +1725,7 @@ var health = {
       return () => {};
     const listener = (event) => {
       const detail = event.detail;
-      if (detail && typeof detail.id === "string" && (detail.event === "state" || detail.event === "error"))
+      if (detail && typeof detail.id === "string" && (detail.event === "state" || detail.event === "metrics" || detail.event === "error"))
         callback(detail);
     };
     window.addEventListener("craftHealthWorkout", listener);

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

@@ -1,3 +1,14 @@
+/** Holds a completed attempt in RUNNING, before WorkManager commits its result. */
+class SettledMediaAttemptWorker(context: Context, parameters: androidx.work.WorkerParameters) : androidx.work.Worker(context, parameters) {
+    private val released = java.util.concurrent.CountDownLatch(1)
+    override fun doWork(): Result {
+        setProgressAsync(androidx.work.workDataOf("craft.media.attemptSettled" to true)).get()
+        released.await(30, java.util.concurrent.TimeUnit.SECONDS)
+        return Result.retry()
+    }
+    override fun onStopped() { released.countDown() }
+}
+
 class DownloadProbe : android.app.Instrumentation() {
     override fun onCreate(arguments: android.os.Bundle?) {
         super.onCreate(arguments)
@@ -23,6 +34,13 @@ class DownloadProbe : android.app.Instrumentation() {
         check(done.await(25, java.util.concurrent.TimeUnit.SECONDS), "operation settled")
         return ok
     }
+    private fun awaitCached(address: String) {
+        // The worker authors a 30-second first retry. Allow that backoff plus
+        // the existing 25-second transfer budget, without issuing another keep.
+        val until = System.currentTimeMillis() + 60000
+        while (CraftNativeMedia.local(targetContext, address) == null && System.currentTimeMillis() < until) Thread.sleep(25)
+        check(CraftNativeMedia.local(targetContext, address) != null, "the durable worker recovers the complete file without another keep")
+    }
     override fun onStart() {
         val result = android.os.Bundle()
         try {
@@ -80,10 +98,11 @@ class DownloadProbe : android.app.Instrumentation() {
                     val until = System.currentTimeMillis() + 25000
                     while (!partial() && System.currentTimeMillis() < until) Thread.sleep(25)
                     check(partial(), "download is in progress before process death")
+                    check(CraftNativeMedia.local(targetContext, restart) == null, "interrupted process never published a partial video")
                     android.os.Process.killProcess(android.os.Process.myPid())
                 }
                 "recover" -> {
-                    check(CraftNativeMedia.local(targetContext, restart) == null, "interrupted process never published a partial video")
+                    awaitCached(restart)
                     check(keep(restart), "retry after process death downloads a complete video")
                     val media = android.media.MediaMetadataRetriever()
                     try {
@@ -98,12 +117,34 @@ class DownloadProbe : android.app.Instrumentation() {
                     check(!keep(broken), "truncated transfer fails")
                     check(CraftNativeMedia.local(targetContext, broken) == null, "truncated transfer is not playable cache")
                     val root = CraftNativeMedia.file(targetContext, broken).parentFile!!
-                    val brokenTarget = CraftNativeMedia.file(targetContext, broken)
-                    check(root.listFiles()?.none { it.name.endsWith(".part") && it.name != "${brokenTarget.name}.part" } != false, "a failed transfer leaves only its own part, to resume")
-                    check(keep(broken), "same URL retries successfully, at once")
-                    check(root.listFiles()?.none { it.name.endsWith(".part") } != false, "a finished transfer leaves no staging files")
-                    val queued = "$base/queued.mp4"
+                    check(CraftNativeMedia.part(targetContext, broken).length() > 0, "a truncated transfer retains bytes for resumption")
+                    awaitCached(broken)
+                    check(keep(broken), "same URL retries successfully")
+                    val retry = "$base/retry.mp4"
+                    check(!keep(retry), "a separate interrupted transfer reports its failure")
+                    check(keep(retry), "an explicit retry runs immediately, without waiting for backoff")
+                    check(root.listFiles()?.none { it.name.endsWith(".part") } != false, "finished retries leave no staging files")
                     val work = androidx.work.WorkManager.getInstance(targetContext)
+                    val settled = "$base/settled.mp4"
+                    val settledName = "craft-media:${CraftNativeMedia.digest(settled)}:any"
+                    val settledRequest = androidx.work.OneTimeWorkRequestBuilder<SettledMediaAttemptWorker>()
+                        .addTag("craft-media").addTag("craft-media:${CraftNativeMedia.digest(settled)}")
+                        .addTag("craft-media:generation:${CraftNativeMedia.generation(targetContext)}").build()
+                    work.enqueueUniqueWork(settledName, androidx.work.ExistingWorkPolicy.KEEP, settledRequest).result.get()
+                    val settledDeadline = System.currentTimeMillis() + 10000
+                    var settledInfo = work.getWorkInfoById(settledRequest.id).get()!!
+                    while ((settledInfo.state != androidx.work.WorkInfo.State.RUNNING || !settledInfo.progress.getBoolean("craft.media.attemptSettled", false)) && System.currentTimeMillis() < settledDeadline) {
+                        Thread.sleep(25)
+                        settledInfo = work.getWorkInfoById(settledRequest.id).get()!!
+                    }
+                    check(settledInfo.state == androidx.work.WorkInfo.State.RUNNING && settledInfo.progress.getBoolean("craft.media.attemptSettled", false), "the settled attempt still has WorkManager's running identity")
+                    check(keep(settled), "an explicit keep replaces a settled running attempt immediately")
+                    // REPLACE can prune the old WorkSpec. Inspect the current
+                    // unique chain rather than requiring the removed row.
+                    val replacement = work.getWorkInfosForUniqueWork(settledName).get()
+                    check(replacement.size == 1 && replacement.single().id != settledRequest.id && replacement.single().state != androidx.work.WorkInfo.State.CANCELLED, "the settled work identity was replaced, not joined")
+
+                    val queued = "$base/queued.mp4"
                     val queuedName = "craft-media:${CraftNativeMedia.digest(queued)}:any"
                     val queuedRequest = androidx.work.OneTimeWorkRequestBuilder<CraftNativeMediaWorker>()
                         .setInitialDelay(10, java.util.concurrent.TimeUnit.SECONDS)

package/package.json

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