Threading fixes

ptsochantaris · Feb 26, 2024 · 080df6e · 080df6e
1 parent 15b3d76
commit 080df6e
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 40 deletions.
diff --git a/Sources/trailer/API/Network.swift b/Sources/trailer/API/Network.swift
@@ -34,17 +34,17 @@ enum Network {
             networkGate.returnTicket()
         }
         #if canImport(FoundationNetworking)
-        return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Data, Error>) in
-            _ = urlSession.dataTask(with: req) { data, _, error in
-                if let error {
-                    continuation.resume(throwing: error)
-                } else {
-                    continuation.resume(returning: data ?? Data())
+            return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Data, Error>) in
+                _ = urlSession.dataTask(with: req) { data, _, error in
+                    if let error {
+                        continuation.resume(throwing: error)
+                    } else {
+                        continuation.resume(returning: data ?? Data())
+                    }
                 }
             }
-        }
         #else
-        return try await urlSession.data(for: req).0
+            return try await urlSession.data(for: req).0
         #endif
     }
 }
diff --git a/Sources/trailer/Actions/Actions-Update.swift b/Sources/trailer/Actions/Actions-Update.swift
@@ -207,7 +207,7 @@ extension Actions {
                 Group("repositories", paging: .first(count: 100, paging: true)) { Repo.fragment }
                 Group("watching", paging: .first(count: 100, paging: true)) { Repo.fragment }
             }
-            let repositoryListQuery = Query(name: "Repos", rootElement: root, perNode: parse)
+            let repositoryListQuery = Query(name: "Repos", rootElement: root, perNode: { await parse(output: $0) })
             try await run(repositoryListQuery)
         } else {
             log(level: .info, "[*Repos*] (Skipped)")
@@ -244,7 +244,7 @@ extension Actions {
         }
 
         if userWantsPrs || userWantsIssues, !filtersRequested { // detect new items
-            let itemIdParser: Query.PerNodeBlock = { output in
+            func itemIdParser(output: ParseOutput) {
                 guard case let .node(node) = output,
                       let parent = node.parent, parent.elementType == "Repository" else {
                     return
@@ -285,7 +285,7 @@ extension Actions {
                 userWantsIssues ? [Repo.issueIdsFragment] :
                 []
             if !fields.isEmpty {
-                let queries = Query.batching("Item IDs", groupName: "nodes", idList: repoIds, maxCost: config.maxNodeCost, perNode: itemIdParser) { fields }
+                let queries = Query.batching("Item IDs", groupName: "nodes", idList: repoIds, maxCost: config.maxNodeCost, perNode: { await itemIdParser(output: $0) }) { fields }
                 try await run(queries)
             }
         } else {
@@ -307,7 +307,7 @@ extension Actions {
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         if !prIdList.isEmpty {
-            try await run(Query.batching("PRs", groupName: "nodes", idList: Array(prIdList.keys), maxCost: config.maxNodeCost, perNode: parse) {
+            try await run(Query.batching("PRs", groupName: "nodes", idList: Array(prIdList.keys), maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                 userWantsComments ? PullRequest.fragmentWithComments : PullRequest.fragment
             })
 
@@ -345,7 +345,7 @@ extension Actions {
             let reviewIdsWithComments = Review.allItems.values.compactMap { $0.syncState == .none || !$0.syncNeedsComments ? nil : $0.id }
 
             if !reviewIdsWithComments.isEmpty {
-                try await run(Query.batching("PR Review Comments", groupName: "nodes", idList: reviewIdsWithComments, maxCost: config.maxNodeCost, perNode: parse) {
+                try await run(Query.batching("PR Review Comments", groupName: "nodes", idList: reviewIdsWithComments, maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                     Review.commentsFragment
                     PullRequest.commentsFragment
                     Issue.commentsFragment
@@ -367,7 +367,7 @@ extension Actions {
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         if !issueIdList.isEmpty {
-            try await run(Query.batching("Issues", groupName: "nodes", idList: Array(issueIdList.keys), maxCost: config.maxNodeCost, perNode: parse) {
+            try await run(Query.batching("Issues", groupName: "nodes", idList: Array(issueIdList.keys), maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                 userWantsComments ? Issue.fragmentWithComments : Issue.fragment
             })
 
@@ -440,7 +440,7 @@ extension Actions {
                 itemIdsWithReactions += Issue.allItems.keys
             }
 
-            try await run(Query.batching("Reactions", groupName: "nodes", idList: itemIdsWithReactions, maxCost: config.maxNodeCost, perNode: parse) {
+            try await run(Query.batching("Reactions", groupName: "nodes", idList: itemIdsWithReactions, maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                 Comment.pullRequestReviewCommentReactionFragment
                 Comment.issueCommentReactionFragment
                 PullRequest.reactionsFragment
@@ -479,13 +479,13 @@ extension Actions {
         let userWantsComments = CommandLine.argument(exists: "-comments")
         if let pr = item.pullRequest {
             let fragment = userWantsComments ? PullRequest.fragmentWithComments : PullRequest.fragment
-            let queries = Query.batching("PR", groupName: "nodes", idList: [pr.id], maxCost: config.maxNodeCost, perNode: parse) { fragment }
+            let queries = Query.batching("PR", groupName: "nodes", idList: [pr.id], maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) { fragment }
             try await run(queries)
 
             if userWantsComments {
                 let reviewIdsWithComments = pr.reviews.compactMap { $0.syncState == .none || !$0.syncNeedsComments ? nil : $0.id }
                 if !reviewIdsWithComments.isEmpty {
-                    try await run(Query.batching("PR Review Comments", groupName: "nodes", idList: reviewIdsWithComments, maxCost: config.maxNodeCost, perNode: parse) {
+                    try await run(Query.batching("PR Review Comments", groupName: "nodes", idList: reviewIdsWithComments, maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                         Review.commentsFragment
                         PullRequest.commentsFragment
                         Issue.commentsFragment
@@ -500,7 +500,7 @@ extension Actions {
                     itemIdsWithReactions.append(contentsOf: review.comments.compactMap { ($0.syncState == .none || !$0.syncNeedsReactions) ? nil : $0.id })
                 }
             }
-            try await run(Query.batching("Reactions", groupName: "nodes", idList: itemIdsWithReactions, maxCost: config.maxNodeCost, perNode: parse) {
+            try await run(Query.batching("Reactions", groupName: "nodes", idList: itemIdsWithReactions, maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                 Comment.pullRequestReviewCommentReactionFragment
                 PullRequest.reactionsFragment
             })
@@ -510,15 +510,15 @@ extension Actions {
 
         } else if let issue = item.issue {
             let fragment = userWantsComments ? Issue.fragmentWithComments : Issue.fragment
-            let queries = Query.batching("Issue", groupName: "nodes", idList: [issue.id], maxCost: config.maxNodeCost, perNode: parse) { fragment }
+            let queries = Query.batching("Issue", groupName: "nodes", idList: [issue.id], maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) { fragment }
             try await run(queries)
 
             var itemIdsWithReactions = [issue.id]
             if userWantsComments {
                 itemIdsWithReactions += issue.comments.compactMap { ($0.syncState == .none || !$0.syncNeedsReactions) ? nil : $0.id }
             }
 
-            try await run(Query.batching("Reactions", groupName: "nodes", idList: itemIdsWithReactions, maxCost: config.maxNodeCost, perNode: parse) {
+            try await run(Query.batching("Reactions", groupName: "nodes", idList: itemIdsWithReactions, maxCost: config.maxNodeCost, perNode: { await parse(output: $0) }) {
                 Comment.pullRequestReviewCommentReactionFragment
                 PullRequest.reactionsFragment
             })

diff --git a/Sources/trailer/Actions/Actions.swift b/Sources/trailer/Actions/Actions.swift
@@ -13,6 +13,7 @@ enum Action: String {
     case stats
 }
 
+@MainActor
 enum Actions {
     private static func checkArguments() -> [String]? {
         // Very rough sanity check to catch typos, should be more fine-grained per action

diff --git a/Sources/trailer/Actions/Notifications.swift b/Sources/trailer/Actions/Notifications.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Lista
 
-struct Notifications {
+enum Notifications {
     struct Notification {
         let title: String?
         let subtitle: String?

diff --git a/Sources/trailer/Core/DB.swift b/Sources/trailer/Core/DB.swift
@@ -83,19 +83,19 @@ enum DB {
 
     static func lookup(type: String, id: String) -> (any Item)? {
         switch type {
-        case "Org": return Org.allItems[id]
-        case "Repo": return Repo.allItems[id]
-        case "Comment": return Comment.allItems[id]
-        case "User": return User.allItems[id]
-        case "Reaction": return Reaction.allItems[id]
-        case "PullRequest": return PullRequest.allItems[id]
-        case "Issue": return Issue.allItems[id]
-        case "Label": return Label.allItems[id]
-        case "Review": return Review.allItems[id]
-        case "ReviewRequest": return ReviewRequest.allItems[id]
-        case "Status": return Status.allItems[id]
-        case "Milestone": return Milestone.allItems[id]
-        default: return nil
+        case "Org": Org.allItems[id]
+        case "Repo": Repo.allItems[id]
+        case "Comment": Comment.allItems[id]
+        case "User": User.allItems[id]
+        case "Reaction": Reaction.allItems[id]
+        case "PullRequest": PullRequest.allItems[id]
+        case "Issue": Issue.allItems[id]
+        case "Label": Label.allItems[id]
+        case "Review": Review.allItems[id]
+        case "ReviewRequest": ReviewRequest.allItems[id]
+        case "Status": Status.allItems[id]
+        case "Milestone": Milestone.allItems[id]
+        default: nil
         }
     }
 

diff --git a/Sources/trailer/Core/Dates.swift b/Sources/trailer/Core/Dates.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct GHDateFormatter {
+enum GHDateFormatter {
     #if os(macOS)
         private static var timeData = tm()
         private static var dateParserHolder = "                   +0000".cString(using: String.Encoding.ascii)!

diff --git a/Sources/trailer/Core/TTY.swift b/Sources/trailer/Core/TTY.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct TTY {
+enum TTY {
     static func rightAlign(_ message: String) -> String {
         let c = max(0, 15 - message.count)
         let spaces = String(repeating: " ", count: c)

diff --git a/Sources/trailer/Core/mainasync.swift b/Sources/trailer/Core/mainasync.swift
@@ -5,6 +5,7 @@ import TrailerQL
 #endif
 
 @main
+@MainActor
 struct MainApp {
     static func main() async {
         TQL.debugLog = { log(level: .debug, indent: 0, $0) }

diff --git a/Sources/trailer/Data/Protocols/Item.swift b/Sources/trailer/Data/Protocols/Item.swift
@@ -105,8 +105,8 @@ extension Item {
     }
 
     static func processAnnouncements(notificationMode: NotificationMode) {
-        allItems.values.forEach {
-            if let i = $0 as? Announceable {
+        for value in allItems.values {
+            if let i = value as? Announceable {
                 i.announceIfNeeded(notificationMode: notificationMode)
             }
         }
@@ -203,9 +203,9 @@ extension Item {
 
     func children<T: Item>(field: String) -> [T] {
         if let childrenIds = DB.idsForChildren(of: id, field: field) {
-            return childrenIds.compactMap { T.allItems[$0] }
+            childrenIds.compactMap { T.allItems[$0] }
         } else {
-            return []
+            []
         }
     }