mirror of
https://github.com/priyanshujain/sanderling.git
synced 2026-10-02 11:07: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
336 lines
12 KiB
Go
336 lines
12 KiB
Go
package ioscompanion
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
"syscall"
|
|
)
|
|
|
|
// These env vars name the signing inputs so the account-specific team id is
|
|
// never committed. The App Store Connect API key path/id/issuer come from the
|
|
// same source. They back the no-Xcode-UI signing path.
|
|
const (
|
|
envTeam = "SANDERLING_IOS_TEAM"
|
|
envTeamFallback = "DEVELOPMENT_TEAM"
|
|
envAuthKeyPath = "ASC_API_KEY_PATH"
|
|
envAuthKeyID = "ASC_API_KEY_ID"
|
|
envAuthIssuer = "ASC_API_ISSUER_ID"
|
|
envCompanionDir = "SANDERLING_COMPANION_DIR"
|
|
)
|
|
|
|
// deviceRunnerScheme and deviceRunnerProject mirror companion/project.yml. The
|
|
// build product is the runner whose xctestrun the test session consumes.
|
|
const (
|
|
deviceRunnerScheme = "CompanionRunner"
|
|
deviceRunnerProject = "CompanionRunner.xcodeproj"
|
|
)
|
|
|
|
// signingCredentials carries the no-UI signing inputs read from the environment.
|
|
type signingCredentials struct {
|
|
team string
|
|
authKeyPath string
|
|
authKeyID string
|
|
authIssuerID string
|
|
}
|
|
|
|
// readSigningCredentials gathers the signing inputs from the environment and
|
|
// reports every missing one at once. The .p8 key must exist on disk.
|
|
func readSigningCredentials() (signingCredentials, error) {
|
|
team := os.Getenv(envTeam)
|
|
if team == "" {
|
|
team = os.Getenv(envTeamFallback)
|
|
}
|
|
creds := signingCredentials{
|
|
team: team,
|
|
authKeyPath: os.Getenv(envAuthKeyPath),
|
|
authKeyID: os.Getenv(envAuthKeyID),
|
|
authIssuerID: os.Getenv(envAuthIssuer),
|
|
}
|
|
var missing []string
|
|
if creds.team == "" {
|
|
missing = append(missing, envTeam)
|
|
}
|
|
if creds.authKeyPath == "" {
|
|
missing = append(missing, envAuthKeyPath)
|
|
}
|
|
if creds.authKeyID == "" {
|
|
missing = append(missing, envAuthKeyID)
|
|
}
|
|
if creds.authIssuerID == "" {
|
|
missing = append(missing, envAuthIssuer)
|
|
}
|
|
if len(missing) > 0 {
|
|
return creds, fmt.Errorf("device signing requires environment variables: %s", strings.Join(missing, ", "))
|
|
}
|
|
// xcodebuild's -authenticationKeyPath demands an absolute path, but .env
|
|
// files commonly carry a repo-relative one. Resolve it against the working
|
|
// directory before the stat so a relative key still works.
|
|
if absolute, err := filepath.Abs(creds.authKeyPath); err == nil {
|
|
creds.authKeyPath = absolute
|
|
}
|
|
if _, err := os.Stat(creds.authKeyPath); err != nil {
|
|
return creds, fmt.Errorf("App Store Connect key not found at %s: %w", creds.authKeyPath, err)
|
|
}
|
|
return creds, nil
|
|
}
|
|
|
|
// VerifyDeviceSigning reports whether the device signing environment is complete
|
|
// and the App Store Connect key file exists. The doctor calls it so the device
|
|
// preflight surfaces missing credentials before a run reaches the build step.
|
|
func VerifyDeviceSigning() error {
|
|
_, err := readSigningCredentials()
|
|
return err
|
|
}
|
|
|
|
// realSpawnDeviceRunner regenerates the runner project, builds it for the device
|
|
// (skipping when the cached build matches the current sources), and spawns the
|
|
// test session that hosts the runner on the device, passing the session port via
|
|
// TEST_RUNNER_COMPANION_PORT. address carries the host loopback port, reused as
|
|
// the device-side COMPANION_PORT.
|
|
func (d *Driver) realSpawnDeviceRunner(ctx context.Context, address string) (*exec.Cmd, error) {
|
|
_, port, err := net.SplitHostPort(address)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
companionDir, err := resolveCompanionDir()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
creds, err := readSigningCredentials()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
derivedDataPath := filepath.Join(os.TempDir(), "sanderling-device-runner")
|
|
if err := os.MkdirAll(derivedDataPath, 0o755); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err := d.buildDeviceRunnerIfNeeded(ctx, companionDir, derivedDataPath, creds); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
xctestrunPath, err := locateDeviceXctestrun(derivedDataPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
logPath := filepath.Join(derivedDataPath, "device-session-"+port+".log")
|
|
logFile, err := os.Create(logPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("create device session log: %w", err)
|
|
}
|
|
|
|
args := testWithoutBuildingArgs(xctestrunPath, d.udid, creds)
|
|
command := exec.CommandContext(ctx, "xcrun", args...)
|
|
command.Stdout = logFile
|
|
command.Stderr = logFile
|
|
// Minimal environment: the session can echo its environment into the run
|
|
// log, so secrets in the parent environment must not reach it. Signing is
|
|
// passed by flag (a key-file path), not env. xcodebuild forwards any
|
|
// TEST_RUNNER_-prefixed var into the runner with the prefix stripped, so the
|
|
// non-secret COMPANION_PORT reaches the device that way instead of a plist
|
|
// patch.
|
|
command.Env = []string{
|
|
"HOME=" + os.Getenv("HOME"),
|
|
"PATH=/usr/bin:/bin",
|
|
"TMPDIR=" + os.TempDir(),
|
|
"TEST_RUNNER_COMPANION_PORT=" + port,
|
|
}
|
|
command.Cancel = func() error { return command.Process.Signal(syscall.SIGTERM) }
|
|
command.WaitDelay = shutdownGrace
|
|
startErr := command.Start()
|
|
logFile.Close()
|
|
if startErr != nil {
|
|
return nil, fmt.Errorf("start device session: %w", startErr)
|
|
}
|
|
fmt.Fprintf(d.output, "device runner session pid=%d port=%s (log: %s)\n", command.Process.Pid, port, logPath)
|
|
return command, nil
|
|
}
|
|
|
|
// buildDeviceRunnerIfNeeded regenerates the project and runs build-for-testing,
|
|
// skipping the build when a marker recording the current build key already
|
|
// matches. The device signature is per-account/per-device, so the build cannot
|
|
// be embedded; the stable derivedDataPath makes the build incremental.
|
|
func (d *Driver) buildDeviceRunnerIfNeeded(ctx context.Context, companionDir, derivedDataPath string, creds signingCredentials) error {
|
|
key, err := buildCacheKey(companionDir, creds)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
marker := filepath.Join(derivedDataPath, "device-runner.sha256")
|
|
if existing, readErr := os.ReadFile(marker); readErr == nil && string(existing) == key {
|
|
fmt.Fprintln(d.output, "device runner build is up to date; skipping build")
|
|
return nil
|
|
}
|
|
|
|
if out, genErr := runQuiet(ctx, companionDir, "xcodegen", "--spec", filepath.Join(companionDir, "project.yml")); genErr != nil {
|
|
return fmt.Errorf("xcodegen: %w: %s", genErr, strings.TrimSpace(string(out)))
|
|
}
|
|
|
|
projectPath := filepath.Join(companionDir, deviceRunnerProject)
|
|
args := buildForTestingArgs(projectPath, derivedDataPath, creds)
|
|
fmt.Fprintln(d.output, "building device runner (first run is slow; subsequent runs are cached)")
|
|
if out, buildErr := runQuiet(ctx, companionDir, append([]string{"xcrun"}, args...)...); buildErr != nil {
|
|
return fmt.Errorf("build-for-testing: %w: %s", buildErr, tailLines(string(out), 20))
|
|
}
|
|
if err := os.WriteFile(marker, []byte(key), 0o644); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// buildCacheKey combines the source hash with the signing identity so a changed
|
|
// team or key invalidates the cached build. A runner signed with a stale
|
|
// identity would otherwise be reused and rejected at install (0xe8008018).
|
|
func buildCacheKey(companionDir string, creds signingCredentials) (string, error) {
|
|
sources, err := sourceHash(companionDir)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
sum := sha256.Sum256([]byte(sources + "\x00" + creds.team + "\x00" + creds.authKeyID))
|
|
return hex.EncodeToString(sum[:]), nil
|
|
}
|
|
|
|
// buildForTestingArgs builds the runner for a generic device destination, signed
|
|
// through the App Store Connect API key with automatic provisioning. A generic
|
|
// destination keeps the build off any specific booted device; the wildcard dev
|
|
// profile covers every provisioned device in the team.
|
|
func buildForTestingArgs(projectPath, derivedDataPath string, creds signingCredentials) []string {
|
|
return []string{"xcodebuild", "build-for-testing",
|
|
"-project", projectPath,
|
|
"-scheme", deviceRunnerScheme,
|
|
"-destination", "generic/platform=iOS",
|
|
"-derivedDataPath", derivedDataPath,
|
|
"-allowProvisioningUpdates",
|
|
"-authenticationKeyPath", creds.authKeyPath,
|
|
"-authenticationKeyID", creds.authKeyID,
|
|
"-authenticationKeyIssuerID", creds.authIssuerID,
|
|
// companion/project.yml disables signing for the simulator build; the
|
|
// device install rejects an unsigned runner (0xe8008018), so signing is
|
|
// re-enabled here and the team drives automatic provisioning.
|
|
"CODE_SIGNING_ALLOWED=YES",
|
|
"CODE_SIGNING_REQUIRED=YES",
|
|
"CODE_SIGN_STYLE=Automatic",
|
|
"DEVELOPMENT_TEAM=" + creds.team,
|
|
"GENERATE_INFOPLIST_FILE=YES",
|
|
}
|
|
}
|
|
|
|
// testWithoutBuildingArgs runs the prebuilt runner's test session on the
|
|
// specific device, installing the signed runner via the same automatic
|
|
// provisioning the build used.
|
|
func testWithoutBuildingArgs(xctestrunPath, hardwareUDID string, creds signingCredentials) []string {
|
|
return []string{"xcodebuild", "test-without-building",
|
|
"-xctestrun", xctestrunPath,
|
|
"-destination", "platform=iOS,id=" + hardwareUDID,
|
|
"-allowProvisioningUpdates",
|
|
"-authenticationKeyPath", creds.authKeyPath,
|
|
"-authenticationKeyID", creds.authKeyID,
|
|
"-authenticationKeyIssuerID", creds.authIssuerID,
|
|
}
|
|
}
|
|
|
|
// locateDeviceXctestrun finds the device build's xctestrun under the derived
|
|
// data products. The name embeds the device SDK version, so it is discovered
|
|
// rather than hardcoded.
|
|
func locateDeviceXctestrun(derivedDataPath string) (string, error) {
|
|
products := filepath.Join(derivedDataPath, "Build", "Products")
|
|
entries, err := os.ReadDir(products)
|
|
if err != nil {
|
|
return "", fmt.Errorf("read build products: %w", err)
|
|
}
|
|
for _, entry := range entries {
|
|
if strings.HasSuffix(entry.Name(), ".xctestrun") {
|
|
return filepath.Join(products, entry.Name()), nil
|
|
}
|
|
}
|
|
return "", fmt.Errorf("no xctestrun under %s", products)
|
|
}
|
|
|
|
// sourceHash digests the runner sources and project spec so a source edit
|
|
// invalidates the cached device build. Mirrors the runnerassets checksum reuse.
|
|
func sourceHash(companionDir string) (string, error) {
|
|
var paths []string
|
|
sourcesDir := filepath.Join(companionDir, "Sources")
|
|
walkErr := filepath.Walk(sourcesDir, func(path string, info os.FileInfo, err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !info.IsDir() {
|
|
paths = append(paths, path)
|
|
}
|
|
return nil
|
|
})
|
|
if walkErr != nil {
|
|
return "", walkErr
|
|
}
|
|
paths = append(paths, filepath.Join(companionDir, "project.yml"))
|
|
sort.Strings(paths)
|
|
hash := sha256.New()
|
|
for _, path := range paths {
|
|
content, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
fmt.Fprintf(hash, "%s\n", path)
|
|
hash.Write(content)
|
|
}
|
|
return hex.EncodeToString(hash.Sum(nil)), nil
|
|
}
|
|
|
|
// resolveCompanionDir finds the companion source tree: the SANDERLING_COMPANION_DIR
|
|
// override if set, otherwise the nearest ancestor of the working directory that
|
|
// holds companion/project.yml. The device runner is built from source at run
|
|
// time, so the tree must be present (it is, in a source checkout).
|
|
func resolveCompanionDir() (string, error) {
|
|
if override := os.Getenv(envCompanionDir); override != "" {
|
|
if _, err := os.Stat(filepath.Join(override, "project.yml")); err != nil {
|
|
return "", fmt.Errorf("%s=%s has no project.yml: %w", envCompanionDir, override, err)
|
|
}
|
|
return override, nil
|
|
}
|
|
directory, err := os.Getwd()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
for {
|
|
candidate := filepath.Join(directory, "companion")
|
|
if _, statErr := os.Stat(filepath.Join(candidate, "project.yml")); statErr == nil {
|
|
return candidate, nil
|
|
}
|
|
parent := filepath.Dir(directory)
|
|
if parent == directory {
|
|
break
|
|
}
|
|
directory = parent
|
|
}
|
|
return "", fmt.Errorf("companion source tree not found; run from a sanderling checkout or set %s", envCompanionDir)
|
|
}
|
|
|
|
// runQuiet runs a command in dir with the inherited environment and returns its
|
|
// combined output. Used for the transient build steps (xcodegen, xcodebuild
|
|
// build-for-testing) whose output is surfaced only on failure.
|
|
func runQuiet(ctx context.Context, dir string, args ...string) ([]byte, error) {
|
|
command := exec.CommandContext(ctx, args[0], args[1:]...)
|
|
command.Dir = dir
|
|
return command.CombinedOutput()
|
|
}
|
|
|
|
// tailLines returns the last n lines of text, so a long xcodebuild failure log
|
|
// surfaces its tail (where the error is) without flooding the run output.
|
|
func tailLines(text string, n int) string {
|
|
lines := strings.Split(strings.TrimRight(text, "\n"), "\n")
|
|
if len(lines) <= n {
|
|
return strings.Join(lines, "\n")
|
|
}
|
|
return strings.Join(lines[len(lines)-n:], "\n")
|
|
}
|