craft-native 0.0.199 → 0.0.201

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

@@ -50,6 +50,14 @@ export interface CraftAndroidConfig {
     /** Reach the person's own devices on the local network over plain HTTP (a Mac companion). */
     enableLocalNetwork?: boolean;
     urlSchemes?: string[];
+    /** HTTPS hosts owned by the app; path rules are ordered, with `*` matching any path text. */
+    appLinks?: Array<{
+        host: string;
+        paths?: Array<{
+            pattern: string;
+            exclude?: boolean;
+        }>;
+    }>;
     trustedOrigins?: string[];
     appIconPath?: string;
     googleServicesFile?: string;

package/dist/android/src/index.js

@@ -188,6 +188,7 @@ var DEFAULT_CONFIG = {
   enableKeepAwake: false,
   enableDeepLinks: false,
   urlSchemes: [],
+  appLinks: [],
   trustedOrigins: [],
   minSdk: ANDROID_MIN_SDK,
   compileSdk: 36,
@@ -255,8 +256,21 @@ function normalizeAndroidNetworkConfig(config) {
     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");
+  config.appLinks = (config.appLinks ?? []).map((link) => {
+    const host = link.host.trim().toLowerCase();
+    const parsed = new URL(`https://${host}`);
+    if (!host || parsed.hostname !== host || parsed.port || parsed.username || parsed.password || parsed.pathname !== "/" || parsed.search || parsed.hash)
+      throw new Error("Android App Links need a hostname without a scheme, port or path");
+    for (const rule of link.paths ?? []) {
+      if (!rule.pattern.startsWith("/") || /[\x00-\x1f]/.test(rule.pattern) || rule.exclude !== undefined && typeof rule.exclude !== "boolean")
+        throw new Error("Android App Link path rules need an absolute path pattern and a boolean exclude");
+    }
+    return { ...link, host };
+  });
+  if (new Set(config.appLinks.map((link) => link.host)).size !== config.appLinks.length)
+    throw new Error("Android App Link hosts must be unique");
+  if (config.enableDeepLinks && config.urlSchemes.length === 0 && config.appLinks.length === 0) {
+    throw new Error("Android deep links require at least one URL scheme or an App Link host");
   }
   const trustedOrigins = (config.trustedOrigins ?? []).map((value) => {
     return androidWebUrl(value, "Android trusted origin").origin;
@@ -454,12 +468,25 @@ function renderAndroidDeepLinks(config) {
   if (!config.enableDeepLinks)
     return "";
   const schemes = [...new Set(config.urlSchemes?.map((value) => value.trim()).filter((value) => /^[a-z][a-z0-9+.-]*$/i.test(value)) ?? [])];
-  return schemes.map((scheme) => `            <intent-filter>
+  const custom = schemes.map((scheme) => `            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="${scheme}" />
             </intent-filter>`).join(`
+`);
+  const verified = (config.appLinks ?? []).map((link) => {
+    if (!/^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/i.test(link.host))
+      throw new Error("Invalid Android App Link host");
+    return `            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="${link.host}" />
+            </intent-filter>`;
+  }).join(`
+`);
+  return [custom, verified].filter(Boolean).join(`
 `);
 }
 var RUNTIME_ABIS = ["arm64-v8a", "x86_64"];
@@ -555,6 +582,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, "CraftAppLinks.kt"), readFileSync(join(TEMPLATES_DIR, "CraftAppLinks.kt.template"), "utf8").replace(/\{\{PACKAGE_NAME\}\}/g, finalPackageName));
   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");

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

@@ -8,6 +8,12 @@
     <!-- craft.speech: from Android 11 an app cannot see, and so cannot bind,
          a text-to-speech engine it has not declared it will look for. -->
     <queries>
+        <intent><action android:name="android.support.customtabs.action.CustomTabsService" /></intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
         <intent>
             <action android:name="android.intent.action.TTS_SERVICE" />
         </intent>

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

@@ -0,0 +1,47 @@
+package {{PACKAGE_NAME}}
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabsClient
+import androidx.browser.customtabs.CustomTabsIntent
+import org.json.JSONObject
+
+/** Ordered website path rules, also publishable as Android 15 dynamic App Links. */
+internal object CraftAppLinks {
+    fun opensInBrowser(config: JSONObject?, uri: Uri): Boolean {
+        if (uri.scheme != "https") return false
+        val hosts = config?.optJSONArray("appLinks") ?: return false
+        for (index in 0 until hosts.length()) {
+            val host = hosts.optJSONObject(index) ?: continue
+            if (!host.optString("host").equals(uri.host, ignoreCase = true)) continue
+            val rules = host.optJSONArray("paths") ?: return false
+            val path = uri.path.orEmpty().ifEmpty { "/" }
+            for (ruleIndex in 0 until rules.length()) {
+                val rule = rules.optJSONObject(ruleIndex) ?: continue
+                val pattern = rule.optString("pattern")
+                val regex = pattern.split('*').joinToString(".*") { Regex.escape(it) }
+                if (Regex("^$regex$").matches(path)) return rule.optBoolean("exclude", false)
+            }
+            return true
+        }
+        return false
+    }
+
+    /** An explicit browser package avoids handing a verified site URL back to ourselves. */
+    fun openBrowser(activity: Activity, uri: Uri) {
+        val customTabsPackage = CustomTabsClient.getPackageName(activity, null)
+        if (customTabsPackage != null && customTabsPackage != activity.packageName) {
+            val tab = CustomTabsIntent.Builder().setShowTitle(true).build()
+            tab.intent.setPackage(customTabsPackage)
+            tab.launchUrl(activity, uri)
+            return
+        }
+        val probe = Intent(Intent.ACTION_VIEW, Uri.parse("https://example.com")).addCategory(Intent.CATEGORY_BROWSABLE)
+        val browser = activity.packageManager.queryIntentActivities(probe, 0)
+            .firstOrNull { it.activityInfo.packageName != activity.packageName }
+            ?.activityInfo?.packageName
+            ?: throw IllegalStateException("No browser is installed")
+        activity.startActivity(Intent(Intent.ACTION_VIEW, uri).addCategory(Intent.CATEGORY_BROWSABLE).setPackage(browser))
+    }
+}

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

@@ -17,7 +17,6 @@ import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import android.view.WindowManager
 import androidx.appcompat.app.AlertDialog
-import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@@ -204,7 +203,7 @@ internal class CraftNativeServices(
         pendingBrowser = callback to done
         browserOpened = true
         try {
-            CustomTabsIntent.Builder().setShowTitle(true).build().launchUrl(host, uri)
+            CraftAppLinks.openBrowser(host, uri)
         } catch (_: ActivityNotFoundException) {
             host.startActivity(Intent(Intent.ACTION_VIEW, uri))
         }

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

@@ -99,6 +99,11 @@ class MainActivity : AppCompatActivity() {
         // reading its intent, which onNewIntent may have replaced with a
         // later warm link.
         val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
+        if (savedInstanceState == null && !launchedFromHistory && intent.data?.let { CraftAppLinks.opensInBrowser(configJson(), it) } == true) {
+            CraftAppLinks.openBrowser(this, intent.data!!)
+            finish()
+            return
+        }
         if (savedInstanceState == null) {
             if (!launchedFromHistory) {
                 intent.data?.toString()?.let(craftBridge::receiveDeepLink)
@@ -300,6 +305,12 @@ class MainActivity : AppCompatActivity() {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
+        intent.data?.let { link ->
+            if (CraftAppLinks.opensInBrowser(configJson(), link)) {
+                CraftAppLinks.openBrowser(this, link)
+                return
+            }
+        }
         intent.data?.toString()?.let(craftBridge::receiveDeepLink)
         handleIncomingShortcut(intent)
     }

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

@@ -3458,6 +3458,11 @@ class MainActivity : AppCompatActivity() {
         routes = CraftNativeRoutes(config)
         stores = CraftNativeStores.get(this, config)
         services = CraftNativeServices(this, config) { this }
+        if (savedInstanceState == null && intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY == 0 && intent.data?.let { CraftAppLinks.opensInBrowser(config, it) } == true) {
+            CraftAppLinks.openBrowser(this, intent.data!!)
+            finish()
+            return
+        }
         services.onBackgroundComplete = { ok, id ->
             if (id == null) {
                 val waiting = backgroundWaiters.values.toList()
@@ -6182,6 +6187,10 @@ class MainActivity : AppCompatActivity() {
         }
         intent.data?.let { link ->
             if (::services.isInitialized && services.deepLink(link)) return
+            if (CraftAppLinks.opensInBrowser(config, link)) {
+                CraftAppLinks.openBrowser(this, link)
+                return
+            }
             publish("DEEP_LINK", deepLinkData(link).put("initial", false))
             if (::routes.isInitialized && !routes.isEmpty) routes.appPath(link.toString(), urlSchemes)?.let { navigateOpen(it, fromLink = true) }
         }

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.199";
+var version = "0.0.201";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -309,7 +309,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.199";
+var version = "0.0.201";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -10403,11 +10403,17 @@ ${e.stdout ?? ""}`;
   };
 }
 async function verifyBundleTrust(appPath, policy = {}) {
-  const identity = await readBundleIdentity(appPath);
-  const requireNotarized = policy.requireNotarized ?? true;
   if (!import_fs3.existsSync(appPath)) {
-    return { ok: false, identity, gatekeeperSource: null, reason: "unreadable", detail: `No such bundle: ${appPath}` };
+    return {
+      ok: false,
+      identity: { identifier: null, teamId: null, authority: null },
+      gatekeeperSource: null,
+      reason: "unreadable",
+      detail: `No such bundle: ${appPath}`
+    };
   }
+  const identity = await readBundleIdentity(appPath);
+  const requireNotarized = policy.requireNotarized ?? true;
   try {
     await execFileAsync("codesign", ["--verify", "--deep", "--strict", "--verbose=2", appPath]);
   } catch (error) {

package/dist/index.js

@@ -57,7 +57,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.199";
+var version = "0.0.201";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -10162,11 +10162,17 @@ ${e.stdout ?? ""}`;
   };
 }
 async function verifyBundleTrust(appPath, policy = {}) {
-  const identity = await readBundleIdentity(appPath);
-  const requireNotarized = policy.requireNotarized ?? true;
   if (!existsSync4(appPath)) {
-    return { ok: false, identity, gatekeeperSource: null, reason: "unreadable", detail: `No such bundle: ${appPath}` };
+    return {
+      ok: false,
+      identity: { identifier: null, teamId: null, authority: null },
+      gatekeeperSource: null,
+      reason: "unreadable",
+      detail: `No such bundle: ${appPath}`
+    };
   }
+  const identity = await readBundleIdentity(appPath);
+  const requireNotarized = policy.requireNotarized ?? true;
   try {
     await execFileAsync("codesign", ["--verify", "--deep", "--strict", "--verbose=2", appPath]);
   } catch (error) {

package/dist/ios/templates/CraftHybrid.swift

@@ -1022,6 +1022,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     private var tabBarHeight: CGFloat = 0
     private var tabSwipeRecognizers: [UIGestureRecognizer] = []
     private var activeTabSwipeTarget: String?
+    private var tabSwipeSettling = false
     /// The edge the incoming tab started from for the current gesture. Keep
     /// this separate from the live frame: deriving it after the drag begins
     /// makes the target jump when the translation crosses the midpoint.
@@ -1077,6 +1078,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     }
 
     @objc private func tabSwipeRecognized(_ recognizer: UIPanGestureRecognizer) {
+        guard !tabSwipeSettling else { return }
         let tabs = hybrid.tabIds
         guard let index = tabs.firstIndex(of: currentTab), tabs.count > 1 else { return }
         let translation = recognizer.translation(in: view).x
@@ -1101,9 +1103,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
                 CraftChrome.shared.swipe(to: tabs[next])
                 return
             }
-            activeTabSwipeTarget = nil
-            let complete = recognizer.state == .ended && (abs(translation) >= max(32, view.bounds.width * 0.28) || abs(velocity) > 700)
+            // Keep the target until the settling animation has read it and
+            // finished. Clearing it here made finishInteractiveTabSwipe return
+            // early, leaving cancelled screens offset and completed swipes
+            // jumping straight to their destination.
+            tabSwipeSettling = true
+            let direction: CGFloat = tabSwipeFrom > 0 ? -1 : 1
+            let progress = translation * direction
+            let speed = velocity * direction
+            let complete = recognizer.state == .ended && speed > -700
+                && (progress >= max(32, view.bounds.width * 0.28) || speed > 700)
             finishInteractiveTabSwipe(completed: complete) { [weak self] in
+                self?.activeTabSwipeTarget = nil
+                self?.tabSwipeSettling = false
                 guard complete else {
                     CraftChrome.shared.cancelTabSwipe()
                     return
@@ -1121,8 +1133,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     /// transparent until its page route catches up. Two web roots still use
     /// the route-aware fallback because one WebView cannot render both pages.
     private func beginInteractiveTabSwipe(to id: String, direction: CGFloat) -> Bool {
-        guard let current = visibleStack, let target = stacks[id],
-              current.view !== target.view,
+        guard let current = visibleStack, view.bounds.width > 0 else { return false }
+        let target: UINavigationController
+        if let mounted = stacks[id] {
+            target = mounted
+        } else {
+            // A native tab must also follow the first swipe to it. Do not
+            // create a second web root here: the shared WebView cannot draw
+            // both pages during the same gesture.
+            guard hybrid.routes.match(id) != nil else { return false }
+            target = makeStack(tab: id, rootPath: id)
+            (target.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(false)
+        }
+        guard current.view !== target.view,
               !(current.topViewController is CraftHybridWebSlot && target.topViewController is CraftHybridWebSlot),
               view.bounds.width > 0 else { return false }
         if let slot = target.topViewController as? CraftHybridWebSlot {
@@ -1155,7 +1178,11 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard let targetId = activeTabSwipeTarget, let current = visibleStack,
               let target = stacks[targetId] else { return }
         let width = max(1, view.bounds.width)
-        let offset = min(width, max(-width, translation))
+        // Reversing past the start stays at zero progress, rather than
+        // pulling both screens away and exposing the background.
+        let offset = tabSwipeFrom > 0
+            ? min(0, max(-width, translation))
+            : max(0, min(width, translation))
         target.view.frame.origin.x = tabSwipeFrom + offset
         current.view.frame.origin.x = offset
     }
@@ -1164,14 +1191,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         guard let targetId = activeTabSwipeTarget, let current = visibleStack,
               let target = stacks[targetId] else { completion(); return }
         let width = view.bounds.width
-        let direction: CGFloat = target.view.frame.minX >= 0 ? 1 : -1
+        let direction: CGFloat = tabSwipeFrom > 0 ? 1 : -1
         let end = completed ? 0 : direction * width
-        let duration = CraftChrome.motion(.easeOut(duration: completed ? 0.22 : 0.18)) == nil ? 0 : 0.22
-        UIView.animate(withDuration: duration, animations: {
+        let settlingDuration = completed ? 0.22 : 0.18
+        let duration = CraftChrome.motion(.easeOut(duration: settlingDuration)) == nil ? 0 : settlingDuration
+        UIView.animate(withDuration: duration, delay: 0, options: [.curveEaseOut, .beginFromCurrentState], animations: {
             target.view.frame.origin.x = end
             current.view.frame.origin.x = completed ? -direction * width : 0
         }, completion: { _ in
-            if !completed {
+            if completed {
+                current.view.isHidden = true
+                current.view.frame = self.view.bounds
+                target.view.frame = self.view.bounds
+            } else {
                 target.view.isHidden = true
                 target.view.frame = self.view.bounds
                 current.view.frame = self.view.bounds
@@ -1690,7 +1722,8 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         if tabSwipeRecognizers.contains(where: { $0 === gestureRecognizer }) {
-            guard hybrid.tabIds.count > 1, let nav = visibleStack, let top = nav.topViewController else { return false }
+            guard activeTabSwipeTarget == nil, !tabSwipeSettling,
+                  hybrid.tabIds.count > 1, let nav = visibleStack, let top = nav.topViewController else { return false }
             guard CraftChrome.shared.tabSwipeEnabled else { return false }
             // Only between the tabs' own first screens, as the bar shows them:
             // deeper in a tab a swipe to the right is Back, and a screen that

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.199",
+  "version": "0.0.201",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",