mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 10:45:53 +03:00
Compare commits
1 Commits
@@ -1,8 +0,0 @@
|
||||
*
|
||||
!/Package.swift
|
||||
!/Package.resolved
|
||||
!/Sources
|
||||
!/Tests
|
||||
!/Linux
|
||||
/Linux/packages
|
||||
/Linux/staging
|
||||
@@ -6,8 +6,6 @@ on:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
env:
|
||||
XTL_CI: "1"
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -24,7 +22,7 @@ jobs:
|
||||
uses: actions/checkout@v6
|
||||
- name: Build and test
|
||||
run: |
|
||||
docker compose run --build -e XTL_CI=1 xtool bash -c \
|
||||
docker compose run --build xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help && swift test"
|
||||
build-macos:
|
||||
runs-on: macos-26
|
||||
|
||||
@@ -3,9 +3,6 @@ on:
|
||||
tags:
|
||||
- "*"
|
||||
|
||||
env:
|
||||
XTL_CI: "1"
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -26,7 +23,6 @@ jobs:
|
||||
run: |
|
||||
docker compose run --build \
|
||||
-e XTOOL_VERSION=${{ github.ref_name }} \
|
||||
-e XTL_CI=1 \
|
||||
--rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
@@ -85,24 +81,3 @@ jobs:
|
||||
TAG="${{ github.ref_name }}"
|
||||
gh release create "$TAG" --draft --title "v$TAG"
|
||||
gh release upload "$TAG" output/**/*.{AppImage,AppImage.zsync,app.zip,app.dSYM.zip}
|
||||
docker:
|
||||
uses: docker/github-builder/.github/workflows/build.yml@v1
|
||||
permissions:
|
||||
contents: read # to fetch the repository content
|
||||
id-token: write # for signing attestations and cache entries with GitHub OIDC
|
||||
packages: write # to push built images to GitHub Container Registry
|
||||
with:
|
||||
build-args: |
|
||||
XTL_CI=1
|
||||
output: image
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm64
|
||||
meta-images: |
|
||||
ghcr.io/xtool-org/xtool
|
||||
meta-tags: |
|
||||
type=semver,pattern={{version}}
|
||||
secrets:
|
||||
registry-auths: |
|
||||
- registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
# About
|
||||
|
||||
xtool is a cross-platform replacement for Xcode (including build system, provisioning, deployment).
|
||||
|
||||
The `xtool` CLI supports macOS, Linux, WSL. The lower-level XKit (provisioning and device interaction) library additionally supports iOS.
|
||||
|
||||
## Development
|
||||
|
||||
- The majority of the code is in the Swift Package. You can use `swift build` / `swift test` / etc for iteration.
|
||||
- Caveat: on macOS, xtool is distributed as an app bundle (allows entitlements like Keychain). To build the Mac app, use `make mac`. You can then invoke the CLI at `./macOS/Build/xtool`.
|
||||
- Make sure to run `make lint` (swiftlint) when you're done
|
||||
|
||||
## Conventions
|
||||
|
||||
- Use modern Swift 6. Strict concurrency is enabled.
|
||||
- Use swift-dependencies for Dependency Injection. Passing dependencies around as arguments is an anti-pattern.
|
||||
+3
-23
@@ -79,15 +79,11 @@ RUN cd xadi \
|
||||
&& cp -r bin/libxadi.so /prefix/usr/lib/libxadi.so
|
||||
|
||||
|
||||
FROM build-base AS build-xtool-base
|
||||
FROM build-base
|
||||
|
||||
COPY --from=build-limd /prefix/usr /usr
|
||||
COPY --from=build-xadi /prefix/usr /usr
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
FROM build-xtool-base AS dev
|
||||
|
||||
# Docker doesn't support FUSE
|
||||
ENV APPIMAGE_EXTRACT_AND_RUN=1
|
||||
|
||||
@@ -96,22 +92,6 @@ ENV APPIMAGE_EXTRACT_AND_RUN=1
|
||||
# socat -dd TCP-LISTEN:27015,range=127.0.0.1/32,reuseaddr,fork UNIX-CLIENT:/var/run/usbmuxd
|
||||
ENV USBMUXD_SOCKET_ADDRESS=host.docker.internal:27015
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
CMD [ "/bin/bash" ]
|
||||
|
||||
FROM build-xtool-base AS build-xtool
|
||||
|
||||
ARG XTL_CI
|
||||
|
||||
ADD Package.swift Package.resolved /xtool/
|
||||
RUN swift package resolve
|
||||
|
||||
ADD . /xtool
|
||||
RUN ./Linux/build.sh
|
||||
|
||||
FROM swift:6.3 AS xtool
|
||||
|
||||
COPY --from=build-xtool /xtool/Linux/packages/xtool-*.AppImage /xtool/xtool.AppImage
|
||||
RUN (cd /xtool && ./xtool.AppImage --appimage-extract) \
|
||||
&& mv /xtool/squashfs-root /usr/local/xtool \
|
||||
&& rm -rf /xtool \
|
||||
&& ln -s /usr/local/xtool/AppRun /usr/local/bin/xtool
|
||||
|
||||
@@ -22,5 +22,4 @@ else
|
||||
fi
|
||||
|
||||
"$docc" "$command" xtool.docc \
|
||||
--enable-experimental-code-block-annotations \
|
||||
--experimental-enable-custom-templates
|
||||
|
||||
@@ -14,12 +14,6 @@ If you're on Windows, you can use xtool via [Windows Subsystem for Linux](https:
|
||||
|
||||
Once you install WSL, you'll also need to set up USB passthrough. See Microsoft's instructions on [installing USBIPD](https://learn.microsoft.com/en-us/windows/wsl/connect-usb). Make sure you're able to bind your iOS device to WSL via USB.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> If you encounter `Error: AFCClient.Error.muxError`, follow the steps described in [this issue comment](https://github.com/xtool-org/xtool/issues/19#issuecomment-2898986718) from user rena2019.
|
||||
>
|
||||
> This relays the device connection from iTunes on Windows, instead of relying on USBIPD.
|
||||
|
||||
### Swift
|
||||
|
||||
Install the Swift 6.3 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
|
||||
@@ -56,10 +56,6 @@ linux-clean:
|
||||
linux-dist:
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
|
||||
.PHONY: docker
|
||||
docker:
|
||||
docker build . -t ghcr.io/xtool-org/xtool:latest
|
||||
|
||||
.PHONY: mac
|
||||
# dev build for macOS
|
||||
mac: project
|
||||
|
||||
+1
-10
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"originHash" : "80db0cddb0e78cf6a4c79f94537cdfebd8004679161532fbae8a57ee9d1d8cd1",
|
||||
"originHash" : "eb2a57fb4e4c2c83ff1f1fa55631db81988fc6e2e576a05a3cc5c8ed69432c3a",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
@@ -352,15 +352,6 @@
|
||||
"version" : "2.11.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-subprocess",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
|
||||
"version" : "0.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-syntax",
|
||||
"kind" : "remoteSourceControl",
|
||||
|
||||
+8
-30
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:6.2
|
||||
// swift-tools-version:6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
@@ -19,14 +19,6 @@ let cSettings: [CSetting] = [
|
||||
.define("_GNU_SOURCE", .when(platforms: [.linux])),
|
||||
]
|
||||
|
||||
let swiftSettings: [SwiftSetting] = {
|
||||
var settings: [SwiftSetting] = []
|
||||
if Context.environment["XTL_CI"] == "1" {
|
||||
settings.append(.treatAllWarnings(as: .error))
|
||||
}
|
||||
return settings
|
||||
}()
|
||||
|
||||
let package = Package(
|
||||
name: "xtool",
|
||||
platforms: [
|
||||
@@ -63,7 +55,6 @@ let package = Package(
|
||||
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
|
||||
|
||||
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.0")),
|
||||
|
||||
.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"),
|
||||
@@ -98,21 +89,14 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
|
||||
],
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"],
|
||||
swiftSettings: swiftSettings,
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
),
|
||||
// common utilities shared across xtool targets
|
||||
.target(
|
||||
name: "XUtils",
|
||||
dependencies: [
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(
|
||||
name: "Subprocess",
|
||||
package: "swift-subprocess",
|
||||
condition: .when(platforms: [.linux, .macOS])
|
||||
),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
@@ -151,16 +135,13 @@ let package = Package(
|
||||
condition: .when(platforms: [.linux])
|
||||
),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
.testTarget(
|
||||
name: "XToolTests",
|
||||
dependencies: [
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XToolSupport",
|
||||
@@ -174,8 +155,7 @@ let package = Package(
|
||||
.product(name: "Version", package: "Version"),
|
||||
.product(name: "libunxip", package: "unxip"),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
.target(
|
||||
name: "PackLib",
|
||||
@@ -183,8 +163,7 @@ let package = Package(
|
||||
"XUtils",
|
||||
.product(name: "Yams", package: "Yams"),
|
||||
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
]
|
||||
),
|
||||
.executableTarget(
|
||||
name: "xtool",
|
||||
@@ -193,8 +172,7 @@ let package = Package(
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
public struct BuildSettings: Sendable {
|
||||
private static let customBinDir =
|
||||
// this is the same option used by SwiftPM itself for dev builds
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { FilePath($0) }
|
||||
ProcessInfo.processInfo.environment["SWIFTPM_CUSTOM_BIN_DIR"].map { URL(fileURLWithPath: $0) }
|
||||
|
||||
private static let envURL = URL(fileURLWithPath: "/usr/bin/env")
|
||||
|
||||
@@ -36,16 +34,18 @@ public struct BuildSettings: Sendable {
|
||||
|
||||
#if os(macOS)
|
||||
private static func xcrun(_ arguments: [String]) async throws -> String {
|
||||
let result = try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: .init(arguments),
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
return result.standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
let xcrun = Process()
|
||||
let pipe = Pipe()
|
||||
xcrun.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
xcrun.arguments = arguments
|
||||
xcrun.standardOutput = pipe
|
||||
try await xcrun.runUntilExit()
|
||||
return String(decoding: pipe.fileHandleForReading.readDataToEndOfFile(), as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
|
||||
private static let swiftURL = Task {
|
||||
try await FilePath(xcrun(["-f", "swift"]))
|
||||
try await URL(fileURLWithPath: xcrun(["-f", "swift"]))
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -53,11 +53,12 @@ public struct BuildSettings: Sendable {
|
||||
forTool tool: String,
|
||||
arguments: [String],
|
||||
packagePathOverride: String? = nil
|
||||
) async throws -> Subprocess.Configuration {
|
||||
let executable: Executable
|
||||
) async throws -> Process {
|
||||
let process = Process()
|
||||
|
||||
let baseArguments: [String]
|
||||
if let customBinDir = Self.customBinDir {
|
||||
executable = .path(customBinDir.appending("swift-\(tool)"))
|
||||
process.executableURL = customBinDir.appendingPathComponent("swift-\(tool)")
|
||||
baseArguments = []
|
||||
} else {
|
||||
#if os(macOS)
|
||||
@@ -66,9 +67,9 @@ public struct BuildSettings: Sendable {
|
||||
// 1) invoking the real swift executable (located with `xcrun -f`) and
|
||||
// 2) explicitly removing SDKROOT from the env, as it may be inherited
|
||||
// through the `swift run pack` invocation.
|
||||
executable = .path(try await Self.swiftURL.value)
|
||||
process.executableURL = try await Self.swiftURL.value
|
||||
#else
|
||||
executable = .name("swift")
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
#endif
|
||||
baseArguments = [tool]
|
||||
}
|
||||
@@ -78,18 +79,11 @@ public struct BuildSettings: Sendable {
|
||||
"--configuration", configuration.rawValue,
|
||||
]
|
||||
|
||||
var rawEnv = ProcessInfo.processInfo.environment
|
||||
rawEnv.removeValue(forKey: "SDKROOT")
|
||||
let env = Dictionary(uniqueKeysWithValues: rawEnv.map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
})
|
||||
|
||||
return Configuration(
|
||||
executable,
|
||||
arguments: .init(baseArguments + extraArguments + sdkOptions + options + arguments),
|
||||
environment: .custom(env),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
)
|
||||
var env = ProcessInfo.processInfo.environment
|
||||
env.removeValue(forKey: "SDKROOT")
|
||||
process.environment = env
|
||||
process.arguments = baseArguments + extraArguments + sdkOptions + options + arguments
|
||||
return process
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Packer: Sendable {
|
||||
public let buildSettings: BuildSettings
|
||||
@@ -55,7 +54,7 @@ public struct Packer: Sendable {
|
||||
try Data().write(to: sources.appendingPathComponent("stub.c", isDirectory: false))
|
||||
}
|
||||
|
||||
let buildConfig = try await buildSettings.swiftPMInvocation(
|
||||
let builder = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "build",
|
||||
arguments: [
|
||||
"--package-path", packageDir.path,
|
||||
@@ -69,12 +68,8 @@ public struct Packer: Sendable {
|
||||
"--disable-automatic-resolution",
|
||||
]
|
||||
)
|
||||
try await Subprocess.run(
|
||||
buildConfig,
|
||||
output: .currentStandardError,
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
builder.standardOutput = FileHandle.standardError
|
||||
try await builder.runUntilExit()
|
||||
}
|
||||
|
||||
public func pack() async throws -> URL {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
public struct Planner: Sendable {
|
||||
public var buildSettings: BuildSettings
|
||||
@@ -244,18 +243,16 @@ public struct Planner: Sendable {
|
||||
}
|
||||
|
||||
private func _dumpAction(arguments: [String], path: String) async throws -> Data {
|
||||
let dumpConfig = try await buildSettings.swiftPMInvocation(
|
||||
let dump = try await buildSettings.swiftPMInvocation(
|
||||
forTool: "package",
|
||||
arguments: arguments,
|
||||
packagePathOverride: path
|
||||
)
|
||||
return try await Subprocess.run(
|
||||
dumpConfig,
|
||||
output: .data(limit: .max),
|
||||
error: .currentStandardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
let pipe = Pipe()
|
||||
dump.standardOutput = pipe
|
||||
async let task = Data(reading: pipe.fileHandleForReading)
|
||||
try await dump.runUntilExit()
|
||||
return try await task
|
||||
}
|
||||
|
||||
private func selectLibrary(
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import Foundation
|
||||
|
||||
extension Process {
|
||||
/// Launches the process and suspends until the receiver is finished.
|
||||
///
|
||||
/// - Parameter onCancel: The action to take if the current
|
||||
/// task is cancelled.
|
||||
public func runUntilExit(onCancel: TaskCancelAction = .interrupt) async throws {
|
||||
try Task.checkCancellation()
|
||||
|
||||
let (terminationStream, terminationContinuation) = AsyncStream<Never>.makeStream()
|
||||
terminationHandler = { _ in
|
||||
terminationContinuation.finish()
|
||||
}
|
||||
|
||||
do {
|
||||
try run()
|
||||
} catch {
|
||||
terminationContinuation.finish()
|
||||
throw error
|
||||
}
|
||||
|
||||
await withTaskCancellationHandler {
|
||||
for await _ in terminationStream {}
|
||||
} onCancel: {
|
||||
switch onCancel {
|
||||
case .interrupt:
|
||||
interrupt()
|
||||
case .terminate:
|
||||
terminate()
|
||||
case .ignore:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
try Task.checkCancellation()
|
||||
|
||||
switch terminationReason {
|
||||
case .exit where terminationStatus == 0:
|
||||
break
|
||||
case .exit:
|
||||
throw Failure.exit(terminationStatus)
|
||||
case .uncaughtSignal:
|
||||
throw Failure.uncaughtSignal(terminationStatus)
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
public enum Failure: Error {
|
||||
case exit(CInt)
|
||||
case uncaughtSignal(CInt)
|
||||
}
|
||||
|
||||
public enum TaskCancelAction: Sendable {
|
||||
/// Sends `SIGINT` to the process.
|
||||
case interrupt
|
||||
/// Sends `SIGTERM` to the process.
|
||||
case terminate
|
||||
/// Don't participate in cooperative cancellation.
|
||||
case ignore
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
import Foundation
|
||||
import Subprocess
|
||||
|
||||
package enum ToolRegistry {
|
||||
package enum Errors: Error, CustomStringConvertible {
|
||||
@@ -17,6 +16,11 @@ package enum ToolRegistry {
|
||||
|
||||
/// Obtain the full path to a tool in the user's `PATH`.
|
||||
///
|
||||
/// This effectively invokes `/bin/sh -c "command -v '$tool'"`.
|
||||
///
|
||||
/// - Warning: Make sure you trust/sanitize the `tool` parameter. If it
|
||||
/// contains a single quote, it can be used in a shell escape.
|
||||
///
|
||||
/// - Throws: `Errors.toolNotFound` if the tool could not be located.
|
||||
package static func locate(_ tool: String) async throws -> URL {
|
||||
try await cache.locate(tool: tool)
|
||||
@@ -26,10 +30,20 @@ package enum ToolRegistry {
|
||||
private var cache: [String: Task<URL, Error>] = [:]
|
||||
|
||||
private func _locate(tool: String) async throws -> URL {
|
||||
guard let path = try? await Executable.name(tool).resolveExecutablePath(in: .inherit),
|
||||
let url = URL(filePath: path)
|
||||
else { throw Errors.toolNotFound(tool) }
|
||||
return url
|
||||
let pipe = Pipe()
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(fileURLWithPath: "/bin/sh")
|
||||
proc.arguments = ["-c", "command -v '\(tool)'"]
|
||||
proc.standardOutput = pipe
|
||||
async let bytes = pipe.fileHandleForReading.readToEnd()
|
||||
do {
|
||||
try await proc.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
throw Errors.toolNotFound(tool)
|
||||
}
|
||||
let path = String(decoding: try await bytes ?? Data(), as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
return URL(fileURLWithPath: path)
|
||||
}
|
||||
|
||||
func locate(tool: String) async throws -> URL {
|
||||
|
||||
@@ -138,9 +138,3 @@ extension WirelessAccessoryEntitlement: EntitlementWithCapability {
|
||||
DeveloperServicesCapability(.wirelessAccessoryConfiguration, isFree: true)
|
||||
}
|
||||
}
|
||||
|
||||
extension WiFiAwareEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
DeveloperServicesCapability(rawName: "WIFI_AWARE", isFree: false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,10 +140,12 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
|
||||
// Xcode-specific
|
||||
request.headerFields[.userAgent] = "Xcode"
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = "16.2 (16C5031c)"
|
||||
|
||||
// MobileMe identity
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = """
|
||||
<VirtualMac2,1> <macOS;15.1.1;24B91> <com.apple.AuthKit/1 (com.apple.dt.Xcode/23505)>
|
||||
""" // deviceInfo.clientInfo.clientString
|
||||
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
|
||||
|
||||
// GrandSlam authentication
|
||||
|
||||
@@ -14,19 +14,29 @@ public struct DeviceInfo: Codable, Sendable {
|
||||
/// `X-Xcode-Version`
|
||||
static let xcodeVersionKey = "X-Xcode-Version"
|
||||
/// Not included in `dictionary`
|
||||
public static let xcodeVersion = "26.5 (17F42)"
|
||||
public static let xcodeVersion = "14.2 (14C18)"
|
||||
|
||||
public struct ClientInfo: Codable {
|
||||
public static let macOSVersion = "14.3.1"
|
||||
public static let macOSBuild = "23D60"
|
||||
|
||||
public static let authKitVersion = "1"
|
||||
public static let akdVersion = "1.0"
|
||||
public static let cfNetworkVersion = "978.0.7"
|
||||
public static let darwinVersion = "18.7.0"
|
||||
|
||||
public let modelID: String // e.g. MacBookPro11,5
|
||||
|
||||
// TODO: Do we need to replace com.apple.akd with com.apple.dt.Xcode? See AltStore
|
||||
var clientString: String {
|
||||
"""
|
||||
<\(modelID)> <macOS;26.6;25G72> <com.apple.AuthKit/1 (com.apple.dt.Xcode/26.0)>
|
||||
<\(modelID)> <Mac OS X;\(Self.macOSVersion);\(Self.macOSBuild)> \
|
||||
<com.apple.AuthKit/\(Self.authKitVersion) (com.apple.akd/\(Self.akdVersion))>
|
||||
"""
|
||||
}
|
||||
|
||||
var userAgent: String {
|
||||
"AuthKit/1 (Macintosh; OS X 26.6) (com.apple.dt.Xcode/26.0)"
|
||||
"akd/\(Self.akdVersion) CFNetwork/\(Self.cfNetworkVersion) Darwin/\(Self.darwinVersion)"
|
||||
}
|
||||
|
||||
public init(modelID: String) {
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
|
||||
#if false
|
||||
|
||||
// For reference: https://github.com/xtool-org/xtool/issues/196
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Creates a socket connected to `ip` on `port`.
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
import Foundation
|
||||
import XADI
|
||||
import Dependencies
|
||||
import Subprocess
|
||||
|
||||
public actor XADIProvider: RawADIProvider {
|
||||
@MainActor private static var loadTask: Task<Void, Error>?
|
||||
@@ -46,17 +45,17 @@ public actor XADIProvider: RawADIProvider {
|
||||
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()
|
||||
let proc = Process()
|
||||
proc.executableURL = URL(filePath: "/usr/bin/env")
|
||||
proc.arguments = [
|
||||
"unzip", "-q",
|
||||
applemusic.path(),
|
||||
"\(archDir)/libCoreADI.so",
|
||||
"\(archDir)/libstoreservicescore.so",
|
||||
"-d", tmp.path()
|
||||
]
|
||||
try proc.run()
|
||||
proc.waitUntilExit()
|
||||
try FileManager.default.moveItem(
|
||||
at: tmp.appending(path: archDir),
|
||||
to: libDir
|
||||
|
||||
@@ -41,11 +41,7 @@ struct GrandSlamClient: Sendable {
|
||||
}
|
||||
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
|
||||
let resp = try await httpClient.withEphemeralClient {
|
||||
try await $0.makeRequest(httpRequest, body: body)
|
||||
}
|
||||
let resp = try await httpClient.makeRequest(httpRequest, body: body)
|
||||
return try R.Decoder.decode(data: resp.body)
|
||||
}
|
||||
|
||||
|
||||
@@ -18,31 +18,23 @@ import OpenAPIAsyncHTTPClient
|
||||
import Dependencies
|
||||
|
||||
extension HTTPClientDependencyKey: DependencyKey {
|
||||
public static let liveValue: HTTPClientProtocol = Client()
|
||||
}
|
||||
|
||||
private struct Client: HTTPClientProtocol {
|
||||
private static let tlsConfiguration: TLSConfiguration = {
|
||||
public static let liveValue: HTTPClientProtocol = {
|
||||
// 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([appleRootCA])]
|
||||
return tlsConfiguration
|
||||
}()
|
||||
|
||||
var client: HTTPClient
|
||||
|
||||
init() {
|
||||
var config = HTTPClient.Configuration(
|
||||
tlsConfiguration: Self.tlsConfiguration,
|
||||
tlsConfiguration: tlsConfiguration,
|
||||
decompression: .enabled(limit: .none)
|
||||
)
|
||||
config.timeout.connect = .seconds(60)
|
||||
self.client = HTTPClient(configuration: config)
|
||||
}
|
||||
return HTTPClient(configuration: config)
|
||||
}()
|
||||
}
|
||||
|
||||
func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
extension HTTPClient: HTTPClientProtocol {
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let (stream, continuation) = AsyncStream.makeStream(of: WebSocketSessionWrapper.self)
|
||||
async let value = stream.first(where: { _ in true })
|
||||
// must be after the `async let` so that we finish if connect throws
|
||||
@@ -50,7 +42,7 @@ private struct Client: HTTPClientProtocol {
|
||||
// we can't use the async overload because we need to immediately subscribe
|
||||
// to onText/onBinary in the same EventLoop tick that the WebSocket is created.
|
||||
// This is also why we create the SessionWrapper inside the closure.
|
||||
let future = WebSocket.connect(to: url, on: client.eventLoopGroup) {
|
||||
let future = WebSocket.connect(to: url, on: eventLoopGroup) {
|
||||
continuation.yield(WebSocketSessionWrapper(webSocket: $0))
|
||||
}
|
||||
try await future.get()
|
||||
@@ -64,17 +56,8 @@ private struct Client: HTTPClientProtocol {
|
||||
case connectFailed
|
||||
}
|
||||
|
||||
var asOpenAPITransport: any ClientTransport {
|
||||
AsyncHTTPClientTransport(configuration: .init(client: client))
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
let ephemeralClient = Client()
|
||||
let result = await Result { try await perform(ephemeralClient) }
|
||||
try? await ephemeralClient.client.shutdown()
|
||||
return try result.get()
|
||||
public var asOpenAPITransport: any ClientTransport {
|
||||
AsyncHTTPClientTransport(configuration: .init(client: self))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,10 +18,6 @@ public protocol HTTPClientProtocol: Sendable {
|
||||
var asOpenAPITransport: ClientTransport { get }
|
||||
|
||||
func makeWebSocket(url: URL) async throws -> WebSocketSession
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T
|
||||
}
|
||||
|
||||
extension HTTPClientProtocol {
|
||||
@@ -45,72 +41,28 @@ extension HTTPClientProtocol {
|
||||
public func makeRequest(
|
||||
_ request: HTTPRequest,
|
||||
body: Data? = nil,
|
||||
requireHTTPSuccess: Bool = true,
|
||||
onProgress: @isolated(any) (Double?) -> Void = { _ in }
|
||||
) async throws -> (response: HTTPResponse, body: Data) {
|
||||
await onProgress(0)
|
||||
let (response, responseBody) = try await send(request, body: body.map { HTTPBody($0) })
|
||||
guard !requireHTTPSuccess || ![.clientError, .serverError].contains(response.status.kind) else {
|
||||
let errorBody = (try? await responseBody.collect()) ?? Data()
|
||||
throw HTTPResponseError(
|
||||
method: request.method,
|
||||
url: "\(request.scheme ?? "https")://\(request.authority ?? "")\(request.path ?? "")",
|
||||
status: response.status,
|
||||
// we don't use `decoding:as:` because we want to validate the UTF8
|
||||
body: String(data: errorBody, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
)
|
||||
let (response, body) = try await send(request, body: body.map { HTTPBody($0) })
|
||||
guard let body else {
|
||||
return (response, Data())
|
||||
}
|
||||
return (response, try await responseBody.collect(onProgress: onProgress))
|
||||
}
|
||||
}
|
||||
|
||||
extension HTTPBody? {
|
||||
fileprivate func collect(
|
||||
onProgress: @isolated(any) (Double?) -> Void = { _ in }
|
||||
) async throws -> Data {
|
||||
try await self?.collect(onProgress: onProgress) ?? Data()
|
||||
}
|
||||
}
|
||||
|
||||
extension HTTPBody {
|
||||
fileprivate func collect(
|
||||
onProgress: @isolated(any) (Double?) -> Void
|
||||
) async throws -> Data {
|
||||
switch self.length {
|
||||
switch body.length {
|
||||
case .unknown:
|
||||
return try await self.reduce(into: Data()) { $0 += $1 }
|
||||
return (response, try await body.reduce(into: Data()) { $0 += $1 })
|
||||
case .known(let length):
|
||||
var data = Data(capacity: Int(length))
|
||||
let total = Double(length)
|
||||
for try await chunk in self {
|
||||
for try await chunk in body {
|
||||
data += chunk
|
||||
await onProgress(Swift.min(Double(data.count) / total, 1))
|
||||
await onProgress(min(Double(data.count) / total, 1))
|
||||
}
|
||||
return data
|
||||
return (response, data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public struct HTTPResponseError: Error, LocalizedError, Sendable, CustomStringConvertible {
|
||||
public let method: HTTPRequest.Method
|
||||
public let url: String
|
||||
public let status: HTTPResponse.Status
|
||||
public let body: String?
|
||||
|
||||
public var description: String {
|
||||
var description = "\(method.rawValue) \(url) failed: HTTP \(status.code)"
|
||||
if !status.reasonPhrase.isEmpty {
|
||||
description += " \(status.reasonPhrase)"
|
||||
}
|
||||
if let body, !body.isEmpty {
|
||||
description += ". Details:\n\(body)"
|
||||
}
|
||||
return description
|
||||
}
|
||||
|
||||
public var errorDescription: String? { description }
|
||||
}
|
||||
|
||||
private struct UnimplementedHTTPClient: HTTPClientProtocol, ClientTransport {
|
||||
public var asOpenAPITransport: ClientTransport { self }
|
||||
|
||||
@@ -132,12 +84,6 @@ private struct UnimplementedHTTPClient: HTTPClientProtocol, ClientTransport {
|
||||
return try closure()
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
try await perform(self)
|
||||
}
|
||||
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let closure: (URL) async throws -> any WebSocketSession = unimplemented()
|
||||
return try await closure(url)
|
||||
|
||||
@@ -56,15 +56,6 @@ private struct Client: HTTPClientProtocol {
|
||||
URLSessionTransport(configuration: .init(session: session))
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
let ephemeralClient = Client()
|
||||
let result = await Result { try await perform(ephemeralClient) }
|
||||
ephemeralClient.session.finishTasksAndInvalidate()
|
||||
return try result.get()
|
||||
}
|
||||
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let task = session.webSocketTask(with: url)
|
||||
let (event, eventContinuation) = AsyncStream<URLSessionWebSocketTask.CloseCode?>.makeStream()
|
||||
|
||||
@@ -26,7 +26,6 @@ extension EntitlementContainer {
|
||||
SiriKitEntitlement.self,
|
||||
InterAppAudioEntitlement.self,
|
||||
WirelessAccessoryEntitlement.self,
|
||||
WiFiAwareEntitlement.self,
|
||||
HomeKitEntitlement.self,
|
||||
HealthKitEntitlement.self,
|
||||
]
|
||||
@@ -156,21 +155,6 @@ public struct WirelessAccessoryEntitlement: Entitlement, RawRepresentable {
|
||||
public init(rawValue: Bool) { self.rawValue = rawValue }
|
||||
}
|
||||
|
||||
public struct WiFiAwareEntitlement: Entitlement, RawRepresentable {
|
||||
public static let identifier = "com.apple.developer.wifi-aware"
|
||||
|
||||
public var rawValue: [String]
|
||||
public init(rawValue: [String]) { self.rawValue = rawValue }
|
||||
|
||||
public init(from decoder: Decoder) throws {
|
||||
rawValue = try decoder.singleValueContainer().decode([String].self)
|
||||
}
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.singleValueContainer()
|
||||
try container.encode(rawValue)
|
||||
}
|
||||
}
|
||||
|
||||
public struct HomeKitEntitlement: Entitlement, RawRepresentable {
|
||||
public static let identifier = "com.apple.developer.homekit"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import Foundation
|
||||
import XKit
|
||||
import XUtils
|
||||
import SystemPackage
|
||||
import NIOPosix
|
||||
import NIOCore
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ struct DSTeamsListCommand: AsyncParsableCommand {
|
||||
func run() async throws {
|
||||
let token = try AuthToken.saved()
|
||||
|
||||
guard case let .xcode(authData) = token.authData() else {
|
||||
guard case let .xcode(authData) = try token.authData() else {
|
||||
throw Console.Error("This command requires password-based authentication")
|
||||
}
|
||||
let client = DeveloperServicesClient(authData: authData)
|
||||
|
||||
@@ -282,8 +282,6 @@ struct DevCommand: AsyncParsableCommand {
|
||||
extension BuildConfiguration: ExpressibleByArgument {}
|
||||
|
||||
#if os(macOS)
|
||||
import Subprocess
|
||||
|
||||
struct SimInstallOperation {
|
||||
var path: URL
|
||||
|
||||
@@ -291,12 +289,10 @@ struct SimInstallOperation {
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: ["simctl", "install", simulator, path.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
let process = Process()
|
||||
process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
process.arguments = ["simctl", "install", simulator, path.path]
|
||||
try await process.runUntilExit()
|
||||
print("Installed to simulator")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,8 +2,6 @@ import Foundation
|
||||
import XKit
|
||||
import Dependencies
|
||||
import PackLib
|
||||
import Subprocess
|
||||
import XUtils
|
||||
|
||||
extension ZIPCompressor: DependencyKey {
|
||||
// TODO: Use `powershell Compress-Archive` and `powershell Expand-Archive` on Windows
|
||||
@@ -14,23 +12,20 @@ extension ZIPCompressor: DependencyKey {
|
||||
|
||||
let dest = dir.deletingLastPathComponent().appendingPathComponent("app.ipa")
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("zip"),
|
||||
arguments: ["-yqru0", dest.path, dir.lastPathComponent],
|
||||
workingDirectory: FilePath(dir.deletingLastPathComponent()),
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
let zip = Process()
|
||||
zip.executableURL = try await ToolRegistry.locate("zip")
|
||||
zip.currentDirectoryURL = dir.deletingLastPathComponent()
|
||||
zip.arguments = ["-yqru0", dest.path, dir.lastPathComponent]
|
||||
try await zip.runUntilExit()
|
||||
|
||||
return dest
|
||||
},
|
||||
decompress: { ipa, directory, progress in
|
||||
progress(nil)
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("unzip"),
|
||||
arguments: ["-q", ipa.path, "-d", directory.path],
|
||||
output: .discarded,
|
||||
).checkSuccess()
|
||||
let unzip = Process()
|
||||
unzip.executableURL = try await ToolRegistry.locate("unzip")
|
||||
unzip.arguments = ["-q", ipa.path, "-d", directory.path]
|
||||
try await unzip.runUntilExit()
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import Foundation
|
||||
import Dependencies
|
||||
import SystemPackage
|
||||
import libunxip
|
||||
import Subprocess
|
||||
import XKit // HTTPClient, stdoutSafe
|
||||
import XUtils // System.File{Path,Descriptor}
|
||||
import PackLib // ToolRegistry
|
||||
|
||||
struct SDKBuilder {
|
||||
enum Arch: String {
|
||||
@@ -180,6 +180,14 @@ struct SDKBuilder {
|
||||
withIntermediateDirectories: false
|
||||
)
|
||||
|
||||
let pipe = Pipe()
|
||||
let untar = Process()
|
||||
untar.currentDirectoryURL = toolsetDir
|
||||
untar.executableURL = try await ToolRegistry.locate("tar")
|
||||
untar.arguments = ["xzf", "-"]
|
||||
untar.standardInput = pipe.fileHandleForReading
|
||||
async let tarExit: Void = untar.runUntilExit()
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
@@ -191,33 +199,22 @@ struct SDKBuilder {
|
||||
case .known(let known): known
|
||||
case .unknown: nil
|
||||
}
|
||||
|
||||
defer { print() }
|
||||
try await Subprocess.run(
|
||||
.name("tar"),
|
||||
arguments: ["xzf", "-"],
|
||||
workingDirectory: FilePath(toolsetDir),
|
||||
input: .inputWriter,
|
||||
output: .discarded,
|
||||
error: .discarded,
|
||||
) { execution in
|
||||
var totalWritten: Int64 = 0
|
||||
let writer = pipe.fileHandleForWriting
|
||||
var written: Int64 = 0
|
||||
do {
|
||||
defer { try? writer.close() }
|
||||
for try await chunk in body {
|
||||
var remaining = chunk
|
||||
while !remaining.isEmpty {
|
||||
let written = try await execution.standardInputWriter.write(Array(remaining))
|
||||
remaining = remaining.dropFirst(written)
|
||||
totalWritten += Int64(written)
|
||||
|
||||
guard let length else { continue }
|
||||
let progress = Int(Double(totalWritten) / Double(length) * 100)
|
||||
try writer.write(contentsOf: chunk)
|
||||
written += Int64(chunk.count)
|
||||
if let length {
|
||||
let progress = Int(Double(written) / Double(length) * 100)
|
||||
print("\r[Downloading toolset] \(progress)%", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
try await execution.standardInputWriter.finish()
|
||||
}
|
||||
.checkSuccess()
|
||||
print()
|
||||
try await tarExit
|
||||
}
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity function_body_length
|
||||
|
||||
@@ -5,7 +5,6 @@ import ArgumentParser
|
||||
import Dependencies
|
||||
import PackLib
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
struct SDKCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
@@ -152,40 +151,50 @@ struct DarwinSDK {
|
||||
|
||||
try await addHostClangResourceDir(to: url)
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "install", url.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "install", url.path]
|
||||
try await process.runUntilExit()
|
||||
}
|
||||
|
||||
private static func addHostClangResourceDir(to sdk: URL) async throws {
|
||||
let clangURL = try await ToolRegistry.locate("clang")
|
||||
let process = try await Subprocess.run(
|
||||
.path(FilePath(clangURL.path)),
|
||||
arguments: ["-print-resource-dir"],
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
let output = process.standardOutput ?? ""
|
||||
let hostClangResources = URL(filePath: output.trimmingCharacters(in: .whitespacesAndNewlines))
|
||||
let outPipe = Pipe()
|
||||
let clang = Process()
|
||||
clang.executableURL = try await ToolRegistry.locate("clang")
|
||||
clang.arguments = ["-print-resource-dir"]
|
||||
clang.standardOutput = outPipe
|
||||
clang.standardError = FileHandle.standardError
|
||||
async let outputData = Data(reading: outPipe.fileHandleForReading)
|
||||
do {
|
||||
try await clang.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
throw Console.Error("Failed to query host clang -print-resource-dir")
|
||||
}
|
||||
let path = String(decoding: try await outputData, as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !path.isEmpty else {
|
||||
throw Console.Error("Host clang returned an empty resource directory")
|
||||
}
|
||||
let hostClangResources = URL(fileURLWithPath: path, isDirectory: true)
|
||||
let hostInclude = hostClangResources.appending(path: "include")
|
||||
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
try FileManager.default.copyItem(at: hostInclude, to: sdkInclude)
|
||||
}
|
||||
|
||||
static func current() async throws -> DarwinSDK? {
|
||||
let outputString: String
|
||||
let output = Pipe()
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"]
|
||||
process.standardOutput = output
|
||||
process.standardError = FileHandle.nullDevice
|
||||
|
||||
async let outputData = Data(reading: output.fileHandleForReading)
|
||||
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
?? ""
|
||||
} catch SubprocessFailure.exited {
|
||||
try await process.runUntilExit()
|
||||
} catch Process.Failure.exit {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -193,6 +202,7 @@ struct DarwinSDK {
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
// swiftlint:disable:previous line_length
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
let outputString = String(decoding: try await outputData, as: UTF8.self)
|
||||
|
||||
guard let resourcesPath = outputString
|
||||
.split(separator: "\n")
|
||||
@@ -220,19 +230,21 @@ struct DarwinSDK {
|
||||
private enum SwiftVersion {}
|
||||
extension SwiftVersion {
|
||||
static func current() async throws -> Version {
|
||||
let outputString: String?
|
||||
let outPipe = Pipe()
|
||||
let errPipe = Pipe()
|
||||
let swift = Process()
|
||||
swift.executableURL = try await ToolRegistry.locate("swift")
|
||||
swift.arguments = ["--version"]
|
||||
swift.standardOutput = outPipe
|
||||
swift.standardError = errPipe
|
||||
async let outputTask = outPipe.fileHandleForReading.readToEnd()
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
try await swift.runUntilExit()
|
||||
} catch is Process.Failure {
|
||||
throw Console.Error("Failed to obtain Swift version")
|
||||
}
|
||||
var output = outputString?[...] ?? ""
|
||||
let outputData = try await outputTask
|
||||
var output = String(decoding: outputData ?? Data(), as: UTF8.self)[...]
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
#if canImport(Subprocess)
|
||||
import Subprocess
|
||||
import Foundation
|
||||
|
||||
extension ExecutionResult {
|
||||
@discardableResult
|
||||
public func checkSuccess() throws(SubprocessFailure) -> Self {
|
||||
try terminationStatus.checkSuccess()
|
||||
return self
|
||||
}
|
||||
}
|
||||
|
||||
extension TerminationStatus {
|
||||
fileprivate func checkSuccess() throws(SubprocessFailure) {
|
||||
if let failure { throw failure }
|
||||
}
|
||||
|
||||
private var failure: SubprocessFailure? {
|
||||
if isSuccess { return nil }
|
||||
switch self {
|
||||
case .exited(let code): return .exited(code)
|
||||
case .signaled(let code): return .signaled(code)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum SubprocessFailure: Error {
|
||||
case exited(TerminationStatus.Code)
|
||||
case signaled(TerminationStatus.Code)
|
||||
}
|
||||
|
||||
extension PlatformOptions {
|
||||
public static var withGracefulShutDown: Self {
|
||||
.init().withGracefulShutDown
|
||||
}
|
||||
|
||||
public var withGracefulShutDown: Self {
|
||||
var copy = self
|
||||
copy.teardownSequence = [
|
||||
.gracefulShutDown(
|
||||
allowedDurationToNextStep: .milliseconds(500)
|
||||
)
|
||||
]
|
||||
return copy
|
||||
}
|
||||
}
|
||||
|
||||
extension Environment {
|
||||
public static func currentMap() -> [Environment.Key: String] {
|
||||
Dictionary(
|
||||
uniqueKeysWithValues: ProcessInfo.processInfo.environment.map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -8,7 +8,7 @@ import Dependencies
|
||||
enum XToolMain {
|
||||
static func main() async throws {
|
||||
prepareDependencies { _ in
|
||||
// TODO: Improve persistence mechanism
|
||||
#warning("Improve persistence mechanism")
|
||||
// for Windows, we could use dpapi.h or wincred.h.
|
||||
// for Linux, maybe use libsecret?
|
||||
// see https://github.com/atom/node-keytar
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
@testable import XKit
|
||||
|
||||
@Test func wifiAwareEntitlementMapsToDeveloperCapability() throws {
|
||||
let plist = """
|
||||
<?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>com.apple.developer.wifi-aware</key>
|
||||
<array>
|
||||
<string>Publish</string>
|
||||
<string>Subscribe</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
"""
|
||||
|
||||
let entitlements = try PropertyListDecoder().decode(
|
||||
Entitlements.self,
|
||||
from: Data(plist.utf8)
|
||||
)
|
||||
let wifiAware = try #require(
|
||||
entitlements.entitlements().compactMap { $0 as? WiFiAwareEntitlement }.first
|
||||
)
|
||||
|
||||
#expect(wifiAware.rawValue == ["Publish", "Subscribe"])
|
||||
#expect(wifiAware.capability.capabilityType.value1 == nil)
|
||||
#expect(wifiAware.capability.capabilityType.value2 == "WIFI_AWARE")
|
||||
#expect(wifiAware.capability.settings == nil)
|
||||
#expect(!wifiAware.capability.isFree)
|
||||
|
||||
let encoded = try PropertyListEncoder().encode(entitlements)
|
||||
let dictionary = try #require(
|
||||
PropertyListSerialization.propertyList(from: encoded, format: nil) as? [String: Any]
|
||||
)
|
||||
#expect(dictionary[WiFiAwareEntitlement.identifier] as? [String] == ["Publish", "Subscribe"])
|
||||
}
|
||||
+2
-2
@@ -2,10 +2,8 @@ services:
|
||||
xtool:
|
||||
build:
|
||||
context: .
|
||||
target: dev
|
||||
volumes:
|
||||
- .:/xtool
|
||||
- .build/linux:/xtool/.build
|
||||
container_name: xtool
|
||||
stdin_open: true
|
||||
tty: true
|
||||
@@ -15,4 +13,6 @@ services:
|
||||
- seccomp:unconfined
|
||||
extra_hosts:
|
||||
# host.docker.internal doesn't exist by default on Linux hosts
|
||||
# TODO: Does this conflict with the default host on macOS?
|
||||
# we could rename this
|
||||
- "host.docker.internal:host-gateway"
|
||||
|
||||
Reference in New Issue
Block a user