craft-native 0.0.246 → 0.0.248

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

@@ -59,6 +59,7 @@ internal class CraftNativeServices(
     private val activity: () -> Activity?,
 ) {
     private val main = Handler(Looper.getMainLooper())
+    private val heartRateEnabled = config.optBoolean("enableHeartRate")
     private val health: CraftNativeHealth? = if (config.optBoolean("enableHealthConnect")) {
         CraftNativeHealth(context, activity, config.optBoolean("enableHealthConnectBackground"), config.optBoolean("enableHealthConnectHistory"))
     } else null
@@ -78,6 +79,14 @@ internal class CraftNativeServices(
                 CraftNativeHub.broadcast("CRAFT_EVENT", JSONObject().put("event", "craftLocationUpdate").put("detail", craftLocationFix(location).put("recordingId", id)))
             }
         }
+        if (heartRateEnabled) {
+            // The strap's readings and connection changes reach every screen
+            // and the app script as `craftHeartRate`, as on iOS. One sink for
+            // the process: each host sets the same one.
+            CraftHeartRate.get(context).sinks["native"] = { detail ->
+                CraftNativeHub.broadcast("CRAFT_EVENT", JSONObject().put("event", "craftHeartRate").put("detail", detail))
+            }
+        }
     }
 
     /** `background.complete(ok, id)`: who is waiting for a background refresh's answer. */
@@ -104,6 +113,7 @@ internal class CraftNativeServices(
             // `health.grantedTypes()` and `health.openSettings()`.
             add("healthAvailability")
         }
+        if (config.optBoolean("enableWallet")) add("wallet")
         if (config.optBoolean("enableKeepAwake")) add("keepAwake")
         if (config.optBoolean("enableGeolocation") || config.optBoolean("enableBackgroundLocation")) {
             add("geolocation")
@@ -111,13 +121,17 @@ internal class CraftNativeServices(
             if (CraftNative.supportsRecordingIntentIdentity()) add("locationRecordingIntentIdentity")
         }
         if (config.optJSONObject("backgroundRefresh")?.optBoolean("enabled") == true || config.optBoolean("enablePushNotifications")) add("background")
+        // A Bluetooth heart-rate strap (CraftHeartRate.kt), the app's own
+        // service: one connection and one recording for every screen.
+        if (heartRateEnabled) addAll(listOf("heartRate", "heartRateRecordingOwnership", "heartRateRecordingIntentIdentity"))
         // craft.crashReporter: the app's crash and error reporter (bughq).
         if (CraftCrashReporter.enabled) add("crashReporter")
     }
 
     fun handles(module: String): Boolean = module in setOf(
         "Dialog", "Browser", "Linking", "Share", "Push", "Health", "KeepAwake", "Brightness", "StatusBar", "Speech", "Background",
-        "Location", "Media", "CrashReporter",
+        "Location", "Media", "CrashReporter", "HeartRate",
+        "Wallet",
     )
 
     fun perform(module: String, method: String, args: JSONArray, completion: (CraftNativeCapabilityResult) -> Unit) {
@@ -132,11 +146,13 @@ internal class CraftNativeServices(
                 "Share" -> share(args.optJSONObject(0) ?: JSONObject(), done)
                 "Push" -> push(method, done)
                 "Health" -> health?.perform(method, args, done) ?: done(failure("CAPABILITY_DISABLED", "Health Connect is not enabled for this app"))
+                "Wallet" -> wallet(method, args, done)
                 "KeepAwake" -> keepAwake(args.optBoolean(0, true), done)
                 "Brightness" -> brightness(method, args, done)
                 "StatusBar" -> statusBar(args.optString(0, "default"), done)
                 "Speech" -> speech(method, args, done)
                 "Location" -> location(method, args, done)
+                "HeartRate" -> heartRate(method, args, done)
                 "Media" -> when (method) {
                     "keep" -> CraftNativeMedia.keep(context, args.optString(0), args.optJSONObject(1)?.optJSONObject("headers") ?: JSONObject(), args.optJSONObject(1)?.optBoolean("cellular", true) ?: true, done)
                     "path" -> done(success(CraftNativeMedia.local(context, args.optString(0))?.absolutePath ?: JSONObject.NULL))
@@ -163,6 +179,28 @@ internal class CraftNativeServices(
         }
     }
 
+    private fun wallet(method: String, args: JSONArray, done: (CraftNativeCapabilityResult) -> Unit) {
+        if (!config.optBoolean("enableWallet")) return done(failure("CAPABILITY_DISABLED", "Wallet is disabled"))
+        when (method) {
+            "isAvailable" -> done(success(runCatching {
+                context.packageManager.getLaunchIntentForPackage("com.google.android.apps.walletnfcrel") != null
+            }.getOrDefault(false)))
+            "add" -> {
+                val source = args.optJSONObject(0) ?: return done(failure("INVALID_ARGUMENT", "Wallet.add needs a source object"))
+                val address = source.optString("url").trim()
+                if (!address.startsWith("https://")) return done(failure("INVALID_ARGUMENT", "Android Wallet.add needs an HTTPS save URL"))
+                val host = activity() ?: return done(failure("NEEDS_ACTIVITY", "No screen is showing to open Wallet"))
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(address))
+                if (intent.resolveActivity(host.packageManager) == null) return done(failure("UNAVAILABLE", "Google Wallet cannot open this save URL"))
+                runCatching { host.startActivity(intent) }
+                    .onSuccess { done(success(true)) }
+                    .onFailure { done(failure("PRESENTATION_FAILED", it.message ?: "Google Wallet could not open")) }
+            }
+            "has" -> done(failure("UNSUPPORTED", "Google Wallet pass lookup is not available through the save-link API"))
+            else -> done(failure("UNKNOWN_ACTION", "Unsupported Wallet method"))
+        }
+    }
+
     // MARK: Dialogs
 
     private fun dialog(method: String, options: JSONObject, done: (CraftNativeCapabilityResult) -> Unit) {
@@ -363,6 +401,7 @@ internal class CraftNativeServices(
     }
 
     fun onRequestPermissionsResult(requestCode: Int): Boolean {
+        if (heartRateEnabled && CraftHeartRate.get(context).onPermissions(requestCode)) return true
         if (requestCode == LOCATION_PERMISSION_REQUEST) {
             val pending = pendingLocationPermission
             pendingLocationPermission = null
@@ -455,6 +494,25 @@ internal class CraftNativeServices(
         }
     }
 
+    // MARK: Heart rate (CraftHeartRate.kt)
+
+    /**
+     * A Bluetooth heart-rate strap, the same service as a page's
+     * `craft.heartRate`, in the iOS host's names (CraftNativeActions.swift's
+     * HeartRate module). Its events reach every screen as `craftHeartRate`.
+     */
+    private fun heartRate(method: String, args: JSONArray, done: (CraftNativeCapabilityResult) -> Unit) {
+        if (!heartRateEnabled) return done(failure("CAPABILITY_DISABLED", "Heart rate is disabled"))
+        CraftHeartRate.get(context).perform(method, args.optJSONObject(0) ?: JSONObject(), activity()) { result ->
+            result.fold(
+                onSuccess = { done(success(it)) },
+                onFailure = { error ->
+                    done(failure((error as? CraftHeartRateException)?.code ?: "CRAFT_ERROR", error.message ?: "Heart rate failed"))
+                },
+            )
+        }
+    }
+
     // MARK: Crash reporting (CraftCrashReporter.kt)
 
     private fun crashReporter(method: String, args: JSONArray, done: (CraftNativeCapabilityResult) -> Unit) {

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

@@ -447,6 +447,24 @@ internal object CraftNativePrelude {
         // address the host through `window.craft`. Keep native screens
         // compatible without pretending a document exists.
         if (typeof globalThis.window === 'undefined') globalThis.window = globalThis;
+        // JavaScriptSandbox intentionally has no browser URL/encoding
+        // globals. Install named failures instead of letting a shared module
+        // die with an unhelpful `URLSearchParams is not defined` halfway
+        // through its load path. The full browser implementations belong to
+        // the shared STX runtime; these diagnostics keep the native boundary
+        // explicit until that runtime is present.
+        (function() {
+          function unavailable(name, hint) {
+            var failure = function() {
+              throw new ReferenceError(name + ' is not available on a native screen — ' + hint);
+            };
+            failure.prototype.constructor = failure;
+            return failure;
+          }
+          if (typeof globalThis.URL === 'undefined') globalThis.URL = unavailable('URL', 'use an absolute URL or build the path with encodeURIComponent');
+          if (typeof globalThis.URLSearchParams === 'undefined') globalThis.URLSearchParams = unavailable('URLSearchParams', 'build query strings with encodeURIComponent');
+          if (typeof globalThis.TextEncoder === 'undefined') globalThis.TextEncoder = unavailable('TextEncoder', 'use a native-supported encoding helper');
+        })();
         (function() {
           var forward = null;
           var listeners = [];
@@ -671,9 +689,11 @@ internal object CraftNativePrelude {
           // Older native bundles call the page-shaped `craft.dialog` API
           // directly. Keep that API on the capability bridge so JavaScript
           // Core/JavaScriptSandbox screens never fall back to a DOM sheet.
-          if (Array.isArray(__stxNativeBridge.capabilities) && __stxNativeBridge.capabilities.indexOf('dialog') >= 0 && !craft.dialog) {
-            var nextDialogRequest = 0;
-            function dialogRequest(method, args) {
+          // Native capability ownership wins over any browser-shaped dialog
+          // object the bundle installed before the bridge ran. Otherwise an
+          // action sheet silently falls back to the DOM renderer.
+          var nextDialogRequest = 0;
+          function dialogRequest(method, args) {
               return new Promise(function(resolve, reject) {
                 var id = 'craft-dialog-' + (++nextDialogRequest);
                 var remove = __stxNativeBridge.addMessageListener(function(raw) {
@@ -702,13 +722,19 @@ internal object CraftNativePrelude {
                   },
                 }));
               });
+          }
+          function installNativeDialog() {
+            var craft = globalThis.craft = globalThis.craft || {};
+            if (Array.isArray(__stxNativeBridge.capabilities) && __stxNativeBridge.capabilities.indexOf('dialog') >= 0) {
+              craft.dialog = {
+                alert: function(options) { return dialogRequest('alert', [options || {}]).then(function() {}); },
+                confirm: function(options) { return dialogRequest('confirm', [options || {}]).then(Boolean); },
+                actionSheet: function(options) { return dialogRequest('actionSheet', [options || {}]).then(function(id) { return typeof id === 'string' ? id : null; }); },
+              };
             }
-            craft.dialog = {
-              alert: function(options) { return dialogRequest('alert', [options || {}]).then(function() {}); },
-              confirm: function(options) { return dialogRequest('confirm', [options || {}]).then(Boolean); },
-              actionSheet: function(options) { return dialogRequest('actionSheet', [options || {}]).then(function(id) { return typeof id === 'string' ? id : null; }); },
-            };
           }
+          globalThis.__craftInstallNativeDialog = installNativeDialog;
+          installNativeDialog();
         })();
     """.trimIndent()
 }
@@ -1258,8 +1284,15 @@ internal object CraftNativeMedia {
             .addTag(TAG)
             .addTag("$TAG:${digest(address)}")
             .build()
-        // KEEP: a transfer already queued or running for this address is joined, not started again.
-        work.enqueueUniqueWork(workName(address, wifiOnly), androidx.work.ExistingWorkPolicy.KEEP, request)
+        // A transfer running for this address is joined (KEEP), not started again. One
+        // only queued, or waiting out a retry's backoff, is replaced: asked for again,
+        // it runs now and resumes the part the last attempt left.
+        val name = workName(address, wifiOnly)
+        background.execute {
+            val running = runCatching { work.getWorkInfosForUniqueWork(name).get() }.getOrDefault(emptyList())
+                .any { it.state == androidx.work.WorkInfo.State.RUNNING }
+            work.enqueueUniqueWork(name, if (running) androidx.work.ExistingWorkPolicy.KEEP else androidx.work.ExistingWorkPolicy.REPLACE, request)
+        }
         val reason = when {
             !online(app) -> "offline"
             wifiOnly && metered(app) -> "cellular"
@@ -1298,8 +1331,13 @@ internal object CraftNativeMedia {
             val target = file(context, address)
             val staging = part(context, address)
             target.parentFile?.mkdirs()
+            val download = CraftResumableDownload()
+            val asked = headers.keys().asSequence().associateWith { headers.optString(it) }
             val fetched = try {
-                CraftResumableDownload().fetch(address, headers.keys().asSequence().associateWith { headers.optString(it) }, staging, stopped)
+                // A part that no longer lines up was dropped: the whole file, now, not after a backoff.
+                download.fetch(address, asked, staging, stopped).let { first ->
+                    if (first is CraftResumableDownload.Fetched.Restart) download.fetch(address, asked, staging, stopped) else first
+                }
             } catch (error: Exception) {
                 val full = generateSequence<Throwable>(error) { it.cause }.take(16).any {
                     it is android.system.ErrnoException && it.errno == android.system.OsConstants.ENOSPC
@@ -1360,9 +1398,9 @@ internal object CraftNativeMedia {
     fun prune(context: Context, keep: List<String>): Int {
         val wanted = keep.map { digest(it) }.toSet()
         var removed = 0
+        // A keep still waiting owns its address's files and its transfer until it is answered.
+        val active = synchronized(lock) { waiting.keys.map { digest(it) }.toSet() }
         synchronized(lock) {
-            // A keep still waiting owns its address's files until it is answered.
-            val active = waiting.keys.map { digest(it) }.toSet()
             root(context).listFiles()?.forEach { file ->
                 val owner = file.name.substringBefore('.')
                 // Part files from before transfers resumed (`<sha>.<ext>.<id>.part`) are never picked up again.
@@ -1375,7 +1413,7 @@ internal object CraftNativeMedia {
             runCatching {
                 androidx.work.WorkManager.getInstance(app).getWorkInfosByTag(TAG).get()
                     .filter { !it.state.isFinished }
-                    .filter { info -> info.tags.none { it.startsWith("$TAG:") && it.removePrefix("$TAG:") in wanted } }
+                    .filter { info -> info.tags.none { it.startsWith("$TAG:") && it.removePrefix("$TAG:").let { owner -> owner in wanted || owner in active } } }
                     .forEach { androidx.work.WorkManager.getInstance(app).cancelWorkById(it.id) }
             }
         }
@@ -1435,6 +1473,8 @@ internal class CraftResumableDownload(
         if (have > 0) connection.setRequestProperty("Range", "bytes=$have-")
         try {
             val status = connection.responseCode
+            // Part of a file nobody asked a part of: not something to keep.
+            if (status == 206 && have == 0L) return Fetched.Refused(status)
             val resumed = status == 206 && have > 0 && rangeStart(connection.getHeaderField("Content-Range")) == have
             if (status == 416 || (status == 206 && !resumed)) {
                 part.delete()