craft-native 0.0.424 → 0.0.436

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

@@ -478,7 +478,7 @@ internal class CraftNativeCapabilities(
         }
         "remove" -> {
             val file = ownedFile(args.optString(0)) ?: return failure("INVALID_ARGUMENT", "files.remove needs a file made by craft.files")
-            success(file.delete())
+            success(removeOwnedFile(file))
         }
         "download" -> download(requestToken, args)
             else -> failure("UNKNOWN_ACTION", "Unsupported Files method")
@@ -802,7 +802,7 @@ internal class CraftNativeCapabilities(
             success(copied)
         } catch (error: Exception) {
             for (index in 0 until copied.length()) {
-                copied.optJSONObject(index)?.optString("path")?.let { ownedFile(it)?.parentFile?.deleteRecursively() }
+                copied.optJSONObject(index)?.optString("path")?.let { ownedFile(it)?.let(::removeOwnedFile) }
             }
             val message = error.message ?: "The selected document could not be read"
             if (message.startsWith("CANCELLED:")) failure("CANCELLED", message.removePrefix("CANCELLED:").trim())
@@ -915,6 +915,18 @@ internal class CraftNativeCapabilities(
         return file.takeIf { it.path.startsWith(root.path + File.separator) }
     }
 
+    /** Delete only a validated owned file; never sweep siblings or the shared root. */
+    private fun removeOwnedFile(file: File): Boolean {
+        // File.delete is non-recursive and reports permission failures. Reject
+        // directories before removal; parent pruning must remain best effort.
+        if (!runCatching { file.isFile && file.delete() }.getOrDefault(false)) return false
+        runCatching {
+            val parent = file.parentFile
+            if (parent != null && parent != fileRoot.canonicalFile && parent.isDirectory) parent.delete()
+        }
+        return true
+    }
+
     private fun safeFileName(raw: String): String {
         val name = raw.substringAfterLast('/').substringAfterLast('\\').trim()
         return name.ifBlank { "file" }.replace(Regex("[\\\\/:*?\"<>|\\r\\n]"), "_")
@@ -939,7 +951,7 @@ internal class CraftNativeCapabilities(
         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()
+            ownedFile(file.optString("path"))?.let(::removeOwnedFile)
         }
     }
 

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

@@ -57,13 +57,14 @@ internal class CraftNativeSounds(
         if (id.isBlank()) return done(failure("INVALID_ARGUMENT", "audio.play needs an id"))
         val uri = source(address)
             ?: return done(failure("INVALID_ARGUMENT", "audio.play needs an absolute http, https, file or content URL"))
-        stop(id, 0.0)
-
         val requestedVolume = options.optDouble("volume", 1.0)
         val volume = requestedVolume.takeIf { it.isFinite() }?.coerceIn(0.0, 1.0)?.toFloat()
             ?: return done(failure("INVALID_ARGUMENT", "audio.play volume must be a finite number between 0 and 1"))
         val fadeIn = options.optDouble("fadeIn", 0.0)
         if (!fadeIn.isFinite() || fadeIn < 0) return done(failure("INVALID_ARGUMENT", "audio.play fadeIn must be a non-negative finite number"))
+        // Reject malformed options before cancelling a sound with the same id.
+        // Its player, pending load and cancellation handle still belong to it.
+        stop(id, 0.0)
         val player = MediaPlayer()
         val sound = Sound(player, if (fadeIn > 0) 0f else volume, pending = done)
         sounds[id] = sound

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

@@ -9,6 +9,10 @@ import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
 import android.database.ContentObserver
 import android.content.Intent
 import android.app.PictureInPictureParams
@@ -4683,6 +4687,7 @@ class MainActivity : AppCompatActivity() {
     private val capabilityHandler = Handler(Looper.getMainLooper())
     private var hapticsEnabled = false
     private var clipboardEnabled = false
+    private var shakeEnabled = false
     internal var nativeAppState = "inactive"
         private set
     private var deliveredInitialDeepLink = false
@@ -4755,6 +4760,7 @@ class MainActivity : AppCompatActivity() {
         }.getOrDefault(JSONObject())
         hapticsEnabled = config.optBoolean("enableHaptics", false)
         clipboardEnabled = config.optBoolean("enableClipboard", false)
+        shakeEnabled = config.optBoolean("enableShakeGesture", false)
         // Normally started already by its content provider; this covers a
         // process that skipped providers (instrumentation).
         CraftCrashReporter.start(this)
@@ -6101,9 +6107,7 @@ class MainActivity : AppCompatActivity() {
                 val handler = craftNativeEventName(events, "onPress", "onClick")
                 if (handler.isNotBlank()) screen.handlers[this] = handler else screen.handlers.remove(this)
                 setOnClickListener {
-                    screen.linkTargets[it]?.let { target -> navigateOpen(target); return@setOnClickListener }
-                    val current = screen.handlers[this] ?: return@setOnClickListener
-                    send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                    dispatchNativePress(screen, it)
                 }
             }
             "Button" -> (previous as? Button ?: CraftNativePointerButton(this).apply {
@@ -6877,9 +6881,7 @@ class MainActivity : AppCompatActivity() {
                 control.isClickable = true
                 if (type in setOf("TouchableOpacity", "TouchableHighlight", "Pressable")) {
                     control.setOnClickListener {
-                        screen.linkTargets[it]?.let { target -> navigateOpen(target); return@setOnClickListener }
-                        val current = screen.handlers[it] ?: return@setOnClickListener
-                        send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                        dispatchNativePress(screen, it)
                     }
                     control.setOnTouchListener { view, event ->
                         if (!CraftNativePointers.ownsTouch(view) && event.actionMasked != MotionEvent.ACTION_CANCEL) return@setOnTouchListener false
@@ -6907,9 +6909,7 @@ class MainActivity : AppCompatActivity() {
                                     send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
                                 }
                                 if (event.actionMasked == android.view.MotionEvent.ACTION_UP) {
-                                    screen.linkTargets[view]?.let { target -> navigateOpen(target); return@setOnTouchListener true }
-                                    val current = screen.handlers[view] ?: return@setOnTouchListener true
-                                    send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                                    dispatchNativePress(screen, view)
                                 }
                                 true
                             }
@@ -6920,9 +6920,7 @@ class MainActivity : AppCompatActivity() {
                     control.setOnTouchListener(null)
                     if (screen.pressBaseBackgrounds.containsKey(control)) control.background = screen.pressBaseBackgrounds[control]
                     control.setOnClickListener {
-                        screen.linkTargets[control]?.let { target -> navigateOpen(target); return@setOnClickListener }
-                        val current = screen.handlers[control] ?: return@setOnClickListener
-                        send(screen, "EVENT", JSONObject().put("handlerName", current).put("nativeEvent", JSONObject()))
+                        dispatchNativePress(screen, control)
                     }
                 }
             } else {
@@ -8254,7 +8252,45 @@ class MainActivity : AppCompatActivity() {
         publish("APP_STATE", JSONObject().put("state", nativeAppState))
     }
 
+    // MARK: - Shake gesture (enableShakeGesture)
+
+    /// The accelerometer, watched for a shake while the app is in front, as on
+    /// iOS. Armed on resume and disarmed on pause, because the sensor is the
+    /// whole cost of this feature and nobody can shake a phone at an app they
+    /// cannot see.
+    private var lastShakeAt = 0L
+    private val shakeSensors by lazy { getSystemService(Context.SENSOR_SERVICE) as? SensorManager }
+    private val shakeListener = object : SensorEventListener {
+        override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {}
+        override fun onSensorChanged(event: SensorEvent?) {
+            val reading = event?.values ?: return
+            if (reading.size < 3) return
+            // Android reports m/s^2 with gravity included, so a phone at rest
+            // reads about 9.81. Converted to g to match the iOS threshold and
+            // the force the event carries.
+            val magnitude = kotlin.math.sqrt((reading[0] * reading[0] + reading[1] * reading[1] + reading[2] * reading[2]).toDouble()) / SensorManager.GRAVITY_EARTH
+            if (magnitude < 2.2) return
+            val now = System.currentTimeMillis()
+            // One event per gesture, not one per sample.
+            if (now - lastShakeAt < 2000L) return
+            lastShakeAt = now
+            CraftNativeHub.broadcast("CRAFT_EVENT", JSONObject().put("event", "shake").put("detail", JSONObject().put("force", magnitude)))
+        }
+    }
+
+    private fun armShakeGesture() {
+        if (!shakeEnabled) return
+        val sensor = shakeSensors?.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) ?: return
+        shakeSensors?.registerListener(shakeListener, sensor, SensorManager.SENSOR_DELAY_UI)
+    }
+
+    private fun disarmShakeGesture() {
+        if (!shakeEnabled) return
+        shakeSensors?.unregisterListener(shakeListener)
+    }
+
     override fun onPause() {
+        disarmShakeGesture()
         if (::services.isInitialized) services.pauseVoice()
         nativeAppState = "inactive"
         publish("APP_STATE", JSONObject().put("state", nativeAppState))
@@ -8314,6 +8350,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
+        armShakeGesture()
         if (::services.isInitialized) services.resumed()
     }
 
@@ -8371,6 +8408,18 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    // The authored handler owns navigation. The bridge is asynchronous, so
+    // opening the link as well cannot honor a handler's preventDefault intent.
+    private fun dispatchNativePress(screen: Screen, view: View) {
+        if (!view.isEnabled) return
+        val handler = screen.handlers[view]
+        if (handler != null) {
+            send(screen, "EVENT", JSONObject().put("handlerName", handler).put("nativeEvent", JSONObject()))
+        } else {
+            screen.linkTargets[view]?.let { target -> navigateOpen(target) }
+        }
+    }
+
     private fun send(screen: Screen, type: String, payload: JSONObject, correlationId: String? = null) {
         if (!screen.active) return
         val message = JSONObject().put("type", type).put("payload", payload)

package/dist/browser.js

@@ -317,7 +317,7 @@ async function createBrowserStorage(options) {
   };
   const accountChanged = async () => {
     const next = storage.getItem(tokenKey);
-    if (next === token) {
+    if (next === token && (!transitioning || transition)) {
       await transition;
       return;
     }
@@ -351,7 +351,14 @@ async function createBrowserStorage(options) {
       if (before !== next)
         options.sessionChanged?.(next, before);
     })();
-    await transition;
+    const attempt = transition;
+    try {
+      await attempt;
+    } catch (error) {
+      if (current === revision && transition === attempt)
+        transition = null;
+      throw error;
+    }
   };
   const secureKey = (name) => name === sessionTokenKey ? tokenKey : key(`credential:${name}`);
   return {

package/dist/cli.js

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

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.424";
+var version = "0.0.436";
 
 // 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.424";
+var version = "0.0.436";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

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

@@ -84,6 +84,8 @@ export interface CraftConfig {
     enableAudioRecording?: boolean;
     enableVideoRecording?: boolean;
     enableMotionSensors?: boolean;
+    /** Shaking the phone raises a `shake` event. Arms the accelerometer while the app is in front. */
+    enableShakeGesture?: boolean;
     enableLocalDatabase?: boolean;
     enableBluetooth?: boolean;
     enableNFC?: boolean;

package/dist/ios/src/index.js

@@ -18,7 +18,7 @@ function iosPermissions(config) {
     contacts: config.enableContacts,
     calendar: config.enableCalendar,
     bluetooth: config.enableBluetooth || config.enableHeartRate,
-    motion: config.enableMotionSensors,
+    motion: config.enableMotionSensors || config.enableShakeGesture,
     biometric: config.enableBiometric,
     music: config.enableAppleMusic,
     health: config.enableHealthKit,
@@ -701,6 +701,7 @@ var DEFAULT_CONFIG = {
   enableAudioRecording: false,
   enableVideoRecording: false,
   enableMotionSensors: false,
+  enableShakeGesture: false,
   enableLocalDatabase: false,
   enableBluetooth: false,
   enableNFC: false,

package/dist/ios/templates/CraftApp.swift

@@ -1830,6 +1830,11 @@ struct CraftConfig: Codable {
     var enableAudioRecording: Bool = false
     var enableVideoRecording: Bool = false
     var enableMotionSensors: Bool = false
+    /// Shaking the phone raises a `shake` event, for a report-a-problem
+    /// gesture. Its own flag rather than a corner of `enableMotionSensors`,
+    /// because it arms the accelerometer for as long as the app is in front:
+    /// an app that wanted only the motion API should not pay for that.
+    var enableShakeGesture: Bool = false
     var enableLocalDatabase: Bool = false
     var enableBluetooth: Bool = false
     var enableNFC: Bool = false
@@ -2413,6 +2418,10 @@ struct CraftWebView: UIViewRepresentable {
         private var motionManager: CMMotionManager?
         private var isMotionUpdating = false
 
+        // Shake gesture (enableShakeGesture), armed only while the app is in front
+        private var shakeMotion: CMMotionManager?
+        private var lastShakeAt: Date?
+
         // Bluetooth
         private var centralManager: CBCentralManager?
         private var peripheralManager: CBPeripheralManager?
@@ -2465,6 +2474,8 @@ struct CraftWebView: UIViewRepresentable {
             if config.enableMotionSensors {
                 motionManager = CMMotionManager()
             }
+            // The app starts in front, so the gesture starts armed.
+            armShakeGesture()
             #endif
             if config.enableHealthKit {
                 // Apple Health's heart rate as it arrives
@@ -3866,6 +3877,7 @@ struct CraftWebView: UIViewRepresentable {
         @objc private func appDidEnterBackground(_ notification: Notification) {
             backgroundedAt = Date()
             saveInteractionState()
+            disarmShakeGesture()
         }
 
         @objc private func appDidReceiveMemoryWarning(_ notification: Notification) {
@@ -3997,6 +4009,7 @@ struct CraftWebView: UIViewRepresentable {
         }
 
         @objc private func appWillEnterForeground(_ notification: Notification) {
+            armShakeGesture()
             if recoverOnForeground, let webView {
                 // The page is about to be rebuilt; there is no one to resume.
                 backgroundedAt = nil
@@ -8499,6 +8512,56 @@ struct CraftWebView: UIViewRepresentable {
             #endif
         }
 
+        // MARK: - Shake Gesture
+
+        /// The accelerometer, watched for a shake while the app is in front.
+        ///
+        /// Deliberately not `startDeviceMotionUpdates`: that fuses attitude and
+        /// gravity every sample, and a shake needs neither. Raw acceleration at
+        /// 20 Hz is enough to see one and costs a fraction of the same watch.
+        ///
+        /// Armed on foreground and disarmed on background, because the sensor
+        /// is the whole cost of this feature and nobody can shake a phone at an
+        /// app they cannot see.
+        private func armShakeGesture() {
+            #if CRAFT_PERMISSION_MOTION
+            guard config.enableShakeGesture, shakeMotion == nil else { return }
+            let manager = CMMotionManager()
+            guard manager.isAccelerometerAvailable else { return }
+            manager.accelerometerUpdateInterval = 1.0 / 20.0
+            shakeMotion = manager
+            manager.startAccelerometerUpdates(to: .main) { [weak self] sample, _ in
+                guard let self, let sample else { return }
+                self.readShake(sample.acceleration)
+            }
+            #endif
+        }
+
+        private func disarmShakeGesture() {
+            #if CRAFT_PERMISSION_MOTION
+            shakeMotion?.stopAccelerometerUpdates()
+            shakeMotion = nil
+            #endif
+        }
+
+        #if CRAFT_PERMISSION_MOTION
+        private func readShake(_ force: CMAcceleration) {
+            // Total force, gravity included, so a phone at rest reads 1g and
+            // the threshold is what a deliberate shake adds on top of it. At
+            // 2.2g a pocket, a footfall and setting the phone down are all
+            // below it, which is what a fitness app has to clear.
+            let magnitude = sqrt(force.x * force.x + force.y * force.y + force.z * force.z)
+            guard magnitude >= 2.2 else { return }
+            let now = Date()
+            // One event per gesture, not one per sample. A shake is a second
+            // or two of samples over the threshold, and every one of them
+            // would otherwise be reported as its own shake.
+            if let lastShakeAt, now.timeIntervalSince(lastShakeAt) < 2.0 { return }
+            lastShakeAt = now
+            sendToWeb("shake", data: ["force": magnitude])
+        }
+        #endif
+
         // MARK: - Motion Sensors
         private func startMotionUpdates(interval: Double, callbackId: String?) {
             #if CRAFT_PERMISSION_MOTION

package/dist/ios/templates/CraftNativeMutation.swift

@@ -18,10 +18,22 @@ struct CraftNativeMutationFailure: Error, Equatable {
 struct CraftNativeMutationResult {
     let batchId: String
     let revision: Int
-    let document: [String: Any]?
     let updatedNodeIds: [String]
     let affectedNodeIds: [String]
     let requiresFullRender: Bool
+    private let materialize: () -> [String: Any]?
+    /// The committed tree, built when asked for: a host that redraws only the
+    /// nodes a batch touched never needs the whole tree.
+    var document: [String: Any]? { materialize() }
+
+    init(batchId: String, revision: Int, document: @escaping () -> [String: Any]?, updatedNodeIds: [String], affectedNodeIds: [String], requiresFullRender: Bool) {
+        self.batchId = batchId
+        self.revision = revision
+        self.materialize = document
+        self.updatedNodeIds = updatedNodeIds
+        self.affectedNodeIds = affectedNodeIds
+        self.requiresFullRender = requiresFullRender
+    }
 }
 
 /// Validates and applies versioned native-tree mutations without touching UIKit.
@@ -91,6 +103,8 @@ final class CraftNativeMutationDocument {
         var updatedNodeIds: [String] = []
         var affectedNodeIds: [String] = []
         var requiresFullRender = false
+        // Only an operation that adds, moves or removes nodes can leave one unreachable.
+        var reshaped = false
         for (index, value) in operations.enumerated() {
             guard let operation = value as? [String: Any], let name = operation["op"] as? String else {
                 throw CraftNativeMutationFailure(
@@ -99,6 +113,7 @@ final class CraftNativeMutationDocument {
                     operationIndex: index
                 )
             }
+            if name != "updateNode" { reshaped = true }
             do {
                 switch name {
                 case "createNode":
@@ -147,7 +162,7 @@ final class CraftNativeMutationDocument {
             guard let root = candidateNodes[candidateRoot], root.parent == nil else {
                 throw CraftNativeMutationFailure("INVALID_TREE", "root node must not have a parent")
             }
-            guard descendants(of: candidateRoot, nodes: candidateNodes).count + 1 == candidateNodes.count else {
+            guard !reshaped || descendants(of: candidateRoot, nodes: candidateNodes).count + 1 == candidateNodes.count else {
                 throw CraftNativeMutationFailure("INVALID_TREE", "all nodes must be reachable from the root")
             }
         }
@@ -158,7 +173,7 @@ final class CraftNativeMutationDocument {
         return CraftNativeMutationResult(
             batchId: batchId,
             revision: nextRevision,
-            document: candidateRoot.flatMap { materialize($0, nodes: candidateNodes) },
+            document: { [candidateRoot, candidateNodes, weak self] in candidateRoot.flatMap { self?.materialize($0, nodes: candidateNodes) } },
             updatedNodeIds: updatedNodeIds,
             affectedNodeIds: affectedNodeIds,
             requiresFullRender: requiresFullRender