Add DMG packaging to release script

.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+xcuserdata/
+DerivedData/
+build/
+Build/

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## Unreleased
+- Flattened the project structure so sources live at the repository root instead of the nested `iKeyMon/` folder and updated the Xcode project accordingly.
+- Fixed build settings (entitlements, preview assets) and placeholder previews to work with the new layout.
+- Migrated the updated API layer and unified `ServerInfo` model from the previous branch.
+- Added verbose logging in `MainView` to trace server loading, selection, and fetch/ping activity when the list appears empty.
+- Switched `MainView` and `ServerFormView` to the version-aware API client (`APIFactory`/`APIv2_12`) for server summaries and introduced a shared `PingService`.
+- Detection now probes `meta.api_version` so future API versions are selected automatically, and the ping loop logs only failures to keep output quiet.
+- Further reduced MainView console noise by removing redundant refresh/onAppear logs.

NOTES.md

@@ -0,0 +1,7 @@
+- add tooltip for:
+    Ping (est time consideration)
+    dynamic Data
+    static Data
+
+move source to /src. like iKeyMon before
+add a merker for "reboot required"

README.md

@@ -30,12 +30,22 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
 ## 🚀 How to Run
 
 Clone the repo and open it in [Xcode](https://developer.apple.com/xcode/). You can build and run the app on macOS 14+.
-                                      
+                                     
 ```
 git clone https://git.24unix.net/tracer/iKeyMon
 cd iKeyMon
 open iKeyMon.xcodeproj
 ```
+
+### Local release build
+
+Use the helper script to produce a zipped `.app` in `dist/`:
+
+```bash
+./scripts/build_release.sh
+```
+
+It cleans previous artifacts, builds the `Release` configuration, and drops `iKeyMon-<version>.zip` into the `dist` folder (ignored by git).
 ## 📦 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

@@ -0,0 +1,117 @@
+//
+//  ApiFactory.swift
+//  iKeyMon
+//
+//  Created by tracer on 13.11.25.
+//
+
+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) {
+            return version
+        }
+        
+        let components = versionString.split(separator: ".").compactMap { Int($0) }
+        guard components.count >= 2 else { return nil }
+        
+        let major = components[0]
+        let minor = components[1]
+        
+        switch (major, minor) {
+        case (2, 12): return .v2_12
+        case (2, 13...): return .v2_13
+        default: return nil
+        }
+    }
+}
+
+protocol AnyServerAPI {
+    func fetchSystemInfo() async throws -> SystemInfo
+    func fetchLoadData() async throws -> Any
+    func fetchMemoryData() async throws -> Any
+    func fetchUtilizationData() async throws -> Any
+    func fetchServerSummary(apiKey: String) async throws -> ServerInfo
+}
+
+private struct AnyServerAPIWrapper<T: ServerAPIProtocol>: AnyServerAPI {
+    private let wrapped: T
+    
+    init(_ wrapped: T) {
+        self.wrapped = wrapped
+    }
+    
+    func fetchSystemInfo() async throws -> SystemInfo {
+        return try await wrapped.fetchSystemInfo()
+    }
+    
+    func fetchLoadData() async throws -> Any {
+        return try await wrapped.fetchLoad()
+    }
+    
+    func fetchMemoryData() async throws -> Any {
+        return try await wrapped.fetchMemory()
+    }
+    
+    func fetchUtilizationData() async throws -> Any {
+        return try await wrapped.fetchUtilization()
+    }
+
+    func fetchServerSummary(apiKey: String) async throws -> ServerInfo {
+        return try await wrapped.fetchServerSummary(apiKey: apiKey)
+    }
+}
+
+class APIFactory {
+    static func createAPI(baseURL: URL, version: APIVersion) -> AnyServerAPI {
+        switch version {
+        case .v2_12:
+            return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
+        case .v2_13:
+            return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
+        }
+    }
+    
+    static func createAPI(baseURL: URL, versionString: String) -> AnyServerAPI? {
+        guard let version = APIVersion.from(versionString: versionString) else { return nil }
+        return createAPI(baseURL: baseURL, version: version)
+    }
+    
+    static func detectAndCreateAPI(baseURL: URL, apiKey: String? = nil) async throws -> AnyServerAPI {
+        if let apiKey, !apiKey.isEmpty {
+            do {
+                let versionURL = baseURL.appendingPathComponent("api/v2/server")
+                var request = URLRequest(url: versionURL)
+                request.httpMethod = "GET"
+                request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
+                request.timeoutInterval = 15
+
+                let (data, response) = try await URLSession.shared.data(for: request)
+                if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 {
+                    let decoder = JSONDecoder()
+                    decoder.keyDecodingStrategy = .convertFromSnakeCase
+                    let probe = try decoder.decode(ServerMetaProbe.self, from: data)
+                    if let api = createAPI(baseURL: baseURL, versionString: probe.meta.apiVersion) {
+                        return api
+                    }
+                }
+            } catch {
+                // Fall back to default version below
+            }
+        }
+
+        return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
+    }
+}
+
+private struct ServerMetaProbe: Decodable {
+    struct Meta: Decodable {
+        let apiVersion: String
+    }
+
+    let meta: Meta
+}

Sources/Model/API/ApiManager.swift

@@ -0,0 +1,64 @@
+//
+//  ApiManager.swift
+//  iKeyMon
+//
+//  Created by tracer on 13.11.25.
+//
+
+import Foundation
+import Combine
+
+@MainActor
+class APIManager: ObservableObject {
+    @Published var isConnected = false
+    @Published var currentVersion: String = ""
+    @Published var lastError: Error?
+    
+    private var api: AnyServerAPI?
+    private let baseURL: URL
+    
+    init(baseURL: URL) {
+        self.baseURL = baseURL
+    }
+    
+    func connect() async {
+        do {
+            self.api = try await APIFactory.detectAndCreateAPI(baseURL: baseURL)
+            let systemInfo = try await api!.fetchSystemInfo()
+            self.currentVersion = systemInfo.version
+            self.isConnected = true
+            self.lastError = nil
+        } catch {
+            self.isConnected = false
+            self.lastError = error
+            self.api = nil
+        }
+    }
+    
+    func disconnect() {
+        self.api = nil
+        self.isConnected = false
+        self.currentVersion = ""
+        self.lastError = nil
+    }
+    
+    func fetchSystemInfo() async throws -> SystemInfo {
+        guard let api = api else { throw APIError.invalidResponse }
+        return try await api.fetchSystemInfo()
+    }
+    
+    func fetchLoad() async throws -> Any {
+        guard let api = api else { throw APIError.invalidResponse }
+        return try await api.fetchLoadData()
+    }
+    
+    func fetchMemory() async throws -> Any {
+        guard let api = api else { throw APIError.invalidResponse }
+        return try await api.fetchMemoryData()
+    }
+    
+    func fetchUtilization() async throws -> Any {
+        guard let api = api else { throw APIError.invalidResponse }
+        return try await api.fetchUtilizationData()
+    }
+}

Sources/Model/API/BaseAPI.swift

@@ -0,0 +1,67 @@
+//
+//  BaseAPI.swift
+//  iKeyMon
+//
+//  Created by tracer on 13.11.25.
+//
+
+
+import Foundation
+
+protocol ServerAPIProtocol {
+    associatedtype LoadType: Codable
+    associatedtype MemoryType: Codable
+    associatedtype UtilizationType: Codable
+    
+    func fetchSystemInfo() async throws -> SystemInfo
+    func fetchLoad() async throws -> LoadType
+    func fetchMemory() async throws -> MemoryType
+    func fetchUtilization() async throws -> UtilizationType
+    func fetchServerSummary(apiKey: String) async throws -> ServerInfo
+}
+
+struct SystemInfo: Codable {
+    let version: String
+    let timestamp: Date
+    let hostname: String
+}
+
+class BaseAPIClient {
+    let baseURL: URL
+    let session: URLSession
+    
+    init(baseURL: URL, session: URLSession = .shared) {
+        self.baseURL = baseURL
+        self.session = session
+    }
+    
+    func performRequest<T: Codable>(_ request: URLRequest, responseType: T.Type) async throws -> T {
+        let (data, response) = try await session.data(for: request)
+        
+        guard let httpResponse = response as? HTTPURLResponse else {
+            throw APIError.invalidResponse
+        }
+        
+        guard 200...299 ~= httpResponse.statusCode else {
+            throw APIError.httpError(httpResponse.statusCode)
+        }
+        
+        return try JSONDecoder().decode(T.self, from: data)
+    }
+}
+
+enum APIError: Error, LocalizedError {
+    case invalidURL
+    case invalidResponse
+    case httpError(Int)
+    case decodingError(Error)
+    
+    var errorDescription: String? {
+        switch self {
+        case .invalidURL: return "Invalid URL"
+        case .invalidResponse: return "Invalid response"
+        case .httpError(let code): return "HTTP Error: \(code)"
+        case .decodingError(let error): return "Decoding error: \(error.localizedDescription)"
+        }
+    }
+}

Sources/Model/API/PingService.swift

@@ -0,0 +1,34 @@
+import Foundation
+
+enum PingService {
+    static func ping(hostname: String, apiKey: String) async -> Bool {
+        guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
+            print("❌ [PingService] Invalid URL for \(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)
+            if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode != 200 {
+                if let responseString = String(data: data, encoding: .utf8) {
+                    print("❌ [PingService] HTTP \(httpResponse.statusCode): \(responseString)")
+                }
+                return false
+            }
+
+            if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
+                return true
+            } else {
+                return false
+            }
+        } catch {
+            print("❌ [PingService] Error pinging \(hostname): \(error)")
+            return false
+        }
+    }
+}

Sources/Model/API/Server.swift

@@ -0,0 +1,55 @@
+//
+//  Server.swift
+//  iKeyMon
+//
+//  Created by tracer on 30.03.25.
+//
+
+import Foundation
+
+struct Server: Identifiable, Codable, Hashable, Equatable {
+    let id: UUID
+    var hostname: String
+    var info: ServerInfo?
+    var pingable: Bool
+
+    init(id: UUID = UUID(), hostname: String, info: ServerInfo? = nil, pingable: Bool = false) {
+        self.id = id
+        self.hostname = hostname
+        self.info = info
+        self.pingable = pingable
+    }
+
+    // MARK: - Manual conformance
+
+    static func == (lhs: Server, rhs: Server) -> Bool {
+        lhs.id == rhs.id && lhs.hostname == rhs.hostname && lhs.info == rhs.info && lhs.pingable == rhs.pingable
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+        hasher.combine(hostname)
+        hasher.combine(info)
+        hasher.combine(pingable)
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case id, hostname, info, pingable
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        id = try container.decode(UUID.self, forKey: .id)
+        hostname = try container.decode(String.self, forKey: .hostname)
+        info = try container.decodeIfPresent(ServerInfo.self, forKey: .info)
+        pingable = try container.decodeIfPresent(Bool.self, forKey: .pingable) ?? false
+    }
+
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(id, forKey: .id)
+        try container.encode(hostname, forKey: .hostname)
+        try container.encodeIfPresent(info, forKey: .info)
+        try container.encode(pingable, forKey: .pingable)
+    }
+}

Sources/Model/API/ServerInfo.swift

@@ -0,0 +1,238 @@
+import Foundation
+
+// MARK: - Server Info Domain Model
+
+struct ServerInfo: Codable, Hashable, Equatable {
+    struct Load: Codable, Hashable, Equatable {
+        let minute1: Double
+        let minute5: Double
+        let minute15: Double
+        let percent: Double
+        let cpuCount: Int
+        let level: String
+
+        init(minute1: Double, minute5: Double, minute15: Double, percent: Double, cpuCount: Int, level: String) {
+            self.minute1 = minute1
+            self.minute5 = minute5
+            self.minute15 = minute15
+            self.percent = percent
+            self.cpuCount = cpuCount
+            self.level = level
+        }
+    }
+
+    struct Memory: Codable, Hashable, Equatable {
+        let free: Int
+        let used: Int
+        let total: Int
+        let percent: Double
+
+        init(free: Int, used: Int, total: Int, percent: Double) {
+            self.free = free
+            self.used = used
+            self.total = total
+            self.percent = percent
+        }
+    }
+
+    struct DiskSpace: Codable, Hashable, Equatable {
+        let free: Int
+        let used: Int
+        let total: Int
+        let percent: Double
+
+        init(free: Int, used: Int, total: Int, percent: Double) {
+            self.free = free
+            self.used = used
+            self.total = total
+            self.percent = percent
+        }
+    }
+
+    struct ServicePort: Codable, Hashable, Identifiable, Equatable {
+        var id: String { "\(service)-\(port)-\(proto)" }
+        let service: String
+        let status: String
+        let port: Int
+        let proto: String
+
+        init(service: String, status: String, port: Int, proto: String) {
+            self.service = service
+            self.status = status
+            self.port = port
+            self.proto = proto
+        }
+    }
+
+    struct PHPInterpreter: Codable, Hashable, Identifiable, Equatable {
+        var id: String { versionFull }
+        let version: String
+        let path: String?
+        let configFile: String?
+        let extensions: [String]
+        let memoryLimit: String?
+        let maxExecutionTime: String?
+
+        init(
+            version: String,
+            path: String? = nil,
+            configFile: String? = nil,
+            extensions: [String] = [],
+            memoryLimit: String? = nil,
+            maxExecutionTime: String? = nil
+        ) {
+            self.version = version
+            self.path = path
+            self.configFile = configFile
+            self.extensions = extensions
+            self.memoryLimit = memoryLimit
+            self.maxExecutionTime = maxExecutionTime
+        }
+
+        var versionFull: String {
+            var components = [version]
+            if let path, !path.isEmpty {
+                components.append(path)
+            }
+            return components.joined(separator: " – ")
+        }
+    }
+
+    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
+    var serverTime: String
+    var uptime: String
+    var processCount: Int
+    var apacheVersion: String
+    var phpVersion: String
+    var mysqlVersion: String?
+    var mariadbVersion: String?
+    var emailsInQueue: Int?
+    var operatingSystem: OperatingSystem?
+    var ports: [ServicePort]?
+    var load: Load
+    var memory: Memory
+    var swap: Memory
+    var diskSpace: DiskSpace
+    var panelVersion: String
+    var panelBuild: String
+    var apiVersion: String
+    var additionalPHPInterpreters: [PHPInterpreter]?
+
+    var formattedVersion: String {
+        "KeyHelp \(panelVersion) • Build \(panelBuild) • API \(apiVersion)"
+    }
+
+    var formattedServerTime: String {
+        guard let date = ServerInfo.isoFormatter.date(from: serverTime) else {
+            return serverTime
+        }
+        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
+
+extension ServerInfo {
+    private static let isoFormatter: ISO8601DateFormatter = {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds, .withColonSeparatorInTimeZone]
+        return formatter
+    }()
+
+    private static let displayFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateStyle = .medium
+        formatter.timeStyle = .medium
+        return formatter
+    }()
+
+    static let placeholder = ServerInfo(
+        hostname: "preview.example.com",
+        ipAddresses: ["192.168.1.1", "fe80::1"],
+        cpuCores: 4,
+        serverTime: "2025-04-04T18:00:00+0200",
+        uptime: "3 Days / 12 Hours / 30 Minutes",
+        processCount: 123,
+        apacheVersion: "2.4.58",
+        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"),
+            ServicePort(service: "SSH", status: "offline", port: 22, proto: "tcp")
+        ],
+        load: Load(minute1: 0.5, minute5: 0.3, minute15: 0.2, percent: 10.0, cpuCount: 4, level: "low"),
+        memory: Memory(free: 8_000_000_000, used: 4_000_000_000, total: 12_000_000_000, percent: 33.3),
+        swap: Memory(free: 4_000_000_000, used: 1_000_000_000, total: 5_000_000_000, percent: 20.0),
+        diskSpace: DiskSpace(free: 100_000_000_000, used: 50_000_000_000, total: 150_000_000_000, percent: 33.3),
+        panelVersion: "25.0",
+        panelBuild: "3394",
+        apiVersion: "2",
+        additionalPHPInterpreters: [
+            PHPInterpreter(version: "8.3", path: "/usr/bin/php8.3"),
+            PHPInterpreter(version: "8.2", path: "/usr/bin/php8.2")
+        ]
+    )
+}

Sources/Model/API/Versions/APIv2_12.swift

@@ -0,0 +1,411 @@
+//
+//  APIv2_12.swift
+//  iKeyMon
+//
+//  Created by tracer on 13.11.25.
+//
+
+
+import Foundation
+
+extension APIv2_12 {
+    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_12: BaseAPIClient, ServerAPIProtocol {
+    typealias LoadType = APIv2_12.Load
+    typealias MemoryType = APIv2_12.Memory
+    typealias UtilizationType = APIv2_12.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_12 {
+    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/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

@@ -9,6 +9,9 @@ import SwiftUI
 
 struct MainView: View {
     
+    private static let serverOrderKeyStatic = "serverOrder"
+    private static let storedServersKeyStatic = "storedServers"
+
     @State var showAddServerSheet: Bool = false
     @State private var serverBeingEdited: Server?
     @State private var serverToDelete: Server?
@@ -18,27 +21,10 @@ struct MainView: View {
     @State private var progress: Double = 0
     @State private var lastRefresh = Date()
     @State private var pingTimer: Timer?
-    private let serverOrderKey = "serverOrder"
+    private let serverOrderKey = MainView.serverOrderKeyStatic
+    private let storedServersKey = MainView.storedServersKeyStatic
 
-    @State private var servers: [Server] = {
-        if let data = UserDefaults.standard.data(forKey: "storedServers"),
-           let saved = try? JSONDecoder().decode([Server].self, from: data) {
-
-            if let idStrings = UserDefaults.standard.stringArray(forKey: "serverOrder") {
-                let idMap = idStrings.compactMap(UUID.init)
-                return saved.sorted { a, b in
-                    guard
-                        let i1 = idMap.firstIndex(of: a.id),
-                        let i2 = idMap.firstIndex(of: b.id)
-                    else { return false }
-                    return i1 < i2
-                }
-            }
-
-            return saved
-        }
-        return []
-    }()
+    @State private var servers: [Server] = MainView.loadStoredServers()
 
 //    @State private var selectedServer: Server?
     @State private var selectedServerID: UUID?
@@ -113,17 +99,30 @@ struct MainView: View {
         }
         .onReceive(refreshTimer) { _ in
             for server in servers {
-                print("fetching server: \(server.hostname)")
                 fetchServerInfo(for: server.id)
             }
         }
         .onAppear {
+            let initialID: UUID?
             if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
                let uuid = UUID(uuidString: storedID),
                servers.contains(where: { $0.id == uuid }) {
-                selectedServerID = uuid
-            } else if selectedServerID == nil, let first = servers.first {
-                selectedServerID = first.id
+                print("✅ [MainView] Restored selected server \(uuid)")
+                initialID = uuid
+            } else if let first = servers.first {
+                print("✅ [MainView] Selecting first server \(first.hostname)")
+                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
@@ -135,8 +134,17 @@ struct MainView: View {
     }
     
     private func fetchServerInfo(for id: UUID) {
-        guard let server = servers.first(where: { $0.id == id }),
-              let api = ServerAPI(server: server) else {
+        guard let server = servers.first(where: { $0.id == id }) else {
+            print("❌ [MainView] fetchServerInfo: server not found for id \(id)")
+            return
+        }
+        guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines),
+              !apiKey.isEmpty else {
+            print("❌ [MainView] fetchServerInfo: missing API key for \(server.hostname)")
+            return
+        }
+        guard let baseURL = URL(string: "https://\(server.hostname)") else {
+            print("❌ [MainView] Invalid base URL for \(server.hostname)")
             return
         }
 
@@ -145,17 +153,53 @@ struct MainView: View {
         Task {
             defer { isFetchingInfo = false }
             do {
-                let info = try await api.fetchServerInfo()
-                if let index = servers.firstIndex(where: { $0.id == id }) {
-                    var updated = servers[index]
-                    updated.info = ServerInfo(from: info)
-                    servers[index] = updated
+                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("❌ Failed to fetch server data: \(error)")
             }
         }
     }
+
+    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)
@@ -165,64 +209,55 @@ struct MainView: View {
     private func saveServerOrder() {
         let ids = servers.map { $0.id.uuidString }
         UserDefaults.standard.set(ids, forKey: serverOrderKey)
+        print("💾 [MainView] Saved server order with \(ids.count) entries")
     }
     
     private struct PingResponse: Codable {
         let response: String
     }
-    
-//    func pingServer(_ server: Server) async -> Bool {
-//        let hostname = server.hostname
-//        guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
-//            return false
-//        }
-//
-//        var request = URLRequest(url: url)
-//        request.httpMethod = "GET"
-//        request.timeoutInterval = 5
-//        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-//
-//        let apiKey = KeychainHelper.loadApiKey(for: hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-//        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
-//
-//        do {
-//            let (data, response) = try await URLSession.shared.data(for: request)
-//            if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 {
-//                do {
-//                    let decoded = try JSONDecoder().decode(PingResponse.self, from: data)
-//                    if decoded.response == "pong" {
-//                        return true
-//                    } else {
-//                        print("❌ Unexpected response: \(decoded.response)")
-//                        return false
-//                    }
-//                } catch {
-//                    print("❌ Failed to decode JSON: \(error)")
-//                    return false
-//                }
-//            } else {
-//                return false
-//            }
-//        } catch {
-//            print("[Ping] \(server.hostname): \(error.localizedDescription)")
-//            return false
-//        }
-//    }
-    
+        
     func pingAllServers() {
         for (index, server) in servers.enumerated() {
             Task {
                 let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-
-                let api = ServerAPI(hostname: server.hostname, apiKey: apiKey)
-                let pingable = await api.ping()
-
-                servers[index].pingable = pingable
+                let pingable = await PingService.ping(hostname: server.hostname, apiKey: apiKey)
+                await MainActor.run {
+                    servers[index].pingable = pingable
+                }
+                if !pingable {
+                    print("📶 [MainView] Ping \(server.hostname): offline")
                 }
             }
         }
     }
 
+    private static func loadStoredServers() -> [Server] {
+        let defaults = UserDefaults.standard
+        guard let data = defaults.data(forKey: storedServersKeyStatic) else {
+            print("ℹ️ [MainView] No storedServers data found")
+            return []
+        }
+        do {
+            let saved = try JSONDecoder().decode([Server].self, from: data)
+            print("📦 [MainView] Loaded \(saved.count) servers from UserDefaults")
+            if let order = defaults.stringArray(forKey: serverOrderKeyStatic) {
+                let idMap = order.compactMap(UUID.init)
+                let sorted = saved.sorted { a, b in
+                    guard
+                        let i1 = idMap.firstIndex(of: a.id),
+                        let i2 = idMap.firstIndex(of: b.id)
+                    else { return false }
+                    return i1 < i2
+                }
+                return sorted
+            }
+            return saved
+        } catch {
+            print("❌ [MainView] Failed to decode stored servers: \(error)")
+            return []
+        }
+    }
+}
 
 #Preview {
     MainView()

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

@@ -102,8 +102,10 @@ struct ServerFormView: View {
         let host = hostname.trimmingCharacters(in: .whitespacesAndNewlines)
         let key = apiKey.trimmingCharacters(in: .whitespacesAndNewlines)
 
-        let pinger = ServerAPI(hostname: host, apiKey: key)
-        connectionOK = await pinger.ping()
+        let reachable = await PingService.ping(hostname: host, apiKey: key)
+        await MainActor.run {
+            connectionOK = reachable
+        }
 //
 //        guard let url = URL(string: "https://\(host)/api/v2/ping") else {
 //            print("❌ Invalid URL")
@@ -183,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 }) {
@@ -192,7 +194,7 @@ struct ServerFormView: View {
                 if oldHostname != trimmedHost {
                     KeychainHelper.deleteApiKey(for: oldHostname)
                 }
-                KeychainHelper.save(apiKey: trimmedKey, for: trimmedHost)
+                KeychainHelper.saveApiKey(trimmedKey, for: trimmedHost)
             }
         }
     }
@@ -212,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

@@ -17,5 +17,10 @@ struct iKeyMonApp: App {
                 }
         }
         .windowResizability(.contentMinSize)
+
+        Settings {
+            PreferencesView()
+                .padding()
+        }
     }
 }

iKeyMon.xcodeproj/project.pbxproj

@@ -6,14 +6,28 @@
 	objectVersion = 77;
 	objects = {
 
+/* Begin PBXBuildFile section */
+		52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
+		52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
+/* 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>"; };
+		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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		5203C24F2D997D2800576D4A /* iKeyMon */ = {
+		52A9B8BE2ECB68B5004DD4A2 /* Sources */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			path = iKeyMon;
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		52A9B8F72ECB6B8A004DD4A2 /* Preview Content */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = "Preview Content";
 			sourceTree = "<group>";
 		};
 /* End PBXFileSystemSynchronizedRootGroup section */
@@ -32,8 +46,13 @@
 		5203C2442D997D2800576D4A = {
 			isa = PBXGroup;
 			children = (
-				5203C24F2D997D2800576D4A /* iKeyMon */,
+				52A9B8BE2ECB68B5004DD4A2 /* Sources */,
+				52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */,
+				52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
+				52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
+				52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
 				5203C24E2D997D2800576D4A /* Products */,
+				52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
 			);
 			sourceTree = "<group>";
 		};
@@ -61,7 +80,8 @@
 			dependencies = (
 			);
 			fileSystemSynchronizedGroups = (
-				5203C24F2D997D2800576D4A /* iKeyMon */,
+				52A9B8BE2ECB68B5004DD4A2 /* Sources */,
+				52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
 			);
 			name = iKeyMon;
 			packageProductDependencies = (
@@ -109,6 +129,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
+				52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -248,11 +270,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = iKeyMon/iKeyMon.entitlements;
+				CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_ASSET_PATHS = "\"iKeyMon/Preview Content\"";
+				DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
 				DEVELOPMENT_TEAM = Q5486ZVAFT;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -275,11 +297,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = iKeyMon/iKeyMon.entitlements;
+				CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_ASSET_PATHS = "\"iKeyMon/Preview Content\"";
+				DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
 				DEVELOPMENT_TEAM = Q5486ZVAFT;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;

iKeyMon/Model/API/ServerResponse.swift

@@ -1,179 +0,0 @@
-//
-//  ServerResponse.swift
-//  iKeyMon
-//
-//  Created by tracer on 30.03.25.
-//
-
-import Foundation
-import Foundation
-
-// MARK: - Root Response
-struct ServerResponse: Decodable {
-    let meta: Meta
-    let operatingSystem: OperatingSystem
-    let utilization: Utilization
-    let resources: Resources
-    let components: Components
-    let additionalPHPInterpreters: [PHPInterpreter]?
-    let ports: [ServicePort]?
-
-    enum CodingKeys: String, CodingKey {
-        case meta
-        case operatingSystem = "operating_system"
-        case utilization, resources, components
-        case additionalPHPInterpreters = "additional_php_interpreters"
-        case ports
-    }
-}
-
-// MARK: - Meta
-struct Meta: Decodable {
-    let hostname: String
-    let ipAddresses: [String]
-    let serverTime: String
-    let uptime: Uptime
-    let panelVersion: String
-    let panelBuild: String
-    let apiVersion: String
-    let apiDocs: String
-    let keyhelpPro: Bool
-
-    enum CodingKeys: String, CodingKey {
-        case hostname
-        case ipAddresses = "ip_addresses"
-        case serverTime = "server_time"
-        case uptime
-        case panelVersion = "panel_version"
-        case panelBuild = "panel_build"
-        case apiVersion = "api_version"
-        case apiDocs = "api_docs"
-        case keyhelpPro = "keyhelp_pro"
-    }
-}
-
-struct Uptime: Decodable {
-    let days, hours, minutes, seconds: Int
-}
-
-// MARK: - OperatingSystem
-struct OperatingSystem: Decodable {
-    let label, distribution, version, architecture: String
-    let endOfLife: Bool
-    let updates: Updates
-
-    enum CodingKeys: String, CodingKey {
-        case label, distribution, version, architecture
-        case endOfLife = "end_of_life"
-        case updates
-    }
-}
-
-struct Updates: Decodable {
-    let updateCount, securityUpdateCount: Int
-    let rebootRequired: Bool
-
-    enum CodingKeys: String, CodingKey {
-        case updateCount = "update_count"
-        case securityUpdateCount = "security_update_count"
-        case rebootRequired = "reboot_required"
-    }
-}
-
-// MARK: - Utilization
-struct Utilization: Decodable {
-    let processCount, emailsInQueue: Int
-    let load: Load
-    let diskSpace: DiskSpace
-    let inodes: Inodes
-    let memory, swap: Memory
-
-    enum CodingKeys: String, CodingKey {
-        case processCount = "process_count"
-        case emailsInQueue = "emails_in_queue"
-        case load
-        case diskSpace = "disk_space"
-        case inodes, memory, swap
-    }
-}
-
-struct Load: Decodable {
-    let minute1, minute5, minute15, percent: Double
-    let cpuCount: Int
-    let level: String
-
-    enum CodingKeys: String, CodingKey {
-        case minute1 = "minute_1"
-        case minute5 = "minute_5"
-        case minute15 = "minute_15"
-        case cpuCount = "cpu_count"
-        case percent, level
-    }
-}
-
-struct DiskSpace: Decodable {
-    let free, used, total: Int
-    let percent: Double
-}
-
-struct Inodes: Decodable {
-    let free, used, total: Int
-    let percent: Double
-}
-
-struct Memory: Decodable {
-    let free, used, total: Int
-    let percent: Double
-}
-
-// MARK: - Resources
-struct Resources: Decodable {
-    let adminAccounts, clientAccounts, domains, subdomains: Int
-    let emailAccounts, emailAddresses, emailForwardings, databases: Int
-    let ftpUsers, scheduledTasks: Int
-    let consumedDiskSpace, traffic: Int
-
-    enum CodingKeys: String, CodingKey {
-        case adminAccounts = "admin_accounts"
-        case clientAccounts = "client_accounts"
-        case domains, subdomains
-        case emailAccounts = "email_accounts"
-        case emailAddresses = "email_addresses"
-        case emailForwardings = "email_forwardings"
-        case databases
-        case ftpUsers = "ftp_users"
-        case scheduledTasks = "scheduled_tasks"
-        case consumedDiskSpace = "consumed_disk_space"
-        case traffic
-    }
-}
-
-// MARK: - Components
-struct Components: Decodable {
-    let kernel, apache, php, proftpd, dovecot, postfix: String
-    let mariadb, mysql: String?
-}
-
-struct PHPInterpreter: Decodable {
-    let version, versionFull: String
-
-    enum CodingKeys: String, CodingKey {
-        case version
-        case versionFull = "version_full"
-    }
-}
-
-struct ServicePort: Decodable, Identifiable {
-    let service: String
-    let port: Int
-    let proto: String
-    let status: String
-    var id: String { service }
-
-    enum CodingKeys: String, CodingKey {
-        case service
-        case port
-        case proto = "protocol"
-        case status
-    }
-}

iKeyMon/Model/Server.swift

@@ -1,39 +0,0 @@
-//
-//  Server.swift
-//  iKeyMon
-//
-//  Created by tracer on 30.03.25.
-//
-
-import Foundation
-
-struct Server: Identifiable, Codable, Hashable, Equatable {
-    let id: UUID
-    var hostname: String
-
-    // runtime-only, skip for Codable / Hashable / Equatable
-    var info: ServerInfo? = nil
-    var pingable: Bool = false
-
-    init(id: UUID = UUID(), hostname: String, info: ServerInfo? = nil, pingable: Bool = false) {
-        self.id = id
-        self.hostname = hostname
-        self.info = info
-        self.pingable = pingable
-    }
-
-    // MARK: - Manual conformance
-
-    static func == (lhs: Server, rhs: Server) -> Bool {
-        lhs.id == rhs.id && lhs.hostname == rhs.hostname && lhs.info == rhs.info && lhs.pingable == rhs.pingable
-    }
-
-    func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-        hasher.combine(hostname)
-    }
-
-    enum CodingKeys: String, CodingKey {
-        case id, hostname
-    }
-}

iKeyMon/Model/ServerInfo.swift

@@ -1,124 +0,0 @@
-//
-//  ServerInfo.swift
-//  iKeyMon
-//
-//  Created by tracer on 30.03.25.
-//
-
-import Foundation
-
-struct ServerInfo: Decodable, Equatable {
-    static func == (lhs: ServerInfo, rhs: ServerInfo) -> Bool {
-        lhs.hostname == rhs.hostname && lhs.serverTime == rhs.serverTime
-    }
-    
-    var hostname: String
-    var ipAddresses: [String]
-//    var processor: String
-    var cpuCores: Int
-//    var virtualization: String
-    var serverTime: String
-    var uptime: String
-//    var sshFingerprint: String
-    var processCount: Int
-    var apacheVersion: String
-    var phpVersion: String
-    var mysqlVersion: String?
-    var mariadbVersion: String?
-    var ports: [ServicePort]?
-    var load: Load
-    var memory: Memory
-    var swap: Memory
-    var diskSpace: DiskSpace
-    var panelVersion: String
-    var panelBuild: String
-    var apiVersion: String
-    var additionalPHPInterpreters: [PHPInterpreter]?
-
-    
-}
-
-extension ServerInfo {
-    static let placeholder = ServerInfo(
-        hostname: "keyhelp.lab.24unix.net",
-        ipAddresses: ["192.168.99.44", "2a03:..."],
-//        processor: "Common processor (arm64)",
-        cpuCores: 8,
-//        virtualization: "QEMU",
-        serverTime: "Sunday, March 30, 2025 at 08:01 PM (Europe/Berlin)",
-        uptime: "6 Days / 7 Hours / 16 Minutes",
-//        sshFingerprint: "Ed25519 / ECDSA / RSA",
-        processCount: 123,
-        apacheVersion: "2.4",
-        phpVersion: "8.4",
-        ports: [],
-        load: Load(
-            minute1: 0.42,
-            minute5: 0.31,
-            minute15: 0.29,
-            percent: 10.5,
-            cpuCount: 4,
-            level: "low"
-        ),
-        memory: Memory(free: 1234, used: 4567, total: 123456, percent: 23.45),
-        swap: Memory(free: 1234, used: 4567, total: 123456, percent: 23.45),
-        diskSpace:  DiskSpace(free: 1234, used: 4567, total: 123456, percent: 23.45),
-        panelVersion: "25.0",
-        panelBuild: "3394",
-        apiVersion: "2.0"
-    )
-    
-    var cpuLoadDetail: String {
-        "1min: \(load.minute1), 5min: \(load.minute5), 15min: \(load.minute15) (\(load.level))"
-    }
-    
-    var formattedServerTime: String {
-        let isoFormatter = ISO8601DateFormatter()
-        let formatter = DateFormatter()
-        formatter.locale = Locale(identifier: "de_DE")
-        formatter.dateStyle = .medium
-        formatter.timeStyle = .short
-
-        if let date = isoFormatter.date(from: serverTime) {
-            return formatter.string(from: date)
-        } else {
-            return serverTime // fallback to raw string if parsing fails
-        }
-    }
-    
-    var formattedVersion: String {
-        "\(panelVersion) (Build \(panelBuild))"
-    }
-}
-
-extension ServerInfo {
-    init(from response: ServerResponse) {
-        self.hostname = response.meta.hostname
-        self.ipAddresses = response.meta.ipAddresses
-        self.serverTime = response.meta.serverTime
-
-        let u = response.meta.uptime
-        self.uptime = "\(u.days) Days / \(u.hours) Hours / \(u.minutes) Minutes"
-
-        self.cpuCores = response.utilization.load.cpuCount
-        self.processCount = response.utilization.processCount
-
-        self.apacheVersion = response.components.apache
-        self.phpVersion = response.components.php
-
-        self.mysqlVersion = response.components.mysql ?? ""
-        self.mariadbVersion = response.components.mariadb ?? ""
-        
-        self.ports = response.ports
-        
-        self.load = response.utilization.load
-        self.memory = response.utilization.memory
-        self.swap = response.utilization.swap
-        self.diskSpace = response.utilization.diskSpace
-        
-        self.panelVersion = response.meta.panelVersion
-        self.panelBuild = response.meta.panelBuild
-        self.apiVersion = response.meta.apiVersion
-        self.additionalPHPInterpreters = response.additionalPHPInterpreters
-    }
-}

iKeyMon/ServerAPI.swift

@@ -1,67 +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 {
-            return false
-        }
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "GET"
-        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
-
-        do {
-            let (data, _ /*response */) = try await URLSession.shared.data(for: request)
-//            if let httpResponse = response as? HTTPURLResponse {
-//                print("data: \(String(data: data, encoding: .utf8))")
-//            }
-
-            if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
-                return true
-            }
-        } catch {
-            print("❌ Ping error: \(error)")
-        }
-
-        return false
-    }
-    
-    func fetchServerInfo() async throws -> ServerResponse {
-        guard let url = URL(string: "https://\(hostname)/api/v2/server") else {
-            throw URLError(.badURL)
-        }
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "GET"
-        request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        let (data, _) = try await URLSession.shared.data(for: request)
-        let decoded = try JSONDecoder().decode(ServerResponse.self, from: data)
-                
-        return decoded
-    }
-}

iKeyMon/Views/ServerDetailView.swift

@@ -1,89 +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(
-            hostname: "preview.example.com",
-            ipAddresses: ["192.168.1.1", "fe80::1"],
-            cpuCores: 4,
-            serverTime: "2025-04-04T18:00:00+0200",
-            uptime: "3 Days / 12 Hours / 30 Minutes",
-            processCount: 123,
-            apacheVersion: "2.4.58",
-            phpVersion: "8.2.12",
-            mysqlVersion: "8.0.33",
-            mariadbVersion: nil,
-            ports: nil,
-            load: Load(minute1: 0.5, minute5: 0.3, minute15: 0.2, percent: 10.0, cpuCount: 4, level: "low"),
-            memory: Memory(free: 8_000_000_000, used: 4_000_000_000, total: 12_000_000_000, percent: 33.3),
-            swap: Memory(free: 4_000_000_000, used: 1_000_000_000, total: 5_000_000_000, percent: 20.0),
-            diskSpace: DiskSpace(free: 100_000_000_000, used: 50_000_000_000, total: 150_000_000_000, percent: 33.3),
-            panelVersion: "25.0",
-            panelBuild: "3394",
-            apiVersion: "2"
-        ))),
-        isFetching: false
-    )
-}

iKeyMon/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()
-}

scripts/build_release.sh

@@ -0,0 +1,42 @@
+#!/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"
+
+rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
+mkdir -p "$ARTIFACTS_DIR"
+
+xcodebuild \
+  -project "$ROOT_DIR/$PROJECT" \
+  -scheme "$SCHEME" \
+  -configuration Release \
+  -derivedDataPath "$BUILD_DIR" \
+  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
+
+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 "$APP_PATH" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
+
+echo "✅ Build complete. Artifact: $ARTIFACTS_DIR/$ZIP_NAME"