Compare commits
112 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 11815fb807 | |||
| afbb425e3b | |||
| 92040e5c5e | |||
| 50410488a1 | |||
| 8d6334d3b4 | |||
| dc8de5a4ea | |||
| 3510474764 | |||
| 9f42c68279 | |||
| 031781761c | |||
| 9413c23cc5 | |||
|
|
c8d3289a9b | ||
|
|
c063add947 | ||
|
|
610c569b83 | ||
|
|
7d7a79cf13 | ||
|
|
2775e44f92 | ||
|
|
d5cadf75ca | ||
|
|
28104c1bc3 | ||
|
|
8dae638111 | ||
|
|
670c8fe83b | ||
|
|
846983649a | ||
|
|
1670b030ba | ||
|
|
fc43fa9094 | ||
|
|
4f026d6e1b | ||
|
|
06932cde21 | ||
|
|
7a286c68e3 | ||
|
|
e7b776942b | ||
|
|
8cf974118b | ||
|
|
ae83ea7dab | ||
|
|
39205230b6 | ||
|
|
55a266014c | ||
|
|
c002cab616 | ||
|
|
117134cead | ||
|
|
35711d33c0 | ||
|
|
4f3d56dc3c | ||
|
|
0d80a0f912 | ||
|
|
b1d6e61f05 | ||
|
|
2dd2c2154f | ||
|
|
c6ecbbe511 | ||
|
|
77a145604c | ||
|
|
0016030ff3 | ||
|
|
615d664731 | ||
|
|
5644fbdfe0 | ||
|
|
9b5883fe77 | ||
|
|
5d15810802 | ||
|
|
519d15ed10 | ||
|
|
446bbe7f98 | ||
|
|
b67fffd3f0 | ||
|
|
84935ee8fd | ||
|
|
0f266f7046 | ||
|
|
bff7c44c29 | ||
|
|
f930e8334f | ||
|
|
0032ad9b57 | ||
|
|
b7f5d1a762 | ||
|
|
5dc5621871 | ||
|
|
2a848c3251 | ||
|
|
bb4f972d58 | ||
|
|
62d4a9ac96 | ||
|
|
75fe670779 | ||
|
|
a961baab28 | ||
|
|
7246b132f6 | ||
|
|
1afce31641 | ||
|
|
281016bfc9 | ||
|
|
144ad27aa6 | ||
|
|
aa655bb7d6 | ||
|
|
1ac34e1f04 | ||
|
|
5f045c113a | ||
|
|
2dbe739c97 | ||
|
|
da9dd2f7ed | ||
|
|
2ae67b6675 | ||
|
|
989717539c | ||
|
|
6d05419abb | ||
|
|
be37bf526a | ||
|
|
6c1f5c6d25 | ||
|
|
32f97ff7d4 | ||
|
|
dbbe1752d1 | ||
|
|
2fe9821ac1 | ||
|
|
87d4bffb99 | ||
|
|
92782716fc | ||
|
|
002c9e8cf2 | ||
|
|
8820244589 | ||
|
|
48d2f0ea42 | ||
|
|
1947d05d78 | ||
|
|
86039cd5a9 | ||
|
|
4f9c008498 | ||
|
|
76818578b9 | ||
|
|
9070882f38 | ||
|
|
541927c30a | ||
|
|
ab3a7ca469 | ||
|
|
ee27efc0d4 | ||
|
|
c3f445e3c3 | ||
|
|
215c24d5a2 | ||
|
|
b96b018f70 | ||
|
|
65a65939a7 | ||
|
|
25723b7f07 | ||
|
|
10683ebc73 | ||
|
|
393bcf27e1 | ||
|
|
839a513fde | ||
|
|
77e82753ba | ||
|
|
bbb0b580b0 | ||
|
|
dd225b2b8e | ||
|
|
76b01352ac | ||
|
|
fcca8cee38 | ||
|
|
94d1b3fec4 | ||
|
|
4352ae1476 | ||
|
|
846e0b149b | ||
|
|
11ca4dbede | ||
|
|
1d8bdfe491 | ||
|
|
4f5a07822f | ||
|
|
67709dfda6 | ||
|
|
6753226087 | ||
|
|
a3671acf38 | ||
|
|
0aa773a0b3 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@ build/
|
||||
Build/
|
||||
dist/
|
||||
.signing.env
|
||||
homebrew-tap/
|
||||
|
||||
44
CHANGELOG.md
44
CHANGELOG.md
@@ -1,6 +1,46 @@
|
||||
# Changelog
|
||||
|
||||
## Unreleased
|
||||
## 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)
|
||||
- Fixed changelog extraction in publish script.
|
||||
|
||||
## 26.1.0 (2025-01-03)
|
||||
- Auto-populate release description from CHANGELOG when publishing to Gitea.
|
||||
|
||||
## Prereleases
|
||||
|
||||
### Fixed
|
||||
- Fixed excessive refresh timer resets by properly cancelling previous subscriptions and validating value changes before recreating timers.
|
||||
- Fixed interval indicator to respect user's refresh interval setting instead of always assuming 60 seconds.
|
||||
|
||||
### Added
|
||||
- Added status notifications for server monitoring in Preferences → Notifications:
|
||||
- "Status Notifications" toggle: alerts when servers go offline/online or services change status.
|
||||
- "Alert Notifications" toggle: (placeholder for future alert threshold configuration).
|
||||
- Ping status changes now trigger notifications (Server Online/Offline).
|
||||
- Service status monitoring tracks individual services (DNS, FTP, SSH, HTTP, HTTPS, etc.) and alerts when they go offline or come back online.
|
||||
- Notification permissions are requested automatically when the app launches.
|
||||
|
||||
### Previous Changes
|
||||
- Flattened the project structure so sources live at the repository root instead of the nested `iKeyMon/` folder and updated the Xcode project accordingly.
|
||||
- Fixed build settings (entitlements, preview assets) and placeholder previews to work with the new layout.
|
||||
- Migrated the updated API layer and unified `ServerInfo` model from the previous branch.
|
||||
@@ -10,5 +50,5 @@
|
||||
- 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.
|
||||
- `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.
|
||||
|
||||
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:
|
||||
- Ping every 10 seconds
|
||||
- Server info every 60 seconds
|
||||
- Preferences dialog
|
||||
- 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
|
||||
- Stores API keys securely in the macOS Keychain
|
||||
- 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
|
||||
|
||||
- Preferences dialog
|
||||
- macOS notifications if servers or services become unavailable
|
||||
- Optional iOS support if there is demand
|
||||
- iOS support is a possibility, but it is unclear if or when that will happen
|
||||
|
||||
## 🚀 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+.
|
||||
|
||||
@@ -38,79 +59,6 @@ cd iKeyMon
|
||||
open iKeyMon.xcodeproj
|
||||
```
|
||||
|
||||
### Local release build
|
||||
|
||||
Use the helper script to produce distributables in `dist/`:
|
||||
|
||||
```bash
|
||||
./scripts/build_release.sh
|
||||
```
|
||||
|
||||
It cleans previous artifacts, builds the `Release` configuration, and drops both `iKeyMon-<version>.zip` and `iKeyMon-<version>.dmg` into the `dist` folder (ignored by git). To enable codesigning + notarization, copy `signing.env.example` to `.signing.env`, fill in your Developer ID identity, Apple ID, team ID, and app-specific password. The script sources that file locally (it remains gitignored) and performs signing/notarization when the values are present.
|
||||
|
||||
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
|
||||
|
||||
MIT — see [LICENSE](LICENSE) for details.
|
||||
|
||||
@@ -10,6 +10,7 @@ import Foundation
|
||||
enum APIVersion: String, CaseIterable {
|
||||
case v2_12 = "2.12"
|
||||
case v2_13 = "2.13"
|
||||
case v2_14 = "2.14"
|
||||
|
||||
static func from(versionString: String) -> APIVersion? {
|
||||
if let version = APIVersion(rawValue: versionString) {
|
||||
@@ -24,7 +25,8 @@ enum APIVersion: String, CaseIterable {
|
||||
|
||||
switch (major, minor) {
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -36,6 +38,7 @@ protocol AnyServerAPI {
|
||||
func fetchMemoryData() async throws -> Any
|
||||
func fetchUtilizationData() async throws -> Any
|
||||
func fetchServerSummary(apiKey: String) async throws -> ServerInfo
|
||||
func restartServer(apiKey: String) async throws
|
||||
}
|
||||
|
||||
private struct AnyServerAPIWrapper<T: ServerAPIProtocol>: AnyServerAPI {
|
||||
@@ -64,6 +67,10 @@ private struct AnyServerAPIWrapper<T: ServerAPIProtocol>: AnyServerAPI {
|
||||
func fetchServerSummary(apiKey: String) async throws -> ServerInfo {
|
||||
return try await wrapped.fetchServerSummary(apiKey: apiKey)
|
||||
}
|
||||
|
||||
func restartServer(apiKey: String) async throws {
|
||||
try await wrapped.restartServer(apiKey: apiKey)
|
||||
}
|
||||
}
|
||||
|
||||
class APIFactory {
|
||||
@@ -73,6 +80,8 @@ class APIFactory {
|
||||
return AnyServerAPIWrapper(APIv2_12(baseURL: baseURL))
|
||||
case .v2_13:
|
||||
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 fetchUtilization() async throws -> UtilizationType
|
||||
func fetchServerSummary(apiKey: String) async throws -> ServerInfo
|
||||
func restartServer(apiKey: String) async throws
|
||||
}
|
||||
|
||||
struct SystemInfo: Codable {
|
||||
@@ -36,6 +37,15 @@ class BaseAPIClient {
|
||||
}
|
||||
|
||||
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)
|
||||
|
||||
guard let httpResponse = response as? HTTPURLResponse else {
|
||||
@@ -43,25 +53,61 @@ class BaseAPIClient {
|
||||
}
|
||||
|
||||
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 {
|
||||
case invalidURL
|
||||
case invalidResponse
|
||||
case httpError(Int)
|
||||
case httpError(Int, String?)
|
||||
case decodingError(Error)
|
||||
case unsupportedFeature(String)
|
||||
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .invalidURL: return "Invalid URL"
|
||||
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 .unsupportedFeature(let feature): return "\(feature) is not supported by this host"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private struct APIErrorEnvelope: Decodable {
|
||||
let code: String?
|
||||
let message: String?
|
||||
}
|
||||
|
||||
@@ -1,7 +1,21 @@
|
||||
import Foundation
|
||||
import UserNotifications
|
||||
|
||||
enum PingService {
|
||||
static func ping(hostname: String, apiKey: String) async -> Bool {
|
||||
private static var previousPingStates: [String: Bool] = [:]
|
||||
private static var suppressedUntil: [String: Date] = [:]
|
||||
|
||||
static func suppressChecks(for hostname: String, duration: TimeInterval) {
|
||||
suppressedUntil[hostname] = Date().addingTimeInterval(duration)
|
||||
}
|
||||
|
||||
static func ping(hostname: String, apiKey: String, notificationsEnabled: Bool = true) async -> Bool {
|
||||
if let suppressedUntil = suppressedUntil[hostname], suppressedUntil > Date() {
|
||||
return false
|
||||
} else {
|
||||
suppressedUntil.removeValue(forKey: hostname)
|
||||
}
|
||||
|
||||
guard let url = URL(string: "https://\(hostname)/api/v2/ping") else {
|
||||
print("❌ [PingService] Invalid URL for \(hostname)")
|
||||
return false
|
||||
@@ -15,20 +29,48 @@ enum PingService {
|
||||
do {
|
||||
let (data, response) = try await URLSession.shared.data(for: request)
|
||||
if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode != 200 {
|
||||
if let responseString = String(data: data, encoding: .utf8) {
|
||||
print("❌ [PingService] HTTP \(httpResponse.statusCode): \(responseString)")
|
||||
}
|
||||
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||
return false
|
||||
}
|
||||
|
||||
if let result = try? JSONDecoder().decode([String: String].self, from: data), result["response"] == "pong" {
|
||||
handlePingSuccess(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||
return true
|
||||
} else {
|
||||
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||
return false
|
||||
}
|
||||
} catch {
|
||||
print("❌ [PingService] Error pinging \(hostname): \(error)")
|
||||
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
private static func handlePingSuccess(for hostname: String, notificationsEnabled: Bool) {
|
||||
let wasPreviouslyDown = previousPingStates[hostname] == false
|
||||
previousPingStates[hostname] = true
|
||||
|
||||
if wasPreviouslyDown && notificationsEnabled {
|
||||
sendNotification(title: "Server Online", body: "\(hostname) is now online")
|
||||
}
|
||||
}
|
||||
|
||||
private static func handlePingFailure(for hostname: String, notificationsEnabled: Bool) {
|
||||
let wasPreviouslyUp = previousPingStates[hostname] != false
|
||||
previousPingStates[hostname] = false
|
||||
|
||||
if wasPreviouslyUp && notificationsEnabled {
|
||||
sendNotification(title: "Server Offline", body: "\(hostname) is offline")
|
||||
}
|
||||
}
|
||||
|
||||
private static func sendNotification(title: String, body: String) {
|
||||
let content = UNMutableNotificationContent()
|
||||
content.title = title
|
||||
content.body = body
|
||||
content.sound = .default
|
||||
|
||||
let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
|
||||
UNUserNotificationCenter.current().add(request)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,6 +185,10 @@ struct ServerInfo: Codable, Hashable, Equatable {
|
||||
].filter { !$0.isEmpty }
|
||||
return components.isEmpty ? nil : components.joined(separator: " • ")
|
||||
}
|
||||
|
||||
var supportsRestartCommand: Bool {
|
||||
ServerInfo.version(apiVersion, isAtLeast: "2.14")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Helpers & Sample Data
|
||||
@@ -226,6 +230,27 @@ extension ServerInfo {
|
||||
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(
|
||||
hostname: "preview.example.com",
|
||||
ipAddresses: ["192.168.1.1", "fe80::1"],
|
||||
|
||||
@@ -181,7 +181,7 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
|
||||
}
|
||||
|
||||
guard httpResponse.statusCode == 200 else {
|
||||
throw APIError.httpError(httpResponse.statusCode)
|
||||
throw APIError.httpError(httpResponse.statusCode, nil)
|
||||
}
|
||||
|
||||
let decoder = JSONDecoder()
|
||||
@@ -189,6 +189,10 @@ class APIv2_12: BaseAPIClient, ServerAPIProtocol {
|
||||
let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
|
||||
return envelope.toDomain()
|
||||
}
|
||||
|
||||
func restartServer(apiKey: String) async throws {
|
||||
throw APIError.unsupportedFeature("Server reboot")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Server Summary Mapping
|
||||
|
||||
@@ -181,7 +181,7 @@ class APIv2_13: BaseAPIClient, ServerAPIProtocol {
|
||||
}
|
||||
|
||||
guard httpResponse.statusCode == 200 else {
|
||||
throw APIError.httpError(httpResponse.statusCode)
|
||||
throw APIError.httpError(httpResponse.statusCode, nil)
|
||||
}
|
||||
|
||||
let decoder = JSONDecoder()
|
||||
@@ -189,6 +189,10 @@ class APIv2_13: BaseAPIClient, ServerAPIProtocol {
|
||||
let envelope = try decoder.decode(ServerSummaryEnvelope.self, from: data)
|
||||
return envelope.toDomain()
|
||||
}
|
||||
|
||||
func restartServer(apiKey: String) async throws {
|
||||
throw APIError.unsupportedFeature("Server reboot")
|
||||
}
|
||||
}
|
||||
|
||||
// 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)
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
||||
}()
|
||||
private let logger = Logger(subsystem: "net.24unix.iKeyMon", category: "Sparkle")
|
||||
private let verboseLogging: Bool
|
||||
@Published var logMessages: [String] = []
|
||||
|
||||
override init() {
|
||||
self.verboseLogging = ProcessInfo.processInfo.environment["SPARKLE_VERBOSE_LOGGING"] == "1"
|
||||
@@ -34,6 +35,7 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
||||
|
||||
private func log(_ message: String) {
|
||||
logger.log("\(message, privacy: .public)")
|
||||
addLogMessage("[INFO] \(message)")
|
||||
if verboseLogging {
|
||||
print("[Sparkle] \(message)")
|
||||
}
|
||||
@@ -41,11 +43,21 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
||||
|
||||
private func logError(_ message: String) {
|
||||
logger.error("\(message, privacy: .public)")
|
||||
addLogMessage("[ERROR] \(message)")
|
||||
if verboseLogging {
|
||||
fputs("[Sparkle][error] \(message)\n", stderr)
|
||||
}
|
||||
}
|
||||
|
||||
private func addLogMessage(_ message: String) {
|
||||
let timestamp = DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)
|
||||
let timestampedMessage = "[\(timestamp)] \(message)"
|
||||
logMessages.append(timestampedMessage)
|
||||
if logMessages.count > 100 {
|
||||
logMessages.removeFirst()
|
||||
}
|
||||
}
|
||||
|
||||
private func describe(update item: SUAppcastItem) -> String {
|
||||
let short = item.displayVersionString
|
||||
let build = item.versionString
|
||||
@@ -53,41 +65,63 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
||||
}
|
||||
}
|
||||
|
||||
@MainActor
|
||||
extension SparkleUpdater: SPUUpdaterDelegate {
|
||||
func updater(_ updater: SPUUpdater, didFinishLoading appcast: SUAppcast) {
|
||||
log("Loaded Sparkle appcast containing \(appcast.items.count) item(s).")
|
||||
nonisolated func updater(_ updater: SPUUpdater, didFinishLoading appcast: SUAppcast) {
|
||||
Task { @MainActor in
|
||||
log("Loaded Sparkle appcast containing \(appcast.items.count) item(s).")
|
||||
}
|
||||
}
|
||||
|
||||
func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {
|
||||
log("Found valid update \(describe(update: item))")
|
||||
nonisolated func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {
|
||||
Task { @MainActor in
|
||||
log("Found valid update \(describe(update: item))")
|
||||
}
|
||||
}
|
||||
|
||||
func updaterDidNotFindUpdate(_ updater: SPUUpdater) {
|
||||
log("No updates available.")
|
||||
nonisolated func updaterDidNotFindUpdate(_ updater: SPUUpdater) {
|
||||
Task { @MainActor in
|
||||
log("No updates available.")
|
||||
}
|
||||
}
|
||||
|
||||
func updater(_ updater: SPUUpdater, willDownloadUpdate item: SUAppcastItem, with request: NSMutableURLRequest) {
|
||||
log("Downloading \(describe(update: item)) from \(request.url?.absoluteString ?? "unknown URL")")
|
||||
nonisolated func updater(_ updater: SPUUpdater, willDownloadUpdate item: SUAppcastItem, with request: NSMutableURLRequest) {
|
||||
Task { @MainActor in
|
||||
log("Downloading \(describe(update: item)) from \(request.url?.absoluteString ?? "unknown URL")")
|
||||
}
|
||||
}
|
||||
|
||||
func updater(_ updater: SPUUpdater, didDownloadUpdate item: SUAppcastItem) {
|
||||
log("Finished downloading \(describe(update: item))")
|
||||
nonisolated func updater(_ updater: SPUUpdater, didDownloadUpdate item: SUAppcastItem) {
|
||||
Task { @MainActor in
|
||||
log("Finished downloading \(describe(update: item))")
|
||||
}
|
||||
}
|
||||
|
||||
func updater(_ updater: SPUUpdater, failedToDownloadUpdate item: SUAppcastItem, error: Error) {
|
||||
logError("Failed to download \(describe(update: item)): \(error.localizedDescription)")
|
||||
nonisolated func updater(_ updater: SPUUpdater, failedToDownloadUpdate item: SUAppcastItem, error: Error) {
|
||||
Task { @MainActor in
|
||||
logError("Failed to download \(describe(update: item)): \(error.localizedDescription)")
|
||||
}
|
||||
}
|
||||
|
||||
func userDidCancelDownload(_ updater: SPUUpdater) {
|
||||
log("User cancelled Sparkle download.")
|
||||
nonisolated func userDidCancelDownload(_ updater: SPUUpdater) {
|
||||
Task { @MainActor in
|
||||
log("User cancelled Sparkle download.")
|
||||
}
|
||||
}
|
||||
|
||||
func updater(_ updater: SPUUpdater, willInstallUpdate item: SUAppcastItem) {
|
||||
log("Will install update \(describe(update: item))")
|
||||
nonisolated func updater(_ updater: SPUUpdater, willInstallUpdate item: SUAppcastItem) {
|
||||
Task { @MainActor in
|
||||
log("Will install update \(describe(update: item))")
|
||||
}
|
||||
}
|
||||
|
||||
func updater(_ updater: SPUUpdater, didAbortWithError error: Error) {
|
||||
logError("Sparkle aborted: \(error.localizedDescription)")
|
||||
nonisolated func updater(_ updater: SPUUpdater, didAbortWithError error: Error) {
|
||||
Task { @MainActor in
|
||||
let errorDescription = error as NSError
|
||||
let details = "Domain: \(errorDescription.domain), Code: \(errorDescription.code), Description: \(error.localizedDescription)"
|
||||
logError("Sparkle aborted: \(details)")
|
||||
if let underlying = errorDescription.userInfo[NSUnderlyingErrorKey] as? NSError {
|
||||
logError("Underlying error: Domain: \(underlying.domain), Code: \(underlying.code), Description: \(underlying.localizedDescription)")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,20 +6,29 @@
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import Combine
|
||||
import UserNotifications
|
||||
|
||||
struct MainView: View {
|
||||
|
||||
private static let serverOrderKeyStatic = "serverOrder"
|
||||
private static let storedServersKeyStatic = "storedServers"
|
||||
|
||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||
@State var showAddServerSheet: Bool = false
|
||||
@State private var serverBeingEdited: Server?
|
||||
@State private var serverToDelete: Server?
|
||||
@State private var showDeleteConfirmation = false
|
||||
@State private var isFetchingInfo: Bool = false
|
||||
@State private var refreshTimer = Timer.publish(every: 60, on: .main, in: .common).autoconnect()
|
||||
@AppStorage("pingInterval") private var pingInterval: Int = 10
|
||||
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
|
||||
@AppStorage("enableStatusNotifications") private var enableStatusNotifications: Bool = true
|
||||
@AppStorage("enableAlertNotifications") private var enableAlertNotifications: Bool = true
|
||||
@State private var refreshTimer: Timer.TimerPublisher?
|
||||
@State private var refreshSubscription: AnyCancellable?
|
||||
@State private var pingTimer: Timer?
|
||||
@State private var restartingServerID: UUID?
|
||||
@State private var lastRefreshInterval: Int?
|
||||
@State private var previousServiceStates: [String: String] = [:]
|
||||
private let serverOrderKey = MainView.serverOrderKeyStatic
|
||||
private let storedServersKey = MainView.storedServersKeyStatic
|
||||
|
||||
@@ -60,14 +69,6 @@ struct MainView: View {
|
||||
}
|
||||
.help("Add Host")
|
||||
}
|
||||
ToolbarItem {
|
||||
Button {
|
||||
sparkleUpdater.checkForUpdates()
|
||||
} label: {
|
||||
Image(systemName: "square.and.arrow.down")
|
||||
}
|
||||
.help("Check for Updates")
|
||||
}
|
||||
}
|
||||
.navigationTitle("Servers")
|
||||
.onChange(of: selectedServerID) {
|
||||
@@ -79,7 +80,15 @@ struct MainView: View {
|
||||
} detail: {
|
||||
if let selectedServerID,
|
||||
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 {
|
||||
ContentUnavailableView("No Server Selected", systemImage: "server.rack")
|
||||
}
|
||||
@@ -106,12 +115,9 @@ struct MainView: View {
|
||||
}
|
||||
Button("Cancel", role: .cancel) {}
|
||||
}
|
||||
.onReceive(refreshTimer) { _ in
|
||||
for server in servers {
|
||||
fetchServerInfo(for: server.id)
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
requestNotificationPermissions()
|
||||
|
||||
let initialID: UUID?
|
||||
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
||||
let uuid = UUID(uuidString: storedID),
|
||||
@@ -133,9 +139,14 @@ struct MainView: View {
|
||||
await prefetchOtherServers(activeID: initialID)
|
||||
}
|
||||
}
|
||||
pingAllServers()
|
||||
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
||||
pingAllServers()
|
||||
setupTimers()
|
||||
}
|
||||
.onChange(of: pingInterval) { _, _ in
|
||||
setupPingTimer()
|
||||
}
|
||||
.onChange(of: refreshInterval) { oldValue, newValue in
|
||||
if oldValue != newValue {
|
||||
setupRefreshTimer()
|
||||
}
|
||||
}
|
||||
.frame(minWidth: 800, minHeight: 450)
|
||||
@@ -168,6 +179,7 @@ struct MainView: View {
|
||||
var updated = servers[index]
|
||||
updated.info = info
|
||||
servers[index] = updated
|
||||
checkServiceStatusChanges(for: server.hostname, newInfo: info)
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
@@ -228,13 +240,34 @@ struct MainView: View {
|
||||
for (index, server) in servers.enumerated() {
|
||||
Task {
|
||||
let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
||||
let pingable = await PingService.ping(hostname: server.hostname, apiKey: apiKey)
|
||||
let pingable = await PingService.ping(hostname: server.hostname, apiKey: apiKey, notificationsEnabled: enableStatusNotifications)
|
||||
await MainActor.run {
|
||||
servers[index].pingable = pingable
|
||||
}
|
||||
if !pingable {
|
||||
print("📶 [MainView] Ping \(server.hostname): offline")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func setupTimers() {
|
||||
setupPingTimer()
|
||||
setupRefreshTimer()
|
||||
}
|
||||
|
||||
private func setupPingTimer() {
|
||||
pingTimer?.invalidate()
|
||||
pingAllServers()
|
||||
pingTimer = Timer.scheduledTimer(withTimeInterval: Double(pingInterval), repeats: true) { _ in
|
||||
pingAllServers()
|
||||
}
|
||||
}
|
||||
|
||||
private func setupRefreshTimer() {
|
||||
refreshSubscription?.cancel()
|
||||
refreshSubscription = nil
|
||||
refreshTimer = Timer.publish(every: Double(refreshInterval), on: .main, in: .common)
|
||||
refreshSubscription = refreshTimer?.autoconnect().sink { _ in
|
||||
for server in servers {
|
||||
fetchServerInfo(for: server.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -265,6 +298,127 @@ struct MainView: View {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
private func requestNotificationPermissions() {
|
||||
Task {
|
||||
do {
|
||||
try await UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound])
|
||||
} catch {
|
||||
print("❌ [MainView] Failed to request notification permissions: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func checkServiceStatusChanges(for hostname: String, newInfo: ServerInfo) {
|
||||
guard let ports = newInfo.ports else { return }
|
||||
|
||||
for port in ports {
|
||||
let key = "\(hostname)-\(port.id)"
|
||||
let previousStatus = previousServiceStates[key]
|
||||
let currentStatus = port.status
|
||||
|
||||
previousServiceStates[key] = currentStatus
|
||||
|
||||
if let previousStatus, previousStatus != currentStatus {
|
||||
if currentStatus == "offline" && enableStatusNotifications {
|
||||
sendServiceNotification(service: port.service, hostname: hostname, status: "offline")
|
||||
} else if currentStatus == "online" && previousStatus == "offline" && enableStatusNotifications {
|
||||
sendServiceNotification(service: port.service, hostname: hostname, status: "online")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func sendServiceNotification(service: String, hostname: String, status: String) {
|
||||
let content = UNMutableNotificationContent()
|
||||
content.title = "\(service) \(status.uppercased())"
|
||||
content.body = "\(service) on \(hostname) is \(status)"
|
||||
content.sound = .default
|
||||
|
||||
let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
|
||||
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)
|
||||
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) {
|
||||
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 {
|
||||
|
||||
@@ -23,6 +23,7 @@ struct PreferencesView: View {
|
||||
}
|
||||
}
|
||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||
@Environment(\.colorScheme) private var colorScheme
|
||||
|
||||
@AppStorage("pingInterval") private var storedPingInterval: Int = 10
|
||||
@AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
|
||||
@@ -143,12 +144,39 @@ struct PreferencesView: View {
|
||||
}
|
||||
private func backgroundColor(for tab: Tab) -> Color {
|
||||
if selection == tab {
|
||||
return Color.accentColor
|
||||
return sidebarSelectionColor
|
||||
}
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -252,11 +280,6 @@ private struct UpdatesPreferencesView: View {
|
||||
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)
|
||||
@@ -265,19 +288,18 @@ private struct UpdatesPreferencesView: View {
|
||||
}
|
||||
|
||||
private struct NotificationsPreferencesView: View {
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
Text("Notifications")
|
||||
.font(.headline)
|
||||
.padding(.bottom)
|
||||
@AppStorage("enableStatusNotifications") private var enableStatusNotifications: Bool = true
|
||||
@AppStorage("enableAlertNotifications") private var enableAlertNotifications: Bool = true
|
||||
|
||||
Text("Configure notification behavior here.")
|
||||
.foregroundColor(.secondary)
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 18) {
|
||||
Toggle("Status Notifications", isOn: $enableStatusNotifications)
|
||||
Toggle("Alert Notifications", isOn: $enableAlertNotifications)
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.toggleStyle(.switch)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,16 +7,28 @@
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct ServerActionFeedback: Identifiable {
|
||||
let id = UUID()
|
||||
let title: String
|
||||
let message: String
|
||||
}
|
||||
|
||||
struct ServerDetailView: View {
|
||||
@Binding var server: Server
|
||||
var isFetching: Bool
|
||||
var canRestart: Bool = false
|
||||
var isRestarting: Bool = false
|
||||
var onRestart: (() async -> ServerActionFeedback)? = nil
|
||||
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
||||
|
||||
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
|
||||
|
||||
private var showPlaceholder: Bool {
|
||||
server.info == nil
|
||||
}
|
||||
|
||||
|
||||
@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()
|
||||
|
||||
var body: some View {
|
||||
@@ -32,7 +44,13 @@ struct ServerDetailView: View {
|
||||
VStack(spacing: 0) {
|
||||
Spacer().frame(height: 6)
|
||||
TabView {
|
||||
GeneralView(server: resolvedBinding)
|
||||
GeneralView(
|
||||
server: resolvedBinding,
|
||||
canRestart: canRestart,
|
||||
isRestarting: isRestarting
|
||||
) {
|
||||
showRestartSheet = true
|
||||
}
|
||||
.tabItem {
|
||||
Text("General").unredacted()
|
||||
}
|
||||
@@ -56,13 +74,43 @@ struct ServerDetailView: View {
|
||||
}
|
||||
.padding(0)
|
||||
}
|
||||
.overlay(alignment: .bottomTrailing) {
|
||||
if let feedback = restartFeedback {
|
||||
RestartFeedbackBanner(
|
||||
feedback: feedback,
|
||||
onDismiss: {
|
||||
restartFeedback = nil
|
||||
}
|
||||
)
|
||||
.padding()
|
||||
}
|
||||
}
|
||||
.onReceive(timer) { _ in
|
||||
guard showIntervalIndicator else { return }
|
||||
withAnimation(.linear(duration: 1.0 / 60.0)) {
|
||||
progress += 1.0 / (60.0 * 60.0)
|
||||
progress += 1.0 / (Double(refreshInterval) * 60.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> {
|
||||
@@ -80,7 +128,8 @@ struct ServerDetailView: View {
|
||||
#Preview {
|
||||
ServerDetailView(
|
||||
server: .constant(Server(id: UUID(), hostname: "preview.example.com", info: ServerInfo.placeholder)),
|
||||
isFetching: false
|
||||
isFetching: false,
|
||||
canRestart: true
|
||||
)
|
||||
}
|
||||
|
||||
@@ -96,3 +145,67 @@ private struct LoadingBadge: View {
|
||||
.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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,6 +20,8 @@ struct ServerFormView: View {
|
||||
@State private var hostname: String
|
||||
@State private var apiKey: String
|
||||
@State private var connectionOK: Bool = false
|
||||
@State private var testingConnection: Bool = false
|
||||
@State private var connectionError: String = ""
|
||||
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
|
||||
@@ -55,6 +57,12 @@ struct ServerFormView: View {
|
||||
SecureField("API Key", text: $apiKey)
|
||||
.textFieldStyle(RoundedBorderTextFieldStyle())
|
||||
|
||||
if !connectionError.isEmpty {
|
||||
Text(connectionError)
|
||||
.foregroundColor(.red)
|
||||
.font(.caption)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Button("Cancel") {
|
||||
dismiss()
|
||||
@@ -65,6 +73,8 @@ struct ServerFormView: View {
|
||||
await testConnection()
|
||||
}
|
||||
}
|
||||
.disabled(hostname.isEmpty || apiKey.isEmpty || testingConnection)
|
||||
|
||||
Button("Save") {
|
||||
saveServer()
|
||||
updateServer()
|
||||
@@ -102,9 +112,21 @@ struct ServerFormView: View {
|
||||
let host = hostname.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let key = apiKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
|
||||
await MainActor.run {
|
||||
testingConnection = true
|
||||
connectionError = ""
|
||||
}
|
||||
|
||||
let reachable = await PingService.ping(hostname: host, apiKey: key)
|
||||
await MainActor.run {
|
||||
connectionOK = reachable
|
||||
testingConnection = false
|
||||
if reachable {
|
||||
connectionOK = true
|
||||
connectionError = ""
|
||||
} else {
|
||||
connectionOK = false
|
||||
connectionError = "Connection failed. Check hostname and API key."
|
||||
}
|
||||
}
|
||||
//
|
||||
// guard let url = URL(string: "https://\(host)/api/v2/ping") else {
|
||||
|
||||
@@ -9,6 +9,9 @@ import SwiftUI
|
||||
|
||||
struct GeneralView: View {
|
||||
@Binding var server: Server
|
||||
var canRestart: Bool = false
|
||||
var isRestarting: Bool = false
|
||||
var onRestart: (() -> Void)? = nil
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
@@ -117,6 +120,33 @@ struct GeneralView: View {
|
||||
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()
|
||||
.frame(minHeight: geometry.size.height, alignment: .top)
|
||||
@@ -132,7 +162,7 @@ struct GeneralView: View {
|
||||
@State var previewServer = Server(hostname: "example.com", info: .placeholder)
|
||||
|
||||
var body: some View {
|
||||
GeneralView(server: $previewServer)
|
||||
GeneralView(server: $previewServer, canRestart: true)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,10 @@ import SwiftUI
|
||||
struct ResourcesView: View {
|
||||
@Binding var server: Server
|
||||
|
||||
private var displayInfo: ServerInfo {
|
||||
server.info ?? .placeholder
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
ScrollView {
|
||||
@@ -25,40 +29,40 @@ struct ResourcesView: View {
|
||||
Text("CPU Load")
|
||||
} value: {
|
||||
LoadBarCell(
|
||||
percent: (server.info?.load.percent)!,
|
||||
load1: (server.info?.load.minute1)!,
|
||||
load5: (server.info?.load.minute5)!,
|
||||
load15: (server.info?.load.minute15)!
|
||||
percent: displayInfo.load.percent,
|
||||
load1: displayInfo.load.minute1,
|
||||
load5: displayInfo.load.minute5,
|
||||
load15: displayInfo.load.minute15
|
||||
)
|
||||
}
|
||||
TableRowView {
|
||||
Text("Memory")
|
||||
} value: {
|
||||
UsageBarCell(
|
||||
free: (server.info?.memory.free)!,
|
||||
used: (server.info?.memory.used)!,
|
||||
total: (server.info?.memory.total)!,
|
||||
percent: (server.info?.memory.percent)!
|
||||
free: displayInfo.memory.free,
|
||||
used: displayInfo.memory.used,
|
||||
total: displayInfo.memory.total,
|
||||
percent: displayInfo.memory.percent
|
||||
)
|
||||
}
|
||||
TableRowView {
|
||||
Text("Swap")
|
||||
} value: {
|
||||
UsageBarCell(
|
||||
free: (server.info?.swap.free)!,
|
||||
used: (server.info?.swap.used)!,
|
||||
total: (server.info?.swap.total)!,
|
||||
percent: (server.info?.swap.percent)!
|
||||
free: displayInfo.swap.free,
|
||||
used: displayInfo.swap.used,
|
||||
total: displayInfo.swap.total,
|
||||
percent: displayInfo.swap.percent
|
||||
)
|
||||
}
|
||||
TableRowView {
|
||||
Text("SSD")
|
||||
} value: {
|
||||
UsageBarCell(
|
||||
free: (server.info?.diskSpace.free)!,
|
||||
used: (server.info?.diskSpace.used)!,
|
||||
total: (server.info?.diskSpace.total)!,
|
||||
percent: (server.info?.diskSpace.percent)!
|
||||
free: displayInfo.diskSpace.free,
|
||||
used: displayInfo.diskSpace.used,
|
||||
total: displayInfo.diskSpace.total,
|
||||
percent: displayInfo.diskSpace.percent
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
30
Sparkle/appcast.xml
vendored
30
Sparkle/appcast.xml
vendored
@@ -3,28 +3,28 @@
|
||||
<channel>
|
||||
<title>iKeyMon</title>
|
||||
<item>
|
||||
<title>26.0.31</title>
|
||||
<pubDate>Sun, 07 Dec 2025 17:52:44 +0100</pubDate>
|
||||
<sparkle:version>65</sparkle:version>
|
||||
<sparkle:shortVersionString>26.0.31</sparkle:shortVersionString>
|
||||
<title>26.1.7</title>
|
||||
<pubDate>Sun, 19 Apr 2026 16:54:42 +0200</pubDate>
|
||||
<sparkle:version>177</sparkle:version>
|
||||
<sparkle:shortVersionString>26.1.7</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.31/iKeyMon-26.0.31.zip" length="4811475" type="application/octet-stream" sparkle:edSignature="zFNwVms0WwT5CBYX1GjtVg1qKbxoCVvv2DKXoTGZmwx+crg0B1fk3Ytu9K+6yTfbwQYsRISst9g3InMAlJS6BQ=="/>
|
||||
<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>
|
||||
<title>26.0.29</title>
|
||||
<pubDate>Sun, 07 Dec 2025 17:07:32 +0100</pubDate>
|
||||
<sparkle:version>61</sparkle:version>
|
||||
<sparkle:shortVersionString>26.0.29</sparkle:shortVersionString>
|
||||
<title>26.1.6</title>
|
||||
<pubDate>Sun, 19 Apr 2026 15:26:19 +0200</pubDate>
|
||||
<sparkle:version>175</sparkle:version>
|
||||
<sparkle:shortVersionString>26.1.6</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.29/iKeyMon-26.0.29.zip" length="4811507" type="application/octet-stream" sparkle:edSignature="eRH4M8hEYa9gYiyjAVtTpXN3T1o+OGadDRMQu4kHL/dbJ2vj/5pY1+am9/9qG33Qairt3Od/6/WKLyxxs4mWCw=="/>
|
||||
<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>
|
||||
<title>26.0.28</title>
|
||||
<pubDate>Sun, 07 Dec 2025 17:02:18 +0100</pubDate>
|
||||
<sparkle:version>59</sparkle:version>
|
||||
<sparkle:shortVersionString>26.0.28</sparkle:shortVersionString>
|
||||
<title>26.1.5</title>
|
||||
<pubDate>Sun, 19 Apr 2026 12:09:33 +0200</pubDate>
|
||||
<sparkle:version>173</sparkle:version>
|
||||
<sparkle:shortVersionString>26.1.5</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.28/iKeyMon-26.0.28.zip" length="4811473" type="application/octet-stream" sparkle:edSignature="tF188T0m/j22MStCVbVkrf2JllyZ9wiEmc++kgF4GTKhoAuHURYvT/Euy+ivEodmQ/LzeFolN4lViqaVa3y+DQ=="/>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.5/iKeyMon-26.1.5.zip" length="3065231" type="application/octet-stream" sparkle:edSignature="HVV7iZ4eyJC1VMh2q4GUoAESZnk4HoFU00QlA9qM4X4dJAT5oBEVB55m4wuF4u9iVFAeohkB0vleLlV39mxrBA=="/>
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
@@ -4,13 +4,19 @@ set -euo pipefail
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
REMOTE_NAME="${1:-origin}"
|
||||
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
|
||||
echo "release: skipped (SKIP_RELEASE=1)"
|
||||
exit 0
|
||||
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
|
||||
release_local_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"
|
||||
|
||||
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
|
||||
run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
|
||||
echo "release: commit failed (log: $RELEASE_LOG)"
|
||||
@@ -75,10 +82,5 @@ else
|
||||
}
|
||||
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: success v${NEW_VERSION}"
|
||||
exit 1
|
||||
else
|
||||
echo "release: push failed (log: $RELEASE_LOG)"
|
||||
exit 1
|
||||
fi
|
||||
echo "release: created commit for v${NEW_VERSION}; run 'git push' again to push the new release commit"
|
||||
exit 1
|
||||
|
||||
@@ -6,5 +6,7 @@
|
||||
<string>https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml</string>
|
||||
<key>SUPublicEDKey</key>
|
||||
<string>EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=</string>
|
||||
<key>SUEnableInstallerLauncherService</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -3,10 +3,12 @@
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.app-sandbox</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-only</key>
|
||||
<true/>
|
||||
<false/>
|
||||
<key>com.apple.security.network.client</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.downloads.read-write</key>
|
||||
<true/>
|
||||
<key>com.apple.security.files.user-selected.read-write</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -322,7 +322,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 65;
|
||||
CURRENT_PROJECT_VERSION = 177;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -337,7 +337,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 26.0.31;
|
||||
MARKETING_VERSION = 26.1.7;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
@@ -353,7 +353,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 65;
|
||||
CURRENT_PROJECT_VERSION = 177;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -368,7 +368,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 26.0.31;
|
||||
MARKETING_VERSION = 26.1.7;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
|
||||
@@ -3,6 +3,7 @@ set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
BUILD_DIR="$ROOT_DIR/build"
|
||||
DERIVED_DATA_DIR="$BUILD_DIR/derived-data"
|
||||
ARTIFACTS_DIR="$ROOT_DIR/dist"
|
||||
SCHEME="iKeyMon"
|
||||
PROJECT="iKeyMon.xcodeproj"
|
||||
@@ -141,24 +142,32 @@ export SPARKLE_APPCAST_OUTPUT
|
||||
|
||||
"$ROOT_DIR/scripts/sync_version.sh"
|
||||
|
||||
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||
mkdir -p "$ARTIFACTS_DIR"
|
||||
rm -rf "$DERIVED_DATA_DIR" "$ARTIFACTS_DIR"
|
||||
mkdir -p "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||
|
||||
xcodebuild \
|
||||
-project "$ROOT_DIR/$PROJECT" \
|
||||
-scheme "$SCHEME" \
|
||||
-configuration Release \
|
||||
-derivedDataPath "$BUILD_DIR" \
|
||||
-derivedDataPath "$DERIVED_DATA_DIR" \
|
||||
CODE_SIGNING_ALLOWED=NO \
|
||||
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
|
||||
echo "❌ Failed to find built app at $APP_PATH"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -n "${CODESIGN_IDENTITY:-}" ]]; then
|
||||
echo "🔏 Codesigning Sparkle framework..."
|
||||
codesign \
|
||||
--force \
|
||||
--options runtime \
|
||||
--timestamp \
|
||||
--sign "$CODESIGN_IDENTITY" \
|
||||
"$APP_PATH/Contents/Frameworks/Sparkle.framework"
|
||||
|
||||
echo "🔏 Codesigning app with identity: $CODESIGN_IDENTITY"
|
||||
codesign \
|
||||
--deep \
|
||||
@@ -189,9 +198,7 @@ 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
|
||||
ditto -c -k --keepParent "$APP_PATH" "$ARTIFACTS_DIR/$ZIP_NAME"
|
||||
|
||||
DMG_NAME="iKeyMon-${VERSION}.dmg"
|
||||
hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
|
||||
@@ -209,8 +216,10 @@ 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"
|
||||
"$ROOT_DIR/scripts/update_homebrew_tap.sh" "$VERSION" "$ARTIFACTS_DIR/$DMG_NAME"
|
||||
else
|
||||
echo "ℹ️ Skipping Gitea release publishing (GITEA_* variables not fully set)."
|
||||
echo "ℹ️ Skipping Homebrew tap update because release publishing was skipped."
|
||||
fi
|
||||
|
||||
echo "✅ Build complete. Artifacts:"
|
||||
|
||||
@@ -15,20 +15,49 @@ 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}"
|
||||
CHANGELOG_FILE="$ROOT_DIR/CHANGELOG.md"
|
||||
|
||||
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}"
|
||||
# Extract changelog for this version
|
||||
extract_changelog() {
|
||||
local version="$1"
|
||||
local changelog_file="$2"
|
||||
|
||||
if [[ ! -f "$changelog_file" ]]; then
|
||||
echo ""
|
||||
return
|
||||
fi
|
||||
|
||||
awk -v ver="## $version" '
|
||||
/^## / {
|
||||
if (found) exit
|
||||
if ($0 ~ ver) {
|
||||
found=1
|
||||
next
|
||||
}
|
||||
}
|
||||
found { print }
|
||||
' "$changelog_file"
|
||||
}
|
||||
|
||||
CHANGELOG_BODY="$(extract_changelog "$VERSION" "$CHANGELOG_FILE")"
|
||||
if [[ -z "$CHANGELOG_BODY" ]]; then
|
||||
CHANGELOG_BODY="See commit history for details."
|
||||
fi
|
||||
|
||||
PRERELEASE_FLAG="${GITEA_PRERELEASE:-false}"
|
||||
|
||||
create_payload="$(jq -n \
|
||||
--arg tag "$RELEASE_TAG" \
|
||||
--arg name "iKeyMon ${VERSION}" \
|
||||
--arg target "$TARGET_COMMIT" \
|
||||
--arg body "$CHANGELOG_BODY" \
|
||||
--argjson prerelease "$PRERELEASE_FLAG" \
|
||||
'{ tag_name: $tag, name: $name, target_commitish: $target, draft: false, prerelease: $prerelease }')"
|
||||
'{ tag_name: $tag, name: $name, target_commitish: $target, body: $body, draft: false, prerelease: $prerelease }')"
|
||||
|
||||
response_file="$(mktemp)"
|
||||
http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \
|
||||
|
||||
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.0.31"
|
||||
"marketing_version": "26.1.7"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user