Files
container/Sources/Services/ContainerNetworkService/Client/NetworkClient.swift
T
J Logan 356c8d2f88 Reorganize client libraries. (#1020)
- 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
2026-01-06 08:27:14 -08:00

135 lines
4.7 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 ContainerResource
import ContainerXPC
import ContainerizationError
import Foundation
/// A client for interacting with a single network.
public struct NetworkClient: Sendable {
// FIXME: need more flexibility than a hard-coded constant?
static let label = "com.apple.container.network.container-network-vmnet"
private var machServiceLabel: String {
"\(Self.label).\(id)"
}
let id: String
/// Create a client for a network.
public init(id: String) {
self.id = id
}
}
// Runtime Methods
extension NetworkClient {
public func state() async throws -> NetworkState {
let request = XPCMessage(route: NetworkRoutes.state.rawValue)
let client = createClient()
let response = try await client.send(request)
let state = try response.state()
return state
}
public func allocate(hostname: String, macAddress: String? = nil) async throws -> (attachment: Attachment, additionalData: XPCMessage?) {
let request = XPCMessage(route: NetworkRoutes.allocate.rawValue)
request.set(key: NetworkKeys.hostname.rawValue, value: hostname)
if let macAddress = macAddress {
request.set(key: NetworkKeys.macAddress.rawValue, value: macAddress)
}
let client = createClient()
let response = try await client.send(request)
let attachment = try response.attachment()
let additionalData = response.additionalData()
return (attachment, additionalData)
}
public func deallocate(hostname: String) async throws {
let request = XPCMessage(route: NetworkRoutes.deallocate.rawValue)
request.set(key: NetworkKeys.hostname.rawValue, value: hostname)
let client = createClient()
try await client.send(request)
}
public func lookup(hostname: String) async throws -> Attachment? {
let request = XPCMessage(route: NetworkRoutes.lookup.rawValue)
request.set(key: NetworkKeys.hostname.rawValue, value: hostname)
let client = createClient()
let response = try await client.send(request)
return try response.dataNoCopy(key: NetworkKeys.attachment.rawValue).map {
try JSONDecoder().decode(Attachment.self, from: $0)
}
}
public func disableAllocator() async throws -> Bool {
let request = XPCMessage(route: NetworkRoutes.disableAllocator.rawValue)
let client = createClient()
let response = try await client.send(request)
return try response.allocatorDisabled()
}
private func createClient() -> XPCClient {
XPCClient(service: machServiceLabel)
}
}
extension XPCMessage {
public func additionalData() -> XPCMessage? {
guard let additionalData = xpc_dictionary_get_dictionary(self.underlying, NetworkKeys.additionalData.rawValue) else {
return nil
}
return XPCMessage(object: additionalData)
}
public func allocatorDisabled() throws -> Bool {
self.bool(key: NetworkKeys.allocatorDisabled.rawValue)
}
public func attachment() throws -> Attachment {
let data = self.dataNoCopy(key: NetworkKeys.attachment.rawValue)
guard let data else {
throw ContainerizationError(.invalidArgument, message: "no network attachment snapshot data in message")
}
return try JSONDecoder().decode(Attachment.self, from: data)
}
public func hostname() throws -> String {
let hostname = self.string(key: NetworkKeys.hostname.rawValue)
guard let hostname else {
throw ContainerizationError(.invalidArgument, message: "no hostname data in message")
}
return hostname
}
public func state() throws -> NetworkState {
let data = self.dataNoCopy(key: NetworkKeys.state.rawValue)
guard let data else {
throw ContainerizationError(.invalidArgument, message: "no network snapshot data in message")
}
return try JSONDecoder().decode(NetworkState.self, from: data)
}
}