mirror of
https://github.com/acamarata/curtain.git
synced 2026-07-01 11:14:25 +00:00
8c19e960d2
Detection: netstat lives at /usr/sbin/netstat, not /usr/bin — the hardcoded wrong path silently killed the ESTABLISHED-TCP activator (root cause of the failed live test). Fixed and live-verified. Added peered-UDP activator (5900-5902) for High-Performance sessions, per-signal transition logging, unconditional error logging for dead probe helpers, and probe v2 with full CGSession dictionary diffing. 7 new parser tests (32 total). Fixes from a full audit + adversarial review: idle source setting honored (default now Remote session activity), cover scope reduced to a coherent two-mode model with legacy migration (per-display toggle was inverted in onlyMarked and dead in all), curtain test no longer schedules a teardown over a live session, specific-display password box placement gets a real picker, refuse-to-arm enforced, activation notification posts a real banner, menu password gate bypassed when the event tap is dead, shared single-decoder aerial player with stale-task guard and async playability check, password buffer zeroed on successful unlock and Esc, XPC interruption/invalidation handlers, modern Accessibility settings URL, launchPath modernized, codesign failures now abort release.sh, monotonic CFBundleVersion, install.sh temp cleanup, dead armDisarmHotkey setting removed. Refactor: Curtain.swift and PreferencesWindow.swift split into focused files (largest now 479 lines). Wiki, README, and contributing docs updated to match. Build clean at 0 warnings, 32/32 tests pass.
66 lines
3.2 KiB
Swift
66 lines
3.2 KiB
Swift
import Cocoa
|
|
|
|
/// Purpose: App entry orchestration. Owns the coordinator, the optional menu bar,
|
|
/// the settings window, and the onboarding window. Keeps logic out of the
|
|
/// UI: it just wires callbacks between the pieces and drives cleanup on quit.
|
|
/// Inputs: NSApplicationDelegate lifecycle callbacks; Settings/UserDefaults state.
|
|
/// Outputs: A running agent with menu bar, settings, and (first run) onboarding wired.
|
|
/// Constraints: @MainActor — owns AppKit objects and SessionCoordinator (itself @MainActor).
|
|
/// cleanup() must be idempotent: it runs on quit, on SIGTERM, and on terminate.
|
|
/// SPORT: MASTER-APP
|
|
@MainActor
|
|
final class AppDelegate: NSObject, NSApplicationDelegate {
|
|
let coordinator = SessionCoordinator()
|
|
lazy var menuBar = MenuBarController(coordinator: coordinator)
|
|
lazy var prefs = PreferencesWindowController(coordinator: coordinator)
|
|
lazy var onboarding = OnboardingWindowController(coordinator: coordinator)
|
|
|
|
func applicationDidFinishLaunching(_ n: Notification) {
|
|
Settings.registerDefaults()
|
|
Notifier.requestAuthorization()
|
|
System.startupLockProbe()
|
|
|
|
coordinator.onStateChange = { [weak self] active in self?.menuBar.reflect(active: active) }
|
|
coordinator.onArmedChange = { [weak self] armed in self?.menuBar.reflect(armed: armed) }
|
|
coordinator.start()
|
|
|
|
// Reconcile the optional privileged disconnect helper with its saved setting.
|
|
DisconnectClient.shared.syncWithSettings()
|
|
|
|
menuBar.onOpenSettings = { [weak self] in self?.prefs.show() }
|
|
menuBar.onOpenSetup = { [weak self] in self?.onboarding.show() }
|
|
menuBar.onQuit = { [weak self] in self?.quit() }
|
|
if Settings.showInMenuBar { menuBar.show() }
|
|
|
|
prefs.onMenuBarToggle = { [weak self] on in on ? self?.menuBar.show() : self?.menuBar.hide() }
|
|
prefs.openOnboarding = { [weak self] in self?.onboarding.show() }
|
|
|
|
// First run drives the Accessibility grant and password setup via onboarding.
|
|
// After onboarding, fall back to settings only if there's nothing to find the app by.
|
|
if !Settings.hasOnboarded {
|
|
onboarding.show()
|
|
} else if !Settings.showInMenuBar && !Settings.hasPassword {
|
|
prefs.show()
|
|
}
|
|
|
|
// Reconcile the login-item state with the saved preference.
|
|
LoginItem.set(Settings.launchAtLogin)
|
|
|
|
// Soft, non-prompting check once onboarding has happened — onboarding/Settings
|
|
// surface any warning, so there's nothing to do here but note the state.
|
|
if Settings.hasOnboarded { _ = AXIsProcessTrusted() }
|
|
}
|
|
|
|
/// Re-opening the app from Finder shows the settings window.
|
|
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
|
|
prefs.show(); return true
|
|
}
|
|
|
|
func applicationWillTerminate(_ notification: Notification) { cleanup() }
|
|
|
|
/// Idempotent teardown: drop the curtain and release input/display assertions.
|
|
/// Called on user quit, on SIGTERM (launchd / `kill`), and on app termination.
|
|
func cleanup() { coordinator.deactivateNowForQuit() }
|
|
|
|
private func quit() { cleanup(); NSApp.terminate(nil) }
|
|
}
|