Compare commits

..

1 Commits

  • wip: hot reloading
    Discriminate with module name
    
    Fully working
    
    Changes
    
    Fix linux
    
    changes
    
    allow customizing xload path
    
    Lint
    
    Command
91 changed files with 3054 additions and 1923 deletions
+1 -1
View File
@@ -6,4 +6,4 @@ runs:
- name: Set up Xcode
shell: bash
run: |
sudo xcode-select -s /Applications/Xcode_27.1.0.app
sudo xcode-select -s /Applications/Xcode_26.4.app
+2 -2
View File
@@ -27,7 +27,7 @@ jobs:
docker compose run --build -e XTL_CI=1 xtool bash -c \
"swift build --product xtool && .build/debug/xtool --help && swift test"
build-macos:
runs-on: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
@@ -39,7 +39,7 @@ jobs:
run: |
swift test
build-ios:
runs-on: xcode-27
runs-on: macos-26
steps:
- name: Checkout
uses: actions/checkout@v6
+1 -2
View File
@@ -36,7 +36,7 @@ jobs:
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
build-mac:
runs-on: xcode-27
runs-on: macos-26
permissions:
contents: write
steps:
@@ -57,7 +57,6 @@ jobs:
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
XTOOL_VERSION: ${{ github.ref_name }}
run: |
brew install -y xcodegen
cd macOS
bundle exec fastlane package
- name: Upload artifacts
+1 -1
View File
@@ -1,4 +1,4 @@
swiftlint_version: 0.65.1
swiftlint_version: 0.59.1
disabled_rules:
- trailing_comma
- nesting
+1 -1
View File
@@ -1,7 +1,7 @@
# Note: We use 22.04 since AppImage recommends building on the
# oldest configuration that you support
ARG SWIFT_VERSION=6.4.1
ARG SWIFT_VERSION=6.3.3
FROM swift:${SWIFT_VERSION}-jammy AS build-base
@@ -68,7 +68,7 @@ sudo apt-get install usbmuxd
### Xcode.xip
Download **Xcode 27.1** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
Download **Xcode 27** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
> Note:
>
@@ -131,7 +131,7 @@ Choice (0-1): 0
Path to Xcode.xip:
```
Enter the path (for example `~/Downloads/Xcode_27.1.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Enter the path (for example `~/Downloads/Xcode_27.0.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
Confirm that it worked:
-6
View File
@@ -1,6 +0,0 @@
.DS_Store
.build
.swiftpm
*/xtool
*/.bsp
/out
-29
View File
@@ -1,29 +0,0 @@
// swift-tools-version: 6.0
import PackageDescription
let package = Package(
name: "DemoDynamic",
platforms: [
.iOS(.v17),
.macOS(.v14),
],
products: [
.library(
name: "DemoDynamic",
targets: ["DemoDynamic"]
),
],
dependencies: [
.package(path: "../ExampleSupport"),
],
targets: [
.target(
name: "DemoDynamic",
dependencies: [
"ExampleSupport",
.product(name: "ExampleDynamicLibrary", package: "ExampleSupport"),
]
),
]
)
@@ -1,12 +0,0 @@
import ExampleDynamicLibrary
import ExampleSupport
import SwiftUI
@main struct DemoApp: ExampleApp {
init() {
let message = exampleDynamicLibraryFunction()
guard message == "Hello from the dynamic library\n" else {
fatalError("Unexpected message from dynamic library: \(message)")
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoDynamic
-33
View File
@@ -1,33 +0,0 @@
// swift-tools-version: 6.0
import PackageDescription
let package = Package(
name: "DemoExtensions",
platforms: [
.iOS(.v17),
.macOS(.v14),
],
products: [
.library(
name: "DemoExtensions",
targets: ["DemoExtensions"]
),
.library(
name: "DemoExtensionsWidget",
targets: ["DemoExtensionsWidget"]
),
],
dependencies: [
.package(path: "../ExampleSupport"),
],
targets: [
.target(
name: "DemoExtensions",
dependencies: [
"ExampleSupport",
]
),
.target(name: "DemoExtensionsWidget"),
]
)
@@ -1,4 +0,0 @@
import SwiftUI
import ExampleSupport
@main struct DemoApp: ExampleApp {}
@@ -1,51 +0,0 @@
import WidgetKit
import SwiftUI
@main struct Bundle: WidgetBundle {
var body: some Widget {
DemoWidget()
}
}
struct DemoWidget: Widget {
var body: some WidgetConfiguration {
StaticConfiguration(
kind: "DemoWidget",
provider: Provider()
) { entry in
VStack {
Text(entry.date, style: .date)
}
.containerBackground(.fill.tertiary, for: .widget)
}
.configurationDisplayName("DemoWidget")
.description("This is an example widget.")
}
struct Entry: TimelineEntry {
var date = Date()
}
struct Provider: TimelineProvider {
func placeholder(in context: Context) -> Entry {
Entry()
}
func getSnapshot(
in context: Context,
completion: @escaping (Entry) -> Void
) {
completion(Entry())
}
func getTimeline(
in context: Context,
completion: @escaping (Timeline<Entry>) -> Void
) {
completion(Timeline(
entries: [Entry()],
policy: .after(.now + 3600)
))
}
}
}
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.widgetkit-extension</string>
</dict>
</dict>
</plist>
-6
View File
@@ -1,6 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoExtensions
product: DemoExtensions
extensions:
- product: DemoExtensionsWidget
infoPath: Support/DemoExtensionsWidget-Info.plist
-31
View File
@@ -1,31 +0,0 @@
// swift-tools-version: 6.0
import PackageDescription
let package = Package(
name: "DemoResources",
platforms: [
.iOS(.v17),
.macOS(.v14),
],
products: [
.library(
name: "DemoResources",
targets: ["DemoResources"]
),
],
dependencies: [
.package(path: "../ExampleSupport"),
],
targets: [
.target(
name: "DemoResources",
dependencies: [
"ExampleSupport",
],
resources: [
.process("bundled.txt"),
]
),
]
)
-1
View File
@@ -1 +0,0 @@
Top level resource
@@ -1,34 +0,0 @@
import ExampleSupport
import SwiftUI
@main struct DemoApp: App {
var body: some Scene {
WindowGroup {
Text("Hello, world!")
.task {
guard let bundled = #bundle.url(forResource: "bundled", withExtension: "txt")
else { fatalError("Missing bundled.txt resource") }
assertContents(of: bundled, equal: "Bundled resource\n")
guard let top = Bundle.main.url(forResource: "top", withExtension: "txt")
else { fatalError("Missing top.txt resource") }
assertContents(of: top, equal: "Top level resource\n")
Example.pass()
}
}
}
}
private func assertContents(of url: URL, equal value: String) {
let name = url.lastPathComponent
let contents: String
do {
contents = try String(contentsOf: url, encoding: .utf8)
} catch {
fatalError("Failed to read \(name): \(error)")
}
guard contents == value else {
fatalError("\(name) had unexpected contents: \(contents)")
}
}
@@ -1 +0,0 @@
Bundled resource
-4
View File
@@ -1,4 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoResources
resources:
- Resources/top.txt
-28
View File
@@ -1,28 +0,0 @@
// swift-tools-version: 6.0
import PackageDescription
let package = Package(
name: "DemoSimple",
platforms: [
.iOS(.v17),
.macOS(.v14),
],
products: [
.library(
name: "DemoSimple",
targets: ["DemoSimple"]
),
],
dependencies: [
.package(path: "../ExampleSupport"),
],
targets: [
.target(
name: "DemoSimple",
dependencies: [
"ExampleSupport",
]
),
]
)
@@ -1,26 +0,0 @@
import ExampleSupport
import SwiftUI
@main struct DemoApp: App {
public var body: some Scene {
WindowGroup {
ContentView()
}
}
}
private struct ContentView: View {
@State var counter = 0
var body: some View {
VStack {
Button("Counter = \(counter)") {
counter += 1
}
}
.padding()
.task {
Example.pass()
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoSimple
-132
View File
@@ -1,132 +0,0 @@
{
"originHash" : "4a80ae2e9e4c4e1e4e29c32e93dc624202a42a942e44d358035684ec5e0746f7",
"pins" : [
{
"identity" : "combine-schedulers",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "114354e8c1667a2edc4993700fb9fa4f90157b56",
"version" : "1.2.2"
}
},
{
"identity" : "swift-case-paths",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-case-paths",
"state" : {
"revision" : "cb4cba6a8a46a86db0d37dbe09935ead6b24c91a",
"version" : "1.10.0"
}
},
{
"identity" : "swift-clocks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-clocks",
"state" : {
"revision" : "82440fa0a8b1c381a6d1e8e0fc7bbba53ec63204",
"version" : "1.1.1"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "98ef3c98609a1e31b7e157b5b619579001a789d6",
"version" : "1.7.1"
}
},
{
"identity" : "swift-composable-architecture",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
"state" : {
"revision" : "377da4061db10d26337a71bb279c506bb951f50f",
"version" : "1.26.2"
}
},
{
"identity" : "swift-concurrency-extras",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
"version" : "1.4.1"
}
},
{
"identity" : "swift-custom-dump",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-custom-dump",
"state" : {
"revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19",
"version" : "1.7.3"
}
},
{
"identity" : "swift-dependencies",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "b476cc5761057d8d857de063fe7ac8daecf5c06b",
"version" : "1.17.1"
}
},
{
"identity" : "swift-identified-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-identified-collections",
"state" : {
"revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
"version" : "1.1.1"
}
},
{
"identity" : "swift-issue-reporting",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"state" : {
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
"version" : "2.1.1"
}
},
{
"identity" : "swift-navigation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-navigation",
"state" : {
"revision" : "7e95e5e9ff0a64f6ad8bca59083f8d6ba381b6ff",
"version" : "2.11.2"
}
},
{
"identity" : "swift-perception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-perception",
"state" : {
"revision" : "597afd46249f4a71885b95d26b26cc5b893daf32",
"version" : "2.0.12"
}
},
{
"identity" : "swift-sharing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-sharing",
"state" : {
"revision" : "3552faf8a6c18ce896ec5a72bd8c34755f0f03e0",
"version" : "2.10.1"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
"revision" : "050f1a346fbbac0ca2cfb15a95274f7bd1cf0ccf",
"version" : "604.0.0"
}
}
],
"version" : 3
}
-30
View File
@@ -1,30 +0,0 @@
// swift-tools-version: 6.0
import PackageDescription
let package = Package(
name: "DemoTCA",
platforms: [
.iOS(.v17),
.macOS(.v14),
],
products: [
.library(
name: "DemoTCA",
targets: ["DemoTCA"]
),
],
dependencies: [
.package(path: "../ExampleSupport"),
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.0.0"),
],
targets: [
.target(
name: "DemoTCA",
dependencies: [
"ExampleSupport",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
],
),
]
)
@@ -1,24 +0,0 @@
import SwiftUI
import ComposableArchitecture
import ExampleSupport
struct ContentView: View {
let store: StoreOf<CounterFeature>
var body: some View {
VStack {
Image(systemName: "globe")
.imageScale(.large)
.foregroundStyle(.tint)
Text("Count: \(store.count)")
}
.padding()
.onAppear {
store.send(.appear)
}
.onChange(of: store.count) { _, count in
guard count == 1 else { return }
Example.pass()
}
}
}
@@ -1,31 +0,0 @@
import ComposableArchitecture
@Reducer
struct CounterFeature {
@ObservableState
struct State {
var count = 0
}
enum Action {
case appear
case timerElapsed
}
@Dependency(\.continuousClock) var continuousClock
var body: some Reducer<State, Action> {
Reduce { state, action in
switch action {
case .appear:
return .run { [continuousClock] send in
try await continuousClock.sleep(for: .seconds(1))
await send(.timerElapsed)
}
case .timerElapsed:
state.count += 1
return .none
}
}
}
}
@@ -1,15 +0,0 @@
import SwiftUI
import ComposableArchitecture
@main
struct DemoTCAApp: App {
private let store = Store(initialState: CounterFeature.State()) {
CounterFeature()
}
var body: some Scene {
WindowGroup {
ContentView(store: store)
}
}
}
-2
View File
@@ -1,2 +0,0 @@
version: 1
bundleID: sh.xtool.examples.DemoTCA
-31
View File
@@ -1,31 +0,0 @@
// swift-tools-version: 6.4
import PackageDescription
let package = Package(
name: "ExampleSupport",
platforms: [
.iOS(.v17),
.macOS(.v14),
],
products: [
.library(
name: "ExampleSupport",
targets: ["ExampleSupport"]
),
.library(
name: "ExampleDynamicLibrary",
type: .dynamic,
targets: ["ExampleDynamicLibrary"]
),
],
targets: [
.target(name: "ExampleSupport"),
.target(
name: "ExampleDynamicLibrary",
resources: [
.process("response.txt"),
]
),
]
)
@@ -1,9 +0,0 @@
import Foundation
public func exampleDynamicLibraryFunction() -> String {
guard let bundled = #bundle.url(forResource: "response", withExtension: "txt")
else { fatalError("Missing bundled.txt resource") }
// swiftlint:disable:next force_try
let contents = try! String(contentsOf: bundled, encoding: .utf8)
return "Hello \(contents)"
}
@@ -1 +0,0 @@
from the dynamic library
@@ -1,25 +0,0 @@
import SwiftUI
public protocol ExampleApp: App {}
extension ExampleApp {
public var body: some Scene {
WindowGroup {
ContentView()
}
}
}
private struct ContentView: View {
var body: some View {
VStack {
Image(systemName: "globe")
.imageScale(.large)
.foregroundStyle(.tint)
Text("Hello, world!")
}
.padding()
.task {
Example.pass()
}
}
}
@@ -1,12 +0,0 @@
import Foundation
public enum Example {}
extension Example {
public static func pass() {
Task {
try? await Task.sleep(for: .seconds(1))
print("xtool test succeeded")
exit(0)
}
}
}
-14
View File
@@ -1,14 +0,0 @@
# Examples
These primarily exist as fixtures for integration tests, but also double as snippets of sample code.
Each demo is designed to make some assertions shortly after launching, and then exit. On success, stdout will include the message "xtool test succeeded".
## Testing
```
./Examples/test.sh [--build | --run] [DemoName]
```
- Omit `--build`/`--run` to build _and_ run
- Omit the demo name to loop through all demos
-118
View File
@@ -1,118 +0,0 @@
#!/bin/bash
set -euo pipefail
shopt -s nullglob
usage() {
echo "Usage: $0 [--build | --run] [DemoName]"
}
mode=both
case "${1:-}" in
--build) mode=build; shift ;;
--run) mode=run; shift ;;
-h|--help) usage; exit 0 ;;
esac
if [[ $# -gt 1 || (${1:-} != "" && (${1:-} != Demo* || ${1:-} == */*)) ]]; then
usage >&2
exit 1
fi
cd "$(dirname "$0")"
examples_dir="$PWD"
out_dir="$examples_dir/out"
if [[ -n "${1:-}" ]]; then
demos=("$1")
elif [[ "$mode" == run ]]; then
demos=()
for app in "$out_dir"/*.app; do
name="${app##*/}"
demos+=("${name%.app}")
done
else
demos=()
for demo in "$examples_dir"/Demo*/; do
[[ -f "$demo/Package.swift" ]] || continue
demo="${demo%/}"
demos+=("${demo##*/}")
done
fi
if [[ ${#demos[@]} -eq 0 ]]; then
echo "No demos found. Run $0 --build first if using --run." >&2
exit 1
fi
logs_dir="$(mktemp -d)"
trap 'rm -rf "$logs_dir"' EXIT
trap 'exit 130' INT
trap 'exit 143' TERM
build_demo() {
local demo="$1"
echo "Building $demo..."
mkdir -p "$out_dir" || return 1
# Do not leave an older successful build available after a failed rebuild.
rm -rf "$out_dir/$demo.app" || return 1
(cd "$examples_dir/$demo" && xtool dev build --triple arm64-apple-ios-simulator) || return 1
cp -R "$examples_dir/$demo/xtool/$demo.app" "$out_dir/$demo.app"
}
run_demo() (
demo="$1"
app="$out_dir/$demo.app"
log="$logs_dir/$demo-run.log"
if [[ ! -d "$app" ]]; then
echo "Missing $app. Run $0 --build $demo first." >&2
exit 1
fi
bundle_id=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$app/Info.plist") || exit 1
echo "Running $demo..."
xcrun simctl install booted "$app" || exit 1
xcrun simctl launch --terminate-running-process --console booted "$bundle_id" >"$log" 2>&1 &
launch_pid=$!
# A demo should exit shortly after launch. Bound failures that hang instead.
(
sleep_pid=""
trap '[[ -z "$sleep_pid" ]] || kill "$sleep_pid" 2>/dev/null || true' EXIT
sleep 60 &
sleep_pid=$!
wait "$sleep_pid"
sleep_pid=""
touch "$log.timeout"
kill -TERM "$launch_pid" 2>/dev/null || exit 0
sleep 5 &
sleep_pid=$!
wait "$sleep_pid"
sleep_pid=""
kill -KILL "$launch_pid" 2>/dev/null || true
) >/dev/null 2>&1 &
timeout_pid=$!
trap 'kill "$timeout_pid" "$launch_pid" 2>/dev/null || true' EXIT
status=0
wait "$launch_pid" || status=$?
kill "$timeout_pid" 2>/dev/null || true
wait "$timeout_pid" 2>/dev/null || true
cat "$log"
if [[ -f "$log.timeout" ]]; then
echo "$demo did not terminate within 60 seconds." >&2
exit 1
fi
[[ "$status" -eq 0 ]] && grep -Fxq 'xtool test succeeded' "$log"
)
status=0
for demo in "${demos[@]}"; do
if [[ "$mode" != run ]] && ! build_demo "$demo"; then
echo "Build failed: $demo" >&2
status=1
continue
fi
if [[ "$mode" != build ]] && ! run_demo "$demo"; then
echo "Test failed: $demo" >&2
status=1
fi
done
exit "$status"
+2 -2
View File
@@ -13,7 +13,7 @@ fi
rm -rf staging/tmp
mkdir -p staging/tmp staging/linuxdeploy
swift build --package-path .. -c release --product xtool
swift build --package-path .. -c release --product xtool --static-swift-stdlib
bin="$(swift build --package-path .. -c release --show-bin-path)"
strip "${bin}/xtool"
@@ -38,7 +38,7 @@ if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
fi
mkdir -p staging/tmp/AppDir/usr/bin
find "${bin}"/ -name '*.resources' -or -name '*.bundle' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
export LINUXDEPLOY_OUTPUT_VERSION="${XTOOL_VERSION:-unversioned}"
export LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage"
+1 -2
View File
@@ -132,8 +132,7 @@ docs-preview:
SWIFTLINT_VERSION = $(shell head -1 .swiftlint.yml | cut -d' ' -f2)
SWIFTLINT_BIN = .tmp/swiftlint/swiftlint-$(SWIFTLINT_VERSION)
SWIFTLINT_ARCH = $(subst aarch64,arm64,$(subst x86_64,amd64,$(shell uname -m)))
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux_$(SWIFTLINT_ARCH)).zip
SWIFTLINT_URL = https://github.com/realm/SwiftLint/releases/download/$(SWIFTLINT_VERSION)/$(if $(IS_MAC),portable_swiftlint,swiftlint_linux).zip
.PHONY: lint
lint: $(SWIFTLINT_BIN)
+102 -57
View File
@@ -1,13 +1,13 @@
{
"originHash" : "df62267a8ffd060087e903a9d112d24562a959d43a0819a6511367da533c5594",
"originHash" : "c7a8ecfa1983b2d2cd303da1fc360a5329a8fe77440411341561bb35dd3c197a",
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "dd9206de0717d658daec6a064992894fdab8ae17",
"version" : "4.7.3"
"revision" : "db806756c989760b35108146381535aec231092b",
"version" : "4.7.0"
}
},
{
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
"revision" : "4c005f955e83f888d5616e579717a36d2dfc6301",
"version" : "1.36.2"
"revision" : "f95c908967e98c68c5ce3fd61a7974e7e869e303",
"version" : "1.36.1"
}
},
{
@@ -37,6 +37,15 @@
"version" : "1.2.2"
}
},
{
"identity" : "jsonutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
"state" : {
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
"version" : "4.2.0"
}
},
{
"identity" : "openapikit",
"kind" : "remoteSourceControl",
@@ -46,15 +55,6 @@
"version" : "6.4.0"
}
},
{
"identity" : "opencombine",
"kind" : "remoteSourceControl",
"location" : "https://github.com/OpenCombine/OpenCombine.git",
"state" : {
"revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
"version" : "0.14.0"
}
},
{
"identity" : "pathkit",
"kind" : "remoteSourceControl",
@@ -64,6 +64,15 @@
"version" : "1.0.1"
}
},
{
"identity" : "rainbow",
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
"revision" : "711ca908ca19d16e577d575c8d0a48151a16bb1b",
"version" : "4.2.2"
}
},
{
"identity" : "spectre",
"kind" : "remoteSourceControl",
@@ -76,7 +85,7 @@
{
"identity" : "swift-algorithms",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-algorithms.git",
"location" : "https://github.com/apple/swift-algorithms",
"state" : {
"revision" : "87e50f483c54e6efd60e885f7f5aa946cee68023",
"version" : "1.2.1"
@@ -85,7 +94,7 @@
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
"version" : "1.8.2"
@@ -105,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
"revision" : "13713a4ffdee8abd929f92568ee9462a46ae26e0",
"version" : "1.1.7"
"revision" : "3da39bbc4e687d4192af7c9cf4eab805745a0b9c",
"version" : "1.1.5"
}
},
{
@@ -141,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
"revision" : "35a1edcb8ebd2bfe251d587f0b69e62af28f508c",
"version" : "1.7.3"
"revision" : "a0cb0954ecb21e4e31b0070e6ed5674e8556685a",
"version" : "1.6.0"
}
},
{
@@ -150,8 +159,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-concurrency-extras",
"state" : {
"revision" : "8a4260f7373493435bd21194585c95b72bfdd401",
"version" : "1.4.3"
"revision" : "5fa253428866f2360c3754e88537f700ed2656b5",
"version" : "1.4.1"
}
},
{
@@ -159,8 +168,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-configuration.git",
"state" : {
"revision" : "8bae88f79dbddec793390c5bf3e2abb4ac2ece42",
"version" : "1.2.2"
"revision" : "3533f65d3e36dcdffc91ce34ef4d3c9c1887fd4b",
"version" : "1.2.1"
}
},
{
@@ -168,8 +177,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
"revision" : "c2cbadd7263439d8015189668f96ff5b5be565ce",
"version" : "5.0.3"
"revision" : "a9d1d5ab8951ada40cafff8c8e2b551dfde4f390",
"version" : "5.0.0"
}
},
{
@@ -186,8 +195,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
"revision" : "297b5b9c82a5631e3199ce3ec0993a3cfb0fbb84",
"version" : "1.7.2"
"revision" : "cc504a45f6ce73ce6067837d7ac19fa67b229a56",
"version" : "1.5.0"
}
},
{
@@ -231,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"state" : {
"revision" : "b23bb4493c439d3e05152bc167014235ba3d47fc",
"version" : "2.1.2"
"revision" : "75b000cea2ca6d7527a57e1b9cc0bdf21a9abe9f",
"version" : "2.1.1"
}
},
{
@@ -240,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "4038b6a4f74a1426f47eb1dd5b4bb5628a15d597",
"version" : "1.16.1"
"revision" : "9c6fb14227f55d8f711ce3847dc2f419fb0ecacb",
"version" : "1.15.1"
}
},
{
@@ -249,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
"revision" : "6db9d9abd92ad7399b8a564cafbb87d3507245fa",
"version" : "2.104.0"
"revision" : "21de5f08c1a166a6dd293d0e587ad977bf8dac5d",
"version" : "2.103.0"
}
},
{
@@ -312,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
"revision" : "164dfbcf1f78e2ddc719ab9d85c50d1157fa8d7d",
"version" : "1.14.2"
"revision" : "39d49cf22abab58a07f02bb76808b5d2839b294a",
"version" : "1.13.1"
}
},
{
@@ -321,8 +330,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
"revision" : "ad7a252e215870ea2de9cf8605ff9336b004183a",
"version" : "1.13.1"
"revision" : "9e53df53e043b53046a371b31aaf0a1e26eef946",
"version" : "1.12.1"
}
},
{
@@ -330,8 +339,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
"revision" : "c97e0f0187d95542b4a254f5bb4dc67f43bf73c9",
"version" : "1.4.0"
"revision" : "08796d36c99ad2318929bfa1d1e40f82194b65cc",
"version" : "1.3.1"
}
},
{
@@ -339,8 +348,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-context.git",
"state" : {
"revision" : "853ba3d9ce78851b9cc20108e8bd4f13f7fa546c",
"version" : "1.5.1"
"revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
"version" : "1.3.0"
}
},
{
@@ -348,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
"revision" : "a18ee16b8039866fd919bdb4e8e906882d4ecc75",
"version" : "2.13.0"
"revision" : "7f9326b0326ff86e3646295ea6e891f68c471c5e",
"version" : "2.12.0"
}
},
{
@@ -357,8 +366,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-subprocess",
"state" : {
"revision" : "dbe21bd7dfd4ffef8c32588918542a8abfa1b54c",
"version" : "1.0.2"
"revision" : "b3937ab85dd32f6e9435914599c1519074769c1a",
"version" : "1.0.0"
}
},
{
@@ -373,12 +382,30 @@
{
"identity" : "swift-system",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system.git",
"location" : "https://github.com/apple/swift-system",
"state" : {
"revision" : "869129b7bf4ecc57b97d0193ad29690ca2134750",
"version" : "1.8.1"
}
},
{
"identity" : "swift-tools-protocols",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-tools-protocols",
"state" : {
"revision" : "d81024558da3bcd53748c4cfdaba10a49242442e",
"version" : "0.0.10"
}
},
{
"identity" : "swiftcli",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jakeheis/SwiftCLI.git",
"state" : {
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
"version" : "6.0.3"
}
},
{
"identity" : "swiftymobiledevice",
"kind" : "remoteSourceControl",
@@ -397,6 +424,15 @@
"version" : "3.3.0"
}
},
{
"identity" : "version",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/Version",
"state" : {
"revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
"version" : "2.2.1"
}
},
{
"identity" : "websocket-kit",
"kind" : "remoteSourceControl",
@@ -407,12 +443,21 @@
}
},
{
"identity" : "xcode-project-format",
"identity" : "xadi",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/xcode-project-format.git",
"location" : "https://github.com/xtool-org/xadi",
"state" : {
"revision" : "c132630aabf40f6d6c3f7bb004595d2e5a28ea42",
"version" : "0.1.0"
"revision" : "2aad968e4806b8571f6f2bed22ecec00b0322f95",
"version" : "0.4.1"
}
},
{
"identity" : "xcodegen",
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
"revision" : "8445e778451c7e44237b90281bde622d764b0084",
"version" : "2.46.0"
}
},
{
@@ -420,8 +465,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "b505c06bb190b9306b29d5d96e3284e139af3cc8",
"version" : "9.17.6"
"revision" : "eb001108f64467b0cc7e8cbf90b3b4aaa1822cbb",
"version" : "9.14.0"
}
},
{
@@ -429,8 +474,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xtool-org/xtool-core",
"state" : {
"revision" : "154d7213c12e3f21d50793f50ec7bfb89cfd3918",
"version" : "1.5.1"
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
"version" : "1.5.0"
}
},
{
@@ -438,8 +483,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams",
"state" : {
"revision" : "a27b21e0c81c5bf42049b897a62aaf387e80f279",
"version" : "6.2.2"
"revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17",
"version" : "5.4.0"
}
},
{
+14 -21
View File
@@ -48,9 +48,10 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.1")),
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.0")),
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.9.0")),
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.4.1")),
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
@@ -61,11 +62,13 @@ let package = Package(
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
.package(url: "https://github.com/apple/swift-collections", from: "1.7.1"),
.package(url: "https://github.com/apple/xcode-project-format.git", .upToNextMinor(from: "0.1.0")),
// v1.7.0 has a crash on old OSes: https://github.com/apple/swift-collections/issues/733.
// pin 1.6.0 until 1.7.1 is released.
.package(url: "https://github.com/apple/swift-collections", exact: "1.6.0"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-subprocess", from: "1.0.0"),
.package(url: "https://github.com/swiftlang/swift-tools-protocols", exact: "0.0.10"),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
@@ -73,16 +76,14 @@ let package = Package(
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.3.0"),
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.6.2"),
// we don't use this but need the explicit dependency to keep the lockfile stable.
// TODO: remove once https://github.com/pointfreeco/combine-schedulers/issues/120 is fixed
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
.package(url: "https://github.com/attaswift/BigInt", from: "6.0.0"),
.package(url: "https://github.com/jpsim/Yams", from: "6.0.0"),
.package(url: "https://github.com/mxcl/Version", from: "2.1.0"),
.package(url: "https://github.com/jpsim/Yams", from: "5.1.3"),
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
// NB: this should only be imported from XcodeProjects
.package(url: "https://github.com/tuist/XcodeProj.git", from: "9.17.5"),
// TODO: just depend on tuist/XcodeProj instead
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
],
targets: [
.target(
@@ -123,6 +124,7 @@ let package = Package(
"DeveloperAPI",
"CXKit",
"XUtils",
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux, .macOS])),
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
.product(name: "Dependencies", package: "swift-dependencies"),
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
@@ -161,9 +163,6 @@ let package = Package(
dependencies: [
"XKit",
"XToolSupport",
"PackLib",
.product(name: "Crypto", package: "swift-crypto"),
.product(name: "X509", package: "swift-certificates"),
],
swiftSettings: swiftSettings,
),
@@ -176,26 +175,20 @@ let package = Package(
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SystemPackage", package: "swift-system"),
.product(name: "NIOPosix", package: "swift-nio"),
.product(name: "Version", package: "Version"),
.product(name: "libunxip", package: "unxip"),
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
],
cSettings: cSettings,
swiftSettings: swiftSettings,
),
.target(
name: "XcodeProjects",
dependencies: [
.product(name: "XcodeProj", package: "XcodeProj"),
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
],
),
.target(
name: "PackLib",
dependencies: [
"XUtils",
"XcodeProjects",
.product(name: "Superutils", package: "xtool-core"),
.product(name: "Yams", package: "Yams"),
.product(name: "XcodeProjectFormat", package: "xcode-project-format"),
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
],
swiftSettings: swiftSettings,
),
+4
View File
@@ -0,0 +1,4 @@
#include "inotify_shim.h"
#include "stdout_shim.h"
#include "version.h"
#include "mobileprovision.h"
+21
View File
@@ -0,0 +1,21 @@
#ifndef CINOTIFY_SHIMS_H
#define CINOTIFY_SHIMS_H
#ifdef __linux__
#include <stdio.h>
#include <stdint.h>
#include <sys/inotify.h>
static inline const char *cin_event_name(const struct inotify_event *event) {
if (event->len)
return event->name;
else
return NULL;
}
static const uint32_t cin_all_events = IN_ALL_EVENTS;
#endif
#endif /* CINOTIFY_SHIMS_H */
+1 -21
View File
@@ -193,7 +193,7 @@ public struct Packer: Sendable {
if product.type == .application {
info["UIRequiredDeviceCapabilities"] = ["arm64"]
info["LSRequiresIPhoneOS"] = true
info["CFBundleSupportedPlatforms"] = Packer.cfBundleSupportedPlatforms(for: buildSettings.triple)
info["CFBundleSupportedPlatforms"] = ["iPhoneOS"]
}
if let iconPath = product.iconPath {
@@ -210,26 +210,6 @@ public struct Packer: Sendable {
try encodedPlist.write(to: infoPath)
}
}
static func cfBundleSupportedPlatforms(for triple: String) -> [String] {
let components = triple.split(separator: "-").map(String.init)
guard let appleIndex = components.firstIndex(of: "apple"),
components.indices.contains(appleIndex + 1) else {
return ["iPhoneOS"]
}
let os = components[appleIndex + 1].prefix { !$0.isNumber }
switch os {
case "ios" where components.contains("simulator"):
return ["iPhoneSimulator"]
case "ios":
return ["iPhoneOS"]
case "macos", "macosx":
return ["MacOSX"]
default:
return ["iPhoneOS"]
}
}
}
extension Plan.Product {
-5
View File
@@ -137,10 +137,6 @@ public struct Planner: Sendable {
throw StringError("Could not find target '\(targetName)' in package '\(targetPackage.name)'")
}
guard visited.insert(targetName).inserted else { continue }
// Macro targets are compiler plugins that run on the host, not code
// linked into the iOS app. Skip them to avoid resolving their
// host-only dependencies (e.g. SwiftSyntaxMacros).
if target.type == "macro" { continue }
if target.moduleType == "BinaryTarget" {
resources.append(.binaryTarget(name: targetName))
}
@@ -412,7 +408,6 @@ private struct PackageDump: Decodable {
struct Target: Decodable {
let name: String
let moduleType: String
let type: String?
let productDependencies: [String]?
let targetDependencies: [String]?
let resources: [Resource]?
+18 -60
View File
@@ -1,64 +1,12 @@
import Subprocess
import Version
import XUtils
public struct SwiftVersion: Sendable, Comparable, Hashable {
public var major: Int
public var minor: Int
public var patch: Int
public struct SwiftVersion: Sendable {
public var version: Version
public init(_ major: Int, _ minor: Int, _ patch: Int = 0) {
self.major = major
self.minor = minor
self.patch = patch
}
public static func < (lhs: Self, rhs: Self) -> Bool {
lhs.tuple < rhs.tuple
}
fileprivate var tuple: (Int, Int, Int) {
(major, minor, patch)
}
}
extension SwiftVersion {
public var supportsSwiftBuild: Bool {
self >= SwiftVersion(6, 4)
}
}
extension SwiftVersion: LosslessStringConvertible, CustomStringConvertible {
public var description: String {
"\(major).\(minor).\(patch)"
}
public init?(_ description: String) {
// inverse of https://github.com/swiftlang/swift/blob/896191b38/lib/Basic/Version.cpp#L266
var output = description[...]
if output.hasPrefix("Apple ") {
output = output.dropFirst("Apple ".count)
}
if output.hasPrefix("Swift version ") {
output = output.dropFirst("Swift version ".count)
output = output.prefix { !$0.isWhitespace }
}
let isDev = output.hasSuffix("-dev")
if isDev { output = output.dropLast("-dev".count) }
let parts = output.split(separator: ".")
var numericParts = parts.compactMap { Int($0) }
guard parts.count == numericParts.count else {
return nil
}
switch numericParts.count {
case 2: numericParts.append(0)
case 3: break
default: return nil
}
self.init(numericParts[0], numericParts[1], numericParts[2])
version >= Version(6, 4, 0)
}
}
@@ -76,12 +24,22 @@ extension SwiftVersion {
} catch {
throw StringError("Failed to obtain Swift version")
}
let output = outputString ?? ""
guard let version = Self(output) else {
var output = outputString?[...] ?? ""
if output.hasPrefix("Apple ") {
output = output.dropFirst("Apple ".count)
}
guard output.hasPrefix("Swift version ") else {
throw StringError("Could not parse Swift version: '\(output)'")
}
return version
output = output.dropFirst("Swift version ".count)
guard let space = output.firstIndex(of: " ") else {
throw StringError("Could not parse Swift version: '\(output)'")
}
output = output[..<space]
guard let version = Version(tolerant: output) else {
throw StringError("Could not parse Swift version: '\(output)'")
}
return SwiftVersion(version: version)
}
public static var current: Self {
+126 -254
View File
@@ -1,5 +1,10 @@
#if os(macOS)
import Foundation
import XcodeProjects
import PathKit
import Version
import ProjectSpec
import XcodeGenKit
import XcodeProj
public struct XcodePacker {
public var plan: Plan
@@ -9,284 +14,151 @@ public struct XcodePacker {
}
// swiftlint:disable:next function_body_length
public func createProject(
at root: URL = URL(fileURLWithPath: FileManager.default.currentDirectoryPath, isDirectory: true)
) async throws -> URL {
let xtoolDir = root.appendingPathComponent("xtool", isDirectory: true)
let projectDir = xtoolDir.appendingPathComponent(".xtool-tmp", isDirectory: true)
try? FileManager.default.removeItem(at: projectDir)
try FileManager.default.createDirectory(at: projectDir, withIntermediateDirectories: true)
public func createProject() async throws -> URL {
let xtoolDir: Path = "xtool"
let fromProjectToRoot = "../.."
let projectDir: Path = xtoolDir + ".xtool-tmp"
try? xtoolDir.delete()
try projectDir.mkpath()
let emptyText = Data("// leave this file empty".utf8)
let products = plan.allProducts
let targetIDs = products.map {
XCSchema.ObjectID("xtool:\($0.product)")
let fromProjectToRoot = try Path(".").relativePath(from: projectDir)
guard let deploymentTarget = Version(tolerant: plan.app.deploymentTarget) else {
throw StringError("Could not parse deployment target '\(plan.app.deploymentTarget)'")
}
let sourcePhase = XCSchema.BuildPhase.sources(.init(objectID: nil, name: nil))
let frameworksPhase = XCSchema.BuildPhase.frameworks(.init(objectID: nil, name: nil))
var groups: [XCSchema.Reference] = []
var productFiles: [XCSchema.Reference] = []
var targets: [XCSchema.Target] = []
let emptyText = Data("""
// leave this file empty
""".utf8)
for (index, product) in products.enumerated() {
let productDir = projectDir.appendingPathComponent(product.product, isDirectory: true)
try FileManager.default.createDirectory(at: productDir, withIntermediateDirectories: true)
try emptyText.write(to: productDir.appendingPathComponent("empty.c"))
let targets = try plan.allProducts.map { product in
let productDir = projectDir + product.product
try productDir.mkpath()
let emptyFile = productDir + "empty.c"
try emptyFile.write(emptyText)
let infoPath = productDir + "Info.plist"
var plist = product.infoPlist
let families = (plist.removeValue(forKey: "UIDeviceFamily") as? [Int]) ?? [1, 2]
plist["CFBundleExecutable"] = product.targetName
plist["CFBundleName"] = product.targetName
plist["CFBundleDisplayName"] = product.product
if let iconPath = product.iconPath {
plist["CFBundleIconFile"] = URL(fileURLWithPath: iconPath).deletingPathExtension().lastPathComponent
}
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
try encodedPlist.write(to: productDir.appendingPathComponent("Info.plist"))
try infoPath.write(encodedPlist)
var buildSettings: [String: XCSchema.BuildSetting] = [
var buildSettings: [String: BuildSetting] = [
"PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
"PRODUCT_NAME": .string(product.targetName),
"TARGETED_DEVICE_FAMILY": .string(families.map(String.init).joined(separator: ",")),
"IPHONEOS_DEPLOYMENT_TARGET": .string(product.deploymentTarget),
"INFOPLIST_FILE": .string("\(product.product)/Info.plist"),
"LD_RUNPATH_SEARCH_PATHS": .array(["$(inherited)", "@executable_path/Frameworks"]),
"TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
]
if product.type == .appExtension {
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = .string("YES")
buildSettings["LD_RUNPATH_SEARCH_PATHS"] = .array([
"$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks",
])
buildSettings["APPLICATION_EXTENSION_API_ONLY"] = true
}
if let entitlementsPath = product.entitlementsPath {
let path = (entitlementsPath as NSString).isAbsolutePath
? entitlementsPath
: (fromProjectToRoot as NSString).appendingPathComponent(entitlementsPath)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string(path)
buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
}
let source = XCSchema.FileReference(
objectID: nil,
path: "empty.c",
explicitFileType: nil,
expectedSignature: nil,
textEncoding: nil,
lineEnding: nil,
includeInIndex: nil,
buildFiles: [.init(
objectID: nil,
buildPhase: .named(
target: .init(targetName: product.targetName),
kind: .sources,
name: nil
),
properties: buildFileProperties(),
)],
)
let info = XCSchema.FileReference(
objectID: nil,
path: "Info.plist",
explicitFileType: nil,
expectedSignature: nil,
textEncoding: nil,
lineEnding: nil,
includeInIndex: nil,
buildFiles: [],
)
let resources = try resourceReferences(for: product, at: root)
groups.append(.group(.init(
objectID: nil,
name: product.product,
path: try .init(base: .group, path: product.product),
includeInIndex: nil,
children: [.fileReference(source), .fileReference(info)] + resources,
)))
let productFilename = "\(product.targetName).\(product.type == .application ? "app" : "appex")"
let productFile = XCSchema.FileReference(
objectID: nil,
path: try .init(base: .buildProducts, path: productFilename),
explicitFileType: .init(fileTypeID: product.type == .application ? "wrapper.application" : "wrapper.app-extension"),
expectedSignature: nil,
textEncoding: nil,
lineEnding: nil,
includeInIndex: false,
buildFiles: index == 0 ? [] : [.init(
objectID: nil,
buildPhase: .named(
target: .init(targetName: plan.app.targetName),
kind: .copy,
name: "Embed App Extensions",
),
properties: buildFileProperties(removeHeadersOnCopy: true),
)],
)
productFiles.append(.fileReference(productFile))
let packageProduct = XCSchema.SwiftPackageProductReference(
objectID: nil,
package: nil,
productName: product.product,
productType: .other,
)
let packageMember = XCSchema.SwiftPackageProductTargetMember(
packageProduct: packageProduct,
buildFile: .init(
objectID: nil,
buildPhase: .named(kind: .frameworks, name: nil),
properties: buildFileProperties(),
),
)
var phases = [sourcePhase, frameworksPhase]
if !resources.isEmpty {
phases.append(.copy(.init(
objectID: nil,
name: "Copy Root Resources",
bundleBasePath: .resourcesDir,
relativePath: "",
scope: .always,
)))
}
if index == 0 && !plan.extensions.isEmpty {
phases.append(.copy(.init(
objectID: nil,
name: "Embed App Extensions",
bundleBasePath: .plugInsDir,
relativePath: "",
scope: .always,
)))
}
let dependencies: [XCSchema.TargetDependency] = index == 0
? plan.extensions.map {
.localTarget(XCSchema.LocalTargetReference(targetName: $0.targetName), [])
let additionalDependencies: [Dependency] = if product.type == .application {
plan.extensions.map {
Dependency(
type: .target,
reference: $0.targetName
)
}
: []
targets.append(.native(XCSchema.CommonTargetProperties(
} else {
[]
}
return Target(
name: product.targetName,
objectID: targetIDs[index],
configurationListDebugID: nil,
dependencies: dependencies,
buildPhases: phases,
buildRules: [],
specializedConfigurations: [],
buildSettings: buildSettings,
product: .namePath(.init(components: [.child("Products"), .child(productFilename)])),
productTypeID: XCSchema.ProductTypeID(
abbreviatedRepresentation: product.type == .application
? "application"
: "app-extension"
),
testHostTarget: nil,
legacyProvisioningStyle: nil,
legacyTeamID: nil,
lastSwiftUpdateCheck: nil,
lastSwiftMigration: nil,
packageProductTargetMembers: [packageMember],
)))
}
let schema = XCSchema.Project(
objectID: nil,
rootGroupDebugID: nil,
configurationListDebugID: nil,
topLevelReferences: groups + [
.group(XCSchema.Group(
objectID: nil,
name: "Products",
path: "",
includeInIndex: nil,
children: productFiles,
))
],
packages: [.init(location: .local(.init(path: fromProjectToRoot)), traits: [])],
configurations: ["Debug", "Release"].map {
.init(name: .init(name: $0), file: nil, objectID: nil)
},
buildSettings: ["SDKROOT": .string("iphoneos")],
defaultConfigurationName: .init(name: "Debug"),
targets: targets,
localizationInfo: .init(development: .init(languageID: "en"), supported: []),
requiredCapabilities: [],
buildIndependentTargetsInParallel: true,
lastUpgradeCheck: nil,
lastSwiftUpdateCheck: nil,
lastSwiftMigration: nil,
organizationName: nil,
classPrefix: nil,
productsGroup: .namePath(.init(components: [.child("Products")])),
importedProducts: [],
)
let project = XcodeProject(project: schema)
let projectURL = projectDir.appending(path: "\(plan.app.product).xcodeproj")
try project.write(to: projectURL)
let workspace = XcodeWorkspace(children: [
.file(XcodeWorkspace.Location(base: .container, path: "..")),
.file(XcodeWorkspace.Location(base: .group, path: ".xtool-tmp/\(projectURL.lastPathComponent)"))
])
let workspaceURL = xtoolDir.appending(path: "\(plan.app.product).xcworkspace")
try workspace.write(to: workspaceURL)
return workspaceURL
}
private func resourceReferences(for product: Plan.Product, at root: URL) throws -> [XCSchema.Reference] {
var paths = product.resources.compactMap { resource -> String? in
guard case .root(let source) = resource else { return nil }
return source
}
if let iconPath = product.iconPath {
paths.append(iconPath)
}
var visited: Set<String> = []
return try paths.compactMap { path in
let url = URL(fileURLWithPath: path, relativeTo: root).standardizedFileURL
guard visited.insert(url.path).inserted else { return nil }
let isAbsolute = (path as NSString).isAbsolutePath
let referencePath = isAbsolute ? path : ("../.." as NSString).appendingPathComponent(path)
var isDirectory: ObjCBool = false
_ = FileManager.default.fileExists(atPath: url.path, isDirectory: &isDirectory)
return .fileReference(.init(
objectID: nil,
path: try .init(base: isAbsolute ? .absolute : .project, path: referencePath),
explicitFileType: isDirectory.boolValue ? .init(fileTypeID: "folder") : nil,
expectedSignature: nil,
textEncoding: nil,
lineEnding: nil,
includeInIndex: nil,
buildFiles: [.init(
objectID: nil,
buildPhase: .named(
target: .init(targetName: product.targetName),
kind: .copy,
name: "Copy Root Resources",
type: product.type == .application ? .application : .appExtension,
platform: .iOS,
deploymentTarget: deploymentTarget,
settings: Settings(buildSettings: buildSettings),
sources: [
TargetSource(
path: try emptyFile.relativePath(from: projectDir).string,
buildPhase: .sources
),
properties: buildFileProperties(),
)],
))
],
dependencies: [
Dependency(
type: .package(products: [product.product]),
reference: "RootPackage"
),
] + additionalDependencies,
info: Plist(
path: try infoPath.relativePath(from: projectDir).string,
attributes: [:]
)
)
}
}
private func buildFileProperties(removeHeadersOnCopy: Bool = false) -> XCSchema.BuildFileProperties {
XCSchema.BuildFileProperties(
platformFilters: [],
additionalBuildFlags: nil,
assetTags: [],
attributes: XCSchema.BuildFileAttributes(
headerRole: nil,
machInterfaceGeneration: nil,
isWeak: false,
codeSignOnCopy: false,
codeGeneration: .default,
headerPreservation: removeHeadersOnCopy ? .removeOnCopy : .keep,
decompress: false,
codeGenerationVisibility: nil,
),
let project = Project(
name: plan.app.targetName,
targets: targets,
packages: [
"RootPackage": .local(
path: fromProjectToRoot.string,
group: nil,
excludeFromProject: false
),
],
options: SpecOptions(
localPackagesGroup: ""
)
)
// TODO: Handle plan.resources of type .root
// TODO: Handle plan.iconPath
let generator = ProjectGenerator(project: project)
let xcodeproj = projectDir + "\(plan.app.product).xcodeproj"
let xcworkspace = xtoolDir + "\(plan.app.product).xcworkspace"
do {
let current = Path.current
Path.current = xcodeproj.parent()
defer { Path.current = current }
let xcodeProject = try generator.generateXcodeProject(userName: NSUserName())
if let packageRef = xcodeProject.pbxproj.fileReferences.first(where: { $0.name == ".." }) {
for group in xcodeProject.pbxproj.groups {
group.children.removeAll(where: { $0.uuid == packageRef.uuid })
}
xcodeProject.pbxproj.delete(object: packageRef)
}
try xcodeProject.write(path: Path(xcodeproj.lastComponent))
}
do {
let current = Path.current
Path.current = xcworkspace.parent()
defer { Path.current = current }
let xcworkspaceDirectory = xcworkspace.parent()
let fromWorkspaceToSelf = try Path(".").relativePath(from: xcworkspaceDirectory).withName()
let fromWorkspaceToProject = try xcodeproj.relativePath(from: xcworkspaceDirectory).withName()
let workspace = XCWorkspace(data: .init(children: [
.file(.init(location: .container(fromWorkspaceToSelf.string))),
.file(.init(location: .group(fromWorkspaceToProject.string))),
]))
try workspace.write(path: Path(xcworkspace.lastComponent))
}
return xcworkspace.url
}
}
extension Path {
fileprivate func withName() -> Path {
// eg if curr dir is Foo, this converts "." to "../Foo"
// which includes the name in the path, and therefore
// in the Xcode navigator
self.parent() + self.absolute().lastComponent
}
}
#endif
@@ -100,9 +100,8 @@ public struct DeveloperServicesFetchCertificateOperation: DeveloperServicesOpera
return try await self.replaceCertificates(certificates, requireConfirmation: true)
}
guard let certificate = certificates.first(where: {
$0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true
}) else {
let knownSerialNumber = signingInfo.certificate.serialNumber()
guard let certificate = certificates.first(where: { $0.attributes?.serialNumber == knownSerialNumber }) else {
// we need to revoke existing certs, otherwise it doesn't always let us make a new one
return try await self.replaceCertificates(certificates, requireConfirmation: true)
}
@@ -54,6 +54,7 @@ public struct DeveloperServicesClient: Sendable {
}
}
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.httpClient) var httpClient
@@ -75,6 +76,8 @@ public struct DeveloperServicesClient: Sendable {
throw Error.malformedRequest
}
let deviceInfo = try deviceInfoProvider.fetch()
var httpRequest = HTTPRequest(method: .post, url: url)
let acceptedLanguages = Locale.preferredLanguages.joined(separator: ", ")
@@ -85,6 +88,8 @@ public struct DeveloperServicesClient: Sendable {
request.methodOverride.map { httpRequest.headerFields[.init("X-HTTP-Method-Override")!] = $0 }
httpRequest.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
httpRequest.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
httpRequest.headerFields[.init("X-Apple-I-Identity-Id")!] = loginToken.adsid
httpRequest.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
@@ -98,6 +103,8 @@ public struct DeveloperServicesClient: Sendable {
let (_, data) = try await httpClient.makeRequest(httpRequest, body: body)
// String(data: data, encoding: .utf8).map { print("\(url): \($0)") }
let decoded: R.Response = try request.apiVersion.decode(response: data)
return try await request.parse(decoded)
@@ -105,6 +105,7 @@ public struct XcodeAuthData: Sendable {
}
public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
@Dependency(\.deviceInfoProvider) private var deviceInfoProvider
@Dependency(\.anisetteDataProvider) private var anisetteDataProvider
public var authData: XcodeAuthData
@@ -129,7 +130,7 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
) async throws -> (HTTPResponse, HTTPBody?) {
var request = request
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
let deviceInfo = try deviceInfoProvider.fetch()
// General
request.headerFields[.acceptLanguage] = Locale.preferredLanguages.joined(separator: ", ")
@@ -141,12 +142,17 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
request.headerFields[.userAgent] = "Xcode"
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
// MobileMe identity
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
// GrandSlam authentication
request.headerFields[.init("X-Apple-App-Info")!] = AppTokenKey.xcode.rawValue
request.headerFields[.init("X-Apple-I-Identity-Id")!] = authData.loginToken.adsid
request.headerFields[.init("X-Apple-GS-Token")!] = authData.loginToken.token
// Anisette
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
for (key, value) in anisetteData.dictionary {
request.headerFields[.init(key)!] = value
}
@@ -61,16 +61,13 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
break
}
// Match locally rather than with filter[serialNumber]: the API lists serials with a
// leading zero nibble ("0E41…") but its filter only matches them without it ("E41…").
let certs = try await DeveloperAPIPages {
try await context.developerAPIClient.certificatesGetCollection().ok.body.json
} next: {
$0.links.next
}
.map(\.data)
.reduce(into: [], +=)
.filter { $0.attributes?.serialNumber.map(signingInfo.certificate.hasSerialNumber) == true }
let serialNumber = signingInfo.certificate.serialNumber()
let certs = try await context.developerAPIClient.certificatesGetCollection(
query: .init(
filter_lbrack_serialNumber_rbrack_: [serialNumber]
)
)
.ok.body.json.data
let allDevices = try await context.developerAPIClient.devicesGetCollection()
.ok.body.json.data
@@ -18,6 +18,15 @@ public protocol RawADIProvider: Sendable {
) async throws -> (machineID: Data, otp: Data)
}
extension RawADIProvider {
public func clientInfo() async throws -> String {
// Looks like Apple detects attempts to use a macOS client string on Windows :/
"""
<PC> <Windows;6.2(0,0);9200> <com.apple.AuthKitWin/1 (com.apple.iCloud/7.21)>
"""
}
}
private struct UnimplementedRawADIProvider: RawADIProvider {
func startProvisioning(
spim: Data,
@@ -35,16 +44,17 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
let closure: (UUID, inout UInt64, Data) async throws -> (Data, Data) = unimplemented()
return try await closure(userID, &routingInfo, provisioningInfo)
}
func clientInfo() async throws -> String {
let closure: () async throws -> String = unimplemented()
return try await closure()
}
}
private enum RawADIProviderDependencyKey: DependencyKey {
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
static let liveValue: RawADIProvider = OmnisetteADIProvider()
static let liveValue: RawADIProvider = {
#if canImport(XADI)
return XADIProvider()
#else
return OmnisetteADIProvider()
#endif
}()
}
extension DependencyValues {
@@ -169,12 +179,15 @@ public struct ADIDataProvider: AnisetteDataProvider {
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
for (key, value) in try await deviceInfo().dictionary {
request.headerFields[.init(key)!] = value
}
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = try await clientInfo()
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = self.localUserUID.uuidString
// request.headers[DeviceInfo.clientInfoKey] = self.deviceInfo.clientInfo.clientString
// self.deviceInfo.dictionary.forEach { request.headers[$0] = $1 }
let (_, response) = try await self.httpClient.makeRequest(request, body: body)
// print(String(data: response, encoding: .utf8) ?? "<no utf8 data>")
return try GrandSlamOperationDecoder<Response>.decode(data: response)
}
@@ -226,7 +239,7 @@ public struct ADIDataProvider: AnisetteDataProvider {
machineID: mid.base64EncodedString(),
localUserID: self.localUserID,
oneTimePassword: otp.base64EncodedString(),
deviceInfo: try await deviceInfo(),
deviceID: self.localUserUID.uuidString
)
}
@@ -236,7 +249,11 @@ public struct ADIDataProvider: AnisetteDataProvider {
}
private static var providerID: String? {
"mac-omnisette"
#if os(macOS)
return "1"
#else
return nil
#endif
}
public var providerID: String? { Self.providerID }
@@ -274,13 +291,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
)
}
public func deviceInfo() async throws -> DeviceInfo {
DeviceInfo(
deviceID: localUserUID.uuidString,
clientInfo: try await clientInfo(),
)
}
}
public struct ADIError: Error, CustomStringConvertible {
@@ -49,9 +49,10 @@ public struct AnisetteData {
static let oneTimePasswordKey = "X-Apple-I-MD"
public let oneTimePassword: String
public let deviceInfo: DeviceInfo
static let deviceIDKey = "X-Mme-Device-Id"
public var deviceID: String?
public var dictionary: [String: String] {
var dictionary: [String: String] {
// GSA doesn't like "en_US@rg=..."; it has to be just "en_US".
let localeIdentifier = if let language = locale.language.languageCode?.identifier,
let region = locale.region?.identifier {
@@ -59,7 +60,7 @@ public struct AnisetteData {
} else {
"en_US"
}
return [
var dictionary = [
Self.localeKey: localeIdentifier,
Self.timeZoneKey: timeZone.abbreviation() ?? "UTC",
Self.clientTimeKey: Self.dateFormatter.string(from: clientTime),
@@ -68,7 +69,10 @@ public struct AnisetteData {
Self.localUserIDKey: localUserID,
Self.oneTimePasswordKey: oneTimePassword,
]
.merging(deviceInfo.dictionary) { _, b in b }
if let deviceID {
dictionary[Self.deviceIDKey] = deviceID
}
return dictionary
}
}
@@ -22,8 +22,6 @@ public protocol AnisetteDataProvider: Sendable {
func resetProvisioning() async
func provisioningData() -> ProvisioningData?
func deviceInfo() async throws -> DeviceInfo
func fetchAnisetteData() async throws -> AnisetteData
}
@@ -56,9 +54,4 @@ private struct UnimplementedAnisetteDataProvider: AnisetteDataProvider {
let closure: () async throws -> AnisetteData = unimplemented()
return try await closure()
}
func deviceInfo() async throws -> DeviceInfo {
let closure: () async throws -> DeviceInfo = unimplemented()
return try await closure()
}
}
@@ -0,0 +1,102 @@
//
// DeviceInfo+Fetching.swift
// XKit
//
// Created by Kabir Oberai on 18/06/20.
// Copyright © 2020 Kabir Oberai. All rights reserved.
//
import Foundation
#if os(macOS)
extension DeviceInfo {
private static func fetchDeviceID() -> String? {
var waitTime = timespec(tv_sec: 0, tv_nsec: 0) // wait indefinitely
let bytes = [UInt8](unsafeUninitializedCapacity: MemoryLayout<uuid_t>.size) { buf, count in
// force unwrapping is safe because uuid_t has a non-zero size
count = (gethostuuid(buf.baseAddress!, &waitTime) == 0) ? buf.count : 0
}
guard !bytes.isEmpty else { return nil }
return bytes.withUnsafeBufferPointer {
UUID(uuid: UnsafeRawBufferPointer($0).load(as: uuid_t.self)).uuidString
}
}
private static func hardwareProperty(forKey key: String) -> Data? {
let entry = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options")
guard entry != 0 else { return nil }
defer { IOObjectRelease(entry) }
return IORegistryEntryCreateCFProperty(
entry, key as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? Data
}
private static func fetchROMAddress() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:ROM")?
.map { String(format: "%02hhx", $0) }
.joined()
}
private static func fetchMLBSerialNumber() -> String? {
hardwareProperty(forKey: "4D1EDE05-38C7-4a6a-9CC6-4BCCA8B38C14:MLB")?
.map { String(format: isprint(Int32($0)) != 0 ? "%c" : "%02hhx", $0) }
.joined()
}
private static func fetchSerialNumber() -> String? {
let service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"))
guard service != 0 else { return nil }
defer { IOObjectRelease(service) }
return IORegistryEntryCreateCFProperty(
service, "IOPlatformSerialNumber" as CFString, kCFAllocatorDefault, 0
)?.takeRetainedValue() as? String
}
private static func fetchHardwareModel() -> String? {
var modelSize = 0
guard sysctlbyname("hw.model", nil, &modelSize, nil, 0) == 0,
modelSize > 0 else { return nil }
return String(unsafeUninitializedCapacity: modelSize) { buf in
var len = modelSize
guard sysctlbyname("hw.model", buf.baseAddress, &len, nil, 0) == 0,
len == modelSize else { return 0 }
return len - 1 // exclude NUL
}
}
public static func current() -> DeviceInfo? {
let romAddress = fetchROMAddress() ?? ""
let mlbSerialNumber = fetchMLBSerialNumber() ?? ""
guard let deviceID = fetchDeviceID(),
let serialNumber = fetchSerialNumber(),
let modelID = fetchHardwareModel()
else { return nil }
return DeviceInfo(
deviceID: deviceID,
romAddress: romAddress,
mlbSerialNumber: mlbSerialNumber,
serialNumber: serialNumber,
modelID: modelID
)
}
}
#else
extension DeviceInfo {
public static func current() -> DeviceInfo? {
return DeviceInfo(
deviceID: "99B5D9D4-B068-5CEE-A799-5EBB5B0894A6",
romAddress: "94f6a300e9a0",
mlbSerialNumber: "C02520301W0GF2D1U",
serialNumber: "C02PQKRJG8WP",
modelID: "Mac16,1"
)
}
}
#endif
// FIXME: Figure out DeviceInfo.current() outside macOS
// (see above)
@@ -1,20 +1,116 @@
//
// DeviceInfo.swift
// XKit
//
// Created by Kabir Oberai on 19/11/19.
// Copyright © 2019 Kabir Oberai. All rights reserved.
//
import Foundation
import Dependencies
public struct DeviceInfo: Codable, Sendable {
public static let xcodeVersionKey = "X-Xcode-Version"
public static let xcodeVersion = "26.5 (17F42)"
public static let akdUserAgent = "akd/1.0 CFNetwork/808.1.4"
public static let deviceIDKey = "X-Mme-Device-Id"
/// `X-Xcode-Version`
static let xcodeVersionKey = "X-Xcode-Version"
/// Not included in `dictionary`
public static let xcodeVersion = "26.5 (17F42)"
public struct ClientInfo: Codable {
public let modelID: String // e.g. MacBookPro11,5
var clientString: String {
"""
<\(modelID)> <macOS;27.0;26A5378j> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
"""
}
var userAgent: String {
"AuthKit/1 (Macintosh; OS X 27.0) (com.apple.dt.Xcode/26.5)"
}
public init(modelID: String) {
self.modelID = modelID
}
}
/// `X-Mme-Device-Id`
static let deviceIDKey = "X-Mme-Device-Id"
public let deviceID: String
public static let clientInfoKey = "X-MMe-Client-Info"
public let clientInfo: String
/// `X-Apple-I-ROM`
static let romAddressKey = "X-Apple-I-ROM"
public let romAddress: String
public var dictionary: [String: String] {
/// `X-Apple-I-MLB`
static let mlbSerialNumberKey = "X-Apple-I-MLB"
/// main logic board serial number
public let mlbSerialNumber: String
/// `X-Apple-I-SRL-NO`
static let serialNumberKey = "X-Apple-I-SRL-NO"
public let serialNumber: String
public let modelID: String
/// `X-MMe-Client-Info`
static let clientInfoKey = "X-MMe-Client-Info"
public var clientInfo: ClientInfo { .init(modelID: modelID) }
public init(
deviceID: String,
romAddress: String,
mlbSerialNumber: String,
serialNumber: String,
modelID: String
) {
self.deviceID = deviceID
self.romAddress = romAddress
self.mlbSerialNumber = mlbSerialNumber
self.serialNumber = serialNumber
self.modelID = modelID
}
var dictionary: [String: String] {
[
Self.clientInfoKey: clientInfo,
Self.deviceIDKey: deviceID,
Self.romAddressKey: romAddress,
Self.mlbSerialNumberKey: mlbSerialNumber,
Self.serialNumberKey: serialNumber
]
}
}
extension DeviceInfo {
public enum FetchError: Error {
case couldNotFetch
}
fileprivate static func fetch() throws -> Self {
guard let deviceInfo = DeviceInfo.current() else {
throw FetchError.couldNotFetch
}
return deviceInfo
}
}
public struct DeviceInfoProvider: DependencyKey, Sendable {
public var fetch: @Sendable () throws -> DeviceInfo
public init(fetch: @escaping @Sendable () throws -> DeviceInfo) {
self.fetch = fetch
}
private static let current = Result { try DeviceInfo.fetch() }
public static let testValue = DeviceInfoProvider(fetch: unimplemented())
public static let liveValue = DeviceInfoProvider { try current.get() }
}
extension DependencyValues {
public var deviceInfoProvider: DeviceInfoProvider {
get { self[DeviceInfoProvider.self] }
set { self[DeviceInfoProvider.self] = newValue }
}
}
@@ -0,0 +1,256 @@
//
// LocalAnisetteDataProviders.swift
// XKit
//
// Created by Kabir Oberai on 29/06/20.
// Copyright © 2020 Kabir Oberai. All rights reserved.
//
#if false
// For reference: https://github.com/xtool-org/xtool/issues/196
import Foundation
/// Creates a socket connected to `ip` on `port`.
///
/// - Returns: A connected socket file descriptor, or `nil` if
/// the connection failed. The caller is responsible for closing
/// the returned file descriptor.
private func connect(toIP ip: String, port: UInt16) -> Int32? {
var addr = sockaddr_in()
addr.sin_family = .init(AF_INET)
addr.sin_port = CFSwapInt16HostToBig(port)
addr.sin_addr.s_addr = inet_addr(ip)
// we can't do this inside withUnsafePointer due to memory exclusivity rules
let addrSize = MemoryLayout.size(ofValue: addr)
let socketFd = socket(AF_INET, SOCK_STREAM, 0)
guard socketFd != -1 else { return nil }
guard withUnsafePointer(to: &addr, {
connect(
socketFd,
UnsafeRawPointer($0).assumingMemoryBound(to: sockaddr.self),
.init(addrSize)
)
}) == 0 else { return nil }
return socketFd
}
public class NetcatAnisetteDataProvider: AnisetteDataProvider {
private struct RawAnisetteData {
let machineID: String
let localUserID: String
let routingInfo: String
let oneTimePassword: String
}
private class ConnectionInfo {
let socketFd: Int32
let machineID: String
let localUserID: String
let routingInfo: String
let firstOTP: String
init(socketFd: Int32, machineID: String, localUserID: String, routingInfo: String, firstOTP: String) {
self.socketFd = socketFd
self.machineID = machineID
self.localUserID = localUserID
self.routingInfo = routingInfo
self.firstOTP = firstOTP
}
deinit { close(socketFd) }
}
public enum Error: Swift.Error {
/// The user is probably not running anisettehelperd on the host machine
case helperUnreachable
case invalidAnisetteData
case networkError(errno: Int32)
}
public let ip: String
public let port: UInt16
public let deviceInfo: DeviceInfo
private var _connectionInfo: ConnectionInfo?
private var hasUsedFirstOTP = false
public init(ip: String, port: UInt16, deviceInfo: DeviceInfo) {
self.ip = ip
self.port = port
self.deviceInfo = deviceInfo
}
public convenience init(localPort port: UInt16, deviceInfo: DeviceInfo) {
self.init(ip: "0.0.0.0", port: port, deviceInfo: deviceInfo)
}
private func readAll(fromSocket sock: Int32) throws -> Data {
let capacity = 1024
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
defer { buf.deallocate() }
var data = Data()
while true {
let count = recv(sock, buf, capacity, 0)
guard count != -1 else {
throw Error.networkError(errno: errno)
}
data.append(buf, count: count)
if count < capacity {
break
}
}
return data
}
private func connectionInfo() throws -> ConnectionInfo {
if let connectionInfo = _connectionInfo { return connectionInfo }
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
let id = deviceInfo.deviceID
write(socketFd, id, strlen(id) + 1) // include null
let clientInfo = deviceInfo.clientInfo.clientString
write(socketFd, clientInfo, strlen(clientInfo) + 1)
let initialData = try readAll(fromSocket: socketFd)
guard let string = String(data: initialData, encoding: .utf8)
else { throw Error.invalidAnisetteData }
let components = string.split(separator: "\r\n")
guard components.count == 4 else { throw Error.invalidAnisetteData }
let connectionInfo = ConnectionInfo(
socketFd: socketFd,
machineID: String(components[0]),
localUserID: String(components[1]),
routingInfo: String(components[2]),
firstOTP: String(components[3])
)
_connectionInfo = connectionInfo
return connectionInfo
}
private func rawAnisetteData() throws -> RawAnisetteData {
let info = try connectionInfo()
if !hasUsedFirstOTP {
return RawAnisetteData(
machineID: info.machineID,
localUserID: info.localUserID,
routingInfo: info.routingInfo,
oneTimePassword: info.firstOTP
)
}
write(info.socketFd, "a\n", 3)
let response = try readAll(fromSocket: info.socketFd)
guard let otp = String(data: response, encoding: .utf8)
else { throw Error.invalidAnisetteData }
return RawAnisetteData(
machineID: info.machineID,
localUserID: info.localUserID,
routingInfo: info.routingInfo,
oneTimePassword: otp
)
}
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
let time = Date()
let raw: RawAnisetteData
let routingInfo: UInt64
do {
raw = try rawAnisetteData()
guard let rinfo = UInt64(raw.routingInfo)
else { throw Error.invalidAnisetteData }
routingInfo = rinfo
} catch {
return completion(.failure(error))
}
let anisette = AnisetteData(
clientTime: time,
routingInfo: routingInfo,
machineID: raw.machineID,
localUserID: raw.localUserID,
oneTimePassword: raw.oneTimePassword
)
completion(.success(anisette))
}
}
/// Provides Anisette Data by making a request to a TCP server
public class TCPAnisetteDataProvider: AnisetteDataProvider {
public enum Error: Swift.Error {
/// The user is probably not running anisettehelperd on the host machine
case helperUnreachable
case invalidAnisetteData
}
public let ip: String
public let port: UInt16
public init(ip: String, port: UInt16) {
self.ip = ip
self.port = port
}
public convenience init(localPort port: UInt16) {
self.init(ip: "0.0.0.0", port: port)
}
private func rawAnisetteData() throws -> Data {
guard let socketFd = connect(toIP: ip, port: port) else { throw Error.helperUnreachable }
let capacity = 1024
let buf = UnsafeMutablePointer<UInt8>.allocate(capacity: capacity)
defer { buf.deallocate() }
var data = Data()
while true {
let count = recv(socketFd, buf, capacity, 0)
// swiftlint:disable:next empty_count
guard count != 0 else { break }
data.append(buf, count: count)
}
return data
}
public func fetchAnisetteData(completion: @escaping (Result<AnisetteData, Swift.Error>) -> Void) {
let time = Date()
let rawDeserialized: Any
do {
let raw = try rawAnisetteData()
rawDeserialized = try PropertyListSerialization.propertyList(from: raw, format: nil)
} catch {
return completion(.failure(error))
}
guard let data = rawDeserialized as? [String: Any],
let rinfoString = data[AnisetteData.routingInfoKey] as? String,
let rinfo = UInt64(rinfoString),
let machineID = data[AnisetteData.machineIDKey] as? String,
let localUserID = data[AnisetteData.localUserIDKey] as? String,
let oneTimePassword = data[AnisetteData.oneTimePasswordKey] as? String
else { return completion(.failure(Error.invalidAnisetteData)) }
completion(.success(AnisetteData(
clientTime: time,
routingInfo: rinfo,
machineID: machineID,
localUserID: localUserID,
oneTimePassword: oneTimePassword
)))
}
}
#endif
@@ -6,9 +6,10 @@ struct OmnisetteADIProvider: RawADIProvider {
// should implement v3 of https://github.com/SideStore/omnisette-server
// list: https://servers.sidestore.io/servers.json
// e.g. https://ani.sidestore.io
private let url: URL
init(
url: URL = URL(string: "https://mac-ani.jkcoxson.com")!
url: URL = URL(string: "https://ani.sidestore.io")! // URL(string: "http://localhost:6969")!
) {
self.url = url
}
@@ -0,0 +1,196 @@
#if canImport(XADI)
import Foundation
import XADI
import Dependencies
import Subprocess
public actor XADIProvider: RawADIProvider {
@MainActor private static var loadTask: Task<Void, Error>?
@Dependency(\.httpClient) private var httpClient
@Dependency(\.persistentDirectory) private var persistentDirectory
private var directory: URL { persistentDirectory.appendingPathComponent("Anisette") }
public init() {}
private func _loadADI(id: UUID) async throws {
let dir = self.directory
let libDir = dir.appending(path: "libs")
if !libDir.dirExists {
let tmp = dir.appending(path: "tmp")
try? FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
let applemusic = tmp.appending(path: "applemusic.apk")
if !applemusic.exists {
print("[Downloading libraries] ...", terminator: "")
fflush(stdoutSafe)
let url = URL(string: "https://apps.mzstatic.com/content/android-apple-music-apk/applemusic.apk")!
defer { print("") }
let data = try await httpClient.makeRequest(HTTPRequest(url: url)) { progress in
guard let progress else { return }
let progString = "\(Int(progress * 100))%".padding(toLength: 4, leading: true)
print("\r[Downloading libraries] \(progString)", terminator: "")
fflush(stdoutSafe)
}.body
try data.write(to: applemusic)
}
#if arch(arm64)
let arch = "arm64-v8a"
#elseif arch(x86_64)
let arch = "x86_64"
#else
#error("Unsupported architecture")
#endif
let archDir = "lib/\(arch)"
// TODO: Use ZIPFoundation
try await Subprocess.run(
.name("unzip"),
arguments: [
"-q",
applemusic.path,
"\(archDir)/libCoreADI.so",
"\(archDir)/libstoreservicescore.so",
"-d", tmp.path
],
output: .discarded
).checkSuccess()
try FileManager.default.moveItem(
at: tmp.appending(path: archDir),
to: libDir
)
try? FileManager.default.removeItem(at: tmp)
}
xadi_Load(strdup(libDir.path()))
let rawID = id.uuidString.replacingOccurrences(of: "-", with: "").prefix(16).lowercased()
try check(xadi_SetAndroidID(rawID, UInt32(rawID.utf8.count)))
let adi = dir.appending(path: "adi")
try? FileManager.default.createDirectory(at: adi, withIntermediateDirectories: true)
try check(xadi_SetProvisioningPath(adi.path()))
}
@MainActor private func loadADI(id: UUID) async throws {
if let loadTask = Self.loadTask {
try await loadTask.value
return
}
let loadTask = Task { try await _loadADI(id: id) }
Self.loadTask = loadTask
try await loadTask.value
}
public func clientInfo() async throws -> String {
"""
<MacBookPro13,2> <macOS;13.1;22C65> <com.apple.AuthKit/1 (com.apple.dt.Xcode/3594.4.19)>
"""
}
public func startProvisioning(spim: Data, userID: UUID) async throws -> (any RawADIProvisioningSession, Data) {
try await loadADI(id: userID)
var sessionID: UInt32 = 0
var cpimBytes: UnsafeMutableRawPointer?
var cpimLen: UInt32 = 0
try check(spim.withUnsafeBytes { spimBytes in
xadi_ProvisioningStart(
UInt64(bitPattern: -2),
spimBytes.baseAddress!, UInt32(spimBytes.count),
&cpimBytes, &cpimLen,
&sessionID
)
})
let data = Data(UnsafeRawBufferPointer(start: cpimBytes, count: Int(cpimLen)))
_ = cpimBytes.map { xadi_Dispose($0) }
return (
ADISession(
sessionID: sessionID,
adiDirectory: directory.appending(path: "adi")
),
data
)
}
private struct ADISession: RawADIProvisioningSession {
let sessionID: UInt32
let adiDirectory: URL
func endProvisioning(routingInfo: UInt64, ptm: Data, tk: Data) async throws -> Data {
try check(ptm.withUnsafeBytes { ptmBuf in
tk.withUnsafeBytes { tkBuf in
xadi_ProvisioningEnd(
sessionID,
ptmBuf.baseAddress!, UInt32(ptmBuf.count),
tkBuf.baseAddress!, UInt32(tkBuf.count)
)
}
})
let file = adiDirectory.appending(path: "adi.pb")
// adi saves the file as 0o034 (group wx, public r) by default
// which is a... strange choice that prevents us from reading
// or writing by default. Since we're the owner, we can easily
// change this though.
try FileManager.default.setAttributes(
// rw for owner
[.posixPermissions: 0o600],
ofItemAtPath: file.path
)
return try Data(contentsOf: file)
}
}
public func requestOTP(
userID: UUID,
routingInfo: inout UInt64,
provisioningInfo: Data
) async throws -> (machineID: Data, otp: Data) {
try await loadADI(id: userID)
var midBytes: UnsafeMutableRawPointer?
var midLen: UInt32 = 0
var otpBytes: UnsafeMutableRawPointer?
var otpLen: UInt32 = 0
let adiDirectory = directory.appending(path: "adi")
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
let adiFile = adiDirectory.appending(path: "adi.pb")
try provisioningInfo.write(to: adiFile)
try check(xadi_OTPRequest(
UInt64(bitPattern: -2),
&midBytes, &midLen,
&otpBytes, &otpLen
))
let mid = Data(UnsafeRawBufferPointer(start: midBytes, count: Int(midLen)))
let otp = Data(UnsafeRawBufferPointer(start: otpBytes, count: Int(otpLen)))
_ = midBytes.map { xadi_Dispose($0) }
_ = otpBytes.map { xadi_Dispose($0) }
return (machineID: mid, otp: otp)
}
}
private func check(_ adiStatus: Int32) throws {
guard adiStatus == 0 else {
throw ADIError(code: Int(adiStatus))
}
}
extension StringProtocol {
fileprivate func padding(
toLength minLength: Int,
withPad pad: Character = " ",
leading: Bool = false
) -> String {
let justPadding = String(repeating: pad, count: Swift.max(minLength - count, 0))
return leading ? justPadding + self : self + justPadding
}
}
#endif
+6 -3
View File
@@ -15,19 +15,22 @@ struct GrandSlamClient: Sendable {
private let lookupManager = GrandSlamLookupManager()
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.httpClient) var httpClient
init() {}
func send<R: GrandSlamRequest>(_ request: R) async throws -> R.Decoder.Value {
let deviceInfo = try deviceInfoProvider.fetch()
let anisetteData = try await anisetteDataProvider.fetchAnisetteData()
let url = try await lookupManager.fetchURL(forEndpoint: R.endpoint)
let method = request.method(anisetteData: anisetteData)
let method = request.method(deviceInfo: deviceInfo, anisetteData: anisetteData)
var httpRequest = HTTPRequest(method: method.httpMethod, url: url)
httpRequest.headerFields[.contentType] = "text/x-xml-plist"
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = anisetteData.deviceInfo.clientInfo
httpRequest.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
let body: Data? = switch method {
case .get:
nil
@@ -36,7 +39,7 @@ struct GrandSlamClient: Sendable {
fromPropertyList: body, format: .xml, options: 0
)
}
request.configure(request: &httpRequest, anisetteData: anisetteData)
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
// GrandSlam doesn't seem to like reused (keep-alive) connections so create a
// new one for each request. cf https://github.com/rileytestut/AltSign/pull/52
@@ -21,27 +21,33 @@ actor GrandSlamLookupManager {
private let decoder = PropertyListDecoder()
private var endpoints: GrandSlamEndpoints?
@Dependency(\.anisetteDataProvider) var anisetteDataProvider
@Dependency(\.deviceInfoProvider) var deviceInfoProvider
@Dependency(\.httpClient) var httpClient
init() {}
private func performLookup() async throws -> GrandSlamEndpoints {
let deviceInfo = try await anisetteDataProvider.deviceInfo()
let deviceInfo = try deviceInfoProvider.fetch()
/* {
"X-Apple-I-Locale" = "en_IN";
"X-Apple-I-TimeZone" = "Asia/Kolkata";
"X-Apple-I-TimeZone-Offset" = 19800;
"X-MMe-Client-Info" = "<MacBookPro11,5> <Mac OS X;10.14.6;18G103> <com.apple.AuthKit/1 (com.apple.akd/1.0)>";
"X-MMe-Country" = IN;
"X-Mme-Device-Id" = "[REDACTED]";
} */
var request = HTTPRequest(url: Self.lookupURL)
request.headerFields = [
.userAgent: DeviceInfo.akdUserAgent,
.userAgent: deviceInfo.clientInfo.userAgent,
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
.init(AnisetteData.timeZoneKey)!: TimeZone.current.identifier,
.init("X-Apple-I-TimeZone-Offset")!: "\(TimeZone.current.secondsFromGMT())"
]
request.headerFields[.init("X-MMe-Country")!] = Locale.current.region?.identifier
for (key, value) in deviceInfo.dictionary {
request.headerFields[.init(key)!] = value
}
let (_, body) = try await httpClient.makeRequest(request)
return try self.decoder.decode(Response.self, from: body).urls
@@ -27,15 +27,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
private func performSMSAuth() async throws {
// TODO: parse phone number list from o=complete req?
let phoneNumberID = "1"
do {
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
} catch let error as HTTPResponseError where error.status.code == 403 {
print("""
warning: Could not send verification code via SMS. Falling back to trusted device authentication...
""")
try await performTrustedDeviceAuth()
return
}
try await client.send(GrandSlamSMSAuthRequest(loginData: loginData, phoneNumberID: phoneNumberID))
try await validateCode(phoneNumberID: phoneNumberID)
}
@@ -59,14 +51,7 @@ struct GrandSlamTwoFactorAuthenticateOperation {
private func performTrustedDeviceAuth() async throws {
let request = GrandSlamTrustedDeviceRequest(loginData: loginData)
do {
try await client.send(request)
} catch let error as HTTPResponseError where error.status.code == 403 {
print("""
warning: Could not send verification code. Generate one manually.
See https://github.com/xtool-org/xtool/discussions/368
""")
}
try await client.send(request)
try await validateCode()
}
@@ -40,7 +40,7 @@ struct GrandSlamSMSAuthRequest: GrandSlamTwoFactorRequest {
let loginData: GrandSlamLoginData
let phoneNumberID: String
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.post([
"serverInfo": [
"phoneNumber.id": phoneNumberID
@@ -36,7 +36,7 @@ struct GrandSlamValidateSMSRequest: GrandSlamTwoFactorRequest {
let phoneNumberID: String
let verificationCode: String
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.post([
"securityCode.code": verificationCode,
"serverInfo": [
@@ -69,12 +69,12 @@ extension GrandSlamOperationRequest {
static var endpoint: GrandSlamEndpoint { .lookup(\.gsService) }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headerFields[.accept] = "*/*"
request.headerFields[.userAgent] = DeviceInfo.akdUserAgent
request.headerFields[.userAgent] = deviceInfo.clientInfo.userAgent
}
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
var clientData: [String: Any] = [
"bootstrap": true,
"icscrec": true,
@@ -83,6 +83,7 @@ extension GrandSlamOperationRequest {
"svct": "iCloud",
"loc": Locale.current.identifier
]
clientData.merge(deviceInfo.dictionary) { _, b in b }
clientData.merge(anisetteData.dictionary) { _, b in b }
var request: [String: Any] = [
@@ -30,6 +30,6 @@ protocol GrandSlamRequest: Sendable {
static var endpoint: GrandSlamEndpoint { get }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData)
func method(anisetteData: AnisetteData) -> GrandSlamMethod
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData)
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod
}
@@ -17,10 +17,9 @@ extension GrandSlamTwoFactorRequest {
var extraHeaders: [String: String] { [:] }
func configure(request: inout HTTPRequest, anisetteData: AnisetteData) {
func configure(request: inout HTTPRequest, deviceInfo: DeviceInfo, anisetteData: AnisetteData) {
request.headerFields[.accept] = "application/x-buddyml"
request.headerFields[.contentType] = "application/x-plist"
request.headerFields[.userAgent] = DeviceInfo.akdUserAgent
request.headerFields[.init("X-Apple-App-Info")!] = "com.apple.gs.xcode.auth"
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
request.headerFields[.init("X-Apple-Identity-Token")!] = loginData.identityToken
@@ -28,7 +27,7 @@ extension GrandSlamTwoFactorRequest {
extraHeaders.forEach { request.headerFields[.init($0)!] = $1 }
}
func method(anisetteData: AnisetteData) -> GrandSlamMethod {
func method(deviceInfo: DeviceInfo, anisetteData: AnisetteData) -> GrandSlamMethod {
.get
}
@@ -35,13 +35,11 @@ private struct Client: HTTPClientProtocol {
}
private static let tlsConfiguration: TLSConfiguration = {
let appleRoots = appleRootCertificates.map { pem in
// if ssl cert parsing fails we're screwed so we might as well force try
// swiftlint:disable:next force_try
try! NIOSSLCertificate(bytes: Array(pem.utf8), format: .pem)
}
// if ssl cert parsing fails we're screwed so we might as well force try
// swiftlint:disable:next force_try
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
tlsConfiguration.additionalTrustRoots = [.certificates(appleRoots)]
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
tlsConfiguration.certificateVerification = .none
}
@@ -138,17 +136,6 @@ private final class WebSocketSessionWrapper: WebSocketSession {
}
}
// MARK: - Apple Root Certificates
// https://www.apple.com/certificateauthority/
private let appleRootCertificates: [String] = [
appleRootPEM,
appleRootG2PEM,
appleRootG3PEM,
]
// https://www.apple.com/appleca/AppleIncRootCertificate.cer
private let appleRootPEM = """
-----BEGIN CERTIFICATE-----
MIIEuzCCA6OgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzET
@@ -179,59 +166,4 @@ IQ7aunMZT7XZNn/Bh1XZp5m5MkL72NVxnn6hUrcbvZNCJBIqxw8dtk2cXmPIS4AX
UKqK1drk/NAJBzewdXUh
-----END CERTIFICATE-----
"""
// https://www.apple.com/certificateauthority/AppleRootCA-G2.cer
private let appleRootG2PEM = """
-----BEGIN CERTIFICATE-----
MIIFkjCCA3qgAwIBAgIIAeDltYNno+AwDQYJKoZIhvcNAQEMBQAwZzEbMBkGA1UE
AwwSQXBwbGUgUm9vdCBDQSAtIEcyMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0
aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMw
HhcNMTQwNDMwMTgxMDA5WhcNMzkwNDMwMTgxMDA5WjBnMRswGQYDVQQDDBJBcHBs
ZSBSb290IENBIC0gRzIxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0
aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzCCAiIwDQYJ
KoZIhvcNAQEBBQADggIPADCCAgoCggIBANgREkhI2imKScUcx+xuM23+TfvgHN6s
XuI2pyT5f1BrTM65MFQn5bPW7SXmMLYFN14UIhHF6Kob0vuy0gmVOKTvKkmMXT5x
ZgM4+xb1hYjkWpIMBDLyyED7Ul+f9sDx47pFoFDVEovy3d6RhiPw9bZyLgHaC/Yu
OQhfGaFjQQscp5TBhsRTL3b2CtcM0YM/GlMZ81fVJ3/8E7j4ko380yhDPLVoACVd
J2LT3VXdRCCQgzWTxb+4Gftr49wIQuavbfqeQMpOhYV4SbHXw8EwOTKrfl+q04tv
ny0aIWhwZ7Oj8ZhBbZF8+NfbqOdfIRqMM78xdLe40fTgIvS/cjTf94FNcX1RoeKz
8NMoFnNvzcytN31O661A4T+B/fc9Cj6i8b0xlilZ3MIZgIxbdMYs0xBTJh0UT8TU
gWY8h2czJxQI6bR3hDRSj4n4aJgXv8O7qhOTH11UL6jHfPsNFL4VPSQ08prcdUFm
IrQB1guvkJ4M6mL4m1k8COKWNORj3rw31OsMiANDC1CvoDTdUE0V+1ok2Az6DGOe
HwOx4e7hqkP0ZmUoNwIx7wHHHtHMn23KVDpA287PT0aLSmWaasZobNfMmRtHsHLD
d4/E92GcdB/O/WuhwpyUgquUoue9G7q5cDmVF8Up8zlYNPXEpMZ7YLlmQ1A/bmH8
DvmGqmAMQ0uVAgMBAAGjQjBAMB0GA1UdDgQWBBTEmRNsGAPCe8CjoA1/coB6HHcm
jTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwF
AAOCAgEAUabz4vS4PZO/Lc4Pu1vhVRROTtHlznldgX/+tvCHM/jvlOV+3Gp5pxy+
8JS3ptEwnMgNCnWefZKVfhidfsJxaXwU6s+DDuQUQp50DhDNqxq6EWGBeNjxtUVA
eKuowM77fWM3aPbn+6/Gw0vsHzYmE1SGlHKy6gLti23kDKaQwFd1z4xCfVzmMX3z
ybKSaUYOiPjjLUKyOKimGY3xn83uamW8GrAlvacp/fQ+onVJv57byfenHmOZ4VxG
/5IFjPoeIPmGlFYl5bRXOJ3riGQUIUkhOb9iZqmxospvPyFgxYnURTbImHy99v6Z
SYA7LNKmp4gDBDEZt7Y6YUX6yfIjyGNzv1aJMbDZfGKnexWoiIqrOEDCzBL/FePw
N983csvMmOa/orz6JopxVtfnJBtIRD6e/J/JzBrsQzwBvDR4yGn1xuZW7AYJNpDr
FEobXsmII9oDMJELuDY++ee1KG++P+w8j2Ud5cAeh6Squpj9kuNsJnfdBrRkBof0
Tta6SqoWqPQFZ2aWuuJVecMsXUmPgEkrihLHdoBR37q9ZV0+N0djMenl9MU/S60E
inpxLK8JQzcPqOMyT/RFtm2XNuyE9QoB6he7hY1Ck3DDUOUUi78/w0EP3SIEIwiK
um1xRKtzCTrJ+VKACd+66eYWyi4uTLLT3OUEVLLUNIAytbwPF+E=
-----END CERTIFICATE-----
"""
// https://www.apple.com/certificateauthority/AppleRootCA-G3.cer
private let appleRootG3PEM = """
-----BEGIN CERTIFICATE-----
MIICQzCCAcmgAwIBAgIILcX8iNLFS5UwCgYIKoZIzj0EAwMwZzEbMBkGA1UEAwwS
QXBwbGUgUm9vdCBDQSAtIEczMSYwJAYDVQQLDB1BcHBsZSBDZXJ0aWZpY2F0aW9u
IEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcN
MTQwNDMwMTgxOTA2WhcNMzkwNDMwMTgxOTA2WjBnMRswGQYDVQQDDBJBcHBsZSBS
b290IENBIC0gRzMxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9y
aXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzB2MBAGByqGSM49
AgEGBSuBBAAiA2IABJjpLz1AcqTtkyJygRMc3RCV8cWjTnHcFBbZDuWmBSp3ZHtf
TjjTuxxEtX/1H7YyYl3J6YRbTzBPEVoA/VhYDKX1DyxNB0cTddqXl5dvMVztK517
IDvYuVTZXpmkOlEKMaNCMEAwHQYDVR0OBBYEFLuw3qFYM4iapIqZ3r6966/ayySr
MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gA
MGUCMQCD6cHEFl4aXTQY2e3v9GwOAEZLuN+yRhHFD/3meoyhpmvOwgPUnPWTxnS4
at+qIxUCMG1mihDK1A3UT82NQz60imOlM27jbdoXt2QfyFMm+YhidDkLF1vLUagM
6BgD56KyKA==
-----END CERTIFICATE-----
"""
#endif
@@ -0,0 +1,48 @@
//
// Superconfig.swift
//
//
// Created by Kabir Oberai on 02/05/21.
//
import Foundation
public struct Superconfig: Codable, Sendable {
// Stuff that needs to come from the installer
public let udid: String
public let pairingKeys: Data
public let deviceInfo: DeviceInfo
// Stuff that can also be fetched in-app
public let preferredTeamID: String
public let preferredSigningInfo: SigningInfo?
public let appleID: String
public let provisioningData: ProvisioningData?
public let token: DeveloperServicesLoginToken
public init(
udid: String,
pairingKeys: Data,
deviceInfo: DeviceInfo,
preferredTeamID: String,
preferredSigningInfo: SigningInfo?,
appleID: String,
provisioningData: ProvisioningData?,
token: DeveloperServicesLoginToken
) {
self.udid = udid
self.pairingKeys = pairingKeys
self.deviceInfo = deviceInfo
self.preferredTeamID = preferredTeamID
self.preferredSigningInfo = preferredSigningInfo
self.appleID = appleID
self.provisioningData = provisioningData
self.token = token
}
public static let filename = "Superconfig.plist"
public static let encoder = PropertyListEncoder()
public func save(inAppDir appDir: URL) throws {
try Self.encoder.encode(self).write(to: appDir.appendingPathComponent(Self.filename))
}
}
+4 -15
View File
@@ -57,23 +57,12 @@ public struct Certificate: Codable, Sendable {
}
public func serialNumber() -> String {
// big endian, hex-encoded. Leading zero bytes are dropped, but not leading zero
// nibbles: Apple formats serials like "03AB…", not "3AB…" (#305).
raw.serialNumber.bytes
.drop { $0 == 0 }
// big endian, hex-encoded
let content = raw.serialNumber.bytes.lazy
.map { String(format: "%02hhX", $0) }
.joined()
}
/// Whether `serialNumber` (hex-encoded, e.g. by the App Store Connect API)
/// is this certificate's serial number.
///
/// Compares numerically, so case and leading zeros don't matter.
public func hasSerialNumber(_ serialNumber: String) -> Bool {
func normalized(_ hex: String) -> Substring {
hex.uppercased().drop { $0 == "0" }
}
return normalized(serialNumber) == normalized(self.serialNumber())
.drop { $0 == "0" }
return String(content)
}
public func wasIssuedBefore(_ other: Certificate) -> Bool {
+5
View File
@@ -67,6 +67,11 @@ public actor Signer {
) throws {
let encoder = PropertyListEncoder()
encoder.outputFormat = .xml
var entitlementMapping = entitlementMapping
if entitlementMapping.isEmpty {
// zsign_sign requires at least one entitlements_data_t
entitlementMapping[app] = try Entitlements(entitlements: [])
}
let entsArray: [entitlements_data_t] = try entitlementMapping.map { url, ents in
try url.withUnsafeFileSystemRepresentation { bundlePath in
guard let bundlePath = bundlePath else { throw Error.badFilePath }
-8
View File
@@ -76,14 +76,6 @@ struct AuthOperation {
}
private func logInWithPassword() async throws -> AuthToken {
print("""
Heads up:
This works by emulating a virtual Mac to interact with Apple services.
We use a third-party service to create a randomized device ID token
(Anisette Data) but your credentials are only ever sent to Apple.
Still, consider using a secondary Apple ID since this is a private API.
""")
let username = try await Console.promptRequired("Apple ID: ", existing: username)
let password: String
+1 -2
View File
@@ -37,8 +37,7 @@ enum Console {
data += view
}
}
let str = String(decoding: data, as: UTF8.self)
return str.hasSuffix("\r") ? String(str.dropLast()) : str
return String(decoding: data, as: UTF8.self)
}
}
@@ -4,17 +4,48 @@ import ArgumentParser
import Dependencies
struct DSAnisetteCommand: AsyncParsableCommand {
private final class Provider: RawADIProvider, RawADIProvisioningSession {
func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
print("spim: \(spim.base64EncodedString())")
return (self, Data(base64Encoded: try await Console.prompt("cpim: "))!)
}
func endProvisioning(
routingInfo: UInt64,
ptm: Data,
tk: Data
) async throws -> Data {
print("""
rinfo: \(routingInfo)
ptm: \(ptm.base64EncodedString())
tk: \(tk.base64EncodedString())
""")
return Data(base64Encoded: try await Console.prompt("pinfo: "))!
}
func requestOTP(
userID: UUID,
routingInfo: inout UInt64,
provisioningInfo: Data
) -> (machineID: Data, otp: Data) {
print("otp; pinfo: \(provisioningInfo)")
return (Data(), Data())
}
}
static let configuration = CommandConfiguration(
commandName: "anisette",
abstract: "Test out Anisette data"
)
func run() async throws {
@Dependency(\.anisetteDataProvider) var provider
let res = try await provider.fetchAnisetteData()
for (key, value) in res.dictionary.sorted(by: { $0.key < $1.key }) {
print("\(key): \(value)")
let provider = withDependencies {
$0.rawADIProvider = Provider()
} operation: {
ADIDataProvider()
}
let res = try await provider.fetchAnisetteData()
print(res)
}
}
+75 -52
View File
@@ -23,10 +23,30 @@ struct PackOperation {
var triple: String?
var buildOptions = BuildOptions(configuration: .debug)
var extraOptions: [String] = []
var watchMode = false
var xcode = false
func buildSettings() async throws -> BuildSettings {
try await BuildSettings(
configuration: buildOptions.configuration,
triple: triple ?? Self.defaultTriple,
options: extraOptions + (
watchMode
? [
"-Xlinker", "-interposable",
// https://kyleye.top/posts/debugreplaceableview-multiple-type-erasers/
"-Xswiftc", "-enable-experimental-feature", "-Xswiftc", "OpaqueTypeErasure",
// https://www.guardsquare.com/blog/behind-swiftui-previews
"-Xswiftc", "-Xfrontend", "-Xswiftc", "-enable-private-imports",
]
: []
)
)
}
@discardableResult
func run() async throws -> URL {
func run() async throws -> (Plan, URL) {
// TODO: support running inside a child directory
let contents = try FileManager.default.contentsOfDirectory(atPath: ".")
@@ -54,11 +74,7 @@ struct PackOperation {
await LSPConfig.tryEnsure(using: schema)
let buildSettings = try await BuildSettings(
configuration: buildOptions.configuration,
triple: triple ?? Self.defaultTriple,
options: []
)
let buildSettings = try await buildSettings()
let planner = Planner(
buildSettings: buildSettings,
@@ -66,9 +82,12 @@ struct PackOperation {
)
let plan = try await planner.createPlan()
#if os(macOS)
if xcode {
return try await XcodePacker(plan: plan).createProject()
let url = try await XcodePacker(plan: plan).createProject()
return (plan, url)
}
#endif
let packer = Packer(
buildSettings: buildSettings,
@@ -79,40 +98,38 @@ struct PackOperation {
let productsWithEntitlements = plan
.allProducts
.compactMap { p in p.entitlementsPath.map { (p, $0) } }
if !productsWithEntitlements.isEmpty {
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements).self) { group in
for (product, path) in productsWithEntitlements {
group.addTask {
let data = try await Data(reading: URL(fileURLWithPath: path))
let decoder = PropertyListDecoder()
let entitlements = try decoder.decode(Entitlements.self, from: data)
return (product.directory(inApp: bundle), entitlements)
}
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements?).self) { group in
for (product, path) in productsWithEntitlements {
group.addTask {
let data = try await Data(reading: URL(fileURLWithPath: path))
let decoder = PropertyListDecoder()
let entitlements = try decoder.decode(Entitlements.self, from: data)
return (product.directory(inApp: bundle), entitlements)
}
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
}
print("Applying entitlements...")
try await Signer.first().sign(
app: bundle,
identity: .adhoc,
entitlementMapping: mapping,
progress: { _ in }
)
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
}
print("Applying entitlements...")
try await Signer.first().sign(
app: bundle,
identity: .adhoc,
entitlementMapping: mapping,
progress: { _ in }
)
return bundle
return (plan, bundle)
}
}
struct DevXcodeCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "generate-xcode-project",
abstract: "Generate Xcode project"
abstract: "Generate Xcode project",
discussion: "This option does nothing on Linux"
)
func run() async throws {
let result = try await PackOperation(xcode: true).run()
print("Wrote to \(result.path)")
try await PackOperation(xcode: true).run()
}
}
@@ -155,7 +172,7 @@ struct DevBuildCommand: AsyncParsableCommand {
signingAuthToken = nil
}
let url = try await PackOperation(
let (_, url) = try await PackOperation(
triple: triple,
buildOptions: packOptions
).run()
@@ -220,6 +237,13 @@ struct DevRunCommand: AsyncParsableCommand {
help: "Target the iOS Simulator"
) var simulator = false
@Flag(
name: .shortAndLong,
help: "Hot reload files on change. Requires simulator."
) var watch = false
@Option var xloadPath: String?
var triple: String? {
if simulator {
#if arch(arm64)
@@ -233,17 +257,37 @@ struct DevRunCommand: AsyncParsableCommand {
return nil
}
#else
var watch: Bool { false }
var triple: String? { nil }
#endif
@OptionGroup var connectionOptions: ConnectionOptions
func validate() throws {
#if os(macOS)
if watch && !simulator {
throw ValidationError("--watch requires --simulator")
}
#endif
}
func run() async throws {
let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()
let operation = PackOperation(
triple: triple,
buildOptions: packOptions,
watchMode: watch,
)
let (plan, output) = try await operation.run()
#if os(macOS)
if simulator {
try await SimInstallOperation(path: output).run()
try await SimInstallOperation(
operation: operation,
plan: plan,
path: output,
watch: watch,
xLoadLibrary: xloadPath,
).run()
return
}
#endif
@@ -292,24 +336,3 @@ struct DevCommand: AsyncParsableCommand {
}
extension BuildConfiguration: ExpressibleByArgument {}
#if os(macOS)
import Subprocess
struct SimInstallOperation {
var path: URL
// TODO: allow customizing this
var simulator = "booted"
func run() async throws {
try await Subprocess.run(
.path("/usr/bin/xcrun"),
arguments: ["simctl", "install", simulator, path.path],
output: .discarded
)
.checkSuccess()
print("Installed to simulator")
}
}
#endif
File diff suppressed because it is too large Load Diff
+101
View File
@@ -0,0 +1,101 @@
#if os(macOS)
import Foundation
import ArgumentParser
import PackLib
import XUtils
import Subprocess
struct HotReloadCommand: AsyncParsableCommand {
static let configuration = CommandConfiguration(
commandName: "hot-reload",
abstract: "Run an app with support for hot reloading",
)
@Flag(
help: "Use the SwiftPM build system to determine compile commands"
) var swiftpm = false
@Option(
help: .init(
"Use the specified Build Server to determine compile commands",
discussion: """
The file at the specified path should correspond to the BSP \
Connection Details specification. See:
https://build-server-protocol.github.io/docs/overview/server-discovery
""",
)
) var buildServerPath: String?
@Option(
help: "The directory in which to store scratch files"
) var scratchDirectory: String?
@Option(
help: "String to prepend to all env var names"
) var envPrefix: String = ""
@Option(
help: .hidden
) var xloadLibrary: String?
@Argument(
help: .init(
"The command to run with hot reloading",
discussion: """
xtool spawns the provided process with env vars set to enable hot reloading.
"""
)
) var command: [String]
func run() async throws {
let configuration: BuildServerConfiguration
switch (swiftpm, buildServerPath) {
case (true, _?):
throw ValidationError("Both --swiftpm or --build-server-path were provided; please only provide one.")
case (true, nil):
configuration = try await .swiftPM(settings: BuildSettings(configuration: .debug, triple: "arm64-apple-ios-simulator"))
case (false, let serverPath?):
configuration = try await .external(definition: URL(filePath: serverPath))
case (false, nil):
if let discovered = try await BuildServerConfiguration.discover(in: URL(filePath: ".")) {
configuration = discovered
} else {
throw ValidationError("Could not guess build system. Please specify one with --swiftpm or --build-server-path")
}
}
let reloader = try await HotReloader(
configuration: configuration,
scratchDirectory: scratchDirectory.map { FilePath($0) },
xLoadLibrary: xloadLibrary
)
let watchTask = Task {
do {
try await reloader.watch()
} catch {
print("Error: watcher failed: \(error)")
}
}
var arguments = command
let executable = arguments.removeFirst()
try await Subprocess.run(
.name(executable),
arguments: Arguments(arguments),
environment: .inherit.updating(reloader.subprocessEnvironment(prefix: envPrefix)),
platformOptions: .withGracefulShutDown,
output: .currentStandardOutput,
error: .currentStandardError,
)
.checkSuccess()
watchTask.cancel()
await watchTask.value
}
}
#endif
+111
View File
@@ -0,0 +1,111 @@
#if os(macOS)
import Subprocess
import PackLib
import Foundation
import XUtils
import Dependencies
import XKit
actor HotReloader {
var configuration: BuildServerConfiguration
var scratchDirectory: FilePath
var xLoadLibrary: String?
private let scratchTemporaryDirectory: TemporaryDirectory?
private let xLoadPath: String
private let buildDirectory: FilePath
private let outDirectory: FilePath
init(
configuration: BuildServerConfiguration,
scratchDirectory: FilePath? = nil,
xLoadLibrary: String? = nil,
) async throws {
self.configuration = configuration
if let scratchDirectory {
self.scratchDirectory = FilePath(URL(filePath: scratchDirectory.string).absoluteURL.path)
self.scratchTemporaryDirectory = nil
} else {
let scratchTemporaryDirectory = try TemporaryDirectory(name: "scratch")
self.scratchDirectory = FilePath(scratchTemporaryDirectory.url.path)
self.scratchTemporaryDirectory = consume scratchTemporaryDirectory
}
self.xLoadLibrary = xLoadLibrary
xLoadPath = if let xLoadLibrary {
URL(filePath: xLoadLibrary).absoluteURL.path
} else {
try await Self.getXLoad(platform: "iphonesimulator").path
}
buildDirectory = self.scratchDirectory.appending("build")
try FileManager.default.createDirectory(at: URL(filePath: buildDirectory)!, withIntermediateDirectories: true)
outDirectory = self.scratchDirectory.appending("out")
try FileManager.default.createDirectory(at: URL(filePath: outDirectory)!, withIntermediateDirectories: true)
}
nonisolated func environment(prefix: String = "SIMCTL_CHILD_") -> [String: String] {
[
"\(prefix)DYLD_INSERT_LIBRARIES": xLoadPath,
"\(prefix)XLOAD_WATCH_DIR": outDirectory.string,
"\(prefix)XLOAD_INTERCEPT": "1",
]
}
nonisolated func subprocessEnvironment(prefix: String = "SIMCTL_CHILD_") -> [Environment.Key: String] {
Dictionary(uniqueKeysWithValues: environment(prefix: prefix).map {
(Environment.Key(rawValue: $0)!, $1)
})
}
func watch() async throws {
let workspace = try await SwiftWorkspace(
configuration: configuration,
buildDirectory: buildDirectory,
outDirectory: outDirectory,
)
@Dependency(\.fileSystemMonitor) var fileSystemMonitor
let events = try await fileSystemMonitor.watch(FilePath(FileManager.default.currentDirectoryPath))
for await event in events {
do {
try await workspace.fileDidChange(event.file)
} catch {
print("Reload failed: \(error)")
}
}
}
private static func getXLoad(platform: String) async throws -> URL {
let version = "0.3.0"
let remote = URL(string: "https://github.com/xtool-org/xload/releases/download/v\(version)/libXLoad.\(platform).dylib")!
@Dependency(\.httpClient) var httpClient
@Dependency(\.persistentDirectory) var persistentDirectory
let platformDir = persistentDirectory.appending(path: "xload/\(platform)")
let versionDir = platformDir.appending(path: version)
let local = versionDir.appending(path: "libXLoad.dylib")
if local.exists { return local }
print("Downloading xload...")
try? FileManager.default.removeItem(at: platformDir)
try FileManager.default.createDirectory(at: versionDir, withIntermediateDirectories: true)
let data = try await httpClient.makeRequest(HTTPRequest(url: remote))
guard data.response.status.kind == .successful else {
throw StringError("Failed to download xload: got HTTP \(data.response.status)")
}
try data.body.write(to: local)
return local
}
}
#endif
+72 -83
View File
@@ -76,12 +76,18 @@ struct SDKBuilder {
let mode: Mode
// bump this when the sdk builder logic changes
static let sdkEpoch = 4
static let sdkEpoch = 3
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
static let darwinToolsVersion = "1.1.0"
// tag from https://github.com/xtool-org/OpenAppleMacros
static let oamVersion = "1.4.1"
static let oamVersion = "1.3.0"
static let oamLibraries: [String] = [
"FoundationModelsMacros",
"PreviewsMacros",
"SwiftUIMacros",
]
static var currentSDKVersion: String {
"""
@@ -199,11 +205,6 @@ struct SDKBuilder {
},
"librarian": {
"path": "llvm-lib"
},
"swiftCompiler": {
"extraCLIOptions": [
"-Xfrontend", "-enable-cross-import-overlays"
]
}
}
""".write(
@@ -232,36 +233,22 @@ struct SDKBuilder {
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
}
private func fetchTarball(
url: URL,
destination directory: URL,
displayName: String,
envOverride: String? = nil,
) async throws {
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")
try FileManager.default.createDirectory(
at: directory,
at: toolsetDir,
withIntermediateDirectories: false
)
if let envOverride, let path = ProcessInfo.processInfo.environment[envOverride] {
let archive = URL(fileURLWithPath: path)
print("[Extracting \(displayName)] \(archive.path)")
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", archive.path],
workingDirectory: FilePath(directory),
output: .discarded,
error: .discarded,
)
.checkSuccess()
return
}
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else {
throw Console.Error("Could not fetch tarball at \(url)")
}
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
@@ -271,7 +258,7 @@ struct SDKBuilder {
try await Subprocess.run(
.name("tar"),
arguments: ["xzf", "-"],
workingDirectory: FilePath(directory),
workingDirectory: FilePath(toolsetDir),
input: .inputWriter,
output: .discarded,
error: .discarded,
@@ -286,28 +273,13 @@ struct SDKBuilder {
guard let length else { continue }
let progress = Int(Double(totalWritten) / Double(length) * 100)
print("\r[Downloading \(displayName)] \(progress)%", terminator: "")
print("\r[Downloading toolset] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
try await execution.standardInputWriter.finish()
}
.checkSuccess()
}
// swiftlint:disable:next function_body_length
private func installToolset(in output: URL) async throws {
let toolsetDir = output.appendingPathComponent("toolset")
let url = URL(string: """
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
""")!
try await fetchTarball(
url: url,
destination: toolsetDir,
displayName: "toolset",
envOverride: "XTL_TOOLSET_TARBALL",
)
// swift-build assumes we have an Apple-flavored librarian for Apple platforms
// (https://github.com/swiftlang/swift-build/blob/b2433e74e/Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift#L1735)
@@ -414,41 +386,43 @@ struct SDKBuilder {
}
private func installMacros(in output: URL) async throws {
@Dependency(\.httpClient) var httpClient
let url = URL(string: """
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue).tar.gz
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue)
""")!
let macrosDir = output.appendingPathComponent("OpenAppleMacros")
try await fetchTarball(
url: url,
destination: macrosDir,
displayName: "OpenAppleMacros",
envOverride: "XTL_OAM_TARBALL",
)
struct MacrosInfo: Decodable {
var plugins: [String]
}
let macrosInfo = try JSONDecoder().decode(
MacrosInfo.self,
from: Data(contentsOf: macrosDir.appendingPathComponent("info.json"))
)
try FileManager.default.moveItem(
at: macrosDir.appendingPathComponent("OpenAppleMacrosServer"),
to: output.appendingPathComponent("OpenAppleMacrosServer")
)
try FileManager.default.removeItem(at: macrosDir)
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
let pluginsDir = output.appendingPathComponent("OpenAppleMacrosPlugins")
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: false)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in macrosInfo.plugins {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
let length: Int64? = switch body.length {
case .known(let known): known
case .unknown: nil
}
let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
do {
let handle = try FileDescriptor.open(
FilePath(outputPath),
.writeOnly,
options: .create,
permissions: [.ownerReadWriteExecute, .groupReadExecute, .otherReadExecute]
)
defer { try? handle.close() }
var written: Int64 = 0
for try await chunk in body {
try handle.writeAll(chunk)
written += Int64(chunk.count)
if let length {
let progress = Int(Double(written) / Double(length) * 100)
print("\r[Downloading OpenAppleMacros] \(progress)%", terminator: "")
fflush(stdoutSafe)
}
}
}
print()
}
private static let expectedXcodeChildren = ["Info.plist", "version.plist", "Developer"]
@@ -632,12 +606,27 @@ struct SDKBuilder {
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
let pluginsDir = hostDir.appendingPathComponent("plugins")
try FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../../../OpenAppleMacrosPlugins"
)
if platform == "iPhoneSimulator" {
// The iPhoneSimulator platform doesn't contain plugins; Xcode seems to be hardcoded
// to look at the ones from iPhoneOS.platform. We can symlink the iPhoneOS ones too.
try? FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createSymbolicLink(
atPath: pluginsDir.path,
withDestinationPath: "../../../../../../iPhoneOS.platform/Developer/usr/lib/swift/host/plugins"
)
} else {
try? FileManager.default.removeItem(at: pluginsDir)
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: true)
// create a lib*.so file for each macro 'library' that we support.
// the files are stubs (empty) because we just need them to convince swiftc that
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
// server.
for library in Self.oamLibraries {
let target = pluginsDir.appendingPathComponent("lib\(library).so")
try Data().write(to: target)
}
}
}
// we copy over the host's clang resorurce dir during install, because intrinsics can differ
+1
View File
@@ -1,5 +1,6 @@
import Foundation
import XKit
import Version
import ArgumentParser
import Dependencies
import PackLib
@@ -0,0 +1,81 @@
#if os(macOS)
import Subprocess
import PackLib
import Foundation
import XUtils
import Dependencies
import XKit
struct SimInstallOperation {
var operation: PackOperation
var plan: Plan
var path: URL
var watch = false
var xLoadLibrary: String?
// TODO: allow customizing this
var simulator = "booted"
func run() async throws {
try await Subprocess.run(
.path("/usr/bin/xcrun"),
arguments: ["simctl", "install", simulator, path.path],
output: .discarded
)
.checkSuccess()
print("Installed to simulator")
let tmp = URL(filePath: FileManager.default.currentDirectoryPath)
.appending(path: "xtool/.xload")
try? FileManager.default.removeItem(at: tmp)
defer { try? FileManager.default.removeItem(at: tmp) }
let watchTask: Task<Void, Error>?
let envVars: [Environment.Key: String?]
if watch {
try FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
guard let temporaryDirectoryPath = FilePath(tmp) else {
throw Console.Error("Bad temporaryDirectory path")
}
let hotReloader = try await HotReloader(
configuration: .swiftPM(settings: operation.buildSettings()),
scratchDirectory: temporaryDirectoryPath,
xLoadLibrary: xLoadLibrary
)
watchTask = Task {
do {
try await hotReloader.watch()
} catch {
print("Error: watch task failed: \(error)")
}
}
envVars = hotReloader.subprocessEnvironment()
} else {
watchTask = nil
envVars = [:]
}
try await Subprocess.run(
.path("/usr/bin/xcrun"),
arguments: [
"simctl", "launch",
"--console-pty",
simulator, plan.app.bundleID,
],
environment: .inherit.updating(envVars),
platformOptions: .withGracefulShutDown,
output: .currentStandardOutput,
error: .currentStandardError,
)
.checkSuccess()
watchTask?.cancel()
try await watchTask?.value
}
}
#endif
+397
View File
@@ -0,0 +1,397 @@
import Foundation
import XUtils
import PackLib
import BuildServerProtocol
import LanguageServerProtocol
import LanguageServerProtocolTransport
import Subprocess
import Dependencies
actor SwiftWorkspace {
private let connection: JSONRPCConnection
private let buildDirectory: FilePath
private let outDirectory: FilePath
private var counter = 0
struct FileInfo {
let file: FilePath
let target: BuildTarget
let sources: SourcesItem
let source: SourceItem
init?(target: BuildTarget, sources: SourcesItem, source: SourceItem) {
guard let path = FilePath(source.uri.arbitrarySchemeURL) else { return nil }
self.file = path
self.target = target
self.sources = sources
self.source = source
}
}
private var filesToWatch: [FilePath: [FileInfo]] = [:]
private var sources: [(BuildTarget, SourcesItem)] {
didSet { updateFilesToWatch() }
}
private var cachedCommands: [FilePath: FrontendCommand] = [:]
struct FrontendCommand {
let commandLine: CommandInvocation
let output: FilePath
let module: String
}
init(
configuration: BuildServerConfiguration,
buildDirectory: FilePath,
outDirectory: FilePath,
) async throws {
self.buildDirectory = buildDirectory
self.outDirectory = outDirectory
let handler = StreamingMessageHandler()
let (connection, _) = try JSONRPCConnection.start(
executable: configuration.executable,
arguments: configuration.arguments,
name: "xtool",
protocol: .bspProtocol,
stderrLoggingCategory: "xtool-error",
client: handler,
terminationHandler: { print("Terminated: \($0)") }
)
self.connection = connection
_ = try await connection.send(InitializeBuildRequest(
displayName: "xtool",
version: "1.0.0",
bspVersion: "2.2.0",
rootUri: .init(URL(filePath: FileManager.default.currentDirectoryPath)),
capabilities: BuildClientCapabilities(
languageIds: [.swift, .c, .cpp, .objective_c, .objective_cpp],
)
))
connection.send(OnBuildInitializedNotification())
// some BSP servers (eg SourceKit-Bazel-BSP) require an initial build targets request
// before they send OnBuildTargetDidChange
_ = try await connection.send(WorkspaceBuildTargetsRequest())
for await case _ as OnBuildTargetDidChangeNotification in handler.notifications { break }
let result = try await connection.send(WorkspaceBuildTargetsRequest())
let targets = Dictionary(uniqueKeysWithValues: result.targets.map { ($0.id, $0) })
let targetInfos = try await connection.send(BuildTargetSourcesRequest(
targets: result.targets.map(\.id)
))
sources = targetInfos.items.compactMap {
guard let target = targets[$0.target] else { return nil }
return (target, $0)
}
updateFilesToWatch()
}
deinit {
connection.close()
}
func updateFilesToWatch() {
filesToWatch = Dictionary(
grouping: sources.flatMap { target, sources in
sources.sources.compactMap { source in
// guard !target.id.uri.stringValue.contains("&targetGUID=PACKAGE-TARGET:") else { return nil }
FileInfo(target: target, sources: sources, source: source)
}
},
by: \.file
)
}
func fileDidChange(_ path: FilePath) async throws {
guard filesToWatch[path] != nil else { return }
print("Reloading \(path)")
_ = try await rebuild(path: path)
}
@discardableResult
func rebuild(path: FilePath) async throws -> FilePath {
let command = try await frontendCommand(for: path)
try await Subprocess.run(
.path(FilePath(String(command.commandLine.command))),
arguments: .init(command.commandLine.arguments.map { String($0) }),
output: .currentStandardOutput,
error: .currentStandardError,
)
.checkSuccess()
let sdk = try command.commandLine.value(for: "-sdk")
.orThrow(Console.Error("Could not find -sdk"))
let target = try command.commandLine.value(for: "-target")
.orThrow(Console.Error("Could not find -target"))
counter += 1
let outputFile = outDirectory
.appending("lib\(path.lastComponent!.stem).\(counter).dylib")
// link
try await Subprocess.run(
.path(try await BuildSettings.swiftcURL()),
arguments: [
command.output.string,
"-emit-library",
"-sdk", sdk, "-target", target,
"-Xlinker", "-undefined", "-Xlinker", "dynamic_lookup",
"-o", outputFile.string
],
output: .currentStandardOutput,
error: .currentStandardError,
)
.checkSuccess()
return outputFile
}
func frontendCommand(for path: FilePath) async throws -> FrontendCommand {
if let cached = cachedCommands[path] {
return cached
}
let targets = filesToWatch[path] ?? []
let target: FileInfo
switch targets.count {
case 0:
throw Console.Error("No targets for file")
case 1:
target = targets[0]
default:
print("warning: multiple targets contain this file: \(targets.map(\.target.id.uri))")
target = targets[0]
}
guard let fileURL = URL(filePath: path)?.absoluteURL, let lastComponent = path.lastComponent else {
throw Console.Error("Bad file path \(path.string)")
}
let options = try await connection.send(TextDocumentSourceKitOptionsRequest(
textDocument: .init(target.source.uri),
target: target.target.id,
language: .swift,
))
.orThrow(Console.Error("No options"))
guard let moduleNameIndex = options.compilerArguments.firstIndex(of: "-module-name"),
moduleNameIndex < options.compilerArguments.count - 2 else {
throw Console.Error("Could not determine module name for file at \(path)")
}
let moduleName = options.compilerArguments[moduleNameIndex + 1]
let moduleBuildDirectory = buildDirectory.appending(moduleName)
let moduleBuildDirectoryURL = try URL(filePath: moduleBuildDirectory).orThrow(Console.Error("Bad module name"))
try? FileManager.default.createDirectory(at: moduleBuildDirectoryURL, withIntermediateDirectories: true)
let swiftcOutput = try await Subprocess.run(
.path(try await BuildSettings.swiftcURL()),
arguments: .init(
["-c", "-driver-print-jobs"]
+ options.compilerArguments
+ ["-working-directory", moduleBuildDirectory.string]
),
output: .string(limit: .max),
error: .currentStandardError
).checkSuccess()
let frontendCommands = (swiftcOutput.standardOutput ?? "").split(separator: "\n")
guard let invocation = frontendCommands.lazy.compactMap({ line -> CommandInvocation? in
guard let invocation = CommandInvocation(line) else { return nil }
guard invocation.value(for: "-primary-file") == fileURL.path else { return nil }
return invocation
}).first else { throw Console.Error("Could not find frontend command") }
let command = FrontendCommand(
commandLine: invocation,
output: moduleBuildDirectory.appending("\(lastComponent.stem).o"),
module: moduleName,
)
cachedCommands[path] = command
return command
}
private final class StreamingMessageHandler: MessageHandler {
private let (_notifications, onNotification) = AsyncStream<NotificationType>.makeStream()
var notifications: AsyncStream<NotificationType> { _notifications }
deinit { onNotification.finish() }
func handle(_ notification: some NotificationType) {
onNotification.yield(notification)
}
func handle<Request: RequestType>(
_ request: Request,
id: LanguageServerProtocol.RequestID,
reply: @escaping @Sendable (LanguageServerProtocol.LSPResult<Request.Response>) -> Void
) {
fatalError("Can't handle request \(Request.method)")
}
}
}
// https://github.com/swiftlang/sourcekit-lsp/blob/3278ca0e3/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L66
struct BuildServerConfiguration {
var executable: URL
var arguments: [String]
}
// https://build-server-protocol.github.io/docs/overview/server-discovery#the-bsp-connection-details
struct BuildServerDefinition: Codable {
var name: String
var version: String
var bspVersion: String
var languages: [String]
var argv: [String]
}
extension BuildServerConfiguration {
static func swiftPM(settings: BuildSettings) async throws -> Self {
guard let swiftURL = URL(filePath: try await BuildSettings.swiftURL()) else {
throw Console.Error("Swift URL invalid")
}
return BuildServerConfiguration(
executable: swiftURL,
arguments: settings.withPackagePath("xtool/.xtool-tmp").buildServerArguments
)
}
static func swiftPM(in url: URL) async throws -> Self? {
if url.appending(path: "Package.swift").exists {
return try await .swiftPM(settings: .init(configuration: .debug, triple: "arm64-apple-ios-simulator"))
}
return nil
}
static func external(definition: BuildServerDefinition) async throws -> Self {
guard !definition.argv.isEmpty else {
throw Console.Error("BSP argv must be non-empty")
}
var arguments = definition.argv
let executable = URL(filePath: arguments.removeFirst())
return BuildServerConfiguration(
executable: executable,
arguments: arguments
)
}
static func external(definition url: URL) async throws -> Self {
let data = try Data(contentsOf: url)
let definition = try JSONDecoder().decode(BuildServerDefinition.self, from: data)
return try await .external(definition: definition)
}
static func external(in directory: URL) async throws -> Self? {
let bsp = directory.appending(path: ".bsp")
let bspContents = (try? FileManager.default.contentsOfDirectory(at: bsp, includingPropertiesForKeys: nil)) ?? []
let bspFiles = bspContents.filter { $0.pathExtension == "json" }
switch bspFiles.count {
case 0:
return nil
case 1:
return try await .external(definition: bspFiles[0])
default:
throw Console.Error("""
Found multiple Build Server definitions in '\(bsp.absoluteURL.path)'.
Please explicitly specify the one you want to use.
""")
}
}
static func discover(in directory: URL) async throws -> Self? {
if let external = try await external(in: directory) {
return external
}
if let swiftPM = try await swiftPM(in: directory) {
return swiftPM
}
return nil
}
}
struct CommandInvocation {
var command: String
var arguments: [String]
init?(_ string: some StringProtocol) {
guard let all = try? CommandParser.parse(string), !all.isEmpty else { return nil }
command = all[0]
arguments = Array(all.dropFirst())
}
func value(for option: some StringProtocol) -> String? {
guard let optionIndex = arguments.firstIndex(where: { $0 == option }) else { return nil }
guard optionIndex < arguments.count - 2 else { return nil }
return arguments[optionIndex + 1]
}
}
enum CommandParser {
enum Errors: Error, Hashable {
case unclosedQuote
case unpairedEscape
}
static func parse(_ string: some StringProtocol) throws -> [String] {
try sequence(
state: (
current: string[...],
isInsideQuote: false,
)
) { state -> Token? in
while !state.current.isEmpty {
switch state.current.removeFirst() {
case "'":
state.isInsideQuote.toggle()
case "\\" where !state.isInsideQuote:
guard !state.current.isEmpty else { return .error(.unpairedEscape) }
let actual = state.current.removeFirst()
return .value(actual)
case " " where !state.isInsideQuote:
return .sentinelSpace
case let value:
return .value(value)
}
}
guard !state.isInsideQuote else {
state.isInsideQuote = false
return .error(.unclosedQuote)
}
return nil
}
.lazy
.split(separator: .sentinelSpace)
.map {
let characters = try $0.compactMap { token -> Character? in
switch token {
case .sentinelSpace: nil
case .error(let error): throw error
case .value(let value): value
}
}
return String(characters)
}
}
private enum Token: Hashable {
case sentinelSpace
case value(Character)
case error(Errors)
}
}
+7 -1
View File
@@ -30,7 +30,13 @@ private struct XToolCommand: AsyncParsableCommand {
NewCommand.self,
DevCommand.self,
DSCommand.self,
]
] + { () -> [AsyncParsableCommand.Type] in
#if os(macOS)
[HotReloadCommand.self]
#else
[]
#endif
}()
),
CommandGroup(
name: "Device",
@@ -1,17 +0,0 @@
import Foundation
private import XcodeProj
extension XCSchema.Project {
public func pbxprojRepresentation(name: String) throws -> Data {
let xcprojData = try self.jsonRepresentation()
let pbxproj = try PBXProj(xcprojData: xcprojData, projectName: name)
// dataRepresentation should never return nil
return try pbxproj.dataRepresentation() ?? Data()
}
public init(pbxprojRepresentation data: Data) throws {
let pbxproj = try PBXProj(data: data)
let xcprojData = try pbxproj.xcprojData()
try self.init(jsonRepresentation: xcprojData)
}
}
-78
View File
@@ -1,78 +0,0 @@
import Foundation
@_exported import XcodeProjectFormat
// This library is a lightweight layer on top of the XcodeProjectFormat
// interface, providing other facilities for working with the Xcode
// project formats.
//
// We currently use XcodeProj under the hood for some functionality, but this
// should be considered an implementation detail.
public struct XcodeProject: Equatable, Sendable {
public enum Format: Sendable {
case pbxproj
case xcproj
}
public var project: XCSchema.Project
public var format: Format
public init(
project: XCSchema.Project,
format: Format = .pbxproj,
) {
self.project = project
self.format = format
}
/// Reads the project from the given `.xcodeproj` path.
public init(url: URL) throws {
guard url.pathExtension == "xcodeproj" else {
throw Errors.notAnXcodeproj(url.path)
}
let xcprojURL = url.appending(path: "project.xcproj")
lazy var pbxprojURL = url.appending(path: "project.pbxproj")
if FileManager.default.fileExists(atPath: xcprojURL.path) {
let data = try Data(contentsOf: xcprojURL)
self.project = try XCSchema.Project(jsonRepresentation: data)
self.format = .xcproj
} else if FileManager.default.fileExists(atPath: pbxprojURL.path) {
let data = try Data(contentsOf: pbxprojURL)
self.project = try XCSchema.Project(pbxprojRepresentation: data)
self.format = .pbxproj
} else {
throw Errors.missingProjectFile(url.path)
}
}
/// Sets the format in which the project should be serialized.
public func withFormat(_ format: Format) -> XcodeProject {
var copy = self
copy.format = format
return copy
}
/// Writes the project to the given `.xcodeproj` path.
public func write(to url: URL) throws {
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
switch format {
case .pbxproj:
try project
.pbxprojRepresentation(name: url.deletingPathExtension().lastPathComponent)
.write(to: url.appendingPathComponent("project.pbxproj"))
case .xcproj:
try project
.jsonRepresentation()
.write(to: url.appendingPathComponent("project.xcproj"))
}
try XcodeWorkspace(children: [.file(.current)])
.write(to: url.appendingPathComponent("project.xcworkspace"))
}
public enum Errors: Error {
case notAnXcodeproj(String)
case missingProjectFile(String)
}
}
@@ -1,84 +0,0 @@
import Foundation
private import XcodeProj
extension XcodeWorkspace {
public init(url: URL) throws {
let workspace = try XCWorkspace(pathString: url.path)
self.init(workspace.data)
}
public func dataRepresentation() throws -> Data {
try xcWorkspaceData.dataRepresentation() ?? Data()
}
public func write(to url: URL) throws {
try? FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
try self.dataRepresentation()
.write(to: url.appendingPathComponent("contents.xcworkspacedata"))
}
}
// MARK: - Conversion
extension XcodeWorkspace {
fileprivate init(_ xcWorkspaceData: XCWorkspaceData) {
self.init(children: xcWorkspaceData.children.map { .init(from: $0) })
}
fileprivate var xcWorkspaceData: XCWorkspaceData {
XCWorkspaceData(children: children.map(\.xcWorkspaceDataElement))
}
}
extension XcodeWorkspace.Element {
fileprivate init(from xcWorkspaceDataElement: XCWorkspaceDataElement) {
switch xcWorkspaceDataElement {
case .file(let file):
self = .file(.init(file.location))
case .group(let group):
self = .group(.init(group))
case .fileSystemSynchronizedGroup(let group):
self = .fileSystemSynchronizedGroup(.init(group))
}
}
fileprivate var xcWorkspaceDataElement: XCWorkspaceDataElement {
switch self {
case .file(let location):
.file(.init(location: location.xcWorkspaceLocation))
case .group(let group):
.group(group.xcWorkspaceDataElement)
case .fileSystemSynchronizedGroup(let group):
.fileSystemSynchronizedGroup(group.xcWorkspaceDataElement)
}
}
}
extension XcodeWorkspace.Location {
fileprivate init(_ xcWorkspaceDataElementLocation: XCWorkspaceDataElementLocationType) {
self.base = .init(rawValue: xcWorkspaceDataElementLocation.schema)
self.path = xcWorkspaceDataElementLocation.path
}
fileprivate var xcWorkspaceLocation: XCWorkspaceDataElementLocationType {
.other(base.rawValue, path)
}
}
extension XcodeWorkspace.Group {
fileprivate init(_ xcWorkspaceDataGroup: XCWorkspaceDataGroup) {
self.init(
location: .init(xcWorkspaceDataGroup.location),
name: xcWorkspaceDataGroup.name,
children: xcWorkspaceDataGroup.children.map { .init(from: $0) }
)
}
fileprivate var xcWorkspaceDataElement: XCWorkspaceDataGroup {
.init(
location: self.location.xcWorkspaceLocation,
name: name,
children: children.map(\.xcWorkspaceDataElement)
)
}
}
-103
View File
@@ -1,103 +0,0 @@
import Foundation
public struct XcodeWorkspace: Hashable, Sendable {
public enum Element: Hashable, Sendable {
case file(Location)
case group(Group)
case fileSystemSynchronizedGroup(Group)
public var location: Location {
get {
switch self {
case let .file(location):
location
case let .group(group):
group.location
case let .fileSystemSynchronizedGroup(group):
group.location
}
}
set {
switch self {
case .file:
self = .file(newValue)
case .group(var group):
group.location = newValue
self = .group(group)
case .fileSystemSynchronizedGroup(var group):
group.location = newValue
self = .fileSystemSynchronizedGroup(group)
}
}
}
}
public struct Group: Hashable, Sendable {
public var location: Location
public var name: String?
public var children: [Element]
public init(location: Location, name: String?, children: [Element]) {
self.location = location
self.name = name
self.children = children
}
}
public struct Location: Hashable, Sendable {
public struct Base: Hashable, Sendable, RawRepresentable {
public var rawValue: String
public init(rawValue: String) {
self.rawValue = rawValue
}
}
public var base: Base
public var path: String
public init(base: Base, path: String) {
self.base = base
self.path = path
}
}
public var children: [Element]
public init(children: [Element]) {
self.children = children
}
}
extension XcodeWorkspace.Location.Base {
/// Absolute path
public static let absolute = Self(rawValue: "absolute")
/// Relative to container
public static let container = Self(rawValue: "container")
/// Relative to Developer Directory
public static let developer = Self(rawValue: "developer")
/// Relative to group
public static let group = Self(rawValue: "group")
/// Single project workspace in xcodeproj directory
public static let current = Self(rawValue: "self")
}
extension XcodeWorkspace.Location {
public static var current: Self {
Self(base: .current, path: "")
}
}
extension XcodeWorkspace.Location: LosslessStringConvertible, CustomStringConvertible {
public init?(_ string: String) {
guard let colon = string.firstIndex(of: ":") else {
return nil
}
self.base = Base(rawValue: String(string[..<colon]))
self.path = String(string[colon...].dropFirst())
}
public var description: String {
"\(base.rawValue):\(path)"
}
}
-57
View File
@@ -1,57 +0,0 @@
import Foundation
import Testing
import Crypto
import X509
import XKit
// serial number from https://github.com/xtool-org/xtool/issues/305
private let leadingZeroSerial: [UInt8] = [
0x03, 0x37, 0x42, 0x57, 0x0D, 0x6F, 0x96, 0x84,
0xA2, 0x33, 0x11, 0x71, 0x19, 0x56, 0xA0, 0x84,
]
@Test func serialNumberKeepsLeadingZeroNibble() throws {
let certificate = try makeCertificate(serialNumber: leadingZeroSerial)
#expect(certificate.serialNumber() == "033742570D6F9684A23311711956A084")
}
@Test func serialNumberOmitsDERSignPadding() throws {
// the high bit is set, so DER encodes this serial with a leading 0x00 byte
var serial = leadingZeroSerial
serial[0] = 0x83
let certificate = try makeCertificate(serialNumber: serial)
#expect(certificate.serialNumber() == "833742570D6F9684A23311711956A084")
}
@Test func hasSerialNumberIgnoresCaseAndLeadingZeros() throws {
let certificate = try makeCertificate(serialNumber: leadingZeroSerial)
#expect(certificate.hasSerialNumber("033742570D6F9684A23311711956A084"))
#expect(certificate.hasSerialNumber("033742570d6f9684a23311711956a084"))
#expect(certificate.hasSerialNumber("33742570D6F9684A23311711956A084"))
#expect(certificate.hasSerialNumber("0033742570D6F9684A23311711956A084"))
#expect(!certificate.hasSerialNumber("133742570D6F9684A23311711956A084"))
#expect(!certificate.hasSerialNumber(""))
}
/// Creates a self-signed certificate and round-trips it through DER,
/// like the certificates we get from the developer API.
private func makeCertificate(serialNumber: [UInt8]) throws -> XKit.Certificate {
let key = P256.Signing.PrivateKey()
let name = try DistinguishedName {
CommonName("xtool tests")
}
let now = Date()
let certificate = try X509.Certificate(
version: .v3,
serialNumber: .init(bytes: serialNumber),
publicKey: .init(key.publicKey),
notValidBefore: now,
notValidAfter: now + 3600,
issuer: name,
subject: name,
signatureAlgorithm: .ecdsaWithSHA256,
extensions: .init(),
issuerPrivateKey: .init(key)
)
return try XKit.Certificate(data: XKit.Certificate(raw: certificate).data())
}
@@ -0,0 +1,25 @@
import Testing
@testable import XToolSupport
@Test func commandParser() throws {
func sut(_ string: some StringProtocol) throws -> [String] {
try CommandParser.parse(string)
}
#expect(try sut(#""#).isEmpty)
#expect(try sut(#"foo"#) == ["foo"])
#expect(try sut(#"foo "#) == ["foo"])
#expect(try sut(#"foo one two"#) == ["foo", "one", "two"])
#expect(try sut(#"foo 'one two' three"#) == ["foo", "one two", "three"])
#expect(try sut(#"foo 'one!two' three"#) == ["foo", "one!two", "three"])
#expect(try sut(#"foo one\!two three"#) == ["foo", "one!two", "three"])
#expect(try sut(#"foo one\'two three"#) == ["foo", "one'two", "three"])
#expect(try sut(#"foo one'two three'four five"#) == ["foo", "onetwo threefour", "five"])
#expect(throws: CommandParser.Errors.unclosedQuote) {
try sut(#"foo one two' three"#)
}
#expect(throws: CommandParser.Errors.unpairedEscape) {
try sut(#"foo a b \"#)
}
}
-15
View File
@@ -1,15 +0,0 @@
import Testing
@testable import PackLib
@Test func cfBundleSupportedPlatformsFollowsBuildTriple() {
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios") == ["iPhoneOS"])
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios-simulator") == ["iPhoneSimulator"])
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios17.0") == ["iPhoneOS"])
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-ios17.0-simulator") == ["iPhoneSimulator"])
#expect(Packer.cfBundleSupportedPlatforms(for: "x86_64-apple-ios-simulator") == ["iPhoneSimulator"])
#expect(Packer.cfBundleSupportedPlatforms(for: "arm64-apple-macosx") == ["MacOSX"])
#expect(Packer.cfBundleSupportedPlatforms(for: "x86_64-apple-macosx") == ["MacOSX"])
#expect(Packer.cfBundleSupportedPlatforms(for: "unknown-triple") == ["iPhoneOS"])
}
-86
View File
@@ -1,86 +0,0 @@
import Testing
@testable import PackLib
@Test(arguments: [
("6.2", SwiftVersion(6, 2)),
("6.2.0", SwiftVersion(6, 2)),
("6.2.1", SwiftVersion(6, 2, 1)),
("Swift version 6.2 (swift-6.2-RELEASE)\nTarget: aarch64-unknown-linux-gnu", SwiftVersion(6, 2)),
("Swift version 6.2.1 (swift-6.2.1-RELEASE)", SwiftVersion(6, 2, 1)),
("Apple Swift version 6.2 (swiftlang-6.2.0.19.9 clang-1700.3.19.1)", SwiftVersion(6, 2)),
("Apple Swift version 6.2.1 (swiftlang-6.2.1.4.3 clang-1700.3.19.1)", SwiftVersion(6, 2, 1)),
("Swift version 6.4-dev (LLVM abcdef, Swift abcdef)", SwiftVersion(6, 4)),
("Apple Swift version 6.4.1-dev (LLVM abcdef, Swift abcdef)", SwiftVersion(6, 4, 1)),
("Swift version 6.2 effective-5.10 (swift-6.2-RELEASE)", SwiftVersion(6, 2)),
("Swift version 6.2", SwiftVersion(6, 2)),
("Apple Swift version 6.2.1", SwiftVersion(6, 2, 1)),
("Swift version 6.4-dev", SwiftVersion(6, 4)),
("Apple Swift version 6.4.1-dev", SwiftVersion(6, 4, 1)),
("Swift version 6.4-dev\n", SwiftVersion(6, 4)),
("Swift version 6.4-dev\nTarget: aarch64-unknown-linux-gnu", SwiftVersion(6, 4)),
])
func testSwiftVersionParsing(string: String, expected: SwiftVersion) {
#expect(SwiftVersion(string) == expected)
}
@Test(arguments: [
"",
"6",
"6.2.1.4",
"swift version 6.2 (swift-6.2-RELEASE)",
"Swift version ",
"Swift version 6 (swift-6-RELEASE)",
"Swift version 6.2.1.4 (swift-6.2.1.4-RELEASE)",
"Swift version six.2 (swift-6.2-RELEASE)",
"Swift version 6.two (swift-6.2-RELEASE)",
"Swift version 6.2.one (swift-6.2.1-RELEASE)",
"Swift version 6.2-beta (swift-6.2-RELEASE)",
"Swift version 99999999999999999999.2 (swift-6.2-RELEASE)",
])
func testSwiftVersionParsingInvalidInput(string: String) {
#expect(SwiftVersion(string) == nil)
}
@Test(arguments: [
(SwiftVersion(0, 0), "0.0.0"),
(SwiftVersion(6, 2), "6.2.0"),
(SwiftVersion(6, 2, 1), "6.2.1"),
(SwiftVersion(10, 20, 30), "10.20.30"),
])
func testSwiftVersionStringConversion(version: SwiftVersion, expected: String) {
#expect(version.description == expected)
#expect(String(version) == expected)
#expect(SwiftVersion(version.description) == version)
}
@Test(arguments: [
(SwiftVersion(5, 99, 99), SwiftVersion(6, 0, 0)),
(SwiftVersion(6, 2, 99), SwiftVersion(6, 3, 0)),
(SwiftVersion(6, 2, 0), SwiftVersion(6, 2, 1)),
(SwiftVersion(9, 0, 0), SwiftVersion(10, 0, 0)),
(SwiftVersion(6, 9, 0), SwiftVersion(6, 10, 0)),
(SwiftVersion(6, 2, 9), SwiftVersion(6, 2, 10)),
])
func testSwiftVersionOrdering(lower: SwiftVersion, higher: SwiftVersion) {
#expect(lower < higher)
#expect(higher > lower)
#expect(lower <= higher)
#expect(higher >= lower)
#expect(!(higher < lower))
#expect(!(lower > higher))
#expect(lower != higher)
}
@Test(arguments: [
(SwiftVersion(6, 2), SwiftVersion(6, 2, 0)),
(SwiftVersion(6, 2, 1), SwiftVersion(6, 2, 1)),
])
func testSwiftVersionComparisonEquality(lhs: SwiftVersion, rhs: SwiftVersion) {
#expect(lhs == rhs)
#expect(!(lhs < rhs))
#expect(!(rhs < lhs))
#expect(!(lhs > rhs))
#expect(!(rhs > lhs))
#expect(lhs <= rhs)
#expect(lhs >= rhs)
}
+1 -1
View File
@@ -5,7 +5,7 @@
base = "Documentation/"
publish = "xtool.docc/.docc-build"
command = "./build.sh"
environment = { SWIFT_VERSION = "6.4.1" }
environment = { SWIFT_VERSION = "6.3" }
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
[[redirects]]