Refactor project structure and API
This commit is contained in:
79
Model/API/ApiFactory.swift
Normal file
79
Model/API/ApiFactory.swift
Normal file
@@ -0,0 +1,79 @@
|
||||
//
|
||||
// ApiFactory.swift
|
||||
// iKeyMon
|
||||
//
|
||||
// Created by tracer on 13.11.25.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
enum APIVersion: String, CaseIterable {
|
||||
case v2_12 = "2.12"
|
||||
|
||||
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
|
||||
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
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
||||
class APIFactory {
|
||||
static func createAPI(baseURL: URL, version: APIVersion) -> AnyServerAPI {
|
||||
switch version {
|
||||
case .v2_12:
|
||||
return AnyServerAPIWrapper(APIv2_12(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) async throws -> AnyServerAPI {
|
||||
// For now we only support API v2.12, so return that implementation directly.
|
||||
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
||||
}
|
||||
}
|
||||
64
Model/API/ApiManager.swift
Normal file
64
Model/API/ApiManager.swift
Normal file
@@ -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()
|
||||
}
|
||||
}
|
||||
66
Model/API/BaseAPI.swift
Normal file
66
Model/API/BaseAPI.swift
Normal file
@@ -0,0 +1,66 @@
|
||||
//
|
||||
// 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
|
||||
}
|
||||
|
||||
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)"
|
||||
}
|
||||
}
|
||||
}
|
||||
39
Model/API/Server.swift
Normal file
39
Model/API/Server.swift
Normal file
@@ -0,0 +1,39 @@
|
||||
//
|
||||
// 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
|
||||
}
|
||||
}
|
||||
271
Model/API/ServerAPI.swift
Normal file
271
Model/API/ServerAPI.swift
Normal file
@@ -0,0 +1,271 @@
|
||||
//
|
||||
// ServerAPI.swift
|
||||
// iKeyMon
|
||||
//
|
||||
// Created by tracer on 06.04.25.
|
||||
//
|
||||
import Foundation
|
||||
|
||||
final class ServerAPI {
|
||||
private let hostname: String
|
||||
private let apiKey: String
|
||||
|
||||
init(hostname: String, apiKey: String) {
|
||||
self.hostname = hostname
|
||||
self.apiKey = apiKey
|
||||
}
|
||||
|
||||
init?(server: Server) {
|
||||
guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) else {
|
||||
return nil
|
||||
}
|
||||
self.hostname = server.hostname
|
||||
self.apiKey = apiKey
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
func ping() async -> Bool {
|
||||
guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
|
||||
print("❌ [ServerAPI] Invalid ping URL for hostname: \(hostname)")
|
||||
return false
|
||||
}
|
||||
|
||||
var request = URLRequest(url: url)
|
||||
request.httpMethod = "GET"
|
||||
request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
|
||||
request.timeoutInterval = 10
|
||||
|
||||
do {
|
||||
let (data, response) = try await URLSession.shared.data(for: request)
|
||||
|
||||
// Add debug info for comparison with server info request
|
||||
if let httpResponse = response as? HTTPURLResponse {
|
||||
if httpResponse.statusCode != 200 {
|
||||
print("❌ [ServerAPI] Ping HTTP Status: \(httpResponse.statusCode) for \(hostname)")
|
||||
if let responseString = String(data: data, encoding: .utf8) {
|
||||
print("❌ [ServerAPI] Ping error response: \(responseString)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
|
||||
return true
|
||||
} else {
|
||||
print("❌ [ServerAPI] Ping failed - invalid response for \(hostname)")
|
||||
if let responseString = String(data: data, encoding: .utf8) {
|
||||
print("❌ [ServerAPI] Ping response: \(responseString)")
|
||||
}
|
||||
return false
|
||||
}
|
||||
} catch {
|
||||
print("❌ [ServerAPI] Ping error for \(hostname): \(error)")
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func fetchServerInfo() async throws -> ServerInfo {
|
||||
print("🔍 [ServerAPI] Starting fetchServerInfo for hostname: \(hostname)")
|
||||
|
||||
guard let url = URL(string: "https://\(hostname)/api/v2/server") else {
|
||||
print("❌ [ServerAPI] Invalid URL for hostname: \(hostname)")
|
||||
throw URLError(.badURL)
|
||||
}
|
||||
|
||||
print("🌐 [ServerAPI] URL created: \(url.absoluteString)")
|
||||
|
||||
var request = URLRequest(url: url)
|
||||
request.httpMethod = "GET"
|
||||
request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
|
||||
// Temporarily remove Content-Type to match ping request exactly
|
||||
// request.setValue("application/json", forHTTPHeaderField: "Content-Type")
|
||||
request.timeoutInterval = 30
|
||||
|
||||
print("📤 [ServerAPI] Making request with timeout: \(request.timeoutInterval)s")
|
||||
print("📤 [ServerAPI] API Key (first 10 chars): \(String(apiKey.prefix(10)))...")
|
||||
print("📤 [ServerAPI] Request headers: \(request.allHTTPHeaderFields ?? [:])")
|
||||
|
||||
do {
|
||||
let startTime = Date()
|
||||
let (data, response) = try await URLSession.shared.data(for: request)
|
||||
let endTime = Date()
|
||||
let duration = endTime.timeIntervalSince(startTime)
|
||||
|
||||
print("📥 [ServerAPI] Request completed in \(String(format: "%.2f", duration))s")
|
||||
|
||||
if let httpResponse = response as? HTTPURLResponse {
|
||||
print("📥 [ServerAPI] HTTP Status: \(httpResponse.statusCode)")
|
||||
|
||||
// Handle 401 specifically
|
||||
if httpResponse.statusCode == 401 {
|
||||
print("❌ [ServerAPI] 401 Unauthorized - API key issue!")
|
||||
if let responseString = String(data: data, encoding: .utf8) {
|
||||
print("❌ [ServerAPI] 401 Response body: \(responseString)")
|
||||
}
|
||||
throw URLError(.userAuthenticationRequired)
|
||||
}
|
||||
|
||||
// Handle other non-200 status codes
|
||||
if httpResponse.statusCode != 200 {
|
||||
print("❌ [ServerAPI] Non-200 status code: \(httpResponse.statusCode)")
|
||||
if let responseString = String(data: data, encoding: .utf8) {
|
||||
print("❌ [ServerAPI] Error response body: \(responseString)")
|
||||
}
|
||||
throw URLError(.badServerResponse)
|
||||
}
|
||||
}
|
||||
|
||||
print("📥 [ServerAPI] Data size: \(data.count) bytes")
|
||||
|
||||
print("🔄 [ServerAPI] Decoding response payload...")
|
||||
|
||||
let decoder = JSONDecoder()
|
||||
decoder.keyDecodingStrategy = .convertFromSnakeCase
|
||||
let decodedResponse = try decoder.decode(ServerResponseEnvelope.self, from: data)
|
||||
let decoded = decodedResponse.toDomain()
|
||||
print("✅ [ServerAPI] JSON decoding successful")
|
||||
|
||||
return decoded
|
||||
} catch let urlError as URLError {
|
||||
print("❌ [ServerAPI] URLError: \(urlError.localizedDescription)")
|
||||
print("❌ [ServerAPI] URLError code: \(urlError.code.rawValue)")
|
||||
throw urlError
|
||||
} catch let decodingError as DecodingError {
|
||||
print("❌ [ServerAPI] Decoding error: \(decodingError)")
|
||||
throw decodingError
|
||||
} catch {
|
||||
print("❌ [ServerAPI] Unexpected error: \(error)")
|
||||
throw error
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Response Helpers
|
||||
|
||||
private extension ServerAPI {
|
||||
struct ServerResponseEnvelope: Decodable {
|
||||
let data: ServerData
|
||||
let meta: Meta
|
||||
|
||||
struct Meta: Decodable {
|
||||
let apiVersion: String
|
||||
}
|
||||
}
|
||||
|
||||
struct ServerData: Decodable {
|
||||
struct Port: Decodable {
|
||||
let service: String
|
||||
let status: String
|
||||
let port: Int
|
||||
let proto: String
|
||||
}
|
||||
|
||||
struct Load: Decodable {
|
||||
let minute1: Double
|
||||
let minute5: Double
|
||||
let minute15: Double
|
||||
let percent: Double
|
||||
let cpuCount: Int
|
||||
let level: String
|
||||
}
|
||||
|
||||
struct Memory: Decodable {
|
||||
let free: Int
|
||||
let used: Int
|
||||
let total: Int
|
||||
let percent: Double
|
||||
}
|
||||
|
||||
struct Disk: Decodable {
|
||||
let free: Int
|
||||
let used: Int
|
||||
let total: Int
|
||||
let percent: Double
|
||||
}
|
||||
|
||||
struct PHPInterpreter: Decodable {
|
||||
let version: String
|
||||
let path: String?
|
||||
let configFile: String?
|
||||
let extensions: [String]
|
||||
let memoryLimit: String?
|
||||
let maxExecutionTime: String?
|
||||
}
|
||||
|
||||
let hostname: String
|
||||
let ipAddresses: [String]
|
||||
let cpuCores: Int
|
||||
let serverTime: String
|
||||
let uptime: String
|
||||
let processCount: Int
|
||||
let apacheVersion: String
|
||||
let phpVersion: String
|
||||
let mysqlVersion: String?
|
||||
let mariadbVersion: String?
|
||||
let ports: [Port]?
|
||||
let load: Load
|
||||
let memory: Memory
|
||||
let swap: Memory
|
||||
let diskSpace: Disk
|
||||
let panelVersion: String
|
||||
let panelBuild: String
|
||||
let additionalPhpInterpreters: [PHPInterpreter]?
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private extension ServerAPI.ServerResponseEnvelope {
|
||||
func toDomain() -> ServerInfo {
|
||||
ServerInfo(
|
||||
hostname: data.hostname,
|
||||
ipAddresses: data.ipAddresses,
|
||||
cpuCores: data.cpuCores,
|
||||
serverTime: data.serverTime,
|
||||
uptime: data.uptime,
|
||||
processCount: data.processCount,
|
||||
apacheVersion: data.apacheVersion,
|
||||
phpVersion: data.phpVersion,
|
||||
mysqlVersion: data.mysqlVersion,
|
||||
mariadbVersion: data.mariadbVersion,
|
||||
ports: data.ports?.map { ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto) },
|
||||
load: ServerInfo.Load(
|
||||
minute1: data.load.minute1,
|
||||
minute5: data.load.minute5,
|
||||
minute15: data.load.minute15,
|
||||
percent: data.load.percent,
|
||||
cpuCount: data.load.cpuCount,
|
||||
level: data.load.level
|
||||
),
|
||||
memory: ServerInfo.Memory(
|
||||
free: data.memory.free,
|
||||
used: data.memory.used,
|
||||
total: data.memory.total,
|
||||
percent: data.memory.percent
|
||||
),
|
||||
swap: ServerInfo.Memory(
|
||||
free: data.swap.free,
|
||||
used: data.swap.used,
|
||||
total: data.swap.total,
|
||||
percent: data.swap.percent
|
||||
),
|
||||
diskSpace: ServerInfo.DiskSpace(
|
||||
free: data.diskSpace.free,
|
||||
used: data.diskSpace.used,
|
||||
total: data.diskSpace.total,
|
||||
percent: data.diskSpace.percent
|
||||
),
|
||||
panelVersion: data.panelVersion,
|
||||
panelBuild: data.panelBuild,
|
||||
apiVersion: meta.apiVersion,
|
||||
additionalPHPInterpreters: data.additionalPhpInterpreters?.map {
|
||||
ServerInfo.PHPInterpreter(
|
||||
version: $0.version,
|
||||
path: $0.path,
|
||||
configFile: $0.configFile,
|
||||
extensions: $0.extensions,
|
||||
memoryLimit: $0.memoryLimit,
|
||||
maxExecutionTime: $0.maxExecutionTime
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
177
Model/API/ServerInfo.swift
Normal file
177
Model/API/ServerInfo.swift
Normal file
@@ -0,0 +1,177 @@
|
||||
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: " – ")
|
||||
}
|
||||
}
|
||||
|
||||
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 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)
|
||||
}
|
||||
}
|
||||
|
||||
// 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,
|
||||
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")
|
||||
]
|
||||
)
|
||||
}
|
||||
73
Model/API/ServerTypes.swift
Normal file
73
Model/API/ServerTypes.swift
Normal file
@@ -0,0 +1,73 @@
|
||||
//
|
||||
// ServerTypes_Fixed.swift
|
||||
// iKeyMon
|
||||
//
|
||||
// Fixed server types matching your existing code structure
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
// MARK: - Server API Response Types
|
||||
struct ServerAPIResponse<T: Codable>: Codable {
|
||||
let data: T
|
||||
let status: String
|
||||
let timestamp: Date
|
||||
let version: String
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case data
|
||||
case status
|
||||
case timestamp
|
||||
case version
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Server API Version
|
||||
struct ServerAPIVersion: Codable {
|
||||
let major: Int
|
||||
let minor: Int
|
||||
let patch: Int
|
||||
let string: String
|
||||
|
||||
init(major: Int, minor: Int, patch: Int = 0) {
|
||||
self.major = major
|
||||
self.minor = minor
|
||||
self.patch = patch
|
||||
self.string = "\(major).\(minor).\(patch)"
|
||||
}
|
||||
|
||||
init(from versionString: String) throws {
|
||||
let components = versionString.split(separator: ".").compactMap { Int($0) }
|
||||
guard components.count >= 2 else {
|
||||
throw DecodingError.dataCorrupted(
|
||||
DecodingError.Context(codingPath: [], debugDescription: "Invalid version string format")
|
||||
)
|
||||
}
|
||||
|
||||
self.major = components[0]
|
||||
self.minor = components[1]
|
||||
self.patch = components.count > 2 ? components[2] : 0
|
||||
self.string = versionString
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Server API Response Factory
|
||||
class ServerAPIResponseFactory {
|
||||
static func createResponse<T: Codable>(data: T, status: String = "success") -> ServerAPIResponse<T> {
|
||||
return ServerAPIResponse(
|
||||
data: data,
|
||||
status: status,
|
||||
timestamp: Date(),
|
||||
version: "1.0"
|
||||
)
|
||||
}
|
||||
|
||||
static func createErrorResponse(error: String) -> ServerAPIResponse<String> {
|
||||
return ServerAPIResponse(
|
||||
data: error,
|
||||
status: "error",
|
||||
timestamp: Date(),
|
||||
version: "1.0"
|
||||
)
|
||||
}
|
||||
}
|
||||
170
Model/API/Versions/APIv2_12.swift
Normal file
170
Model/API/Versions/APIv2_12.swift
Normal file
@@ -0,0 +1,170 @@
|
||||
//
|
||||
// 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.12/system/info"
|
||||
case load = "/api/v2.12/metrics/load"
|
||||
case memory = "/api/v2.12/metrics/memory"
|
||||
case utilization = "/api/v2.12/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)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user