Introduce initial UI for connecting to networks
This commit is contained in:
parent
a757ac7be9
commit
453dd2d116
33 changed files with 1458 additions and 321 deletions
|
|
@ -1,146 +1,50 @@
|
|||
import BurrowShared
|
||||
import NetworkExtension
|
||||
import SwiftUI
|
||||
|
||||
protocol Tunnel {
|
||||
var status: TunnelStatus { get }
|
||||
|
||||
func start()
|
||||
func stop()
|
||||
func enable()
|
||||
}
|
||||
|
||||
enum TunnelStatus: Equatable, Hashable {
|
||||
case unknown
|
||||
case permissionRequired
|
||||
case disabled
|
||||
case connecting
|
||||
case connected(Date)
|
||||
case disconnecting
|
||||
case disconnected
|
||||
case reasserting
|
||||
case invalid
|
||||
case configurationReadWriteFailed
|
||||
}
|
||||
|
||||
struct TunnelKey: EnvironmentKey {
|
||||
static let defaultValue: any Tunnel = NetworkExtensionTunnel()
|
||||
}
|
||||
|
||||
extension EnvironmentValues {
|
||||
var tunnel: any Tunnel {
|
||||
get { self[TunnelKey.self] }
|
||||
set { self[TunnelKey.self] = newValue }
|
||||
}
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
@Observable
|
||||
class Tunnel {
|
||||
private(set) var status: Status = .unknown
|
||||
private var error: NEVPNError?
|
||||
class PreviewTunnel: Tunnel {
|
||||
var status: TunnelStatus = .permissionRequired
|
||||
|
||||
private let logger = Logger.logger(for: Tunnel.self)
|
||||
private let bundleIdentifier: String
|
||||
private let configure: (NETunnelProviderManager, NETunnelProviderProtocol) -> Void
|
||||
private var tasks: [Task<Void, Error>] = []
|
||||
|
||||
// Each manager corresponds to one entry in the Settings app.
|
||||
// Our goal is to maintain a single manager, so we create one if none exist and delete extra if there are any.
|
||||
private var managers: [NEVPNManager]? {
|
||||
didSet { status = currentStatus }
|
||||
func start() {
|
||||
status = .connected(.now)
|
||||
}
|
||||
|
||||
private var currentStatus: Status {
|
||||
guard let managers = managers else {
|
||||
guard let error = error else {
|
||||
return .unknown
|
||||
}
|
||||
|
||||
switch error.code {
|
||||
case .configurationReadWriteFailed:
|
||||
return .configurationReadWriteFailed
|
||||
default:
|
||||
return .unknown
|
||||
}
|
||||
}
|
||||
|
||||
guard let manager = managers.first else {
|
||||
return .permissionRequired
|
||||
}
|
||||
|
||||
guard manager.isEnabled else {
|
||||
return .disabled
|
||||
}
|
||||
|
||||
return manager.connection.tunnelStatus
|
||||
}
|
||||
|
||||
convenience init(configure: @escaping (NETunnelProviderManager, NETunnelProviderProtocol) -> Void) {
|
||||
self.init("com.hackclub.burrow.network", configure: configure)
|
||||
}
|
||||
|
||||
init(_ bundleIdentifier: String, configure: @escaping (NETunnelProviderManager, NETunnelProviderProtocol) -> Void) {
|
||||
self.bundleIdentifier = bundleIdentifier
|
||||
self.configure = configure
|
||||
|
||||
let center = NotificationCenter.default
|
||||
let configurationChanged = Task {
|
||||
for try await _ in center.notifications(named: .NEVPNConfigurationChange).map({ _ in () }) {
|
||||
await update()
|
||||
}
|
||||
}
|
||||
let statusChanged = Task {
|
||||
for try await _ in center.notifications(named: .NEVPNStatusDidChange).map({ _ in () }) {
|
||||
await MainActor.run {
|
||||
status = currentStatus
|
||||
}
|
||||
}
|
||||
}
|
||||
tasks = [configurationChanged, statusChanged]
|
||||
|
||||
Task { await update() }
|
||||
}
|
||||
|
||||
private func update() async {
|
||||
do {
|
||||
let updated = try await NETunnelProviderManager.managers
|
||||
await MainActor.run {
|
||||
managers = updated
|
||||
}
|
||||
} catch let vpnError as NEVPNError {
|
||||
error = vpnError
|
||||
} catch {
|
||||
logger.error("Failed to update VPN configurations: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func configure() async throws {
|
||||
if managers == nil {
|
||||
await update()
|
||||
}
|
||||
|
||||
guard let managers = managers else { return }
|
||||
|
||||
if managers.count > 1 {
|
||||
try await withThrowingTaskGroup(of: Void.self, returning: Void.self) { group in
|
||||
for manager in managers.suffix(from: 1) {
|
||||
group.addTask { try await manager.remove() }
|
||||
}
|
||||
try await group.waitForAll()
|
||||
}
|
||||
}
|
||||
|
||||
if managers.isEmpty {
|
||||
let manager = NETunnelProviderManager()
|
||||
let proto = NETunnelProviderProtocol()
|
||||
proto.providerBundleIdentifier = bundleIdentifier
|
||||
configure(manager, proto)
|
||||
|
||||
manager.protocolConfiguration = proto
|
||||
try await manager.save()
|
||||
}
|
||||
}
|
||||
|
||||
func start() throws {
|
||||
guard let manager = managers?.first else { return }
|
||||
try manager.connection.startVPNTunnel()
|
||||
}
|
||||
|
||||
func stop() {
|
||||
guard let manager = managers?.first else { return }
|
||||
manager.connection.stopVPNTunnel()
|
||||
status = .disconnected
|
||||
}
|
||||
|
||||
deinit {
|
||||
tasks.forEach { $0.cancel() }
|
||||
}
|
||||
}
|
||||
|
||||
extension NEVPNConnection {
|
||||
var tunnelStatus: Tunnel.Status {
|
||||
switch status {
|
||||
case .connected:
|
||||
.connected(connectedDate!)
|
||||
case .connecting:
|
||||
.connecting
|
||||
case .disconnecting:
|
||||
.disconnecting
|
||||
case .disconnected:
|
||||
.disconnected
|
||||
case .reasserting:
|
||||
.reasserting
|
||||
case .invalid:
|
||||
.invalid
|
||||
@unknown default:
|
||||
.unknown
|
||||
}
|
||||
func enable() {
|
||||
status = .disconnected
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue