Compare commits
28 Commits
refactor-p
...
v26.0.18
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24794a1d63 | ||
|
|
d65ec99cfb | ||
|
|
57dc68f434 | ||
|
|
e3b14e87fe | ||
|
|
1c7e14a9db | ||
|
|
fc3e55294a | ||
|
|
02828c8d5b | ||
|
|
3f849d0db6 | ||
|
|
69904c07ce | ||
|
|
01c89de738 | ||
|
|
dc9560e31a | ||
|
|
dc710d53aa | ||
|
|
db1f15f981 | ||
|
|
db58a5c048 | ||
|
|
00978b096b | ||
|
|
73d81216bb | ||
|
|
0f1c876520 | ||
|
|
2b3850440f | ||
|
|
756695c5b0 | ||
|
|
726df91d2d | ||
|
|
f6c4773ac7 | ||
|
|
f1367287de | ||
|
|
6b8d458605 | ||
|
|
562023519a | ||
|
|
c9ebc22551 | ||
|
|
01c8da07e0 | ||
|
|
d3f9126245 | ||
|
|
4efe1a2324 |
4
.gitignore
vendored
@@ -1,3 +1,7 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
xcuserdata/
|
xcuserdata/
|
||||||
DerivedData/
|
DerivedData/
|
||||||
|
build/
|
||||||
|
Build/
|
||||||
|
dist/
|
||||||
|
.signing.env
|
||||||
|
|||||||
@@ -1,51 +1,61 @@
|
|||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_16x16.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "16x16"
|
"size" : "16x16"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_16x16@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "16x16"
|
"size" : "16x16"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_32x32.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "32x32"
|
"size" : "32x32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_32x32@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "32x32"
|
"size" : "32x32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_128x128.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "128x128"
|
"size" : "128x128"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_128x128@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "128x128"
|
"size" : "128x128"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_256x256.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "256x256"
|
"size" : "256x256"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_256x256@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "256x256"
|
"size" : "256x256"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_512x512.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "512x512"
|
"size" : "512x512"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_512x512@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "512x512"
|
"size" : "512x512"
|
||||||
|
|||||||
BIN
Assets.xcassets/AppIcon.appiconset/icon_128x128.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
Normal file
|
After Width: | Height: | Size: 55 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_16x16.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_256x256.png
Normal file
|
After Width: | Height: | Size: 55 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
Normal file
|
After Width: | Height: | Size: 230 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_32x32.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_512x512.png
Normal file
|
After Width: | Height: | Size: 230 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
Normal file
|
After Width: | Height: | Size: 1.0 MiB |
BIN
Assets/dmg_background.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
@@ -7,4 +7,8 @@
|
|||||||
- Added verbose logging in `MainView` to trace server loading, selection, and fetch/ping activity when the list appears empty.
|
- 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`.
|
- 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.
|
- Detection now probes `meta.api_version` so future API versions are selected automatically, and the ping loop logs only failures to keep output quiet.
|
||||||
|
- Introduced repository-wide version management via `version.json` + `scripts/sync_version.sh`, ensuring Xcode targets and release artifacts stay aligned.
|
||||||
|
- Enhanced `scripts/build_release.sh` to timestamp/harden signatures, notarize DMGs, and optionally publish tagged releases (pre-release by default) with ZIP/DMG assets directly to Gitea when credentials are configured.
|
||||||
|
- Integrated Sparkle (via Swift Package Manager) to handle automatic update checks, downloads, signature verification, and relaunches, replacing the previous custom updater UI. Preferences now simply surface Sparkle's check/download toggles.
|
||||||
|
- `scripts/build_release.sh` can optionally run Sparkle’s `generate_appcast` (when signing key and download prefix env vars are set), producing a ready-to-host `appcast.xml` alongside the ZIP/DMG artifacts.
|
||||||
- Further reduced MainView console noise by removing redundant refresh/onAppear logs.
|
- Further reduced MainView console noise by removing redundant refresh/onAppear logs.
|
||||||
|
|||||||
@@ -1,271 +0,0 @@
|
|||||||
//
|
|
||||||
// ServerAPI.swift
|
|
||||||
// iKeyMon
|
|
||||||
//
|
|
||||||
// Created by tracer on 06.04.25.
|
|
||||||
//
|
|
||||||
import Foundation
|
|
||||||
|
|
||||||
final class ServerAPI {
|
|
||||||
private let hostname: String
|
|
||||||
private let apiKey: String
|
|
||||||
|
|
||||||
init(hostname: String, apiKey: String) {
|
|
||||||
self.hostname = hostname
|
|
||||||
self.apiKey = apiKey
|
|
||||||
}
|
|
||||||
|
|
||||||
init?(server: Server) {
|
|
||||||
guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) else {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
self.hostname = server.hostname
|
|
||||||
self.apiKey = apiKey
|
|
||||||
}
|
|
||||||
|
|
||||||
@discardableResult
|
|
||||||
func ping() async -> Bool {
|
|
||||||
guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
|
|
||||||
print("❌ [ServerAPI] Invalid ping URL for hostname: \(hostname)")
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
var request = URLRequest(url: url)
|
|
||||||
request.httpMethod = "GET"
|
|
||||||
request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
|
|
||||||
request.timeoutInterval = 10
|
|
||||||
|
|
||||||
do {
|
|
||||||
let (data, response) = try await URLSession.shared.data(for: request)
|
|
||||||
|
|
||||||
// Add debug info for comparison with server info request
|
|
||||||
if let httpResponse = response as? HTTPURLResponse {
|
|
||||||
if httpResponse.statusCode != 200 {
|
|
||||||
print("❌ [ServerAPI] Ping HTTP Status: \(httpResponse.statusCode) for \(hostname)")
|
|
||||||
if let responseString = String(data: data, encoding: .utf8) {
|
|
||||||
print("❌ [ServerAPI] Ping error response: \(responseString)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
|
|
||||||
return true
|
|
||||||
} else {
|
|
||||||
print("❌ [ServerAPI] Ping failed - invalid response for \(hostname)")
|
|
||||||
if let responseString = String(data: data, encoding: .utf8) {
|
|
||||||
print("❌ [ServerAPI] Ping response: \(responseString)")
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
print("❌ [ServerAPI] Ping error for \(hostname): \(error)")
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func fetchServerInfo() async throws -> ServerInfo {
|
|
||||||
print("🔍 [ServerAPI] Starting fetchServerInfo for hostname: \(hostname)")
|
|
||||||
|
|
||||||
guard let url = URL(string: "https://\(hostname)/api/v2/server") else {
|
|
||||||
print("❌ [ServerAPI] Invalid URL for hostname: \(hostname)")
|
|
||||||
throw URLError(.badURL)
|
|
||||||
}
|
|
||||||
|
|
||||||
print("🌐 [ServerAPI] URL created: \(url.absoluteString)")
|
|
||||||
|
|
||||||
var request = URLRequest(url: url)
|
|
||||||
request.httpMethod = "GET"
|
|
||||||
request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
|
|
||||||
// Temporarily remove Content-Type to match ping request exactly
|
|
||||||
// request.setValue("application/json", forHTTPHeaderField: "Content-Type")
|
|
||||||
request.timeoutInterval = 30
|
|
||||||
|
|
||||||
print("📤 [ServerAPI] Making request with timeout: \(request.timeoutInterval)s")
|
|
||||||
print("📤 [ServerAPI] API Key (first 10 chars): \(String(apiKey.prefix(10)))...")
|
|
||||||
print("📤 [ServerAPI] Request headers: \(request.allHTTPHeaderFields ?? [:])")
|
|
||||||
|
|
||||||
do {
|
|
||||||
let startTime = Date()
|
|
||||||
let (data, response) = try await URLSession.shared.data(for: request)
|
|
||||||
let endTime = Date()
|
|
||||||
let duration = endTime.timeIntervalSince(startTime)
|
|
||||||
|
|
||||||
print("📥 [ServerAPI] Request completed in \(String(format: "%.2f", duration))s")
|
|
||||||
|
|
||||||
if let httpResponse = response as? HTTPURLResponse {
|
|
||||||
print("📥 [ServerAPI] HTTP Status: \(httpResponse.statusCode)")
|
|
||||||
|
|
||||||
// Handle 401 specifically
|
|
||||||
if httpResponse.statusCode == 401 {
|
|
||||||
print("❌ [ServerAPI] 401 Unauthorized - API key issue!")
|
|
||||||
if let responseString = String(data: data, encoding: .utf8) {
|
|
||||||
print("❌ [ServerAPI] 401 Response body: \(responseString)")
|
|
||||||
}
|
|
||||||
throw URLError(.userAuthenticationRequired)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle other non-200 status codes
|
|
||||||
if httpResponse.statusCode != 200 {
|
|
||||||
print("❌ [ServerAPI] Non-200 status code: \(httpResponse.statusCode)")
|
|
||||||
if let responseString = String(data: data, encoding: .utf8) {
|
|
||||||
print("❌ [ServerAPI] Error response body: \(responseString)")
|
|
||||||
}
|
|
||||||
throw URLError(.badServerResponse)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print("📥 [ServerAPI] Data size: \(data.count) bytes")
|
|
||||||
|
|
||||||
print("🔄 [ServerAPI] Decoding response payload...")
|
|
||||||
|
|
||||||
let decoder = JSONDecoder()
|
|
||||||
decoder.keyDecodingStrategy = .convertFromSnakeCase
|
|
||||||
let decodedResponse = try decoder.decode(ServerResponseEnvelope.self, from: data)
|
|
||||||
let decoded = decodedResponse.toDomain()
|
|
||||||
print("✅ [ServerAPI] JSON decoding successful")
|
|
||||||
|
|
||||||
return decoded
|
|
||||||
} catch let urlError as URLError {
|
|
||||||
print("❌ [ServerAPI] URLError: \(urlError.localizedDescription)")
|
|
||||||
print("❌ [ServerAPI] URLError code: \(urlError.code.rawValue)")
|
|
||||||
throw urlError
|
|
||||||
} catch let decodingError as DecodingError {
|
|
||||||
print("❌ [ServerAPI] Decoding error: \(decodingError)")
|
|
||||||
throw decodingError
|
|
||||||
} catch {
|
|
||||||
print("❌ [ServerAPI] Unexpected error: \(error)")
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Response Helpers
|
|
||||||
|
|
||||||
private extension ServerAPI {
|
|
||||||
struct ServerResponseEnvelope: Decodable {
|
|
||||||
let data: ServerData
|
|
||||||
let meta: Meta
|
|
||||||
|
|
||||||
struct Meta: Decodable {
|
|
||||||
let apiVersion: String
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ServerData: Decodable {
|
|
||||||
struct Port: Decodable {
|
|
||||||
let service: String
|
|
||||||
let status: String
|
|
||||||
let port: Int
|
|
||||||
let proto: String
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Load: Decodable {
|
|
||||||
let minute1: Double
|
|
||||||
let minute5: Double
|
|
||||||
let minute15: Double
|
|
||||||
let percent: Double
|
|
||||||
let cpuCount: Int
|
|
||||||
let level: String
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Memory: Decodable {
|
|
||||||
let free: Int
|
|
||||||
let used: Int
|
|
||||||
let total: Int
|
|
||||||
let percent: Double
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Disk: Decodable {
|
|
||||||
let free: Int
|
|
||||||
let used: Int
|
|
||||||
let total: Int
|
|
||||||
let percent: Double
|
|
||||||
}
|
|
||||||
|
|
||||||
struct PHPInterpreter: Decodable {
|
|
||||||
let version: String
|
|
||||||
let path: String?
|
|
||||||
let configFile: String?
|
|
||||||
let extensions: [String]
|
|
||||||
let memoryLimit: String?
|
|
||||||
let maxExecutionTime: String?
|
|
||||||
}
|
|
||||||
|
|
||||||
let hostname: String
|
|
||||||
let ipAddresses: [String]
|
|
||||||
let cpuCores: Int
|
|
||||||
let serverTime: String
|
|
||||||
let uptime: String
|
|
||||||
let processCount: Int
|
|
||||||
let apacheVersion: String
|
|
||||||
let phpVersion: String
|
|
||||||
let mysqlVersion: String?
|
|
||||||
let mariadbVersion: String?
|
|
||||||
let ports: [Port]?
|
|
||||||
let load: Load
|
|
||||||
let memory: Memory
|
|
||||||
let swap: Memory
|
|
||||||
let diskSpace: Disk
|
|
||||||
let panelVersion: String
|
|
||||||
let panelBuild: String
|
|
||||||
let additionalPhpInterpreters: [PHPInterpreter]?
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private extension ServerAPI.ServerResponseEnvelope {
|
|
||||||
func toDomain() -> ServerInfo {
|
|
||||||
ServerInfo(
|
|
||||||
hostname: data.hostname,
|
|
||||||
ipAddresses: data.ipAddresses,
|
|
||||||
cpuCores: data.cpuCores,
|
|
||||||
serverTime: data.serverTime,
|
|
||||||
uptime: data.uptime,
|
|
||||||
processCount: data.processCount,
|
|
||||||
apacheVersion: data.apacheVersion,
|
|
||||||
phpVersion: data.phpVersion,
|
|
||||||
mysqlVersion: data.mysqlVersion,
|
|
||||||
mariadbVersion: data.mariadbVersion,
|
|
||||||
ports: data.ports?.map { ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto) },
|
|
||||||
load: ServerInfo.Load(
|
|
||||||
minute1: data.load.minute1,
|
|
||||||
minute5: data.load.minute5,
|
|
||||||
minute15: data.load.minute15,
|
|
||||||
percent: data.load.percent,
|
|
||||||
cpuCount: data.load.cpuCount,
|
|
||||||
level: data.load.level
|
|
||||||
),
|
|
||||||
memory: ServerInfo.Memory(
|
|
||||||
free: data.memory.free,
|
|
||||||
used: data.memory.used,
|
|
||||||
total: data.memory.total,
|
|
||||||
percent: data.memory.percent
|
|
||||||
),
|
|
||||||
swap: ServerInfo.Memory(
|
|
||||||
free: data.swap.free,
|
|
||||||
used: data.swap.used,
|
|
||||||
total: data.swap.total,
|
|
||||||
percent: data.swap.percent
|
|
||||||
),
|
|
||||||
diskSpace: ServerInfo.DiskSpace(
|
|
||||||
free: data.diskSpace.free,
|
|
||||||
used: data.diskSpace.used,
|
|
||||||
total: data.diskSpace.total,
|
|
||||||
percent: data.diskSpace.percent
|
|
||||||
),
|
|
||||||
panelVersion: data.panelVersion,
|
|
||||||
panelBuild: data.panelBuild,
|
|
||||||
apiVersion: meta.apiVersion,
|
|
||||||
additionalPHPInterpreters: data.additionalPhpInterpreters?.map {
|
|
||||||
ServerInfo.PHPInterpreter(
|
|
||||||
version: $0.version,
|
|
||||||
path: $0.path,
|
|
||||||
configFile: $0.configFile,
|
|
||||||
extensions: $0.extensions,
|
|
||||||
memoryLimit: $0.memoryLimit,
|
|
||||||
maxExecutionTime: $0.maxExecutionTime
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
//
|
|
||||||
// ServerTypes_Fixed.swift
|
|
||||||
// iKeyMon
|
|
||||||
//
|
|
||||||
// Fixed server types matching your existing code structure
|
|
||||||
//
|
|
||||||
|
|
||||||
import Foundation
|
|
||||||
|
|
||||||
// MARK: - Server API Response Types
|
|
||||||
struct ServerAPIResponse<T: Codable>: Codable {
|
|
||||||
let data: T
|
|
||||||
let status: String
|
|
||||||
let timestamp: Date
|
|
||||||
let version: String
|
|
||||||
|
|
||||||
enum CodingKeys: String, CodingKey {
|
|
||||||
case data
|
|
||||||
case status
|
|
||||||
case timestamp
|
|
||||||
case version
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Server API Version
|
|
||||||
struct ServerAPIVersion: Codable {
|
|
||||||
let major: Int
|
|
||||||
let minor: Int
|
|
||||||
let patch: Int
|
|
||||||
let string: String
|
|
||||||
|
|
||||||
init(major: Int, minor: Int, patch: Int = 0) {
|
|
||||||
self.major = major
|
|
||||||
self.minor = minor
|
|
||||||
self.patch = patch
|
|
||||||
self.string = "\(major).\(minor).\(patch)"
|
|
||||||
}
|
|
||||||
|
|
||||||
init(from versionString: String) throws {
|
|
||||||
let components = versionString.split(separator: ".").compactMap { Int($0) }
|
|
||||||
guard components.count >= 2 else {
|
|
||||||
throw DecodingError.dataCorrupted(
|
|
||||||
DecodingError.Context(codingPath: [], debugDescription: "Invalid version string format")
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
self.major = components[0]
|
|
||||||
self.minor = components[1]
|
|
||||||
self.patch = components.count > 2 ? components[2] : 0
|
|
||||||
self.string = versionString
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Server API Response Factory
|
|
||||||
class ServerAPIResponseFactory {
|
|
||||||
static func createResponse<T: Codable>(data: T, status: String = "success") -> ServerAPIResponse<T> {
|
|
||||||
return ServerAPIResponse(
|
|
||||||
data: data,
|
|
||||||
status: status,
|
|
||||||
timestamp: Date(),
|
|
||||||
version: "1.0"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
static func createErrorResponse(error: String) -> ServerAPIResponse<String> {
|
|
||||||
return ServerAPIResponse(
|
|
||||||
data: error,
|
|
||||||
status: "error",
|
|
||||||
timestamp: Date(),
|
|
||||||
version: "1.0"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
9
NOTES.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
- add tooltip for:
|
||||||
|
Ping (est time consideration)
|
||||||
|
dynamic Data
|
||||||
|
static Data
|
||||||
|
|
||||||
|
add a marker for "reboot required"
|
||||||
|
|
||||||
|
dummy
|
||||||
|
|
||||||
67
README.md
@@ -8,9 +8,10 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
|
|||||||
- Shows CPU load, memory usage, swap usage, and disk usage
|
- Shows CPU load, memory usage, swap usage, and disk usage
|
||||||
- Periodic ping via `/api/ping` endpoint to check if a server is reachable
|
- Periodic ping via `/api/ping` endpoint to check if a server is reachable
|
||||||
- Colored status indicator for each server in the list
|
- Colored status indicator for each server in the list
|
||||||
- Automatic updates:
|
- Automatic refreshes:
|
||||||
- Ping every 10 seconds
|
- Ping every 10 seconds
|
||||||
- Server info every 60 seconds
|
- Server info every 60 seconds
|
||||||
|
- Built-in Sparkle updater (automatic checks, downloads, and relaunch once a signed release is available)
|
||||||
- Organized layout using tabs: General / Resources / Services
|
- Organized layout using tabs: General / Resources / Services
|
||||||
- Stores API keys securely in the macOS Keychain
|
- Stores API keys securely in the macOS Keychain
|
||||||
- Native macOS look & feel using SwiftUI
|
- Native macOS look & feel using SwiftUI
|
||||||
@@ -36,6 +37,70 @@ git clone https://git.24unix.net/tracer/iKeyMon
|
|||||||
cd iKeyMon
|
cd iKeyMon
|
||||||
open iKeyMon.xcodeproj
|
open iKeyMon.xcodeproj
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Local release build
|
||||||
|
|
||||||
|
Use the helper script to produce distributables in `dist/`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./scripts/build_release.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
It cleans previous artifacts, builds the `Release` configuration, and drops both `iKeyMon-<version>.zip` and `iKeyMon-<version>.dmg` into the `dist` folder (ignored by git). To enable codesigning + notarization, copy `signing.env.example` to `.signing.env`, fill in your Developer ID identity, Apple ID, team ID, and app-specific password. The script sources that file locally (it remains gitignored) and performs signing/notarization when the values are present.
|
||||||
|
|
||||||
|
To auto-publish the artifacts as a Gitea release, extend `.signing.env` with:
|
||||||
|
|
||||||
|
```
|
||||||
|
GITEA_TOKEN="..."
|
||||||
|
GITEA_OWNER="tracer"
|
||||||
|
GITEA_REPO="iKeyMon"
|
||||||
|
# optional: GITEA_API_BASE="https://git.24unix.net/api/v1"
|
||||||
|
# optional: GITEA_TARGET_COMMIT="master"
|
||||||
|
# optional: GITEA_PRERELEASE="false" # defaults to true until preferences are done
|
||||||
|
# optional Sparkle feed helpers:
|
||||||
|
# SPARKLE_EDDSA_KEY_FILE="$HOME/.config/Sparkle/iKeyMon.key"
|
||||||
|
# SPARKLE_DOWNLOAD_BASE_URL="https://git.24unix.net/tracer/iKeyMon/releases/download"
|
||||||
|
# SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE="v{{VERSION}}"
|
||||||
|
# SPARKLE_APPCAST_OUTPUT="$ROOT_DIR/Sparkle/appcast.xml" # default
|
||||||
|
```
|
||||||
|
|
||||||
|
`GITEA_TARGET_COMMIT` defaults to the current `HEAD` commit, so overriding it lets you publish from another branch if needed. Whenever those variables are set, the script will create (or reuse) tag `v<version>` and upload both ZIP and DMG as release assets automatically.
|
||||||
|
|
||||||
|
If you re-run the release script for the same version, it removes any existing assets with the same filenames before uploading, so you never end up with duplicate ZIP/DMG files on the release page.
|
||||||
|
|
||||||
|
### Sparkle updates
|
||||||
|
|
||||||
|
iKeyMon uses [Sparkle](https://sparkle-project.org/) for macOS-safe updates.
|
||||||
|
|
||||||
|
1. Generate an EdDSA key pair once (`./Packages/Sparkle/bin/generate_keys`). Store the private key on-disk (for example `~/.config/Sparkle/iKeyMon.key`, which the build script expects) and copy the public key into the `SUPublicEDKey` entry (see Info.plist notes below).
|
||||||
|
2. `./scripts/build_release.sh` signs the ZIP with Sparkle’s `sign_update` tool and invokes `generate_appcast` automatically when the Sparkle variables are present. The generated feed is written to `Sparkle/appcast.xml`, so commit that file after every release. Set `SPARKLE_DOWNLOAD_BASE_URL` to the static portion of your release-download endpoint (e.g. `https://…/releases/download`) and `SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE` to the path segment that should be inserted before each asset (default `v{{VERSION}}` mirrors how Gitea exposes assets). The feed stays inside the repo (it is not uploaded as a release asset).
|
||||||
|
3. Set `SUFeedURL` in Info.plist (or the corresponding build setting) to the raw URL of `Sparkle/appcast.xml` inside this repo (e.g. `https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml`).
|
||||||
|
|
||||||
|
Preferences expose Sparkle’s built-in toggles for “Automatically check” and “Automatically download”, and the toolbar button simply calls Sparkle’s “Check for Updates…” sheet.
|
||||||
|
|
||||||
|
> `./scripts/build_release.sh` will call `generate_appcast` for you when `SPARKLE_EDDSA_KEY_FILE`, `SPARKLE_DOWNLOAD_BASE_URL`, and (optionally) `SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE` are set. It tries to locate Sparkle’s CLI in DerivedData automatically, but you can override the path via `SPARKLE_GENERATE_APPCAST`. The resulting feed is written to `SPARKLE_APPCAST_OUTPUT` (defaults to `Sparkle/appcast.xml`).
|
||||||
|
|
||||||
|
> Build settings include `INFOPLIST_KEY_SUFeedURL` and `INFOPLIST_KEY_SUPublicEDKey`. Make sure to fill both before shipping a build so Sparkle knows where to fetch updates and how to verify them.
|
||||||
|
|
||||||
|
### Automated release push
|
||||||
|
|
||||||
|
If you want `git push origin master` to build/sign/notarize/upload automatically, enable the provided pre-push hook:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git config core.hooksPath hooks
|
||||||
|
```
|
||||||
|
|
||||||
|
The hook (see `hooks/pre-push`) watches for pushes that include `refs/heads/master`, automatically bumps `marketing_version` (incrementing the last component), runs `scripts/build_release.sh`, stages `version.json`, `iKeyMon.xcodeproj/project.pbxproj`, and `Sparkle/appcast.xml`, then creates a commit `chore: release <version>`. It performs its own `git push` behind the scenes and cancels the original push command so you don't upload the same refs twice—once you see “Release … pushed. Original push cancelled”, you're done (Git will report the original push failed; that's expected). To skip the automation temporarily, prepend `SKIP_RELEASE=1` to your `git push` command.
|
||||||
|
|
||||||
|
The bumping logic lives in `scripts/bump_version.sh` (feel free to run it manually if you need to create a release without pushing).
|
||||||
|
|
||||||
|
### Versioning workflow
|
||||||
|
|
||||||
|
- The canonical marketing version lives in `version.json` and follows the format `YY.major.minor` (example: `26.1.2`). Update that file manually whenever you cut a new release branch.
|
||||||
|
- The build number is derived automatically from the git commit count on the current branch (you can override it by exporting `BUILD_NUMBER` before running the script if needed).
|
||||||
|
- Run `./scripts/sync_version.sh` anytime after editing `version.json` (the release script already calls it). The helper updates `MARKETING_VERSION` and `CURRENT_PROJECT_VERSION` inside `iKeyMon.xcodeproj`, keeping Xcode, the app bundle, and release artifacts in sync.
|
||||||
|
- `scripts/build_release.sh` reads the same `version.json` for naming the generated ZIP/DMG, so the artifact names, Info.plist values, and UI displays all stay aligned.
|
||||||
|
|
||||||
## 📦 License
|
## 📦 License
|
||||||
|
|
||||||
MIT — see [LICENSE](LICENSE) for details.
|
MIT — see [LICENSE](LICENSE) for details.
|
||||||
|
|||||||
50
Sources/Extensions/View+Shimmer.swift
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
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) {
|
||||||
|
guard active else { return }
|
||||||
|
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))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@ import Foundation
|
|||||||
import Security
|
import Security
|
||||||
|
|
||||||
enum KeychainHelper {
|
enum KeychainHelper {
|
||||||
static func save(apiKey: String, for hostname: String) {
|
static func saveApiKey(_ apiKey: String, for hostname: String) {
|
||||||
let data = Data(apiKey.utf8)
|
let data = Data(apiKey.utf8)
|
||||||
let query: [String: Any] = [
|
let query: [String: Any] = [
|
||||||
kSecClass as String: kSecClassGenericPassword,
|
kSecClass as String: kSecClassGenericPassword,
|
||||||
@@ -9,6 +9,7 @@ import Foundation
|
|||||||
|
|
||||||
enum APIVersion: String, CaseIterable {
|
enum APIVersion: String, CaseIterable {
|
||||||
case v2_12 = "2.12"
|
case v2_12 = "2.12"
|
||||||
|
case v2_13 = "2.13"
|
||||||
|
|
||||||
static func from(versionString: String) -> APIVersion? {
|
static func from(versionString: String) -> APIVersion? {
|
||||||
if let version = APIVersion(rawValue: versionString) {
|
if let version = APIVersion(rawValue: versionString) {
|
||||||
@@ -22,7 +23,8 @@ enum APIVersion: String, CaseIterable {
|
|||||||
let minor = components[1]
|
let minor = components[1]
|
||||||
|
|
||||||
switch (major, minor) {
|
switch (major, minor) {
|
||||||
case (2, 12...): return .v2_12
|
case (2, 12): return .v2_12
|
||||||
|
case (2, 13...): return .v2_13
|
||||||
default: return nil
|
default: return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -69,6 +71,8 @@ class APIFactory {
|
|||||||
switch version {
|
switch version {
|
||||||
case .v2_12:
|
case .v2_12:
|
||||||
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
||||||
|
case .v2_13:
|
||||||
|
return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,7 +104,7 @@ class APIFactory {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,6 +98,43 @@ struct ServerInfo: Codable, Hashable, Equatable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct OperatingSystem: Codable, Hashable, Equatable {
|
||||||
|
struct UpdateStatus: Codable, Hashable, Equatable {
|
||||||
|
let updateCount: Int
|
||||||
|
let securityUpdateCount: Int
|
||||||
|
let rebootRequired: Bool
|
||||||
|
|
||||||
|
init(updateCount: Int, securityUpdateCount: Int, rebootRequired: Bool) {
|
||||||
|
self.updateCount = updateCount
|
||||||
|
self.securityUpdateCount = securityUpdateCount
|
||||||
|
self.rebootRequired = rebootRequired
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let label: String
|
||||||
|
let distribution: String
|
||||||
|
let version: String
|
||||||
|
let architecture: String
|
||||||
|
let endOfLife: Bool
|
||||||
|
let updates: UpdateStatus?
|
||||||
|
|
||||||
|
init(
|
||||||
|
label: String,
|
||||||
|
distribution: String,
|
||||||
|
version: String,
|
||||||
|
architecture: String,
|
||||||
|
endOfLife: Bool,
|
||||||
|
updates: UpdateStatus?
|
||||||
|
) {
|
||||||
|
self.label = label
|
||||||
|
self.distribution = distribution
|
||||||
|
self.version = version
|
||||||
|
self.architecture = architecture
|
||||||
|
self.endOfLife = endOfLife
|
||||||
|
self.updates = updates
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var hostname: String
|
var hostname: String
|
||||||
var ipAddresses: [String]
|
var ipAddresses: [String]
|
||||||
var cpuCores: Int
|
var cpuCores: Int
|
||||||
@@ -108,6 +145,8 @@ struct ServerInfo: Codable, Hashable, Equatable {
|
|||||||
var phpVersion: String
|
var phpVersion: String
|
||||||
var mysqlVersion: String?
|
var mysqlVersion: String?
|
||||||
var mariadbVersion: String?
|
var mariadbVersion: String?
|
||||||
|
var emailsInQueue: Int?
|
||||||
|
var operatingSystem: OperatingSystem?
|
||||||
var ports: [ServicePort]?
|
var ports: [ServicePort]?
|
||||||
var load: Load
|
var load: Load
|
||||||
var memory: Memory
|
var memory: Memory
|
||||||
@@ -128,6 +167,15 @@ struct ServerInfo: Codable, Hashable, Equatable {
|
|||||||
}
|
}
|
||||||
return ServerInfo.displayFormatter.string(from: date)
|
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
|
// MARK: - Helpers & Sample Data
|
||||||
@@ -157,6 +205,19 @@ extension ServerInfo {
|
|||||||
phpVersion: "8.2.12",
|
phpVersion: "8.2.12",
|
||||||
mysqlVersion: "8.0.33",
|
mysqlVersion: "8.0.33",
|
||||||
mariadbVersion: nil,
|
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: [
|
ports: [
|
||||||
ServicePort(service: "HTTP", status: "online", port: 80, proto: "tcp"),
|
ServicePort(service: "HTTP", status: "online", port: 80, proto: "tcp"),
|
||||||
ServicePort(service: "HTTPS", status: "online", port: 443, proto: "tcp"),
|
ServicePort(service: "HTTPS", status: "online", port: 443, proto: "tcp"),
|
||||||
@@ -131,10 +131,10 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
|
|||||||
typealias UtilizationType = APIv2_12.Utilization
|
typealias UtilizationType = APIv2_12.Utilization
|
||||||
|
|
||||||
private enum Endpoint: String {
|
private enum Endpoint: String {
|
||||||
case systemInfo = "/api/v2.12/system/info"
|
case systemInfo = "/api/v2/system/info"
|
||||||
case load = "/api/v2.12/metrics/load"
|
case load = "/api/v2/metrics/load"
|
||||||
case memory = "/api/v2.12/metrics/memory"
|
case memory = "/api/v2/metrics/memory"
|
||||||
case utilization = "/api/v2.12/metrics/utilization"
|
case utilization = "/api/v2/metrics/utilization"
|
||||||
|
|
||||||
func url(baseURL: URL) -> URL {
|
func url(baseURL: URL) -> URL {
|
||||||
return baseURL.appendingPathComponent(self.rawValue)
|
return baseURL.appendingPathComponent(self.rawValue)
|
||||||
@@ -196,6 +196,7 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
|
|||||||
private extension APIv2_12 {
|
private extension APIv2_12 {
|
||||||
struct ServerSummaryEnvelope: Decodable {
|
struct ServerSummaryEnvelope: Decodable {
|
||||||
let meta: Meta
|
let meta: Meta
|
||||||
|
let operatingSystem: OperatingSystem?
|
||||||
let utilization: Utilization
|
let utilization: Utilization
|
||||||
let components: Components
|
let components: Components
|
||||||
let ports: [Port]?
|
let ports: [Port]?
|
||||||
@@ -247,6 +248,7 @@ private extension APIv2_12 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let processCount: Int
|
let processCount: Int
|
||||||
|
let emailsInQueue: Int?
|
||||||
let load: Load
|
let load: Load
|
||||||
let diskSpace: Disk
|
let diskSpace: Disk
|
||||||
let memory: Memory
|
let memory: Memory
|
||||||
@@ -280,6 +282,53 @@ private extension APIv2_12 {
|
|||||||
let configFile: 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 {
|
func toDomain() -> ServerInfo {
|
||||||
let load = utilization.load
|
let load = utilization.load
|
||||||
let disk = utilization.diskSpace
|
let disk = utilization.diskSpace
|
||||||
@@ -297,6 +346,23 @@ private extension APIv2_12 {
|
|||||||
phpVersion: components.php,
|
phpVersion: components.php,
|
||||||
mysqlVersion: components.mysql,
|
mysqlVersion: components.mysql,
|
||||||
mariadbVersion: components.mariadb,
|
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 {
|
ports: ports?.map {
|
||||||
ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto)
|
ServerInfo.ServicePort(service: $0.service, status: $0.status, port: $0.port, proto: $0.proto)
|
||||||
},
|
},
|
||||||
411
Sources/Model/API/Versions/APIv2_13.swift
Normal file
@@ -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
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
26
Sources/ViewModels/SparkleUpdater.swift
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import Sparkle
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
final class SparkleUpdater: NSObject, ObservableObject {
|
||||||
|
let controller: SPUStandardUpdaterController
|
||||||
|
|
||||||
|
override init() {
|
||||||
|
self.controller = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
|
||||||
|
super.init()
|
||||||
|
}
|
||||||
|
|
||||||
|
var automaticallyChecksForUpdates: Bool {
|
||||||
|
get { controller.updater.automaticallyChecksForUpdates }
|
||||||
|
set { controller.updater.automaticallyChecksForUpdates = newValue }
|
||||||
|
}
|
||||||
|
|
||||||
|
var automaticallyDownloadsUpdates: Bool {
|
||||||
|
get { controller.updater.automaticallyDownloadsUpdates }
|
||||||
|
set { controller.updater.automaticallyDownloadsUpdates = newValue }
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkForUpdates() {
|
||||||
|
controller.checkForUpdates(nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,14 +12,13 @@ struct MainView: View {
|
|||||||
private static let serverOrderKeyStatic = "serverOrder"
|
private static let serverOrderKeyStatic = "serverOrder"
|
||||||
private static let storedServersKeyStatic = "storedServers"
|
private static let storedServersKeyStatic = "storedServers"
|
||||||
|
|
||||||
|
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||||
@State var showAddServerSheet: Bool = false
|
@State var showAddServerSheet: Bool = false
|
||||||
@State private var serverBeingEdited: Server?
|
@State private var serverBeingEdited: Server?
|
||||||
@State private var serverToDelete: Server?
|
@State private var serverToDelete: Server?
|
||||||
@State private var showDeleteConfirmation = false
|
@State private var showDeleteConfirmation = false
|
||||||
@State private var isFetchingInfo: Bool = false
|
@State private var isFetchingInfo: Bool = false
|
||||||
@State private var refreshTimer = Timer.publish(every: 60, on: .main, in: .common).autoconnect()
|
@State private var refreshTimer = Timer.publish(every: 60, on: .main, in: .common).autoconnect()
|
||||||
@State private var progress: Double = 0
|
|
||||||
@State private var lastRefresh = Date()
|
|
||||||
@State private var pingTimer: Timer?
|
@State private var pingTimer: Timer?
|
||||||
private let serverOrderKey = MainView.serverOrderKeyStatic
|
private let serverOrderKey = MainView.serverOrderKeyStatic
|
||||||
private let storedServersKey = MainView.storedServersKeyStatic
|
private let storedServersKey = MainView.storedServersKeyStatic
|
||||||
@@ -30,7 +29,7 @@ struct MainView: View {
|
|||||||
@State private var selectedServerID: UUID?
|
@State private var selectedServerID: UUID?
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
|
var mainContent: some View {
|
||||||
NavigationSplitView {
|
NavigationSplitView {
|
||||||
List(selection: $selectedServerID) {
|
List(selection: $selectedServerID) {
|
||||||
ForEach(servers) { server in
|
ForEach(servers) { server in
|
||||||
@@ -61,6 +60,14 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
.help("Add Host")
|
.help("Add Host")
|
||||||
}
|
}
|
||||||
|
ToolbarItem {
|
||||||
|
Button {
|
||||||
|
sparkleUpdater.checkForUpdates()
|
||||||
|
} label: {
|
||||||
|
Image(systemName: "square.and.arrow.down")
|
||||||
|
}
|
||||||
|
.help("Check for Updates")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Servers")
|
.navigationTitle("Servers")
|
||||||
.onChange(of: selectedServerID) {
|
.onChange(of: selectedServerID) {
|
||||||
@@ -77,6 +84,8 @@ struct MainView: View {
|
|||||||
ContentUnavailableView("No Server Selected", systemImage: "server.rack")
|
ContentUnavailableView("No Server Selected", systemImage: "server.rack")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
return mainContent
|
||||||
.sheet(isPresented: $showAddServerSheet) {
|
.sheet(isPresented: $showAddServerSheet) {
|
||||||
ServerFormView(
|
ServerFormView(
|
||||||
mode: .add,
|
mode: .add,
|
||||||
@@ -103,16 +112,26 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
|
let initialID: UUID?
|
||||||
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
||||||
let uuid = UUID(uuidString: storedID),
|
let uuid = UUID(uuidString: storedID),
|
||||||
servers.contains(where: { $0.id == uuid }) {
|
servers.contains(where: { $0.id == uuid }) {
|
||||||
print("✅ [MainView] Restored selected server \(uuid)")
|
print("✅ [MainView] Restored selected server \(uuid)")
|
||||||
selectedServerID = uuid
|
initialID = uuid
|
||||||
} else if selectedServerID == nil, let first = servers.first {
|
} else if let first = servers.first {
|
||||||
print("✅ [MainView] Selecting first server \(first.hostname)")
|
print("✅ [MainView] Selecting first server \(first.hostname)")
|
||||||
selectedServerID = first.id
|
initialID = first.id
|
||||||
} else {
|
} else {
|
||||||
print("ℹ️ [MainView] No stored selection")
|
print("ℹ️ [MainView] No stored selection")
|
||||||
|
initialID = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedServerID = initialID
|
||||||
|
|
||||||
|
if let initialID {
|
||||||
|
Task {
|
||||||
|
await prefetchOtherServers(activeID: initialID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
pingAllServers()
|
pingAllServers()
|
||||||
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
||||||
@@ -120,7 +139,6 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.frame(minWidth: 800, minHeight: 450)
|
.frame(minWidth: 800, minHeight: 450)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private func fetchServerInfo(for id: UUID) {
|
private func fetchServerInfo(for id: UUID) {
|
||||||
@@ -158,6 +176,39 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func prefetchOtherServers(activeID: UUID) async {
|
||||||
|
let others = servers.filter { $0.id != activeID }
|
||||||
|
await withTaskGroup(of: Void.self) { group in
|
||||||
|
for server in others {
|
||||||
|
group.addTask {
|
||||||
|
await fetchServerInfoAsync(for: server.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func fetchServerInfoAsync(for id: UUID) async {
|
||||||
|
guard let server = servers.first(where: { $0.id == id }) else { return }
|
||||||
|
guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||||
|
!apiKey.isEmpty,
|
||||||
|
let baseURL = URL(string: "https://\(server.hostname)")
|
||||||
|
else { return }
|
||||||
|
|
||||||
|
do {
|
||||||
|
let api = try await APIFactory.detectAndCreateAPI(baseURL: baseURL, apiKey: apiKey)
|
||||||
|
let info = try await api.fetchServerSummary(apiKey: apiKey)
|
||||||
|
await MainActor.run {
|
||||||
|
if let index = servers.firstIndex(where: { $0.id == id }) {
|
||||||
|
var updated = servers[index]
|
||||||
|
updated.info = info
|
||||||
|
servers[index] = updated
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
print("❌ Prefetch failed for \(server.hostname): \(error)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private func moveServer(from source: IndexSet, to destination: Int) {
|
private func moveServer(from source: IndexSet, to destination: Int) {
|
||||||
servers.move(fromOffsets: source, toOffset: destination)
|
servers.move(fromOffsets: source, toOffset: destination)
|
||||||
saveServerOrder()
|
saveServerOrder()
|
||||||
@@ -218,4 +269,5 @@ struct MainView: View {
|
|||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
MainView()
|
MainView()
|
||||||
|
.environmentObject(SparkleUpdater())
|
||||||
}
|
}
|
||||||
303
Sources/Views/PreferencesView.swift
Normal file
@@ -0,0 +1,303 @@
|
|||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct PreferencesView: View {
|
||||||
|
private enum Tab: CaseIterable {
|
||||||
|
case monitor, notifications, alerts, updates
|
||||||
|
|
||||||
|
var title: String {
|
||||||
|
switch self {
|
||||||
|
case .monitor: return "Monitor"
|
||||||
|
case .notifications: return "Notifications"
|
||||||
|
case .alerts: return "Alerts"
|
||||||
|
case .updates: return "Updates"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var icon: String {
|
||||||
|
switch self {
|
||||||
|
case .monitor: return "waveform.path.ecg"
|
||||||
|
case .notifications: return "bell.badge"
|
||||||
|
case .alerts: return "exclamationmark.triangle"
|
||||||
|
case .updates: return "square.and.arrow.down"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||||
|
|
||||||
|
@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)
|
||||||
|
.background(
|
||||||
|
Capsule(style: .continuous)
|
||||||
|
.fill(backgroundColor(for: tab))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.focusable(false)
|
||||||
|
.contentShape(Capsule())
|
||||||
|
.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()
|
||||||
|
case .updates:
|
||||||
|
UpdatesPreferencesView()
|
||||||
|
.environmentObject(sparkleUpdater)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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 UpdatesPreferencesView: View {
|
||||||
|
@EnvironmentObject var sparkleUpdater: SparkleUpdater
|
||||||
|
|
||||||
|
private var automaticallyChecksBinding: Binding<Bool> {
|
||||||
|
Binding(
|
||||||
|
get: { sparkleUpdater.automaticallyChecksForUpdates },
|
||||||
|
set: { sparkleUpdater.automaticallyChecksForUpdates = $0 }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private var automaticallyDownloadsBinding: Binding<Bool> {
|
||||||
|
Binding(
|
||||||
|
get: { sparkleUpdater.automaticallyDownloadsUpdates },
|
||||||
|
set: { sparkleUpdater.automaticallyDownloadsUpdates = $0 }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 18) {
|
||||||
|
Toggle("Automatically check for updates", isOn: automaticallyChecksBinding)
|
||||||
|
Toggle("Automatically download updates", isOn: automaticallyDownloadsBinding)
|
||||||
|
|
||||||
|
Button(action: sparkleUpdater.checkForUpdates) {
|
||||||
|
Label("Check for Updates Now", systemImage: "sparkles")
|
||||||
|
}
|
||||||
|
|
||||||
|
Text("Updates are delivered via Sparkle. Configure your appcast URL and public EdDSA key in Info.plist (keys `SUFeedURL` and `SUPublicEDKey`).")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.padding(.top, 4)
|
||||||
|
|
||||||
|
Spacer()
|
||||||
|
}
|
||||||
|
.toggleStyle(.switch)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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()
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@ struct TableRowView<Label: View, Value: View>: View {
|
|||||||
HStack(alignment: .top) {
|
HStack(alignment: .top) {
|
||||||
label()
|
label()
|
||||||
.frame(width: 180, alignment: .leading)
|
.frame(width: 180, alignment: .leading)
|
||||||
|
.unredacted()
|
||||||
|
|
||||||
value()
|
value()
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
98
Sources/Views/ServerDetailView.swift
Normal file
@@ -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())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -185,7 +185,7 @@ struct ServerFormView: View {
|
|||||||
print("adding server")
|
print("adding server")
|
||||||
let newServer = Server(hostname: trimmedHost)
|
let newServer = Server(hostname: trimmedHost)
|
||||||
servers.append(newServer)
|
servers.append(newServer)
|
||||||
KeychainHelper.save(apiKey: trimmedKey, for: trimmedHost)
|
KeychainHelper.saveApiKey(trimmedKey, for: trimmedHost)
|
||||||
saveServers()
|
saveServers()
|
||||||
case .edit(let oldServer):
|
case .edit(let oldServer):
|
||||||
if let index = servers.firstIndex(where: { $0.id == oldServer.id }) {
|
if let index = servers.firstIndex(where: { $0.id == oldServer.id }) {
|
||||||
@@ -194,7 +194,7 @@ struct ServerFormView: View {
|
|||||||
if oldHostname != trimmedHost {
|
if oldHostname != trimmedHost {
|
||||||
KeychainHelper.deleteApiKey(for: oldHostname)
|
KeychainHelper.deleteApiKey(for: oldHostname)
|
||||||
}
|
}
|
||||||
KeychainHelper.save(apiKey: trimmedKey, for: trimmedHost)
|
KeychainHelper.saveApiKey(trimmedKey, for: trimmedHost)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -214,7 +214,7 @@ struct ServerFormView: View {
|
|||||||
if oldHostname != hostname {
|
if oldHostname != hostname {
|
||||||
KeychainHelper.deleteApiKey(for: oldHostname)
|
KeychainHelper.deleteApiKey(for: oldHostname)
|
||||||
}
|
}
|
||||||
KeychainHelper.save(apiKey: apiKey, for: hostname)
|
KeychainHelper.saveApiKey(apiKey, for: hostname)
|
||||||
saveServers()
|
saveServers()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
134
Sources/Views/Tabs/GeneralView.swift
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
//
|
||||||
|
// 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 && description.range(of: distro, options: [.caseInsensitive]) == nil {
|
||||||
|
description += " • \(distro)"
|
||||||
|
}
|
||||||
|
if !os.architecture.isEmpty &&
|
||||||
|
description.range(of: os.architecture, options: [.caseInsensitive]) == nil {
|
||||||
|
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()
|
||||||
|
}
|
||||||
41
Sources/iKeyMonApp.swift
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
//
|
||||||
|
// iKeyMonApp.swift
|
||||||
|
// iKeyMon
|
||||||
|
//
|
||||||
|
// Created by tracer on 30.03.25.
|
||||||
|
//
|
||||||
|
|
||||||
|
import SwiftUI
|
||||||
|
#if os(macOS)
|
||||||
|
import AppKit
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@main
|
||||||
|
struct iKeyMonApp: App {
|
||||||
|
@StateObject private var sparkleUpdater = SparkleUpdater()
|
||||||
|
|
||||||
|
init() {
|
||||||
|
#if os(macOS)
|
||||||
|
if let customIcon = NSImage(named: "AppIcon") {
|
||||||
|
NSApplication.shared.applicationIconImage = customIcon
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
var body: some Scene {
|
||||||
|
WindowGroup {
|
||||||
|
MainView()
|
||||||
|
.environmentObject(sparkleUpdater)
|
||||||
|
.onDisappear {
|
||||||
|
NSApp.terminate(nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.windowResizability(.contentMinSize)
|
||||||
|
|
||||||
|
Settings {
|
||||||
|
PreferencesView()
|
||||||
|
.padding()
|
||||||
|
.environmentObject(sparkleUpdater)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
30
Sparkle/appcast.xml
vendored
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" standalone="yes"?>
|
||||||
|
<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
|
||||||
|
<channel>
|
||||||
|
<title>iKeyMon</title>
|
||||||
|
<item>
|
||||||
|
<title>26.0.16</title>
|
||||||
|
<pubDate>Tue, 25 Nov 2025 18:34:19 +0100</pubDate>
|
||||||
|
<sparkle:version>39</sparkle:version>
|
||||||
|
<sparkle:shortVersionString>26.0.16</sparkle:shortVersionString>
|
||||||
|
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||||
|
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.16/iKeyMon-26.0.16.zip" length="4801351" type="application/octet-stream" sparkle:edSignature="lbQEpxEElRxwyRdm0LQIxsnfh8o8Kt66wQlcl4PBs68lBmjkq0b/5EsVCElWQb0Nei/GCk6I/m2mSNL7mA3wBQ=="/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<title>26.0.15</title>
|
||||||
|
<pubDate>Tue, 25 Nov 2025 18:11:17 +0100</pubDate>
|
||||||
|
<sparkle:version>35</sparkle:version>
|
||||||
|
<sparkle:shortVersionString>26.0.15</sparkle:shortVersionString>
|
||||||
|
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||||
|
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.15/iKeyMon-26.0.15.zip" length="4801128" type="application/octet-stream" sparkle:edSignature="T16+tX44yN2UqIUsMJeZAxydOuLC6lcQQrlRElTkJlSWPheWLy9xPjP4T45mNSOcWTax0gRCnI50ab3geL9XAA=="/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<title>26.0.15</title>
|
||||||
|
<pubDate>Tue, 25 Nov 2025 17:42:56 +0100</pubDate>
|
||||||
|
<sparkle:version>34</sparkle:version>
|
||||||
|
<sparkle:shortVersionString>26.0.15</sparkle:shortVersionString>
|
||||||
|
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||||
|
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.15/iKeyMon-26.0.15.zip" length="4800821" type="application/octet-stream" sparkle:edSignature="bojJ638CY0n+34POoJX3OBrXRAiPOYPiDTfgJOS9fCslw8YGKZLviJvcExC2PKh1HDt0Raabo0FJUJrAFUMmBQ=="/>
|
||||||
|
</item>
|
||||||
|
</channel>
|
||||||
|
</rss>
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
//
|
|
||||||
// ServerDetailView.swift
|
|
||||||
// iKeyMon
|
|
||||||
//
|
|
||||||
// Created by tracer on 30.03.25.
|
|
||||||
//
|
|
||||||
|
|
||||||
import SwiftUI
|
|
||||||
|
|
||||||
struct ServerDetailView: View {
|
|
||||||
@Binding var server: Server
|
|
||||||
var isFetching: Bool
|
|
||||||
|
|
||||||
@State private var progress: Double = 0
|
|
||||||
let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
|
|
||||||
|
|
||||||
var body: some View {
|
|
||||||
VStack(spacing: 0) {
|
|
||||||
ProgressView(value: progress)
|
|
||||||
.progressViewStyle(LinearProgressViewStyle())
|
|
||||||
.padding(.horizontal)
|
|
||||||
.frame(height: 2)
|
|
||||||
|
|
||||||
if server.info == nil {
|
|
||||||
ProgressView("Fetching server info...")
|
|
||||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
||||||
} else {
|
|
||||||
ZStack(alignment: .topTrailing) {
|
|
||||||
VStack(spacing: 0) {
|
|
||||||
Spacer().frame(height: 6)
|
|
||||||
TabView {
|
|
||||||
GeneralView(server: $server)
|
|
||||||
.tabItem {
|
|
||||||
Text("General")
|
|
||||||
}
|
|
||||||
ResourcesView(server: $server)
|
|
||||||
.tabItem {
|
|
||||||
Text("Resources")
|
|
||||||
}
|
|
||||||
ServicesView(server: $server)
|
|
||||||
.tabItem {
|
|
||||||
Text("Services")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFetching {
|
|
||||||
ProgressView()
|
|
||||||
.scaleEffect(0.5)
|
|
||||||
.padding()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.padding(0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.onReceive(timer) { _ in
|
|
||||||
withAnimation(.linear(duration: 1.0 / 60.0)) {
|
|
||||||
progress += 1.0 / (60.0 * 60.0)
|
|
||||||
if progress >= 1 { progress = 0 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#Preview {
|
|
||||||
ServerDetailView(
|
|
||||||
server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
|
|
||||||
isFetching: false
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -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()
|
|
||||||
}
|
|
||||||
62
hooks/pre-push
Executable file
@@ -0,0 +1,62 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
REMOTE_NAME="${1:-origin}"
|
||||||
|
|
||||||
|
if [[ -n "${SKIP_RELEASE:-}" ]]; then
|
||||||
|
echo "⚙️ SKIP_RELEASE set — skipping automated release build."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
should_release=false
|
||||||
|
release_local_ref=""
|
||||||
|
release_remote_ref=""
|
||||||
|
while read -r local_ref local_sha remote_ref remote_sha; do
|
||||||
|
[[ -z "${local_ref:-}" ]] && continue
|
||||||
|
if [[ "$local_ref" == "refs/heads/master" || "$remote_ref" == "refs/heads/master" ]]; then
|
||||||
|
should_release=true
|
||||||
|
release_local_ref="$local_ref"
|
||||||
|
release_remote_ref="${remote_ref:-refs/heads/master}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ "$should_release" != true ]]; then
|
||||||
|
current_branch="$(git -C "$ROOT_DIR" symbolic-ref --short -q HEAD || true)"
|
||||||
|
if [[ "$current_branch" == "master" ]]; then
|
||||||
|
should_release=true
|
||||||
|
release_local_ref="refs/heads/master"
|
||||||
|
release_remote_ref="refs/heads/master"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$should_release" != true ]]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "🚀 Detected push to master — bumping version and building release..."
|
||||||
|
NEW_VERSION="$("$ROOT_DIR/scripts/bump_version.sh")"
|
||||||
|
echo "🔢 marketing_version -> ${NEW_VERSION}"
|
||||||
|
"$ROOT_DIR/scripts/sync_version.sh"
|
||||||
|
|
||||||
|
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj"
|
||||||
|
|
||||||
|
"$ROOT_DIR/scripts/build_release.sh"
|
||||||
|
|
||||||
|
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml"
|
||||||
|
|
||||||
|
if git -C "$ROOT_DIR" diff --cached --quiet; then
|
||||||
|
echo "⚠️ No release changes detected; skipping release commit."
|
||||||
|
else
|
||||||
|
git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}"
|
||||||
|
echo "📝 Committed release ${NEW_VERSION}."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "📤 Pushing release commit..."
|
||||||
|
if SKIP_RELEASE=1 git -C "$ROOT_DIR" push "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
|
||||||
|
echo "✅ Release ${NEW_VERSION} pushed. Original push cancelled (already done)."
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo "❌ Failed to push release ${NEW_VERSION}. Please resolve manually."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
10
iKeyMon-Info.plist
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>SUFeedURL</key>
|
||||||
|
<string>https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml</string>
|
||||||
|
<key>SUPublicEDKey</key>
|
||||||
|
<string>EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=</string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
@@ -7,42 +7,47 @@
|
|||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
52A9B79B2EC8E7EE004DD4A2 /* iKeyMonApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A9B7892EC8E7EE004DD4A2 /* iKeyMonApp.swift */; };
|
|
||||||
52A9B79C2EC8E7EE004DD4A2 /* KeychainHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A9B78A2EC8E7EE004DD4A2 /* KeychainHelper.swift */; };
|
|
||||||
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
|
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
|
||||||
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
|
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
|
||||||
|
52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B9712ECF751C004DD4A2 /* signing.env.example */; };
|
||||||
|
52A9BD112ED377F7004DD4A2 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 52A9BD102ED377F7004DD4A2 /* Sparkle */; };
|
||||||
|
52A9BECA2ED3874F004DD4A2 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9BEC92ED3874F004DD4A2 /* README.md */; };
|
||||||
/* End PBXBuildFile section */
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
|
/* Begin PBXCopyFilesBuildPhase section */
|
||||||
|
52A9BD152ED37BD8004DD4A2 /* CopyFiles */ = {
|
||||||
|
isa = PBXCopyFilesBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
dstPath = "";
|
||||||
|
dstSubfolderSpec = 6;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
};
|
||||||
|
/* End PBXCopyFilesBuildPhase section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
5203C24D2D997D2800576D4A /* iKeyMon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iKeyMon.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
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>"; };
|
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>"; };
|
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iKeyMon.entitlements; sourceTree = "<group>"; };
|
||||||
52A9B7892EC8E7EE004DD4A2 /* iKeyMonApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iKeyMonApp.swift; sourceTree = "<group>"; };
|
|
||||||
52A9B78A2EC8E7EE004DD4A2 /* KeychainHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainHelper.swift; sourceTree = "<group>"; };
|
|
||||||
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
|
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
|
||||||
|
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = NOTES.md; sourceTree = "<group>"; };
|
||||||
|
52A9B9712ECF751C004DD4A2 /* signing.env.example */ = {isa = PBXFileReference; lastKnownFileType = text; path = signing.env.example; sourceTree = "<group>"; };
|
||||||
|
52A9BEC92ED3874F004DD4A2 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
|
||||||
|
52A9C38F2ED4D753004DD4A2 /* iKeyMon-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "iKeyMon-Info.plist"; sourceTree = "<group>"; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
||||||
52A9B7A12EC8E84F004DD4A2 /* Extensions */ = {
|
52A9B8BE2ECB68B5004DD4A2 /* Sources */ = {
|
||||||
isa = PBXFileSystemSynchronizedRootGroup;
|
isa = PBXFileSystemSynchronizedRootGroup;
|
||||||
path = Extensions;
|
path = Sources;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
52A9B7A72EC8E857004DD4A2 /* Model */ = {
|
52A9B8F72ECB6B8A004DD4A2 /* Preview Content */ = {
|
||||||
isa = PBXFileSystemSynchronizedRootGroup;
|
|
||||||
path = Model;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
52A9B7AC2EC8E85E004DD4A2 /* Preview Content */ = {
|
|
||||||
isa = PBXFileSystemSynchronizedRootGroup;
|
isa = PBXFileSystemSynchronizedRootGroup;
|
||||||
path = "Preview Content";
|
path = "Preview Content";
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
52A9B7BC2EC8E86C004DD4A2 /* Views */ = {
|
|
||||||
isa = PBXFileSystemSynchronizedRootGroup;
|
|
||||||
path = Views;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
/* End PBXFileSystemSynchronizedRootGroup section */
|
/* End PBXFileSystemSynchronizedRootGroup section */
|
||||||
|
|
||||||
/* Begin PBXFrameworksBuildPhase section */
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
@@ -50,6 +55,7 @@
|
|||||||
isa = PBXFrameworksBuildPhase;
|
isa = PBXFrameworksBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
|
52A9BD112ED377F7004DD4A2 /* Sparkle in Frameworks */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -59,16 +65,17 @@
|
|||||||
5203C2442D997D2800576D4A = {
|
5203C2442D997D2800576D4A = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
52A9C38F2ED4D753004DD4A2 /* iKeyMon-Info.plist */,
|
||||||
|
52A9B8BE2ECB68B5004DD4A2 /* Sources */,
|
||||||
52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
|
52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
|
||||||
52A9B7A72EC8E857004DD4A2 /* Model */,
|
|
||||||
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
|
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
|
||||||
52A9B7A12EC8E84F004DD4A2 /* Extensions */,
|
52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
|
||||||
52A9B7AC2EC8E85E004DD4A2 /* Preview Content */,
|
|
||||||
52A9B7892EC8E7EE004DD4A2 /* iKeyMonApp.swift */,
|
|
||||||
52A9B7BC2EC8E86C004DD4A2 /* Views */,
|
|
||||||
52A9B78A2EC8E7EE004DD4A2 /* KeychainHelper.swift */,
|
|
||||||
5203C24E2D997D2800576D4A /* Products */,
|
5203C24E2D997D2800576D4A /* Products */,
|
||||||
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
|
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
|
||||||
|
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */,
|
||||||
|
52A9B9712ECF751C004DD4A2 /* signing.env.example */,
|
||||||
|
52A9BEC92ED3874F004DD4A2 /* README.md */,
|
||||||
|
52A9BD122ED37E08004DD4A2 /* Frameworks */,
|
||||||
);
|
);
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
@@ -80,6 +87,13 @@
|
|||||||
name = Products;
|
name = Products;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
52A9BD122ED37E08004DD4A2 /* Frameworks */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
);
|
||||||
|
name = Frameworks;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
/* Begin PBXNativeTarget section */
|
/* Begin PBXNativeTarget section */
|
||||||
@@ -90,19 +104,19 @@
|
|||||||
5203C2492D997D2800576D4A /* Sources */,
|
5203C2492D997D2800576D4A /* Sources */,
|
||||||
5203C24A2D997D2800576D4A /* Frameworks */,
|
5203C24A2D997D2800576D4A /* Frameworks */,
|
||||||
5203C24B2D997D2800576D4A /* Resources */,
|
5203C24B2D997D2800576D4A /* Resources */,
|
||||||
|
52A9BD152ED37BD8004DD4A2 /* CopyFiles */,
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
dependencies = (
|
dependencies = (
|
||||||
);
|
);
|
||||||
fileSystemSynchronizedGroups = (
|
fileSystemSynchronizedGroups = (
|
||||||
52A9B7A12EC8E84F004DD4A2 /* Extensions */,
|
52A9B8BE2ECB68B5004DD4A2 /* Sources */,
|
||||||
52A9B7A72EC8E857004DD4A2 /* Model */,
|
52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
|
||||||
52A9B7AC2EC8E85E004DD4A2 /* Preview Content */,
|
|
||||||
52A9B7BC2EC8E86C004DD4A2 /* Views */,
|
|
||||||
);
|
);
|
||||||
name = iKeyMon;
|
name = iKeyMon;
|
||||||
packageProductDependencies = (
|
packageProductDependencies = (
|
||||||
|
52A9BD102ED377F7004DD4A2 /* Sparkle */,
|
||||||
);
|
);
|
||||||
productName = iKeyMon;
|
productName = iKeyMon;
|
||||||
productReference = 5203C24D2D997D2800576D4A /* iKeyMon.app */;
|
productReference = 5203C24D2D997D2800576D4A /* iKeyMon.app */;
|
||||||
@@ -132,6 +146,9 @@
|
|||||||
);
|
);
|
||||||
mainGroup = 5203C2442D997D2800576D4A;
|
mainGroup = 5203C2442D997D2800576D4A;
|
||||||
minimizedProjectReferenceProxies = 1;
|
minimizedProjectReferenceProxies = 1;
|
||||||
|
packageReferences = (
|
||||||
|
52A9BD0F2ED377F7004DD4A2 /* XCRemoteSwiftPackageReference "Sparkle" */,
|
||||||
|
);
|
||||||
preferredProjectObjectVersion = 77;
|
preferredProjectObjectVersion = 77;
|
||||||
productRefGroup = 5203C24E2D997D2800576D4A /* Products */;
|
productRefGroup = 5203C24E2D997D2800576D4A /* Products */;
|
||||||
projectDirPath = "";
|
projectDirPath = "";
|
||||||
@@ -148,7 +165,9 @@
|
|||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
|
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
|
||||||
|
52A9BECA2ED3874F004DD4A2 /* README.md in Resources */,
|
||||||
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
|
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
|
||||||
|
52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -159,8 +178,6 @@
|
|||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
52A9B79B2EC8E7EE004DD4A2 /* iKeyMonApp.swift in Sources */,
|
|
||||||
52A9B79C2EC8E7EE004DD4A2 /* KeychainHelper.swift in Sources */,
|
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -293,18 +310,22 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 41;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
|
INFOPLIST_FILE = "iKeyMon-Info.plist";
|
||||||
|
INFOPLIST_KEY_CFBundleIconName = AppIcon;
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||||
|
INFOPLIST_KEY_SUFeedURL = "https://git.24unix.net/tracer/iKeyMon/releases/appcast.xml";
|
||||||
|
INFOPLIST_KEY_SUPublicEDKey = "EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=";
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 26.0.17;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||||
@@ -320,18 +341,22 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 41;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
|
INFOPLIST_FILE = "iKeyMon-Info.plist";
|
||||||
|
INFOPLIST_KEY_CFBundleIconName = AppIcon;
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||||
|
INFOPLIST_KEY_SUFeedURL = "https://git.24unix.net/tracer/iKeyMon/releases/appcast.xml";
|
||||||
|
INFOPLIST_KEY_SUPublicEDKey = "EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=";
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 26.0.17;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||||
@@ -361,6 +386,25 @@
|
|||||||
defaultConfigurationName = Release;
|
defaultConfigurationName = Release;
|
||||||
};
|
};
|
||||||
/* End XCConfigurationList section */
|
/* End XCConfigurationList section */
|
||||||
|
|
||||||
|
/* Begin XCRemoteSwiftPackageReference section */
|
||||||
|
52A9BD0F2ED377F7004DD4A2 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
|
||||||
|
isa = XCRemoteSwiftPackageReference;
|
||||||
|
repositoryURL = "https://github.com/sparkle-project/Sparkle";
|
||||||
|
requirement = {
|
||||||
|
kind = upToNextMajorVersion;
|
||||||
|
minimumVersion = 2.8.1;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/* End XCRemoteSwiftPackageReference section */
|
||||||
|
|
||||||
|
/* Begin XCSwiftPackageProductDependency section */
|
||||||
|
52A9BD102ED377F7004DD4A2 /* Sparkle */ = {
|
||||||
|
isa = XCSwiftPackageProductDependency;
|
||||||
|
package = 52A9BD0F2ED377F7004DD4A2 /* XCRemoteSwiftPackageReference "Sparkle" */;
|
||||||
|
productName = Sparkle;
|
||||||
|
};
|
||||||
|
/* End XCSwiftPackageProductDependency section */
|
||||||
};
|
};
|
||||||
rootObject = 5203C2452D997D2800576D4A /* Project object */;
|
rootObject = 5203C2452D997D2800576D4A /* Project object */;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"originHash" : "e721da7f9826abdffcb6185e886155efa2514bd6234475f1afa893e29eb258d6",
|
||||||
|
"pins" : [
|
||||||
|
{
|
||||||
|
"identity" : "sparkle",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/sparkle-project/Sparkle",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "5581748cef2bae787496fe6d61139aebe0a451f6",
|
||||||
|
"version" : "2.8.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version" : 3
|
||||||
|
}
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
//
|
|
||||||
// iKeyMonApp.swift
|
|
||||||
// iKeyMon
|
|
||||||
//
|
|
||||||
// Created by tracer on 30.03.25.
|
|
||||||
//
|
|
||||||
|
|
||||||
import SwiftUI
|
|
||||||
|
|
||||||
@main
|
|
||||||
struct iKeyMonApp: App {
|
|
||||||
var body: some Scene {
|
|
||||||
WindowGroup {
|
|
||||||
MainView()
|
|
||||||
.onDisappear {
|
|
||||||
NSApp.terminate(nil)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.windowResizability(.contentMinSize)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
196
scripts/build_release.sh
Executable file
@@ -0,0 +1,196 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
BUILD_DIR="$ROOT_DIR/build"
|
||||||
|
ARTIFACTS_DIR="$ROOT_DIR/dist"
|
||||||
|
SCHEME="iKeyMon"
|
||||||
|
PROJECT="iKeyMon.xcodeproj"
|
||||||
|
CREDENTIALS_FILE="$ROOT_DIR/.signing.env"
|
||||||
|
VERSION_FILE="$ROOT_DIR/version.json"
|
||||||
|
DERIVED_DATA_ROOT="${DERIVED_DATA_ROOT:-$HOME/Library/Developer/Xcode/DerivedData}"
|
||||||
|
|
||||||
|
find_generate_appcast() {
|
||||||
|
if [[ -n "${SPARKLE_GENERATE_APPCAST:-}" && -x "${SPARKLE_GENERATE_APPCAST}" ]]; then
|
||||||
|
echo "$SPARKLE_GENERATE_APPCAST"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -d "$DERIVED_DATA_ROOT" ]]; then
|
||||||
|
local candidate
|
||||||
|
candidate="$(find "$DERIVED_DATA_ROOT" -path "*/SourcePackages/artifacts/sparkle/Sparkle/bin/generate_appcast" -type f 2>/dev/null | head -n 1 || true)"
|
||||||
|
if [[ -n "$candidate" ]]; then
|
||||||
|
echo "$candidate"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
generate_appcast() {
|
||||||
|
local generator
|
||||||
|
generator="$(find_generate_appcast)"
|
||||||
|
local download_prefix="${SPARKLE_DOWNLOAD_BASE_URL:-}"
|
||||||
|
local subdir_template="${SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE:-}"
|
||||||
|
|
||||||
|
if [[ -z "$generator" || -z "${SPARKLE_EDDSA_KEY_FILE:-}" || -z "$download_prefix" ]]; then
|
||||||
|
echo "ℹ️ Skipping Sparkle appcast generation (generator/key/download prefix not configured)."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
download_prefix="${download_prefix%/}"
|
||||||
|
local output="$SPARKLE_APPCAST_OUTPUT"
|
||||||
|
mkdir -p "$(dirname "$output")"
|
||||||
|
|
||||||
|
local staging_dir
|
||||||
|
staging_dir="$(mktemp -d)"
|
||||||
|
local zip_found=false
|
||||||
|
shopt -s nullglob
|
||||||
|
for zip_path in "$ARTIFACTS_DIR"/*.zip; do
|
||||||
|
zip_found=true
|
||||||
|
local filename version_guess target_dir subdir
|
||||||
|
filename="$(basename "$zip_path")"
|
||||||
|
if [[ "$filename" =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]; then
|
||||||
|
version_guess="${BASH_REMATCH[1]}"
|
||||||
|
else
|
||||||
|
version_guess="$VERSION"
|
||||||
|
fi
|
||||||
|
|
||||||
|
target_dir="$staging_dir"
|
||||||
|
if [[ -n "$subdir_template" ]]; then
|
||||||
|
subdir="$subdir_template"
|
||||||
|
subdir="${subdir//\{\{VERSION\}\}/$version_guess}"
|
||||||
|
subdir="${subdir//\{\{SHORT_VERSION\}\}/$version_guess}"
|
||||||
|
subdir="${subdir//\{\{TAG\}\}/v$version_guess}"
|
||||||
|
subdir="${subdir#/}"
|
||||||
|
subdir="${subdir%/}"
|
||||||
|
if [[ -n "$subdir" ]]; then
|
||||||
|
target_dir="$staging_dir/$subdir"
|
||||||
|
mkdir -p "$target_dir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp "$zip_path" "$target_dir/"
|
||||||
|
done
|
||||||
|
shopt -u nullglob
|
||||||
|
|
||||||
|
if [[ "$zip_found" != true ]]; then
|
||||||
|
echo "ℹ️ Skipping Sparkle appcast generation (no ZIP archives found)."
|
||||||
|
rm -rf "$staging_dir"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "🧾 Generating Sparkle appcast at $output"
|
||||||
|
if ! "$generator" \
|
||||||
|
--download-url-prefix "$download_prefix" \
|
||||||
|
--ed-key-file "$SPARKLE_EDDSA_KEY_FILE" \
|
||||||
|
-o "$output" \
|
||||||
|
"$staging_dir"; then
|
||||||
|
echo "⚠️ Sparkle appcast generation failed."
|
||||||
|
fi
|
||||||
|
rm -rf "$staging_dir"
|
||||||
|
}
|
||||||
|
|
||||||
|
sign_update_artifacts() {
|
||||||
|
local signer
|
||||||
|
signer="$(find "$DERIVED_DATA_ROOT" -path "*/SourcePackages/artifacts/sparkle/Sparkle/bin/sign_update" -type f 2>/dev/null | head -n 1 || true)"
|
||||||
|
if [[ -z "$signer" || -z "${SPARKLE_EDDSA_KEY_FILE:-}" ]]; then
|
||||||
|
echo "ℹ️ Skipping Sparkle signing (sign_update or SPARKLE_EDDSA_KEY_FILE missing)."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
echo "🔑 Signing ${ZIP_NAME} for Sparkle feed"
|
||||||
|
if ! "$signer" "${ARTIFACTS_DIR}/${ZIP_NAME}" --ed-key-file "${SPARKLE_EDDSA_KEY_FILE}"; then
|
||||||
|
echo "⚠️ sign_update failed (continuing without signature)"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ -f "$CREDENTIALS_FILE" ]]; then
|
||||||
|
set -a
|
||||||
|
# shellcheck disable=SC1090
|
||||||
|
source "$CREDENTIALS_FILE"
|
||||||
|
set +a
|
||||||
|
fi
|
||||||
|
|
||||||
|
: "${SPARKLE_APPCAST_OUTPUT:=$ROOT_DIR/Sparkle/appcast.xml}"
|
||||||
|
export SPARKLE_APPCAST_OUTPUT
|
||||||
|
|
||||||
|
"$ROOT_DIR/scripts/sync_version.sh"
|
||||||
|
|
||||||
|
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||||
|
mkdir -p "$ARTIFACTS_DIR"
|
||||||
|
|
||||||
|
xcodebuild \
|
||||||
|
-project "$ROOT_DIR/$PROJECT" \
|
||||||
|
-scheme "$SCHEME" \
|
||||||
|
-configuration Release \
|
||||||
|
-derivedDataPath "$BUILD_DIR" \
|
||||||
|
CODE_SIGNING_ALLOWED=NO \
|
||||||
|
clean build
|
||||||
|
|
||||||
|
APP_PATH="$BUILD_DIR/Build/Products/Release/iKeyMon.app"
|
||||||
|
if [[ ! -d "$APP_PATH" ]]; then
|
||||||
|
echo "❌ Failed to find built app at $APP_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "${CODESIGN_IDENTITY:-}" ]]; then
|
||||||
|
echo "🔏 Codesigning app with identity: $CODESIGN_IDENTITY"
|
||||||
|
codesign \
|
||||||
|
--deep \
|
||||||
|
--force \
|
||||||
|
--options runtime \
|
||||||
|
--timestamp \
|
||||||
|
--entitlements "$ROOT_DIR/iKeyMon.entitlements" \
|
||||||
|
--sign "$CODESIGN_IDENTITY" \
|
||||||
|
"$APP_PATH"
|
||||||
|
else
|
||||||
|
echo "⚠️ Skipping codesign (CODESIGN_IDENTITY not set)."
|
||||||
|
fi
|
||||||
|
|
||||||
|
STAGING_DIR=$(mktemp -d)
|
||||||
|
mkdir -p "$STAGING_DIR"
|
||||||
|
cp -R "$APP_PATH" "$STAGING_DIR/"
|
||||||
|
ln -s /Applications "$STAGING_DIR/Applications"
|
||||||
|
mkdir -p "$STAGING_DIR/.background"
|
||||||
|
cp "$ROOT_DIR/Assets/dmg_background.png" "$STAGING_DIR/.background/background.png"
|
||||||
|
|
||||||
|
VERSION="$(python3 - <<'PY' "$VERSION_FILE"
|
||||||
|
import json, sys
|
||||||
|
with open(sys.argv[1], "r", encoding="utf-8") as handle:
|
||||||
|
data = json.load(handle)
|
||||||
|
print(data.get("marketing_version", "dev"))
|
||||||
|
PY
|
||||||
|
)"
|
||||||
|
ZIP_NAME="iKeyMon-${VERSION}.zip"
|
||||||
|
pushd "$(dirname "$APP_PATH")" >/dev/null
|
||||||
|
zip -r "$ARTIFACTS_DIR/$ZIP_NAME" "$(basename "$APP_PATH")"
|
||||||
|
popd >/dev/null
|
||||||
|
|
||||||
|
DMG_NAME="iKeyMon-${VERSION}.dmg"
|
||||||
|
hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
|
||||||
|
sign_update_artifacts
|
||||||
|
|
||||||
|
if [[ -n "${NOTARY_APPLE_ID:-}" && -n "${NOTARY_TEAM_ID:-}" && -n "${NOTARY_PASSWORD:-}" ]]; then
|
||||||
|
echo "📝 Submitting DMG for notarization..."
|
||||||
|
xcrun notarytool submit "$ARTIFACTS_DIR/$DMG_NAME" \
|
||||||
|
--apple-id "$NOTARY_APPLE_ID" \
|
||||||
|
--team-id "$NOTARY_TEAM_ID" \
|
||||||
|
--password "$NOTARY_PASSWORD" \
|
||||||
|
--wait
|
||||||
|
xcrun stapler staple "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
else
|
||||||
|
echo "⚠️ Skipping notarization (NOTARY_* variables not set)."
|
||||||
|
fi
|
||||||
|
rm -rf "$STAGING_DIR"
|
||||||
|
|
||||||
|
generate_appcast
|
||||||
|
|
||||||
|
if [[ -n "${GITEA_TOKEN:-}" && -n "${GITEA_OWNER:-}" && -n "${GITEA_REPO:-}" ]]; then
|
||||||
|
"$ROOT_DIR/scripts/publish_release.sh" "$VERSION" "$ARTIFACTS_DIR/$ZIP_NAME" "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
else
|
||||||
|
echo "ℹ️ Skipping Gitea release publishing (GITEA_* variables not fully set)."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "✅ Build complete. Artifacts:"
|
||||||
|
echo " - $ARTIFACTS_DIR/$ZIP_NAME"
|
||||||
|
echo " - $ARTIFACTS_DIR/$DMG_NAME"
|
||||||
24
scripts/bump_version.sh
Executable file
@@ -0,0 +1,24 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
VERSION_FILE="$ROOT_DIR/version.json"
|
||||||
|
|
||||||
|
new_version="$(python3 - "$VERSION_FILE" <<'PY'
|
||||||
|
import json, sys, pathlib
|
||||||
|
path = pathlib.Path(sys.argv[1])
|
||||||
|
data = json.loads(path.read_text())
|
||||||
|
current = data.get("marketing_version")
|
||||||
|
if not current:
|
||||||
|
raise SystemExit("marketing_version missing in version.json")
|
||||||
|
parts = current.split(".")
|
||||||
|
if len(parts) != 3 or not all(part.isdigit() for part in parts):
|
||||||
|
raise SystemExit(f"Invalid marketing_version format: {current}")
|
||||||
|
parts[-1] = str(int(parts[-1]) + 1)
|
||||||
|
data["marketing_version"] = ".".join(parts)
|
||||||
|
path.write_text(json.dumps(data, indent=2) + "\n")
|
||||||
|
print(data["marketing_version"])
|
||||||
|
PY
|
||||||
|
)"
|
||||||
|
|
||||||
|
echo "$new_version"
|
||||||
98
scripts/publish_release.sh
Executable file
@@ -0,0 +1,98 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
VERSION="$1"
|
||||||
|
ZIP_PATH="$2"
|
||||||
|
DMG_PATH="$3"
|
||||||
|
|
||||||
|
: "${GITEA_TOKEN:?Set GITEA_TOKEN in .signing.env}"
|
||||||
|
: "${GITEA_OWNER:?Set GITEA_OWNER in .signing.env}"
|
||||||
|
: "${GITEA_REPO:?Set GITEA_REPO in .signing.env}"
|
||||||
|
|
||||||
|
TARGET_COMMIT="${GITEA_TARGET_COMMIT:-$(git -C "$ROOT_DIR" rev-parse HEAD)}"
|
||||||
|
API_BASE="${GITEA_API_BASE:-https://git.24unix.net/api/v1}"
|
||||||
|
API_BASE="${API_BASE%/}"
|
||||||
|
RELEASE_TAG="v${VERSION}"
|
||||||
|
API_URL="${API_BASE}/repos/${GITEA_OWNER}/${GITEA_REPO}"
|
||||||
|
|
||||||
|
if ! command -v jq >/dev/null 2>&1; then
|
||||||
|
echo "❌ jq is required to parse Gitea responses." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
PRERELEASE_FLAG="${GITEA_PRERELEASE:-true}"
|
||||||
|
|
||||||
|
create_payload="$(jq -n \
|
||||||
|
--arg tag "$RELEASE_TAG" \
|
||||||
|
--arg name "iKeyMon ${VERSION}" \
|
||||||
|
--arg target "$TARGET_COMMIT" \
|
||||||
|
--argjson prerelease "$PRERELEASE_FLAG" \
|
||||||
|
'{ tag_name: $tag, name: $name, target_commitish: $target, draft: false, prerelease: $prerelease }')"
|
||||||
|
|
||||||
|
response_file="$(mktemp)"
|
||||||
|
http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-X POST \
|
||||||
|
-d "$create_payload" \
|
||||||
|
"${API_URL}/releases")
|
||||||
|
|
||||||
|
if [[ "$http_code" == "201" ]]; then
|
||||||
|
echo "✅ Created release ${RELEASE_TAG}"
|
||||||
|
elif [[ "$http_code" == "409" ]]; then
|
||||||
|
echo "ℹ️ Release ${RELEASE_TAG} already exists, fetching existing ID."
|
||||||
|
else
|
||||||
|
echo "❌ Failed to create release (HTTP ${http_code}):"
|
||||||
|
cat "$response_file"
|
||||||
|
rm -f "$response_file"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$http_code" == "409" ]]; then
|
||||||
|
curl -sS \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
"${API_URL}/releases/tags/${RELEASE_TAG}" >"$response_file"
|
||||||
|
fi
|
||||||
|
|
||||||
|
release_id=$(jq -r '.id' "$response_file")
|
||||||
|
rm -f "$response_file"
|
||||||
|
|
||||||
|
if [[ -z "$release_id" || "$release_id" == "null" ]]; then
|
||||||
|
echo "❌ Could not determine release ID for ${RELEASE_TAG}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
delete_existing_asset() {
|
||||||
|
local filename="$1"
|
||||||
|
local asset_id
|
||||||
|
asset_id="$(curl -sS \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
"${API_URL}/releases/${release_id}/assets" | jq -r --arg name "$filename" '.[] | select(.name == $name) | .id' | head -n 1)"
|
||||||
|
if [[ -n "$asset_id" && "$asset_id" != "null" ]]; then
|
||||||
|
echo "🗑️ Removing existing asset ${filename}"
|
||||||
|
curl -sS \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-X DELETE \
|
||||||
|
"${API_URL}/releases/${release_id}/assets/${asset_id}" >/dev/null
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
upload_asset() {
|
||||||
|
local file="$1"
|
||||||
|
local filename
|
||||||
|
filename="$(basename "$file")"
|
||||||
|
|
||||||
|
delete_existing_asset "$filename"
|
||||||
|
|
||||||
|
echo "⬆️ Uploading ${filename}"
|
||||||
|
curl -sS \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-F "attachment=@${file}" \
|
||||||
|
"${API_URL}/releases/${release_id}/assets" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
upload_asset "$ZIP_PATH"
|
||||||
|
upload_asset "$DMG_PATH"
|
||||||
|
|
||||||
|
echo "🎉 Release ${RELEASE_TAG} assets uploaded."
|
||||||
56
scripts/sync_version.sh
Executable file
@@ -0,0 +1,56 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
VERSION_FILE="$ROOT_DIR/version.json"
|
||||||
|
PROJECT_FILE="$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj"
|
||||||
|
|
||||||
|
if [[ ! -f "$VERSION_FILE" ]]; then
|
||||||
|
echo "❌ version.json not found at $VERSION_FILE" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v jq >/dev/null 2>&1; then
|
||||||
|
echo "❌ jq is required but not found in PATH" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
MARKETING_VERSION="$(jq -r '.marketing_version // empty' "$VERSION_FILE")"
|
||||||
|
if [[ -z "$MARKETING_VERSION" ]]; then
|
||||||
|
echo "❌ marketing_version missing in $VERSION_FILE" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! "$MARKETING_VERSION" =~ ^[0-9]{2}\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
echo "❌ marketing_version '$MARKETING_VERSION' must follow YY.major.minor (e.g. 26.1.2)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
BUILD_NUMBER="${BUILD_NUMBER:-$(git -C "$ROOT_DIR" rev-list --count HEAD)}"
|
||||||
|
if [[ -z "$BUILD_NUMBER" ]]; then
|
||||||
|
echo "❌ Unable to derive BUILD_NUMBER" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
update_setting() {
|
||||||
|
local key="$1"
|
||||||
|
local value="$2"
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp)"
|
||||||
|
LC_ALL=C sed -E "s/(${key}[[:space:]]*=[[:space:]]*)[^;]+;/\\1${value};/g" "$PROJECT_FILE" >"$tmp"
|
||||||
|
if cmp -s "$tmp" "$PROJECT_FILE"; then
|
||||||
|
if ! grep -q "${key} = ${value};" "$PROJECT_FILE"; then
|
||||||
|
rm -f "$tmp"
|
||||||
|
echo "❌ Failed to update ${key} in $PROJECT_FILE" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -f "$tmp"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
mv "$tmp" "$PROJECT_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
update_setting "MARKETING_VERSION" "$MARKETING_VERSION"
|
||||||
|
update_setting "CURRENT_PROJECT_VERSION" "$BUILD_NUMBER"
|
||||||
|
|
||||||
|
echo "✅ Synced marketing version $MARKETING_VERSION and build $BUILD_NUMBER into Xcode project."
|
||||||
17
signing.env.example
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
CODESIGN_IDENTITY="Developer ID Application: Your Name (TEAMID1234)"
|
||||||
|
NOTARY_APPLE_ID="appleid@example.com"
|
||||||
|
NOTARY_TEAM_ID="TEAMID1234"
|
||||||
|
NOTARY_PASSWORD="app-specific-password"
|
||||||
|
GITEA_TOKEN="personal-access-token"
|
||||||
|
GITEA_OWNER="tracer"
|
||||||
|
GITEA_REPO="iKeyMon"
|
||||||
|
# GITEA_API_BASE="https://git.24unix.net/api/v1"
|
||||||
|
# GITEA_TARGET_COMMIT="master"
|
||||||
|
# GITEA_PRERELEASE="false"
|
||||||
|
|
||||||
|
# Sparkle appcast generation (optional)
|
||||||
|
# SPARKLE_EDDSA_KEY_FILE="$HOME/.config/Sparkle/iKeyMon.key"
|
||||||
|
# SPARKLE_DOWNLOAD_BASE_URL="https://git.24unix.net/tracer/iKeyMon/releases/download"
|
||||||
|
# SPARKLE_DOWNLOAD_SUBDIR_TEMPLATE="v{{VERSION}}"
|
||||||
|
# SPARKLE_APPCAST_OUTPUT="$ROOT_DIR/Sparkle/appcast.xml" # defaults to this path
|
||||||
|
# SPARKLE_GENERATE_APPCAST="/path/to/generate_appcast" # auto-detected if unset
|
||||||
3
version.json
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"marketing_version": "26.0.17"
|
||||||
|
}
|
||||||