install launch daemon as part of installer

ethanndickson · ethanndickson · commit 6a93fac210b1 · 2025-08-04T13:00:47.000+10:00
diff --git a/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift b/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift
@@ -96,12 +96,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     guard self.vpn.state != .connected, self.state.hasSession else { return }
                     await self.state.handleTokenExpiry()
                 }
-                // If the Helper is pending approval, we should check if it's
-                // been approved when the tray is opened.
-                Task { @MainActor in
-                    guard self.vpn.state == .failed(.helperError(.requiresApproval)) else { return }
-                    self.vpn.refreshHelperState()
-                }
             }, content: {
                 VPNMenu<CoderVPNService, MutagenDaemon>().frame(width: 256)
                     .environmentObject(self.vpn)
@@ -122,7 +116,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             if await !vpn.loadNetworkExtensionConfig() {
                 state.reconfigure()
             }
-            await vpn.setupHelper()
         }
     }
 
diff --git a/Coder-Desktop/Coder-Desktop/HelperService.swift b/Coder-Desktop/Coder-Desktop/HelperService.swift
diff --git a/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift b/Coder-Desktop/Coder-Desktop/VPN/VPNService.swift
@@ -36,7 +36,6 @@ enum VPNServiceError: Error, Equatable {
     case internalError(String)
     case systemExtensionError(SystemExtensionState)
     case networkExtensionError(NetworkExtensionState)
-    case helperError(HelperState)
 
     var description: String {
         switch self {
@@ -46,8 +45,6 @@ enum VPNServiceError: Error, Equatable {
             "SystemExtensionError: \(state.description)"
         case let .networkExtensionError(state):
             "NetworkExtensionError: \(state.description)"
-        case let .helperError(state):
-            "HelperError: \(state.description)"
         }
     }
 
@@ -70,13 +67,6 @@ final class CoderVPNService: NSObject, VPNService {
     @Published var sysExtnState: SystemExtensionState = .uninstalled
     @Published var neState: NetworkExtensionState = .unconfigured
     var state: VPNServiceState {
-        // The ordering here is important. The button to open the settings page
-        // where the helper is approved is a no-op if the user has a settings
-        // window on the page where the system extension is approved.
-        // So, we want to ensure the helper settings button is clicked first.
-        guard helperState == .installed else {
-            return .failed(.helperError(helperState))
-        }
         guard sysExtnState == .installed else {
             return .failed(.systemExtensionError(sysExtnState))
         }
@@ -90,8 +80,6 @@ final class CoderVPNService: NSObject, VPNService {
         return tunnelState
     }
 
-    @Published var helperState: HelperState = .uninstalled
-
     @Published var progress: VPNProgress = .init(stage: .initial, downloadProgress: nil)
 
     @Published var menuState: VPNMenuState = .init()
@@ -119,14 +107,6 @@ final class CoderVPNService: NSObject, VPNService {
             return
         }
 
-        // We have to manually fetch the helper state,
-        // and we don't want to start the VPN
-        // if the helper is not ready.
-        refreshHelperState()
-        if helperState != .installed {
-            return
-        }
-
         menuState.clear()
         await startTunnel()
         logger.debug("network extension enabled")
diff --git a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift
@@ -124,11 +124,7 @@ struct VPNMenu<VPN: VPNService, FS: FileSyncDaemon>: View {
                 // Prevent starting the VPN before the user has approved the system extension.
                 vpn.state == .failed(.systemExtensionError(.needsUserApproval)) ||
                 // Prevent starting the VPN without a VPN configuration.
-                vpn.state == .failed(.networkExtensionError(.unconfigured)) ||
-                // Prevent starting the VPN before the Helper is approved
-                vpn.state == .failed(.helperError(.requiresApproval)) ||
-                // Prevent starting the VPN before the Helper is installed
-                vpn.state == .failed(.helperError(.installing))
+                vpn.state == .failed(.networkExtensionError(.unconfigured))
         )
     }
 }
diff --git a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNState.swift b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNState.swift
@@ -34,13 +34,6 @@ struct VPNState<VPN: VPNService>: View {
                     // open the menu bar an extra time
                     state.reconfigure()
                 }
-            case (.failed(.helperError(.requiresApproval)), _):
-                ApprovalRequiredView<VPN>(
-                    message: "Awaiting Background Item approval",
-                    action: SMAppService.openSystemSettingsLoginItems
-                )
-            case (.failed(.helperError(.installing)), _):
-                HelperProgressView()
             case (.disabled, _):
                 Text("Enable Coder Connect to see workspaces")
                     .font(.body)
diff --git a/Coder-Desktop/Coder-DesktopHelper/com.coder.Coder-Desktop.Helper.plist b/Coder-Desktop/Coder-DesktopHelper/com.coder.Coder-Desktop.Helper.plist
@@ -4,8 +4,8 @@
 <dict>
 	<key>Label</key>
 	<string>com.coder.Coder-Desktop.Helper</string>
-	<key>BundleProgram</key>
-	<string>Contents/MacOS/com.coder.Coder-Desktop.Helper</string>
+	<key>Program</key>
+	<string>/Applications/Coder Desktop.app/Contents/MacOS/com.coder.Coder-Desktop.Helper</string>
 	<key>MachServices</key>
 	<dict>
 		<!-- $(TeamIdentifierPrefix) isn't populated here, so this value is hardcoded -->
diff --git a/pkgbuild/scripts/postinstall b/pkgbuild/scripts/postinstall
@@ -2,6 +2,25 @@
 
 RUNNING_MARKER_FILE="/tmp/coder_desktop_running"
 
+LAUNCH_DAEMON_PLIST_SRC="/Applications/Coder Desktop.app/Contents/Library/LaunchDaemons"
+LAUNCH_DAEMON_PLIST_DEST="/Library/LaunchDaemons"
+LAUNCH_DAEMON_NAME="com.coder.Coder-Desktop.Helper"
+LAUNCH_DAEMON_PLIST_NAME="$LAUNCH_DAEMON_NAME.plist"
+LAUNCH_DAEMON_BINARY_PATH="/Applications/Coder Desktop.app/Contents/MacOS/com.coder.Coder-Desktop.Helper"
+
+# Install daemon
+# Copy plist into system dir
+sudo cp "$LAUNCH_DAEMON_PLIST_SRC"/"$LAUNCH_DAEMON_PLIST_NAME" "$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME"
+# Set necessary permissions
+sudo chmod -R 755 "$LAUNCH_DAEMON_BINARY_PATH"
+sudo chmod 644 "$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME"
+sudo chown root:wheel "$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME"
+
+# Load daemon
+sudo launchctl enable "system/$LAUNCH_DAEMON_NAME" || true # Might already be enabled
+sudo launchctl bootstrap system "$LAUNCH_DAEMON_PLIST_DEST/$LAUNCH_DAEMON_PLIST_NAME"
+sudo launchctl kickstart -k "system/$LAUNCH_DAEMON_NAME"
+
 # Before this script, or the user, opens the app, make sure
 # Gatekeeper has ingested the notarization ticket.
 spctl -avvv "/Applications/Coder Desktop.app"
diff --git a/pkgbuild/scripts/preinstall b/pkgbuild/scripts/preinstall
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
 RUNNING_MARKER_FILE="/tmp/coder_desktop_running"
+LAUNCH_DAEMON_NAME="com.coder.Coder-Desktop.Helper"
+
+# Stop an existing launch daemon, if it exists
+sudo launchctl bootout "system/$LAUNCH_DAEMON_NAME" 2>/dev/null || true
 
 rm $RUNNING_MARKER_FILE || true
 
diff --git a/scripts/update-cask.sh b/scripts/update-cask.sh
@@ -94,6 +94,7 @@ cask "coder-desktop" do
   uninstall quit:       [
               "com.coder.Coder-Desktop",
               "com.coder.Coder-Desktop.VPN",
+              "com.coder.Coder-Desktop.Helper",
             ],
             login_item: "Coder Desktop"
 

Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`96`	`96`	`guard self.vpn.state != .connected, self.state.hasSession else { return }`
`97`	`97`	`await self.state.handleTokenExpiry()`
`98`	`98`	`}`
`99`		`- // If the Helper is pending approval, we should check if it's`
`100`		`- // been approved when the tray is opened.`
`101`		`- Task { @MainActor in`
`102`		`- guard self.vpn.state == .failed(.helperError(.requiresApproval)) else { return }`
`103`		`- self.vpn.refreshHelperState()`
`104`		`- }`
`105`	`99`	`}, content: {`
`106`	`100`	`VPNMenu<CoderVPNService, MutagenDaemon>().frame(width: 256)`
`107`	`101`	`.environmentObject(self.vpn)`
`@@ -122,7 +116,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`122`	`116`	`if await !vpn.loadNetworkExtensionConfig() {`
`123`	`117`	`state.reconfigure()`
`124`	`118`	`}`
`125`		`- await vpn.setupHelper()`
`126`	`119`	`}`
`127`	`120`	`}`
`128`	`121`
Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,7 @@ struct VPNMenu<VPN: VPNService, FS: FileSyncDaemon>: View {`
`124`	`124`	`// Prevent starting the VPN before the user has approved the system extension.`
`125`	`125`	`vpn.state == .failed(.systemExtensionError(.needsUserApproval)) \|\|`
`126`	`126`	`// Prevent starting the VPN without a VPN configuration.`
`127`		`- vpn.state == .failed(.networkExtensionError(.unconfigured)) \|\|`
`128`		`- // Prevent starting the VPN before the Helper is approved`
`129`		`- vpn.state == .failed(.helperError(.requiresApproval)) \|\|`
`130`		`- // Prevent starting the VPN before the Helper is installed`
`131`		`- vpn.state == .failed(.helperError(.installing))`
	`127`	`+ vpn.state == .failed(.networkExtensionError(.unconfigured))`
`132`	`128`	`)`
`133`	`129`	`}`
`134`	`130`	`}`