10 Commits
8 changed files with 192 additions and 79 deletions
+60
View File
@@ -3,6 +3,7 @@ import Combine
/// Bridges app-lifecycle events into SwiftUI: requests Notification Center
/// authorization once at launch so threshold alerts can post banners.
@MainActor
final class AppDelegate: NSObject, NSApplicationDelegate {
var statusItem: NSStatusItem?
var popover: NSPopover?
@@ -74,3 +75,62 @@ struct MacMonitorApp: App {
}
}
}
// MARK: - UI Shims (macOS 12 Support)
public struct MMLabeledContent<Label: View, Content: View>: View {
public let label: Label
public let content: Content
public init(@ViewBuilder content: () -> Content, @ViewBuilder label: () -> Label) {
self.label = label()
self.content = content()
}
public init(_ titleKey: LocalizedStringKey, @ViewBuilder content: () -> Content) where Label == Text {
self.label = Text(titleKey)
self.content = content()
}
public init<S: StringProtocol>(_ title: S, @ViewBuilder content: () -> Content) where Label == Text {
self.label = Text(title)
self.content = content()
}
public var body: some View {
HStack {
label
Spacer()
content
}
}
}
public extension View {
@ViewBuilder
func mmMonospaced() -> some View {
if #available(macOS 13.0, *) {
self.monospaced()
} else {
self
}
}
@ViewBuilder
func mmMonospacedDigit() -> some View {
if #available(macOS 13.0, *) {
self.monospacedDigit()
} else {
self
}
}
@ViewBuilder
func mmFormStyleGrouped() -> some View {
if #available(macOS 13.0, *) {
self.formStyle(.grouped)
} else {
self
}
}
}
@@ -118,11 +118,12 @@ public final class UNAlertNotificationDispatcher: NSObject, AlertNotificationDis
didReceive response: UNNotificationResponse,
withCompletionHandler completionHandler: @escaping () -> Void
) {
let targetTab: String? = switch response.actionIdentifier {
let targetTab: String?
switch response.actionIdentifier {
case AlertNotificationAction.viewProcessesIdentifier:
"Processes"
targetTab = "Processes"
default:
nil
targetTab = nil
}
Task { @MainActor in
AppNavigationBus.shared.request(tab: targetTab)
+3 -2
View File
@@ -4,8 +4,9 @@ import SwiftUI
/// Sidebar tab showing currently breached thresholds and the in-app
/// alert history log maintained by `AlertEngine`.
@MainActor
public struct AlertsView: View {
@State private var engine = AlertEngine.shared
@ObservedObject private var engine = AlertEngine.shared
public init() {}
@@ -109,7 +110,7 @@ public struct AlertsView: View {
Text(event.alertID)
.font(.caption2)
.foregroundStyle(.secondary)
.monospaced()
.mmMonospaced()
}
Spacer()
Text(event.timestamp.formatted(date: .abbreviated, time: .standard))
@@ -1,5 +1,7 @@
import SwiftUI
#if canImport(Charts)
import Charts
#endif
public struct TelemetryTrendChartView: View {
public let title: String
@@ -43,8 +45,7 @@ public struct TelemetryTrendChartView: View {
Spacer()
HStack(spacing: 12) {
Text(String(format: "Cur: %.1f %@", currentValue, unit))
.font(.caption)
.fontWeight(.semibold)
.font(.system(size: 11, weight: .semibold))
.foregroundColor(color)
Text(String(format: "Avg: %.1f %@", averageValue, unit))
.font(.caption)
@@ -55,6 +56,8 @@ public struct TelemetryTrendChartView: View {
}
}
#if canImport(Charts)
if #available(macOS 13.0, *) {
Chart {
ForEach(Array(samples.enumerated()), id: \.element.id) { index, sample in
LineMark(
@@ -81,9 +84,50 @@ public struct TelemetryTrendChartView: View {
.chartYScale(domain: 0...(maxY ?? max(1.0, maxValue * 1.15)))
.chartXAxis(.hidden)
.frame(height: 120)
} else {
fallbackChart
}
#else
fallbackChart
#endif
}
.padding(14)
.background(Color(NSColor.controlBackgroundColor))
.cornerRadius(10)
}
@ViewBuilder
private var fallbackChart: some View {
Canvas { context, size in
guard samples.count > 1 else { return }
let effectiveMaxY = maxY ?? max(1.0, maxValue * 1.15)
let dx = size.width / CGFloat(samples.count - 1)
var path = Path()
var areaPath = Path()
for (index, sample) in samples.enumerated() {
let x = CGFloat(index) * dx
let y = size.height - (CGFloat(sample.value) / CGFloat(effectiveMaxY)) * size.height
if index == 0 {
path.move(to: CGPoint(x: x, y: y))
areaPath.move(to: CGPoint(x: x, y: size.height))
areaPath.addLine(to: CGPoint(x: x, y: y))
} else {
path.addLine(to: CGPoint(x: x, y: y))
areaPath.addLine(to: CGPoint(x: x, y: y))
}
}
if let lastIndex = samples.indices.last {
let lastX = CGFloat(lastIndex) * dx
areaPath.addLine(to: CGPoint(x: lastX, y: size.height))
areaPath.closeSubpath()
}
context.fill(areaPath, with: .linearGradient(Gradient(colors: [color.opacity(0.35), color.opacity(0.05)]), startPoint: .zero, endPoint: CGPoint(x: 0, y: size.height)))
context.stroke(path, with: .color(color), lineWidth: 2)
}
.frame(height: 120)
}
}
+38 -32
View File
@@ -1,8 +1,9 @@
import SwiftUI
@MainActor
public struct ContentView: View {
@StateObject private var store = SystemTelemetryStore.shared
@State private var selectedTab: String = "Dashboard"
@State private var selectedTab: String? = "Dashboard"
@State private var processSearchText: String = ""
@State private var socketSearchText: String = ""
@State private var selectedPID: Int32? = nil
@@ -119,7 +120,7 @@ public struct ContentView: View {
headerCard
engineControlCard
switch selectedTab {
switch selectedTab ?? "Dashboard" {
case "Dashboard":
dashboardView
case "Architecture":
@@ -168,7 +169,7 @@ public struct ContentView: View {
}
.padding(24)
}
.navigationTitle("MacMonitor — \(selectedTab)")
.navigationTitle("MacMonitor — \(selectedTab ?? "Dashboard")")
}
// MARK: - Dashboard Composite View
@@ -357,20 +358,20 @@ public struct ContentView: View {
Label("Kernel & VM Telemetry", systemImage: "waveform.path.ecg")
.font(.headline)
Grid(alignment: .leading, horizontalSpacing: 20, verticalSpacing: 8) {
GridRow {
VStack(alignment: .leading, spacing: 8) {
HStack {
Text("Context Switches:").foregroundStyle(.secondary)
Text("\(Int(store.kernelCounters.contextSwitchesPerSec))/s").bold().monospacedDigit()
Text("Syscalls:").foregroundStyle(.secondary)
Text("\(Int(store.kernelCounters.syscallsPerSec))/s").bold().monospacedDigit()
}
GridRow {
HStack {
Text("Page Faults:").foregroundStyle(.secondary)
Text("\(Int(store.kernelCounters.pageFaultsPerSec))/s").bold().monospacedDigit()
Text("COW Faults:").foregroundStyle(.secondary)
Text("\(Int(store.kernelCounters.cowFaultsPerSec))/s").bold().monospacedDigit()
}
GridRow {
HStack {
Text("Pageins / Pageouts:").foregroundStyle(.secondary)
Text("\(Int(store.kernelCounters.pageinsPerSec)) / \(Int(store.kernelCounters.pageoutsPerSec)) /s").bold().monospacedDigit()
Text("Zero-Fill:").foregroundStyle(.secondary)
@@ -445,20 +446,20 @@ public struct ContentView: View {
ProgressView(value: min(store.memory.utilizationPercentage / 100.0, 1.0))
.tint(store.memory.utilizationPercentage > 85 ? .red : .blue)
Grid(alignment: .leading, horizontalSpacing: 20, verticalSpacing: 6) {
GridRow {
VStack(alignment: .leading, spacing: 6) {
HStack {
Text("Used:").foregroundStyle(.secondary)
Text(formatBytes(store.memory.usedBytes)).bold()
Text("Free:").foregroundStyle(.secondary)
Text(formatBytes(store.memory.freeBytes)).bold()
}
GridRow {
HStack {
Text("Wired:").foregroundStyle(.secondary)
Text(formatBytes(store.memory.wiredBytes))
Text("Compressed:").foregroundStyle(.secondary)
Text(formatBytes(store.memory.compressedBytes))
}
GridRow {
HStack {
Text("Swap Used:").foregroundStyle(.secondary)
Text(formatBytes(store.memory.swapUsedBytes))
Text("Swap Total:").foregroundStyle(.secondary)
@@ -602,10 +603,10 @@ public struct ContentView: View {
Text(s.protocolName)
}
TableColumn("Local Endpoint") { s in
Text("\(s.localAddress):\(s.localPort)").monospaced()
Text("\(s.localAddress):\(s.localPort)").mmMonospaced()
}
TableColumn("Remote Endpoint") { s in
Text("\(s.remoteAddress):\(s.remotePort)").monospaced()
Text("\(s.remoteAddress):\(s.remotePort)").mmMonospaced()
}
TableColumn("State") { s in
Text(s.tcpState).font(.caption).foregroundStyle(s.tcpState == "ESTABLISHED" ? .green : .secondary)
@@ -751,20 +752,20 @@ public struct ContentView: View {
if !store.batteryHealth.hasBattery {
Text("Desktop Mac / No battery installed").font(.caption).foregroundStyle(.secondary)
} else {
Grid(alignment: .leading, horizontalSpacing: 20, verticalSpacing: 6) {
GridRow {
VStack(alignment: .leading, spacing: 6) {
HStack {
Text("Cycle Count:").foregroundStyle(.secondary)
Text("\(store.batteryHealth.cycleCount) / \(store.batteryHealth.designCycleCount)").bold()
Text("Temperature:").foregroundStyle(.secondary)
Text(String(format: "%.1f°C", store.batteryHealth.temperature)).bold()
}
GridRow {
HStack {
Text("Voltage / Power:").foregroundStyle(.secondary)
Text("\(String(format: "%.2f V", store.batteryHealth.voltage)) (\(String(format: "%.1f W", store.batteryHealth.watts)))")
Text("Power Adapter:").foregroundStyle(.secondary)
Text(store.batteryHealth.externalConnected ? "\(store.batteryHealth.adapterWatts)W Connected" : "On Battery")
}
GridRow {
HStack {
Text("Capacity:").foregroundStyle(.secondary)
Text("\(store.batteryHealth.currentCapacity) / \(store.batteryHealth.maxCapacity) mAh")
Text("Manufacturer:").foregroundStyle(.secondary)
@@ -797,10 +798,10 @@ public struct ContentView: View {
.background(Color.secondary.opacity(0.15), in: Capsule())
}
TableColumn("Vendor ID") { d in
Text(String(format: "0x%04x", d.vendorID)).monospaced()
Text(String(format: "0x%04x", d.vendorID)).mmMonospaced()
}
TableColumn("Product ID") { d in
Text(String(format: "0x%04x", d.productID)).monospaced()
Text(String(format: "0x%04x", d.productID)).mmMonospaced()
}
TableColumn("Built-In") { d in
Text(d.isBuiltIn ? "Yes" : "External").foregroundStyle(d.isBuiltIn ? Color.secondary : Color.blue)
@@ -961,14 +962,14 @@ public struct ContentView: View {
.font(.title3.bold().monospacedDigit())
}
Grid(alignment: .leading, horizontalSpacing: 20, verticalSpacing: 6) {
GridRow {
VStack(alignment: .leading, spacing: 6) {
HStack {
Text("CPU Power:").foregroundStyle(.secondary)
Text(String(format: "%.1f W", store.power.cpuWatts)).bold()
Text("GPU Power:").foregroundStyle(.secondary)
Text(String(format: "%.1f W", store.power.gpuWatts)).bold()
}
GridRow {
HStack {
Text("CPU Voltage:").foregroundStyle(.secondary)
Text(String(format: "%.2f V", store.power.cpuVoltage))
Text("CPU Current:").foregroundStyle(.secondary)
@@ -989,24 +990,22 @@ public struct ContentView: View {
Text("Host Architecture & Kernel")
.font(.headline)
Grid(alignment: .leading, horizontalSpacing: 24, verticalSpacing: 10) {
GridRow {
VStack(alignment: .leading, spacing: 10) {
HStack {
Text("Hardware Model:").foregroundStyle(.secondary)
Text(store.hostModel).bold()
Text("Physical Cores:").foregroundStyle(.secondary)
Text("\(store.physicalCpuCount)").bold()
}
GridRow {
HStack {
Text("Darwin Kernel:").foregroundStyle(.secondary)
Text(store.kernelVersion).bold()
Text("Logical Cores:").foregroundStyle(.secondary)
Text("\(store.logicalCpuCount)").bold()
}
GridRow {
HStack {
Text("Target Architecture:").foregroundStyle(.secondary)
Text("Intel x86_64").bold()
Text("Deployment Target:").foregroundStyle(.secondary)
Text("macOS 14.0 (Sonoma)").bold()
}
}
}
@@ -1220,6 +1219,7 @@ public struct ContentView: View {
}
// MARK: - Process Detail Inspector Sheet
@MainActor
struct ProcessDetailSheet: View {
let inspector: MMProcessDetailInspector
let pid: Int32
@@ -1248,8 +1248,9 @@ struct ProcessDetailSheet: View {
if selectedDetailTab == "Threads" {
List(threads.indices, id: \.self) { idx in
let t = threads[idx]
let threadID = "\(t["threadID"] ?? idx)"
HStack {
Text("Thread \(t["threadID"] ?? idx)").bold()
Text("Thread \(threadID)").bold()
Spacer()
Text("CPU: \(String(format: "%.1f%%", (t["cpuPercent"] as? Double) ?? 0.0))").monospacedDigit()
Text(t["state"] as? String ?? "").foregroundStyle(.secondary)
@@ -1262,11 +1263,16 @@ struct ProcessDetailSheet: View {
} else {
List(sockets.indices, id: \.self) { idx in
let s = sockets[idx]
let proto = s["protocol"] as? String ?? "TCP"
let localAddr = (s["localAddress"] as? String) ?? ""
let localPort = (s["localPort"] as? Int) ?? 0
let remoteAddr = (s["remoteAddress"] as? String) ?? ""
let remotePort = (s["remotePort"] as? Int) ?? 0
HStack {
Text(s["protocol"] as? String ?? "TCP").bold()
Text(proto).bold()
Spacer()
Text("\(s["localAddress"] ?? ""):\(s["localPort"] ?? 0) → \(s["remoteAddress"] ?? ""):\(s["remotePort"] ?? 0)")
.monospaced()
Text("\(localAddr):\(localPort) → \(remoteAddr):\(remotePort)")
.mmMonospaced()
Text(s["tcpState"] as? String ?? "").foregroundStyle(.secondary)
}
}
@@ -1,7 +1,8 @@
import SwiftUI
@MainActor
public struct QuickGlancePopoverView: View {
var store: SystemTelemetryStore
@ObservedObject var store: SystemTelemetryStore
public init(store: SystemTelemetryStore) {
self.store = store
@@ -109,9 +110,7 @@ public struct QuickGlancePopoverView: View {
}
Spacer()
Text(value)
.font(.subheadline)
.fontWeight(.semibold)
.fontDesign(.monospaced)
.font(.system(size: 13, weight: .semibold, design: .monospaced))
}
}
+14 -13
View File
@@ -5,6 +5,7 @@ import UserNotifications
/// Preferences UI for threshold alert rules. Bound directly to
/// `AlertEngine.shared.configuration`, which auto-persists to `UserDefaults`.
@MainActor
public struct AlertsSettingsView: View {
@ObservedObject private var engine = AlertEngine.shared
@State private var authorizationStatus: UNAuthorizationStatus = .notDetermined
@@ -58,24 +59,24 @@ public struct AlertsSettingsView: View {
Section("CPU Temperature") {
Toggle("High CPU Temperature Alert", isOn: $engine.configuration.cpuTempEnabled)
LabeledContent("Threshold") {
MMLabeledContent("Threshold") {
Slider(value: $engine.configuration.cpuTempThresholdC, in: 60...110, step: 1) {
EmptyView()
}
Text("\(Int(engine.configuration.cpuTempThresholdC))°C")
.monospacedDigit()
.mmMonospacedDigit()
.frame(width: 48, alignment: .trailing)
}
}
Section("Cooling Fans") {
Toggle("Fan Stall Alert", isOn: $engine.configuration.fanStallEnabled)
LabeledContent("Alert when CPU above") {
MMLabeledContent("Alert when CPU above") {
Slider(value: $engine.configuration.fanStallTempThresholdC, in: 40...100, step: 1) {
EmptyView()
}
Text("\(Int(engine.configuration.fanStallTempThresholdC))°C")
.monospacedDigit()
.mmMonospacedDigit()
.frame(width: 48, alignment: .trailing)
}
Text("Triggers when a fan reports 0 RPM while the CPU is hot.")
@@ -85,12 +86,12 @@ public struct AlertsSettingsView: View {
Section("Memory") {
Toggle("Low Memory Alert", isOn: $engine.configuration.memoryEnabled)
LabeledContent("Free RAM below") {
MMLabeledContent("Free RAM below") {
Slider(value: $engine.configuration.memoryFreeMBThreshold, in: 100...4096, step: 50) {
EmptyView()
}
Text("\(Int(engine.configuration.memoryFreeMBThreshold)) MB")
.monospacedDigit()
.mmMonospacedDigit()
.frame(width: 64, alignment: .trailing)
}
Toggle("Alert on Critical Memory Pressure", isOn: $engine.configuration.memoryAlertOnCriticalPressure)
@@ -98,32 +99,32 @@ public struct AlertsSettingsView: View {
Section("Storage") {
Toggle("Low Disk Space Alert", isOn: $engine.configuration.storageEnabled)
LabeledContent("Free space below") {
MMLabeledContent("Free space below") {
Slider(value: $engine.configuration.storageFreeGBThreshold, in: 1...100, step: 1) {
EmptyView()
}
Text("\(Int(engine.configuration.storageFreeGBThreshold)) GB")
.monospacedDigit()
.mmMonospacedDigit()
.frame(width: 48, alignment: .trailing)
}
LabeledContent("Free percent below") {
MMLabeledContent("Free percent below") {
Slider(value: $engine.configuration.storageFreePercentThreshold, in: 1...50, step: 1) {
EmptyView()
}
Text("\(Int(engine.configuration.storageFreePercentThreshold))%")
.monospacedDigit()
.mmMonospacedDigit()
.frame(width: 48, alignment: .trailing)
}
}
Section("Battery") {
Toggle("Low Battery Alert", isOn: $engine.configuration.batteryEnabled)
LabeledContent("Charge below") {
MMLabeledContent("Charge below") {
Slider(value: $engine.configuration.batteryPercentThreshold, in: 1...50, step: 1) {
EmptyView()
}
Text("\(Int(engine.configuration.batteryPercentThreshold))%")
.monospacedDigit()
.mmMonospacedDigit()
.frame(width: 48, alignment: .trailing)
}
Text("Only fires while discharging on battery power.")
@@ -131,7 +132,7 @@ public struct AlertsSettingsView: View {
.foregroundStyle(.secondary)
}
}
.formStyle(.grouped)
.mmFormStyleGrouped()
.frame(minWidth: 480, minHeight: 520)
.task { await refreshAuthorizationStatus() }
}
+1
View File
@@ -2,6 +2,7 @@ import XCTest
import SwiftUI
@testable import MacMonitor
@MainActor
final class MMMenuBarTests: XCTestCase {
func testMenuBarStatusViewInitialization() {