craft-native 0.0.369 → 0.0.375

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

@@ -222,7 +222,7 @@ internal class CraftNativeCapabilities(
                 "pickVideo" -> pickVideo(requestToken, args, completion)
                 "pickFile" -> pickFile(requestToken, args, completion)
                 "download", "write", "remove" -> networkExecutor.execute {
-                    complete(requestToken, files(requestToken, method, args), completion)
+                    completeFile(requestToken, files(requestToken, method, args), completion)
                 }
                 else -> complete(requestToken, failure("UNKNOWN_ACTION", "Unsupported Files method"), completion)
             }
@@ -492,6 +492,7 @@ internal class CraftNativeCapabilities(
 
     private fun pickVideo(requestToken: String, args: JSONArray, completion: (CraftNativeCapabilityResult) -> Unit) {
         mainHandler.post {
+            if (fileRequestCancelled(requestToken)) return@post
             val host = activity ?: return@post complete(requestToken, failure("NEEDS_ACTIVITY", "No screen is showing to pick from"), completion)
             if (pendingFilePick != null) {
                 complete(requestToken, failure("BUSY", "Another file picker is already open"), completion)
@@ -518,7 +519,7 @@ internal class CraftNativeCapabilities(
     private fun copyVideo(requestToken: String, uri: Uri, limit: Long): CraftNativeCapabilityResult {
         var target: File? = null
         return try {
-            if (cancelled.contains(requestToken)) throw IllegalStateException("CANCELLED: Video selection was cancelled")
+            if (fileRequestCancelled(requestToken)) throw IllegalStateException("CANCELLED: Video selection was cancelled")
             val name = context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
                 if (it.moveToFirst()) it.getString(0) else null
             } ?: "video.mp4"
@@ -535,7 +536,7 @@ internal class CraftNativeCapabilities(
                     while (true) {
                         val count = source.read(buffer)
                         if (count < 0) break
-                        if (cancelled.contains(requestToken)) throw IllegalStateException("CANCELLED: Video selection was cancelled")
+                        if (fileRequestCancelled(requestToken)) throw IllegalStateException("CANCELLED: Video selection was cancelled")
                         size += count
                         require(size <= limit) { "Choose a video under ${limit / 1024 / 1024}MB." }
                         output.write(buffer, 0, count)
@@ -558,6 +559,7 @@ internal class CraftNativeCapabilities(
         completion: (CraftNativeCapabilityResult) -> Unit,
     ) {
         mainHandler.post {
+            if (fileRequestCancelled(requestToken)) return@post
             val host = activity ?: return@post complete(requestToken, failure("NEEDS_ACTIVITY", "No screen is showing to pick from"), completion)
             if (pendingFilePick != null) {
                 complete(requestToken, failure("BUSY", "Another file picker is already open"), completion)
@@ -594,6 +596,7 @@ internal class CraftNativeCapabilities(
 
     private fun pickFile(requestToken: String, args: JSONArray, completion: (CraftNativeCapabilityResult) -> Unit) {
         mainHandler.post {
+            if (fileRequestCancelled(requestToken)) return@post
             val host = activity ?: return@post complete(requestToken, failure("NEEDS_ACTIVITY", "No screen is showing to pick from"), completion)
             if (pendingFilePick != null) {
                 complete(requestToken, failure("BUSY", "Another file picker is already open"), completion)
@@ -674,7 +677,7 @@ internal class CraftNativeCapabilities(
             networkExecutor.execute {
                 val result = data?.data?.let { copyVideo(pending.requestToken, it, pending.videoLimit) }
                     ?: failure("PICKER_FAILED", "The selected video could not be read")
-                complete(pending.requestToken, result, pending.completion)
+                completeFile(pending.requestToken, result, pending.completion)
             }
             return true
         }
@@ -687,30 +690,28 @@ internal class CraftNativeCapabilities(
                     data?.data?.let { add(it) }
                 }.distinct().take(pending.selectionLimit)
                 val result = copyDocuments(pending.requestToken, uris, pending.fileLimit)
-                complete(pending.requestToken, result, pending.completion)
+                completeFile(pending.requestToken, result, pending.completion)
             }
             return true
         }
         networkExecutor.execute {
-            val descriptor = if (pending.source == "camera") {
-                val bitmap = data?.extras?.get("data") as? Bitmap
-                bitmap?.let { writeImage(it, pending.maxPixels, pending.quality, "photo.jpg", pending.requestToken) }
-            } else {
-                val uri = data?.data
-                uri?.let { copyUri(pending.requestToken, it, pending.maxPixels, pending.quality) }
-            }
-            complete(
-                pending.requestToken,
-                descriptor?.let(::success) ?: if (cancelled.contains(pending.requestToken)) failure("CANCELLED", "Image selection was cancelled")
-                else failure("PICKER_FAILED", "The selected image could not be read"),
-                pending.completion,
-            )
+            val result = runCatching {
+                val descriptor = if (pending.source == "camera") {
+                    val bitmap = data?.extras?.get("data") as? Bitmap
+                    bitmap?.let { writeImage(it, pending.maxPixels, pending.quality, "photo.jpg", pending.requestToken) }
+                } else {
+                    data?.data?.let { copyUri(pending.requestToken, it, pending.maxPixels, pending.quality) }
+                }
+                descriptor?.let(::success) ?: if (fileRequestCancelled(pending.requestToken)) failure("CANCELLED", "Image selection was cancelled")
+                else failure("PICKER_FAILED", "The selected image could not be read")
+            }.getOrElse { failure("READ_ERROR", it.message ?: "The selected image could not be read") }
+            completeFile(pending.requestToken, result, pending.completion)
         }
         return true
     }
 
     private fun copyUri(requestToken: String, uri: Uri, maxPixels: Int, quality: Float): JSONObject? {
-        if (cancelled.contains(requestToken)) return null
+        if (fileRequestCancelled(requestToken)) return null
         val name = context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
             if (it.moveToFirst()) it.getString(0) else null
         } ?: "photo"
@@ -729,7 +730,7 @@ internal class CraftNativeCapabilities(
         val copied = JSONArray()
         return try {
             uris.forEach { copied.put(copyDocument(requestToken, it, limit)) }
-            if (cancelled.contains(requestToken)) throw IllegalStateException("CANCELLED: File selection was cancelled")
+            if (fileRequestCancelled(requestToken)) throw IllegalStateException("CANCELLED: File selection was cancelled")
             success(copied)
         } catch (error: Exception) {
             for (index in 0 until copied.length()) {
@@ -745,6 +746,7 @@ internal class CraftNativeCapabilities(
     private fun copyDocument(requestToken: String, uri: Uri, limit: Long): JSONObject {
         var target: File? = null
         return try {
+            if (fileRequestCancelled(requestToken)) throw IllegalStateException("CANCELLED: File selection was cancelled")
             val name = context.contentResolver.query(uri, arrayOf(android.provider.OpenableColumns.DISPLAY_NAME), null, null, null)?.use {
                 if (it.moveToFirst()) it.getString(0) else null
             } ?: "file"
@@ -759,7 +761,7 @@ internal class CraftNativeCapabilities(
                     while (true) {
                         val count = source.read(buffer)
                         if (count < 0) break
-                        if (cancelled.contains(requestToken)) throw IllegalStateException("CANCELLED: File selection was cancelled")
+                        if (fileRequestCancelled(requestToken)) throw IllegalStateException("CANCELLED: File selection was cancelled")
                         size += count
                         require(size <= limit) { "FILE_TOO_LARGE: Choose a file under ${limit / 1024 / 1024}MB." }
                         output.write(buffer, 0, count)
@@ -785,7 +787,7 @@ internal class CraftNativeCapabilities(
     }
 
     private fun writeImage(bitmap: Bitmap, maxPixels: Int, quality: Float, name: String, requestToken: String? = null): JSONObject? {
-        if (requestToken != null && cancelled.contains(requestToken)) {
+        if (requestToken != null && fileRequestCancelled(requestToken)) {
             bitmap.recycle()
             return null
         }
@@ -809,7 +811,7 @@ internal class CraftNativeCapabilities(
             file.parentFile?.deleteRecursively()
             return null
         }
-        if (requestToken != null && cancelled.contains(requestToken)) {
+        if (requestToken != null && fileRequestCancelled(requestToken)) {
             file.parentFile?.deleteRecursively()
             return null
         }
@@ -819,7 +821,7 @@ internal class CraftNativeCapabilities(
     private fun store(bytes: ByteArray, name: String, type: String): CraftNativeCapabilityResult {
         val file = File(fileRoot, UUID.randomUUID().toString()).apply { mkdirs() }.resolve(safeFileName(name))
         return runCatching { file.writeBytes(bytes); success(descriptor(file, type)) }
-            .getOrElse { failure("WRITE_ERROR", it.message ?: "File could not be written") }
+            .getOrElse { file.parentFile?.deleteRecursively(); failure("WRITE_ERROR", it.message ?: "File could not be written") }
     }
 
     private fun descriptor(file: File, type: String): JSONObject = JSONObject()
@@ -860,16 +862,36 @@ internal class CraftNativeCapabilities(
     private fun headerValue(value: String): String = value.replace("\r", "").replace("\n", "")
     private fun validURL(raw: String): URL? = runCatching { URL(raw) }.getOrNull()?.takeIf { it.protocol.lowercase() in setOf("http", "https") && it.host.isNotBlank() }
 
+    private fun fileRequestCancelled(requestToken: String): Boolean =
+        closed.get() || cancelled.contains(requestToken) || Thread.currentThread().isInterrupted
+
+    private fun discardFiles(result: CraftNativeCapabilityResult) {
+        if (result.code != null) return
+        val data = result.data
+        val files = if (data is JSONArray) (0 until data.length()).mapNotNull { data.optJSONObject(it) }
+            else listOfNotNull(data as? JSONObject)
+        files.forEach { file ->
+            ownedFile(file.optString("path"))?.parentFile?.deleteRecursively()
+        }
+    }
+
+    private fun completeFile(requestToken: String, result: CraftNativeCapabilityResult, completion: (CraftNativeCapabilityResult) -> Unit) {
+        complete(requestToken, result, completion, discard = { discardFiles(result) })
+    }
+
     private fun complete(
         requestToken: String,
         result: CraftNativeCapabilityResult,
         completion: (CraftNativeCapabilityResult) -> Unit,
+        discard: (() -> Unit)? = null,
     ) {
-        if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
-            if (!cancelled.remove(requestToken) && !closed.get()) completion(result)
-        } else mainHandler.post {
-            if (!cancelled.remove(requestToken) && !closed.get()) completion(result)
+        val deliver: () -> Unit = {
+            if (cancelled.remove(requestToken) || closed.get()) discard?.invoke()
+            else completion(result)
         }
+        if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+            deliver()
+        } else mainHandler.post { deliver() }
     }
 
     private fun storage(method: String, args: JSONArray): CraftNativeCapabilityResult = synchronized(CraftNativeStorage.lock) {

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

@@ -20,7 +20,10 @@ import kotlin.math.min
  * invalidates the previous load. The player is released on every terminal
  * path, including cancellation, decode failure and screen teardown.
  */
-internal class CraftNativeSounds(private val context: Context) {
+internal class CraftNativeSounds(
+    private val context: Context,
+    private val requestFocus: (AudioManager, AudioFocusRequest) -> Int = { manager, request -> manager.requestAudioFocus(request) },
+) {
     private data class Sound(
         val player: MediaPlayer,
         var volume: Float,
@@ -33,6 +36,8 @@ internal class CraftNativeSounds(private val context: Context) {
 
     private val main = Handler(Looper.getMainLooper())
     private val sounds = mutableMapOf<String, Sound>()
+    private var focusSuspended = false
+    private var ducked = false
     private val audioManager by lazy { context.getSystemService(Context.AUDIO_SERVICE) as AudioManager }
     private val focusRequest by lazy {
         AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
@@ -74,12 +79,13 @@ internal class CraftNativeSounds(private val context: Context) {
             emit?.invoke(JSONObject().put("id", id).put("event", "error").put("message", message))
         }
 
-        if (audioManager.requestAudioFocus(focusRequest) != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+        if (requestFocus(audioManager, focusRequest) != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
             settle(failure("AUDIO_FOCUS_DENIED", "Audio focus was denied by the operating system"))
             remove(id)
             emit?.invoke(JSONObject().put("id", id).put("event", "error").put("message", "Audio focus was denied by the operating system"))
             return
         }
+        onAudioFocusChange(AudioManager.AUDIOFOCUS_GAIN)
 
         runCatching {
             player.setAudioAttributes(AudioAttributes.Builder()
@@ -87,7 +93,7 @@ internal class CraftNativeSounds(private val context: Context) {
                 .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
                 .build())
             player.isLooping = options.optBoolean("loop", false)
-            player.setVolume(if (fadeIn > 0) 0f else volume, if (fadeIn > 0) 0f else volume)
+            applyVolume(sound)
             player.setOnPreparedListener {
                 if (sounds[id] !== sound) return@setOnPreparedListener
                 sound.prepared = true
@@ -95,7 +101,7 @@ internal class CraftNativeSounds(private val context: Context) {
                 settle(CraftNativeCapabilityResult(data = true))
                 if (fadeIn > 0) {
                     if (!sound.paused) ramp(sound, volume, fadeIn / 1000.0)
-                    else { sound.volume = volume; player.setVolume(volume, volume) }
+                    else { sound.volume = volume; applyVolume(sound) }
                 }
             }
             player.setOnCompletionListener {
@@ -136,6 +142,7 @@ internal class CraftNativeSounds(private val context: Context) {
 
     fun resume(id: String): Boolean {
         val sound = sounds[id] ?: return false
+        if (focusSuspended) return false
         if (sound.prepared) runCatching { sound.player.start() }.onFailure { return false }
         sound.paused = false
         sound.interrupted = false
@@ -151,7 +158,7 @@ internal class CraftNativeSounds(private val context: Context) {
         if (fade > 0 && !sound.paused) ramp(sound, target, fade / 1000.0)
         else {
             sound.volume = target
-            sound.player.setVolume(target, target)
+            applyVolume(sound)
         }
         return true
     }
@@ -195,7 +202,11 @@ internal class CraftNativeSounds(private val context: Context) {
             sound.player.stop()
         }
         sound.player.release()
-        if (sounds.isEmpty()) audioManager.abandonAudioFocusRequest(focusRequest)
+        if (sounds.isEmpty()) {
+            audioManager.abandonAudioFocusRequest(focusRequest)
+            focusSuspended = false
+            ducked = false
+        }
         val answer = sound.pending
         sound.pending = null
         answer?.invoke(failure("CANCELLED", "Audio playback was stopped or replaced"))
@@ -211,21 +222,28 @@ internal class CraftNativeSounds(private val context: Context) {
                     }
                 }
             }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> sounds.values.toList().forEach { sound ->
-                if (!sound.paused) {
-                    sound.interrupted = true
-                    if (sound.prepared) runCatching { sound.player.pause() }
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
+                focusSuspended = true
+                sounds.values.toList().forEach { sound ->
+                    if (!sound.paused) {
+                        sound.interrupted = true
+                        if (sound.prepared) runCatching { sound.player.pause() }
+                    }
                 }
             }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> sounds.values.toList().forEach { sound ->
-                runCatching { sound.player.setVolume(sound.volume * 0.2f, sound.volume * 0.2f) }
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
+                ducked = true
+                sounds.values.toList().forEach { sound -> runCatching { applyVolume(sound) } }
             }
-            AudioManager.AUDIOFOCUS_GAIN -> sounds.values.toList().forEach { sound ->
-                if (sound.interrupted && !sound.paused) {
-                    sound.interrupted = false
-                    if (sound.prepared) runCatching { sound.player.start() }
-                } else {
-                    runCatching { sound.player.setVolume(sound.volume, sound.volume) }
+            AudioManager.AUDIOFOCUS_GAIN -> {
+                focusSuspended = false
+                ducked = false
+                sounds.values.toList().forEach { sound ->
+                    runCatching { applyVolume(sound) }
+                    if (sound.interrupted && !sound.paused) {
+                        sound.interrupted = false
+                        if (sound.prepared) runCatching { sound.player.start() }
+                    }
                 }
             }
         }
@@ -241,8 +259,8 @@ internal class CraftNativeSounds(private val context: Context) {
                 if (!sounds.containsValue(sound)) return
                 val progress = min(1.0, (android.os.SystemClock.uptimeMillis() - began).toDouble() / duration).toFloat()
                 val value = start + (target - start) * progress
-                sound.player.setVolume(value, value)
                 sound.volume = value
+                applyVolume(sound)
                 if (progress >= 1f) {
                     sound.fade = null
                     done?.invoke()
@@ -256,5 +274,12 @@ internal class CraftNativeSounds(private val context: Context) {
         main.post(tick)
     }
 
+    private fun outputVolume(sound: Sound): Float = sound.volume * if (ducked) 0.2f else 1f
+
+    private fun applyVolume(sound: Sound) {
+        val value = outputVolume(sound)
+        sound.player.setVolume(value, value)
+    }
+
     private fun failure(code: String, message: String) = CraftNativeCapabilityResult(code = code, message = message)
 }

package/dist/api/mobile.d.ts

@@ -1774,7 +1774,7 @@ export interface HealthLiveWorkoutEvent {
     message?: string;
 }
 /** The health reads and writes a host may or may not have, depending on the app build it runs in. */
-export type HealthReadMethod = 'getWorkouts' | 'getDailyStatistics' | 'getHeartRateSamples' | 'getSamples' | 'getSleepIntervals' | 'saveData' | 'saveMindfulSession' | 'getMindfulSessions' | 'startHeartRateUpdates' | 'stopHeartRateUpdates' | 'startWorkout' | 'pauseWorkout' | 'resumeWorkout' | 'endWorkout';
+export type HealthReadMethod = 'getWorkouts' | 'getDailyStatistics' | 'getHeartRateSamples' | 'getSamples' | 'getSleepIntervals' | 'saveData' | 'saveMindfulSession' | 'getMindfulSessions' | 'startHeartRateUpdates' | 'stopHeartRateUpdates' | 'startWorkout' | 'pauseWorkout' | 'resumeWorkout' | 'endWorkout' | 'discardWorkout';
 export declare const health: {
     /**
      * Whether this app build answers `method`. An app installed before a read
@@ -1834,6 +1834,8 @@ export declare const health: {
     resumeWorkout(): Promise<boolean>;
     /** Ends and saves the current live workout. */
     endWorkout(): Promise<HealthLiveWorkoutResult>;
+    /** iOS: ends the live session without saving a workout. Does not delete existing health samples. */
+    discardWorkout(): Promise<boolean>;
     /** Receives OS workout state transitions; returns the unsubscribe. */
     onWorkout(callback: (event: HealthLiveWorkoutEvent) => void): () => void;
     /**

package/dist/cli.js

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

package/dist/components/index.d.ts

@@ -790,6 +790,8 @@ export interface SwitchProps extends BaseProps {
     };
     thumbColor?: string;
     ios_backgroundColor?: string;
+    /** iOS-only solid UIControl switch: opaque thumb and immediate transitions. Defaults to native UISwitch. */
+    ios_solid?: boolean;
 }
 export interface CheckboxProps extends BaseProps {
     style?: StyleValue<ViewStyle>;

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/src/index.d.ts

@@ -408,6 +408,8 @@ export interface InitOptions {
      * monorepo dev loop uses.
      */
     runtimeDir?: string | null;
+    /** Explicit Craft Zig source package for a per-app runtime build (or CRAFT_IOS_RUNTIME_SOURCE). */
+    runtimeSource?: string | null;
 }
 export interface BuildOptions {
     htmlPath?: string;
@@ -422,6 +424,8 @@ export interface BuildOptions {
      * leaves whatever `init` installed exactly as it is.
      */
     runtimeDir?: string | null;
+    /** Rebuild the installed runtime from this source using the app's current feature flags. */
+    runtimeSource?: string | null;
 }
 /**
  * Run the app's declared generator hook without invoking a shell.
@@ -498,7 +502,7 @@ export declare function renderRuntimeSettings(): string;
  * behind the `CRAFT_SCHEDULED_WORKOUTS` condition, so an app that does not
  * schedule workouts does not link it. `$(inherited)` keeps Debug's `DEBUG`.
  */
-export declare function renderFeatureSettings(config: Pick<CraftConfig, 'enableScheduledWorkouts'>): string;
+export declare function renderFeatureSettings(config: Partial<CraftConfig>): string;
 export declare function renderPrivacyManifest(config: CraftConfig): string;
 /**
  * Whether a PNG carries an alpha channel, from its header: colour type 4
@@ -563,7 +567,7 @@ export declare function resolveRuntimeDir(override?: string | null): string | nu
  *
  * Returns true when a runtime was installed.
  */
-export declare function installRuntime(output: string, runtimeDir: string): Promise<boolean>;
+export declare function installRuntime(output: string, runtimeDir: string, config?: CraftConfig): Promise<boolean>;
 /**
  * The identifier an app's display name becomes wherever Xcode or Swift needs
  * one: the project, the target, the product and the `@main` type.