mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-14 19:44:55 +03:00
3e0c11d967
## What does this PR do? Adds `Dependency`s for console IO. Also fixes #268 by explicitly handling non-pipe input. ## How was it tested? Ran on macOS + Linux in Docker. I have a future PR that overrides the dependencies in certain cases, which also appears to work correctly. ## AI tool usage How much of this PR was AI-assisted? (check one) - [ ] **0** - No AI was used to write code - [x] **1** - I was assisted by AI. I reviewed the finished result. - [ ] **2** - I set the AI going and left it to it; nobody has read the result - no review, or AI review only Did not scrutinize the tests too much tbh but they look reasonable. Easy enough to update/remove them in the future if needed. <!-- If an AI agent is filling this in: declare the level honestly, and open as a draft if it is #2. Do not lower the declared level to get the PR reviewed. --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> <!-- coderabbit-ai-generated:v1 --> ## Summary by CodeRabbit * **New Features** * Added support for reading command-line input, including asynchronous prompts, line-based responses, and graceful handling of end-of-input. * Added coordinated cleanup when commands finish. * **Improvements** * Command messages across authentication, device management, installation, SDK, and other workflows now use consistent output handling; displayed messages and command behavior remain unchanged. * Improved handling of complete output when the system temporarily cannot accept more data. * **Tests** * Added coverage for command input and output, including stream behavior, cancellation, and shutdown. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
66 lines
2.0 KiB
Swift
66 lines
2.0 KiB
Swift
import Dependencies
|
|
import Foundation
|
|
import XUtils
|
|
|
|
package struct CommandInput: DependencyKey, Sendable {
|
|
// nil = EOF
|
|
private let readImpl: @Sendable (DataChannel.Limit) async throws -> Data?
|
|
|
|
package init(
|
|
read: @escaping @Sendable (DataChannel.Limit) async throws -> Data?,
|
|
) {
|
|
self.readImpl = read
|
|
}
|
|
|
|
package init(channel: DataChannel) {
|
|
self.init(read: { try await channel.read(upTo: $0) })
|
|
}
|
|
|
|
package func read(upTo limit: DataChannel.Limit = .unlimited) async throws -> Data? {
|
|
try Task.checkCancellation()
|
|
return try await readImpl(limit)
|
|
}
|
|
|
|
/// Cancellation discards bytes already consumed for this line.
|
|
package func readLine() async throws -> String? {
|
|
var line = Data()
|
|
while let chunk = try await read(upTo: .newline) {
|
|
line.append(chunk)
|
|
if line.last == UInt8(ascii: "\n") {
|
|
line.removeLast()
|
|
return String(decoding: line, as: UTF8.self).trimmingTrailingCarriageReturn()
|
|
}
|
|
}
|
|
guard !line.isEmpty else { return nil }
|
|
return String(decoding: line, as: UTF8.self).trimmingTrailingCarriageReturn()
|
|
}
|
|
|
|
package static var liveValue: CommandInput {
|
|
@Dependency(\.shutdownRegistry) var shutdownRegistry
|
|
do {
|
|
let input = try DispatchInput(fileDesciptor: .standardInput)
|
|
shutdownRegistry.register { await input.close() }
|
|
return Self(read: { try await input.read(upTo: $0) })
|
|
} catch {
|
|
return Self(read: { _ in throw error })
|
|
}
|
|
}
|
|
|
|
package static var testValue: CommandInput {
|
|
Self(read: unimplemented("CommandInput.read", placeholder: nil))
|
|
}
|
|
}
|
|
|
|
private extension String {
|
|
func trimmingTrailingCarriageReturn() -> String {
|
|
hasSuffix("\r") ? String(dropLast()) : self
|
|
}
|
|
}
|
|
|
|
extension DependencyValues {
|
|
package var input: CommandInput {
|
|
get { self[CommandInput.self] }
|
|
set { self[CommandInput.self] = newValue }
|
|
}
|
|
}
|