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
102 lines
4.1 KiB
Swift
102 lines
4.1 KiB
Swift
import XCTest
|
|
|
|
// Types unicode text into the focused element through the public typeText API,
|
|
// avoiding the pasteboard entirely. With replace enabled, the current value
|
|
// length is consumed first by prepending that many delete keys so the whole
|
|
// replacement happens in one typeText call.
|
|
enum TextInput {
|
|
enum TextInputError: Error {
|
|
case typingFailed(String)
|
|
}
|
|
|
|
static func type(text: String, replace: Bool, bundleIdentifier: String) throws {
|
|
let application = XCUIApplication(bundleIdentifier: bundleIdentifier)
|
|
|
|
var payload = text
|
|
if replace {
|
|
let deleteCount = deletePrefixLength(bundleIdentifier: bundleIdentifier)
|
|
if deleteCount > 0 {
|
|
let deletes = String(repeating: XCUIKeyboardKey.delete.rawValue, count: deleteCount)
|
|
payload = deletes + text
|
|
}
|
|
}
|
|
|
|
// Type at the application level so it lands in whatever holds keyboard
|
|
// focus, without resolving a specific element. Compose Multiplatform
|
|
// text fields do not reliably expose hasKeyboardFocus to the query layer.
|
|
// typeText must run on the main thread.
|
|
var caughtError: NSError?
|
|
var completed = false
|
|
runOnMain {
|
|
completed = CompanionRunCatching({
|
|
application.typeText(payload)
|
|
}, &caughtError)
|
|
}
|
|
if !completed {
|
|
throw TextInputError.typingFailed(caughtError?.localizedDescription ?? "unknown")
|
|
}
|
|
}
|
|
|
|
// erase deletes count characters from the focused field by typing that many
|
|
// delete keys. Used on device, where EraseText routes to the runner instead
|
|
// of the legacy companion's HID stream.
|
|
static func erase(count: Int, bundleIdentifier: String) throws {
|
|
guard count > 0 else { return }
|
|
let deletes = String(repeating: XCUIKeyboardKey.delete.rawValue, count: count)
|
|
try typeOnFocus(deletes, bundleIdentifier: bundleIdentifier)
|
|
}
|
|
|
|
// pressKey types a single logical key into the focused field. Only return is
|
|
// supported, matching the simulator companion's key surface.
|
|
static func pressKey(key: String, bundleIdentifier: String) throws {
|
|
switch key {
|
|
case "return", "enter", "Return", "Enter":
|
|
try typeOnFocus(XCUIKeyboardKey.return.rawValue, bundleIdentifier: bundleIdentifier)
|
|
default:
|
|
throw TextInputError.typingFailed("unsupported key \(key)")
|
|
}
|
|
}
|
|
|
|
private static func typeOnFocus(_ payload: String, bundleIdentifier: String) throws {
|
|
let application = XCUIApplication(bundleIdentifier: bundleIdentifier)
|
|
var caughtError: NSError?
|
|
var completed = false
|
|
runOnMain {
|
|
completed = CompanionRunCatching({
|
|
application.typeText(payload)
|
|
}, &caughtError)
|
|
}
|
|
if !completed {
|
|
throw TextInputError.typingFailed(caughtError?.localizedDescription ?? "unknown")
|
|
}
|
|
}
|
|
|
|
private static func runOnMain(_ work: () -> Void) {
|
|
if Thread.isMainThread {
|
|
work()
|
|
} else {
|
|
DispatchQueue.main.sync(execute: work)
|
|
}
|
|
}
|
|
|
|
// Sizes the delete prefix for replace. The snapshot does not say which
|
|
// editable field holds keyboard focus (Compose fields never expose
|
|
// hasKeyboardFocus), so the prefix covers the longest editable value on
|
|
// screen: deletes beyond the focused field's content are no-ops at the
|
|
// start of the field, while undersizing would leave residue and silently
|
|
// turn replace into append.
|
|
private static func deletePrefixLength(bundleIdentifier: String) -> Int {
|
|
let elements = Snapshot.elements(bundleIdentifier: bundleIdentifier)
|
|
var longest = 0
|
|
for element in elements {
|
|
guard let type = element["type"] as? String,
|
|
type == "TextArea" || type == "TextField",
|
|
let value = element["AXValue"] as? String else {
|
|
continue
|
|
}
|
|
longest = max(longest, value.count)
|
|
}
|
|
return longest
|
|
}
|
|
}
|