craft-native 0.0.210 → 0.0.212

package/README.md

@@ -499,6 +499,29 @@ cd packages/examples-ts
 bun run hello-world
 ```
 
+## Mobile restart and update tests
+
+Use the Bun-only `craft-native/testing` entrypoint to interrupt an installed app
+on an explicitly selected iOS Simulator or Android emulator:
+
+```ts
+import { createMobileTestDevice } from 'craft-native/testing'
+
+const device = createMobileTestDevice({
+  platform: 'android', device: 'emulator-5582', appId: 'org.example.app',
+})
+await device.restart()
+const { previousBuild, build } = await device.installUpdate('/path/to/update.apk')
+```
+
+For iOS use `platform: 'ios'`, the simulator UUID, and an `.app` directory.
+`restart()` waits for a new boot; `installUpdate()` requires an existing app and
+preserves its data. Android updates must use the original signing key. Supply a
+higher build number and assert the returned installed builds, then run your
+app's UI checks for persisted progress and offline content. Neither operation
+uninstalls an app or clears its data. The controls deliberately refuse physical
+devices and implicit device selectors.
+
 ## Contributing
 
 We love contributions! Please see our [contributing guide](../../CONTRIBUTING.md).

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

@@ -142,7 +142,7 @@ import kotlin.math.pow
 
 private const val CRAFT_NATIVE_CAPABILITY_TIMEOUT_MS = 30_000L
 
-private fun craftNativeOptionalString(value: Any?): String? = value
+internal fun craftNativeOptionalString(value: Any?): String? = value
     ?.takeUnless { it == JSONObject.NULL }
     ?.toString()
     ?.takeUnless { it == "null" || it == "undefined" }
@@ -2515,7 +2515,7 @@ private class CraftNativeScrollView(context: Context) : SwipeRefreshLayout(conte
             }
 
             scroller.setOnScrollChangeListener { _, x, y, _, _ ->
-                if (!horizontal) updateStickyHeaders()
+                if (horizontalMode != true) updateStickyHeaders()
                 onScroll?.invoke(x, y)
             }
             scroller.setOnTouchListener { _, event ->
@@ -6222,7 +6222,7 @@ class MainActivity : AppCompatActivity() {
             else -> 400
         }
         view.typeface = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Typeface.create("sans-serif", weight, false)
+            Typeface.create(Typeface.create("sans-serif", Typeface.NORMAL), weight, false)
         } else {
             Typeface.create("sans-serif", if (weight >= 600) Typeface.BOLD else Typeface.NORMAL)
         }

package/dist/cli.js

@@ -3424,7 +3424,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.210";
+var version = "0.0.212";
 
 // 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.210";
+var version = "0.0.212";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -57,7 +57,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.210";
+var version = "0.0.212";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftLiveActivityWidget.swift.template

@@ -11,9 +11,9 @@ struct CraftLiveActivityWidget: Widget {
     var body: some WidgetConfiguration {
         ActivityConfiguration(for: CraftActivityAttributes.self) { context in
             HStack(spacing: 12) {
-                Image(systemName: symbol(context)).font(.title2).foregroundStyle(tint(context))
+                activityIcon(context).font(.title2)
                 VStack(alignment: .leading, spacing: 4) {
-                    Text(context.attributes.title).font(.headline).lineLimit(1)
+                    Text(context.attributes.title).font(.headline).lineLimit(2)
                     if let detail = context.state.detail, !detail.isEmpty {
                         Text(detail).font(.subheadline).lineLimit(1)
                     }
@@ -33,14 +33,14 @@ struct CraftLiveActivityWidget: Widget {
         } dynamicIsland: { context in
             DynamicIsland {
                 DynamicIslandExpandedRegion(.leading) {
-                    Image(systemName: symbol(context)).foregroundStyle(tint(context)).font(.title2)
+                    activityIcon(context).font(.title2)
                 }
                 DynamicIslandExpandedRegion(.trailing) {
                     timer(context).font(.title2.monospacedDigit().weight(.semibold))
                 }
                 DynamicIslandExpandedRegion(.center) {
                     VStack(spacing: 3) {
-                        Text(context.attributes.title).font(.headline).lineLimit(1)
+                        Text(context.attributes.title).font(.headline).lineLimit(2)
                         Text(context.isStale ? context.state.staleStatus ?? context.state.status : context.state.status).font(.caption).foregroundStyle(.secondary).lineLimit(1)
                     }
                 }
@@ -59,17 +59,26 @@ struct CraftLiveActivityWidget: Widget {
                     }
                 }
             } compactLeading: {
-                Image(systemName: symbol(context)).foregroundStyle(tint(context))
+                activityIcon(context)
             } compactTrailing: {
-                timer(context).monospacedDigit().frame(maxWidth: 64)
+                timer(context).monospacedDigit().frame(maxWidth: 64, alignment: .trailing)
             } minimal: {
-                Image(systemName: symbol(context)).foregroundStyle(tint(context))
+                activityIcon(context)
             }
             .widgetURL(context.attributes.deepLink.flatMap(URL.init(string:)))
             .keylineTint(tint(context))
         }
     }
 
+    private func activityIcon(_ context: ActivityViewContext<CraftActivityAttributes>) -> some View {
+        // The pause glyph uses the active symbol's footprint, keeping the
+        // title's leading edge steady through state changes.
+        Image(systemName: context.attributes.symbol ?? "timer")
+            .hidden()
+            .overlay { Image(systemName: symbol(context)) }
+            .foregroundStyle(tint(context))
+    }
+
     private func symbol(_ context: ActivityViewContext<CraftActivityAttributes>) -> String {
         context.state.paused == true ? "pause.fill" : context.attributes.symbol ?? "timer"
     }
@@ -82,8 +91,23 @@ struct CraftLiveActivityWidget: Widget {
 
     private func date(_ milliseconds: Double) -> Date { Date(timeIntervalSince1970: milliseconds / 1000) }
 
-    @ViewBuilder
     private func timer(_ context: ActivityViewContext<CraftActivityAttributes>) -> some View {
+        // Measure the hour format in the inherited native font. A widget's
+        // ticking Text is horizontally flexible; an overlay bounds it to this
+        // footprint so names retain the same width when the timer pauses.
+        Text(duration(max(3600, context.state.durationSeconds, context.state.remainingSeconds ?? 0)))
+            .lineLimit(1)
+            .hidden()
+            .overlay(alignment: .trailing) {
+                timerContent(context)
+                    .multilineTextAlignment(.trailing)
+                    .lineLimit(1)
+                    .minimumScaleFactor(0.8)
+            }
+    }
+
+    @ViewBuilder
+    private func timerContent(_ context: ActivityViewContext<CraftActivityAttributes>) -> some View {
         if context.state.paused == true {
             Text(duration(context.state.remainingSeconds ?? context.state.durationSeconds))
         } else if let end = context.state.timerEndsAt {

package/dist/ios/templates/testing/DriverTests.swift.template

@@ -167,7 +167,7 @@ final class DriverTests: XCTestCase {
     }
 
     func testScript() throws {
-        continueAfterFailure = true
+        continueAfterFailure = false
         let data: Data?
         if let resource = Bundle(for: DriverTests.self).url(forResource: "journey", withExtension: "txt") {
             bundledJourney = true
@@ -219,7 +219,13 @@ final class DriverTests: XCTestCase {
             check(element(containing: arg, in: springboard) == nil, "systemabsent \(arg)")
         case "systemtap":
             let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")
-            if let target = poll(10, { element(containing: arg, in: springboard) }) { press(target); note("systemtap \(arg): ok") }
+            // Widget text lives in a remote accessibility host. Its frame can
+            // be visible while XCTest cannot resolve an activation point. Tap
+            // the containing system button (the actual Live Activity card).
+            let predicate = NSPredicate(format: "label CONTAINS[c] %@ OR identifier == %@", arg, arg)
+            let card = springboard.buttons.containing(predicate).firstMatch
+            if card.exists && card.isHittable { press(card); note("systemtap \(arg): ok") }
+            else if let target = poll(10, { element(containing: arg, in: springboard) }) { press(target); note("systemtap \(arg): ok") }
             else { XCTFail("System element not found"); note("FAIL systemtap \(arg): NOT FOUND") }
         case "systemtree":
             let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")

package/dist/mobile-testing.d.ts

@@ -0,0 +1,25 @@
+export type MobileTestDeviceOptions = {
+    platform: 'ios';
+    device: string;
+    appId: string;
+    xcrun?: string;
+} | {
+    platform: 'android';
+    device: string;
+    appId: string;
+    adb?: string;
+};
+export interface MobileTestDevice {
+    restart: () => Promise<void>;
+    installUpdate: (artifact: string) => Promise<{
+        previousBuild: string;
+        build: string;
+    }>;
+    installedBuild: () => Promise<string>;
+}
+/**
+ * Drives an explicitly selected simulator/emulator. Restart preserves its disk;
+ * update installs over the existing app, without uninstalling or clearing data.
+ * Keep product assertions in the app's journey, after these OS boundaries.
+ */
+export declare function createMobileTestDevice(options: MobileTestDeviceOptions): MobileTestDevice;

package/dist/mobile-testing.js

@@ -0,0 +1,78 @@
+// @bun
+// src/mobile-testing.ts
+import { access } from "fs/promises";
+import { join } from "path";
+function createMobileTestDevice(options) {
+  if (!/^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/.test(options.appId))
+    throw new Error("An explicit app identifier is required");
+  if (options.platform === "ios" && !/^[a-f\d]{8}(?:-[a-f\d]{4}){3}-[a-f\d]{12}$/i.test(options.device))
+    throw new Error("An explicit iOS simulator UUID is required");
+  if (options.platform === "android" && !/^emulator-\d+$/.test(options.device))
+    throw new Error("An explicit Android emulator serial is required");
+  async function run(args, timeout = 120000) {
+    const child = Bun.spawn(args, { stdout: "pipe", stderr: "pipe" });
+    const deadline = setTimeout(() => child.kill(), timeout);
+    try {
+      const [output, errors, code] = await Promise.all([new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited]);
+      if (code !== 0)
+        throw new Error(`Mobile test command failed: ${args[0]} ${args[1]} (${code})
+${errors || output}`);
+      return output.trim();
+    } finally {
+      clearTimeout(deadline);
+    }
+  }
+  const ios = (...args) => run([options.platform === "ios" ? options.xcrun || "xcrun" : "xcrun", "simctl", ...args]);
+  const android = (...args) => run([options.platform === "android" ? options.adb || "adb" : "adb", "-s", options.device, ...args]);
+  async function installedBuild() {
+    if (options.platform === "ios") {
+      const app = await ios("get_app_container", options.device, options.appId, "app");
+      return run(["/usr/libexec/PlistBuddy", "-c", "Print :CFBundleVersion", join(app, "Info.plist")]);
+    }
+    const result = await android("shell", "dumpsys", "package", options.appId);
+    const version = result.match(/\bversionCode=(\d+)/)?.[1];
+    if (!version)
+      throw new Error(`App is not installed: ${options.appId}`);
+    return version;
+  }
+  async function restart() {
+    if (options.platform === "ios") {
+      await ios("shutdown", options.device);
+      await ios("boot", options.device);
+      await ios("bootstatus", options.device, "-b");
+      return;
+    }
+    const previousBoot = await android("shell", "cat", "/proc/sys/kernel/random/boot_id");
+    await android("reboot");
+    const deadline = Date.now() + 120000;
+    while (Date.now() < deadline) {
+      try {
+        await android("wait-for-device");
+        const boot = await android("shell", "cat", "/proc/sys/kernel/random/boot_id");
+        if (boot !== previousBoot && await android("shell", "getprop", "sys.boot_completed") === "1") {
+          await android("shell", "input", "keyevent", "82");
+          return;
+        }
+      } catch {}
+      await Bun.sleep(500);
+    }
+    throw new Error("Android emulator did not complete a new boot");
+  }
+  async function installUpdate(artifact) {
+    const previousBuild = await installedBuild();
+    if (options.platform === "ios") {
+      const id = await run(["/usr/libexec/PlistBuddy", "-c", "Print :CFBundleIdentifier", join(artifact, "Info.plist")]);
+      if (id !== options.appId)
+        throw new Error("Update bundle identifier differs from the installed app");
+      await ios("install", options.device, artifact);
+    } else {
+      await access(artifact);
+      await android("install", "-r", artifact);
+    }
+    return { previousBuild, build: await installedBuild() };
+  }
+  return { restart, installUpdate, installedBuild };
+}
+export {
+  createMobileTestDevice
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.210",
+  "version": "0.0.212",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",
@@ -39,6 +39,11 @@
         "default": "./dist/index.cjs"
       }
     },
+    "./testing": {
+      "browser": null,
+      "types": "./dist/mobile-testing.d.ts",
+      "import": "./dist/mobile-testing.js"
+    },
     "./mobile": {
       "types": "./dist/mobile.d.ts",
       "import": "./dist/mobile.js",
@@ -67,6 +72,9 @@
   },
   "typesVersions": {
     "*": {
+      "testing": [
+        "./dist/mobile-testing.d.ts"
+      ],
       "mobile": [
         "./dist/mobile.d.ts"
       ],