fmt

coadler · coadler · commit 38a9388a4f65 · 2025-01-22T18:29:53.000-06:00
diff --git a/Coder Desktop/Coder Desktop/VPNService.swift b/Coder Desktop/Coder Desktop/VPNService.swift
@@ -1,6 +1,6 @@
 import NetworkExtension
-import SwiftUI
 import os
+import SwiftUI
 import VPNXPC
 
 @MainActor
@@ -84,7 +84,7 @@ final class CoderVPNService: NSObject, VPNService {
             await enableNetworkExtension()
             logger.debug("network extension enabled")
             if let proxy = xpcConn.remoteObjectProxy as? VPNXPCProtocol {
-                proxy.start() { result in
+                proxy.start { _ in
                     self.tunnelState = .connected
                 }
             }
@@ -103,9 +103,8 @@ final class CoderVPNService: NSObject, VPNService {
         }
         stopTask = Task {
             tunnelState = .disconnecting
-            
             if let proxy = xpcConn.remoteObjectProxy as? VPNXPCProtocol {
-                proxy.stop() { result in }
+                proxy.stop { _ in }
             }
             await disableNetworkExtension()
             logger.info("network extension stopped")
diff --git a/Coder Desktop/VPN/VpnXPCInterface.swift b/Coder Desktop/VPN/VpnXPCInterface.swift
@@ -25,7 +25,7 @@ final class CallbackWrapper: @unchecked Sendable {
         manager = newManager
         managerLock.unlock()
     }
-    
+
     func getManager() -> Manager? {
         managerLock.lock()
         let m = manager
@@ -37,15 +37,15 @@ final class CallbackWrapper: @unchecked Sendable {
         // 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"
+                NSLocalizedDescriptionKey: "Manager not set",
             ]))
             return
         }
-        
+
         // We must call the async actor method from a Task.
         Task {
             do {
@@ -69,11 +69,11 @@ final class CallbackWrapper: @unchecked Sendable {
         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"
+                NSLocalizedDescriptionKey: "Manager not set",
             ]))
             return
         }
-        
+
         Task {
             do {
                 try await manager.stopVPN()
diff --git a/Coder Desktop/VPN/main.swift b/Coder Desktop/VPN/main.swift
@@ -5,7 +5,7 @@ import VPNXPC
 final class XPCListenerDelegate: NSObject, NSXPCListenerDelegate, Sendable {
     let vpnXPCInterface = VPNXPCInterface()
 
-    func listener(_ listener: NSXPCListener, shouldAcceptNewConnection newConnection: NSXPCConnection) -> Bool {
+    func listener(_: NSXPCListener, shouldAcceptNewConnection newConnection: NSXPCConnection) -> Bool {
         newConnection.exportedInterface = NSXPCInterface(with: VPNXPCProtocol.self)
         newConnection.exportedObject = vpnXPCInterface
 
@@ -14,7 +14,7 @@ final class XPCListenerDelegate: NSObject, NSXPCListenerDelegate, Sendable {
     }
 }
 
-internal let GlobalXPCListenerDelegate = XPCListenerDelegate()
+let GlobalXPCListenerDelegate = XPCListenerDelegate()
 let xpcListener = NSXPCListener(machServiceName: "com.coder.Coder-Desktop.VPNXPC")
 xpcListener.delegate = GlobalXPCListenerDelegate
 xpcListener.resume()
diff --git a/Coder Desktop/VPNXPC/VPNXPCProtocol.swift b/Coder Desktop/VPNXPC/VPNXPCProtocol.swift
@@ -24,4 +24,4 @@ import Foundation
  And, when you are finished with the service, clean up the connection like this:
 
      connectionToService.invalidate()
-*/
+ */

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import VPNXPC`
`5`	`5`	`final class XPCListenerDelegate: NSObject, NSXPCListenerDelegate, Sendable {`
`6`	`6`	`let vpnXPCInterface = VPNXPCInterface()`
`7`	`7`
`8`		`- func listener(_ listener: NSXPCListener, shouldAcceptNewConnection newConnection: NSXPCConnection) -> Bool {`
	`8`	`+ func listener(_: NSXPCListener, shouldAcceptNewConnection newConnection: NSXPCConnection) -> Bool {`
`9`	`9`	`newConnection.exportedInterface = NSXPCInterface(with: VPNXPCProtocol.self)`
`10`	`10`	`newConnection.exportedObject = vpnXPCInterface`
`11`	`11`
`@@ -14,7 +14,7 @@ final class XPCListenerDelegate: NSObject, NSXPCListenerDelegate, Sendable {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-internal let GlobalXPCListenerDelegate = XPCListenerDelegate()`
	`17`	`+let GlobalXPCListenerDelegate = XPCListenerDelegate()`
`18`	`18`	`let xpcListener = NSXPCListener(machServiceName: "com.coder.Coder-Desktop.VPNXPC")`
`19`	`19`	`xpcListener.delegate = GlobalXPCListenerDelegate`
`20`	`20`	`xpcListener.resume()`