cleanup

Author: ethanndickson

Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift

@@ -92,8 +92,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             image: "MenuBarIcon",
             onAppear: {
                 // If the VPN is enabled, it's likely the token isn't expired
+                guard self.vpn.state != .connected, self.state.hasSession else { return }
                 Task { @MainActor in
-                    guard self.vpn.state != .connected, self.state.hasSession else { return }
                     await self.state.handleTokenExpiry()
                 }
             }, content: {

Coder-Desktop/Coder-Desktop/Preview Content/PreviewVPN.swift

@@ -81,7 +81,5 @@ final class PreviewVPN: Coder_Desktop.VPNService {
         state = .connecting
     }
 
-    func updateHelperState() {}
-
     var startWhenReady: Bool = false
 }

Coder-Desktop/Coder-Desktop/Views/VPN/VPNState.swift

@@ -1,4 +1,3 @@
-import ServiceManagement
 import SwiftUI
 
 struct VPNState<VPN: VPNService>: View {
@@ -11,7 +10,7 @@ struct VPNState<VPN: VPNService>: View {
         Group {
             switch (vpn.state, state.hasSession) {
             case (.failed(.systemExtensionError(.needsUserApproval)), _):
-                ApprovalRequiredView<VPN>(
+                ApprovalRequiredView(
                     message: "Awaiting System Extension approval",
                     action: openSystemExtensionSettings
                 )
@@ -57,24 +56,7 @@ struct VPNState<VPN: VPNService>: View {
     }
 }
 
-struct HelperProgressView: View {
-    var body: some View {
-        HStack {
-            Spacer()
-            VStack {
-                CircularProgressView(value: nil)
-                Text("Installing Helper...")
-                    .multilineTextAlignment(.center)
-            }
-            .padding()
-            .foregroundStyle(.secondary)
-            Spacer()
-        }
-    }
-}
-
-struct ApprovalRequiredView<VPN: VPNService>: View {
-    @EnvironmentObject var vpn: VPN
+struct ApprovalRequiredView: View {
     let message: String
     let action: () -> Void
 

Coder-Desktop/project.yml

@@ -216,6 +216,25 @@ targets:
     buildToolPlugins:
       - plugin: SwiftLintBuildToolPlugin
         package: SwiftLintPlugins
+    postBuildScripts:
+      # This is a dependency of the app, not the helper, as it copies the
+      # helper plist from the app bundle to the system store.
+      - name: "Upsert Helper for Local Development"
+        # Only run this script (and prompt for admin) when the helper or any of
+        # it's frameworks have changed.
+        inputFiles:
+          - "$(BUILT_PRODUCTS_DIR)/com.coder.Coder-Desktop.Helper"
+          - "$(BUILT_PRODUCTS_DIR)/CoderSDK.framework/Versions/A/CoderSDK"
+          - "$(BUILT_PRODUCTS_DIR)/VPNLib.framework/Versions/A/VPNLib"
+        outputFiles:
+          - "$(DERIVED_FILE_DIR)/upsert-helper.stamp"
+        script: |
+          /usr/bin/osascript <<'APPLESCRIPT'
+          do shell script "/bin/bash -c " & quoted form of ((system attribute "SRCROOT") & "/../scripts/upsert-dev-helper.sh") with administrator privileges
+          APPLESCRIPT
+          /usr/bin/touch "${DERIVED_FILE_DIR}/upsert-helper.stamp"
+        basedOnDependencyAnalysis: true
+        runOnlyWhenInstalling: false
 
   Coder-DesktopTests:
     type: bundle.unit-test
@@ -376,4 +395,4 @@ targets:
         PRODUCT_BUNDLE_IDENTIFIER: "com.coder.Coder-Desktop.Helper"
         PRODUCT_MODULE_NAME: "$(PRODUCT_NAME:c99extidentifier)"
         PRODUCT_NAME: "$(PRODUCT_BUNDLE_IDENTIFIER)"
-        SKIP_INSTALL: YES
+        SKIP_INSTALL: YES

scripts/update-cask.sh

@@ -93,8 +93,8 @@ cask "coder-desktop" do
 
   uninstall quit:       [
               "com.coder.Coder-Desktop",
-              "com.coder.Coder-Desktop.VPN",
               "com.coder.Coder-Desktop.Helper",
+              "com.coder.Coder-Desktop.VPN",
             ],
             login_item: "Coder Desktop"
 

scripts/upsert-dev-helper.sh

@@ -0,0 +1,30 @@
+# This script operates like postinstall + preinstall, but for local development
+# builds, where the helper is necessary. Instead of looking for
+# /Applications/Coder Desktop.app, it looks for
+# /Applications/Coder/Coder Desktop.app, which is where the local build is
+# installed.
+
+set -euox pipefail
+
+LAUNCH_DAEMON_PLIST_SRC="/Applications/Coder/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/Coder Desktop.app/Contents/MacOS/com.coder.Coder-Desktop.Helper"
+
+# Stop an existing launch daemon, if it exists
+sudo launchctl bootout "system/$LAUNCH_DAEMON_NAME" 2>/dev/null || true
+
+# Install daemon
+# Copy plist into system dir, with the path corrected to the local build
+sed 's|/Applications/Coder Desktop\.app|/Applications/Coder/Coder Desktop.app|g' "$LAUNCH_DAEMON_PLIST_SRC"/"$LAUNCH_DAEMON_PLIST_NAME" | sudo tee "$LAUNCH_DAEMON_PLIST_DEST"/"$LAUNCH_DAEMON_PLIST_NAME" >/dev/null
+# 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"
+