Unified and moved request sending code to GitHubAPI.

Author: erikdoe

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubBranchList.swift

@@ -27,18 +27,13 @@ class GitHubBranchList: ObservableObject {
     }
 
     private func fetchBranches(request: URLRequest) async -> [GitHubBranch] {
-        do {
-            let (data, response) = try await URLSession.feedSession.data(for: request)
-            guard let response = response as? HTTPURLResponse else { throw URLError(.unsupportedURL) }
-            if response.statusCode != 200 {
-                return [GitHubBranch(message: HTTPURLResponse.localizedString(forStatusCode: response.statusCode))]
-            }
-            return try JSONDecoder().decode([GitHubBranch].self, from: data)
-        } catch {
-            return [GitHubBranch(message: error.localizedDescription)]
+        let (repos, message): ([GitHubBranch]?, String) = await GitHubAPI.sendRequest(request: request)
+        guard let repos else {
+            return [GitHubBranch(message: message)]
         }
+        return repos
     }
-
+ 
     func clearBranches() {
         items = [GitHubBranch()]
     }

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubRepositoryList.swift

@@ -53,47 +53,15 @@ class GitHubRepositoryList: ObservableObject {
     }
 
     private func fetchUser(request: URLRequest) async -> (GitHubUser?, String) {
-        do {
-            let (data, response) = try await URLSession.feedSession.data(for: request)
-            guard let response = response as? HTTPURLResponse else { throw URLError(.unsupportedURL) }
-            // TODO: Somehow refactor this to use the same code as fetchRepositories
-            if response.statusCode == 403 || response.statusCode == 429 {
-                if let v = response.value(forHTTPHeaderField: "x-ratelimit-remaining"), Int(v) == 0  {
-                    // HTTPURLResponse doesn't have a specific message for code 429
-                    return (nil, "too many requests")
-                } else {
-                    return (nil, HTTPURLResponse.localizedString(forStatusCode: response.statusCode))
-                }
-            }
-            if response.statusCode != 200 {
-                return (nil, HTTPURLResponse.localizedString(forStatusCode: response.statusCode))
-            }
-            return (try JSONDecoder().decode(GitHubUser.self, from: data), "OK")
-        } catch {
-            return (nil, error.localizedDescription)
-        }
+        return await GitHubAPI.sendRequest(request: request)
     }
 
     private func fetchRepositories(request: URLRequest) async -> [GitHubRepository] {
-        do {
-            let (data, response) = try await URLSession.feedSession.data(for: request)
-            guard let response = response as? HTTPURLResponse else { throw URLError(.unsupportedURL) }
-            // TODO: Somehow refactor this to use the same code as feed reader
-            if response.statusCode == 403 || response.statusCode == 429 {
-                if let v = response.value(forHTTPHeaderField: "x-ratelimit-remaining"), Int(v) == 0  {
-                    // HTTPURLResponse doesn't have a specific message for code 429
-                    return [GitHubRepository(message: "too many requests")]
-                } else {
-                    return [GitHubRepository(message: HTTPURLResponse.localizedString(forStatusCode: response.statusCode))]
-                }
-            }
-            if response.statusCode != 200 {
-                return [GitHubRepository(message: HTTPURLResponse.localizedString(forStatusCode: response.statusCode))]
-            }
-            return try JSONDecoder().decode([GitHubRepository].self, from: data)
-        } catch {
-            return [GitHubRepository(message: error.localizedDescription)]
+        let (repos, message): ([GitHubRepository]?, String) = await GitHubAPI.sendRequest(request: request)
+        guard let repos else {
+            return [GitHubRepository(message: message)]
         }
+        return repos
     }
 
     func clearRepositories() {

CCMenu/Source/Pipeline Window/GitHub Sheets/GitHubWorkflowList.swift

@@ -30,17 +30,11 @@ class GitHubWorkflowList: ObservableObject {
     }
 
     private func fetchWorkflows(request: URLRequest) async -> [GitHubWorkflow] {
-        do {
-            let (data, response) = try await URLSession.feedSession.data(for: request)
-            guard let response = response as? HTTPURLResponse else { throw URLError(.unsupportedURL) }
-            if response.statusCode != 200 {
-                return [GitHubWorkflow(message: HTTPURLResponse.localizedString(forStatusCode: response.statusCode))]
-            }
-            let workflowResponse = try JSONDecoder().decode(WorflowResponse.self, from: data)
-            return workflowResponse.workflows
-        } catch {
-            return [GitHubWorkflow(message: error.localizedDescription)]
+        let (workflowResponse, message): (WorflowResponse?, String) = await GitHubAPI.sendRequest(request: request)
+        guard let workflowResponse else {
+            return [GitHubWorkflow(message: message)]
         }
+        return workflowResponse.workflows
     }
 
     struct WorflowResponse: Decodable {

CCMenu/Source/Server Monitor/GitHubAPI.swift

@@ -117,6 +117,31 @@ class GitHubAPI {
     }
 
 
+    // MARK: - send requests
+
+    static func sendRequest<T>(request: URLRequest) async -> (T?, String) where T: Decodable {
+        do {
+            let (data, response) = try await URLSession.feedSession.data(for: request)
+            guard let response = response as? HTTPURLResponse else { throw URLError(.unsupportedURL) }
+            if response.statusCode == 403 || response.statusCode == 429 {
+                if let v = response.value(forHTTPHeaderField: "x-ratelimit-remaining"), Int(v) == 0  {
+                    // HTTPURLResponse doesn't have a specific message for code 429
+                    return (nil, "too many requests")
+                } else {
+                    return (nil, HTTPURLResponse.localizedString(forStatusCode: response.statusCode))
+                }
+            }
+            if response.statusCode != 200 {
+                return (nil, HTTPURLResponse.localizedString(forStatusCode: response.statusCode))
+            }
+            return (try JSONDecoder().decode(T.self, from: data), "OK")
+        } catch {
+            return (nil, error.localizedDescription)
+        }
+    }
+
+
+
     // MARK: - helper functions
 
     private static func baseURL(forAPI: Bool) -> String {