craft-native 0.0.246 → 0.0.248

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

@@ -60,7 +60,18 @@ export interface CraftAndroidConfig {
     enableGeolocation?: boolean;
     enableBackgroundLocation?: boolean;
     enableBluetooth?: boolean;
+    /**
+     * A Bluetooth heart-rate strap, or a watch broadcasting its heart rate (the
+     * standard Heart Rate Service), through `craft.heartRate` on a page and the
+     * `HeartRate` module on a native screen (CraftHeartRate.kt): scan, connect,
+     * live readings as `craftHeartRate` events, and a recording kept natively,
+     * in the foreground (a connectedDevice service) while it runs. The iOS
+     * builder's flag of the same name.
+     */
+    enableHeartRate?: boolean;
     enableHealthConnect?: boolean;
+    /** Google Wallet save-link handoff for native screens. */
+    enableWallet?: boolean;
     /**
      * The Health Connect data the app reads and writes, by the shared type
      * names (`steps`, `sleep`, `workouts`...). The manifest declares only

package/dist/android/src/index.js

@@ -18,6 +18,8 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
+import com.google.android.gms.maps.model.Polygon
+import com.google.android.gms.maps.model.PolygonOptions
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions`,
       dependency: "com.google.android.gms:play-services-maps:18.2.0"
@@ -37,6 +39,7 @@ import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.CircleLayer
+import org.maplibre.android.style.layers.FillLayer
 import org.maplibre.android.style.layers.LineLayer
 import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.layers.PropertyFactory.*
@@ -498,7 +501,9 @@ var DEFAULT_CONFIG = {
   enableGeolocation: false,
   enableBackgroundLocation: false,
   enableBluetooth: false,
+  enableHeartRate: false,
   enableHealthConnect: false,
+  enableWallet: false,
   enableKeepAwake: false,
   enableDeepLinks: false,
   urlSchemes: [],
@@ -790,7 +795,11 @@ function renderAndroidPermissions(config) {
     healthConnectPermissions(config).forEach((permission) => permissions.add(permission));
   if (config.renderer === "native" && config.backgroundRefresh?.enabled)
     permissions.add("android.permission.RECEIVE_BOOT_COMPLETED");
-  const bluetooth = config.enableBluetooth ? [
+  if (config.enableHeartRate) {
+    permissions.add("android.permission.FOREGROUND_SERVICE");
+    permissions.add("android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE");
+  }
+  const bluetooth = config.enableBluetooth || config.enableHeartRate ? [
     '    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />',
     '    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />',
     '    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />',
@@ -1019,7 +1028,7 @@ async function init(options) {
     writeNativeShellSources(output, packagePath, finalPackageName, config);
   }
   const craftBridgeTemplate = readFileSync2(join3(TEMPLATES_DIR, "CraftBridge.kt.template"), "utf-8");
-  const craftBridge = craftBridgeTemplate.replace(/\{\{PROMISE_RUNTIME\}\}/g, () => renderAndroidPromiseRuntime("            ")).replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{ENABLE_SPEECH\}\}/g, String(Boolean(config.enableSpeechRecognition))).replace(/\{\{ENABLE_HAPTICS\}\}/g, String(Boolean(config.enableHaptics))).replace(/\{\{ENABLE_SHARE\}\}/g, String(Boolean(config.enableShare))).replace(/\{\{ENABLE_CAMERA\}\}/g, String(Boolean(config.enableCamera))).replace(/\{\{ENABLE_BIOMETRIC\}\}/g, String(Boolean(config.enableBiometric))).replace(/\{\{ENABLE_PUSH\}\}/g, String(Boolean(config.enablePushNotifications))).replace(/\{\{ENABLE_SECURE_STORAGE\}\}/g, String(Boolean(config.enableSecureStorage))).replace(/\{\{ENABLE_GEOLOCATION\}\}/g, String(Boolean(config.enableGeolocation))).replace(/\{\{ENABLE_BACKGROUND_LOCATION\}\}/g, String(Boolean(config.enableBackgroundLocation))).replace(/\{\{ENABLE_KEEP_AWAKE\}\}/g, String(Boolean(config.enableKeepAwake))).replace(/\{\{ENABLE_DEEP_LINKS\}\}/g, String(Boolean(config.enableDeepLinks))).replace(/\{\{ENABLE_HEALTH_CONNECT\}\}/g, String(Boolean(config.enableHealthConnect))).replace(/\{\{FIREBASE_IMPORT\}\}/g, config.enablePushNotifications ? "import com.google.firebase.messaging.FirebaseMessaging" : "").replace(/\{\{REGISTER_PUSH_IMPLEMENTATION\}\}/g, config.enablePushNotifications ? `activity.runOnUiThread {
+  const craftBridge = craftBridgeTemplate.replace(/\{\{PROMISE_RUNTIME\}\}/g, () => renderAndroidPromiseRuntime("            ")).replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{ENABLE_SPEECH\}\}/g, String(Boolean(config.enableSpeechRecognition))).replace(/\{\{ENABLE_HAPTICS\}\}/g, String(Boolean(config.enableHaptics))).replace(/\{\{ENABLE_SHARE\}\}/g, String(Boolean(config.enableShare))).replace(/\{\{ENABLE_CAMERA\}\}/g, String(Boolean(config.enableCamera))).replace(/\{\{ENABLE_BIOMETRIC\}\}/g, String(Boolean(config.enableBiometric))).replace(/\{\{ENABLE_PUSH\}\}/g, String(Boolean(config.enablePushNotifications))).replace(/\{\{ENABLE_SECURE_STORAGE\}\}/g, String(Boolean(config.enableSecureStorage))).replace(/\{\{ENABLE_GEOLOCATION\}\}/g, String(Boolean(config.enableGeolocation))).replace(/\{\{ENABLE_BACKGROUND_LOCATION\}\}/g, String(Boolean(config.enableBackgroundLocation))).replace(/\{\{ENABLE_KEEP_AWAKE\}\}/g, String(Boolean(config.enableKeepAwake))).replace(/\{\{ENABLE_DEEP_LINKS\}\}/g, String(Boolean(config.enableDeepLinks))).replace(/\{\{ENABLE_HEALTH_CONNECT\}\}/g, String(Boolean(config.enableHealthConnect))).replace(/\{\{ENABLE_HEART_RATE\}\}/g, String(Boolean(config.enableHeartRate))).replace(/\{\{FIREBASE_IMPORT\}\}/g, config.enablePushNotifications ? "import com.google.firebase.messaging.FirebaseMessaging" : "").replace(/\{\{REGISTER_PUSH_IMPLEMENTATION\}\}/g, config.enablePushNotifications ? `activity.runOnUiThread {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
                 && ContextCompat.checkSelfPermission(activity, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
                 ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.POST_NOTIFICATIONS), 4204)
@@ -1047,8 +1056,11 @@ async function init(options) {
   writeFileSync(join3(nativeDir, "LocationRecordingService.kt"), serviceTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   const healthTemplate = readFileSync2(join3(TEMPLATES_DIR, config.enableHealthConnect ? "CraftHealthConnect.kt.template" : "CraftHealthConnectStub.kt.template"), "utf-8");
   writeFileSync(join3(output, "app/src/main/java", packagePath, "CraftHealthConnect.kt"), healthTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
+  for (const [template, file] of [["CraftHeartRateCore.kt.template", "CraftHeartRateCore.kt"], ["CraftHeartRate.kt.template", "CraftHeartRate.kt"]]) {
+    writeFileSync(join3(output, "app/src/main/java", packagePath, file), readFileSync2(join3(TEMPLATES_DIR, template), "utf8").replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
+  }
   const manifestTemplate = readFileSync2(join3(TEMPLATES_DIR, "AndroidManifest.xml.template"), "utf-8");
-  const manifest = manifestTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{PERMISSIONS\}\}/g, renderAndroidPermissions(config)).replace(/\{\{USES_CLEARTEXT\}\}/g, config.devServerURL?.startsWith("http://") || config.enableLocalNetwork ? "true" : "false").replace(/\{\{DEEP_LINK_INTENT_FILTERS\}\}/g, renderAndroidDeepLinks(config)).replace(/\{\{BACKGROUND_SERVICE\}\}/g, config.enableBackgroundLocation ? '        <service android:name="com.craft.runtime.LocationRecordingService" android:exported="false" android:foregroundServiceType="location" android:stopWithTask="false" />' : "").replace(/\{\{NATIVE_NOTIFICATION_RECEIVER\}\}/g, config.renderer === "native" ? renderNativeShellManifest(config) : "").replace(/\{\{CRASH_REPORTER_PROVIDER\}\}/g, `        <provider android:name=".CraftCrashReporterInit" android:authorities="\${applicationId}.craft-crash" android:exported="false" android:initOrder="1000" />`).replace(/\{\{GOOGLE_MAPS_API_KEY\}\}/g, config.mapProvider !== "maplibre" && config.mapsApiKey ? `        <meta-data android:name="com.google.android.geo.API_KEY" android:value="${escapeXml(config.mapsApiKey)}" />` : "").replace(/\{\{HEALTH_CONNECT_QUERIES\}\}/g, config.enableHealthConnect ? `    <queries>
+  const manifest = manifestTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{PERMISSIONS\}\}/g, renderAndroidPermissions(config)).replace(/\{\{USES_CLEARTEXT\}\}/g, config.devServerURL?.startsWith("http://") || config.enableLocalNetwork ? "true" : "false").replace(/\{\{DEEP_LINK_INTENT_FILTERS\}\}/g, renderAndroidDeepLinks(config)).replace(/\{\{BACKGROUND_SERVICE\}\}/g, config.enableBackgroundLocation ? '        <service android:name="com.craft.runtime.LocationRecordingService" android:exported="false" android:foregroundServiceType="location" android:stopWithTask="false" />' : "").replace(/\{\{HEART_RATE_SERVICE\}\}/g, config.enableHeartRate ? '        <service android:name=".CraftHeartRateService" android:exported="false" android:foregroundServiceType="connectedDevice" />' : "").replace(/\{\{NATIVE_NOTIFICATION_RECEIVER\}\}/g, config.renderer === "native" ? renderNativeShellManifest(config) : "").replace(/\{\{CRASH_REPORTER_PROVIDER\}\}/g, `        <provider android:name=".CraftCrashReporterInit" android:authorities="\${applicationId}.craft-crash" android:exported="false" android:initOrder="1000" />`).replace(/\{\{GOOGLE_MAPS_API_KEY\}\}/g, config.mapProvider !== "maplibre" && config.mapsApiKey ? `        <meta-data android:name="com.google.android.geo.API_KEY" android:value="${escapeXml(config.mapsApiKey)}" />` : "").replace(/\{\{HEALTH_CONNECT_QUERIES\}\}/g, config.enableHealthConnect ? `    <queries>
         <package android:name="com.google.android.apps.healthdata" />
     </queries>` : "").replace(/\{\{HEALTH_CONNECT_RATIONALE\}\}/g, config.enableHealthConnect ? `            <intent-filter>
                 <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
@@ -1374,23 +1386,23 @@ async function run(options) {
   }
 }
 export {
-  syncNativeFonts,
-  syncAndroidWebAssets,
-  runKotlinFixture,
-  run,
-  resolveRuntimeDir,
-  renderAndroidPermissions,
-  renderAndroidDeepLinks,
-  open,
-  nativeRouteRuntime,
-  nativeRouteBundles,
-  nativeMessages,
-  nativeMapProviders,
-  installRuntime,
-  init,
-  healthConnectPermissions,
-  createAndroidEmulator,
-  build,
+  ANDROID_MIN_SDK,
   HEALTH_CONNECT_PERMISSIONS,
-  ANDROID_MIN_SDK
+  build,
+  createAndroidEmulator,
+  healthConnectPermissions,
+  init,
+  installRuntime,
+  nativeMapProviders,
+  nativeMessages,
+  nativeRouteBundles,
+  nativeRouteRuntime,
+  open,
+  renderAndroidDeepLinks,
+  renderAndroidPermissions,
+  resolveRuntimeDir,
+  run,
+  runKotlinFixture,
+  syncAndroidWebAssets,
+  syncNativeFonts
 };

package/dist/android/templates/AndroidManifest.xml.template

@@ -55,6 +55,7 @@
         </activity>
 
 {{BACKGROUND_SERVICE}}
+{{HEART_RATE_SERVICE}}
 {{NATIVE_NOTIFICATION_RECEIVER}}
 {{CRASH_REPORTER_PROVIDER}}
 

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

@@ -444,6 +444,9 @@ class CraftBridge(
                     bluetooth: false,
                     nfc: false,
                     health: {{ENABLE_HEALTH_CONNECT}},
+                    heartRate: {{ENABLE_HEART_RATE}},
+                    heartRateRecordingOwnership: {{ENABLE_HEART_RATE}},
+                    heartRateRecordingIntentIdentity: {{ENABLE_HEART_RATE}},
                     screenCapture: false
                 },
 
@@ -1808,6 +1811,85 @@ class CraftBridge(
                     readRecording: function(options) { return recordingCall('readRecording', options); },
                     acknowledgeRecording: function(options) { return recordingCall('acknowledgeRecording', options); }
                 };
+                // A Bluetooth heart-rate strap, or a watch broadcasting its
+                // heart rate (CraftHeartRate.kt), in the iOS page's names.
+                // Readings, devices found by scan() and connection changes
+                // arrive as craftHeartRate events ({type: 'reading' | 'device'
+                // | 'state'}); startRecording() keeps every reading natively,
+                // screen locked or app closed, until stopRecording(). Calls
+                // that wait on Android's Nearby devices prompt have no deadline.
+                var heartRateSequence = 0;
+                var heartRateRequests = Object.create(null);
+                var heartRateClosed = false;
+                window.__craftHeartRateResult = function(id, value) {
+                    var pending = heartRateRequests[id];
+                    if (!pending) return;
+                    delete heartRateRequests[id];
+                    pending.resolve(value);
+                };
+                window.__craftHeartRateError = function(id, message, code) {
+                    var pending = heartRateRequests[id];
+                    if (!pending) return;
+                    delete heartRateRequests[id];
+                    var error = new Error(message);
+                    error.code = code || 'CRAFT_ERROR';
+                    error.bridge = true;
+                    pending.reject(error);
+                };
+                window.__craftRejectHeartRateRequests = function(message) {
+                    heartRateClosed = true;
+                    Object.keys(heartRateRequests).forEach(function(id) {
+                        var pending = heartRateRequests[id];
+                        delete heartRateRequests[id];
+                        pending.reject(new Error(message || 'Android bridge closed'));
+                    });
+                };
+                function heartRate(method, options) {
+                    options = options || {};
+                    if (['startRecording', 'pauseRecording', 'resumeRecording', 'stopRecording', 'readRecording', 'getRecordingState', 'acknowledgeRecording'].indexOf(method) !== -1) {
+                        if (Object.prototype.hasOwnProperty.call(options, 'recordingId') &&
+                            (typeof options.recordingId !== 'string' || !options.recordingId.trim())) {
+                            var invalidStart = new Error('recordingId must be a nonempty recording ID');
+                            invalidStart.code = 'INVALID_ARGUMENT';
+                            return Promise.reject(invalidStart);
+                        }
+                        if (Object.prototype.hasOwnProperty.call(options, 'expectedId') &&
+                            (typeof options.expectedId !== 'string' || !options.expectedId.trim())) {
+                            var invalid = new Error('expectedId must be a nonempty recording ID');
+                            invalid.code = 'INVALID_ARGUMENT';
+                            return Promise.reject(invalid);
+                        }
+                    }
+                    if (heartRateClosed) return Promise.reject(new Error('Android bridge is closed'));
+                    return new Promise(function(resolve, reject) {
+                        heartRateSequence += 1;
+                        var id = heartRateSequence;
+                        heartRateRequests[id] = {resolve: resolve, reject: reject};
+                        try {
+                            CraftAndroid.heartRate(method, JSON.stringify(options), id);
+                        } catch (error) {
+                            delete heartRateRequests[id];
+                            reject(error);
+                        }
+                    });
+                }
+                craft.heartRate = {
+                    getState: function() { return heartRate('getState'); },
+                    requestAuthorization: function() { return heartRate('requestAuthorization'); },
+                    scan: function(options) { return heartRate('scan', {timeout: options && typeof options.timeout === 'number' ? options.timeout : null}); },
+                    stopScan: function() { return heartRate('stopScan'); },
+                    getDevices: function() { return heartRate('getDevices'); },
+                    connect: function(id) { return heartRate('connect', {id: typeof id === 'string' ? id : id && id.id}); },
+                    reconnect: function() { return heartRate('reconnect'); },
+                    disconnect: function(options) { return heartRate('disconnect', {forget: !!(options && options.forget)}); },
+                    startRecording: function(options) { return heartRate('startRecording', options); },
+                    pauseRecording: function(options) { return heartRate('pauseRecording', options); },
+                    resumeRecording: function(options) { return heartRate('resumeRecording', options); },
+                    stopRecording: function(options) { return heartRate('stopRecording', options); },
+                    getRecordingState: function(options) { return heartRate('getRecordingState', options); },
+                    acknowledgeRecording: function(options) { return heartRate('acknowledgeRecording', options); },
+                    readRecording: function(options) { return heartRate('readRecording', options); }
+                };
                 var shareApi = function(text, title) { return legacyShare(text, title); };
                 shareApi.share = function(options) {
                     options = options || {};
@@ -2537,6 +2619,7 @@ class CraftBridge(
     }
 
     fun onRequestPermissionsResult(requestCode: Int): Boolean {
+        if (heartRateEnabled && CraftHeartRate.get(activity).onPermissions(requestCode)) return true
         if (closed) return requestCode in PERMISSION_REQUEST_START..PERMISSION_REQUEST_END
         // startListening asked for the microphone and is waiting on this.
         if (requestCode == REQUEST_SPEECH) {
@@ -2820,6 +2903,54 @@ class CraftBridge(
         return legacyRecordingAction("readRecording")
     }
 
+    // ==================== Heart rate (CraftHeartRate.kt) ====================
+
+    private val heartRateEnabled = {{ENABLE_HEART_RATE}}
+
+    /** The strap's events, to this page as `craftHeartRate`. */
+    private val heartRateSink: (JSONObject) -> Unit = { detail ->
+        evaluateJavascriptUnlessClosed("window.dispatchEvent(new CustomEvent('craftHeartRate', {detail: $detail}));")
+    }
+
+    init {
+        if (heartRateEnabled) CraftHeartRate.get(activity).sinks["page"] = heartRateSink
+    }
+
+    /**
+     * One `craft.heartRate` call, by method name, answered through
+     * `__craftHeartRateResult` / `__craftHeartRateError` with its id. An
+     * answer for a page that has since navigated away is dropped.
+     */
+    @JavascriptInterface
+    fun heartRate(method: String, optionsJson: String, callbackId: Int) {
+        activity.runOnUiThread {
+            if (closed) return@runOnUiThread
+            if (!heartRateEnabled) return@runOnUiThread rejectHeartRate(callbackId, navigationGeneration, "Heart rate is disabled", "CAPABILITY_DISABLED")
+            val generation = navigationGeneration
+            val options = runCatching { JSONObject(optionsJson) }.getOrNull()
+                ?: return@runOnUiThread rejectHeartRate(callbackId, generation, "Invalid heart-rate options", "INVALID_ARGUMENT")
+            CraftHeartRate.get(activity).perform(method, options, activity) { result ->
+                result.fold(
+                    onSuccess = { value ->
+                        if (generation != navigationGeneration) return@fold
+                        val json = if (value is String) JSONObject.quote(value) else value.toString()
+                        evaluateJavascriptUnlessClosed("window.__craftHeartRateResult && window.__craftHeartRateResult($callbackId, $json)")
+                    },
+                    onFailure = { error ->
+                        rejectHeartRate(callbackId, generation, error.message ?: "Heart rate failed", (error as? CraftHeartRateException)?.code ?: "CRAFT_ERROR")
+                    },
+                )
+            }
+        }
+    }
+
+    private fun rejectHeartRate(callbackId: Int, generation: Int, message: String, code: String) {
+        if (generation != navigationGeneration) return
+        evaluateJavascriptUnlessClosed(
+            "window.__craftHeartRateError && window.__craftHeartRateError($callbackId, ${jsQuote(message)}, ${jsQuote(code)})"
+        )
+    }
+
     // ==================== Clipboard ====================
 
     @JavascriptInterface
@@ -4473,13 +4604,17 @@ class CraftBridge(
                 webView.evaluateJavascript(
                     "window.__craftRejectPendingPromises && window.__craftRejectPendingPromises('Android bridge closed');" +
                         "window.__craftRejectPermissionRequests && window.__craftRejectPermissionRequests('Android bridge closed');" +
-                        "window.__craftRejectSpeechRequests && window.__craftRejectSpeechRequests('Android bridge closed')",
+                        "window.__craftRejectSpeechRequests && window.__craftRejectSpeechRequests('Android bridge closed');" +
+                        "window.__craftRejectHeartRateRequests && window.__craftRejectHeartRateRequests('Android bridge closed')",
                     null
                 )
             }
         }
         CraftNative.close(activity)
         healthConnect.close()
+        // The strap and its recording carry on (the service is the
+        // process's); only this page stops hearing them.
+        if (heartRateEnabled) CraftHeartRate.get(activity).sinks.remove("page", heartRateSink)
 
         if (shareReceiverRegistered) {
             runCatching { activity.unregisterReceiver(shareChosenReceiver) }