mirror of
https://github.com/priyanshujain/sanderling.git
synced 2026-10-02 19:17:10 +00:00
* 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
227 lines
7.5 KiB
Go
227 lines
7.5 KiB
Go
package testrun
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"os"
|
|
"os/exec"
|
|
"strconv"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/priyanshujain/sanderling/internal/android"
|
|
"github.com/priyanshujain/sanderling/internal/driver"
|
|
"github.com/priyanshujain/sanderling/internal/driver/chrome"
|
|
"github.com/priyanshujain/sanderling/internal/driver/ioscompanion"
|
|
driverSidecar "github.com/priyanshujain/sanderling/internal/driver/sidecar"
|
|
"github.com/priyanshujain/sanderling/internal/ios"
|
|
"github.com/priyanshujain/sanderling/internal/sidecarassets"
|
|
)
|
|
|
|
// iOS resolution seams: package-level so routing tests substitute canned
|
|
// resolvers instead of shelling out to xcrun.
|
|
var (
|
|
iosResolveTarget = ios.ResolveTarget
|
|
iosResolveDevice = ios.ResolveDevice
|
|
iosEnsureSimulator = ios.EnsureSimulator
|
|
)
|
|
|
|
// resolveIOSTarget decides whether a run drives a simulator or a physical
|
|
// device and fills the iOS fields on Options. A simulator target is booted if
|
|
// needed; a physical-device target is resolved to its hardware UDID and
|
|
// CoreDevice id via devicectl.
|
|
func resolveIOSTarget(ctx context.Context, options Options, stdout io.Writer) (Options, error) {
|
|
udid, isSimulator, err := iosResolveTarget(ctx, options.IosDevice)
|
|
if err != nil {
|
|
// No query and nothing booted: keep boot-first behavior, then resolve
|
|
// the simulator that EnsureSimulator just brought up.
|
|
if options.IosDevice == "" {
|
|
if bootErr := iosEnsureSimulator(ctx, "", stdout); bootErr != nil {
|
|
return options, bootErr
|
|
}
|
|
udid, isSimulator, err = iosResolveTarget(ctx, "")
|
|
}
|
|
if err != nil {
|
|
return options, err
|
|
}
|
|
} else if isSimulator {
|
|
if err := iosEnsureSimulator(ctx, options.IosDevice, stdout); err != nil {
|
|
return options, err
|
|
}
|
|
udid, isSimulator, err = iosResolveTarget(ctx, options.IosDevice)
|
|
if err != nil {
|
|
return options, err
|
|
}
|
|
}
|
|
options.iosUDID = udid
|
|
options.iosIsSimulator = isSimulator
|
|
if !isSimulator {
|
|
device, err := iosResolveDevice(ctx, options.IosDevice)
|
|
if err != nil {
|
|
return options, err
|
|
}
|
|
options.iosUDID = device.HardwareUDID
|
|
options.iosCoreDeviceID = device.CoreDeviceID
|
|
fmt.Fprintf(stdout, "using device: %s (udid %s, id %s)\n", device.Name, device.HardwareUDID, device.CoreDeviceID)
|
|
}
|
|
return options, nil
|
|
}
|
|
|
|
// preflight is a seam so routing tests exercise driver construction without the
|
|
// host-readiness checks (xcrun, java) that are absent on a Linux CI runner.
|
|
var preflight = Preflight
|
|
|
|
// newDeviceDriver constructs the physical-device iOS driver and its cleanup. A
|
|
// seam so routing tests assert the resolved identifiers reach DeviceOptions
|
|
// without building or spawning a real runner.
|
|
var newDeviceDriver = func(ctx context.Context, options ioscompanion.DeviceOptions) (driver.DeviceDriver, func(), error) {
|
|
d, err := ioscompanion.NewDevice(ctx, options)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return d, d.Close, nil
|
|
}
|
|
|
|
// buildDriver creates the appropriate DeviceDriver for the platform and returns
|
|
// a cleanup function. For web, ChromeDriver is used directly. An iOS simulator
|
|
// is driven by the native simulator companion (no JVM). A physical iOS device
|
|
// is driven runner-only over a usbmux tunnel. Android uses the JVM sidecar,
|
|
// which is extracted, spawned, and dialed.
|
|
func buildDriver(ctx context.Context, options Options, stdout io.Writer) (driver.DeviceDriver, func(), error) {
|
|
if err := preflight(ctx, options.Platform); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if options.Platform == "web" {
|
|
d := chrome.New()
|
|
return d, func() { _ = d.Terminate(context.Background()) }, nil
|
|
}
|
|
|
|
if options.Platform == "ios" && options.iosIsSimulator {
|
|
d, err := ioscompanion.New(ctx, ioscompanion.Options{
|
|
UniqueDeviceIdentifier: options.iosUDID,
|
|
BundleID: options.BundleID,
|
|
AppPath: options.IosAppPath,
|
|
Output: stdout,
|
|
})
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("ios simulator driver: %w", err)
|
|
}
|
|
return d, d.Close, nil
|
|
}
|
|
|
|
if options.Platform == "ios" {
|
|
d, cleanup, err := newDeviceDriver(ctx, ioscompanion.DeviceOptions{
|
|
HardwareUDID: options.iosUDID,
|
|
CoreDeviceID: options.iosCoreDeviceID,
|
|
BundleID: options.BundleID,
|
|
AppPath: options.IosAppPath,
|
|
Output: stdout,
|
|
})
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("ios device driver: %w", err)
|
|
}
|
|
return d, cleanup, nil
|
|
}
|
|
|
|
// Android uses the JVM sidecar, which requires java.
|
|
if err := preflightDevice(options.Platform); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
sidecarDirectory := os.TempDir() + "/sanderling-sidecar"
|
|
jarPath, err := sidecarassets.Extract(sidecarDirectory)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("extract sidecar: %w", err)
|
|
}
|
|
fmt.Fprintf(stdout, "sidecar JAR: %s (size=%d)\n", jarPath, sidecarassets.EmbeddedSize())
|
|
|
|
sidecarPort, err := pickFreePort()
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
sidecarArgs := []string{"-jar", jarPath,
|
|
"--port", strconv.Itoa(sidecarPort),
|
|
"--platform", options.Platform,
|
|
}
|
|
sidecarCommand := exec.CommandContext(ctx, "java", sidecarArgs...)
|
|
sidecarCommand.Stdout = stdout
|
|
sidecarCommand.Stderr = stdout
|
|
sidecarCommand.Env = android.EnvWithAndroidPlatformTools(os.Environ())
|
|
// SIGTERM lets the sidecar's shutdown hook stop the iOS XCTest runner.
|
|
// SIGKILL skips the hook and orphans an xcodebuild session that later
|
|
// restarts its runner and hijacks the simulator mid-run.
|
|
sidecarCommand.Cancel = func() error {
|
|
return sidecarCommand.Process.Signal(syscall.SIGTERM)
|
|
}
|
|
sidecarCommand.WaitDelay = sidecarShutdownGrace
|
|
if err := sidecarCommand.Start(); err != nil {
|
|
return nil, nil, fmt.Errorf("spawn sidecar: %w", err)
|
|
}
|
|
fmt.Fprintf(stdout, "sidecar pid=%d listening on 127.0.0.1:%d\n", sidecarCommand.Process.Pid, sidecarPort)
|
|
|
|
driverClient, err := driverSidecar.Dial(fmt.Sprintf("127.0.0.1:%d", sidecarPort))
|
|
if err != nil {
|
|
stopSidecar(sidecarCommand)
|
|
return nil, nil, fmt.Errorf("dial sidecar: %w", err)
|
|
}
|
|
driverClient.SetPlatform(options.Platform)
|
|
// WaitForHealth confirms the gRPC sidecar is up. For iOS, the WDA warmup
|
|
// (absorbing the XCUITest startup race) runs inside IosDriverBackend.init
|
|
// in the sidecar - no additional sleep needed here.
|
|
healthCtx, healthCancel := context.WithTimeout(ctx, sidecarStartupTimeout)
|
|
if err := driverClient.WaitForHealth(healthCtx, 250e6); err != nil {
|
|
healthCancel()
|
|
stopSidecar(sidecarCommand)
|
|
_ = driverClient.Close()
|
|
return nil, nil, fmt.Errorf("sidecar health check: %w", err)
|
|
}
|
|
healthCancel()
|
|
fmt.Fprintln(stdout, "sidecar is healthy")
|
|
|
|
cleanup := func() {
|
|
_ = driverClient.Close()
|
|
stopSidecar(sidecarCommand)
|
|
}
|
|
return driverClient, cleanup, nil
|
|
}
|
|
|
|
// sidecarShutdownGrace bounds how long the sidecar gets to run its shutdown
|
|
// hook (terminate the app, stop the XCTest runner) before being killed.
|
|
const sidecarShutdownGrace = 15 * time.Second
|
|
|
|
// stopSidecar terminates the sidecar gracefully so its shutdown hook can stop
|
|
// the device-side runner processes, escalating to SIGKILL when it does not
|
|
// exit within the grace window.
|
|
func stopSidecar(sidecarCommand *exec.Cmd) {
|
|
if sidecarCommand.Process == nil {
|
|
return
|
|
}
|
|
if err := sidecarCommand.Process.Signal(syscall.SIGTERM); err != nil {
|
|
_ = sidecarCommand.Process.Kill()
|
|
_ = sidecarCommand.Wait()
|
|
return
|
|
}
|
|
done := make(chan struct{})
|
|
go func() {
|
|
_ = sidecarCommand.Wait()
|
|
close(done)
|
|
}()
|
|
select {
|
|
case <-done:
|
|
case <-time.After(sidecarShutdownGrace):
|
|
_ = sidecarCommand.Process.Kill()
|
|
<-done
|
|
}
|
|
}
|
|
|
|
func pickFreePort() (int, error) {
|
|
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
defer listener.Close()
|
|
return listener.Addr().(*net.TCPAddr).Port, nil
|
|
}
|