review

Author: ethanndickson

Coder Desktop/Coder Desktop/Views/VPNMenu.swift

@@ -92,8 +92,9 @@ struct VPNMenu<VPN: VPNService, S: Session>: View {
 }
 
 func openSystemExtensionSettings() {
-    // TODO: Check this still works in a new macOS version
+    // Sourced from:
     // https://gist.github.com/rmcdongit/f66ff91e0dad78d4d6346a75ded4b751?permalink_comment_id=5261757
+    // We'll need to ensure this continues to work in future macOS versions
     // swiftlint:disable:next line_length
     NSWorkspace.shared.open(URL(string: "x-apple.systempreferences:com.apple.ExtensionsPreferences?extensionPointIdentifier=com.apple.system_extension.network_extension.extension-point")!)
 }

Coder Desktop/VPN/Manager.swift

@@ -91,11 +91,7 @@ actor Manager {
             logger.error("tunnel read loop failed: \(error.localizedDescription, privacy: .public)")
             try await tunnelHandle.close()
             ptp.cancelTunnelWithError(
-                NSError(
-                    domain: "\(Bundle.main.bundleIdentifier!).Manager",
-                    code: -1,
-                    userInfo: [NSLocalizedDescriptionKey: "Tunnel read loop failed: \(error.localizedDescription)"]
-                )
+                makeNSError(suffix: "Manager", desc: "Tunnel read loop failed: \(error.localizedDescription)")
             )
             return
         }

Coder Desktop/VPN/PacketTunnelProvider.swift

@@ -43,45 +43,26 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
         return nil
     }
 
-    // swiftlint:disable:next function_body_length
     override func startTunnel(
         options _: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void
     ) {
         logger.info("startTunnel called")
         guard manager == nil else {
             logger.error("startTunnel called with non-nil Manager")
-            completionHandler(
-                NSError(
-                    domain: "\(Bundle.main.bundleIdentifier!).PTP",
-                    code: -1,
-                    userInfo: [NSLocalizedDescriptionKey: "Already running"]
-                )
-            )
+            completionHandler(makeNSError(suffix: "PTP", desc: "Already running"))
             return
         }
         guard let proto = protocolConfiguration as? NETunnelProviderProtocol,
               let baseAccessURL = proto.serverAddress
         else {
             logger.error("startTunnel called with nil protocolConfiguration")
-            completionHandler(
-                NSError(
-                    domain: "\(Bundle.main.bundleIdentifier!).PTP",
-                    code: -1,
-                    userInfo: [NSLocalizedDescriptionKey: "Missing Configuration"]
-                )
-            )
+            completionHandler(makeNSError(suffix: "PTP", desc: "Missing Configuration"))
             return
         }
         // HACK: We can't write to the system keychain, and the NE can't read the user keychain.
         guard let token = proto.providerConfiguration?["token"] as? String else {
             logger.error("startTunnel called with nil token")
-            completionHandler(
-                NSError(
-                    domain: "\(Bundle.main.bundleIdentifier!).PTP",
-                    code: -1,
-                    userInfo: [NSLocalizedDescriptionKey: "Missing Token"]
-                )
-            )
+            completionHandler(makeNSError(suffix: "PTP", desc: "Missing Token"))
             return
         }
         logger.debug("retrieved token & access URL")
@@ -104,11 +85,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
             } catch {
                 logger.error("error starting manager: \(error.description, privacy: .public)")
                 completionHandler(
-                    NSError(
-                        domain: "\(Bundle.main.bundleIdentifier!).Manager",
-                        code: -1,
-                        userInfo: [NSLocalizedDescriptionKey: error.description]
-                    )
+                    makeNSError(suffix: "Manager", desc: error.description)
                 )
             }
         }

Coder Desktop/VPNLib/Util.swift

@@ -21,3 +21,11 @@ public struct CompletionWrapper<T>: @unchecked Sendable {
         block()
     }
 }
+
+public func makeNSError(suffix: String, code: Int = -1, desc: String) -> NSError {
+    NSError(
+        domain: "\(Bundle.main.bundleIdentifier!).\(suffix)",
+        code: code,
+        userInfo: [NSLocalizedDescriptionKey: desc]
+    )
+}