craft-native 0.0.174 → 0.0.176

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

@@ -77,6 +77,25 @@ export interface CraftAndroidConfig {
         enabled?: boolean;
         minimumIntervalMinutes?: number;
     };
+    /**
+     * Crash and error reporting to bughq (CraftCrashReporter.kt): uncaught JVM
+     * exceptions, ANRs and native crashes (ApplicationExitInfo), uncaught
+     * JavaScript errors, and what the page sends through `craft.crashReporter`.
+     * Queued on disk and sent when online. Release builds are minified: upload
+     * `app/build/outputs/mapping/release/mapping.txt` so bughq can retrace.
+     */
+    crashReporting?: {
+        /** The bughq project's public ingest key. */
+        key: string;
+        /** Default https://bughq.org. */
+        host?: string;
+        /** Default `production`. */
+        environment?: string;
+        /** Default `<versionName>+<versionCode>`, e.g. `1.0.0+41`. */
+        release?: string;
+        /** One session per launch, for crash-free sessions. Default on. */
+        sessions?: boolean;
+    };
 }
 /** The shared health data types (the iOS builder's HealthKit names). */
 export type HealthConnectType = 'steps' | 'heartRate' | 'activeEnergy' | 'distance' | 'workouts' | 'restingHeartRate' | 'heartRateVariability' | 'bodyMass' | 'sleep' | 'mindful' | 'dietaryEnergy' | 'dietaryProtein' | 'dietaryCarbohydrates' | 'dietaryFat';

package/dist/android/src/index.js

@@ -79,6 +79,21 @@ function renderAndroidPromiseRuntime(indent = "") {
 
 // ../android/src/index.ts
 var TEMPLATES_DIR = join(dirname(import.meta.dir), "templates");
+function resolveCraftAndroidVersion(startDir = import.meta.dir) {
+  let directory = resolve(startDir);
+  while (true) {
+    try {
+      const pkg = JSON.parse(readFileSync(join(directory, "package.json"), "utf8"));
+      if ((pkg.name === "@craft-native/android" || pkg.name === "craft-native") && typeof pkg.version === "string" && pkg.version)
+        return pkg.version;
+    } catch {}
+    const parent = dirname(directory);
+    if (parent === directory)
+      return "0.0.0";
+    directory = parent;
+  }
+}
+var CRAFT_ANDROID_VERSION = resolveCraftAndroidVersion();
 var LOCAL_DEVELOPMENT_HOSTS = new Set(["localhost", "127.0.0.1", "10.0.2.2"]);
 var KOTLIN_KEYWORDS = new Set([
   "as",
@@ -530,6 +545,7 @@ async function init(options) {
   const mainActivityTemplate = readFileSync(join(TEMPLATES_DIR, config.renderer === "native" ? "MainActivityNative.kt.template" : "MainActivity.kt.template"), "utf-8");
   const mainActivity = mainActivityTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{APP_NAME\}\}/g, name);
   writeFileSync(join(output, "app/src/main/java", packagePath, "MainActivity.kt"), mainActivity);
+  writeFileSync(join(output, "app/src/main/java", packagePath, "CraftCrashReporter.kt"), readFileSync(join(TEMPLATES_DIR, "CraftCrashReporter.kt.template"), "utf-8").replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{CRAFT_VERSION\}\}/g, CRAFT_ANDROID_VERSION));
   if (config.renderer === "native") {
     const mutationTemplate = readFileSync(join(TEMPLATES_DIR, "CraftNativeMutation.kt.template"), "utf-8");
     const flatListTemplate = readFileSync(join(TEMPLATES_DIR, "CraftNativeFlatList.kt.template"), "utf-8");
@@ -573,7 +589,7 @@ async function init(options) {
   const healthTemplate = readFileSync(join(TEMPLATES_DIR, config.enableHealthConnect ? "CraftHealthConnect.kt.template" : "CraftHealthConnectStub.kt.template"), "utf-8");
   writeFileSync(join(output, "app/src/main/java", packagePath, "CraftHealthConnect.kt"), healthTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   const manifestTemplate = readFileSync(join(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(/\{\{GOOGLE_MAPS_API_KEY\}\}/g, 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(/\{\{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.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" />
@@ -586,7 +602,8 @@ async function init(options) {
   const projectGradleTemplate = readFileSync(join(TEMPLATES_DIR, "build.gradle.kts.project.template"), "utf-8");
   writeFileSync(join(output, "build.gradle.kts"), projectGradleTemplate.replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services") version "4.4.2" apply false' : ""));
   const appGradleTemplate = readFileSync(join(TEMPLATES_DIR, "build.gradle.kts.app.template"), "utf-8");
-  const appGradle = appGradleTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{VERSION_NAME\}\}/g, escapeKotlinString(config.version || "1.0.0")).replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk ?? ANDROID_MIN_SDK)).replace(/\{\{COMPILE_SDK\}\}/g, String(config.compileSdk || 36)).replace(/\{\{TARGET_SDK\}\}/g, String(config.targetSdk || 35)).replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services")' : "").replace(/\{\{FIREBASE_MESSAGING_DEPENDENCY\}\}/g, config.enablePushNotifications ? '    implementation("com.google.firebase:firebase-messaging:24.1.0")' : "").replace(/\{\{REFRESH_LAYOUT_DEPENDENCY\}\}/g, config.renderer === "native" ? '    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")' : "").replace(/\{\{HEALTH_CONNECT_DEPENDENCIES\}\}/g, config.enableHealthConnect ? `    implementation("androidx.health.connect:connect-client:1.1.0")
+  const appGradle = appGradleTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName).replace(/\{\{VERSION_NAME\}\}/g, escapeKotlinString(config.version || "1.0.0")).replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk ?? ANDROID_MIN_SDK)).replace(/\{\{COMPILE_SDK\}\}/g, String(config.compileSdk || 36)).replace(/\{\{TARGET_SDK\}\}/g, String(config.targetSdk || 35)).replace(/\{\{GOOGLE_SERVICES_PLUGIN\}\}/g, hasGoogleServices ? '    id("com.google.gms.google-services")' : "").replace(/\{\{FIREBASE_MESSAGING_DEPENDENCY\}\}/g, config.enablePushNotifications ? '    implementation("com.google.firebase:firebase-messaging:24.1.0")' : "").replace(/\{\{REFRESH_LAYOUT_DEPENDENCY\}\}/g, config.renderer === "native" ? '    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")' : "").replace(/\{\{GOOGLE_MAPS_DEPENDENCY\}\}/g, config.renderer === "native" ? `    // Native STX Map overlays and trail routes
+    implementation("com.google.android.gms:play-services-maps:18.2.0")` : "").replace(/\{\{HEALTH_CONNECT_DEPENDENCIES\}\}/g, config.enableHealthConnect ? `    implementation("androidx.health.connect:connect-client:1.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")` : "").replace(/\{\{JAVASCRIPT_ENGINE_DEPENDENCY\}\}/g, config.renderer === "native" ? `    implementation("androidx.javascriptengine:javascriptengine:1.1.0")
     // The in-app browser (Custom Tabs) and background refresh (WorkManager).
     implementation("androidx.browser:browser:1.8.0")

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

@@ -48,6 +48,7 @@
 
 {{BACKGROUND_SERVICE}}
 {{NATIVE_NOTIFICATION_RECEIVER}}
+{{CRASH_REPORTER_PROVIDER}}
 
     </application>
 

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

@@ -418,6 +418,7 @@ class CraftBridge(
                     appReview: true,
                     flashlight: {{ENABLE_CAMERA}} && ${hasFlashlight()},
                     speech: true,
+                    crashReporter: ${CraftCrashReporter.enabled},
                     brightness: true,
                     openURL: true,
                     vibrationPattern: true,
@@ -1748,6 +1749,26 @@ class CraftBridge(
                         return Promise.resolve().then(function() { CraftAndroid.stopSpeaking(); });
                     }
                 };
+                // Crash and error reporting (CraftCrashReporter.kt): the page's
+                // error SDK hands its events here, so they share the app's
+                // on-disk outbox, its session and the device's own context.
+                craft.crashReporter = {
+                    capture: function(event) {
+                        return Promise.resolve().then(function() { return CraftAndroid.crashReporterCapture(JSON.stringify(event || {})); });
+                    },
+                    setUser: function(id) {
+                        return Promise.resolve().then(function() { return CraftAndroid.crashReporterSetUser(id == null ? '' : String(id)); });
+                    },
+                    addBreadcrumb: function(breadcrumb) {
+                        return Promise.resolve().then(function() { return CraftAndroid.crashReporterAddBreadcrumb(JSON.stringify(breadcrumb || {})); });
+                    },
+                    flush: function() {
+                        return Promise.resolve().then(function() { return CraftAndroid.crashReporterFlush(); });
+                    },
+                    context: function() {
+                        return Promise.resolve().then(function() { return JSON.parse(CraftAndroid.crashReporterContext()); });
+                    }
+                };
                 craft.location = {
                     getCurrentPosition: craft.getCurrentPosition,
                     watchPosition: craft.watchPosition,
@@ -1859,6 +1880,36 @@ class CraftBridge(
         return true
     }
 
+    // ==================== Crash reporting ====================
+
+    /** Queues an event the page built; false when reporting is off or the event has no message. */
+    @JavascriptInterface
+    fun crashReporterCapture(eventJson: String): Boolean =
+        runCatching { CraftCrashReporter.capture(JSONObject(eventJson)) }.getOrDefault(false)
+
+    @JavascriptInterface
+    fun crashReporterSetUser(id: String): Boolean {
+        CraftCrashReporter.setUser(id)
+        return CraftCrashReporter.enabled
+    }
+
+    @JavascriptInterface
+    fun crashReporterAddBreadcrumb(breadcrumbJson: String): Boolean {
+        val crumb = runCatching { JSONObject(breadcrumbJson) }.getOrNull() ?: return false
+        CraftCrashReporter.addBreadcrumb(crumb)
+        return CraftCrashReporter.enabled
+    }
+
+    @JavascriptInterface
+    fun crashReporterFlush(): Boolean {
+        CraftCrashReporter.requestFlush()
+        return CraftCrashReporter.enabled
+    }
+
+    @JavascriptInterface
+    fun crashReporterContext(): String =
+        if (CraftCrashReporter.enabled) CraftCrashReporter.context().toString() else JSONObject().put("enabled", false).toString()
+
     // ==================== Speech Recognition ====================
 
     /**