Compare commits
97 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 |
22
CHANGELOG.md
22
CHANGELOG.md
@@ -1,6 +1,24 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Unreleased
|
|
||||||
|
## 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.
|
- 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.
|
- 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.
|
- Migrated the updated API layer and unified `ServerInfo` model from the previous branch.
|
||||||
@@ -10,5 +28,5 @@
|
|||||||
- Introduced repository-wide version management via `version.json` + `scripts/sync_version.sh`, ensuring Xcode targets and release artifacts stay aligned.
|
- 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.
|
- 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.
|
- 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.
|
- Further reduced MainView console noise by removing redundant refresh/onAppear logs.
|
||||||
|
|||||||
2
NOTES.md
2
NOTES.md
@@ -5,5 +5,3 @@
|
|||||||
|
|
||||||
add a marker for "reboot required"
|
add a marker for "reboot required"
|
||||||
|
|
||||||
dummy22
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
import UserNotifications
|
||||||
|
|
||||||
enum PingService {
|
enum PingService {
|
||||||
static func ping(hostname: String, apiKey: String) async -> Bool {
|
private static var previousPingStates: [String: Bool] = [:]
|
||||||
|
|
||||||
|
static func ping(hostname: String, apiKey: String, notificationsEnabled: Bool = true) async -> Bool {
|
||||||
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,17 +21,49 @@ enum PingService {
|
|||||||
if let responseString = String(data: data, encoding: .utf8) {
|
if let responseString = String(data: data, encoding: .utf8) {
|
||||||
print("❌ [PingService] HTTP \(httpResponse.statusCode): \(responseString)")
|
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)
|
||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
|
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
print("❌ [PingService] Error pinging \(hostname): \(error)")
|
print("❌ [PingService] Error pinging \(hostname): \(error)")
|
||||||
|
handlePingFailure(for: hostname, notificationsEnabled: notificationsEnabled)
|
||||||
return false
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
|||||||
}()
|
}()
|
||||||
private let logger = Logger(subsystem: "net.24unix.iKeyMon", category: "Sparkle")
|
private let logger = Logger(subsystem: "net.24unix.iKeyMon", category: "Sparkle")
|
||||||
private let verboseLogging: Bool
|
private let verboseLogging: Bool
|
||||||
|
@Published var logMessages: [String] = []
|
||||||
|
|
||||||
override init() {
|
override init() {
|
||||||
self.verboseLogging = ProcessInfo.processInfo.environment["SPARKLE_VERBOSE_LOGGING"] == "1"
|
self.verboseLogging = ProcessInfo.processInfo.environment["SPARKLE_VERBOSE_LOGGING"] == "1"
|
||||||
@@ -34,6 +35,7 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
|||||||
|
|
||||||
private func log(_ message: String) {
|
private func log(_ message: String) {
|
||||||
logger.log("\(message, privacy: .public)")
|
logger.log("\(message, privacy: .public)")
|
||||||
|
addLogMessage("[INFO] \(message)")
|
||||||
if verboseLogging {
|
if verboseLogging {
|
||||||
print("[Sparkle] \(message)")
|
print("[Sparkle] \(message)")
|
||||||
}
|
}
|
||||||
@@ -41,11 +43,21 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
|||||||
|
|
||||||
private func logError(_ message: String) {
|
private func logError(_ message: String) {
|
||||||
logger.error("\(message, privacy: .public)")
|
logger.error("\(message, privacy: .public)")
|
||||||
|
addLogMessage("[ERROR] \(message)")
|
||||||
if verboseLogging {
|
if verboseLogging {
|
||||||
fputs("[Sparkle][error] \(message)\n", stderr)
|
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 {
|
private func describe(update item: SUAppcastItem) -> String {
|
||||||
let short = item.displayVersionString
|
let short = item.displayVersionString
|
||||||
let build = item.versionString
|
let build = item.versionString
|
||||||
@@ -53,41 +65,63 @@ final class SparkleUpdater: NSObject, ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@MainActor
|
|
||||||
extension SparkleUpdater: SPUUpdaterDelegate {
|
extension SparkleUpdater: SPUUpdaterDelegate {
|
||||||
func updater(_ updater: SPUUpdater, didFinishLoading appcast: SUAppcast) {
|
nonisolated func updater(_ updater: SPUUpdater, didFinishLoading appcast: SUAppcast) {
|
||||||
log("Loaded Sparkle appcast containing \(appcast.items.count) item(s).")
|
Task { @MainActor in
|
||||||
|
log("Loaded Sparkle appcast containing \(appcast.items.count) item(s).")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {
|
nonisolated func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {
|
||||||
log("Found valid update \(describe(update: item))")
|
Task { @MainActor in
|
||||||
|
log("Found valid update \(describe(update: item))")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updaterDidNotFindUpdate(_ updater: SPUUpdater) {
|
nonisolated func updaterDidNotFindUpdate(_ updater: SPUUpdater) {
|
||||||
log("No updates available.")
|
Task { @MainActor in
|
||||||
|
log("No updates available.")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updater(_ updater: SPUUpdater, willDownloadUpdate item: SUAppcastItem, with request: NSMutableURLRequest) {
|
nonisolated func updater(_ updater: SPUUpdater, willDownloadUpdate item: SUAppcastItem, with request: NSMutableURLRequest) {
|
||||||
log("Downloading \(describe(update: item)) from \(request.url?.absoluteString ?? "unknown URL")")
|
Task { @MainActor in
|
||||||
|
log("Downloading \(describe(update: item)) from \(request.url?.absoluteString ?? "unknown URL")")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updater(_ updater: SPUUpdater, didDownloadUpdate item: SUAppcastItem) {
|
nonisolated func updater(_ updater: SPUUpdater, didDownloadUpdate item: SUAppcastItem) {
|
||||||
log("Finished downloading \(describe(update: item))")
|
Task { @MainActor in
|
||||||
|
log("Finished downloading \(describe(update: item))")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updater(_ updater: SPUUpdater, failedToDownloadUpdate item: SUAppcastItem, error: Error) {
|
nonisolated func updater(_ updater: SPUUpdater, failedToDownloadUpdate item: SUAppcastItem, error: Error) {
|
||||||
logError("Failed to download \(describe(update: item)): \(error.localizedDescription)")
|
Task { @MainActor in
|
||||||
|
logError("Failed to download \(describe(update: item)): \(error.localizedDescription)")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func userDidCancelDownload(_ updater: SPUUpdater) {
|
nonisolated func userDidCancelDownload(_ updater: SPUUpdater) {
|
||||||
log("User cancelled Sparkle download.")
|
Task { @MainActor in
|
||||||
|
log("User cancelled Sparkle download.")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updater(_ updater: SPUUpdater, willInstallUpdate item: SUAppcastItem) {
|
nonisolated func updater(_ updater: SPUUpdater, willInstallUpdate item: SUAppcastItem) {
|
||||||
log("Will install update \(describe(update: item))")
|
Task { @MainActor in
|
||||||
|
log("Will install update \(describe(update: item))")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func updater(_ updater: SPUUpdater, didAbortWithError error: Error) {
|
nonisolated func updater(_ updater: SPUUpdater, didAbortWithError error: Error) {
|
||||||
logError("Sparkle aborted: \(error.localizedDescription)")
|
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,28 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
import Combine
|
||||||
|
import UserNotifications
|
||||||
|
|
||||||
struct MainView: View {
|
struct MainView: View {
|
||||||
|
|
||||||
private static let serverOrderKeyStatic = "serverOrder"
|
private static let serverOrderKeyStatic = "serverOrder"
|
||||||
private static let storedServersKeyStatic = "storedServers"
|
private static let storedServersKeyStatic = "storedServers"
|
||||||
|
|
||||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
|
||||||
@State var showAddServerSheet: Bool = false
|
@State var showAddServerSheet: Bool = false
|
||||||
@State private var serverBeingEdited: Server?
|
@State private var serverBeingEdited: Server?
|
||||||
@State private var serverToDelete: Server?
|
@State private var serverToDelete: Server?
|
||||||
@State private var showDeleteConfirmation = false
|
@State private var showDeleteConfirmation = false
|
||||||
@State private var isFetchingInfo: Bool = false
|
@State private var isFetchingInfo: Bool = false
|
||||||
@State private var refreshTimer = Timer.publish(every: 60, on: .main, in: .common).autoconnect()
|
@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 pingTimer: Timer?
|
||||||
|
@State private var lastRefreshInterval: Int?
|
||||||
|
@State private var previousServiceStates: [String: String] = [:]
|
||||||
private let serverOrderKey = MainView.serverOrderKeyStatic
|
private let serverOrderKey = MainView.serverOrderKeyStatic
|
||||||
private let storedServersKey = MainView.storedServersKeyStatic
|
private let storedServersKey = MainView.storedServersKeyStatic
|
||||||
|
|
||||||
@@ -60,14 +68,6 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
.help("Add Host")
|
.help("Add Host")
|
||||||
}
|
}
|
||||||
ToolbarItem {
|
|
||||||
Button {
|
|
||||||
sparkleUpdater.checkForUpdates()
|
|
||||||
} label: {
|
|
||||||
Image(systemName: "square.and.arrow.down")
|
|
||||||
}
|
|
||||||
.help("Check for Updates")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.navigationTitle("Servers")
|
.navigationTitle("Servers")
|
||||||
.onChange(of: selectedServerID) {
|
.onChange(of: selectedServerID) {
|
||||||
@@ -106,12 +106,9 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
Button("Cancel", role: .cancel) {}
|
Button("Cancel", role: .cancel) {}
|
||||||
}
|
}
|
||||||
.onReceive(refreshTimer) { _ in
|
|
||||||
for server in servers {
|
|
||||||
fetchServerInfo(for: server.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.onAppear {
|
.onAppear {
|
||||||
|
requestNotificationPermissions()
|
||||||
|
|
||||||
let initialID: UUID?
|
let initialID: UUID?
|
||||||
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
||||||
let uuid = UUID(uuidString: storedID),
|
let uuid = UUID(uuidString: storedID),
|
||||||
@@ -133,9 +130,14 @@ struct MainView: View {
|
|||||||
await prefetchOtherServers(activeID: initialID)
|
await prefetchOtherServers(activeID: initialID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pingAllServers()
|
setupTimers()
|
||||||
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
}
|
||||||
pingAllServers()
|
.onChange(of: pingInterval) { _, _ in
|
||||||
|
setupPingTimer()
|
||||||
|
}
|
||||||
|
.onChange(of: refreshInterval) { oldValue, newValue in
|
||||||
|
if oldValue != newValue {
|
||||||
|
setupRefreshTimer()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.frame(minWidth: 800, minHeight: 450)
|
.frame(minWidth: 800, minHeight: 450)
|
||||||
@@ -168,6 +170,7 @@ struct MainView: View {
|
|||||||
var updated = servers[index]
|
var updated = servers[index]
|
||||||
updated.info = info
|
updated.info = info
|
||||||
servers[index] = updated
|
servers[index] = updated
|
||||||
|
checkServiceStatusChanges(for: server.hostname, newInfo: info)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
@@ -228,7 +231,7 @@ struct MainView: View {
|
|||||||
for (index, server) in servers.enumerated() {
|
for (index, server) in servers.enumerated() {
|
||||||
Task {
|
Task {
|
||||||
let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
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 {
|
await MainActor.run {
|
||||||
servers[index].pingable = pingable
|
servers[index].pingable = pingable
|
||||||
}
|
}
|
||||||
@@ -239,6 +242,30 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static func loadStoredServers() -> [Server] {
|
private static func loadStoredServers() -> [Server] {
|
||||||
let defaults = UserDefaults.standard
|
let defaults = UserDefaults.standard
|
||||||
guard let data = defaults.data(forKey: storedServersKeyStatic) else {
|
guard let data = defaults.data(forKey: storedServersKeyStatic) else {
|
||||||
@@ -265,6 +292,46 @@ struct MainView: View {
|
|||||||
return []
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
|
|||||||
@@ -252,11 +252,6 @@ private struct UpdatesPreferencesView: View {
|
|||||||
Label("Check for Updates Now", systemImage: "sparkles")
|
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()
|
Spacer()
|
||||||
}
|
}
|
||||||
.toggleStyle(.switch)
|
.toggleStyle(.switch)
|
||||||
@@ -265,19 +260,18 @@ private struct UpdatesPreferencesView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private struct NotificationsPreferencesView: View {
|
private struct NotificationsPreferencesView: View {
|
||||||
var body: some View {
|
@AppStorage("enableStatusNotifications") private var enableStatusNotifications: Bool = true
|
||||||
VStack(alignment: .leading, spacing: 12) {
|
@AppStorage("enableAlertNotifications") private var enableAlertNotifications: Bool = true
|
||||||
Text("Notifications")
|
|
||||||
.font(.headline)
|
|
||||||
.padding(.bottom)
|
|
||||||
|
|
||||||
Text("Configure notification behavior here.")
|
var body: some View {
|
||||||
.foregroundColor(.secondary)
|
VStack(alignment: .leading, spacing: 18) {
|
||||||
|
Toggle("Status Notifications", isOn: $enableStatusNotifications)
|
||||||
|
Toggle("Alert Notifications", isOn: $enableAlertNotifications)
|
||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
}
|
}
|
||||||
|
.toggleStyle(.switch)
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
.padding()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,12 @@ struct ServerDetailView: View {
|
|||||||
@Binding var server: Server
|
@Binding var server: Server
|
||||||
var isFetching: Bool
|
var isFetching: Bool
|
||||||
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
||||||
|
@AppStorage("refreshInterval") private var refreshInterval: Int = 60
|
||||||
|
|
||||||
private var showPlaceholder: Bool {
|
private var showPlaceholder: Bool {
|
||||||
server.info == nil
|
server.info == nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@State private var progress: Double = 0
|
@State private var progress: Double = 0
|
||||||
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()
|
||||||
|
|
||||||
@@ -59,7 +60,7 @@ struct ServerDetailView: View {
|
|||||||
.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)) {
|
||||||
progress += 1.0 / (60.0 * 60.0)
|
progress += 1.0 / (Double(refreshInterval) * 60.0)
|
||||||
if progress >= 1 { progress = 0 }
|
if progress >= 1 { progress = 0 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ struct ServerFormView: View {
|
|||||||
@State private var hostname: String
|
@State private var hostname: String
|
||||||
@State private var apiKey: String
|
@State private var apiKey: String
|
||||||
@State private var connectionOK: Bool = false
|
@State private var connectionOK: Bool = false
|
||||||
|
@State private var testingConnection: Bool = false
|
||||||
|
@State private var connectionError: String = ""
|
||||||
|
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
|
|
||||||
@@ -55,6 +57,12 @@ struct ServerFormView: View {
|
|||||||
SecureField("API Key", text: $apiKey)
|
SecureField("API Key", text: $apiKey)
|
||||||
.textFieldStyle(RoundedBorderTextFieldStyle())
|
.textFieldStyle(RoundedBorderTextFieldStyle())
|
||||||
|
|
||||||
|
if !connectionError.isEmpty {
|
||||||
|
Text(connectionError)
|
||||||
|
.foregroundColor(.red)
|
||||||
|
.font(.caption)
|
||||||
|
}
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Button("Cancel") {
|
Button("Cancel") {
|
||||||
dismiss()
|
dismiss()
|
||||||
@@ -65,6 +73,8 @@ struct ServerFormView: View {
|
|||||||
await testConnection()
|
await testConnection()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.disabled(hostname.isEmpty || apiKey.isEmpty || testingConnection)
|
||||||
|
|
||||||
Button("Save") {
|
Button("Save") {
|
||||||
saveServer()
|
saveServer()
|
||||||
updateServer()
|
updateServer()
|
||||||
@@ -102,9 +112,21 @@ struct ServerFormView: View {
|
|||||||
let host = hostname.trimmingCharacters(in: .whitespacesAndNewlines)
|
let host = hostname.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
let key = apiKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
let key = apiKey.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
|
|
||||||
|
await MainActor.run {
|
||||||
|
testingConnection = true
|
||||||
|
connectionError = ""
|
||||||
|
}
|
||||||
|
|
||||||
let reachable = await PingService.ping(hostname: host, apiKey: key)
|
let reachable = await PingService.ping(hostname: host, apiKey: key)
|
||||||
await MainActor.run {
|
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 {
|
// guard let url = URL(string: "https://\(host)/api/v2/ping") else {
|
||||||
|
|||||||
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.0.31</title>
|
<title>26.1.1</title>
|
||||||
<pubDate>Sun, 07 Dec 2025 17:52:44 +0100</pubDate>
|
<pubDate>Sat, 03 Jan 2026 16:34:21 +0100</pubDate>
|
||||||
<sparkle:version>65</sparkle:version>
|
<sparkle:version>162</sparkle:version>
|
||||||
<sparkle:shortVersionString>26.0.31</sparkle:shortVersionString>
|
<sparkle:shortVersionString>26.1.1</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.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.1/iKeyMon-26.1.1.zip" length="3007145" type="application/octet-stream" sparkle:edSignature="iIRDl2//fBGMkI0AwE5PzSOZO5fowONqEx/6EH3SLnWxj6LC0LQh+SifVAwpf4g5/zPEMXNrLl+CZB7LEz/HCw=="/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<title>26.0.29</title>
|
<title>26.0.70</title>
|
||||||
<pubDate>Sun, 07 Dec 2025 17:07:32 +0100</pubDate>
|
<pubDate>Sat, 03 Jan 2026 15:49:42 +0100</pubDate>
|
||||||
<sparkle:version>61</sparkle:version>
|
<sparkle:version>154</sparkle:version>
|
||||||
<sparkle:shortVersionString>26.0.29</sparkle:shortVersionString>
|
<sparkle:shortVersionString>26.0.70</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.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.0.70/iKeyMon-26.0.70.zip" length="3007098" type="application/octet-stream" sparkle:edSignature="XZA2xs40EZnexsv/DvzjiH2yiQACqlU+KSDFGqFQTgCTFEPxg6w/qx1cuolgHD3kQJm/svRTNYRR4OVYt9UQBA=="/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<title>26.0.28</title>
|
<title>26.0.69</title>
|
||||||
<pubDate>Sun, 07 Dec 2025 17:02:18 +0100</pubDate>
|
<pubDate>Sat, 03 Jan 2026 14:00:40 +0100</pubDate>
|
||||||
<sparkle:version>59</sparkle:version>
|
<sparkle:version>150</sparkle:version>
|
||||||
<sparkle:shortVersionString>26.0.28</sparkle:shortVersionString>
|
<sparkle:shortVersionString>26.0.69</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.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.0.69/iKeyMon-26.0.69.zip" length="2993457" type="application/octet-stream" sparkle:edSignature="cIqWamcPRsxA7zPaGcUuUOqLYs5KTcoAgXQkhblCF+Wc2tEnGHFVysARtMH68jGq7ObfhDuI3oZJNg857rQ0Dg=="/>
|
||||||
</item>
|
</item>
|
||||||
</channel>
|
</channel>
|
||||||
</rss>
|
</rss>
|
||||||
@@ -6,5 +6,7 @@
|
|||||||
<string>https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml</string>
|
<string>https://git.24unix.net/tracer/iKeyMon/raw/branch/master/Sparkle/appcast.xml</string>
|
||||||
<key>SUPublicEDKey</key>
|
<key>SUPublicEDKey</key>
|
||||||
<string>EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=</string>
|
<string>EgJgrOGQ79L5me616jA7kDCEOgx+Rg11uYLYLLIyzTI=</string>
|
||||||
|
<key>SUEnableInstallerLauncherService</key>
|
||||||
|
<false/>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@@ -3,10 +3,12 @@
|
|||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
<key>com.apple.security.app-sandbox</key>
|
<key>com.apple.security.app-sandbox</key>
|
||||||
<true/>
|
<false/>
|
||||||
<key>com.apple.security.files.user-selected.read-only</key>
|
|
||||||
<true/>
|
|
||||||
<key>com.apple.security.network.client</key>
|
<key>com.apple.security.network.client</key>
|
||||||
<true/>
|
<true/>
|
||||||
|
<key>com.apple.security.files.downloads.read-write</key>
|
||||||
|
<true/>
|
||||||
|
<key>com.apple.security.files.user-selected.read-write</key>
|
||||||
|
<true/>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@@ -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 = 65;
|
CURRENT_PROJECT_VERSION = 162;
|
||||||
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.0.31;
|
MARKETING_VERSION = 26.1.1;
|
||||||
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 = 65;
|
CURRENT_PROJECT_VERSION = 162;
|
||||||
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.0.31;
|
MARKETING_VERSION = 26.1.1;
|
||||||
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;
|
||||||
|
|||||||
@@ -159,6 +159,14 @@ if [[ ! -d "$APP_PATH" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${CODESIGN_IDENTITY:-}" ]]; then
|
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"
|
echo "🔏 Codesigning app with identity: $CODESIGN_IDENTITY"
|
||||||
codesign \
|
codesign \
|
||||||
--deep \
|
--deep \
|
||||||
@@ -189,9 +197,7 @@ print(data.get("marketing_version", "dev"))
|
|||||||
PY
|
PY
|
||||||
)"
|
)"
|
||||||
ZIP_NAME="iKeyMon-${VERSION}.zip"
|
ZIP_NAME="iKeyMon-${VERSION}.zip"
|
||||||
pushd "$(dirname "$APP_PATH")" >/dev/null
|
ditto -c -k --keepParent "$APP_PATH" "$ARTIFACTS_DIR/$ZIP_NAME"
|
||||||
zip -r "$ARTIFACTS_DIR/$ZIP_NAME" "$(basename "$APP_PATH")"
|
|
||||||
popd >/dev/null
|
|
||||||
|
|
||||||
DMG_NAME="iKeyMon-${VERSION}.dmg"
|
DMG_NAME="iKeyMon-${VERSION}.dmg"
|
||||||
hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
|
hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
|||||||
@@ -15,20 +15,49 @@ API_BASE="${GITEA_API_BASE:-https://git.24unix.net/api/v1}"
|
|||||||
API_BASE="${API_BASE%/}"
|
API_BASE="${API_BASE%/}"
|
||||||
RELEASE_TAG="v${VERSION}"
|
RELEASE_TAG="v${VERSION}"
|
||||||
API_URL="${API_BASE}/repos/${GITEA_OWNER}/${GITEA_REPO}"
|
API_URL="${API_BASE}/repos/${GITEA_OWNER}/${GITEA_REPO}"
|
||||||
|
CHANGELOG_FILE="$ROOT_DIR/CHANGELOG.md"
|
||||||
|
|
||||||
if ! command -v jq >/dev/null 2>&1; then
|
if ! command -v jq >/dev/null 2>&1; then
|
||||||
echo "❌ jq is required to parse Gitea responses." >&2
|
echo "❌ jq is required to parse Gitea responses." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 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:-true}"
|
PRERELEASE_FLAG="${GITEA_PRERELEASE:-true}"
|
||||||
|
|
||||||
create_payload="$(jq -n \
|
create_payload="$(jq -n \
|
||||||
--arg tag "$RELEASE_TAG" \
|
--arg tag "$RELEASE_TAG" \
|
||||||
--arg name "iKeyMon ${VERSION}" \
|
--arg name "iKeyMon ${VERSION}" \
|
||||||
--arg target "$TARGET_COMMIT" \
|
--arg target "$TARGET_COMMIT" \
|
||||||
|
--arg body "$CHANGELOG_BODY" \
|
||||||
--argjson prerelease "$PRERELEASE_FLAG" \
|
--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)"
|
response_file="$(mktemp)"
|
||||||
http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \
|
http_code=$(curl -sS -w "%{http_code}" -o "$response_file" \
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"marketing_version": "26.0.31"
|
"marketing_version": "26.1.1"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user