chore: release 26.1.3

- Simplified awk extraction without aggressive sed cleanup
- Now correctly extracts version-specific changelog entries
- Works with minimal or full changelog sections

CHANGELOG.md

@@ -1,22 +1,31 @@
 # Changelog
 
-## Unreleased
+
+## 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 Sparkle updater ZIP archive creation: replaced `zip` command with `ditto` to properly preserve app bundle code signatures during extraction, resolving "damaged app" errors on update installation.
-- Fixed code signature issues for sandboxed apps by removing entitlements parameter from non-sandboxed builds.
-- Fixed Sparkle framework deep code signing to handle complex framework structure.
-- Fixed missing XPC service entitlements (`com.apple.security.xpc.aConnectionServices`, `com.apple.security.xpc.aStatusServices`) required for Sparkle installer to communicate with sandboxed app.
-
-### Changed
-- Re-enabled app sandbox with minimal entitlements (network.client only) for improved security while maintaining Sparkle update functionality.
-- Enhanced Sparkle error logging to include error domain and code information, making update failures easier to diagnose.
-- Updated build script to use `ditto -c -k --keepParent` for creating update ZIPs, which properly preserves code signatures that `zip` command breaks.
+- 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 in-app Sparkle update logs in Preferences → Updates tab with Show/Hide toggle for real-time debugging of update operations.
-- Log entries include timestamps and distinguish between info and error messages.
-- Users can clear logs manually and logs persist during the session (max 100 entries).
+- 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.

NOTES.md

@@ -5,5 +5,3 @@
 
 add a marker for "reboot required"
 
-                    
-1112

Sources/Model/API/PingService.swift

@@ -1,7 +1,10 @@
 import Foundation
+import UserNotifications
 
 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 {
             print("❌ [PingService] Invalid URL for \(hostname)")
             return false
@@ -18,17 +21,49 @@ enum PingService {
                 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)
+    }
 }

Sources/Views/MainView.swift

@@ -6,6 +6,8 @@
 //
 
 import SwiftUI
+import Combine
+import UserNotifications
 
 struct MainView: View {
     
@@ -17,8 +19,15 @@ struct MainView: View {
     @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 lastRefreshInterval: Int?
+    @State private var previousServiceStates: [String: String] = [:]
     private let serverOrderKey = MainView.serverOrderKeyStatic
     private let storedServersKey = MainView.storedServersKeyStatic
 
@@ -97,12 +106,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),
@@ -124,9 +130,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)
@@ -159,6 +170,7 @@ struct MainView: View {
                         var updated = servers[index]
                         updated.info = info
                         servers[index] = updated
+                        checkServiceStatusChanges(for: server.hostname, newInfo: info)
                     }
                 }
             } catch {
@@ -219,7 +231,7 @@ 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
                 }
@@ -230,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] {
         let defaults = UserDefaults.standard
         guard let data = defaults.data(forKey: storedServersKeyStatic) else {
@@ -256,6 +292,46 @@ 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)
+    }
 }
 
 #Preview {

Sources/Views/PreferencesView.swift

@@ -260,19 +260,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()
     }
 }
 

Sources/Views/ServerDetailView.swift

@@ -11,11 +11,12 @@ struct ServerDetailView: View {
     @Binding var server: Server
     var isFetching: Bool
     @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
     let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
     
@@ -59,7 +60,7 @@ struct ServerDetailView: View {
         .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 }
             }
         }

Sources/Views/ServerFormView.swift

@@ -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 {

Sparkle/appcast.xml

@@ -3,28 +3,28 @@
     <channel>
         <title>iKeyMon</title>
         <item>
-            <title>26.0.69</title>
-            <pubDate>Sat, 03 Jan 2026 14:00:40 +0100</pubDate>
-            <sparkle:version>150</sparkle:version>
-            <sparkle:shortVersionString>26.0.69</sparkle:shortVersionString>
+            <title>26.1.3</title>
+            <pubDate>Sat, 03 Jan 2026 18:17:26 +0100</pubDate>
+            <sparkle:version>167</sparkle:version>
+            <sparkle:shortVersionString>26.1.3</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
-            <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=="/>
+            <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.3/iKeyMon-26.1.3.zip" length="3007204" type="application/octet-stream" sparkle:edSignature="u8a/cDZFPV0a21y+1q7HpZjQQv8r7GtlrHqyinDtgI6jI5Sv5q26x0sTagPrmrwwydIj3hWFmHN/iYp/PomaCw=="/>
         </item>
         <item>
-            <title>26.0.68</title>
-            <pubDate>Sat, 03 Jan 2026 13:52:33 +0100</pubDate>
-            <sparkle:version>148</sparkle:version>
-            <sparkle:shortVersionString>26.0.68</sparkle:shortVersionString>
+            <title>26.1.2</title>
+            <pubDate>Sat, 03 Jan 2026 18:05:27 +0100</pubDate>
+            <sparkle:version>164</sparkle:version>
+            <sparkle:shortVersionString>26.1.2</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
-            <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.68/iKeyMon-26.0.68.zip" length="2993469" type="application/octet-stream" sparkle:edSignature="M5WBkO4BN8RwMJ0ZU3Ku4CyQllnbEzz9X6MYR4IVX5prO9oyMBGoceHA3C97wZA6+++9u7RnRsKrFvei2CsWBQ=="/>
+            <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.2/iKeyMon-26.1.2.zip" length="3007173" type="application/octet-stream" sparkle:edSignature="CiNeGZ9h4WtI/ZOW371EAEKGK0vWdu1VhBk5ewh2hoq+4C8R9DbnQvDyHvwFy4wh6VpLahp/mXr4gV5alEIRCw=="/>
         </item>
         <item>
-            <title>26.0.67</title>
-            <pubDate>Sat, 03 Jan 2026 13:36:29 +0100</pubDate>
-            <sparkle:version>146</sparkle:version>
-            <sparkle:shortVersionString>26.0.67</sparkle:shortVersionString>
+            <title>26.1.1</title>
+            <pubDate>Sat, 03 Jan 2026 16:34:21 +0100</pubDate>
+            <sparkle:version>162</sparkle:version>
+            <sparkle:shortVersionString>26.1.1</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
-            <enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.0.67/iKeyMon-26.0.67.zip" length="2993400" type="application/octet-stream" sparkle:edSignature="kr7vKMSM0002I/Fx2KVFGqNA6uMHb5Ll6Cr8NSG+8/Ct6KkC9dAwcd50xeUVPVJ7UT8lNBVPoBjZoFssgIEPAw=="/>
+            <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>
     </channel>
 </rss>

iKeyMon.xcodeproj/project.pbxproj

@@ -322,7 +322,7 @@
 				CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 150;
+				CURRENT_PROJECT_VERSION = 167;
 				DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
 				DEVELOPMENT_TEAM = Q5486ZVAFT;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -337,7 +337,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 26.0.69;
+				MARKETING_VERSION = 26.1.3;
 				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 = 150;
+				CURRENT_PROJECT_VERSION = 167;
 				DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
 				DEVELOPMENT_TEAM = Q5486ZVAFT;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 26.0.69;
+				MARKETING_VERSION = 26.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

scripts/publish_release.sh

@@ -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
 
+# 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}"
 
 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" \

version.json

@@ -1,3 +1,3 @@
 {
-  "marketing_version": "26.0.69"
+  "marketing_version": "26.1.3"
 }