craft-native 0.0.91 → 0.0.92

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

@@ -44,7 +44,19 @@ class MainActivity : AppCompatActivity() {
 
         webView = findViewById(R.id.webview)
         craftBridge = CraftBridge(this, webView, CraftHealthConnect(this, webView))
-        handleIncomingDeepLink(intent, dispatch = false)
+        // The link that launched the app (#215). Queued until the page's bridge
+        // is injected, then dispatched once with `initial: true`, so a page that
+        // subscribes rather than calling getInitialURL still hears it. A
+        // relaunch from Recents carries the old intent, and was not opened by it.
+        // A recreated activity restores what the bridge saved: its intent may
+        // be a later warm link that onNewIntent set.
+        if (savedInstanceState == null) {
+            val launchLink = intent.data?.toString()
+            val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
+            if (launchLink != null && !launchedFromHistory) craftBridge.receiveDeepLink(launchLink)
+        } else {
+            craftBridge.restoreDeepLinks(savedInstanceState)
+        }
         if (savedInstanceState == null) handleIncomingShortcut(intent)
 
         setupWebView()
@@ -150,12 +162,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun handleIncomingDeepLink(source: Intent?, dispatch: Boolean) {
-        val url = source?.data?.toString() ?: return
-        craftBridge.setInitialURL(url)
-        if (dispatch) craftBridge.dispatchDeepLink(url)
-    }
-
     private fun handleIncomingShortcut(source: Intent?) {
         source?.getStringExtra(SHORTCUT_TYPE_EXTRA)?.let(craftBridge::dispatchShortcut)
     }
@@ -198,10 +204,15 @@ class MainActivity : AppCompatActivity() {
         return (uri.scheme == "https" || localDevelopment) && origin in trustedOrigins
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        craftBridge.saveDeepLinks(outState)
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
-        handleIncomingDeepLink(intent, dispatch = true)
+        intent.data?.toString()?.let(craftBridge::receiveDeepLink)
         handleIncomingShortcut(intent)
     }
 

package/dist/api/mobile.d.ts

@@ -550,9 +550,12 @@ export declare const share: {
     /**
      * Open native share dialog.
      *
+     * Resolves `true` when the person shared and `false` when they dismissed the
+     * dialog, on the native bridges and in the browser alike.
+     *
      * @param options - Share options
      */
-    share(options: ShareOptions): Promise<void>;
+    share(options: ShareOptions): Promise<boolean>;
     /**
      * Check if sharing is available.
      */
@@ -670,7 +673,14 @@ export declare const keepAwake: {
 };
 export declare const deepLinks: {
     getInitialURL(): Promise<string | null>;
-    onLink(callback: (url: string) => void): () => void;
+    /**
+     * The second argument says whether this is the link that launched the app.
+     * A page that also calls `getInitialURL()` after an await gets that link
+     * from both, and can skip it here when `initial` is true.
+     */
+    onLink(callback: (url: string, link: {
+        initial: boolean;
+    }) => void): () => void;
 };
 export declare function normalizeDeepLinkURL(value: unknown): string | null;
 export declare const network: {

package/dist/cli.js

@@ -1575,7 +1575,7 @@ async function open(options) {
   await $`open ${projectPath}`;
 }
 function orderSimulators(devices) {
-  return [...devices].sort((left, right) => {
+  return devices.filter((device) => device.runtime.startsWith("iOS")).sort((left, right) => {
     const booted = Number(right.state === "Booted") - Number(left.state === "Booted");
     if (booted !== 0)
       return booted;
@@ -1730,9 +1730,11 @@ var exports_src2 = {};
 __export(exports_src2, {
   syncAndroidWebAssets: () => syncAndroidWebAssets,
   run: () => run2,
+  resolveRuntimeDir: () => resolveRuntimeDir2,
   renderAndroidPermissions: () => renderAndroidPermissions,
   renderAndroidDeepLinks: () => renderAndroidDeepLinks,
   open: () => open2,
+  installRuntime: () => installRuntime2,
   init: () => init2,
   build: () => build2
 });
@@ -1928,6 +1930,36 @@ function renderAndroidDeepLinks(config) {
             </intent-filter>`).join(`
 `);
 }
+function resolveRuntimeDir2(override) {
+  if (override === null)
+    return null;
+  const dir = override ?? process.env.CRAFT_ANDROID_RUNTIME;
+  if (!dir)
+    return null;
+  if (!existsSync5(dir)) {
+    const source = override === undefined ? "CRAFT_ANDROID_RUNTIME points at" : "runtimeDir is";
+    throw new Error(`${source} ${dir}, which does not exist.`);
+  }
+  return dir;
+}
+function installRuntime2(output, runtimeDir) {
+  const found = RUNTIME_ABIS.map((abi) => ({ abi, source: join3(runtimeDir, abi, "libcraft.so") })).filter((entry) => existsSync5(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 = join3(output, "app/src/main/jniLibs");
+  rmSync3(dest, { force: true, recursive: true });
+  for (const { abi, source } of found) {
+    const abiDir = join3(dest, abi);
+    mkdirSync3(abiDir, { recursive: true });
+    cpSync3(source, join3(abiDir, "libcraft.so"));
+  }
+  return true;
+}
 async function init2(options) {
   const { name, packageName, output } = options;
   console.log(`
@@ -2147,6 +2179,11 @@ zipStorePath=wrapper/dists
 </body>
 </html>`;
   writeFileSync4(join3(output, "app/src/main/assets/index.html"), placeholderHtml);
+  const runtimeDir = resolveRuntimeDir2(options.runtimeDir);
+  if (runtimeDir) {
+    installRuntime2(output, runtimeDir);
+    console.log("   Installed the Zig runtime from", runtimeDir);
+  }
   console.log("\u2705 Project initialized");
   console.log("");
   console.log("Next steps:");
@@ -2165,6 +2202,15 @@ async function build2(options) {
     throw new Error(`No craft.config.json found in ${output}. Run 'craft android init' first.`);
   }
   const config = JSON.parse(readFileSync4(configPath, "utf-8"));
+  if (existsSync5(join3(output, "app/src/main/jniLibs"))) {
+    const runtimeDir = resolveRuntimeDir2(options.runtimeDir);
+    if (runtimeDir) {
+      installRuntime2(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) {
     const url = androidWebUrl(devServer, "Android dev server URL");
     config.devServerURL = url.toString();
@@ -2313,7 +2359,7 @@ window.__craftRejectPendingPromises = function(message) {
         if (entry) entry.settle(false, new Error(message || 'Android bridge closed'));
     });
 };
-`, TEMPLATES_DIR2, LOCAL_DEVELOPMENT_HOSTS, KOTLIN_KEYWORDS, DEFAULT_CONFIG2;
+`, TEMPLATES_DIR2, LOCAL_DEVELOPMENT_HOSTS, KOTLIN_KEYWORDS, DEFAULT_CONFIG2, RUNTIME_ABIS;
 var init_src2 = __esm(() => {
   ({ $: $2 } = globalThis.Bun);
   TEMPLATES_DIR2 = join3(dirname2(import.meta.dir), "templates");
@@ -2371,6 +2417,7 @@ var init_src2 = __esm(() => {
     compileSdk: 36,
     targetSdk: 35
   };
+  RUNTIME_ABIS = ["arm64-v8a", "x86_64"];
 });
 
 // ../../node_modules/@stacksjs/clapp/dist/index.js
@@ -4537,7 +4584,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.91";
+var version = "0.0.92";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -5089,11 +5089,18 @@ var share = {
       return craft.share.share(options);
     }
     if (navigator.share) {
-      await navigator.share({
-        title: options.title,
-        text: options.text,
-        url: options.url
-      });
+      try {
+        await navigator.share({
+          title: options.title,
+          text: options.text,
+          url: options.url
+        });
+        return true;
+      } catch (error) {
+        if (error instanceof DOMException && error.name === "AbortError")
+          return false;
+        throw error;
+      }
     } else {
       throw new Error("Share API not available");
     }

package/dist/index.js

@@ -4850,11 +4850,18 @@ var share = {
       return craft.share.share(options);
     }
     if (navigator.share) {
-      await navigator.share({
-        title: options.title,
-        text: options.text,
-        url: options.url
-      });
+      try {
+        await navigator.share({
+          title: options.title,
+          text: options.text,
+          url: options.url
+        });
+        return true;
+      } catch (error) {
+        if (error instanceof DOMException && error.name === "AbortError")
+          return false;
+        throw error;
+      }
     } else {
       throw new Error("Share API not available");
     }

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

@@ -201,7 +201,7 @@ export interface SimulatorDevice {
     runtime: string;
 }
 /**
- * Every available simulator, newest runtime first, iPhones before iPads.
+ * Every available *iOS* simulator, newest runtime first, iPhones before iPads.
  *
  * Exported because the choice is worth testing without a simulator present -
  * `pickSimulator` is the policy and this is the data it reads.

package/dist/ios/src/index.js

@@ -559,7 +559,7 @@ async function open(options) {
   await $`open ${projectPath}`;
 }
 function orderSimulators(devices) {
-  return [...devices].sort((left, right) => {
+  return devices.filter((device) => device.runtime.startsWith("iOS")).sort((left, right) => {
     const booted = Number(right.state === "Booted") - Number(left.state === "Booted");
     if (booted !== 0)
       return booted;