Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Async Console APIs

Kabir Oberaic59f26ee60cd
diff --git a/Package.resolved b/Package.resolved
index 7165926..5067c05 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,5 +1,5 @@
{
- "originHash" : "9d51e39cf59eb5e4b323babb234343919cbd46905692468ce76c44c32c6867b1",
+ "originHash" : "1c6075b990c8caafbf97b43093960552a1cf8bcbf3b5013d4b5928a77bd35e1c",
"pins" : [
{
"identity" : "aexml",
@@ -177,8 +177,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
- "revision" : "914081701062b11e3bb9e21accc379822621995e",
- "version" : "2.76.1"
+ "revision" : "dca6594f65308c761a9c409e09fbf35f48d50d34",
+ "version" : "2.77.0"
}
},
{
diff --git a/Package.swift b/Package.swift
index 9c6e5d5..6450753 100644
--- a/Package.swift
+++ b/Package.swift
@@ -32,12 +32,14 @@ let package = Package(
.package(url: "https://github.com/kabiroberai/swiftpack", .upToNextMinor(from: "1.0.1")),
.package(url: "https://github.com/kabiroberai/zsign", .upToNextMinor(from: "1.3.0")),
+ .package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-crypto", from: "3.9.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.0.0"),
.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/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"),
@@ -120,6 +122,8 @@ let package = Package(
"Supersign",
.product(name: "PackLib", package: "swiftpack"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
+ .product(name: "SystemPackage", package: "swift-system"),
+ .product(name: "NIOPosix", package: "swift-nio"),
.product(name: "Version", package: "Version"),
],
cSettings: cSettings
diff --git a/Sources/SupersignCLISupport/AuthCommand.swift b/Sources/SupersignCLISupport/AuthCommand.swift
index cb79d3d..b7aeea0 100644
--- a/Sources/SupersignCLISupport/AuthCommand.swift
+++ b/Sources/SupersignCLISupport/AuthCommand.swift
@@ -17,11 +17,16 @@ struct AuthOperation {
}
}
- guard let username = username ?? Console.prompt("Apple ID: "), !username.isEmpty else {
- throw Console.Error("A non-empty Apple ID is required.")
+ let username = try await Console.promptRequired("Apple ID: ", existing: username)
+
+ let password: String
+ if let existing = self.password {
+ password = existing
+ } else {
+ password = try await Console.getPassword("Password: ")
}
- guard let password = password ?? Console.getPassword("Password: "), !password.isEmpty else {
- throw Console.Error("A non-empty password is required.")
+ guard !password.isEmpty else {
+ throw Console.Error("Password cannot be empty.")
}
let deviceInfo = try DeviceInfo.fetch()
diff --git a/Sources/SupersignCLISupport/ConnectionOptions.swift b/Sources/SupersignCLISupport/ConnectionOptions.swift
index 830c8ff..23726b3 100644
--- a/Sources/SupersignCLISupport/ConnectionOptions.swift
+++ b/Sources/SupersignCLISupport/ConnectionOptions.swift
@@ -28,7 +28,7 @@ extension ConnectionOptions.WithoutSearchMode {
}
return device
} else {
- return try Console.choose(
+ return try await Console.choose(
from: devices,
onNoElement: { throw Console.Error("Device not found") },
multiPrompt: "Choose device",
diff --git a/Sources/SupersignCLISupport/Console.swift b/Sources/SupersignCLISupport/Console.swift
index 8de98ba..32307ea 100644
--- a/Sources/SupersignCLISupport/Console.swift
+++ b/Sources/SupersignCLISupport/Console.swift
@@ -1,26 +1,65 @@
import Foundation
import Supersign
+import SystemPackage
+import NIOPosix
+import NIOCore
enum Console {
- // nil = EOF
- static func prompt(_ message: String) -> String? {
+ private static func withStandardInput<T>(
+ _ body: (NIOAsyncChannelInboundStream<ByteBuffer>) async throws -> T
+ ) async throws -> T {
+ let copy = try FileDescriptor.standardInput.duplicate()
+ return try await NIOPipeBootstrap(group: .singletonMultiThreadedEventLoopGroup)
+ .takingOwnershipOfDescriptor(input: copy.rawValue)
+ .flatMapThrowing { try NIOAsyncChannel(wrappingChannelSynchronously: $0) }
+ .get()
+ .executeThenClose { try await body($0) }
+ }
+
+ static func prompt(_ message: String) async throws -> String {
if !message.isEmpty {
print(message, terminator: "")
}
fflush(stdoutSafe)
- return readLine()
+
+ return try await withStandardInput { stdin in
+ var data = Data()
+ for try await chunk in stdin {
+ let view = chunk.readableBytesView
+ if let endIndex = view.firstIndex(of: UInt8(ascii: "\n")) {
+ data += view[..<endIndex]
+ break
+ } else {
+ data += view
+ }
+ }
+ return String(decoding: data, as: UTF8.self)
+ }
}
- static func getPassword(_ message: String) -> String? {
+ static func promptRequired(_ message: String, existing: String?) async throws -> String {
+ let value: String
+ if let existing {
+ value = existing
+ } else {
+ value = try await Console.prompt(message)
+ }
+ guard !value.isEmpty else {
+ throw Console.Error("Input cannot be empty.")
+ }
+ return value
+ }
+
+ static func getPassword(_ message: String) async throws -> String {
if !message.isEmpty {
print(message, terminator: "")
}
- let password = withoutEcho { prompt("") }
+ let password = try await withoutEcho { try await prompt("") }
print()
return password
}
- private static func withoutEcho<T>(_ action: () throws -> T) rethrows -> T {
+ private static func withoutEcho<T>(_ action: () async throws -> T) async rethrows -> T {
#if os(Windows)
// based on https://stackoverflow.com/a/4497117/3769927
// TODO: Confirm that this works (or even compiles)
@@ -43,14 +82,14 @@ enum Console {
tcsetattr(STDIN_FILENO, TCSANOW, &newAttr)
defer { tcsetattr(STDIN_FILENO, TCSANOW, &origAttr) }
- return try action()
+ return try await action()
#endif
}
- static func chooseNumber(in range: Range<Int>) -> Int {
+ static func chooseNumber(in range: Range<Int>) async throws -> Int {
let message = "Choice (\(range.lowerBound)-\(range.upperBound - 1)): "
while true {
- if let choice = prompt(message).flatMap(Int.init), range.contains(choice) {
+ if let choice = try await Int(prompt(message)), range.contains(choice) {
return choice
}
}
@@ -61,7 +100,7 @@ enum Console {
onNoElement: () throws -> T,
multiPrompt: @autoclosure () -> String,
formatter: (T) throws -> String
- ) rethrows -> T {
+ ) async throws -> T {
switch elements.count {
case 0:
return try onNoElement()
@@ -72,7 +111,7 @@ enum Console {
try elements.enumerated().forEach { index, element in
try print("\(index): \(formatter(element))")
}
- let choice = chooseNumber(in: elements.indices)
+ let choice = try await chooseNumber(in: elements.indices)
return elements[choice]
}
}
@@ -80,14 +119,13 @@ enum Console {
private static let yesSet: Set<String> = ["yes", "y"]
private static let noSet: Set<String> = ["no", "n"]
- static func confirm(_ message: String) -> Bool {
+ static func confirm(_ message: String) async throws -> Bool {
while true {
- if let resp = prompt("\(message) (yes/no): ")?.lowercased() {
- if yesSet.contains(resp) {
- return true
- } else if noSet.contains(resp) {
- return false
- }
+ let resp = try await prompt("\(message) (yes/no): ").lowercased()
+ if yesSet.contains(resp) {
+ return true
+ } else if noSet.contains(resp) {
+ return false
}
}
}
diff --git a/Sources/SupersignCLISupport/DSCommand.swift b/Sources/SupersignCLISupport/DSCommand.swift
index 7d6428b..d25538a 100644
--- a/Sources/SupersignCLISupport/DSCommand.swift
+++ b/Sources/SupersignCLISupport/DSCommand.swift
@@ -35,22 +35,22 @@ struct DSTeamsListCommand: AsyncParsableCommand {
struct DSAnisetteCommand: AsyncParsableCommand {
private final class Provider: RawADIProvider, RawADIProvisioningSession {
- func startProvisioning(spim: Data, userID: UUID) -> (RawADIProvisioningSession, Data) {
+ func startProvisioning(spim: Data, userID: UUID) async throws -> (RawADIProvisioningSession, Data) {
print("spim: \(spim.base64EncodedString())")
- return (self, Data(base64Encoded: Console.prompt("cpim: ")!)!)
+ return (self, Data(base64Encoded: try await Console.prompt("cpim: "))!)
}
func endProvisioning(
routingInfo: UInt64,
ptm: Data,
tk: Data
- ) -> Data {
+ ) async throws -> Data {
print("""
rinfo: \(routingInfo)
ptm: \(ptm.base64EncodedString())
tk: \(tk.base64EncodedString())
""")
- return Data(base64Encoded: Console.prompt("pinfo: ")!)!
+ return Data(base64Encoded: try await Console.prompt("pinfo: "))!
}
func requestOTP(
diff --git a/Sources/SupersignCLISupport/SupersignCLIDelegate.swift b/Sources/SupersignCLISupport/SupersignCLIDelegate.swift
index 3174734..7c23bad 100644
--- a/Sources/SupersignCLISupport/SupersignCLIDelegate.swift
+++ b/Sources/SupersignCLISupport/SupersignCLIDelegate.swift
@@ -4,7 +4,7 @@ import ConcurrencyExtras
final class SupersignCLIAuthDelegate: TwoFactorAuthDelegate {
func fetchCode() async -> String? {
- Console.prompt("Code: ")
+ try? await Console.prompt("Code: ")
}
}
@@ -28,7 +28,7 @@ actor SupersignCLIDelegate: IntegratedInstallerDelegate {
return teams.first(where: { $0.id == preferredTeam })
}
- return Console.choose(
+ return try? await Console.choose(
from: teams,
onNoElement: { fatalError("No development teams available") },
multiPrompt: "\nSelect a team",
@@ -110,7 +110,11 @@ actor SupersignCLIDelegate: IntegratedInstallerDelegate {
"- \($0.attributes.name) (expires \($0.attributes.expiry.formatted(date: .abbreviated, time: .shortened)))"
}.joined(separator: "\n")
)
- return await Task.detached { Console.confirm("Continue?") }.value
+ do {
+ return try await Console.confirm("Continue?")
+ } catch {
+ return false
+ }
}
// TODO: Use `powershell Compress-Archive` and `powershell Expand-Archive` on Windows