Fix SerpAPI

Author: intitni

Tool/Sources/Preferences/Keys.swift

@@ -586,8 +586,8 @@ public extension UserDefaultPreferenceKeys {
 
 public extension UserDefaultPreferenceKeys {
     enum SearchProvider: String, Codable, CaseIterable {
-        case serpAPI
         case headlessBrowser
+        case serpAPI
     }
 
     enum SerpAPIEngine: String, Codable, CaseIterable {
@@ -612,6 +612,10 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: .google, key: "SerpAPIEngine")
     }
 
+    var serpAPIKeyName: PreferenceKey<String> {
+        .init(defaultValue: "", key: "SerpAPIKeyName")
+    }
+    
     var headlessBrowserEngine: PreferenceKey<HeadlessBrowserEngine> {
         .init(defaultValue: .google, key: "HeadlessBrowserEngine")
     }

Tool/Sources/WebSearchService/SearchServices/SerpAPISearchService.swift

@@ -1,31 +1,22 @@
 import Foundation
 
 struct SerpAPIResponse: Codable {
-    var searchMetadata: SearchMetadata
-    var organicResults: [OrganicResult]
-
-    struct SearchMetadata: Codable {
-        var id: String
-        var status: String
-        var jsonEndpoint: String
-        var createdAt: String
-        var processedAt: String
-        var totalTimeTaken: Double
-    }
+    var organic_results: [OrganicResult]
 
     struct OrganicResult: Codable {
-        var position: Int
-        var title: String
-        var link: String
-        var snippet: String
+        var position: Int?
+        var title: String?
+        var link: String?
+        var snippet: String?
 
-        func toWebSearchResult() -> WebSearchResult.WebPage {
-            return WebSearchResult.WebPage(urlString: link, title: title, snippet: snippet)
+        func toWebSearchResult() -> WebSearchResult.WebPage? {
+            guard let link, let title else { return nil }
+            return WebSearchResult.WebPage(urlString: link, title: title, snippet: snippet ?? "")
         }
     }
 
     func toWebSearchResult() -> WebSearchResult {
-        return WebSearchResult(webPages: organicResults.map { $0.toWebSearchResult() })
+        return WebSearchResult(webPages: organic_results.compactMap { $0.toWebSearchResult() })
     }
 }
 

Tool/Sources/WebSearchService/WebSearchService.swift

@@ -25,20 +25,19 @@ public enum WebSearchProvider {
         switch UserDefaults.shared.value(for: \.searchProvider) {
         case .headlessBrowser:
             return .headlessBrowser(.init(
-                rawValue: UserDefaults.shared.value(for: \.headlessBrowserEngine)
-                    .rawValue
+                rawValue: UserDefaults.shared.value(for: \.headlessBrowserEngine).rawValue
             ) ?? .google)
         case .serpAPI:
+            let apiKeyName = UserDefaults.shared.value(for: \.serpAPIKeyName)
             return .serpAPI(.init(
-                rawValue: UserDefaults.shared.value(for: \.headlessBrowserEngine)
-                    .rawValue
-            ) ?? .google, apiKey: (try? Keychain.apiKey.get("SerpAPIKey")) ?? "")
+                rawValue: UserDefaults.shared.value(for: \.serpAPIEngine).rawValue
+            ) ?? .google, apiKey: (try? Keychain.apiKey.get(apiKeyName)) ?? "")
         }
     }
 }
 
-public struct WebSearchResult {
-    public struct WebPage {
+public struct WebSearchResult: Equatable {
+    public struct WebPage: Equatable {
         public var urlString: String
         public var title: String
         public var snippet: String