craft-native 0.0.90 → 0.0.92

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

@@ -37,6 +37,14 @@ export interface InitOptions {
     packageName?: string;
     output: string;
     config?: Partial<CraftAndroidConfig>;
+    /**
+     * Where to find the Zig runtime's `<abi>/libcraft.so`.
+     *
+     * `null` means no runtime regardless of the environment; `undefined` falls
+     * through to `CRAFT_ANDROID_RUNTIME`. Same shape as the iOS builder's
+     * `runtimeDir`.
+     */
+    runtimeDir?: string | null;
 }
 export interface BuildOptions {
     htmlPath?: string;
@@ -44,6 +52,8 @@ export interface BuildOptions {
     output: string;
     release?: boolean;
     compile?: boolean;
+    /** Same meaning as `InitOptions.runtimeDir`; refreshes what init installed. */
+    runtimeDir?: string | null;
 }
 export interface OpenOptions {
     output: string;
@@ -56,8 +66,33 @@ export declare function syncAndroidWebAssets(source: string, output: string): vo
 export declare function renderAndroidPermissions(config: CraftAndroidConfig): string;
 export declare function renderAndroidDeepLinks(config: CraftAndroidConfig): string;
 /**
- * Initialize a new Android project
+ * Where the runtime directory comes from when the caller does not say.
+ *
+ * The same shape as `CRAFT_BIN` and the iOS builder's `CRAFT_IOS_RUNTIME`: an
+ * explicit override for the monorepo dev loop, not a lookup path. Shipping the
+ * runtime to real apps means putting these libraries in the pantry package
+ * beside the `craft` binary, which is a distribution decision this function
+ * does not make.
+ */
+export declare function resolveRuntimeDir(override?: string | null): string | null;
+/**
+ * Copy the Zig runtime into the generated project as
+ * `app/src/main/jniLibs/<abi>/libcraft.so`.
+ *
+ * That path is AGP's default `jniLibs.srcDirs`, so nothing in the Gradle
+ * templates has to know about it — the library is packaged into the APK and
+ * `System.loadLibrary("craft")` finds it because the file is named for the
+ * `craft` it asks for.
+ *
+ * Until this existed, nothing put the library anywhere. `CraftNative` caught
+ * the `UnsatisfiedLinkError`, set `isAvailable = false`, and every action fell
+ * through to the Kotlin shim — by design, so an app with no runtime still
+ * works, which is also why nobody noticed that *every* generated app was in
+ * that state and the whole Android half of the Zig bridge had never run.
+ *
+ * Returns true when a runtime was installed.
  */
+export declare function installRuntime(output: string, runtimeDir: string): boolean;
 export declare function init(options: InitOptions): Promise<void>;
 /**
  * Build Android project

package/dist/android/src/index.js

@@ -1,9 +1,115 @@
 // @bun
 // ../android/src/index.ts
 import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "fs";
-import { dirname, join, resolve } from "path";
+import { dirname, extname, isAbsolute, join, relative, resolve, sep } from "path";
 var {$ } = globalThis.Bun;
+
+// ../android/src/promise-runtime.ts
+var ANDROID_PROMISE_RUNTIME = `
+if (window.__craftRejectPendingPromises) {
+    window.__craftRejectPendingPromises('Android bridge reinitialized');
+}
+if (window.__craftRejectPermissionRequests) {
+    window.__craftRejectPermissionRequests('Android bridge reinitialized');
+}
+window.__craftPromiseRuntimeClosed = false;
+window.__craftPendingPromises = Object.create(null);
+window.__craftPromise = function(channel, resolveName, rejectName, invoke, timeoutMs, timeoutError) {
+    if (window.__craftPromiseRuntimeClosed) {
+        return Promise.reject(new Error('Android bridge is closed'));
+    }
+    if (window.__craftPendingPromises[channel]) {
+        return Promise.reject(new Error('A '.concat(channel, ' request is already in progress')));
+    }
+
+    return new Promise(function(resolve, reject) {
+        var entry = {settled: false, timer: null, settle: null};
+        var resolveCallback;
+        var rejectCallback;
+
+        entry.settle = function(succeeded, value) {
+            if (entry.settled || window.__craftPendingPromises[channel] !== entry) return;
+            entry.settled = true;
+            if (entry.timer !== null) clearTimeout(entry.timer);
+            if (window[resolveName] === resolveCallback) window[resolveName] = null;
+            if (window[rejectName] === rejectCallback) window[rejectName] = null;
+            delete window.__craftPendingPromises[channel];
+            if (succeeded) resolve(value);
+            else reject(value);
+        };
+
+        resolveCallback = function(value) {
+            entry.settle(true, value);
+        };
+        rejectCallback = function(error) {
+            entry.settle(false, error);
+        };
+        window[resolveName] = resolveCallback;
+        window[rejectName] = rejectCallback;
+        window.__craftPendingPromises[channel] = entry;
+
+        if (timeoutMs > 0) {
+            entry.timer = setTimeout(function() {
+                entry.settle(false, timeoutError || new Error(channel.concat(' request timed out')));
+            }, timeoutMs);
+        }
+
+        try {
+            invoke();
+        }
+        catch (error) {
+            entry.settle(false, error);
+        }
+    });
+};
+
+window.__craftRejectPendingPromises = function(message) {
+    window.__craftPromiseRuntimeClosed = true;
+    Object.keys(window.__craftPendingPromises).forEach(function(channel) {
+        var entry = window.__craftPendingPromises[channel];
+        if (entry) entry.settle(false, new Error(message || 'Android bridge closed'));
+    });
+};
+`;
+function renderAndroidPromiseRuntime(indent = "") {
+  return ANDROID_PROMISE_RUNTIME.trim().split(`
+`).map((line) => `${indent}${line}`).join(`
+`);
+}
+
+// ../android/src/index.ts
 var TEMPLATES_DIR = join(dirname(import.meta.dir), "templates");
+var LOCAL_DEVELOPMENT_HOSTS = new Set(["localhost", "127.0.0.1", "10.0.2.2"]);
+var KOTLIN_KEYWORDS = new Set([
+  "as",
+  "break",
+  "class",
+  "continue",
+  "do",
+  "else",
+  "false",
+  "for",
+  "fun",
+  "if",
+  "in",
+  "interface",
+  "is",
+  "null",
+  "object",
+  "package",
+  "return",
+  "super",
+  "this",
+  "throw",
+  "true",
+  "try",
+  "typealias",
+  "typeof",
+  "val",
+  "var",
+  "when",
+  "while"
+]);
 var DEFAULT_CONFIG = {
   version: "1.0.0",
   versionCode: 1,
@@ -27,16 +133,135 @@ var DEFAULT_CONFIG = {
   compileSdk: 36,
   targetSdk: 35
 };
+function escapeXml(value) {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
+}
+function escapeKotlinString(value) {
+  return value.replaceAll("\\", "\\\\").replaceAll('"', "\\\"").replaceAll("$", "\\$").replaceAll("\r", "\\r").replaceAll(`
+`, "\\n");
+}
+function generatedPackageSegment(name) {
+  const normalized = name.toLowerCase().replace(/[^a-z0-9_]/g, "");
+  if (!normalized)
+    return "app";
+  return /^[a-z_]/.test(normalized) ? normalized : `app${normalized}`;
+}
+function generatedGradleProjectName(name) {
+  const invalidCharacters = ["/", "\\", ":", "<", ">", '"', "?", "*", "|"];
+  const normalized = invalidCharacters.reduce((value, character) => value.replaceAll(character, "-"), name).trim();
+  return normalized || "craft-app";
+}
+function requireRegularFile(path, label) {
+  if (!existsSync(path))
+    throw new Error(`${label} not found: ${path}`);
+  if (!statSync(path).isFile())
+    throw new Error(`${label} must be a file: ${path}`);
+}
+function containsPath(parent, candidate) {
+  const relativePath = relative(parent, candidate);
+  return relativePath === "" || relativePath !== ".." && !relativePath.startsWith(`..${sep}`) && !isAbsolute(relativePath);
+}
+function validateGoogleServicesFile(path, packageName) {
+  requireRegularFile(path, "Google services file");
+  let document;
+  try {
+    document = JSON.parse(readFileSync(path, "utf8"));
+  } catch (error) {
+    throw new Error(`Google services file must contain valid JSON: ${path}`, { cause: error });
+  }
+  const matchingClient = document.client?.some((client) => {
+    return client.client_info?.android_client_info?.package_name === packageName;
+  });
+  if (!matchingClient) {
+    throw new Error(`Google services file has no client for Android package ${packageName}: ${path}`);
+  }
+}
+function androidWebUrl(value, field) {
+  let url;
+  try {
+    url = new URL(value);
+  } catch {
+    throw new Error(`Invalid ${field}: ${value}`);
+  }
+  const localDevelopment = url.protocol === "http:" && LOCAL_DEVELOPMENT_HOSTS.has(url.hostname);
+  if (url.protocol !== "https:" && !localDevelopment || url.username || url.password) {
+    throw new Error(`${field} must use HTTPS or local HTTP without credentials: ${value}`);
+  }
+  return url;
+}
+function normalizeAndroidNetworkConfig(config) {
+  const schemes = config.urlSchemes?.map((value) => value.trim().toLowerCase()) ?? [];
+  if (schemes.some((value) => !/^[a-z][a-z0-9+.-]*$/.test(value))) {
+    throw new Error("Android deep-link schemes must be valid URI schemes");
+  }
+  config.urlSchemes = [...new Set(schemes)];
+  if (config.enableDeepLinks && config.urlSchemes.length === 0) {
+    throw new Error("Android deep links require at least one URL scheme");
+  }
+  const trustedOrigins = (config.trustedOrigins ?? []).map((value) => {
+    return androidWebUrl(value, "Android trusted origin").origin;
+  });
+  if (config.devServerURL) {
+    const devServer = androidWebUrl(config.devServerURL, "Android dev server URL");
+    config.devServerURL = devServer.toString();
+    trustedOrigins.push(devServer.origin);
+  }
+  config.trustedOrigins = [...new Set(trustedOrigins)];
+}
+function validateAndroidConfig(config) {
+  if (!config.appName.trim())
+    throw new Error("Android app name must not be empty");
+  const packageSegments = config.packageName.split(".");
+  if (packageSegments.length < 2 || packageSegments.some((segment) => !/^[A-Za-z_][A-Za-z0-9_]*$/.test(segment) || KOTLIN_KEYWORDS.has(segment))) {
+    throw new Error(`Invalid Android package name: ${config.packageName}`);
+  }
+  if (!/^#(?:[\dA-F]{3,4}|[\dA-F]{6}|[\dA-F]{8})$/i.test(config.backgroundColor ?? "")) {
+    throw new Error(`Invalid Android background color: ${config.backgroundColor}`);
+  }
+  for (const [name, value] of [
+    ["versionCode", config.versionCode],
+    ["minSdk", config.minSdk],
+    ["compileSdk", config.compileSdk],
+    ["targetSdk", config.targetSdk]
+  ]) {
+    if (!Number.isInteger(value) || Number(value) < 1) {
+      throw new Error(`Android ${name} must be a positive integer`);
+    }
+  }
+  if (Number(config.minSdk) > Number(config.targetSdk)) {
+    throw new Error("Android minSdk must not exceed targetSdk");
+  }
+  if (Number(config.targetSdk) > Number(config.compileSdk)) {
+    throw new Error("Android targetSdk must not exceed compileSdk");
+  }
+}
+function writeAndroidConfig(output, config) {
+  writeFileSync(join(output, "craft.config.json"), JSON.stringify(config, null, 2));
+  const runtimeConfig = { ...config };
+  delete runtimeConfig.appIconPath;
+  delete runtimeConfig.googleServicesFile;
+  writeFileSync(join(output, "app/src/main/assets/craft.config.json"), JSON.stringify(runtimeConfig, null, 2));
+}
 function syncAndroidWebAssets(source, output) {
   const sourcePath = resolve(source);
   if (!existsSync(sourcePath))
     throw new Error(`Web asset path not found: ${source}`);
-  const assetsDir = join(output, "app/src/main/assets");
+  const sourceStat = statSync(sourcePath);
+  if (!sourceStat.isDirectory() && !sourceStat.isFile()) {
+    throw new Error(`Web asset path must be a file or directory: ${source}`);
+  }
+  const assetsDir = resolve(output, "app/src/main/assets");
+  if (containsPath(sourcePath, assetsDir) || containsPath(assetsDir, sourcePath)) {
+    throw new Error(`Web asset source must not overlap generated asset directory: ${source}`);
+  }
+  if (sourceStat.isDirectory()) {
+    requireRegularFile(join(sourcePath, "index.html"), "Web asset directory entry point");
+  }
   const configPath = join(assetsDir, "craft.config.json");
   const config = existsSync(configPath) ? readFileSync(configPath) : undefined;
   rmSync(assetsDir, { recursive: true, force: true });
   mkdirSync(assetsDir, { recursive: true });
-  if (statSync(sourcePath).isDirectory())
+  if (sourceStat.isDirectory())
     cpSync(sourcePath, assetsDir, { recursive: true });
   else
     cpSync(sourcePath, join(assetsDir, "index.html"));
@@ -93,14 +318,70 @@ function renderAndroidDeepLinks(config) {
             </intent-filter>`).join(`
 `);
 }
+var RUNTIME_ABIS = ["arm64-v8a", "x86_64"];
+function resolveRuntimeDir(override) {
+  if (override === null)
+    return null;
+  const dir = override ?? process.env.CRAFT_ANDROID_RUNTIME;
+  if (!dir)
+    return null;
+  if (!existsSync(dir)) {
+    const source = override === undefined ? "CRAFT_ANDROID_RUNTIME points at" : "runtimeDir is";
+    throw new Error(`${source} ${dir}, which does not exist.`);
+  }
+  return dir;
+}
+function installRuntime(output, runtimeDir) {
+  const found = RUNTIME_ABIS.map((abi) => ({ abi, source: join(runtimeDir, abi, "libcraft.so") })).filter((entry) => existsSync(entry.source));
+  if (found.length === 0) {
+    throw new Error(`${runtimeDir} has no <abi>/libcraft.so for any of ${RUNTIME_ABIS.join(", ")}. ` + "Run `zig build build-android-all -Doptimize=ReleaseSafe` in packages/zig and point at its zig-out/android.");
+  }
+  if (found.length < RUNTIME_ABIS.length) {
+    const missing = RUNTIME_ABIS.filter((abi) => !found.some((entry) => entry.abi === abi));
+    console.warn(`   \u26A0 only ${found.map((entry) => entry.abi).join(", ")} was found; ${missing.join(", ")} is missing. ` + "The app will fall back to the Kotlin shim on those devices.");
+  }
+  const dest = join(output, "app/src/main/jniLibs");
+  rmSync(dest, { force: true, recursive: true });
+  for (const { abi, source } of found) {
+    const abiDir = join(dest, abi);
+    mkdirSync(abiDir, { recursive: true });
+    cpSync(source, join(abiDir, "libcraft.so"));
+  }
+  return true;
+}
 async function init(options) {
   const { name, packageName, output } = options;
   console.log(`
 \u26A1 Initializing Craft Android project: ${name}`);
   console.log(`   Output: ${output}
 `);
-  const finalPackageName = packageName || `com.craft.${name.toLowerCase().replace(/[^a-z0-9]/g, "")}`;
+  const finalPackageName = packageName || `com.craft.${generatedPackageSegment(name)}`;
   const packagePath = finalPackageName.replace(/\./g, "/");
+  const config = {
+    ...DEFAULT_CONFIG,
+    ...options.config,
+    appName: name,
+    packageName: finalPackageName
+  };
+  if (config.enableBackgroundLocation)
+    config.enableGeolocation = true;
+  if (config.enableHealthConnect) {
+    config.minSdk = Math.max(config.minSdk ?? 26, 26);
+    config.compileSdk = Math.max(config.compileSdk ?? 36, 36);
+  }
+  normalizeAndroidNetworkConfig(config);
+  validateAndroidConfig(config);
+  if (config.enablePushNotifications && !config.googleServicesFile) {
+    throw new Error("Android push notifications require a googleServicesFile");
+  }
+  if (config.googleServicesFile)
+    validateGoogleServicesFile(config.googleServicesFile, finalPackageName);
+  if (config.appIconPath)
+    requireRegularFile(config.appIconPath, "App icon");
+  const appIconExtension = config.appIconPath ? extname(config.appIconPath).toLowerCase() : undefined;
+  if (config.appIconPath && ![".gif", ".jpg", ".png", ".webp"].includes(appIconExtension ?? "")) {
+    throw new Error(`Unsupported Android app icon format: ${appIconExtension || "(none)"}`);
+  }
   const dirs = [
     output,
     join(output, "app/src/main/java", packagePath),
@@ -110,32 +391,24 @@ async function init(options) {
     join(output, "app/src/main/assets"),
     join(output, "gradle/wrapper")
   ];
+  if (existsSync(output) && !statSync(output).isDirectory()) {
+    throw new Error(`Android project output must be a directory: ${output}`);
+  }
   for (const dir of dirs) {
     if (!existsSync(dir)) {
       mkdirSync(dir, { recursive: true });
     }
   }
-  const config = {
-    ...DEFAULT_CONFIG,
-    appName: name,
-    packageName: finalPackageName,
-    ...options.config
-  };
-  if (config.enableBackgroundLocation)
-    config.enableGeolocation = true;
-  writeFileSync(join(output, "craft.config.json"), JSON.stringify(config, null, 2));
-  writeFileSync(join(output, "app/src/main/assets/craft.config.json"), JSON.stringify(config, null, 2));
+  writeAndroidConfig(output, config);
   const hasGoogleServices = Boolean(config.googleServicesFile);
   if (config.googleServicesFile) {
-    if (!existsSync(config.googleServicesFile))
-      throw new Error(`Google services file not found: ${config.googleServicesFile}`);
     cpSync(config.googleServicesFile, join(output, "app/google-services.json"));
   }
   const mainActivityTemplate = readFileSync(join(TEMPLATES_DIR, "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);
   const craftBridgeTemplate = readFileSync(join(TEMPLATES_DIR, "CraftBridge.kt.template"), "utf-8");
-  const craftBridge = craftBridgeTemplate.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(/\{\{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)
@@ -145,27 +418,26 @@ async function init(options) {
                     val token = if (task.isSuccessful) task.result else null
                     val callback = if (token.isNullOrBlank()) "window._craftPushReject" else "window._craftPushResolve"
                     val payload = JSONObject.quote(token ?: task.exception?.message ?: "Firebase Cloud Messaging is not configured")
-                    webView.evaluateJavascript("$callback && $callback($payload)", null)
+                    evaluatePromiseJavascript("$callback && $callback($payload)")
                 }
             } catch (error: Exception) {
                 val payload = JSONObject.quote(error.message ?: "Firebase Cloud Messaging is not configured")
-                webView.evaluateJavascript("window._craftPushReject && window._craftPushReject($payload)", null)
+                evaluatePromiseJavascript("window._craftPushReject && window._craftPushReject($payload)")
             }
-        }` : `activity.runOnUiThread {
-            webView.evaluateJavascript(
-                "window._craftPushReject && window._craftPushReject('Push notifications are disabled')",
-                null
-            )
-        }`);
+        }` : `evaluatePromiseJavascript(
+            "window._craftPushReject && window._craftPushReject('Push notifications are disabled')"
+        )`);
   writeFileSync(join(output, "app/src/main/java", packagePath, "CraftBridge.kt"), craftBridge);
+  const craftNative = readFileSync(join(TEMPLATES_DIR, "CraftNative.kt.template"), "utf-8");
+  const nativeDir = join(output, "app/src/main/java/com/craft/runtime");
+  mkdirSync(nativeDir, { recursive: true });
+  writeFileSync(join(nativeDir, "CraftNative.kt"), craftNative);
+  const serviceTemplate = readFileSync(join(TEMPLATES_DIR, "LocationRecordingService.kt.template"), "utf-8");
+  writeFileSync(join(nativeDir, "LocationRecordingService.kt"), serviceTemplate);
   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));
-  if (config.enableBackgroundLocation) {
-    const serviceTemplate = readFileSync(join(TEMPLATES_DIR, "LocationRecordingService.kt.template"), "utf-8");
-    writeFileSync(join(output, "app/src/main/java", packagePath, "LocationRecordingService.kt"), serviceTemplate.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://") ? "true" : "false").replace(/\{\{DEEP_LINK_INTENT_FILTERS\}\}/g, renderAndroidDeepLinks(config)).replace(/\{\{BACKGROUND_SERVICE\}\}/g, config.enableBackgroundLocation ? '        <service android:name=".LocationRecordingService" android:exported="false" android:foregroundServiceType="location" android:stopWithTask="false" />' : "").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://") ? "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(/\{\{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" />
@@ -178,13 +450,13 @@ 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, config.version || "1.0.0").replace(/\{\{VERSION_CODE\}\}/g, String(config.versionCode || 1)).replace(/\{\{MIN_SDK\}\}/g, String(config.minSdk || 24)).replace(/\{\{COMPILE_SDK\}\}/g, String(Math.max(config.compileSdk || 36, config.enableHealthConnect ? 36 : 1))).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(/\{\{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 || 24)).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(/\{\{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")` : "");
   writeFileSync(join(output, "app/build.gradle.kts"), appGradle);
   const proguardTemplate = readFileSync(join(TEMPLATES_DIR, "proguard-rules.pro.template"), "utf-8");
   writeFileSync(join(output, "app/proguard-rules.pro"), proguardTemplate.replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   const settingsTemplate = readFileSync(join(TEMPLATES_DIR, "settings.gradle.kts.template"), "utf-8");
-  const settings = settingsTemplate.replace(/\{\{APP_NAME\}\}/g, name);
+  const settings = settingsTemplate.replace(/\{\{APP_NAME\}\}/g, escapeKotlinString(generatedGradleProjectName(name)));
   writeFileSync(join(output, "settings.gradle.kts"), settings);
   const gradleProperties = `org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
@@ -205,7 +477,7 @@ zipStorePath=wrapper/dists
   writeFileSync(join(output, "gradle/wrapper/gradle-wrapper.properties"), gradleWrapperProps);
   const stringsXml = `<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">${name}</string>
+    <string name="app_name">${escapeXml(name)}</string>
 </resources>
 `;
   writeFileSync(join(output, "app/src/main/res/values/strings.xml"), stringsXml);
@@ -229,9 +501,7 @@ zipStorePath=wrapper/dists
 </vector>
 `;
   if (config.appIconPath) {
-    if (!existsSync(config.appIconPath))
-      throw new Error(`App icon not found: ${config.appIconPath}`);
-    cpSync(config.appIconPath, join(output, "app/src/main/res/drawable/craft_app_icon.png"));
+    cpSync(config.appIconPath, join(output, `app/src/main/res/drawable/craft_app_icon${appIconExtension}`));
   } else {
     writeFileSync(join(output, "app/src/main/res/drawable/craft_app_icon.xml"), appIconXml);
   }
@@ -265,7 +535,7 @@ zipStorePath=wrapper/dists
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>${name}</title>
+  <title>${escapeXml(name)}</title>
   <style>
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body {
@@ -285,7 +555,7 @@ zipStorePath=wrapper/dists
 </head>
 <body>
   <div class="container">
-    <h1>\u26A1 ${name}</h1>
+    <h1>\u26A1 ${escapeXml(name)}</h1>
     <p>Built with Craft Android</p>
     <p class="ready" id="status">Waiting for Craft bridge...</p>
   </div>
@@ -298,6 +568,11 @@ zipStorePath=wrapper/dists
 </body>
 </html>`;
   writeFileSync(join(output, "app/src/main/assets/index.html"), placeholderHtml);
+  const runtimeDir = resolveRuntimeDir(options.runtimeDir);
+  if (runtimeDir) {
+    installRuntime(output, runtimeDir);
+    console.log("   Installed the Zig runtime from", runtimeDir);
+  }
   console.log("\u2705 Project initialized");
   console.log("");
   console.log("Next steps:");
@@ -316,18 +591,29 @@ async function build(options) {
     throw new Error(`No craft.config.json found in ${output}. Run 'craft android init' first.`);
   }
   const config = JSON.parse(readFileSync(configPath, "utf-8"));
+  if (existsSync(join(output, "app/src/main/jniLibs"))) {
+    const runtimeDir = resolveRuntimeDir(options.runtimeDir);
+    if (runtimeDir) {
+      installRuntime(output, runtimeDir);
+      console.log("   Refreshed the Zig runtime from", runtimeDir);
+    } else {
+      console.log("   Keeping the Zig runtime installed at init (no runtime directory configured)");
+    }
+  }
   if (devServer) {
-    config.devServerURL = devServer;
-    config.trustedOrigins = [...new Set([...config.trustedOrigins ?? [], new URL(devServer).origin])];
-    writeFileSync(configPath, JSON.stringify(config, null, 2));
-    writeFileSync(join(output, "app/src/main/assets/craft.config.json"), JSON.stringify(config, null, 2));
+    const url = androidWebUrl(devServer, "Android dev server URL");
+    config.devServerURL = url.toString();
+    config.trustedOrigins = [...new Set([
+      ...(config.trustedOrigins ?? []).map((value) => androidWebUrl(value, "Android trusted origin").origin),
+      url.origin
+    ])];
+    writeAndroidConfig(output, config);
     console.log(`   Dev server: ${devServer}`);
   }
   if (htmlPath) {
     syncAndroidWebAssets(htmlPath, output);
     config.hasBundledFallback = Boolean(devServer);
-    writeFileSync(configPath, JSON.stringify(config, null, 2));
-    writeFileSync(join(output, "app/src/main/assets/craft.config.json"), JSON.stringify(config, null, 2));
+    writeAndroidConfig(output, config);
     console.log(`   Synced: ${htmlPath} \u2192 assets/`);
   }
   if (!compile)
@@ -400,9 +686,11 @@ async function run(options) {
 export {
   syncAndroidWebAssets,
   run,
+  resolveRuntimeDir,
   renderAndroidPermissions,
   renderAndroidDeepLinks,
   open,
+  installRuntime,
   init,
   build
 };

package/dist/android/src/promise-runtime.d.ts

@@ -0,0 +1,3 @@
+declare const ANDROID_PROMISE_RUNTIME = "\nif (window.__craftRejectPendingPromises) {\n    window.__craftRejectPendingPromises('Android bridge reinitialized');\n}\nif (window.__craftRejectPermissionRequests) {\n    window.__craftRejectPermissionRequests('Android bridge reinitialized');\n}\nwindow.__craftPromiseRuntimeClosed = false;\nwindow.__craftPendingPromises = Object.create(null);\nwindow.__craftPromise = function(channel, resolveName, rejectName, invoke, timeoutMs, timeoutError) {\n    if (window.__craftPromiseRuntimeClosed) {\n        return Promise.reject(new Error('Android bridge is closed'));\n    }\n    if (window.__craftPendingPromises[channel]) {\n        return Promise.reject(new Error('A '.concat(channel, ' request is already in progress')));\n    }\n\n    return new Promise(function(resolve, reject) {\n        var entry = {settled: false, timer: null, settle: null};\n        var resolveCallback;\n        var rejectCallback;\n\n        entry.settle = function(succeeded, value) {\n            if (entry.settled || window.__craftPendingPromises[channel] !== entry) return;\n            entry.settled = true;\n            if (entry.timer !== null) clearTimeout(entry.timer);\n            if (window[resolveName] === resolveCallback) window[resolveName] = null;\n            if (window[rejectName] === rejectCallback) window[rejectName] = null;\n            delete window.__craftPendingPromises[channel];\n            if (succeeded) resolve(value);\n            else reject(value);\n        };\n\n        resolveCallback = function(value) {\n            entry.settle(true, value);\n        };\n        rejectCallback = function(error) {\n            entry.settle(false, error);\n        };\n        window[resolveName] = resolveCallback;\n        window[rejectName] = rejectCallback;\n        window.__craftPendingPromises[channel] = entry;\n\n        if (timeoutMs > 0) {\n            entry.timer = setTimeout(function() {\n                entry.settle(false, timeoutError || new Error(channel.concat(' request timed out')));\n            }, timeoutMs);\n        }\n\n        try {\n            invoke();\n        }\n        catch (error) {\n            entry.settle(false, error);\n        }\n    });\n};\n\nwindow.__craftRejectPendingPromises = function(message) {\n    window.__craftPromiseRuntimeClosed = true;\n    Object.keys(window.__craftPendingPromises).forEach(function(channel) {\n        var entry = window.__craftPendingPromises[channel];\n        if (entry) entry.settle(false, new Error(message || 'Android bridge closed'));\n    });\n};\n";
+export declare function renderAndroidPromiseRuntime(indent?: string): string;
+export { ANDROID_PROMISE_RUNTIME };