krz/hutch

an ios client for sourcehut client ios sourcehut swift https://krz.sh/apps/hutch/

Commit 7ed0e7f12f

7ed0e7f12ff21ed31e7ecd5e72d3eeced14e467a

parent: d67a51cd1e

Unsigned

cmc <hello@cleberg.net> · 2026-05-07 01:41 UTC 

feat(cache): persist read-only API responses

Add a bounded stale-while-revalidate cache at the Sourcehut API boundary with
stable keys, centralized TTLs, request coalescing, payload hashing, and LRU disk
pruning.

Cache high-value read-only repo, build, ticket, project, profile, paste, and
Home/Work Queue data while keeping mutations network-only and invalidating
related prefixes after successful writes.

Add focused cache tests and implementation notes.

Layout: unified · split

Docs/API_CACHE.md +1 −1
@@ -8,4 +8,4 @@ TTLs live in `APICacheTTLs`. Active build data uses a very short TTL, mutable ti
88
99Invalidation is intentionally prefix-based. Successful ticket mutations remove ticket, ticket-list, tracker, and Home prefixes. Build retry/cancel/resubmit actions remove build detail, build-list, build-log, and Home prefixes. This avoids a dependency graph while keeping stale post-mutation data out of the high-risk paths.
1010
11Known limitations: the first pass is integrated into build detail/logs, ticket detail, README lookup, and repository tree/blob/file reads. Some older list-level paths still use the legacy in-memory cache facade and should move to `APICacheKeys` plus `executeCached` next. Recommended next targets are repository lists, build lists, ticket lists, profile repositories/trackers, and Home/Work Queue sections.
11Known limitations: caching now covers the high-value detail paths plus repository/build/ticket/tracker/paste lists, profile repositories/trackers, projects, and Home dashboard fetches. Some services still perform background refresh one request at a time rather than streaming partial refreshed list pages into the UI, and Work Queue-specific surfaces should be reviewed as a follow-up if they grow beyond the Home dashboard data model.
Hutch.xcodeproj/project.pbxproj +8 −8
@@ -517,7 +517,7 @@
517517 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
518518 CODE_SIGN_ENTITLEMENTS = Hutch/Hutch.entitlements;
519519 CODE_SIGN_STYLE = Automatic;
520 CURRENT_PROJECT_VERSION = 83;
520 CURRENT_PROJECT_VERSION = 84;
521521 DEVELOPMENT_TEAM = ZCNAX3VL9D;
522522 ENABLE_PREVIEWS = YES;
523523 GENERATE_INFOPLIST_FILE = YES;
@@ -534,7 +534,7 @@
534534 "$(inherited)",
535535 "@executable_path/Frameworks",
536536 );
537 MARKETING_VERSION = 3.3.0;
537 MARKETING_VERSION = 3.3.1;
538538 PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch;
539539 PRODUCT_NAME = "$(TARGET_NAME)";
540540 STRING_CATALOG_GENERATE_SYMBOLS = YES;
@@ -554,7 +554,7 @@
554554 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
555555 CODE_SIGN_ENTITLEMENTS = Hutch/Hutch.entitlements;
556556 CODE_SIGN_STYLE = Automatic;
557 CURRENT_PROJECT_VERSION = 83;
557 CURRENT_PROJECT_VERSION = 84;
558558 DEVELOPMENT_TEAM = ZCNAX3VL9D;
559559 ENABLE_PREVIEWS = YES;
560560 GENERATE_INFOPLIST_FILE = YES;
@@ -571,7 +571,7 @@
571571 "$(inherited)",
572572 "@executable_path/Frameworks",
573573 );
574 MARKETING_VERSION = 3.3.0;
574 MARKETING_VERSION = 3.3.1;
575575 PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch;
576576 PRODUCT_NAME = "$(TARGET_NAME)";
577577 STRING_CATALOG_GENERATE_SYMBOLS = YES;
@@ -634,7 +634,7 @@
634634 APPLICATION_EXTENSION_API_ONLY = YES;
635635 CODE_SIGN_ENTITLEMENTS = HutchWidgetExtension/HutchWidgetExtension.entitlements;
636636 CODE_SIGN_STYLE = Automatic;
637 CURRENT_PROJECT_VERSION = 83;
637 CURRENT_PROJECT_VERSION = 84;
638638 DEVELOPMENT_TEAM = ZCNAX3VL9D;
639639 GENERATE_INFOPLIST_FILE = NO;
640640 INFOPLIST_FILE = HutchWidgetExtension/Info.plist;
@@ -644,7 +644,7 @@
644644 "@executable_path/Frameworks",
645645 "@executable_path/../../Frameworks",
646646 );
647 MARKETING_VERSION = 3.3.0;
647 MARKETING_VERSION = 3.3.1;
648648 PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch.HutchWidgetExtension;
649649 PRODUCT_NAME = "$(TARGET_NAME)";
650650 SKIP_INSTALL = YES;
@@ -663,7 +663,7 @@
663663 APPLICATION_EXTENSION_API_ONLY = YES;
664664 CODE_SIGN_ENTITLEMENTS = HutchWidgetExtension/HutchWidgetExtension.entitlements;
665665 CODE_SIGN_STYLE = Automatic;
666 CURRENT_PROJECT_VERSION = 83;
666 CURRENT_PROJECT_VERSION = 84;
667667 DEVELOPMENT_TEAM = ZCNAX3VL9D;
668668 GENERATE_INFOPLIST_FILE = NO;
669669 INFOPLIST_FILE = HutchWidgetExtension/Info.plist;
@@ -673,7 +673,7 @@
673673 "@executable_path/Frameworks",
674674 "@executable_path/../../Frameworks",
675675 );
676 MARKETING_VERSION = 3.3.0;
676 MARKETING_VERSION = 3.3.1;
677677 PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch.HutchWidgetExtension;
678678 PRODUCT_NAME = "$(TARGET_NAME)";
679679 SKIP_INSTALL = YES;
Hutch/Networking/APICache.swift +14 −16
@@ -35,7 +35,7 @@ struct CacheEntryMetadata: Codable, Sendable, Equatable {
3535 let schemaVersion: Int
3636 let payloadSize: Int
3737
38 func isExpired(now: Date = Date()) -> Bool {
38 nonisolated func isExpired(now: Date = Date()) -> Bool {
3939 expiresAt <= now
4040 }
4141}
@@ -83,7 +83,7 @@ struct APICacheConfiguration: Sendable {
8383 var memoryEntryLimit: Int
8484 var schemaVersion: Int
8585
86 static func accountScoped(accountID: String) -> APICacheConfiguration {
86 nonisolated static func accountScoped(accountID: String) -> APICacheConfiguration {
8787 let base = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first
8888 ?? URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
8989 return APICacheConfiguration(
@@ -98,7 +98,7 @@ struct APICacheConfiguration: Sendable {
9898 )
9999 }
100100
101 static func temporary(directory: URL) -> APICacheConfiguration {
101 nonisolated static func temporary(directory: URL) -> APICacheConfiguration {
102102 APICacheConfiguration(
103103 directory: directory,
104104 maxCacheSizeBytes: 4 * 1024 * 1024,
@@ -126,15 +126,13 @@ actor PersistentAPICache: APICache {
126126 }
127127
128128 private let configuration: APICacheConfiguration
129 private let fileManager: FileManager
130129 private var memoryEntries: [String: APICacheEntry] = [:]
131130 private var memoryOrder: [String] = []
132131 private var knownMetadata: [String: CacheEntryMetadata] = [:]
133132 private var writeCountSincePrune = 0
134133
135 init(configuration: APICacheConfiguration, fileManager: FileManager = .default) {
134 init(configuration: APICacheConfiguration) {
136135 self.configuration = configuration
137 self.fileManager = fileManager
138136 }
139137
140138 func read(cacheKey: String) async throws -> APICacheEntry {
@@ -147,13 +145,13 @@ actor PersistentAPICache: APICache {
147145 }
148146
149147 let url = fileURL(for: cacheKey)
150 guard fileManager.fileExists(atPath: url.path) else {
148 guard FileManager.default.fileExists(atPath: url.path) else {
151149 throw APICacheError.miss
152150 }
153151
154152 var stored = try decodeEntry(from: url)
155153 guard stored.metadata.schemaVersion == configuration.schemaVersion else {
156 try? fileManager.removeItem(at: url)
154 try? FileManager.default.removeItem(at: url)
157155 throw APICacheError.miss
158156 }
159157
@@ -223,7 +221,7 @@ actor PersistentAPICache: APICache {
223221 memoryEntries.removeValue(forKey: cacheKey)
224222 memoryOrder.removeAll { $0 == cacheKey }
225223 knownMetadata.removeValue(forKey: cacheKey)
226 try? fileManager.removeItem(at: fileURL(for: cacheKey))
224 try? FileManager.default.removeItem(at: fileURL(for: cacheKey))
227225 }
228226
229227 func removeByPrefix(_ prefix: String) async {
@@ -237,7 +235,7 @@ actor PersistentAPICache: APICache {
237235 memoryEntries.removeAll()
238236 memoryOrder.removeAll()
239237 knownMetadata.removeAll()
240 try? fileManager.removeItem(at: configuration.directory)
238 try? FileManager.default.removeItem(at: configuration.directory)
241239 }
242240
243241 func pruneExpired(now: Date = Date()) async {
@@ -289,7 +287,7 @@ actor PersistentAPICache: APICache {
289287
290288 private func loadKnownMetadataIfNeeded() async {
291289 guard knownMetadata.isEmpty else { return }
292 guard let urls = try? fileManager.contentsOfDirectory(
290 guard let urls = try? FileManager.default.contentsOfDirectory(
293291 at: configuration.directory,
294292 includingPropertiesForKeys: nil
295293 ) else { return }
@@ -301,8 +299,8 @@ actor PersistentAPICache: APICache {
301299 }
302300
303301 private func ensureDirectoryExists() throws {
304 if !fileManager.fileExists(atPath: configuration.directory.path) {
305 try fileManager.createDirectory(
302 if !FileManager.default.fileExists(atPath: configuration.directory.path) {
303 try FileManager.default.createDirectory(
306304 at: configuration.directory,
307305 withIntermediateDirectories: true
308306 )
@@ -315,13 +313,13 @@ actor PersistentAPICache: APICache {
315313 .appendingPathExtension("json")
316314 }
317315
318 private static func payloadHash(_ data: Data) -> String {
316 nonisolated private static func payloadHash(_ data: Data) -> String {
319317 SHA256.hash(data: data).map { String(format: "%02x", $0) }.joined()
320318 }
321319}
322320
323321extension JSONEncoder {
324 static var srhtCache: JSONEncoder {
322 nonisolated static var srhtCache: JSONEncoder {
325323 let encoder = JSONEncoder()
326324 encoder.dateEncodingStrategy = .iso8601
327325 return encoder
@@ -329,7 +327,7 @@ extension JSONEncoder {
329327}
330328
331329extension JSONDecoder {
332 static var srhtCache: JSONDecoder {
330 nonisolated static var srhtCache: JSONDecoder {
333331 let decoder = JSONDecoder()
334332 decoder.dateDecodingStrategy = .iso8601
335333 return decoder
Hutch/Networking/APICacheKeys.swift +43
@@ -51,6 +51,14 @@ enum APICacheKeys {
5151 make([SRHTService.todo.rawValue, "tracker-labels", "tracker:\(trackerRid)"])
5252 }
5353
54 static func trackers(cursor: String? = nil) -> String {
55 make([SRHTService.todo.rawValue, "trackers", cursor.map { "cursor:\($0)" }])
56 }
57
58 static func tickets(trackerRid: String, cursor: String? = nil) -> String {
59 make([SRHTService.todo.rawValue, "tickets", "tracker:\(trackerRid)", cursor.map { "cursor:\($0)" }])
60 }
61
5462 static func builds(cursor: String? = nil, filter: String? = nil) -> String {
5563 make([SRHTService.builds.rawValue, "jobs", cursor.map { "cursor:\($0)" }, filter.map { "filter:\($0)" }])
5664 }
@@ -71,6 +79,37 @@ enum APICacheKeys {
7179 make([SRHTService.todo.rawValue, "user-trackers", normalize(owner), cursor.map { "cursor:\($0)" }])
7280 }
7381
82 static func projects(cursor: String? = nil) -> String {
83 make([SRHTService.hub.rawValue, "projects", cursor.map { "cursor:\($0)" }])
84 }
85
86 static func projectDetail(rid: String, mailingListsCursor: String? = nil, sourcesCursor: String? = nil, trackersCursor: String? = nil) -> String {
87 make([
88 SRHTService.hub.rawValue,
89 "project",
90 "rid:\(rid)",
91 mailingListsCursor.map { "ml:\($0)" },
92 sourcesCursor.map { "src:\($0)" },
93 trackersCursor.map { "trk:\($0)" }
94 ])
95 }
96
97 static func homeJobs(actor: String) -> String {
98 make(["home", "jobs", normalize(actor)])
99 }
100
101 static func homeTrackerTickets(owner: String, tracker: String) -> String {
102 make(["home", "tickets", normalize(owner), normalize(tracker)])
103 }
104
105 static func inboxSubscriptions(cursor: String? = nil) -> String {
106 make([SRHTService.lists.rawValue, "subscriptions", cursor.map { "cursor:\($0)" }])
107 }
108
109 static func inboxThreads(listRid: String, cursor: String? = nil) -> String {
110 make([SRHTService.lists.rawValue, "threads", "list:\(listRid)", cursor.map { "cursor:\($0)" }])
111 }
112
74113 static func pasteList(cursor: String? = nil) -> String {
75114 make([SRHTService.paste.rawValue, "pastes", cursor.map { "cursor:\($0)" }])
76115 }
@@ -102,4 +141,8 @@ enum APICacheTTLs {
102141 static let movingRefFileContent: TimeInterval = 10 * 60
103142 static let userProfile: TimeInterval = 30 * 60
104143 static let status: TimeInterval = 5 * 60
144 static let homeDashboard: TimeInterval = 2 * 60
145 static let inboxSummary: TimeInterval = 2 * 60
146 static let projectList: TimeInterval = 10 * 60
147 static let projectDetail: TimeInterval = 10 * 60
105148}
Hutch/Networking/PasteService.swift +15 −4
@@ -109,13 +109,17 @@ final class PasteService: Sendable {
109109 let variables = cursor.map { ["cursor": $0 as any Sendable] }
110110 let result: PasteListResponse
111111 if useCache, cursor == nil {
112 result = try await client.executeAndCache(
112 let cached = try await client.executeCached(
113113 service: .paste,
114114 query: Self.listQuery,
115115 variables: variables,
116116 responseType: PasteListResponse.self,
117 cacheKey: Self.cacheKey
117 cacheKey: APICacheKeys.pasteList(cursor: cursor),
118 resourceType: .pasteList,
119 ttl: APICacheTTLs.ticketList,
120 policy: .cacheFirstThenRefresh
118121 )
122 result = cached.value
119123 } else {
120124 result = try await client.execute(
121125 service: .paste,
@@ -127,8 +131,8 @@ final class PasteService: Sendable {
127131 return result.pastes ?? PasteListPage(results: [], cursor: nil)
128132 }
129133
130 func loadCachedPastes() -> PasteListPage? {
131 guard let data = client.responseCache.get(forKey: Self.cacheKey) else {
134 func loadCachedPastes() async -> PasteListPage? {
135 guard let data = await client.cachedPayload(forKey: APICacheKeys.pasteList()) ?? client.responseCache.get(forKey: Self.cacheKey) else {
132136 return nil
133137 }
134138
@@ -171,6 +175,7 @@ final class PasteService: Sendable {
171175 },
172176 responseType: CreatePasteResponse.self
173177 )
178 await invalidatePasteCaches()
174179 return result.create
175180 }
176181
@@ -181,6 +186,7 @@ final class PasteService: Sendable {
181186 variables: ["id": id, "visibility": visibility.rawValue],
182187 responseType: UpdatePasteResponse.self
183188 )
189 await invalidatePasteCaches()
184190 return result.update
185191 }
186192
@@ -191,6 +197,7 @@ final class PasteService: Sendable {
191197 variables: ["id": id],
192198 responseType: DeletePasteResponse.self
193199 )
200 await invalidatePasteCaches()
194201 return result.delete
195202 }
196203
@@ -208,6 +215,10 @@ final class PasteService: Sendable {
208215 return (draft.filename, data)
209216 }
210217 }
218
219 private func invalidatePasteCaches() async {
220 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.paste.rawValue, "pastes"))
221 }
211222}
212223
213224private struct PasteListResponse: Decodable, Sendable {
Hutch/Networking/ProjectService.swift +19 −4
@@ -287,12 +287,17 @@ struct ProjectService: Sendable {
287287 variables["cursor"] = cursor
288288 }
289289
290 let response = try await client.execute(
290 let cached = try await client.executeCached(
291291 service: .hub,
292292 query: Self.projectsQuery,
293293 variables: variables.isEmpty ? nil : variables,
294 responseType: ProjectPageResponse.self
294 responseType: ProjectPageResponse.self,
295 cacheKey: APICacheKeys.projects(cursor: cursor),
296 resourceType: .userProfile,
297 ttl: APICacheTTLs.projectList,
298 policy: .cacheFirstThenRefresh
295299 )
300 let response = cached.value
296301
297302 results.append(contentsOf: response.me.projects.results)
298303 guard let nextCursor = response.me.projects.cursor else {
@@ -324,12 +329,22 @@ struct ProjectService: Sendable {
324329 variables["trackersCursor"] = trackersCursor
325330 }
326331
327 let response = try await client.execute(
332 let cached = try await client.executeCached(
328333 service: .hub,
329334 query: Self.projectDetailQuery,
330335 variables: variables,
331 responseType: ProjectDetailResponse.self
336 responseType: ProjectDetailResponse.self,
337 cacheKey: APICacheKeys.projectDetail(
338 rid: rid,
339 mailingListsCursor: mailingListsCursor,
340 sourcesCursor: sourcesCursor,
341 trackersCursor: trackersCursor
342 ),
343 resourceType: .userProfile,
344 ttl: APICacheTTLs.projectDetail,
345 policy: .cacheFirstThenRefresh
332346 )
347 let response = cached.value
333348
334349 guard let project = response.project else {
335350 throw SRHTError.decodingError(
Hutch/Views/Builds/BuildListViewModel.swift +17 −6
@@ -188,7 +188,7 @@ final class BuildListViewModel {
188188 func loadJobs() async {
189189 // Show cached data immediately on first load (may populate `jobs` from cache).
190190 if jobs.isEmpty {
191 loadFromCache()
191 await loadFromCache()
192192 }
193193
194194 let treatAsInitialLoad = jobs.isEmpty
@@ -279,6 +279,7 @@ final class BuildListViewModel {
279279 variables: variables,
280280 responseType: SubmitJobResponse.self
281281 )
282 await invalidateBuildListCache()
282283 await loadJobs()
283284 return result.submit.id
284285 } catch {
@@ -297,6 +298,7 @@ final class BuildListViewModel {
297298 variables: ["id": job.id],
298299 responseType: CancelResponse.self
299300 )
301 await invalidateBuildListCache()
300302 if let index = jobs.firstIndex(where: { $0.id == job.id }) {
301303 let updated = JobSummary(
302304 id: job.id,
@@ -345,14 +347,17 @@ final class BuildListViewModel {
345347 }
346348
347349 if useCache && cursor == nil {
348 let result = try await client.executeAndCache(
350 let cached = try await client.executeCached(
349351 service: .builds,
350352 query: Self.query,
351353 variables: variables.isEmpty ? nil : variables,
352354 responseType: JobsResponse.self,
353 cacheKey: Self.cacheKey
355 cacheKey: APICacheKeys.builds(cursor: cursor),
356 resourceType: .buildList,
357 ttl: APICacheTTLs.activeBuild,
358 policy: .cacheFirstThenRefresh
354359 )
355 return result.jobs
360 return cached.value.jobs
356361 } else {
357362 let result = try await client.execute(
358363 service: .builds,
@@ -364,8 +369,14 @@ final class BuildListViewModel {
364369 }
365370 }
366371
367 private func loadFromCache() {
368 guard let data = client.responseCache.get(forKey: Self.cacheKey) else { return }
372 private func invalidateBuildListCache() async {
373 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.builds.rawValue, "jobs"))
374 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.builds.rawValue, "job"))
375 await client.invalidateCache(prefix: APICacheKeys.prefix("home"))
376 }
377
378 private func loadFromCache() async {
379 guard let data = await client.cachedPayload(forKey: APICacheKeys.builds()) ?? client.responseCache.get(forKey: Self.cacheKey) else { return }
369380 let decoder = JSONDecoder()
370381 decoder.dateDecodingStrategy = .srhtFlexible
371382 if let response = try? decoder.decode(
Hutch/Views/Home/HomeViewModel.swift +52 −11
@@ -578,6 +578,7 @@ final class HomeViewModel {
578578 ],
579579 responseType: UnassignResponse.self
580580 )
581 await invalidateHomeRelatedCaches()
581582 assignedTickets.removeAll { $0.id == ticket.id }
582583 persistNeedsAttentionSnapshot()
583584 } catch {
@@ -595,6 +596,7 @@ final class HomeViewModel {
595596 variables: ["id": build.job.id],
596597 responseType: CancelBuildResponse.self
597598 )
599 await invalidateHomeRelatedCaches()
598600 if let index = recentBuilds.firstIndex(where: { $0.id == build.id }) {
599601 let updatedJob = JobSummary(
600602 id: build.job.id,
@@ -684,12 +686,16 @@ final class HomeViewModel {
684686
685687 private func loadRecentJobs() async -> Result<[HomeJobPayload], Error> {
686688 do {
687 let response = try await client.execute(
689 let cached = try await client.executeCached(
688690 service: .builds,
689691 query: Self.jobsQuery,
690 responseType: HomeJobsResponse.self
692 responseType: HomeJobsResponse.self,
693 cacheKey: APICacheKeys.homeJobs(actor: currentUser.canonicalName),
694 resourceType: .buildList,
695 ttl: APICacheTTLs.homeDashboard,
696 policy: .cacheFirstThenRefresh
691697 )
692 return .success(response.jobs.results)
698 return .success(cached.value.jobs.results)
693699 } catch {
694700 return .failure(error)
695701 }
@@ -780,12 +786,17 @@ final class HomeViewModel {
780786 variables["cursor"] = cursor
781787 }
782788
783 let response = try await client.execute(
789 let cached = try await client.executeCached(
784790 service: .lists,
785791 query: Self.inboxSubscriptionsQuery,
786792 variables: variables.isEmpty ? nil : variables,
787 responseType: HomeInboxSubscriptionsResponse.self
793 responseType: HomeInboxSubscriptionsResponse.self,
794 cacheKey: APICacheKeys.inboxSubscriptions(cursor: cursor),
795 resourceType: .ticketList,
796 ttl: APICacheTTLs.inboxSummary,
797 policy: .cacheFirstThenRefresh
788798 )
799 let response = cached.value
789800
790801 subscriptions.append(contentsOf: response.subscriptions.results)
791802 guard let nextCursor = response.subscriptions.cursor else {
@@ -809,12 +820,17 @@ final class HomeViewModel {
809820 variables["cursor"] = cursor
810821 }
811822
812 let response = try await client.execute(
823 let cached = try await client.executeCached(
813824 service: .lists,
814825 query: Self.inboxListThreadsQuery,
815826 variables: variables,
816 responseType: HomeInboxListThreadsResponse.self
827 responseType: HomeInboxListThreadsResponse.self,
828 cacheKey: APICacheKeys.inboxThreads(listRid: mailingList.rid, cursor: cursor),
829 resourceType: .ticketList,
830 ttl: APICacheTTLs.inboxSummary,
831 policy: .cacheFirstThenRefresh
817832 )
833 let response = cached.value
818834
819835 let unreadThreadSummaries = response.list.threads.results.compactMap { thread -> InboxThreadSummary? in
820836 let summary = InboxThreadSummary(
@@ -876,12 +892,17 @@ final class HomeViewModel {
876892 variables["cursor"] = cursor
877893 }
878894
879 let response = try await client.execute(
895 let cached = try await client.executeCached(
880896 service: .todo,
881897 query: Self.trackersQuery,
882898 variables: variables.isEmpty ? nil : variables,
883 responseType: HomeTrackersResponse.self
899 responseType: HomeTrackersResponse.self,
900 cacheKey: APICacheKeys.trackers(cursor: cursor),
901 resourceType: .ticketList,
902 ttl: APICacheTTLs.ticketList,
903 policy: .cacheFirstThenRefresh
884904 )
905 let response = cached.value
885906
886907 allTrackers.append(contentsOf: response.trackers.results)
887908 guard let nextCursor = response.trackers.cursor else {
@@ -925,7 +946,7 @@ final class HomeViewModel {
925946 }
926947
927948 private func fetchAssignedTickets(for tracker: TrackerSummary) async throws -> [HomeAssignedTicket] {
928 let response = try await client.execute(
949 let cached = try await client.executeCached(
929950 service: .todo,
930951 query: Self.trackerTicketsQuery,
931952 variables: [
@@ -934,8 +955,18 @@ final class HomeViewModel {
934955 : tracker.owner.canonicalName,
935956 "tracker": tracker.name
936957 ],
937 responseType: HomeTrackerTicketsResponse.self
958 responseType: HomeTrackerTicketsResponse.self,
959 cacheKey: APICacheKeys.homeTrackerTickets(
960 owner: tracker.owner.canonicalName.hasPrefix("~")
961 ? String(tracker.owner.canonicalName.dropFirst())
962 : tracker.owner.canonicalName,
963 tracker: tracker.name
964 ),
965 resourceType: .ticketList,
966 ttl: APICacheTTLs.ticketList,
967 policy: .cacheFirstThenRefresh
938968 )
969 let response = cached.value
939970
940971 return response.user.tracker.tickets.results.compactMap { payload in
941972 guard payload.status.isOpen else {
@@ -970,6 +1001,7 @@ final class HomeViewModel {
9701001 ],
9711002 responseType: StatusEventResponse.self
9721003 )
1004 await invalidateHomeRelatedCaches()
9731005 assignedTickets.removeAll { $0.id == ticket.id }
9741006 persistNeedsAttentionSnapshot()
9751007 } catch {
@@ -977,6 +1009,15 @@ final class HomeViewModel {
9771009 }
9781010 }
9791011
1012 private func invalidateHomeRelatedCaches() async {
1013 await client.invalidateCache(prefix: APICacheKeys.prefix("home"))
1014 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "tickets"))
1015 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "ticket"))
1016 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "trackers"))
1017 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.builds.rawValue, "jobs"))
1018 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.builds.rawValue, "job"))
1019 }
1020
9801021 private func persistNeedsAttentionSnapshot() {
9811022 let failedBuildCount = recentFailedBuilds().count
9821023 NeedsAttentionSnapshotStore.save(
Hutch/Views/Lookup/UserProfileViewModel.swift +14 −6
@@ -49,13 +49,17 @@ final class UserProfileViewModel {
4949 defer { isLoadingRepositories = false }
5050
5151 do {
52 let result = try await client.execute(
52 let cached = try await client.executeCached(
5353 service: .git,
5454 query: Self.repositoriesQuery,
5555 variables: ["owner": ownerUsername],
56 responseType: UserRepositoriesResponse.self
56 responseType: UserRepositoriesResponse.self,
57 cacheKey: APICacheKeys.userRepositories(owner: ownerUsername),
58 resourceType: .userProfile,
59 ttl: APICacheTTLs.userProfile,
60 policy: .cacheFirstThenRefresh
5761 )
58 repositories = result.user.repositories.results.map { $0.repositorySummary(service: .git) }
62 repositories = cached.value.user.repositories.results.map { $0.repositorySummary(service: .git) }
5963 } catch {
6064 repositoriesError = error.userFacingMessage
6165 }
@@ -78,13 +82,17 @@ final class UserProfileViewModel {
7882 defer { isLoadingTrackers = false }
7983
8084 do {
81 let result = try await client.execute(
85 let cached = try await client.executeCached(
8286 service: .todo,
8387 query: Self.trackersQuery,
8488 variables: ["owner": ownerUsername],
85 responseType: UserTrackersResponse.self
89 responseType: UserTrackersResponse.self,
90 cacheKey: APICacheKeys.userTrackers(owner: ownerUsername),
91 resourceType: .userProfile,
92 ttl: APICacheTTLs.userProfile,
93 policy: .cacheFirstThenRefresh
8694 )
87 trackers = result.user.trackers.results
95 trackers = cached.value.user.trackers.results
8896 } catch {
8997 trackersError = error.userFacingMessage
9098 }
Hutch/Views/Pastes/PasteListViewModel.swift +1 −1
@@ -43,7 +43,7 @@ final class PasteListViewModel {
4343 }
4444
4545 func loadPastes() async {
46 if pastes.isEmpty, let cached = service.loadCachedPastes() {
46 if pastes.isEmpty, let cached = await service.loadCachedPastes() {
4747 pastes = cached.results
4848 cursor = cached.cursor
4949 hasMore = cached.cursor != nil
Hutch/Views/Repositories/RepositoryListViewModel.swift +61 −35
@@ -155,7 +155,7 @@ final class RepositoryListViewModel {
155155
156156 // Only use cache for non-search, initial loads
157157 if !isSearch, repositories.isEmpty {
158 loadFromCache()
158 await loadFromCache()
159159 }
160160
161161 // During search, never show the full-screen loading overlay (which
@@ -282,6 +282,8 @@ final class RepositoryListViewModel {
282282 )
283283 repository = result.createRepository.repositorySummary(service: .hg)
284284 }
285 await client.invalidateCache(prefix: APICacheKeys.prefix(repository.service.rawValue, "repositories"))
286 await client.invalidateCache(prefix: APICacheKeys.prefix("home"))
285287 repositories.insert(repository, at: 0)
286288 insertIntoSearchIndex(repository)
287289 scheduleBuildStatusRefresh()
@@ -469,13 +471,17 @@ final class RepositoryListViewModel {
469471 if useCache && cursor == nil {
470472 if service == .hg {
471473 let hgVariables = cursor.map { ["cursor": $0 as any Sendable] }
472 let result = try await client.executeAndCache(
474 let cached = try await client.executeCached(
473475 service: service,
474476 query: Self.hgQuery,
475477 variables: hgVariables,
476478 responseType: HGRepositoriesResponse.self,
477 cacheKey: cacheKey(for: service)
479 cacheKey: cacheKey(for: service),
480 resourceType: .repositoryList,
481 ttl: APICacheTTLs.repositoryList,
482 policy: .cacheFirstThenRefresh
478483 )
484 let result = cached.value
479485 return Page(
480486 results: result.repositories?.results.map {
481487 RepositoryPayload(
@@ -492,14 +498,17 @@ final class RepositoryListViewModel {
492498 cursor: result.repositories?.cursor
493499 )
494500 }
495 let result = try await client.executeAndCache(
501 let cached = try await client.executeCached(
496502 service: service,
497503 query: Self.gitQuery,
498504 variables: variables.isEmpty ? nil : variables,
499505 responseType: RepositoriesResponse.self,
500 cacheKey: cacheKey(for: service)
506 cacheKey: cacheKey(for: service),
507 resourceType: .repositoryList,
508 ttl: APICacheTTLs.repositoryList,
509 policy: .cacheFirstThenRefresh
501510 )
502 return result.repositories ?? Self.emptyPage
511 return cached.value.repositories ?? Self.emptyPage
503512 } else {
504513 if service == .hg {
505514 let hgVariables = cursor.map { ["cursor": $0 as any Sendable] }
@@ -535,31 +544,14 @@ final class RepositoryListViewModel {
535544 }
536545 }
537546
538 private func loadFromCache() {
539 let cachedRepositories = [SRHTService.git, .hg].flatMap { service -> [RepositorySummary] in
540 guard let data = client.responseCache.get(forKey: cacheKey(for: service)) else { return [] }
541 let decoder = JSONDecoder()
542 decoder.dateDecodingStrategy = .srhtFlexible
543 switch service {
544 case .git:
545 if let response = try? decoder.decode(
546 GraphQLResponse<RepositoriesResponse>.self,
547 from: data
548 ), let repos = response.data?.repositories {
549 return repos.results.map { $0.repositorySummary(service: service) }
550 }
551 case .hg:
552 if let response = try? decoder.decode(
553 GraphQLResponse<HGRepositoriesResponse>.self,
554 from: data
555 ), let repos = response.data?.repositories {
556 return repos.results.map { $0.repositorySummary(service: service) }
557 }
558 default:
559 break
547 private func loadFromCache() async {
548 var persistedRepositories: [RepositorySummary] = []
549 for service in [SRHTService.git, .hg] {
550 if let data = await client.cachedPayload(forKey: cacheKey(for: service)) {
551 persistedRepositories.append(contentsOf: Self.decodeCachedRepositories(data, service: service))
560552 }
561 return []
562553 }
554 let cachedRepositories = persistedRepositories.isEmpty ? legacyCachedRepositories() : persistedRepositories
563555 if !cachedRepositories.isEmpty {
564556 let sortedRepositories = cachedRepositories.sorted(by: repositorySortOrder)
565557 repositories = sortedRepositories
@@ -568,6 +560,37 @@ final class RepositoryListViewModel {
568560 }
569561 }
570562
563 private func legacyCachedRepositories() -> [RepositorySummary] {
564 [SRHTService.git, .hg].flatMap { service -> [RepositorySummary] in
565 guard let data = client.responseCache.get(forKey: cacheKey(for: service)) else { return [] }
566 return Self.decodeCachedRepositories(data, service: service)
567 }
568 }
569
570 private static func decodeCachedRepositories(_ data: Data, service: SRHTService) -> [RepositorySummary] {
571 let decoder = JSONDecoder()
572 decoder.dateDecodingStrategy = .srhtFlexible
573 switch service {
574 case .git:
575 if let response = try? decoder.decode(
576 GraphQLResponse<RepositoriesResponse>.self,
577 from: data
578 ), let repos = response.data?.repositories {
579 return repos.results.map { $0.repositorySummary(service: service) }
580 }
581 case .hg:
582 if let response = try? decoder.decode(
583 GraphQLResponse<HGRepositoriesResponse>.self,
584 from: data
585 ), let repos = response.data?.repositories {
586 return repos.results.map { $0.repositorySummary(service: service) }
587 }
588 default:
589 break
590 }
591 return []
592 }
593
571594 private func scheduleBuildStatusRefresh(force: Bool = false) {
572595 // Skip if we already refreshed recently (120-second TTL). Pull-to-refresh
573596 // passes force: true to bypass this check.
@@ -640,14 +663,17 @@ final class RepositoryListViewModel {
640663 }
641664
642665 if useCache && cursor == nil {
643 let result = try await client.executeAndCache(
666 let cached = try await client.executeCached(
644667 service: .builds,
645668 query: Self.buildsQuery,
646669 variables: variables.isEmpty ? nil : variables,
647670 responseType: BuildJobsResponse.self,
648 cacheKey: Self.buildsCacheKey
671 cacheKey: APICacheKeys.builds(cursor: cursor, filter: "repository-status"),
672 resourceType: .buildList,
673 ttl: APICacheTTLs.activeBuild,
674 policy: .cacheFirstThenRefresh
649675 )
650 return result.jobs
676 return cached.value.jobs
651677 }
652678
653679 let result = try await client.execute(
@@ -681,11 +707,11 @@ final class RepositoryListViewModel {
681707 private func cacheKey(for service: SRHTService) -> String {
682708 switch service {
683709 case .git:
684 Self.gitCacheKey
710 APICacheKeys.repositories(service: .git)
685711 case .hg:
686 Self.hgCacheKey
712 APICacheKeys.repositories(service: .hg)
687713 default:
688 "\(service.rawValue).repositories"
714 APICacheKeys.repositories(service: service)
689715 }
690716 }
691717
Hutch/Views/Tickets/TicketListViewModel.swift +36 −7
@@ -299,6 +299,13 @@ final class TicketListViewModel {
299299 hasMore = true
300300
301301 do {
302 if tickets.isEmpty, let cachedPage = try? await fetchPage(cursor: nil, policy: .cacheOnly) {
303 tickets = cachedPage.results
304 cursor = cachedPage.cursor
305 hasMore = cachedPage.cursor != nil
306 reconcileSelectionWithLoadedTickets()
307 isLoading = false
308 }
302309 // todo.sr.ht exposes `tickets(cursor:)` only (see Docs/API/todo.json) — no server-side
303310 // status filter. The Open tab filters client-side, so we paginate until the cursor is
304311 // exhausted; otherwise older open tickets never appear in the first page (25 items).
@@ -405,6 +412,7 @@ final class TicketListViewModel {
405412 responseType: SubmitTicketResponse.self
406413 )
407414 let ticket = result.submitTicket
415 await invalidateTicketCaches()
408416 tickets.insert(ticket, at: 0)
409417 return ticket
410418 } catch {
@@ -460,6 +468,7 @@ final class TicketListViewModel {
460468 ],
461469 responseType: AssignmentMutationResponse.self
462470 )
471 await invalidateTicketCaches()
463472 } catch {
464473 tickets = original
465474 self.error = error.userFacingMessage
@@ -502,6 +511,7 @@ final class TicketListViewModel {
502511 ],
503512 responseType: AssignmentMutationResponse.self
504513 )
514 await invalidateTicketCaches()
505515 } catch {
506516 tickets = original
507517 self.error = error.userFacingMessage
@@ -512,13 +522,17 @@ final class TicketListViewModel {
512522
513523 func loadTrackerLabels() async {
514524 do {
515 let result = try await client.execute(
525 let cached = try await client.executeCached(
516526 service: .todo,
517527 query: Self.trackerLabelsQuery,
518528 variables: ["rid": trackerRid],
519 responseType: TrackerLabelsResponse.self
529 responseType: TrackerLabelsResponse.self,
530 cacheKey: APICacheKeys.trackerLabels(trackerRid: trackerRid),
531 resourceType: .ticketList,
532 ttl: APICacheTTLs.ticketList,
533 policy: .cacheFirstThenRefresh
520534 )
521 syncTrackerLabels(result.tracker.labels.results)
535 syncTrackerLabels(cached.value.tracker.labels.results)
522536 } catch {
523537 self.error = error.userFacingMessage
524538 }
@@ -652,6 +666,7 @@ final class TicketListViewModel {
652666 ],
653667 responseType: LabelMutationResponse.self
654668 )
669 await invalidateTicketCaches()
655670 } catch {
656671 tickets = original
657672 self.error = error.userFacingMessage
@@ -692,6 +707,7 @@ final class TicketListViewModel {
692707 ],
693708 responseType: LabelMutationResponse.self
694709 )
710 await invalidateTicketCaches()
695711 } catch {
696712 tickets = original
697713 self.error = error.userFacingMessage
@@ -790,6 +806,7 @@ final class TicketListViewModel {
790806 responseType: UpdateStatusResponse.self
791807 )
792808 _ = result.updateTicketStatus
809 await invalidateTicketCaches()
793810 if let index = tickets.firstIndex(where: { $0.id == ticket.id }) {
794811 tickets[index] = updatedTicket(from: ticket, input: input)
795812 }
@@ -800,18 +817,22 @@ final class TicketListViewModel {
800817 isPerformingAction = false
801818 }
802819
803 private func fetchPage(cursor: String?) async throws -> TicketsPage {
820 private func fetchPage(cursor: String?, policy: CachePolicy = .cacheFirstThenRefresh) async throws -> TicketsPage {
804821 var variables: [String: any Sendable] = ["rid": trackerRid]
805822 if let cursor {
806823 variables["cursor"] = cursor
807824 }
808 let result = try await client.execute(
825 let cached = try await client.executeCached(
809826 service: .todo,
810827 query: Self.query,
811828 variables: variables,
812 responseType: TrackerTicketsResponse.self
829 responseType: TrackerTicketsResponse.self,
830 cacheKey: APICacheKeys.tickets(trackerRid: trackerRid, cursor: cursor),
831 resourceType: .ticketList,
832 ttl: APICacheTTLs.ticketList,
833 policy: policy
813834 )
814 return result.tracker.tickets
835 return cached.value.tracker.tickets
815836 }
816837
817838 private struct SubmitTicketResponse: Decodable, Sendable {
@@ -919,6 +940,7 @@ final class TicketListViewModel {
919940 )
920941
921942 if failedTicketIDs.isEmpty {
943 await invalidateTicketCaches()
922944 clearTicketSelection()
923945 isSelectionMode = false
924946 } else {
@@ -960,6 +982,13 @@ final class TicketListViewModel {
960982 )
961983 }
962984
985 private func invalidateTicketCaches() async {
986 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "tickets"))
987 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "ticket"))
988 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "tracker"))
989 await client.invalidateCache(prefix: APICacheKeys.prefix("home"))
990 }
991
963992 private static func bulkStatusUpdateInput(resolution: TicketResolution) -> [String: any Sendable] {
964993 [
965994 "status": TicketStatus.resolved.rawValue,
Hutch/Views/Tickets/TrackerListViewModel.swift +23 −4
@@ -118,6 +118,12 @@ final class TrackerListViewModel {
118118 hasMore = true
119119
120120 do {
121 if trackers.isEmpty, let cached = try? await fetchPage(cursor: nil, policy: .cacheOnly) {
122 trackers = cached.results
123 cursor = cached.cursor
124 hasMore = cached.cursor != nil
125 isLoading = false
126 }
121127 let page = try await fetchPage(cursor: nil)
122128 trackers = page.results
123129 cursor = page.cursor
@@ -181,6 +187,7 @@ final class TrackerListViewModel {
181187 responseType: CreateTrackerResponse.self
182188 )
183189 let tracker = result.createTracker
190 await invalidateTrackerCaches()
184191 trackers.insert(tracker, at: 0)
185192 return tracker
186193 } catch {
@@ -224,6 +231,7 @@ final class TrackerListViewModel {
224231 ],
225232 responseType: UpdateTrackerResponse.self
226233 )
234 await invalidateTrackerCaches()
227235 applyTrackerUpdate(result.updateTracker)
228236 return result.updateTracker
229237 } catch {
@@ -246,6 +254,7 @@ final class TrackerListViewModel {
246254 variables: ["id": tracker.id],
247255 responseType: DeleteTrackerResponse.self
248256 )
257 await invalidateTrackerCaches()
249258 trackers.removeAll { $0.id == tracker.id }
250259 await loadTrackers()
251260 return true
@@ -269,18 +278,22 @@ final class TrackerListViewModel {
269278
270279 // MARK: - Private
271280
272 private func fetchPage(cursor: String?) async throws -> TrackersPage {
281 private func fetchPage(cursor: String?, policy: CachePolicy = .cacheFirstThenRefresh) async throws -> TrackersPage {
273282 var variables: [String: any Sendable] = [:]
274283 if let cursor {
275284 variables["cursor"] = cursor
276285 }
277 let result = try await client.execute(
286 let cached = try await client.executeCached(
278287 service: .todo,
279288 query: Self.query,
280289 variables: variables.isEmpty ? nil : variables,
281 responseType: TrackersResponse.self
290 responseType: TrackersResponse.self,
291 cacheKey: APICacheKeys.trackers(cursor: cursor),
292 resourceType: .ticketList,
293 ttl: APICacheTTLs.ticketList,
294 policy: policy
282295 )
283 return result.trackers
296 return cached.value.trackers
284297 }
285298
286299 private struct CreateTrackerResponse: Decodable, Sendable {
@@ -290,4 +303,10 @@ final class TrackerListViewModel {
290303 private func trackerCreationErrorMessage(for error: Error) -> String {
291304 "Couldn’t create the tracker. \(error.userFacingMessage)"
292305 }
306
307 private func invalidateTrackerCaches() async {
308 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "trackers"))
309 await client.invalidateCache(prefix: APICacheKeys.prefix(SRHTService.todo.rawValue, "tracker"))
310 await client.invalidateCache(prefix: APICacheKeys.prefix("home"))
311 }
293312}