fixes

Author: coadler

Coder Desktop/Coder Desktop/VPNService.swift

@@ -139,6 +139,7 @@ final class CoderVPNService: NSObject, VPNService, @preconcurrency VPNXPCClientC
 
     func onPeerUpdate(_ data: Data) {
         // TODO: handle peer update
+        logger.info("network extension peer update")
         do {
             let msg = try Vpn_TunnelMessage(serializedBytes: data)
             debugPrint(msg)
@@ -157,5 +158,7 @@ final class CoderVPNService: NSObject, VPNService, @preconcurrency VPNXPCClientC
         tunnelState = .disabled
     }
 
-    func onError(_: NSError) {}
+    func onError(_ error: NSError) {
+        logger.info("network extension reported error: \(error)")
+    }
 }

Coder Desktop/VPN/PacketTunnelProvider.swift

@@ -54,14 +54,17 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
         Task {
             // TODO: Retrieve access URL & Token via Keychain
             do throws(ManagerError) {
+                logger.debug("creating manager")
                 manager = try await Manager(
                     with: self,
                     cfg: .init(
                         apiToken: "fake-token", serverUrl: .init(string: "https://dev.coder.com")!
                     )
                 )
                 globalXPCListenerDelegate.vpnXPCInterface.setManager(manager)
-                try await manager?.startVPN()
+                logger.debug("calling manager.startVPN")
+                try await manager!.startVPN()
+                logger.debug("vpn started")
                 completionHandler.callAsFunction(nil)
             } catch {
                 completionHandler.callAsFunction(error as NSError)

Coder Desktop/VPN/VpnXPCInterface.swift

@@ -21,69 +21,7 @@ import VPNXPC
         return m
     }
 
-    func start(with reply: @escaping (NSError?) -> Void) {
-        // Convert Obj-C block to a Swift @Sendable closure.
-        let safeReply = CallbackWrapper(reply)
-        let manager = getManager()
-
-        guard let manager = manager else {
-            // If somehow `start(...)` is called but no Manager is set
-            reply(NSError(domain: "VPNXPC", code: 1, userInfo: [
-                NSLocalizedDescriptionKey: "Manager not set",
-            ]))
-            return
-        }
-
-        // We must call the async actor method from a Task.
-        Task {
-            do {
-                try await manager.startVPN()
-                await MainActor.run {
-                    safeReply.callAsFunction(nil)
-                }
-            } catch {
-                await MainActor.run {
-                    safeReply.callAsFunction(error as NSError)
-                }
-            }
-        }
+    func getPeerInfo(with reply: @escaping () -> Void) {
+        reply()
     }
-
-    func stop(with reply: @escaping (NSError?) -> Void) {
-        // Convert Obj-C block to a Swift @Sendable closure.
-        let safeReply = CallbackWrapper(reply)
-        let manager = getManager()
-
-        guard let manager = manager else {
-            // If somehow `start(...)` is called but no Manager is set
-            reply(NSError(domain: "VPNXPC", code: 1, userInfo: [
-                NSLocalizedDescriptionKey: "Manager not set",
-            ]))
-            return
-        }
-
-        Task {
-            do {
-                try await manager.stopVPN()
-                await MainActor.run {
-                    safeReply.callAsFunction(nil)
-                }
-            } catch {
-                await MainActor.run {
-                    safeReply.callAsFunction(error as NSError)
-                }
-            }
-        }
-    }
-
-//    func getPeerInfo(with reply: @escaping (Bool, String?) -> Void) {
-//        Task {
-//            do {
-//                try await manager.getPeerInfo()
-//                reply(true, nil)
-//            } catch {
-//                reply(false, "\(error)")
-//            }
-//        }
-//    }
 }

Coder Desktop/VPN/main.swift

@@ -34,10 +34,10 @@ final class XPCListenerDelegate: NSObject, NSXPCListenerDelegate, @unchecked Sen
 }
 
 guard
-  let netExt = Bundle.main.object(forInfoDictionaryKey: "NetworkExtension") as? [String: Any],
-  let serviceName = netExt["NEMachServiceName"] as? String
+    let netExt = Bundle.main.object(forInfoDictionaryKey: "NetworkExtension") as? [String: Any],
+    let serviceName = netExt["NEMachServiceName"] as? String
 else {
-  fatalError("Missing NEMachServiceName in Info.plist")
+    fatalError("Missing NEMachServiceName in Info.plist")
 }
 
 print(serviceName)

Coder Desktop/VPNXPC/Protocol.swift

@@ -2,8 +2,7 @@ import Foundation
 
 @preconcurrency
 @objc public protocol VPNXPCProtocol {
-    func start(with reply: @escaping (NSError?) -> Void)
-    func stop(with reply: @escaping (NSError?) -> Void)
+    func getPeerInfo(with reply: @escaping () -> Void)
 }
 
 @preconcurrency