chore: bump nixpkgs and apply new swiftformat/swiftlint/zizmor rules

Author: ethanndickson

.github/dependabot.yaml

@@ -6,6 +6,8 @@ updates:
       interval: "weekly"
       time: "06:00"
       timezone: "America/Chicago"
+    cooldown:
+      default-days: 7
     labels: []
     commit-message:
       prefix: "ci"

.github/zizmor.yml

@@ -0,0 +1,5 @@
+rules:
+  # `uses: $/...` isn't understood by actionlint yet, so keep using `./...`
+  # until https://github.com/rhysd/actionlint/issues/711 is resolved.
+  self-repository:
+    disable: true

Coder-Desktop/.swiftformat

@@ -1,4 +1,4 @@
 --selfrequired log,info,error,debug,critical,fault
 --exclude **.pb.swift,**.grpc.swift
 --condassignment always
---disable unusedArguments
+--disable unusedArguments,wrapPropertyBodies

Coder-Desktop/Coder-Desktop/About.swift

@@ -1,7 +1,7 @@
 import SwiftUI
 
 enum About {
-    public static let repo: String = "https://github.com/coder/coder-desktop-macos"
+    static let repo: String = "https://github.com/coder/coder-desktop-macos"
     private static var credits: NSAttributedString {
         let coder = NSMutableAttributedString(
             string: "Coder.com",

Coder-Desktop/Coder-Desktop/AppHelperXPCClient.swift

@@ -3,7 +3,7 @@ import NetworkExtension
 import os
 import VPNLib
 
-// This is the client for the app to communicate with the privileged helper.
+/// This is the client for the app to communicate with the privileged helper.
 @objc final class HelperXPCClient: NSObject, @unchecked Sendable {
     private var svc: CoderVPNService
     private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "HelperXPCClient")
@@ -43,7 +43,7 @@ import VPNLib
         return connection
     }
 
-    // Establishes a connection to the Helper, so it can send messages back.
+    /// Establishes a connection to the Helper, so it can send messages back.
     func ping() async throws {
         let conn = connect()
         return try await withCheckedThrowingContinuation { continuation in
@@ -83,7 +83,7 @@ import VPNLib
     }
 }
 
-// These methods are called by the Helper over XPC
+/// These methods are called by the Helper over XPC
 extension HelperXPCClient: AppXPCInterface {
     func onPeerUpdate(_ diff: Data, reply: @escaping () -> Void) {
         let reply = CompletionWrapper(reply)

Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift

@@ -141,8 +141,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         NotificationCenter.default.removeObserver(self)
     }
 
-    // This function MUST eventually call `NSApp.reply(toApplicationShouldTerminate: true)`
-    // or return `.terminateNow`
+    /// This function MUST eventually call `NSApp.reply(toApplicationShouldTerminate: true)`
+    /// or return `.terminateNow`
     func applicationShouldTerminate(_: NSApplication) -> NSApplication.TerminateReply {
         Task {
             async let vpnTask: Void = {
@@ -214,15 +214,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         alert.addButton(withTitle: "OK")
         let response = alert.runModal()
         state.skipHiddenIconAlert = suppressCheckbox.state == .on
-        if #available(macOS 26, *), response == .alertFirstButtonReturn {
-            // We'll need to ensure this continues to work in future macOS versions
-            if !NSWorkspace.shared.open(
-                URL(string: "x-apple.systempreferences:com.apple.ControlCenter-Settings.extension?MenuBar")!
-            ) {
-                NSWorkspace.shared.open(
-                    URL(string: "x-apple.systempreferences:com.apple.ControlCenter-Settings.extension")!
-                )
-            }
+        if #available(macOS 26, *), response == .alertFirstButtonReturn,
+           // We'll need to ensure this continues to work in future macOS versions
+           !NSWorkspace.shared.open(
+               URL(string: "x-apple.systempreferences:com.apple.ControlCenter-Settings.extension?MenuBar")!
+           )
+        {
+            NSWorkspace.shared.open(
+                URL(string: "x-apple.systempreferences:com.apple.ControlCenter-Settings.extension")!
+            )
         }
     }
 }

Coder-Desktop/Coder-Desktop/MenuBarController.swift

@@ -34,15 +34,19 @@ class MenuBarController {
     }
 
     func startAnimation() {
-        if animationTask != nil { return }
+        if animationTask != nil {
+            return
+        }
         animationTask = Task {
             defer { animationTask = nil }
             let totalFrames = 60
             let cycleDurationMs: UInt64 = 2000
             let frameDurationMs = cycleDurationMs / UInt64(totalFrames - 1)
             repeat {
                 for frame in 0 ..< totalFrames {
-                    if Task.isCancelled { break }
+                    if Task.isCancelled {
+                        break
+                    }
                     let progress = Double(frame) / Double(totalFrames - 1)
                     let alpha = 0.3 + 0.7 * (0.5 - 0.5 * cos(2 * Double.pi * progress))
                     menuBarExtra.setOpacity(CGFloat(alpha))

Coder-Desktop/Coder-Desktop/Notifications.swift

@@ -9,8 +9,8 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
         )
     }
 
-    // This function is required for notifications to appear as banners whilst the app is running.
-    // We're effectively forwarding the notification back to the OS
+    /// This function is required for notifications to appear as banners whilst the app is running.
+    /// We're effectively forwarding the notification back to the OS
     nonisolated func userNotificationCenter(
         _: UNUserNotificationCenter,
         willPresent _: UNNotification

Coder-Desktop/Coder-Desktop/State.swift

@@ -12,7 +12,7 @@ class AppState: ObservableObject {
 
     let dangerousDisableCoderSignatureValidation: Bool
 
-    // Stored in UserDefaults
+    /// Stored in UserDefaults
     @Published private(set) var hasSession: Bool {
         didSet {
             guard persistent else { return }
@@ -31,15 +31,15 @@ class AppState: ObservableObject {
 
     static let defaultHostnameSuffix: String = "coder"
 
-    // Stored in Keychain
+    /// Stored in Keychain
     @Published private(set) var sessionToken: String? {
         didSet {
             guard persistent else { return }
             keychainSet(sessionToken, for: Keys.sessionToken)
         }
     }
 
-    public var client: Client?
+    var client: Client?
 
     @Published var useLiteralHeaders: Bool = UserDefaults.standard.bool(forKey: Keys.useLiteralHeaders) {
         didSet {
@@ -57,7 +57,7 @@ class AppState: ObservableObject {
         }
     }
 
-    // Defaults to `true`
+    /// Defaults to `true`
     @Published var stopVPNOnQuit: Bool = UserDefaults.standard.optionalBool(forKey: Keys.stopVPNOnQuit) ?? true {
         didSet {
             guard persistent else { return }
@@ -80,7 +80,9 @@ class AppState: ObservableObject {
     }
 
     func tunnelProviderProtocol() -> NETunnelProviderProtocol? {
-        if !hasSession { return nil }
+        if !hasSession {
+            return nil
+        }
         let proto = NETunnelProviderProtocol()
         proto.providerBundleIdentifier = "\(appId).VPN"
         // HACK: We can't write to the system keychain, and the user keychain
@@ -100,13 +102,15 @@ class AppState: ObservableObject {
 
     private let onChange: ((NETunnelProviderProtocol?) -> Void)?
 
-    // reconfigure must be called when any property used to configure the VPN changes
-    public func reconfigure() {
-        if let onChange { onChange(tunnelProviderProtocol()) }
+    /// reconfigure must be called when any property used to configure the VPN changes
+    func reconfigure() {
+        if let onChange {
+            onChange(tunnelProviderProtocol())
+        }
     }
 
-    public init(onChange: ((NETunnelProviderProtocol?) -> Void)? = nil,
-                persistent: Bool = true)
+    init(onChange: ((NETunnelProviderProtocol?) -> Void)? = nil,
+         persistent: Bool = true)
     {
         self.persistent = persistent
         self.onChange = onChange
@@ -141,7 +145,7 @@ class AppState: ObservableObject {
         }
     }
 
-    public func login(baseAccessURL: URL, sessionToken: String) {
+    func login(baseAccessURL: URL, sessionToken: String) {
         hasSession = true
         self.baseAccessURL = baseAccessURL
         self.sessionToken = sessionToken
@@ -154,7 +158,7 @@ class AppState: ObservableObject {
         reconfigure()
     }
 
-    public func handleTokenExpiry() async {
+    func handleTokenExpiry() async {
         if hasSession {
             do {
                 _ = try await client!.user("me")
@@ -172,13 +176,13 @@ class AppState: ObservableObject {
     }
 
     private var refreshTask: Task<String?, Never>?
-    public func refreshDeploymentConfig() async {
+    func refreshDeploymentConfig() async {
         // Client is non-nil if there's a sesssion
         if hasSession, let client {
             refreshTask?.cancel()
 
             refreshTask = Task {
-                let res = try? await retry(floor: .milliseconds(100), ceil: .seconds(10)) {
+                try? await retry(floor: .milliseconds(100), ceil: .seconds(10)) {
                     do {
                         let config = try await client.agentConnectionInfoGeneric()
                         return config.hostname_suffix
@@ -187,14 +191,13 @@ class AppState: ObservableObject {
                         throw error
                     }
                 }
-                return res
             }
 
             hostnameSuffix = await refreshTask?.value ?? Self.defaultHostnameSuffix
         }
     }
 
-    public func clearSession() {
+    func clearSession() {
         hasSession = false
         sessionToken = nil
         refreshTask?.cancel()
@@ -237,11 +240,6 @@ struct LiteralHeader: Hashable, Identifiable, Equatable, Codable {
     var id: String {
         "\(name):\(value)"
     }
-
-    init(name: String, value: String) {
-        self.name = name
-        self.value = value
-    }
 }
 
 extension LiteralHeader {
@@ -251,8 +249,8 @@ extension LiteralHeader {
 }
 
 extension UserDefaults {
-    // Unlike the exisitng `bool(forKey:)` method which returns `false` for both
-    // missing values this method can return `nil`.
+    /// Unlike the exisitng `bool(forKey:)` method which returns `false` for both
+    /// missing values this method can return `nil`.
     func optionalBool(forKey key: String) -> Bool? {
         guard object(forKey: key) != nil else {
             return nil

Coder-Desktop/Coder-Desktop/UpdaterService.swift

@@ -2,9 +2,9 @@ import Sparkle
 import SwiftUI
 
 final class UpdaterService: NSObject, ObservableObject {
-    // The auto-updater can be entirely disabled by setting the
-    // `disableUpdater` UserDefaults key to `true`. This is designed for use in
-    // MDM configurations, where the value can be set to `true` permanently.
+    /// The auto-updater can be entirely disabled by setting the
+    /// `disableUpdater` UserDefaults key to `true`. This is designed for use in
+    /// MDM configurations, where the value can be set to `true` permanently.
     let disabled: Bool = UserDefaults.standard.bool(forKey: Keys.disableUpdater)
 
     @Published var canCheckForUpdates = true