reconnect xpc on each request

Author: ethanndickson

Coder Desktop/Coder Desktop/VPNService.swift

@@ -73,6 +73,7 @@ final class CoderVPNService: NSObject, VPNService {
                 .unconfigured
             }
         }
+        xpc.connect()
         xpc.getPeerState()
         NotificationCenter.default.addObserver(
             self,
@@ -100,7 +101,7 @@ final class CoderVPNService: NSObject, VPNService {
         }
 
         await startTunnel()
-        // this ping is somewhat load bearing since it causes xpc to init
+        xpc.connect()
         xpc.ping()
         logger.debug("network extension enabled")
     }

Coder Desktop/Coder Desktop/XPCInterface.swift

@@ -6,11 +6,14 @@ import VPNLib
 @objc final class VPNXPCInterface: NSObject, VPNXPCClientCallbackProtocol, @unchecked Sendable {
     private var svc: CoderVPNService
     private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "VPNXPCInterface")
-    private let xpc: VPNXPCProtocol
+    private var xpc: VPNXPCProtocol? = nil
 
     init(vpn: CoderVPNService) {
         svc = vpn
+        super.init()
+    }
 
+    func connect() {
         let networkExtDict = Bundle.main.object(forInfoDictionaryKey: "NetworkExtension") as? [String: Any]
         let machServiceName = networkExtDict?["NEMachServiceName"] as? String
         let xpcConn = NSXPCConnection(machServiceName: machServiceName!)
@@ -21,32 +24,32 @@ import VPNLib
         }
         xpc = proxy
 
-        super.init()
-
         xpcConn.exportedObject = self
         xpcConn.invalidationHandler = { [logger] in
             Task { @MainActor in
                 logger.error("XPC connection invalidated.")
+                self.xpc = nil
             }
         }
         xpcConn.interruptionHandler = { [logger] in
             Task { @MainActor in
                 logger.error("XPC connection interrupted.")
+                self.xpc = nil
             }
         }
         xpcConn.resume()
     }
 
     func ping() {
-        xpc.ping {
+        xpc?.ping {
             Task { @MainActor in
                 self.logger.info("Connected to NE over XPC")
             }
         }
     }
 
     func getPeerState() {
-        xpc.getPeerState { data in
+        xpc?.getPeerState { data in
             Task { @MainActor in
                 self.svc.onExtensionPeerState(data)
             }