hackclub/burrow
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions 4

Update Tunnel on the main thread

Browse source 
Also updated it to use the new Swift Observable macro
This commit is contained in:
Conrad Kramer 2024-01-20 09:39:30 -08:00
parent b008762a5b
commit 436a67b352
10 changed files with 167 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Apple/App/Tunnel.swift
View file

@ -2,15 +2,16 @@ import Combine
import NetworkExtension
import SwiftUI
@MainActor
class Tunnel: ObservableObject {
@Published private(set) var status: Status = .unknown
@Published private var error: NEVPNError?
@Observable class Tunnel {
private(set) var status: Status = .unknown
private var error: NEVPNError?
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 }
}
@ -48,24 +49,31 @@ class Tunnel: ObservableObject {
self.bundleIdentifier = bundleIdentifier
self.configure = configure
listenForUpdates()
Task { await update() }
}
private func listenForUpdates() {
let center = NotificationCenter.default
let statusTask = Task {
for try await _ in NotificationCenter.default.notifications(named: .NEVPNStatusDidChange) {
for try await _ in center.notifications(named: .NEVPNStatusDidChange).map({ _ in () }) {
status = currentStatus
}
}
let configurationTask = Task {
for try await _ in NotificationCenter.default.notifications(named: .NEVPNConfigurationChange) {
for try await _ in center.notifications(named: .NEVPNConfigurationChange).map({ _ in () }) {
await update()
}
}
tasks = [statusTask, configurationTask]
}
func update() async {
private func update() async {
do {
managers = try await NETunnelProviderManager.managers
} catch let error as NEVPNError {
self.error = error
let updated = try await NETunnelProviderManager.managers
await MainActor.run { managers = updated }
} catch let vpnError as NEVPNError {
error = vpnError
} catch {
print(error)
}
@ -109,7 +117,9 @@ class Tunnel: ObservableObject {
}
deinit {
tasks.forEach { $0.cancel() }
for task in tasks {
task.cancel()
}
}
}