Replace continuations with natively async methods (#284)

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Upgrade OpenSSL to 1.1.1q.
+- Use natively async methods from NetworkExtension. [#284](https://github.com/passepartoutvpn/tunnelkit/pull/284)
 
 ### Fixed
 

Sources/TunnelKitManager/NetworkExtensionVPN.swift

@@ -31,7 +31,6 @@ private let log = SwiftyBeaver.self
 
 /// `VPN` based on the NetworkExtension framework.
 public class NetworkExtensionVPN: VPN {
-    private let semaphore = DispatchSemaphore(value: 1)
 
     /**
      Initializes a provider.
@@ -49,11 +48,7 @@ public class NetworkExtensionVPN: VPN {
     // MARK: Public
 
     public func prepare() async {
-        await withCheckedContinuation { (continuation: CheckedContinuation<Void, Never>) in
+        _ = try? await NETunnelProviderManager.loadAllFromPreferences()
-            NETunnelProviderManager.loadAllFromPreferences { managers, error in
-                continuation.resume()
-            }
-        }
     }
     
     public func install(
@@ -104,48 +99,30 @@ public class NetworkExtensionVPN: VPN {
     }
     
     public func disconnect() async {
-        do {
+        guard let managers = try? await lookupAll() else {
-            let managers = try await lookupAll()
-            await withCheckedContinuation { (continuation: CheckedContinuation<Void, Never>) in
-                guard !managers.isEmpty else {
-                    continuation.resume()
             return
         }
-                managers.forEach {
+        guard !managers.isEmpty else {
-                    let isLast = ($0 == managers.last)
+            return
-                    $0.connection.stopVPNTunnel()
-                    $0.isOnDemandEnabled = false
-                    $0.isEnabled = false
-                    $0.saveToPreferences { _ in
-                        if isLast {
-                            continuation.resume()
         }
-                    }
+        for m in managers {
-                }
+            m.connection.stopVPNTunnel()
-            }
+            m.isOnDemandEnabled = false
-        } catch {
+            m.isEnabled = false
+            try? await m.saveToPreferences()
         }
     }
     
     public func uninstall() async {
-        do {
+        guard let managers = try? await lookupAll() else {
-            let managers = try await lookupAll()
-            await withCheckedContinuation { (continuation: CheckedContinuation<Void, Never>) in
-                guard !managers.isEmpty else {
-                    continuation.resume()
             return
         }
-                managers.forEach {
+        guard !managers.isEmpty else {
-                    let isLast = ($0 == managers.last)
+            return
-                    $0.connection.stopVPNTunnel()
-                    $0.removeFromPreferences { _ in
-                        if isLast {
-                            continuation.resume()
         }
-                    }
+        for m in managers {
-                }
+            m.connection.stopVPNTunnel()
-            }
+            try? await m.removeFromPreferences()
-        } catch {
         }
     }
 
@@ -190,7 +167,6 @@ public class NetworkExtensionVPN: VPN {
         protocolConfiguration: NETunnelProviderProtocol,
         onDemandRules: [NEOnDemandRule]
     ) async throws -> NETunnelProviderManager {
-        try await withCheckedThrowingContinuation { continuation in
         manager.localizedDescription = title
         manager.protocolConfiguration = protocolConfiguration
 
@@ -202,57 +178,33 @@ public class NetworkExtensionVPN: VPN {
         }
 
         manager.isEnabled = true
-            manager.saveToPreferences { error in
+        do {
-                if let error = error {
+            try await manager.saveToPreferences()
+            try await manager.loadFromPreferences()
+            notifyReinstall(manager)
+            return manager
+        } catch {
             manager.isOnDemandEnabled = false
             manager.isEnabled = false
-                    continuation.resume(throwing: error)
+            notifyInstallError(error)
-                    self.notifyInstallError(error)
+            throw error
-                } else {
-                    manager.loadFromPreferences { error in
-                        if let error = error {
-                            continuation.resume(throwing: error)
-                            self.notifyInstallError(error)
-                        } else {
-                            continuation.resume(returning: manager)
-                            self.notifyReinstall(manager)
-                        }
-                    }
-                }
-            }
         }
     }
 
     private func retainManagers(_ managers: [NETunnelProviderManager], isIncluded: (NETunnelProviderManager) -> Bool) async {
-        await withCheckedContinuation { (continuation: CheckedContinuation<Void, Never>) in
         let others = managers.filter {
             !isIncluded($0)
         }
         guard !others.isEmpty else {
-                continuation.resume()
             return
         }
-            others.forEach {
+        for o in others {
-                let isLast = ($0 == others.last)
+            try? await o.removeFromPreferences()
-                $0.removeFromPreferences { _ in
-                    if isLast {
-                        continuation.resume()
-                    }
-                }
-            }
         }
     }
     
     private func lookupAll() async throws -> [NETunnelProviderManager] {
-        try await withCheckedThrowingContinuation { continuation in
+        try await NETunnelProviderManager.loadAllFromPreferences()
-            NETunnelProviderManager.loadAllFromPreferences { managers, error in
-                if let error = error {
-                    continuation.resume(throwing: error)
-                } else {
-                    continuation.resume(returning: managers ?? [])
-                }
-            }
-        }
     }
     
     // MARK: Notifications