next test build

.gitignore

@@ -1,3 +1,7 @@
 .DS_Store
 xcuserdata/
 DerivedData/
+build/
+Build/
+dist/
+.signing.env

Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,51 +1,61 @@
 {
   "images" : [
     {
+      "filename" : "icon_16x16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
+      "filename" : "icon_16x16@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
+      "filename" : "icon_32x32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
+      "filename" : "icon_32x32@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
+      "filename" : "icon_128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
+      "filename" : "icon_128x128@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
+      "filename" : "icon_256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
+      "filename" : "icon_256x256@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
+      "filename" : "icon_512x512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
+      "filename" : "icon_512x512@2x.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

Model/API/ServerAPI.swift

@@ -1,271 +0,0 @@
-//
-//  ServerAPI.swift
-//  iKeyMon
-//
-//  Created by tracer on 06.04.25.
-//
-import Foundation
-
-final class ServerAPI {
-    private let hostname: String
-    private let apiKey: String
-
-    init(hostname: String, apiKey: String) {
-        self.hostname = hostname
-        self.apiKey = apiKey
-    }
-
-    init?(server: Server) {
-        guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) else {
-            return nil
-        }
-        self.hostname = server.hostname
-        self.apiKey = apiKey
-    }
-
-    @discardableResult
-    func ping() async -> Bool {
-        guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
-            print("❌ [ServerAPI] Invalid ping URL for hostname: \(hostname)")
-            return false
-        }
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "GET"
-        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
-        request.timeoutInterval = 10
-
-        do {
-            let (data, response) = try await URLSession.shared.data(for: request)
-            
-            // Add debug info for comparison with server info request
-            if let httpResponse = response as? HTTPURLResponse {
-                if httpResponse.statusCode != 200 {
-                    print("❌ [ServerAPI] Ping HTTP Status: \(httpResponse.statusCode) for \(hostname)")
-                    if let responseString = String(data: data, encoding: .utf8) {
-                        print("❌ [ServerAPI] Ping error response: \(responseString)")
-                    }
-                }
-            }
-
-            if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
-                return true
-            } else {
-                print("❌ [ServerAPI] Ping failed - invalid response for \(hostname)")
-                if let responseString = String(data: data, encoding: .utf8) {
-                    print("❌ [ServerAPI] Ping response: \(responseString)")
-                }
-                return false
-            }
-        } catch {
-            print("❌ [ServerAPI] Ping error for \(hostname): \(error)")
-            return false
-        }
-    }
-    
-    func fetchServerInfo() async throws -> ServerInfo {
-        print("🔍 [ServerAPI] Starting fetchServerInfo for hostname: \(hostname)")
-        
-        guard let url = URL(string: "https://\(hostname)/api/v2/server") else {
-            print("❌ [ServerAPI] Invalid URL for hostname: \(hostname)")
-            throw URLError(.badURL)
-        }
-        
-        print("🌐 [ServerAPI] URL created: \(url.absoluteString)")
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "GET"
-        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
-        // Temporarily remove Content-Type to match ping request exactly
-        // request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.timeoutInterval = 30
-        
-        print("📤 [ServerAPI] Making request with timeout: \(request.timeoutInterval)s")
-        print("📤 [ServerAPI] API Key (first 10 chars): \(String(apiKey.prefix(10)))...")
-        print("📤 [ServerAPI] Request headers: \(request.allHTTPHeaderFields ?? [:])")
-
-        do {
-            let startTime = Date()
-            let (data, response) = try await URLSession.shared.data(for: request)
-            let endTime = Date()
-            let duration = endTime.timeIntervalSince(startTime)
-            
-            print("📥 [ServerAPI] Request completed in \(String(format: "%.2f", duration))s")
-            
-            if let httpResponse = response as? HTTPURLResponse {
-                print("📥 [ServerAPI] HTTP Status: \(httpResponse.statusCode)")
-                
-                // Handle 401 specifically
-                if httpResponse.statusCode == 401 {
-                    print("❌ [ServerAPI] 401 Unauthorized - API key issue!")
-                    if let responseString = String(data: data, encoding: .utf8) {
-                        print("❌ [ServerAPI] 401 Response body: \(responseString)")
-                    }
-                    throw URLError(.userAuthenticationRequired)
-                }
-                
-                // Handle other non-200 status codes
-                if httpResponse.statusCode != 200 {
-                    print("❌ [ServerAPI] Non-200 status code: \(httpResponse.statusCode)")
-                    if let responseString = String(data: data, encoding: .utf8) {
-                        print("❌ [ServerAPI] Error response body: \(responseString)")
-                    }
-                    throw URLError(.badServerResponse)
-                }
-            }
-            
-            print("📥 [ServerAPI] Data size: \(data.count) bytes")
-            
-            print("🔄 [ServerAPI] Decoding response payload...")
-            
-            let decoder = JSONDecoder()
-            decoder.keyDecodingStrategy = .convertFromSnakeCase
-            let decodedResponse = try decoder.decode(ServerResponseEnvelope.self, from: data)
-            let decoded = decodedResponse.toDomain()
-            print("✅ [ServerAPI] JSON decoding successful")
-            
-            return decoded
-        } catch let urlError as URLError {
-            print("❌ [ServerAPI] URLError: \(urlError.localizedDescription)")
-            print("❌ [ServerAPI] URLError code: \(urlError.code.rawValue)")
-            throw urlError
-        } catch let decodingError as DecodingError {
-            print("❌ [ServerAPI] Decoding error: \(decodingError)")
-            throw decodingError
-        } catch {
-            print("❌ [ServerAPI] Unexpected error: \(error)")
-            throw error
-        }
-    }
-}
-
-// MARK: - Response Helpers
-
-private extension ServerAPI {
-    struct ServerResponseEnvelope: Decodable {
-        let data: ServerData
-        let meta: Meta
-        
-        struct Meta: Decodable {
-            let apiVersion: String
-        }
-    }
-    
-    struct ServerData: Decodable {
-        struct Port: Decodable {
-            let service: String
-            let status: String
-            let port: Int
-            let proto: String
-        }
-        
-        struct Load: Decodable {
-            let minute1: Double
-            let minute5: Double
-            let minute15: Double
-            let percent: Double
-            let cpuCount: Int
-            let level: String
-        }
-        
-        struct Memory: Decodable {
-            let free: Int
-            let used: Int
-            let total: Int
-            let percent: Double
-        }
-        
-        struct Disk: Decodable {
-            let free: Int
-            let used: Int
-            let total: Int
-            let percent: Double
-        }
-        
-        struct PHPInterpreter: Decodable {
-            let version: String
-            let path: String?
-            let configFile: String?
-            let extensions: [String]
-            let memoryLimit: String?
-            let maxExecutionTime: String?
-        }
-        
-        let hostname: String
-        let ipAddresses: [String]
-        let cpuCores: Int
-        let serverTime: String
-        let uptime: String
-        let processCount: Int
-        let apacheVersion: String
-        let phpVersion: String
-        let mysqlVersion: String?
-        let mariadbVersion: String?
-        let ports: [Port]?
-        let load: Load
-        let memory: Memory
-        let swap: Memory
-        let diskSpace: Disk
-        let panelVersion: String
-        let panelBuild: String
-        let additionalPhpInterpreters: [PHPInterpreter]?
-    }
-    
-}
-
-private extension ServerAPI.ServerResponseEnvelope {
-    func toDomain() -> ServerInfo {
-        ServerInfo(
-            hostname: data.hostname,
-            ipAddresses: data.ipAddresses,
-            cpuCores: data.cpuCores,
-            serverTime: data.serverTime,
-            uptime: data.uptime,
-            processCount: data.processCount,
-            apacheVersion: data.apacheVersion,
-            phpVersion: data.phpVersion,
-            mysqlVersion: data.mysqlVersion,
-            mariadbVersion: data.mariadbVersion,
-            ports: data.ports?.map { ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto) },
-            load: ServerInfo.Load(
-                minute1: data.load.minute1,
-                minute5: data.load.minute5,
-                minute15: data.load.minute15,
-                percent: data.load.percent,
-                cpuCount: data.load.cpuCount,
-                level: data.load.level
-            ),
-            memory: ServerInfo.Memory(
-                free: data.memory.free,
-                used: data.memory.used,
-                total: data.memory.total,
-                percent: data.memory.percent
-            ),
-            swap: ServerInfo.Memory(
-                free: data.swap.free,
-                used: data.swap.used,
-                total: data.swap.total,
-                percent: data.swap.percent
-            ),
-            diskSpace: ServerInfo.DiskSpace(
-                free: data.diskSpace.free,
-                used: data.diskSpace.used,
-                total: data.diskSpace.total,
-                percent: data.diskSpace.percent
-            ),
-            panelVersion: data.panelVersion,
-            panelBuild: data.panelBuild,
-            apiVersion: meta.apiVersion,
-            additionalPHPInterpreters: data.additionalPhpInterpreters?.map {
-                ServerInfo.PHPInterpreter(
-                    version: $0.version,
-                    path: $0.path,
-                    configFile: $0.configFile,
-                    extensions: $0.extensions,
-                    memoryLimit: $0.memoryLimit,
-                    maxExecutionTime: $0.maxExecutionTime
-                )
-            }
-        )
-    }
-}

Model/API/ServerTypes.swift

@@ -1,73 +0,0 @@
-//
-//  ServerTypes_Fixed.swift
-//  iKeyMon
-//
-//  Fixed server types matching your existing code structure
-//
-
-import Foundation
-
-// MARK: - Server API Response Types
-struct ServerAPIResponse<T: Codable>: Codable {
-    let data: T
-    let status: String
-    let timestamp: Date
-    let version: String
-    
-    enum CodingKeys: String, CodingKey {
-        case data
-        case status
-        case timestamp
-        case version
-    }
-}
-
-// MARK: - Server API Version
-struct ServerAPIVersion: Codable {
-    let major: Int
-    let minor: Int
-    let patch: Int
-    let string: String
-    
-    init(major: Int, minor: Int, patch: Int = 0) {
-        self.major = major
-        self.minor = minor
-        self.patch = patch
-        self.string = "\(major).\(minor).\(patch)"
-    }
-    
-    init(from versionString: String) throws {
-        let components = versionString.split(separator: ".").compactMap { Int($0) }
-        guard components.count >= 2 else {
-            throw DecodingError.dataCorrupted(
-                DecodingError.Context(codingPath: [], debugDescription: "Invalid version string format")
-            )
-        }
-        
-        self.major = components[0]
-        self.minor = components[1]
-        self.patch = components.count > 2 ? components[2] : 0
-        self.string = versionString
-    }
-}
-
-// MARK: - Server API Response Factory
-class ServerAPIResponseFactory {
-    static func createResponse<T: Codable>(data: T, status: String = "success") -> ServerAPIResponse<T> {
-        return ServerAPIResponse(
-            data: data,
-            status: status,
-            timestamp: Date(),
-            version: "1.0"
-        )
-    }
-    
-    static func createErrorResponse(error: String) -> ServerAPIResponse<String> {
-        return ServerAPIResponse(
-            data: error,
-            status: "error",
-            timestamp: Date(),
-            version: "1.0"
-        )
-    }
-}

NOTES.md

@@ -0,0 +1,8 @@
+- add tooltip for:
+    Ping (est time consideration)
+    dynamic Data
+    static Data
+
+add a merker for "reboot required"
+Add dmg download option for macOS
+Add versioning

README.md

@@ -36,6 +36,16 @@ git clone https://git.24unix.net/tracer/iKeyMon
 cd iKeyMon
 open iKeyMon.xcodeproj
 ```
+
+### Local release build
+
+Use the helper script to produce distributables in `dist/`:
+
+```bash
+./scripts/build_release.sh
+```
+
+It cleans previous artifacts, builds the `Release` configuration, and drops both `iKeyMon-<version>.zip` and `iKeyMon-<version>.dmg` into the `dist` folder (ignored by git). To enable codesigning + notarization, copy `signing.env.example` to `.signing.env`, fill in your Developer ID identity, Apple ID, team ID, and app-specific password. The script sources that file locally (it remains gitignored) and performs signing/notarization when the values are present.
 ## 📦 License
 
 MIT — see [LICENSE](LICENSE) for details.

Sources/Extensions/View+Shimmer.swift

@@ -0,0 +1,51 @@
+import SwiftUI
+
+struct ShimmerModifier: ViewModifier {
+    var active: Bool
+    @State private var phase: CGFloat = -1
+
+    func body(content: Content) -> some View {
+        content
+            .overlay(
+                shimmer
+                    .mask(content)
+                    .opacity(active ? 1 : 0)
+            )
+            .onAppear {
+                guard active else { return }
+                animate()
+            }
+            .onChange(of: active) { isActive in
+                if isActive {
+                    phase = -1
+                    animate()
+                }
+            }
+    }
+
+    private var shimmer: some View {
+        LinearGradient(
+            gradient: Gradient(colors: [
+                .clear,
+                Color.white.opacity(0.6),
+                .clear
+            ]),
+            startPoint: .top,
+            endPoint: .bottom
+        )
+        .rotationEffect(.degrees(70))
+        .offset(x: phase * 250)
+    }
+
+    private func animate() {
+        withAnimation(.linear(duration: 1.2).repeatForever(autoreverses: false)) {
+            phase = 1
+        }
+    }
+}
+
+extension View {
+    func shimmering(active: Bool) -> some View {
+        modifier(ShimmerModifier(active: active))
+    }
+}

Sources/KeychainHelper.swift

@@ -9,7 +9,7 @@ import Foundation
 import Security
 
 enum KeychainHelper {
-    static func save(apiKey: String, for hostname: String) {
+    static func saveApiKey(_ apiKey: String, for hostname: String) {
         let data = Data(apiKey.utf8)
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,

Sources/Model/API/ApiFactory.swift

@@ -9,6 +9,7 @@ import Foundation
 
 enum APIVersion: String, CaseIterable {
     case v2_12 = "2.12"
+    case v2_13 = "2.13"
     
     static func from(versionString: String) -> APIVersion? {
         if let version = APIVersion(rawValue: versionString) {
@@ -22,7 +23,8 @@ enum APIVersion: String, CaseIterable {
         let minor = components[1]
         
         switch (major, minor) {
-        case (2, 12...): return .v2_12
+        case (2, 12): return .v2_12
+        case (2, 13...): return .v2_13
         default: return nil
         }
     }
@@ -69,6 +71,8 @@ class APIFactory {
         switch version {
         case .v2_12:
             return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
+        case .v2_13:
+            return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
         }
     }
     
@@ -100,7 +104,7 @@ class APIFactory {
             }
         }
 
-        return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
+        return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
     }
 }
 

Sources/Model/API/ServerInfo.swift

@@ -98,6 +98,43 @@ struct ServerInfo: Codable, Hashable, Equatable {
         }
     }
 
+    struct OperatingSystem: Codable, Hashable, Equatable {
+        struct UpdateStatus: Codable, Hashable, Equatable {
+            let updateCount: Int
+            let securityUpdateCount: Int
+            let rebootRequired: Bool
+
+            init(updateCount: Int, securityUpdateCount: Int, rebootRequired: Bool) {
+                self.updateCount = updateCount
+                self.securityUpdateCount = securityUpdateCount
+                self.rebootRequired = rebootRequired
+            }
+        }
+
+        let label: String
+        let distribution: String
+        let version: String
+        let architecture: String
+        let endOfLife: Bool
+        let updates: UpdateStatus?
+
+        init(
+            label: String,
+            distribution: String,
+            version: String,
+            architecture: String,
+            endOfLife: Bool,
+            updates: UpdateStatus?
+        ) {
+            self.label = label
+            self.distribution = distribution
+            self.version = version
+            self.architecture = architecture
+            self.endOfLife = endOfLife
+            self.updates = updates
+        }
+    }
+
     var hostname: String
     var ipAddresses: [String]
     var cpuCores: Int
@@ -108,6 +145,8 @@ struct ServerInfo: Codable, Hashable, Equatable {
     var phpVersion: String
     var mysqlVersion: String?
     var mariadbVersion: String?
+    var emailsInQueue: Int?
+    var operatingSystem: OperatingSystem?
     var ports: [ServicePort]?
     var load: Load
     var memory: Memory
@@ -128,6 +167,15 @@ struct ServerInfo: Codable, Hashable, Equatable {
         }
         return ServerInfo.displayFormatter.string(from: date)
     }
+
+    var operatingSystemSummary: String? {
+        guard let operatingSystem else { return nil }
+        let components = [
+            operatingSystem.label,
+            operatingSystem.architecture
+        ].filter { !$0.isEmpty }
+        return components.isEmpty ? nil : components.joined(separator: " • ")
+    }
 }
 
 // MARK: - Helpers & Sample Data
@@ -157,6 +205,19 @@ extension ServerInfo {
         phpVersion: "8.2.12",
         mysqlVersion: "8.0.33",
         mariadbVersion: nil,
+        emailsInQueue: 0,
+        operatingSystem: OperatingSystem(
+            label: "Debian 12.12 (64-bit)",
+            distribution: "Debian",
+            version: "12.12",
+            architecture: "x86_64",
+            endOfLife: false,
+            updates: OperatingSystem.UpdateStatus(
+                updateCount: 12,
+                securityUpdateCount: 8,
+                rebootRequired: true
+            )
+        ),
         ports: [
             ServicePort(service: "HTTP", status: "online", port: 80, proto: "tcp"),
             ServicePort(service: "HTTPS", status: "online", port: 443, proto: "tcp"),

Sources/Model/API/Versions/APIv2_12.swift

@@ -131,10 +131,10 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
     typealias UtilizationType = APIv2_12.Utilization
     
     private enum Endpoint: String {
-        case systemInfo = "/api/v2.12/system/info"
-        case load = "/api/v2.12/metrics/load"
-        case memory = "/api/v2.12/metrics/memory"
-        case utilization = "/api/v2.12/metrics/utilization"
+        case systemInfo = "/api/v2/system/info"
+        case load = "/api/v2/metrics/load"
+        case memory = "/api/v2/metrics/memory"
+        case utilization = "/api/v2/metrics/utilization"
         
         func url(baseURL: URL) -> URL {
             return baseURL.appendingPathComponent(self.rawValue)
@@ -196,6 +196,7 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
 private extension APIv2_12 {
     struct ServerSummaryEnvelope: Decodable {
         let meta: Meta
+        let operatingSystem: OperatingSystem?
         let utilization: Utilization
         let components: Components
         let ports: [Port]?
@@ -247,6 +248,7 @@ private extension APIv2_12 {
             }
 
             let processCount: Int
+            let emailsInQueue: Int?
             let load: Load
             let diskSpace: Disk
             let memory: Memory
@@ -280,6 +282,53 @@ private extension APIv2_12 {
             let configFile: String?
         }
         
+        struct OperatingSystem: Decodable {
+            struct Updates: Decodable {
+                let updateCount: Int
+                let securityUpdateCount: Int
+                let rebootRequired: Bool
+
+                enum CodingKeys: String, CodingKey {
+                    case updateCount = "update_count"
+                    case securityUpdateCount = "security_update_count"
+                    case rebootRequired = "reboot_required"
+                }
+
+                init(from decoder: Decoder) throws {
+                    let container = try decoder.container(keyedBy: CodingKeys.self)
+                    updateCount = try container.decodeIfPresent(Int.self, forKey: .updateCount) ?? 0
+                    securityUpdateCount = try container.decodeIfPresent(Int.self, forKey: .securityUpdateCount) ?? 0
+                    rebootRequired = try container.decodeIfPresent(Bool.self, forKey: .rebootRequired) ?? false
+                }
+            }
+
+            let label: String
+            let distribution: String
+            let version: String
+            let architecture: String
+            let endOfLife: Bool
+            let updates: Updates?
+
+            enum CodingKeys: String, CodingKey {
+                case label
+                case distribution
+                case version
+                case architecture
+                case endOfLife = "end_of_life"
+                case updates
+            }
+
+            init(from decoder: Decoder) throws {
+                let container = try decoder.container(keyedBy: CodingKeys.self)
+                label = try container.decodeIfPresent(String.self, forKey: .label) ?? ""
+                distribution = try container.decodeIfPresent(String.self, forKey: .distribution) ?? ""
+                version = try container.decodeIfPresent(String.self, forKey: .version) ?? ""
+                architecture = try container.decodeIfPresent(String.self, forKey: .architecture) ?? ""
+                endOfLife = try container.decodeIfPresent(Bool.self, forKey: .endOfLife) ?? false
+                updates = try container.decodeIfPresent(Updates.self, forKey: .updates)
+            }
+        }
+
         func toDomain() -> ServerInfo {
             let load = utilization.load
             let disk = utilization.diskSpace
@@ -297,6 +346,23 @@ private extension APIv2_12 {
                 phpVersion: components.php,
                 mysqlVersion: components.mysql,
                 mariadbVersion: components.mariadb,
+                emailsInQueue: utilization.emailsInQueue,
+                operatingSystem: operatingSystem.map {
+                    ServerInfo.OperatingSystem(
+                        label: $0.label,
+                        distribution: $0.distribution,
+                        version: $0.version,
+                        architecture: $0.architecture,
+                        endOfLife: $0.endOfLife,
+                        updates: $0.updates.map {
+                            ServerInfo.OperatingSystem.UpdateStatus(
+                                updateCount: $0.updateCount,
+                                securityUpdateCount: $0.securityUpdateCount,
+                                rebootRequired: $0.rebootRequired
+                            )
+                        }
+                    )
+                },
                 ports: ports?.map {
                     ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto)
                 },

Sources/Model/API/Versions/APIv2_13.swift

@@ -0,0 +1,411 @@
+//
+//  APIv2_13.swift
+//  iKeyMon
+//
+//  Created by tracer on 13.11.25.
+//
+
+
+import Foundation
+
+extension APIv2_13 {
+    struct Load: Codable {
+        let current: LoadMetrics
+        let historical: [LoadMetrics]
+        
+        struct LoadMetrics: Codable {
+            let oneMinute: Double
+            let fiveMinute: Double
+            let fifteenMinute: Double
+            let timestamp: Date
+            
+            enum CodingKeys: String, CodingKey {
+                case oneMinute = "load_1"
+                case fiveMinute = "load_5"
+                case fifteenMinute = "load_15"
+                case timestamp
+            }
+        }
+    }
+    
+    struct Memory: Codable {
+        let system: SystemMemory
+        let swap: SwapMemory?
+        
+        struct SystemMemory: Codable {
+            let total: Int64
+            let used: Int64
+            let free: Int64
+            let available: Int64
+            let buffers: Int64?
+            let cached: Int64?
+        }
+        
+        struct SwapMemory: Codable {
+            let total: Int64
+            let used: Int64
+            let free: Int64
+        }
+    }
+    
+    struct Utilization: Codable {
+        let cpu: CPUUtilization
+        let memory: MemoryUtilization
+        let disk: [DiskUtilization]
+        let network: [NetworkUtilization]?
+        
+        struct CPUUtilization: Codable {
+            let overall: Double
+            let cores: [Double]
+            let processes: [ProcessInfo]?
+            
+            struct ProcessInfo: Codable {
+                let pid: Int
+                let name: String
+                let cpuPercent: Double
+                
+                enum CodingKeys: String, CodingKey {
+                    case pid
+                    case name
+                    case cpuPercent = "cpu_percent"
+                }
+            }
+        }
+        
+        struct MemoryUtilization: Codable {
+            let percent: Double
+            let topProcesses: [ProcessMemoryInfo]?
+            
+            struct ProcessMemoryInfo: Codable {
+                let pid: Int
+                let name: String
+                let memoryMB: Double
+                
+                enum CodingKeys: String, CodingKey {
+                    case pid
+                    case name
+                    case memoryMB = "memory_mb"
+                }
+            }
+        }
+        
+        struct DiskUtilization: Codable {
+            let device: String
+            let mountpoint: String
+            let usedPercent: Double
+            let totalBytes: Int64
+            let usedBytes: Int64
+            let freeBytes: Int64
+            
+            enum CodingKeys: String, CodingKey {
+                case device
+                case mountpoint
+                case usedPercent = "used_percent"
+                case totalBytes = "total_bytes"
+                case usedBytes = "used_bytes"
+                case freeBytes = "free_bytes"
+            }
+        }
+        
+        struct NetworkUtilization: Codable {
+            let interface: String
+            let bytesIn: Int64
+            let bytesOut: Int64
+            let packetsIn: Int64
+            let packetsOut: Int64
+            
+            enum CodingKeys: String, CodingKey {
+                case interface
+                case bytesIn = "bytes_in"
+                case bytesOut = "bytes_out"
+                case packetsIn = "packets_in"
+                case packetsOut = "packets_out"
+            }
+        }
+    }
+}
+
+class APIv2_13: BaseAPIClient, ServerAPIProtocol {
+    typealias LoadType = APIv2_13.Load
+    typealias MemoryType = APIv2_13.Memory
+    typealias UtilizationType = APIv2_13.Utilization
+    
+    private enum Endpoint: String {
+        case systemInfo = "/api/v2/system/info"
+        case load = "/api/v2/metrics/load"
+        case memory = "/api/v2/metrics/memory"
+        case utilization = "/api/v2/metrics/utilization"
+        
+        func url(baseURL: URL) -> URL {
+            return baseURL.appendingPathComponent(self.rawValue)
+        }
+    }
+    
+    func fetchSystemInfo() async throws -> SystemInfo {
+        let url = Endpoint.systemInfo.url(baseURL: baseURL)
+        let request = URLRequest(url: url)
+        return try await performRequest(request, responseType: SystemInfo.self)
+    }
+    
+    func fetchLoad() async throws -> LoadType {
+        let url = Endpoint.load.url(baseURL: baseURL)
+        var request = URLRequest(url: url)
+        request.setValue("application/json", forHTTPHeaderField: "Accept")
+        return try await performRequest(request, responseType: LoadType.self)
+    }
+    
+    func fetchMemory() async throws -> MemoryType {
+        let url = Endpoint.memory.url(baseURL: baseURL)
+        var request = URLRequest(url: url)
+        request.setValue("application/json", forHTTPHeaderField: "Accept")
+        return try await performRequest(request, responseType: MemoryType.self)
+    }
+    
+    func fetchUtilization() async throws -> UtilizationType {
+        let url = Endpoint.utilization.url(baseURL: baseURL)
+        var request = URLRequest(url: url)
+        request.setValue("application/json", forHTTPHeaderField: "Accept")
+        return try await performRequest(request, responseType: UtilizationType.self)
+    }
+
+    func fetchServerSummary(apiKey: String) async throws -> ServerInfo {
+        let summaryURL = baseURL.appendingPathComponent("api/v2/server")
+        var request = URLRequest(url: summaryURL)
+        request.httpMethod = "GET"
+        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
+        request.timeoutInterval = 30
+
+        let (data, response) = try await session.data(for: request)
+        guard let httpResponse = response as? HTTPURLResponse else {
+            throw APIError.invalidResponse
+        }
+
+        guard httpResponse.statusCode == 200 else {
+            throw APIError.httpError(httpResponse.statusCode)
+        }
+
+        let decoder = JSONDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
+        let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
+        return envelope.toDomain()
+    }
+}
+
+// MARK: - Server Summary Mapping
+
+private extension APIv2_13 {
+    struct ServerSummaryEnvelope: Decodable {
+        let meta: Meta
+        let operatingSystem: OperatingSystem?
+        let utilization: Utilization
+        let components: Components
+        let ports: [Port]?
+        let additionalPhpInterpreters: [AdditionalInterpreter]?
+
+        struct Meta: Decodable {
+            struct Uptime: Decodable {
+                let days: Int
+                let hours: Int
+                let minutes: Int
+                let seconds: Int
+
+                var formatted: String {
+                    "\(days) Days / \(hours) Hours / \(minutes) Minutes / \(seconds) Seconds"
+                }
+            }
+
+            let hostname: String
+            let ipAddresses: [String]
+            let serverTime: String
+            let uptime: Uptime
+            let panelVersion: String
+            let panelBuild: Int
+            let apiVersion: String
+        }
+
+        struct Utilization: Decodable {
+            struct Load: Decodable {
+                let minute1: Double
+                let minute5: Double
+                let minute15: Double
+                let cpuCount: Int
+                let percent: Double
+                let level: String
+            }
+
+            struct Memory: Decodable {
+                let free: Int
+                let used: Int
+                let total: Int
+                let percent: Double
+            }
+
+            struct Disk: Decodable {
+                let free: Int
+                let used: Int
+                let total: Int
+                let percent: Double
+            }
+
+            let processCount: Int
+            let emailsInQueue: Int?
+            let load: Load
+            let diskSpace: Disk
+            let memory: Memory
+            let swap: Memory
+        }
+
+        struct Components: Decodable {
+            let apache: String
+            let php: String
+            let mysql: String?
+            let mariadb: String?
+        }
+
+        struct Port: Decodable {
+            let service: String
+            let status: String
+            let port: Int
+            let proto: String
+
+            enum CodingKeys: String, CodingKey {
+                case service
+                case status
+                case port
+                case proto = "protocol"
+            }
+        }
+
+        struct AdditionalInterpreter: Decodable {
+            let version: String
+            let path: String?
+            let configFile: String?
+        }
+        
+        struct OperatingSystem: Decodable {
+            struct Updates: Decodable {
+                let updateCount: Int
+                let securityUpdateCount: Int
+                let rebootRequired: Bool
+
+                enum CodingKeys: String, CodingKey {
+                    case updateCount = "update_count"
+                    case securityUpdateCount = "security_update_count"
+                    case rebootRequired = "reboot_required"
+                }
+
+                init(from decoder: Decoder) throws {
+                    let container = try decoder.container(keyedBy: CodingKeys.self)
+                    updateCount = try container.decodeIfPresent(Int.self, forKey: .updateCount) ?? 0
+                    securityUpdateCount = try container.decodeIfPresent(Int.self, forKey: .securityUpdateCount) ?? 0
+                    rebootRequired = try container.decodeIfPresent(Bool.self, forKey: .rebootRequired) ?? false
+                }
+            }
+
+            let label: String
+            let distribution: String
+            let version: String
+            let architecture: String
+            let endOfLife: Bool
+            let updates: Updates?
+
+            enum CodingKeys: String, CodingKey {
+                case label
+                case distribution
+                case version
+                case architecture
+                case endOfLife = "end_of_life"
+                case updates
+            }
+
+            init(from decoder: Decoder) throws {
+                let container = try decoder.container(keyedBy: CodingKeys.self)
+                label = try container.decodeIfPresent(String.self, forKey: .label) ?? ""
+                distribution = try container.decodeIfPresent(String.self, forKey: .distribution) ?? ""
+                version = try container.decodeIfPresent(String.self, forKey: .version) ?? ""
+                architecture = try container.decodeIfPresent(String.self, forKey: .architecture) ?? ""
+                endOfLife = try container.decodeIfPresent(Bool.self, forKey: .endOfLife) ?? false
+                updates = try container.decodeIfPresent(Updates.self, forKey: .updates)
+            }
+        }
+
+        func toDomain() -> ServerInfo {
+            let load = utilization.load
+            let disk = utilization.diskSpace
+            let memory = utilization.memory
+            let swapMemory = utilization.swap
+
+            return ServerInfo(
+                hostname: meta.hostname,
+                ipAddresses: meta.ipAddresses,
+                cpuCores: load.cpuCount,
+                serverTime: meta.serverTime,
+                uptime: meta.uptime.formatted,
+                processCount: utilization.processCount,
+                apacheVersion: components.apache,
+                phpVersion: components.php,
+                mysqlVersion: components.mysql,
+                mariadbVersion: components.mariadb,
+                emailsInQueue: utilization.emailsInQueue,
+                operatingSystem: operatingSystem.map {
+                    ServerInfo.OperatingSystem(
+                        label: $0.label,
+                        distribution: $0.distribution,
+                        version: $0.version,
+                        architecture: $0.architecture,
+                        endOfLife: $0.endOfLife,
+                        updates: $0.updates.map {
+                            ServerInfo.OperatingSystem.UpdateStatus(
+                                updateCount: $0.updateCount,
+                                securityUpdateCount: $0.securityUpdateCount,
+                                rebootRequired: $0.rebootRequired
+                            )
+                        }
+                    )
+                },
+                ports: ports?.map {
+                    ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto)
+                },
+                load: ServerInfo.Load(
+                    minute1: load.minute1,
+                    minute5: load.minute5,
+                    minute15: load.minute15,
+                    percent: load.percent,
+                    cpuCount: load.cpuCount,
+                    level: load.level
+                ),
+                memory: ServerInfo.Memory(
+                    free: memory.free,
+                    used: memory.used,
+                    total: memory.total,
+                    percent: memory.percent
+                ),
+                swap: ServerInfo.Memory(
+                    free: swapMemory.free,
+                    used: swapMemory.used,
+                    total: swapMemory.total,
+                    percent: swapMemory.percent
+                ),
+                diskSpace: ServerInfo.DiskSpace(
+                    free: disk.free,
+                    used: disk.used,
+                    total: disk.total,
+                    percent: disk.percent
+                ),
+                panelVersion: meta.panelVersion,
+                panelBuild: String(meta.panelBuild),
+                apiVersion: meta.apiVersion,
+                additionalPHPInterpreters: additionalPhpInterpreters?.map {
+                    ServerInfo.PHPInterpreter(
+                        version: $0.version,
+                        path: $0.path,
+                        configFile: $0.configFile,
+                        extensions: [],
+                        memoryLimit: nil,
+                        maxExecutionTime: nil
+                    )
+                }
+            )
+        }
+    }
+}

Sources/Views/MainView.swift

@@ -103,16 +103,26 @@ struct MainView: View {
             }
         }
         .onAppear {
+            let initialID: UUID?
             if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
                let uuid = UUID(uuidString: storedID),
                servers.contains(where: { $0.id == uuid }) {
                 print("✅ [MainView] Restored selected server \(uuid)")
-                selectedServerID = uuid
-            } else if selectedServerID == nil, let first = servers.first {
+                initialID = uuid
+            } else if let first = servers.first {
                 print("✅ [MainView] Selecting first server \(first.hostname)")
-                selectedServerID = first.id
+                initialID = first.id
             } else {
                 print("ℹ️ [MainView] No stored selection")
+                initialID = nil
+            }
+
+            selectedServerID = initialID
+
+            if let initialID {
+                Task {
+                    await prefetchOtherServers(activeID: initialID)
+                }
             }
             pingAllServers()
             pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
@@ -158,6 +168,39 @@ struct MainView: View {
         }
     }
 
+    private func prefetchOtherServers(activeID: UUID) async {
+        let others = servers.filter { $0.id != activeID }
+        await withTaskGroup(of: Void.self) { group in
+            for server in others {
+                group.addTask {
+                    await fetchServerInfoAsync(for: server.id)
+                }
+            }
+        }
+    }
+
+    private func fetchServerInfoAsync(for id: UUID) async {
+        guard let server = servers.first(where: { $0.id == id }) else { return }
+        guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines),
+              !apiKey.isEmpty,
+              let baseURL = URL(string: "https://\(server.hostname)")
+        else { return }
+
+        do {
+            let api = try await APIFactory.detectAndCreateAPI(baseURL: baseURL, apiKey: apiKey)
+            let info = try await api.fetchServerSummary(apiKey: apiKey)
+            await MainActor.run {
+                if let index = servers.firstIndex(where: { $0.id == id }) {
+                    var updated = servers[index]
+                    updated.info = info
+                    servers[index] = updated
+                }
+            }
+        } catch {
+            print("❌ Prefetch failed for \(server.hostname): \(error)")
+        }
+    }
+    
     private func moveServer(from source: IndexSet, to destination: Int) {
         servers.move(fromOffsets: source, toOffset: destination)
         saveServerOrder()

Sources/Views/PreferencesView.swift

@@ -0,0 +1,259 @@
+import SwiftUI
+
+struct PreferencesView: View {
+    private enum Tab: CaseIterable {
+        case monitor, notifications, alerts
+
+        var title: String {
+            switch self {
+            case .monitor: return "Monitor"
+            case .notifications: return "Notifications"
+            case .alerts: return "Alerts"
+            }
+        }
+
+        var icon: String {
+            switch self {
+            case .monitor: return "waveform.path.ecg"
+            case .notifications: return "bell.badge"
+            case .alerts: return "exclamationmark.triangle"
+            }
+        }
+    }
+
+    @AppStorage("pingInterval") private var storedPingInterval: Int = 10
+    @AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
+    @AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
+
+    @State private var pingIntervalSlider: Double = 10
+    @State private var refreshIntervalSlider: Double = 60
+    @State private var selection: Tab = .monitor
+    @State private var hoveredTab: Tab?
+
+    private let minimumInterval: Double = 10
+    private let maximumPingInterval: Double = 60
+    private let maximumRefreshInterval: Double = 600
+
+    var body: some View {
+        HStack(spacing: 0) {
+            sidebar
+            Divider()
+            ScrollView {
+                detailContent(for: selection)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding()
+            }
+            .frame(minWidth: 360, maxWidth: .infinity, maxHeight: .infinity)
+        }
+        .frame(minWidth: 560, minHeight: 360)
+        .onAppear {
+            pingIntervalSlider = Double(storedPingInterval)
+            refreshIntervalSlider = Double(storedRefreshInterval)
+        }
+        .onChange(of: pingIntervalSlider) { _, newValue in
+            storedPingInterval = Int(newValue)
+        }
+        .onChange(of: refreshIntervalSlider) { _, newValue in
+            storedRefreshInterval = Int(newValue)
+        }
+    }
+
+    private var sidebar: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("Preferences")
+                .font(.headline)
+                .padding(.bottom, 8)
+
+            ForEach(Tab.allCases, id: \.self) { tab in
+                Button {
+                    selection = tab
+                } label: {
+                    HStack(spacing: 10) {
+                        Image(systemName: tab.icon)
+                            .frame(width: 20)
+                        Text(tab.title)
+                        Spacer()
+                    }
+                    .padding(.vertical, 8)
+                    .padding(.horizontal, 10)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                }
+                .buttonStyle(.plain)
+                .focusable(false)
+                .contentShape(Capsule())
+                .background(
+                    Capsule(style: .continuous)
+                        .fill(backgroundColor(for: tab))
+                )
+                .foregroundColor(selection == tab ? .white : .primary)
+                .onHover { isHovering in
+                    hoveredTab = isHovering ? tab : (hoveredTab == tab ? nil : hoveredTab)
+                }
+            }
+
+            Spacer()
+        }
+        .padding()
+        .frame(width: 180, alignment: .top)
+    }
+
+    @ViewBuilder
+    private func detailContent(for tab: Tab) -> some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text(tab.title)
+                .font(.title2)
+                .padding(.bottom, 12)
+
+            switch tab {
+            case .monitor:
+                MonitorPreferencesView(
+                    pingIntervalSlider: $pingIntervalSlider,
+                    refreshIntervalSlider: $refreshIntervalSlider,
+                    showIntervalIndicator: $showIntervalIndicator,
+                    minimumInterval: minimumInterval,
+                    maximumPingInterval: maximumPingInterval,
+                    maximumRefreshInterval: maximumRefreshInterval,
+                    pingChanged: handlePingSliderEditing(_:),
+                    refreshChanged: handleRefreshSliderEditing(_:)
+                )
+            case .notifications:
+                NotificationsPreferencesView()
+            case .alerts:
+                AlertsPreferencesView()
+            }
+        }
+    }
+
+    private func handlePingSliderEditing(_ editing: Bool) {
+        if !editing {
+            storedPingInterval = Int(pingIntervalSlider)
+        }
+    }
+
+    private func handleRefreshSliderEditing(_ editing: Bool) {
+        if !editing {
+            storedRefreshInterval = Int(refreshIntervalSlider)
+        }
+    }
+    private func backgroundColor(for tab: Tab) -> Color {
+        if selection == tab {
+            return Color.accentColor
+        }
+        if hoveredTab == tab {
+            return Color.accentColor.opacity(0.2)
+        }
+        return Color.accentColor.opacity(0.08)
+    }
+}
+
+private struct MonitorPreferencesView: View {
+    @Binding var pingIntervalSlider: Double
+    @Binding var refreshIntervalSlider: Double
+    @Binding var showIntervalIndicator: Bool
+
+    let minimumInterval: Double
+    let maximumPingInterval: Double
+    let maximumRefreshInterval: Double
+    let pingChanged: (Bool) -> Void
+    let refreshChanged: (Bool) -> Void
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 24) {
+            intervalSection(
+                title: "Ping interval",
+                value: $pingIntervalSlider,
+                range: minimumInterval...maximumPingInterval,
+                onEditingChanged: pingChanged
+            )
+
+            intervalSection(
+                title: "Refresh interval",
+                value: $refreshIntervalSlider,
+                range: minimumInterval...maximumRefreshInterval,
+                onEditingChanged: refreshChanged
+            )
+
+            Divider()
+
+            Toggle("Show interval indicator", isOn: $showIntervalIndicator)
+                .toggleStyle(.switch)
+
+            Spacer()
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+    }
+
+    private func intervalSection(
+        title: String,
+        value: Binding<Double>,
+        range: ClosedRange<Double>,
+        onEditingChanged: @escaping (Bool) -> Void
+    ) -> some View {
+        VStack(alignment: .leading, spacing: 8) {
+            HStack {
+                Text(title)
+                    .font(.headline)
+                Spacer()
+                Text("\(Int(value.wrappedValue)) seconds")
+                    .font(.subheadline)
+                    .foregroundColor(.secondary)
+            }
+
+            Slider(
+                value: value,
+                in: range,
+                step: 5
+            ) {
+                Text(title)
+            } minimumValueLabel: {
+                Text("\(Int(range.lowerBound))s")
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+            } maximumValueLabel: {
+                Text("\(Int(range.upperBound))s")
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+            } onEditingChanged: { editing in
+                onEditingChanged(editing)
+            }
+        }
+    }
+}
+
+private struct NotificationsPreferencesView: View {
+    var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("Notifications")
+                .font(.headline)
+                .padding(.bottom)
+
+            Text("Configure notification behavior here.")
+                .foregroundColor(.secondary)
+
+            Spacer()
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding()
+    }
+}
+
+private struct AlertsPreferencesView: View {
+    var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("Alerts")
+                .font(.headline)
+                .padding(.bottom)
+
+            Text("Configure alert thresholds and behavior.")
+                .foregroundColor(.secondary)
+
+            Spacer()
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding()
+    }
+}
+
+#Preview {
+    PreferencesView()
+}

Sources/Views/Rows/TableRowView.swift

@@ -17,6 +17,7 @@ struct TableRowView<Label: View, Value: View>: View {
             HStack(alignment: .top) {
                 label()
                     .frame(width: 180, alignment: .leading)
+                    .unredacted()
                 
                 value()
                     .frame(maxWidth: .infinity, alignment: .leading)

Sources/Views/ServerDetailView.swift

@@ -0,0 +1,98 @@
+//
+//  ServerDetailView.swift
+//  iKeyMon
+//
+//  Created by tracer on 30.03.25.
+//
+
+import SwiftUI
+
+struct ServerDetailView: View {
+    @Binding var server: Server
+    var isFetching: Bool
+    @AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
+    
+    private var showPlaceholder: Bool {
+        server.info == nil
+    }
+    
+    @State private var progress: Double = 0
+    let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
+    
+    var body: some View {
+        VStack(spacing: 0) {
+            if showIntervalIndicator {
+                ProgressView(value: progress)
+                    .progressViewStyle(LinearProgressViewStyle())
+                    .padding(.horizontal)
+                    .frame(height: 2)
+            }
+            
+            ZStack(alignment: .topTrailing) {
+                VStack(spacing: 0) {
+                    Spacer().frame(height: 6)
+                    TabView {
+                        GeneralView(server: resolvedBinding)
+                            .tabItem {
+                                Text("General").unredacted()
+                            }
+                        ResourcesView(server: resolvedBinding)
+                            .tabItem {
+                                Text("Resources").unredacted()
+                            }
+                        ServicesView(server: resolvedBinding)
+                            .tabItem {
+                                Text("Services").unredacted()
+                            }
+                    }
+                    .redacted(reason: showPlaceholder ? .placeholder : [])
+                    .shimmering(active: showPlaceholder)
+                }
+                
+                if showPlaceholder || isFetching {
+                    LoadingBadge()
+                        .padding()
+                }
+            }
+            .padding(0)
+        }
+        .onReceive(timer) { _ in
+            guard showIntervalIndicator else { return }
+            withAnimation(.linear(duration: 1.0 / 60.0)) {
+                progress += 1.0 / (60.0 * 60.0)
+                if progress >= 1 { progress = 0 }
+            }
+        }
+    }
+    
+    private var resolvedBinding: Binding<Server> {
+        if showPlaceholder {
+            return .constant(placeholderServer())
+        }
+        return $server
+    }
+    
+    private func placeholderServer() -> Server {
+        Server(id: server.id, hostname: server.hostname, info: .placeholder, pingable: server.pingable)
+    }
+}
+
+#Preview {
+    ServerDetailView(
+        server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
+        isFetching: false
+    )
+}
+
+private struct LoadingBadge: View {
+    var body: some View {
+        HStack(spacing: 6) {
+            ProgressView()
+                .scaleEffect(0.5)
+            Text("Fetching latest data…")
+                .font(.caption)
+        }
+        .padding(8)
+        .background(.ultraThinMaterial, in: Capsule())
+    }
+}

Sources/Views/ServerFormView.swift

@@ -185,7 +185,7 @@ struct ServerFormView: View {
             print("adding server")
             let newServer = Server(hostname: trimmedHost)
             servers.append(newServer)
-            KeychainHelper.save(apiKey: trimmedKey, for: trimmedHost)
+            KeychainHelper.saveApiKey(trimmedKey, for: trimmedHost)
             saveServers()
         case .edit(let oldServer):
             if let index = servers.firstIndex(where: { $0.id == oldServer.id }) {
@@ -194,7 +194,7 @@ struct ServerFormView: View {
                 if oldHostname != trimmedHost {
                     KeychainHelper.deleteApiKey(for: oldHostname)
                 }
-                KeychainHelper.save(apiKey: trimmedKey, for: trimmedHost)
+                KeychainHelper.saveApiKey(trimmedKey, for: trimmedHost)
             }
         }
     }
@@ -214,7 +214,7 @@ struct ServerFormView: View {
             if oldHostname != hostname {
                 KeychainHelper.deleteApiKey(for: oldHostname)
             }
-            KeychainHelper.save(apiKey: apiKey, for: hostname)
+            KeychainHelper.saveApiKey(apiKey, for: hostname)
             saveServers()
         }
     }

Sources/Views/Tabs/GeneralView.swift

@@ -0,0 +1,133 @@
+//
+//  GeneralTab.swift
+//  iKeyMon
+//
+//  Created by tracer on 30.03.25.
+//
+
+import SwiftUI
+
+struct GeneralView: View {
+    @Binding var server: Server
+    
+    var body: some View {
+        GeometryReader { geometry in
+            ScrollView {
+                VStack(alignment: .leading, spacing: 6) {
+                    TableRowView {
+                        Text("Hostname")
+                    } value: {
+                        InfoCell(value: [server.hostname])
+                    }
+                    
+                    TableRowView {
+                        Text("IP addresses")
+                    } value: {
+                        InfoCell(value: server.info?.ipAddresses ?? [], monospaced: true)
+                    }
+                    
+                    TableRowView {
+                        Text("Server time")
+                    } value: {
+                        InfoCell(value: [server.info?.formattedServerTime ?? ""], monospaced: true)
+                    }
+
+                    TableRowView {
+                        Text("Uptime")
+                    } value: {
+                        InfoCell(value: [server.info?.uptime ?? ""])
+                    }
+
+                    TableRowView {
+                        Text("KeyHelp version")
+                    } value: {
+                        InfoCell(value: [server.info?.formattedVersion ?? ""], monospaced: true)
+                    }
+
+                    TableRowView {
+                        Text("Operating system")
+                    } value: {
+                        InfoCell(
+                            value: {
+                                guard let os = server.info?.operatingSystem else { return [] }
+                                var rows: [String] = []
+
+                                let distro = [os.distribution, os.version]
+                                    .filter { !$0.isEmpty }
+                                    .joined(separator: " ")
+                                    .trimmingCharacters(in: .whitespacesAndNewlines)
+                                var description = os.label.trimmingCharacters(in: .whitespacesAndNewlines)
+                                if description.isEmpty {
+                                    description = distro
+                                } else if !distro.isEmpty && distro.caseInsensitiveCompare(description) != .orderedSame {
+                                    description += " • \(distro)"
+                                }
+                                if !os.architecture.isEmpty {
+                                    description += " (\(os.architecture))"
+                                }
+                                if !description.isEmpty {
+                                    rows.append(description)
+                                }
+
+                                if let updates = os.updates {
+                                    var updateDescription = "Updates: \(updates.updateCount)"
+                                    if updates.securityUpdateCount > 0 {
+                                        updateDescription += " • \(updates.securityUpdateCount) security"
+                                    }
+                                    rows.append(updateDescription)
+                                    if updates.rebootRequired {
+                                        rows.append("Reboot required")
+                                    }
+                                }
+
+                                if os.endOfLife {
+                                    rows.append("End-of-life release")
+                                }
+
+                                return rows
+                            }(),
+                            monospaced: true
+                        )
+                    }
+
+                    TableRowView {
+                        Text("Sytem PHP version")
+                    } value: {
+                        InfoCell(value: [server.info?.phpVersion ?? ""], monospaced: true)
+                    }
+
+                    TableRowView(showDivider: false) {
+                        Text("Additional PHP interpreters")
+                    } value: {
+                        InfoCell(
+                            value: {
+                                let interpreters = server.info?.additionalPHPInterpreters ?? []
+                                if interpreters.isEmpty {
+                                    return ["None"]
+                                }
+                                return interpreters.map { $0.versionFull }
+                            }(),
+                            monospaced: true
+                        )
+                    }
+                }
+                .padding()
+                .frame(minHeight: geometry.size.height, alignment: .top)
+            }
+            .padding()
+            .scrollDisabled(true)
+        }
+    }
+}
+
+#Preview {
+    struct PreviewWrapper: View {
+        @State var previewServer = Server(hostname: "example.com", info: .placeholder)
+
+        var body: some View {
+            GeneralView(server: $previewServer)
+        }
+    }
+
+    return PreviewWrapper()
+}

Sources/iKeyMonApp.swift

@@ -6,9 +6,20 @@
 //
 
 import SwiftUI
+#if os(macOS)
+import AppKit
+#endif
 
 @main
 struct iKeyMonApp: App {
+    init() {
+        #if os(macOS)
+        if let customIcon = NSImage(named: "AppIcon") {
+            NSApplication.shared.applicationIconImage = customIcon
+        }
+        #endif
+    }
+
     var body: some Scene {
         WindowGroup {
             MainView()
@@ -17,5 +28,10 @@ struct iKeyMonApp: App {
                 }
         }
         .windowResizability(.contentMinSize)
+
+        Settings {
+            PreferencesView()
+                .padding()
+        }
     }
 }

Views/ServerDetailView.swift

@@ -1,70 +0,0 @@
-//
-//  ServerDetailView.swift
-//  iKeyMon
-//
-//  Created by tracer on 30.03.25.
-//
-
-import SwiftUI
-
-struct ServerDetailView: View {
-    @Binding var server: Server
-    var isFetching: Bool
-    
-    @State private var progress: Double = 0
-    let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
-    
-    var body: some View {
-        VStack(spacing: 0) {
-            ProgressView(value: progress)
-                .progressViewStyle(LinearProgressViewStyle())
-                .padding(.horizontal)
-                .frame(height: 2)
-            
-            if server.info == nil {
-                ProgressView("Fetching server info...")
-                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-            } else {
-                ZStack(alignment: .topTrailing) {
-                    VStack(spacing: 0) {
-                        Spacer().frame(height: 6)
-                        TabView {
-                            GeneralView(server: $server)
-                                .tabItem {
-                                    Text("General")
-                                }
-                            ResourcesView(server: $server)
-                                .tabItem {
-                                    Text("Resources")
-                                }
-                            ServicesView(server: $server)
-                                .tabItem {
-                                    Text("Services")
-                                }
-                        }
-                    }
-                    
-                    if isFetching {
-                        ProgressView()
-                            .scaleEffect(0.5)
-                            .padding()
-                    }
-                }
-                .padding(0)
-            }
-        }
-        .onReceive(timer) { _ in
-            withAnimation(.linear(duration: 1.0 / 60.0)) {
-                progress += 1.0 / (60.0 * 60.0)
-                if progress >= 1 { progress = 0 }
-            }
-        }
-    }
-}
-
-#Preview {
-    ServerDetailView(
-        server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
-        isFetching: false
-    )
-}

Views/Tabs/GeneralView.swift

@@ -1,81 +0,0 @@
-//
-//  GeneralTab.swift
-//  iKeyMon
-//
-//  Created by tracer on 30.03.25.
-//
-
-import SwiftUI
-
-struct GeneralView: View {
-    @Binding var server: Server
-    
-    var body: some View {
-        GeometryReader { geometry in
-            ScrollView {
-                VStack(alignment: .leading, spacing: 6) {
-                    TableRowView {
-                        Text("Hostname")
-                    } value: {
-                        InfoCell(value: [server.hostname])
-                    }
-                    
-                    TableRowView {
-                        Text("IP addresses")
-                    } value: {
-                        InfoCell(value: server.info?.ipAddresses ?? [], monospaced: true)
-                    }
-                    
-                    TableRowView {
-                        Text("Server time")
-                    } value: {
-                        InfoCell(value: [server.info?.formattedServerTime ?? ""], monospaced: true)
-                    }
-
-                    TableRowView {
-                        Text("Uptime")
-                    } value: {
-                        InfoCell(value: [server.info?.uptime ?? ""])
-                    }
-
-                    TableRowView {
-                        Text("KeyHelp version")
-                    } value: {
-                        InfoCell(value: [server.info?.formattedVersion ?? ""], monospaced: true)
-                    }
-
-                    TableRowView {
-                        Text("Sytem PHP version")
-                    } value: {
-                        InfoCell(value: [server.info?.phpVersion ?? ""], monospaced: true)
-                    }
-
-                    TableRowView(showDivider: false) {
-                        Text("Additional PHP interpreters")
-                    } value: {
-                        InfoCell(
-                            value: server.info?.additionalPHPInterpreters?.map { $0.versionFull } ?? [],
-                            monospaced: true
-                        )
-                    }
-                }
-                .padding()
-                .frame(minHeight: geometry.size.height, alignment: .top)
-            }
-            .padding()
-            .scrollDisabled(true)
-        }
-    }
-}
-
-#Preview {
-    struct PreviewWrapper: View {
-        @State var previewServer = Server(hostname: "example.com", info: .placeholder)
-
-        var body: some View {
-            GeneralView(server: $previewServer)
-        }
-    }
-
-    return PreviewWrapper()
-}

iKeyMon.xcodeproj/project.pbxproj

@@ -7,42 +7,31 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		52A9B79B2EC8E7EE004DD4A2 /* iKeyMonApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A9B7892EC8E7EE004DD4A2 /* iKeyMonApp.swift */; };
-		52A9B79C2EC8E7EE004DD4A2 /* KeychainHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A9B78A2EC8E7EE004DD4A2 /* KeychainHelper.swift */; };
 		52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
 		52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
+		52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B9712ECF751C004DD4A2 /* signing.env.example */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		5203C24D2D997D2800576D4A /* iKeyMon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iKeyMon.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iKeyMon.entitlements; sourceTree = "<group>"; };
-		52A9B7892EC8E7EE004DD4A2 /* iKeyMonApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iKeyMonApp.swift; sourceTree = "<group>"; };
-		52A9B78A2EC8E7EE004DD4A2 /* KeychainHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainHelper.swift; sourceTree = "<group>"; };
 		52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
+		52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = NOTES.md; sourceTree = "<group>"; };
+		52A9B9712ECF751C004DD4A2 /* signing.env.example */ = {isa = PBXFileReference; lastKnownFileType = text; path = signing.env.example; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		52A9B7A12EC8E84F004DD4A2 /* Extensions */ = {
+		52A9B8BE2ECB68B5004DD4A2 /* Sources */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			path = Extensions;
+			path = Sources;
 			sourceTree = "<group>";
 		};
-		52A9B7A72EC8E857004DD4A2 /* Model */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			path = Model;
-			sourceTree = "<group>";
-		};
-		52A9B7AC2EC8E85E004DD4A2 /* Preview Content */ = {
+		52A9B8F72ECB6B8A004DD4A2 /* Preview Content */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			path = "Preview Content";
 			sourceTree = "<group>";
 		};
-		52A9B7BC2EC8E86C004DD4A2 /* Views */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			path = Views;
-			sourceTree = "<group>";
-		};
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -59,16 +48,14 @@
 		5203C2442D997D2800576D4A = {
 			isa = PBXGroup;
 			children = (
+				52A9B8BE2ECB68B5004DD4A2 /* Sources */,
 				52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
-				52A9B7A72EC8E857004DD4A2 /* Model */,
 				52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
-				52A9B7A12EC8E84F004DD4A2 /* Extensions */,
-				52A9B7AC2EC8E85E004DD4A2 /* Preview Content */,
-				52A9B7892EC8E7EE004DD4A2 /* iKeyMonApp.swift */,
-				52A9B7BC2EC8E86C004DD4A2 /* Views */,
-				52A9B78A2EC8E7EE004DD4A2 /* KeychainHelper.swift */,
+				52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
 				5203C24E2D997D2800576D4A /* Products */,
 				52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
+				52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */,
+				52A9B9712ECF751C004DD4A2 /* signing.env.example */,
 			);
 			sourceTree = "<group>";
 		};
@@ -96,10 +83,8 @@
 			dependencies = (
 			);
 			fileSystemSynchronizedGroups = (
-				52A9B7A12EC8E84F004DD4A2 /* Extensions */,
-				52A9B7A72EC8E857004DD4A2 /* Model */,
-				52A9B7AC2EC8E85E004DD4A2 /* Preview Content */,
-				52A9B7BC2EC8E86C004DD4A2 /* Views */,
+				52A9B8BE2ECB68B5004DD4A2 /* Sources */,
+				52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
 			);
 			name = iKeyMon;
 			packageProductDependencies = (
@@ -149,6 +134,7 @@
 			files = (
 				52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
 				52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
+				52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -159,8 +145,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				52A9B79B2EC8E7EE004DD4A2 /* iKeyMonApp.swift in Sources */,
-				52A9B79C2EC8E7EE004DD4A2 /* KeychainHelper.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -299,6 +283,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleIconName = AppIcon;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -326,6 +311,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleIconName = AppIcon;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

scripts/build_release.sh

@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+BUILD_DIR="$ROOT_DIR/build"
+ARTIFACTS_DIR="$ROOT_DIR/dist"
+SCHEME="iKeyMon"
+PROJECT="iKeyMon.xcodeproj"
+CREDENTIALS_FILE="$ROOT_DIR/.signing.env"
+
+if [[ -f "$CREDENTIALS_FILE" ]]; then
+  # shellcheck disable=SC1090
+  source "$CREDENTIALS_FILE"
+fi
+
+rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
+mkdir -p "$ARTIFACTS_DIR"
+
+xcodebuild \
+  -project "$ROOT_DIR/$PROJECT" \
+  -scheme "$SCHEME" \
+  -configuration Release \
+  -derivedDataPath "$BUILD_DIR" \
+  CODE_SIGNING_ALLOWED=NO \
+  clean build
+
+APP_PATH="$BUILD_DIR/Build/Products/Release/iKeyMon.app"
+if [[ ! -d "$APP_PATH" ]]; then
+  echo "❌ Failed to find built app at $APP_PATH"
+  exit 1
+fi
+
+if [[ -n "${CODESIGN_IDENTITY:-}" ]]; then
+  echo "🔏 Codesigning app with identity: $CODESIGN_IDENTITY"
+  codesign \
+    --deep \
+    --force \
+    --options runtime \
+    --timestamp \
+    --entitlements "$ROOT_DIR/iKeyMon.entitlements" \
+    --sign "$CODESIGN_IDENTITY" \
+    "$APP_PATH"
+else
+  echo "⚠️ Skipping codesign (CODESIGN_IDENTITY not set)."
+fi
+
+STAGING_DIR=$(mktemp -d)
+mkdir -p "$STAGING_DIR"
+cp -R "$APP_PATH" "$STAGING_DIR/"
+ln -s /Applications "$STAGING_DIR/Applications"
+mkdir -p "$STAGING_DIR/.background"
+cp "$ROOT_DIR/Assets/dmg_background.png" "$STAGING_DIR/.background/background.png"
+
+VERSION=$(xcodebuild \
+  -project "$ROOT_DIR/$PROJECT" \
+  -scheme "$SCHEME" \
+  -configuration Release \
+  -showBuildSettings | awk '/MARKETING_VERSION/ {print $3; exit}')
+if [[ -z "$VERSION" ]]; then
+  VERSION="dev"
+fi
+ZIP_NAME="iKeyMon-${VERSION}.zip"
+pushd "$(dirname "$APP_PATH")" >/dev/null
+zip -r "$ARTIFACTS_DIR/$ZIP_NAME" "$(basename "$APP_PATH")"
+popd >/dev/null
+
+DMG_NAME="iKeyMon-${VERSION}.dmg"
+hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
+
+if [[ -n "${NOTARY_APPLE_ID:-}" && -n "${NOTARY_TEAM_ID:-}" && -n "${NOTARY_PASSWORD:-}" ]]; then
+  echo "📝 Submitting DMG for notarization..."
+  xcrun notarytool submit "$ARTIFACTS_DIR/$DMG_NAME" \
+    --apple-id "$NOTARY_APPLE_ID" \
+    --team-id "$NOTARY_TEAM_ID" \
+    --password "$NOTARY_PASSWORD" \
+    --wait
+  xcrun stapler staple "$ARTIFACTS_DIR/$DMG_NAME"
+else
+  echo "⚠️ Skipping notarization (NOTARY_* variables not set)."
+fi
+rm -rf "$STAGING_DIR"
+
+echo "✅ Build complete. Artifacts:"
+echo "   - $ARTIFACTS_DIR/$ZIP_NAME"
+echo "   - $ARTIFACTS_DIR/$DMG_NAME"

signing.env.example

@@ -0,0 +1,4 @@
+CODESIGN_IDENTITY="Developer ID Application: Your Name (TEAMID1234)"
+NOTARY_APPLE_ID="appleid@example.com"
+NOTARY_TEAM_ID="TEAMID1234"
+NOTARY_PASSWORD="app-specific-password"