Files
pj 90224dfd06 Physical-device iOS support (#64) (#66)
* feat(companion): add appState, eraseText, pressKey runner handlers

The Go runner transport already calls these methods; the in-device runner
implemented them only latently. They become load-bearing on the device
path, where the hybrid's legacy-companion fallback is absent. Backward
compatible: the simulator hybrid never calls them.

* feat(ios): resolve physical devices from devicectl

ResolveDevice parses xcrun devicectl list devices into Device{Name,
HardwareUDID, CoreDeviceID}: the hardware UDID feeds xcodebuild/iproxy
and the CoreDevice id feeds devicectl install. Matches by name or either
id; errors list candidates on none/ambiguous. Fixes the stale sidecar
comment on ResolveTarget.

* feat(ioscompanion): runner-only device driver mode

NewDevice reuses Driver with d.companion set to the runner dialed over an
iproxy usbmux tunnel, hybrid=false, runnerClient=nil. The existing accessor
seams then route launch/snapshot/text/gesture to the runner with no new
DeviceDriver methods. Device seams swap clear-state to a devicectl
reinstall, container reset to a warn-once no-op, and paste grant to a no-op.
realSpawnDeviceRunner builds and signs the runner at run time via the App
Store Connect API key (no Xcode UI), caching on a source hash.

* test(ioscompanion): cover device wiring, routing, and shell-out argv

Seam-driven NewDevice wiring + gesture/text routing (asserting no keyboard
HID), devicectl/build/test/iproxy argv builders, xctestrun test-target dict
name parsing, signing-credential env checks, and source-hash cache keying.

* feat(testrun): route physical-device iOS runs to the device driver

Execute resolves a non-simulator iOS target through ios.ResolveDevice into
its hardware UDID and CoreDevice id; buildDriver constructs NewDevice via a
seam instead of rejecting the device. Generalizes the --ios-device and
--ios-app-path help to cover the device path; signing stays env-read, never
a flag.

* feat(doctor): device prereqs replace java/sidecar for ios-device

iosDeviceChecks now verifies devicectl, iproxy on PATH, a connected+paired
device (via ios.ConnectedDevices), and App Store Connect signing creds (via
ioscompanion.VerifyDeviceSigning). The retired JVM sidecar checks stay only
under android.

* feat(conformance): device backend uses iphoneos app and tunnel orphan checks

The device backend now builds via just ios-device, points --ios-app-path at
the Debug-iphoneos bundle, and reinstalls each run for clear-state. The G5
orphan scan replaces the retired sidecar.jar check with lingering iproxy and
device test-without-building sessions (destination platform=iOS,id=).

* feat(folio): device build linking the iosArm64 framework

project.yml selects the Kotlin framework slice by SDK (iosArm64 for
iphoneos, iosSimulatorArm64 for simulator) and links via -framework Shared
on the SDK-conditional search path. New ios-device/test-ios-device recipes
mirror ios/test-ios, signing the Debug-iphoneos build with the .env API key.

* docs(cli): document ios-device doctor checks and the device flags

The --ios-device flag now also selects a connected device; --ios-app-path
covers the device install; the doctor gains an ios-device platform whose
checks are devicectl, iproxy, a paired device, and signing credentials.
Corrects the --clear-data default to true.

* fix(ioscompanion): resolve signing key path to absolute

xcodebuild's -authenticationKeyPath requires an absolute path, but .env
files commonly carry a repo-relative one. Resolve it against the working
directory before the stat so a relative ASC_API_KEY_PATH still signs.

* fix(ioscompanion): re-enable signing for the device runner build

companion/project.yml disables code signing for the simulator build, so
the device build inherited it and produced an unsigned runner that the
device rejected at install (0xe8008018). build-for-testing now forces
CODE_SIGNING_ALLOWED/REQUIRED=YES so automatic provisioning signs it.

* fix(ioscompanion): key the device build cache on signing identity

The cache marker hashed only sources, so switching signing team or key
reused a runner signed with the stale identity, which the device rejects at
install (0xe8008018). Fold team + key id into the cache key so a signing
change forces a rebuild.

* docs(getting-started): document physical iOS device setup

Lists the iproxy requirement and the App Store Connect signing env vars
(SANDERLING_IOS_TEAM, ASC_API_*) a device run needs, plus the
test-ios-device recipe and the doctor check.

* feat(ios): native usbmux client and in-process tunnel forwarder

Talk to macOS usbmuxd directly instead of shelling out to iproxy, so the
device path depends on nothing beyond macOS + Xcode.

* refactor(ios): drive device tunnel via io.Closer seam

Replace the tunnelChild *exec.Cmd and spawnTunnel seam with a tunnel
io.Closer and startTunnel seam backed by the in-process usbmux forwarder.

* refactor(ios): remove iproxy spawn from device runner

* test(ios): cover tunnel close via io.Closer not child process

* feat(doctor): check usbmuxd socket instead of iproxy on PATH

* chore(conformance): drop iproxy orphan check; tunnel is in-process

* docs(ios): device tunnel uses native usbmux, nothing to install

* chore: gitignore the signing keys directory

* feat(folio): add Android launcher icon (black bg, white dot)

* feat(folio): add iOS app icon (black bg, white dot)

* feat(folio): add web favicon (black bg, white dot)

* docs(ioscompanion): fix stale const comments

* refactor(ioscompanion): inline single-use devicectl argv builders

* refactor(ioscompanion): inline xcodegenArgs, drop tautological argv tests

* refactor(ioscompanion): inline firstNonEmpty

* refactor(doctor): dedup usbmuxd socket path via ioscompanion seam

* test(doctor): trim redundant signing-check test

* refactor(ioscompanion): deliver COMPANION_PORT via TEST_RUNNER_ env

* fix(testrun): seam preflight so iOS routing tests pass on CI without xcrun
2026-06-09 18:38:52 +05:30

244 lines
6.6 KiB
Go

// Package ios boots and prepares an iOS simulator for testing via simctl.
package ios
import (
"context"
"encoding/json"
"fmt"
"io"
"os/exec"
"strings"
"time"
)
type simDevice struct {
UDID string `json:"udid"`
State string `json:"state"`
Name string `json:"name"`
IsAvailable bool `json:"isAvailable"`
}
type simctlDeviceList struct {
Devices map[string][]simDevice `json:"devices"`
}
// Command-runner seams: overridable in tests so EnsureSimulator can be driven
// with canned device lists without invoking xcrun.
var (
listBooted = bootedSimulator
listBootedAll = bootedSimulators
listAvailable = availableSimulators
boot = bootSimulator
waitForBoot = waitForSimulatorBoot
)
func EnsureSimulator(ctx context.Context, deviceName string, stdout io.Writer) error {
booted, err := listBooted(ctx)
if err != nil {
return fmt.Errorf("list booted simulators: %w", err)
}
if booted != nil {
fmt.Fprintf(stdout, "using booted simulator: %s (%s)\n", booted.Name, booted.UDID)
return nil
}
available, err := listAvailable(ctx)
if err != nil {
return fmt.Errorf("list available simulators: %w", err)
}
target, err := pickSimulator(deviceName, available)
if err != nil {
return err
}
fmt.Fprintf(stdout, "booting simulator %q (%s)...\n", target.Name, target.UDID)
if err := boot(ctx, target.UDID); err != nil {
return fmt.Errorf("boot simulator %q: %w", target.UDID, err)
}
if err := waitForBoot(ctx, target.UDID, 60*time.Second); err != nil {
return fmt.Errorf("wait for simulator boot: %w", err)
}
fmt.Fprintf(stdout, "simulator %q ready\n", target.Name)
return nil
}
// BootedUDID returns the UDID of the currently booted iOS simulator, or "" if none is booted.
func BootedUDID(ctx context.Context) string {
d, _ := bootedSimulator(ctx)
if d == nil {
return ""
}
return d.UDID
}
// ResolveTarget decides which iOS target a run drives and whether it is a
// simulator. An explicit query matching a simulator name or UDID (booted or
// available) resolves to that simulator. With no query, exactly one booted
// simulator resolves to it; multiple booted simulators is an error that lists
// them and asks the caller to pass --ios-device. A query that matches no
// simulator resolves as a physical device (udid = query, simulator false),
// which the caller then resolves through ResolveDevice for the device driver.
func ResolveTarget(ctx context.Context, query string) (udid string, isSimulator bool, err error) {
if query != "" {
booted, err := listBootedAll(ctx)
if err != nil {
return "", false, fmt.Errorf("list booted simulators: %w", err)
}
if match := matchSimulator(query, booted); match != nil {
return match.UDID, true, nil
}
available, err := listAvailable(ctx)
if err != nil {
return "", false, fmt.Errorf("list available simulators: %w", err)
}
if match := matchSimulator(query, available); match != nil {
return match.UDID, true, nil
}
return query, false, nil
}
booted, err := listBootedAll(ctx)
if err != nil {
return "", false, fmt.Errorf("list booted simulators: %w", err)
}
switch len(booted) {
case 1:
return booted[0].UDID, true, nil
case 0:
return "", false, fmt.Errorf("no booted iOS simulator found")
default:
var lines strings.Builder
for _, device := range booted {
fmt.Fprintf(&lines, "\n %s (%s)", device.Name, device.UDID)
}
return "", false, fmt.Errorf("multiple booted iOS simulators; pass --ios-device to select one:%s", lines.String())
}
}
func matchSimulator(query string, devices []simDevice) *simDevice {
for i := range devices {
if devices[i].Name == query || devices[i].UDID == query {
return &devices[i]
}
}
return nil
}
func bootedSimulator(ctx context.Context) (*simDevice, error) {
out, err := exec.CommandContext(ctx, "xcrun", "simctl", "list", "devices", "booted", "--json").Output()
if err != nil {
return nil, err
}
return parseBootedDevice(out)
}
func bootedSimulators(ctx context.Context) ([]simDevice, error) {
out, err := exec.CommandContext(ctx, "xcrun", "simctl", "list", "devices", "booted", "--json").Output()
if err != nil {
return nil, err
}
return parseBootedDevices(out)
}
func availableSimulators(ctx context.Context) ([]simDevice, error) {
out, err := exec.CommandContext(ctx, "xcrun", "simctl", "list", "devices", "available", "--json").Output()
if err != nil {
return nil, err
}
return parseAvailableDevices(out)
}
func parseBootedDevice(out []byte) (*simDevice, error) {
var list simctlDeviceList
if err := json.Unmarshal(out, &list); err != nil {
return nil, err
}
for _, devices := range list.Devices {
for i := range devices {
if devices[i].State == "Booted" {
return &devices[i], nil
}
}
}
return nil, nil
}
func parseBootedDevices(out []byte) ([]simDevice, error) {
var list simctlDeviceList
if err := json.Unmarshal(out, &list); err != nil {
return nil, err
}
var result []simDevice
for _, devices := range list.Devices {
for i := range devices {
if devices[i].State == "Booted" {
result = append(result, devices[i])
}
}
}
return result, nil
}
func parseAvailableDevices(out []byte) ([]simDevice, error) {
var list simctlDeviceList
if err := json.Unmarshal(out, &list); err != nil {
return nil, err
}
var result []simDevice
for _, devices := range list.Devices {
for _, d := range devices {
if d.IsAvailable {
result = append(result, d)
}
}
}
return result, nil
}
func pickSimulator(deviceName string, available []simDevice) (*simDevice, error) {
if deviceName != "" {
for i, d := range available {
if d.Name == deviceName || d.UDID == deviceName {
return &available[i], nil
}
}
return nil, fmt.Errorf("simulator %q not found among available simulators; run `xcrun simctl list devices available` to see options", deviceName)
}
if len(available) == 0 {
return nil, fmt.Errorf("no available iOS simulators found; create one in Xcode -> Window -> Devices and Simulators")
}
for i, d := range available {
if strings.HasPrefix(d.Name, "iPhone") {
return &available[i], nil
}
}
return &available[0], nil
}
func bootSimulator(ctx context.Context, udid string) error {
return exec.CommandContext(ctx, "xcrun", "simctl", "boot", udid).Run()
}
func waitForSimulatorBoot(ctx context.Context, udid string, timeout time.Duration) error {
deadline, cancel := context.WithTimeout(ctx, timeout)
defer cancel()
ticker := time.NewTicker(2 * time.Second)
defer ticker.Stop()
for {
booted, _ := bootedSimulator(deadline)
if booted != nil && (booted.UDID == udid || udid == "") {
return nil
}
select {
case <-deadline.Done():
return deadline.Err()
case <-ticker.C:
}
}
}