Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d978c51fbd | |||
| b8f80932ed | |||
| 11815fb807 | |||
| afbb425e3b | |||
| 92040e5c5e | |||
| 50410488a1 | |||
| 8d6334d3b4 | |||
| dc8de5a4ea | |||
| 3510474764 | |||
| 9f42c68279 | |||
| 031781761c | |||
| 9413c23cc5 | |||
|
|
c8d3289a9b | ||
|
|
c063add947 | ||
|
|
610c569b83 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@ build/
|
|||||||
Build/
|
Build/
|
||||||
dist/
|
dist/
|
||||||
.signing.env
|
.signing.env
|
||||||
|
homebrew-tap/
|
||||||
|
|||||||
23
CHANGELOG.md
23
CHANGELOG.md
@@ -1,5 +1,28 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 26.1.8
|
||||||
|
- Fixed a crash in `PingService` caused by concurrent mutation of shared ping state from multiple async ping tasks.
|
||||||
|
- Moved ping state tracking and reboot suppression windows into an actor so ping success/failure handling is serialized safely.
|
||||||
|
|
||||||
|
## 26.1.7
|
||||||
|
- Added remote reboot support for hosts running KeyHelp API 2.14 or newer.
|
||||||
|
- Added a dedicated `APIv2_14` client and mapped 2.14+ hosts to it instead of treating them as API 2.13.
|
||||||
|
- Fixed the reboot request to call `/api/v2/server/reboot` with the required JSON confirmation payload.
|
||||||
|
- Changed the reboot confirmation and result UI to non-blocking sheets/banner feedback so failures no longer trap the app in modal dialogs.
|
||||||
|
- Improved API error messages by surfacing the server response body instead of only generic HTTP status codes.
|
||||||
|
- Reduced expected reboot noise by suppressing ping checks for a short grace period after a reboot request.
|
||||||
|
|
||||||
|
## 26.1.6
|
||||||
|
- Publish Gitea releases as stable by default instead of pre-releases.
|
||||||
|
- Update the Homebrew tap automatically after each successful release by rewriting the cask version and DMG checksum, then pushing the tap repo.
|
||||||
|
- Simplified the README for end users by adding clear install options and trimming internal release-engineering details.
|
||||||
|
- Ignore the local `homebrew-tap/` checkout in the main app repository.
|
||||||
|
|
||||||
|
## 26.1.3
|
||||||
|
- Fixed version handling for changelogs.
|
||||||
|
|
||||||
|
## 26.1.2 (2025-01-03)
|
||||||
|
- Synced version.json to 26.1.2.
|
||||||
|
|
||||||
## 26.1.1 (2025-01-03)
|
## 26.1.1 (2025-01-03)
|
||||||
- Fixed changelog extraction in publish script.
|
- Fixed changelog extraction in publish script.
|
||||||
|
|||||||
102
README.md
102
README.md
@@ -11,7 +11,9 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
|
|||||||
- Automatic refreshes:
|
- Automatic refreshes:
|
||||||
- Ping every 10 seconds
|
- Ping every 10 seconds
|
||||||
- Server info every 60 seconds
|
- Server info every 60 seconds
|
||||||
|
- Preferences dialog
|
||||||
- Built-in Sparkle updater (automatic checks, downloads, and relaunch once a signed release is available)
|
- Built-in Sparkle updater (automatic checks, downloads, and relaunch once a signed release is available)
|
||||||
|
- macOS notifications if servers or services become unavailable
|
||||||
- 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
|
||||||
@@ -24,11 +26,30 @@ iKeyMon is a native macOS app written in SwiftUI that provides live monitoring f
|
|||||||
|
|
||||||
## 🛠️ Planned Features
|
## 🛠️ Planned Features
|
||||||
|
|
||||||
- Preferences dialog
|
- iOS support is a possibility, but it is unclear if or when that will happen
|
||||||
- macOS notifications if servers or services become unavailable
|
|
||||||
- Optional iOS support if there is demand
|
|
||||||
|
|
||||||
## 🚀 How to Run
|
## 📦 Install
|
||||||
|
|
||||||
|
### Option 1: Download the app
|
||||||
|
|
||||||
|
Download the latest release from:
|
||||||
|
|
||||||
|
https://git.24unix.net/tracer/iKeyMon/releases
|
||||||
|
|
||||||
|
Then open the DMG and move `iKeyMon.app` to your `Applications` folder.
|
||||||
|
|
||||||
|
### Option 2: Install with Homebrew
|
||||||
|
|
||||||
|
```bash
|
||||||
|
brew tap tracer/tap https://git.24unix.net/tracer/homebrew-tap.git
|
||||||
|
brew install --cask ikeymon
|
||||||
|
```
|
||||||
|
|
||||||
|
### Option 3: Build it yourself
|
||||||
|
|
||||||
|
Clone the repository, open it in Xcode, and run the app locally on macOS 14+.
|
||||||
|
|
||||||
|
## 🚀 How to Build
|
||||||
|
|
||||||
Clone the repo and open it in [Xcode](https://developer.apple.com/xcode/). You can build and run the app on macOS 14+.
|
Clone the repo and open it in [Xcode](https://developer.apple.com/xcode/). You can build and run the app on macOS 14+.
|
||||||
|
|
||||||
@@ -38,79 +59,6 @@ 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_TEMPLATE="https://git.24unix.net/tracer/iKeyMon/releases/download/v{{VERSION}}"
|
|
||||||
# If you prefer SPARKLE_DOWNLOAD_BASE_URL, it will automatically append `/v<version>` for you.
|
|
||||||
# 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. Point `SPARKLE_DOWNLOAD_BASE_TEMPLATE` at your release-download prefix (e.g. `https://git.24unix.net/tracer/iKeyMon/releases/download/v{{VERSION}}`) so the generated URLs already match Gitea’s asset paths. 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` and `SPARKLE_DOWNLOAD_BASE_TEMPLATE` (or `SPARKLE_DOWNLOAD_BASE_URL`) 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.
|
|
||||||
|
|
||||||
#### Debugging Sparkle updates
|
|
||||||
|
|
||||||
Launch the shipped app via CLI with `SPARKLE_VERBOSE_LOGGING=1` to mirror Sparkle’s activity in stdout/stderr:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
SPARKLE_VERBOSE_LOGGING=1 /Applications/iKeyMon.app/Contents/MacOS/iKeyMon
|
|
||||||
```
|
|
||||||
|
|
||||||
Sparkle’s installer helper runs in a separate `SUPipedBinary` process. If the installer fails, collect additional details with `log show --process SUPipedBinary --last 5m`.
|
|
||||||
|
|
||||||
### 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.
|
||||||
|
|||||||
@@ -10,6 +10,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"
|
case v2_13 = "2.13"
|
||||||
|
case v2_14 = "2.14"
|
||||||
|
|
||||||
static func from(versionString: String) -> APIVersion? {
|
static func from(versionString: String) -> APIVersion? {
|
||||||
if let version = APIVersion(rawValue: versionString) {
|
if let version = APIVersion(rawValue: versionString) {
|
||||||
@@ -24,7 +25,8 @@ enum APIVersion: String, CaseIterable {
|
|||||||
|
|
||||||
switch (major, minor) {
|
switch (major, minor) {
|
||||||
case (2, 12): return .v2_12
|
case (2, 12): return .v2_12
|
||||||
case (2, 13...): return .v2_13
|
case (2, 13): return .v2_13
|
||||||
|
case (2, 14...): return .v2_14
|
||||||
default: return nil
|
default: return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -36,6 +38,7 @@ protocol AnyServerAPI {
|
|||||||
func fetchMemoryData() async throws -> Any
|
func fetchMemoryData() async throws -> Any
|
||||||
func fetchUtilizationData() async throws -> Any
|
func fetchUtilizationData() async throws -> Any
|
||||||
func fetchServerSummary(apiKey: String) async throws -> ServerInfo
|
func fetchServerSummary(apiKey: String) async throws -> ServerInfo
|
||||||
|
func restartServer(apiKey: String) async throws
|
||||||
}
|
}
|
||||||
|
|
||||||
private struct AnyServerAPIWrapper<T: ServerAPIProtocol>: AnyServerAPI {
|
private struct AnyServerAPIWrapper<T: ServerAPIProtocol>: AnyServerAPI {
|
||||||
@@ -64,6 +67,10 @@ private struct AnyServerAPIWrapper<T: ServerAPIProtocol>: AnyServerAPI {
|
|||||||
func fetchServerSummary(apiKey: String) async throws -> ServerInfo {
|
func fetchServerSummary(apiKey: String) async throws -> ServerInfo {
|
||||||
return try await wrapped.fetchServerSummary(apiKey: apiKey)
|
return try await wrapped.fetchServerSummary(apiKey: apiKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func restartServer(apiKey: String) async throws {
|
||||||
|
try await wrapped.restartServer(apiKey: apiKey)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class APIFactory {
|
class APIFactory {
|
||||||
@@ -73,6 +80,8 @@ class APIFactory {
|
|||||||
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
||||||
case .v2_13:
|
case .v2_13:
|
||||||
return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
|
return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
|
||||||
|
case .v2_14:
|
||||||
|
return AnyServerAPIWrapper(APIv2_14(baseURL: baseURL))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,7 +113,7 @@ class APIFactory {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return AnyServerAPIWrapper(APIv2_13(baseURL: baseURL))
|
return AnyServerAPIWrapper(APIv2_14(baseURL: baseURL))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ protocol ServerAPIProtocol {
|
|||||||
func fetchMemory() async throws -> MemoryType
|
func fetchMemory() async throws -> MemoryType
|
||||||
func fetchUtilization() async throws -> UtilizationType
|
func fetchUtilization() async throws -> UtilizationType
|
||||||
func fetchServerSummary(apiKey: String) async throws -> ServerInfo
|
func fetchServerSummary(apiKey: String) async throws -> ServerInfo
|
||||||
|
func restartServer(apiKey: String) async throws
|
||||||
}
|
}
|
||||||
|
|
||||||
struct SystemInfo: Codable {
|
struct SystemInfo: Codable {
|
||||||
@@ -36,6 +37,15 @@ class BaseAPIClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func performRequest<T: Codable>(_ request: URLRequest, responseType: T.Type) async throws -> T {
|
func performRequest<T: Codable>(_ request: URLRequest, responseType: T.Type) async throws -> T {
|
||||||
|
let (data, _) = try await performDataRequest(request)
|
||||||
|
return try JSONDecoder().decode(T.self, from: data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func performRequestWithoutBody(_ request: URLRequest) async throws {
|
||||||
|
_ = try await performDataRequest(request)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func performDataRequest(_ request: URLRequest) async throws -> (Data, HTTPURLResponse) {
|
||||||
let (data, response) = try await session.data(for: request)
|
let (data, response) = try await session.data(for: request)
|
||||||
|
|
||||||
guard let httpResponse = response as? HTTPURLResponse else {
|
guard let httpResponse = response as? HTTPURLResponse else {
|
||||||
@@ -43,25 +53,61 @@ class BaseAPIClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
guard 200...299 ~= httpResponse.statusCode else {
|
guard 200...299 ~= httpResponse.statusCode else {
|
||||||
throw APIError.httpError(httpResponse.statusCode)
|
throw APIError.httpError(
|
||||||
|
httpResponse.statusCode,
|
||||||
|
BaseAPIClient.extractErrorMessage(from: data)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return try JSONDecoder().decode(T.self, from: data)
|
return (data, httpResponse)
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func extractErrorMessage(from data: Data) -> String? {
|
||||||
|
guard !data.isEmpty else { return nil }
|
||||||
|
|
||||||
|
if let envelope = try? JSONDecoder().decode(APIErrorEnvelope.self, from: data) {
|
||||||
|
let parts = [envelope.code, envelope.message]
|
||||||
|
.compactMap { $0?.trimmingCharacters(in: .whitespacesAndNewlines) }
|
||||||
|
.filter { !$0.isEmpty }
|
||||||
|
|
||||||
|
if !parts.isEmpty {
|
||||||
|
return parts.joined(separator: " ")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let text = String(data: data, encoding: .utf8)?
|
||||||
|
.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||||
|
!text.isEmpty {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum APIError: Error, LocalizedError {
|
enum APIError: Error, LocalizedError {
|
||||||
case invalidURL
|
case invalidURL
|
||||||
case invalidResponse
|
case invalidResponse
|
||||||
case httpError(Int)
|
case httpError(Int, String?)
|
||||||
case decodingError(Error)
|
case decodingError(Error)
|
||||||
|
case unsupportedFeature(String)
|
||||||
|
|
||||||
var errorDescription: String? {
|
var errorDescription: String? {
|
||||||
switch self {
|
switch self {
|
||||||
case .invalidURL: return "Invalid URL"
|
case .invalidURL: return "Invalid URL"
|
||||||
case .invalidResponse: return "Invalid response"
|
case .invalidResponse: return "Invalid response"
|
||||||
case .httpError(let code): return "HTTP Error: \(code)"
|
case .httpError(let code, let message):
|
||||||
|
if let message, !message.isEmpty {
|
||||||
|
return "HTTP Error: \(code)\n\(message)"
|
||||||
|
}
|
||||||
|
return "HTTP Error: \(code)"
|
||||||
case .decodingError(let error): return "Decoding error: \(error.localizedDescription)"
|
case .decodingError(let error): return "Decoding error: \(error.localizedDescription)"
|
||||||
|
case .unsupportedFeature(let feature): return "\(feature) is not supported by this host"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private struct APIErrorEnvelope: Decodable {
|
||||||
|
let code: String?
|
||||||
|
let message: String?
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,9 +2,17 @@ import Foundation
|
|||||||
import UserNotifications
|
import UserNotifications
|
||||||
|
|
||||||
enum PingService {
|
enum PingService {
|
||||||
private static var previousPingStates: [String: Bool] = [:]
|
private static let stateStore = PingStateStore()
|
||||||
|
|
||||||
|
static func suppressChecks(for hostname: String, duration: TimeInterval) async {
|
||||||
|
await stateStore.suppressChecks(for: hostname, duration: duration)
|
||||||
|
}
|
||||||
|
|
||||||
static func ping(hostname: String, apiKey: String, notificationsEnabled: Bool = true) async -> Bool {
|
static func ping(hostname: String, apiKey: String, notificationsEnabled: Bool = true) async -> Bool {
|
||||||
|
if await stateStore.shouldSkipPing(for: hostname) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
|
guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
|
||||||
print("❌ [PingService] Invalid URL for \(hostname)")
|
print("❌ [PingService] Invalid URL for \(hostname)")
|
||||||
return false
|
return false
|
||||||
@@ -18,42 +26,32 @@ enum PingService {
|
|||||||
do {
|
do {
|
||||||
let (data, response) = try await URLSession.shared.data(for: request)
|
let (data, response) = try await URLSession.shared.data(for: request)
|
||||||
if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode != 200 {
|
if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode != 200 {
|
||||||
if let responseString = String(data: data, encoding: .utf8) {
|
await handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||||
print("❌ [PingService] HTTP \(httpResponse.statusCode): \(responseString)")
|
|
||||||
}
|
|
||||||
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
|
if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
|
||||||
handlePingSuccess(for: hostname, notificationsEnabled: notificationsEnabled)
|
await handlePingSuccess(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
await handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
print("❌ [PingService] Error pinging \(hostname): \(error)")
|
await handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||||
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func handlePingSuccess(for hostname: String, notificationsEnabled: Bool) {
|
private static func handlePingSuccess(for hostname: String, notificationsEnabled: Bool) async {
|
||||||
let wasPreviouslyDown = previousPingStates[hostname] == false
|
if let notification = await stateStore.recordSuccess(for: hostname, notificationsEnabled: notificationsEnabled) {
|
||||||
previousPingStates[hostname] = true
|
sendNotification(title: notification.title, body: notification.body)
|
||||||
|
|
||||||
if wasPreviouslyDown && notificationsEnabled {
|
|
||||||
sendNotification(title: "Server Online", body: "\(hostname) is now online")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func handlePingFailure(for hostname: String, notificationsEnabled: Bool) {
|
private static func handlePingFailure(for hostname: String, notificationsEnabled: Bool) async {
|
||||||
let wasPreviouslyUp = previousPingStates[hostname] != false
|
if let notification = await stateStore.recordFailure(for: hostname, notificationsEnabled: notificationsEnabled) {
|
||||||
previousPingStates[hostname] = false
|
sendNotification(title: notification.title, body: notification.body)
|
||||||
|
|
||||||
if wasPreviouslyUp && notificationsEnabled {
|
|
||||||
sendNotification(title: "Server Offline", body: "\(hostname) is offline")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,3 +65,55 @@ enum PingService {
|
|||||||
UNUserNotificationCenter.current().add(request)
|
UNUserNotificationCenter.current().add(request)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private actor PingStateStore {
|
||||||
|
private var previousPingStates: [String: Bool] = [:]
|
||||||
|
private var suppressedUntil: [String: Date] = [:]
|
||||||
|
|
||||||
|
func suppressChecks(for hostname: String, duration: TimeInterval) {
|
||||||
|
suppressedUntil[hostname] = Date().addingTimeInterval(duration)
|
||||||
|
previousPingStates[hostname] = false
|
||||||
|
}
|
||||||
|
|
||||||
|
func shouldSkipPing(for hostname: String) -> Bool {
|
||||||
|
if let suppressedUntil = suppressedUntil[hostname], suppressedUntil > Date() {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
suppressedUntil.removeValue(forKey: hostname)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func recordSuccess(for hostname: String, notificationsEnabled: Bool) -> PingNotification? {
|
||||||
|
let wasPreviouslyDown = previousPingStates[hostname] == false
|
||||||
|
previousPingStates[hostname] = true
|
||||||
|
|
||||||
|
guard wasPreviouslyDown, notificationsEnabled else {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return PingNotification(
|
||||||
|
title: "Server Online",
|
||||||
|
body: "\(hostname) is now online"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func recordFailure(for hostname: String, notificationsEnabled: Bool) -> PingNotification? {
|
||||||
|
let wasPreviouslyUp = previousPingStates[hostname] != false
|
||||||
|
previousPingStates[hostname] = false
|
||||||
|
|
||||||
|
guard wasPreviouslyUp, notificationsEnabled else {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return PingNotification(
|
||||||
|
title: "Server Offline",
|
||||||
|
body: "\(hostname) is offline"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct PingNotification {
|
||||||
|
let title: String
|
||||||
|
let body: String
|
||||||
|
}
|
||||||
|
|||||||
@@ -185,6 +185,10 @@ struct ServerInfo: Codable, Hashable, Equatable {
|
|||||||
].filter { !$0.isEmpty }
|
].filter { !$0.isEmpty }
|
||||||
return components.isEmpty ? nil : components.joined(separator: " • ")
|
return components.isEmpty ? nil : components.joined(separator: " • ")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var supportsRestartCommand: Bool {
|
||||||
|
ServerInfo.version(apiVersion, isAtLeast: "2.14")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Helpers & Sample Data
|
// MARK: - Helpers & Sample Data
|
||||||
@@ -226,6 +230,27 @@ extension ServerInfo {
|
|||||||
return normalized
|
return normalized
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static func version(_ value: String, isAtLeast minimum: String) -> Bool {
|
||||||
|
let lhs = value
|
||||||
|
.split(separator: ".")
|
||||||
|
.compactMap { Int($0) }
|
||||||
|
let rhs = minimum
|
||||||
|
.split(separator: ".")
|
||||||
|
.compactMap { Int($0) }
|
||||||
|
|
||||||
|
let count = max(lhs.count, rhs.count)
|
||||||
|
for index in 0..<count {
|
||||||
|
let left = index < lhs.count ? lhs[index] : 0
|
||||||
|
let right = index < rhs.count ? rhs[index] : 0
|
||||||
|
|
||||||
|
if left != right {
|
||||||
|
return left > right
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
static let placeholder = ServerInfo(
|
static let placeholder = ServerInfo(
|
||||||
hostname: "preview.example.com",
|
hostname: "preview.example.com",
|
||||||
ipAddresses: ["192.168.1.1", "fe80::1"],
|
ipAddresses: ["192.168.1.1", "fe80::1"],
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
guard httpResponse.statusCode == 200 else {
|
guard httpResponse.statusCode == 200 else {
|
||||||
throw APIError.httpError(httpResponse.statusCode)
|
throw APIError.httpError(httpResponse.statusCode, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
let decoder = JSONDecoder()
|
let decoder = JSONDecoder()
|
||||||
@@ -189,6 +189,10 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
|
|||||||
let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
|
let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
|
||||||
return envelope.toDomain()
|
return envelope.toDomain()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func restartServer(apiKey: String) async throws {
|
||||||
|
throw APIError.unsupportedFeature("Server reboot")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Server Summary Mapping
|
// MARK: - Server Summary Mapping
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ class APIv2_13: BaseAPIClient, ServerAPIProtocol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
guard httpResponse.statusCode == 200 else {
|
guard httpResponse.statusCode == 200 else {
|
||||||
throw APIError.httpError(httpResponse.statusCode)
|
throw APIError.httpError(httpResponse.statusCode, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
let decoder = JSONDecoder()
|
let decoder = JSONDecoder()
|
||||||
@@ -189,6 +189,10 @@ class APIv2_13: BaseAPIClient, ServerAPIProtocol {
|
|||||||
let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
|
let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
|
||||||
return envelope.toDomain()
|
return envelope.toDomain()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func restartServer(apiKey: String) async throws {
|
||||||
|
throw APIError.unsupportedFeature("Server reboot")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Server Summary Mapping
|
// MARK: - Server Summary Mapping
|
||||||
|
|||||||
30
Sources/Model/API/Versions/APIv2_14.swift
Normal file
30
Sources/Model/API/Versions/APIv2_14.swift
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
//
|
||||||
|
// APIv2_14.swift
|
||||||
|
// iKeyMon
|
||||||
|
//
|
||||||
|
// Created by tracer on 19.04.26.
|
||||||
|
//
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
|
||||||
|
class APIv2_14: APIv2_13 {
|
||||||
|
private enum Endpoint: String {
|
||||||
|
case serverReboot = "/api/v2/server/reboot"
|
||||||
|
|
||||||
|
func url(baseURL: URL) -> URL {
|
||||||
|
baseURL.appendingPathComponent(rawValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override func restartServer(apiKey: String) async throws {
|
||||||
|
var request = URLRequest(url: Endpoint.serverReboot.url(baseURL: baseURL))
|
||||||
|
request.httpMethod = "POST"
|
||||||
|
request.setValue(apiKey, forHTTPHeaderField: "X-API-KEY")
|
||||||
|
request.setValue("application/json", forHTTPHeaderField: "Accept")
|
||||||
|
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
|
||||||
|
request.timeoutInterval = 30
|
||||||
|
request.httpBody = #"{"confirm":true}"#.data(using: .utf8)
|
||||||
|
|
||||||
|
try await performRequestWithoutBody(request)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ struct MainView: View {
|
|||||||
@State private var refreshTimer: Timer.TimerPublisher?
|
@State private var refreshTimer: Timer.TimerPublisher?
|
||||||
@State private var refreshSubscription: AnyCancellable?
|
@State private var refreshSubscription: AnyCancellable?
|
||||||
@State private var pingTimer: Timer?
|
@State private var pingTimer: Timer?
|
||||||
|
@State private var restartingServerID: UUID?
|
||||||
@State private var lastRefreshInterval: Int?
|
@State private var lastRefreshInterval: Int?
|
||||||
@State private var previousServiceStates: [String: String] = [:]
|
@State private var previousServiceStates: [String: String] = [:]
|
||||||
private let serverOrderKey = MainView.serverOrderKeyStatic
|
private let serverOrderKey = MainView.serverOrderKeyStatic
|
||||||
@@ -79,7 +80,15 @@ struct MainView: View {
|
|||||||
} detail: {
|
} detail: {
|
||||||
if let selectedServerID,
|
if let selectedServerID,
|
||||||
let index = servers.firstIndex(where: { selectedServerID == $0.id }) {
|
let index = servers.firstIndex(where: { selectedServerID == $0.id }) {
|
||||||
ServerDetailView(server: $servers[index], isFetching: isFetchingInfo)
|
let serverID = servers[index].id
|
||||||
|
ServerDetailView(
|
||||||
|
server: $servers[index],
|
||||||
|
isFetching: isFetchingInfo,
|
||||||
|
canRestart: servers[index].info?.supportsRestartCommand == true,
|
||||||
|
isRestarting: restartingServerID == serverID
|
||||||
|
) {
|
||||||
|
await restartServer(for: serverID)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
ContentUnavailableView("No Server Selected", systemImage: "server.rack")
|
ContentUnavailableView("No Server Selected", systemImage: "server.rack")
|
||||||
}
|
}
|
||||||
@@ -235,9 +244,6 @@ struct MainView: View {
|
|||||||
await MainActor.run {
|
await MainActor.run {
|
||||||
servers[index].pingable = pingable
|
servers[index].pingable = pingable
|
||||||
}
|
}
|
||||||
if !pingable {
|
|
||||||
print("📶 [MainView] Ping \(server.hostname): offline")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -332,6 +338,87 @@ struct MainView: View {
|
|||||||
let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
|
let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
|
||||||
UNUserNotificationCenter.current().add(request)
|
UNUserNotificationCenter.current().add(request)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func restartServer(for id: UUID) async -> ServerActionFeedback {
|
||||||
|
guard let server = servers.first(where: { $0.id == id }) else {
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Failed",
|
||||||
|
message: "The selected server could not be found."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
guard server.info?.supportsRestartCommand == true else {
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Unavailable",
|
||||||
|
message: "\(server.hostname) does not support remote reboot via the API."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||||
|
!apiKey.isEmpty else {
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Failed",
|
||||||
|
message: "No API key is configured for \(server.hostname)."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
guard let baseURL = URL(string: "https://\(server.hostname)") else {
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Failed",
|
||||||
|
message: "The server URL for \(server.hostname) is invalid."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
restartingServerID = id
|
||||||
|
defer { restartingServerID = nil }
|
||||||
|
|
||||||
|
do {
|
||||||
|
let api: AnyServerAPI
|
||||||
|
if let versionString = server.info?.apiVersion,
|
||||||
|
let versionedAPI = APIFactory.createAPI(baseURL: baseURL, versionString: versionString) {
|
||||||
|
api = versionedAPI
|
||||||
|
} else {
|
||||||
|
api = try await APIFactory.detectAndCreateAPI(baseURL: baseURL, apiKey: apiKey)
|
||||||
|
}
|
||||||
|
try await api.restartServer(apiKey: apiKey)
|
||||||
|
await PingService.suppressChecks(for: server.hostname, duration: 90)
|
||||||
|
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Requested",
|
||||||
|
message: "The reboot command was sent to \(server.hostname). The host may become unavailable briefly while it restarts."
|
||||||
|
)
|
||||||
|
} catch let error as URLError where Self.isExpectedRestartDisconnect(error) {
|
||||||
|
await PingService.suppressChecks(for: server.hostname, duration: 90)
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Requested",
|
||||||
|
message: "The reboot command appears to have been accepted by \(server.hostname). The connection dropped while the host was going away, which is expected during a reboot."
|
||||||
|
)
|
||||||
|
} catch APIError.httpError(404, let message) {
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Unavailable",
|
||||||
|
message: message ?? "\(server.hostname) returned 404 for /api/v2/server/reboot."
|
||||||
|
)
|
||||||
|
} catch {
|
||||||
|
return ServerActionFeedback(
|
||||||
|
title: "Reboot Failed",
|
||||||
|
message: error.localizedDescription
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func isExpectedRestartDisconnect(_ error: URLError) -> Bool {
|
||||||
|
switch error.code {
|
||||||
|
case .timedOut,
|
||||||
|
.cannotConnectToHost,
|
||||||
|
.networkConnectionLost,
|
||||||
|
.notConnectedToInternet,
|
||||||
|
.cannotFindHost,
|
||||||
|
.dnsLookupFailed:
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ struct PreferencesView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||||
|
@Environment(\.colorScheme) private var colorScheme
|
||||||
|
|
||||||
@AppStorage("pingInterval") private var storedPingInterval: Int = 10
|
@AppStorage("pingInterval") private var storedPingInterval: Int = 10
|
||||||
@AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
|
@AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
|
||||||
@@ -143,12 +144,39 @@ struct PreferencesView: View {
|
|||||||
}
|
}
|
||||||
private func backgroundColor(for tab: Tab) -> Color {
|
private func backgroundColor(for tab: Tab) -> Color {
|
||||||
if selection == tab {
|
if selection == tab {
|
||||||
return Color.accentColor
|
return sidebarSelectionColor
|
||||||
}
|
}
|
||||||
if hoveredTab == tab {
|
if hoveredTab == tab {
|
||||||
return Color.accentColor.opacity(0.2)
|
return sidebarHoverColor
|
||||||
|
}
|
||||||
|
return sidebarBaseColor
|
||||||
|
}
|
||||||
|
|
||||||
|
private var sidebarSelectionColor: Color {
|
||||||
|
switch colorScheme {
|
||||||
|
case .dark:
|
||||||
|
return Color(red: 0.22, green: 0.45, blue: 0.88)
|
||||||
|
default:
|
||||||
|
return Color(red: 0.10, green: 0.39, blue: 0.90)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var sidebarHoverColor: Color {
|
||||||
|
switch colorScheme {
|
||||||
|
case .dark:
|
||||||
|
return Color(red: 0.20, green: 0.22, blue: 0.27)
|
||||||
|
default:
|
||||||
|
return Color(red: 0.87, green: 0.91, blue: 0.98)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var sidebarBaseColor: Color {
|
||||||
|
switch colorScheme {
|
||||||
|
case .dark:
|
||||||
|
return Color(red: 0.15, green: 0.16, blue: 0.19)
|
||||||
|
default:
|
||||||
|
return Color(red: 0.96, green: 0.97, blue: 0.99)
|
||||||
}
|
}
|
||||||
return Color.accentColor.opacity(0.08)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,9 +7,18 @@
|
|||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
|
struct ServerActionFeedback: Identifiable {
|
||||||
|
let id = UUID()
|
||||||
|
let title: String
|
||||||
|
let message: String
|
||||||
|
}
|
||||||
|
|
||||||
struct ServerDetailView: View {
|
struct ServerDetailView: View {
|
||||||
@Binding var server: Server
|
@Binding var server: Server
|
||||||
var isFetching: Bool
|
var isFetching: Bool
|
||||||
|
var canRestart: Bool = false
|
||||||
|
var isRestarting: Bool = false
|
||||||
|
var onRestart: (() async -> ServerActionFeedback)? = nil
|
||||||
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
||||||
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
|
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
|
||||||
|
|
||||||
@@ -18,6 +27,8 @@ struct ServerDetailView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@State private var progress: Double = 0
|
@State private var progress: Double = 0
|
||||||
|
@State private var showRestartSheet = false
|
||||||
|
@State private var restartFeedback: ServerActionFeedback?
|
||||||
let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
|
let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
@@ -33,7 +44,13 @@ struct ServerDetailView: View {
|
|||||||
VStack(spacing: 0) {
|
VStack(spacing: 0) {
|
||||||
Spacer().frame(height: 6)
|
Spacer().frame(height: 6)
|
||||||
TabView {
|
TabView {
|
||||||
GeneralView(server: resolvedBinding)
|
GeneralView(
|
||||||
|
server: resolvedBinding,
|
||||||
|
canRestart: canRestart,
|
||||||
|
isRestarting: isRestarting
|
||||||
|
) {
|
||||||
|
showRestartSheet = true
|
||||||
|
}
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Text("General").unredacted()
|
Text("General").unredacted()
|
||||||
}
|
}
|
||||||
@@ -57,6 +74,17 @@ struct ServerDetailView: View {
|
|||||||
}
|
}
|
||||||
.padding(0)
|
.padding(0)
|
||||||
}
|
}
|
||||||
|
.overlay(alignment: .bottomTrailing) {
|
||||||
|
if let feedback = restartFeedback {
|
||||||
|
RestartFeedbackBanner(
|
||||||
|
feedback: feedback,
|
||||||
|
onDismiss: {
|
||||||
|
restartFeedback = nil
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.padding()
|
||||||
|
}
|
||||||
|
}
|
||||||
.onReceive(timer) { _ in
|
.onReceive(timer) { _ in
|
||||||
guard showIntervalIndicator else { return }
|
guard showIntervalIndicator else { return }
|
||||||
withAnimation(.linear(duration: 1.0 / 60.0)) {
|
withAnimation(.linear(duration: 1.0 / 60.0)) {
|
||||||
@@ -64,6 +92,25 @@ struct ServerDetailView: View {
|
|||||||
if progress >= 1 { progress = 0 }
|
if progress >= 1 { progress = 0 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.sheet(isPresented: $showRestartSheet) {
|
||||||
|
RestartConfirmationSheet(
|
||||||
|
hostname: server.hostname,
|
||||||
|
isRestarting: isRestarting,
|
||||||
|
onCancel: {
|
||||||
|
showRestartSheet = false
|
||||||
|
},
|
||||||
|
onConfirm: {
|
||||||
|
guard let onRestart else { return }
|
||||||
|
showRestartSheet = false
|
||||||
|
Task {
|
||||||
|
let feedback = await onRestart()
|
||||||
|
await MainActor.run {
|
||||||
|
restartFeedback = feedback
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var resolvedBinding: Binding<Server> {
|
private var resolvedBinding: Binding<Server> {
|
||||||
@@ -81,7 +128,8 @@ struct ServerDetailView: View {
|
|||||||
#Preview {
|
#Preview {
|
||||||
ServerDetailView(
|
ServerDetailView(
|
||||||
server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
|
server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
|
||||||
isFetching: false
|
isFetching: false,
|
||||||
|
canRestart: true
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,3 +145,67 @@ private struct LoadingBadge: View {
|
|||||||
.background(.ultraThinMaterial, in: Capsule())
|
.background(.ultraThinMaterial, in: Capsule())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private struct RestartConfirmationSheet: View {
|
||||||
|
let hostname: String
|
||||||
|
let isRestarting: Bool
|
||||||
|
let onCancel: () -> Void
|
||||||
|
let onConfirm: () -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 16) {
|
||||||
|
Text("Reboot this server?")
|
||||||
|
.font(.title3.weight(.semibold))
|
||||||
|
|
||||||
|
Text("This will send a reboot command to \(hostname).")
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
|
||||||
|
HStack {
|
||||||
|
Spacer()
|
||||||
|
|
||||||
|
Button("Cancel") {
|
||||||
|
onCancel()
|
||||||
|
}
|
||||||
|
.keyboardShortcut(.cancelAction)
|
||||||
|
.disabled(isRestarting)
|
||||||
|
|
||||||
|
Button("Reboot", role: .destructive) {
|
||||||
|
onConfirm()
|
||||||
|
}
|
||||||
|
.keyboardShortcut(.defaultAction)
|
||||||
|
.disabled(isRestarting)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(24)
|
||||||
|
.frame(width: 420)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct RestartFeedbackBanner: View {
|
||||||
|
let feedback: ServerActionFeedback
|
||||||
|
let onDismiss: () -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 12) {
|
||||||
|
Text(feedback.title)
|
||||||
|
.font(.headline)
|
||||||
|
|
||||||
|
Text(feedback.message)
|
||||||
|
.font(.subheadline)
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
|
||||||
|
HStack {
|
||||||
|
Spacer()
|
||||||
|
|
||||||
|
Button("OK") {
|
||||||
|
onDismiss()
|
||||||
|
}
|
||||||
|
.keyboardShortcut(.defaultAction)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.frame(maxWidth: 360, alignment: .leading)
|
||||||
|
.padding(24)
|
||||||
|
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 16, style: .continuous))
|
||||||
|
.shadow(radius: 12)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ import SwiftUI
|
|||||||
|
|
||||||
struct GeneralView: View {
|
struct GeneralView: View {
|
||||||
@Binding var server: Server
|
@Binding var server: Server
|
||||||
|
var canRestart: Bool = false
|
||||||
|
var isRestarting: Bool = false
|
||||||
|
var onRestart: (() -> Void)? = nil
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
GeometryReader { geometry in
|
GeometryReader { geometry in
|
||||||
@@ -117,6 +120,33 @@ struct GeneralView: View {
|
|||||||
monospaced: true
|
monospaced: true
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if canRestart, let onRestart {
|
||||||
|
TableRowView(showDivider: false) {
|
||||||
|
Text("Actions")
|
||||||
|
} value: {
|
||||||
|
VStack(alignment: .leading, spacing: 8) {
|
||||||
|
Button(role: .destructive) {
|
||||||
|
onRestart()
|
||||||
|
} label: {
|
||||||
|
if isRestarting {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
ProgressView()
|
||||||
|
.controlSize(.small)
|
||||||
|
Text("Rebooting…")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Label("Reboot Server", systemImage: "arrow.clockwise.circle")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.disabled(isRestarting)
|
||||||
|
|
||||||
|
Text("Sends a reboot command to the selected host.")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.padding()
|
.padding()
|
||||||
.frame(minHeight: geometry.size.height, alignment: .top)
|
.frame(minHeight: geometry.size.height, alignment: .top)
|
||||||
@@ -132,7 +162,7 @@ struct GeneralView: View {
|
|||||||
@State var previewServer = Server(hostname: "example.com", info: .placeholder)
|
@State var previewServer = Server(hostname: "example.com", info: .placeholder)
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
GeneralView(server: $previewServer)
|
GeneralView(server: $previewServer, canRestart: true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ import SwiftUI
|
|||||||
struct ResourcesView: View {
|
struct ResourcesView: View {
|
||||||
@Binding var server: Server
|
@Binding var server: Server
|
||||||
|
|
||||||
|
private var displayInfo: ServerInfo {
|
||||||
|
server.info ?? .placeholder
|
||||||
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
GeometryReader { geometry in
|
GeometryReader { geometry in
|
||||||
ScrollView {
|
ScrollView {
|
||||||
@@ -25,40 +29,40 @@ struct ResourcesView: View {
|
|||||||
Text("CPU Load")
|
Text("CPU Load")
|
||||||
} value: {
|
} value: {
|
||||||
LoadBarCell(
|
LoadBarCell(
|
||||||
percent: (server.info?.load.percent)!,
|
percent: displayInfo.load.percent,
|
||||||
load1: (server.info?.load.minute1)!,
|
load1: displayInfo.load.minute1,
|
||||||
load5: (server.info?.load.minute5)!,
|
load5: displayInfo.load.minute5,
|
||||||
load15: (server.info?.load.minute15)!
|
load15: displayInfo.load.minute15
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
TableRowView {
|
TableRowView {
|
||||||
Text("Memory")
|
Text("Memory")
|
||||||
} value: {
|
} value: {
|
||||||
UsageBarCell(
|
UsageBarCell(
|
||||||
free: (server.info?.memory.free)!,
|
free: displayInfo.memory.free,
|
||||||
used: (server.info?.memory.used)!,
|
used: displayInfo.memory.used,
|
||||||
total: (server.info?.memory.total)!,
|
total: displayInfo.memory.total,
|
||||||
percent: (server.info?.memory.percent)!
|
percent: displayInfo.memory.percent
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
TableRowView {
|
TableRowView {
|
||||||
Text("Swap")
|
Text("Swap")
|
||||||
} value: {
|
} value: {
|
||||||
UsageBarCell(
|
UsageBarCell(
|
||||||
free: (server.info?.swap.free)!,
|
free: displayInfo.swap.free,
|
||||||
used: (server.info?.swap.used)!,
|
used: displayInfo.swap.used,
|
||||||
total: (server.info?.swap.total)!,
|
total: displayInfo.swap.total,
|
||||||
percent: (server.info?.swap.percent)!
|
percent: displayInfo.swap.percent
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
TableRowView {
|
TableRowView {
|
||||||
Text("SSD")
|
Text("SSD")
|
||||||
} value: {
|
} value: {
|
||||||
UsageBarCell(
|
UsageBarCell(
|
||||||
free: (server.info?.diskSpace.free)!,
|
free: displayInfo.diskSpace.free,
|
||||||
used: (server.info?.diskSpace.used)!,
|
used: displayInfo.diskSpace.used,
|
||||||
total: (server.info?.diskSpace.total)!,
|
total: displayInfo.diskSpace.total,
|
||||||
percent: (server.info?.diskSpace.percent)!
|
percent: displayInfo.diskSpace.percent
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
30
Sparkle/appcast.xml
vendored
30
Sparkle/appcast.xml
vendored
@@ -3,28 +3,28 @@
|
|||||||
<channel>
|
<channel>
|
||||||
<title>iKeyMon</title>
|
<title>iKeyMon</title>
|
||||||
<item>
|
<item>
|
||||||
<title>26.1.2</title>
|
<title>26.1.8</title>
|
||||||
<pubDate>Sat, 03 Jan 2026 18:05:27 +0100</pubDate>
|
<pubDate>Sun, 19 Apr 2026 22:50:15 +0200</pubDate>
|
||||||
<sparkle:version>164</sparkle:version>
|
<sparkle:version>179</sparkle:version>
|
||||||
<sparkle:shortVersionString>26.1.2</sparkle:shortVersionString>
|
<sparkle:shortVersionString>26.1.8</sparkle:shortVersionString>
|
||||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.2/iKeyMon-26.1.2.zip" length="3007173" type="application/octet-stream" sparkle:edSignature="CiNeGZ9h4WtI/ZOW371EAEKGK0vWdu1VhBk5ewh2hoq+4C8R9DbnQvDyHvwFy4wh6VpLahp/mXr4gV5alEIRCw=="/>
|
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.8/iKeyMon-26.1.8.zip" length="3108005" type="application/octet-stream" sparkle:edSignature="OyoweSuRk5kusKUlqKQudZjrHkw5UPrLkix+ccpKphO1en2XdtQZa61hnA6HwcHM302jb+YlvN8n9f2Zkr9GBg=="/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<title>26.1.1</title>
|
<title>26.1.7</title>
|
||||||
<pubDate>Sat, 03 Jan 2026 16:34:21 +0100</pubDate>
|
<pubDate>Sun, 19 Apr 2026 16:54:42 +0200</pubDate>
|
||||||
<sparkle:version>162</sparkle:version>
|
<sparkle:version>177</sparkle:version>
|
||||||
<sparkle:shortVersionString>26.1.1</sparkle:shortVersionString>
|
<sparkle:shortVersionString>26.1.7</sparkle:shortVersionString>
|
||||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.1/iKeyMon-26.1.1.zip" length="3007145" type="application/octet-stream" sparkle:edSignature="iIRDl2//fBGMkI0AwE5PzSOZO5fowONqEx/6EH3SLnWxj6LC0LQh+SifVAwpf4g5/zPEMXNrLl+CZB7LEz/HCw=="/>
|
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.7/iKeyMon-26.1.7.zip" length="3106520" type="application/octet-stream" sparkle:edSignature="xuNlxCsTtVgroriFU7fphcfHxAEC8cpd6tHnHMXknJ2jvKm27ShQMqjSW2jdqNAz0a0kNtPM8HwTL+e6nvUyCQ=="/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<title>26.0.70</title>
|
<title>26.1.6</title>
|
||||||
<pubDate>Sat, 03 Jan 2026 15:49:42 +0100</pubDate>
|
<pubDate>Sun, 19 Apr 2026 15:26:19 +0200</pubDate>
|
||||||
<sparkle:version>154</sparkle:version>
|
<sparkle:version>175</sparkle:version>
|
||||||
<sparkle:shortVersionString>26.0.70</sparkle:shortVersionString>
|
<sparkle:shortVersionString>26.1.6</sparkle:shortVersionString>
|
||||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.70/iKeyMon-26.0.70.zip" length="3007098" type="application/octet-stream" sparkle:edSignature="XZA2xs40EZnexsv/DvzjiH2yiQACqlU+KSDFGqFQTgCTFEPxg6w/qx1cuolgHD3kQJm/svRTNYRR4OVYt9UQBA=="/>
|
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.6/iKeyMon-26.1.6.zip" length="3063130" type="application/octet-stream" sparkle:edSignature="QPy3zm31ZTXE9grlj7Ul6kEG2t0veODEBjJ/qADM8A88lLJ8V9L4WhNnD8wmM7Urh1O6eZKl1qrCLTk0oo3WBA=="/>
|
||||||
</item>
|
</item>
|
||||||
</channel>
|
</channel>
|
||||||
</rss>
|
</rss>
|
||||||
@@ -4,13 +4,19 @@ set -euo pipefail
|
|||||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
REMOTE_NAME="${1:-origin}"
|
REMOTE_NAME="${1:-origin}"
|
||||||
QUIET_RELEASE="${QUIET_RELEASE:-1}"
|
QUIET_RELEASE="${QUIET_RELEASE:-1}"
|
||||||
RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/build/release.log}"
|
RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/.git/release.log}"
|
||||||
|
|
||||||
if [[ -n "${SKIP_RELEASE:-}" ]]; then
|
if [[ -n "${SKIP_RELEASE:-}" ]]; then
|
||||||
echo "release: skipped (SKIP_RELEASE=1)"
|
echo "release: skipped (SKIP_RELEASE=1)"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
head_subject="$(git -C "$ROOT_DIR" log -1 --pretty=%s 2>/dev/null || true)"
|
||||||
|
if [[ "$head_subject" =~ ^chore:\ release\ ]]; then
|
||||||
|
echo "release: skipped (HEAD is already a release commit)"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
should_release=false
|
should_release=false
|
||||||
release_local_ref=""
|
release_local_ref=""
|
||||||
release_remote_ref=""
|
release_remote_ref=""
|
||||||
@@ -67,7 +73,8 @@ fi
|
|||||||
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml"
|
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
|
if git -C "$ROOT_DIR" diff --cached --quiet; then
|
||||||
echo "release: no changes detected; skipping commit"
|
echo "release: no changes detected; continuing push"
|
||||||
|
exit 0
|
||||||
else
|
else
|
||||||
run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
|
run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
|
||||||
echo "release: commit failed (log: $RELEASE_LOG)"
|
echo "release: commit failed (log: $RELEASE_LOG)"
|
||||||
@@ -75,10 +82,5 @@ else
|
|||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if SKIP_RELEASE=1 git -C "$ROOT_DIR" push --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
|
echo "release: created commit for v${NEW_VERSION}; run 'git push' again to push the new release commit"
|
||||||
echo "release: success v${NEW_VERSION}"
|
|
||||||
exit 1
|
exit 1
|
||||||
else
|
|
||||||
echo "release: push failed (log: $RELEASE_LOG)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|||||||
@@ -322,7 +322,7 @@
|
|||||||
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 = 164;
|
CURRENT_PROJECT_VERSION = 179;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
@@ -337,7 +337,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 26.1.2;
|
MARKETING_VERSION = 26.1.8;
|
||||||
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;
|
||||||
@@ -353,7 +353,7 @@
|
|||||||
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 = 164;
|
CURRENT_PROJECT_VERSION = 179;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
@@ -368,7 +368,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 26.1.2;
|
MARKETING_VERSION = 26.1.8;
|
||||||
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;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ set -euo pipefail
|
|||||||
|
|
||||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
BUILD_DIR="$ROOT_DIR/build"
|
BUILD_DIR="$ROOT_DIR/build"
|
||||||
|
DERIVED_DATA_DIR="$BUILD_DIR/derived-data"
|
||||||
ARTIFACTS_DIR="$ROOT_DIR/dist"
|
ARTIFACTS_DIR="$ROOT_DIR/dist"
|
||||||
SCHEME="iKeyMon"
|
SCHEME="iKeyMon"
|
||||||
PROJECT="iKeyMon.xcodeproj"
|
PROJECT="iKeyMon.xcodeproj"
|
||||||
@@ -141,18 +142,18 @@ export SPARKLE_APPCAST_OUTPUT
|
|||||||
|
|
||||||
"$ROOT_DIR/scripts/sync_version.sh"
|
"$ROOT_DIR/scripts/sync_version.sh"
|
||||||
|
|
||||||
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
|
rm -rf "$DERIVED_DATA_DIR" "$ARTIFACTS_DIR"
|
||||||
mkdir -p "$ARTIFACTS_DIR"
|
mkdir -p "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||||
|
|
||||||
xcodebuild \
|
xcodebuild \
|
||||||
-project "$ROOT_DIR/$PROJECT" \
|
-project "$ROOT_DIR/$PROJECT" \
|
||||||
-scheme "$SCHEME" \
|
-scheme "$SCHEME" \
|
||||||
-configuration Release \
|
-configuration Release \
|
||||||
-derivedDataPath "$BUILD_DIR" \
|
-derivedDataPath "$DERIVED_DATA_DIR" \
|
||||||
CODE_SIGNING_ALLOWED=NO \
|
CODE_SIGNING_ALLOWED=NO \
|
||||||
clean build
|
clean build
|
||||||
|
|
||||||
APP_PATH="$BUILD_DIR/Build/Products/Release/iKeyMon.app"
|
APP_PATH="$DERIVED_DATA_DIR/Build/Products/Release/iKeyMon.app"
|
||||||
if [[ ! -d "$APP_PATH" ]]; then
|
if [[ ! -d "$APP_PATH" ]]; then
|
||||||
echo "❌ Failed to find built app at $APP_PATH"
|
echo "❌ Failed to find built app at $APP_PATH"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -215,8 +216,10 @@ generate_appcast
|
|||||||
|
|
||||||
if [[ -n "${GITEA_TOKEN:-}" && -n "${GITEA_OWNER:-}" && -n "${GITEA_REPO:-}" ]]; then
|
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"
|
"$ROOT_DIR/scripts/publish_release.sh" "$VERSION" "$ARTIFACTS_DIR/$ZIP_NAME" "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
"$ROOT_DIR/scripts/update_homebrew_tap.sh" "$VERSION" "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
else
|
else
|
||||||
echo "ℹ️ Skipping Gitea release publishing (GITEA_* variables not fully set)."
|
echo "ℹ️ Skipping Gitea release publishing (GITEA_* variables not fully set)."
|
||||||
|
echo "ℹ️ Skipping Homebrew tap update because release publishing was skipped."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "✅ Build complete. Artifacts:"
|
echo "✅ Build complete. Artifacts:"
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ if [[ -z "$CHANGELOG_BODY" ]]; then
|
|||||||
CHANGELOG_BODY="See commit history for details."
|
CHANGELOG_BODY="See commit history for details."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PRERELEASE_FLAG="${GITEA_PRERELEASE:-true}"
|
PRERELEASE_FLAG="${GITEA_PRERELEASE:-false}"
|
||||||
|
|
||||||
create_payload="$(jq -n \
|
create_payload="$(jq -n \
|
||||||
--arg tag "$RELEASE_TAG" \
|
--arg tag "$RELEASE_TAG" \
|
||||||
|
|||||||
62
scripts/update_homebrew_tap.sh
Executable file
62
scripts/update_homebrew_tap.sh
Executable file
@@ -0,0 +1,62 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
VERSION="${1:?usage: update_homebrew_tap.sh <version> <dmg_path>}"
|
||||||
|
DMG_PATH="${2:?usage: update_homebrew_tap.sh <version> <dmg_path>}"
|
||||||
|
TAP_DIR="${HOMEBREW_TAP_DIR:-$ROOT_DIR/homebrew-tap}"
|
||||||
|
CASK_FILE="$TAP_DIR/Casks/ikeymon.rb"
|
||||||
|
|
||||||
|
if [[ ! -d "$TAP_DIR/.git" ]]; then
|
||||||
|
echo "❌ Homebrew tap repo not found at $TAP_DIR"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f "$CASK_FILE" ]]; then
|
||||||
|
echo "❌ Homebrew cask file not found at $CASK_FILE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f "$DMG_PATH" ]]; then
|
||||||
|
echo "❌ DMG artifact not found at $DMG_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$(git -C "$TAP_DIR" status --porcelain)" ]]; then
|
||||||
|
echo "❌ Homebrew tap repo has uncommitted changes: $TAP_DIR"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
SHA256="$(shasum -a 256 "$DMG_PATH" | awk '{print $1}')"
|
||||||
|
|
||||||
|
python3 - <<'PY' "$CASK_FILE" "$VERSION" "$SHA256"
|
||||||
|
from pathlib import Path
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
|
||||||
|
cask_path = Path(sys.argv[1])
|
||||||
|
version = sys.argv[2]
|
||||||
|
sha256 = sys.argv[3]
|
||||||
|
content = cask_path.read_text(encoding="utf-8")
|
||||||
|
|
||||||
|
content, version_count = re.subn(r'version "[^"]+"', f'version "{version}"', content, count=1)
|
||||||
|
content, sha_count = re.subn(r'sha256 "[^"]+"', f'sha256 "{sha256}"', content, count=1)
|
||||||
|
|
||||||
|
if version_count != 1 or sha_count != 1:
|
||||||
|
raise SystemExit("Failed to update version or sha256 in cask file")
|
||||||
|
|
||||||
|
cask_path.write_text(content, encoding="utf-8")
|
||||||
|
PY
|
||||||
|
|
||||||
|
ruby -c "$CASK_FILE" >/dev/null
|
||||||
|
|
||||||
|
if git -C "$TAP_DIR" diff --quiet -- "$CASK_FILE"; then
|
||||||
|
echo "ℹ️ Homebrew tap already points to iKeyMon ${VERSION}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
git -C "$TAP_DIR" add "$CASK_FILE"
|
||||||
|
git -C "$TAP_DIR" commit -m "cask: update ikeymon to ${VERSION}"
|
||||||
|
git -C "$TAP_DIR" push origin master
|
||||||
|
|
||||||
|
echo "✅ Updated Homebrew tap to iKeyMon ${VERSION}"
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"marketing_version": "26.1.2"
|
"marketing_version": "26.1.8"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user