mirror of
https://github.com/apple/container.git
synced 2026-07-17 06:57:05 +00:00
356c8d2f88
- Closes #461. - Extract core types into ContainerResources target. - Extract ContainerNetworkServiceClient from ContainerNetworkService. - Relocate sandbox client from ContainerClient to ContainerSandboxServiceClient. - Relocate ContainerClient to ContainerAPIServiceClient. - Common structure from services and clients under Source/Services. Updated project hierarchy: ``` Sources/CAuditToken - audit token access wrapper Sources/CLI - CLI executable Sources/ContainerBuild - builder Sources/ContainerCommands - CLI command implementations Sources/ContainerLog - logging helpers Sources/ContainerPersistence - persistent data and system property helpers Sources/ContainerPlugin - plugin system Sources/ContainerResource - resource (container, image, volume, network) types Sources/ContainerVersion - version helpers Sources/ContainerXPC - XPC helpers Sources/CVersion - injected project version Sources/DNSServer - container DNS resolver Sources/Helpers - service executables Sources/Services/*/Client - service clients Sources/Services/*/Server - service implementations Sources/SocketForwarder - port forwarding Sources/TerminalProgress - progress bar ``` ## Type of Change - [ ] Bug fix - [ ] New feature - [x] Breaking change - [ ] Documentation update ## Motivation and Context The ContainerClient library was a bit of a grab bag. This refactor applies a more sensible project and library structure for resource data types, services, and clients. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
80 lines
3.1 KiB
Swift
80 lines
3.1 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import AsyncHTTPClient
|
|
import ContainerizationError
|
|
import ContainerizationExtras
|
|
import Foundation
|
|
import TerminalProgress
|
|
|
|
public struct FileDownloader {
|
|
public static func downloadFile(url: URL, to destination: URL, progressUpdate: ProgressUpdateHandler? = nil) async throws {
|
|
let request = try HTTPClient.Request(url: url)
|
|
|
|
let delegate = try FileDownloadDelegate(
|
|
path: destination.path(),
|
|
reportHead: {
|
|
let expectedSizeString = $0.headers["Content-Length"].first ?? ""
|
|
if let expectedSize = Int64(expectedSizeString) {
|
|
if let progressUpdate {
|
|
Task {
|
|
await progressUpdate([
|
|
.addTotalSize(expectedSize)
|
|
])
|
|
}
|
|
}
|
|
}
|
|
},
|
|
reportProgress: {
|
|
let receivedBytes = Int64($0.receivedBytes)
|
|
if let progressUpdate {
|
|
Task {
|
|
await progressUpdate([
|
|
.setSize(receivedBytes)
|
|
])
|
|
}
|
|
}
|
|
})
|
|
|
|
let client = FileDownloader.createClient(url: url)
|
|
do {
|
|
_ = try await client.execute(request: request, delegate: delegate).get()
|
|
} catch {
|
|
try? await client.shutdown()
|
|
throw error
|
|
}
|
|
try await client.shutdown()
|
|
}
|
|
|
|
private static func createClient(url: URL) -> HTTPClient {
|
|
var httpConfiguration = HTTPClient.Configuration()
|
|
// for large file downloads we keep a generous connect timeout, and
|
|
// no read timeout since download durations can vary
|
|
httpConfiguration.timeout = HTTPClient.Configuration.Timeout(
|
|
connect: .seconds(30),
|
|
read: .none
|
|
)
|
|
if let host = url.host {
|
|
let proxyURL = ProxyUtils.proxyFromEnvironment(scheme: url.scheme, host: host)
|
|
if let proxyURL, let proxyHost = proxyURL.host {
|
|
httpConfiguration.proxy = HTTPClient.Configuration.Proxy.server(host: proxyHost, port: proxyURL.port ?? 8080)
|
|
}
|
|
}
|
|
|
|
return HTTPClient(eventLoopGroupProvider: .singleton, configuration: httpConfiguration)
|
|
}
|
|
}
|