Geo: fallback chain — custom domain → workers.dev → locale

Author: sghcto

Tickr/Services/AdService.swift

@@ -62,29 +62,42 @@ class AdService: ObservableObject {
     // The Worker reads request.cf.country server-side (trusted, can't be spoofed)
     // and returns the 2-letter country code as the response body.
     // Fallback: ipapi.co → system locale
-    private static let geoEndpoint = "https://service.h4ux.com/geo-service"
+    private static let geoEndpoints = [
+        "https://service.h4ux.com/geo-service",
+        "https://billowing-term-c225.alon-f46.workers.dev",
+    ]
 
     private init() {
         self.userCountry = UserDefaults.standard.string(forKey: Self.countryKey)
             ?? Locale.current.region?.identifier ?? "US"
         self.currentAd = Self.defaultAd
-        detectCountryThenFetchAds()
+        detectCountryThenFetchAds(endpointIndex: 0)
     }
 
-    private func detectCountryThenFetchAds() {
-        guard let url = URL(string: Self.geoEndpoint) else { fetchAds(); return }
+    private func detectCountryThenFetchAds(endpointIndex: Int) {
+        guard endpointIndex < Self.geoEndpoints.count,
+              let url = URL(string: Self.geoEndpoints[endpointIndex]) else {
+            fetchAds(); return
+        }
 
         var request = URLRequest(url: url)
         request.setValue(Secrets.geoWorkerKey, forHTTPHeaderField: "X-Tickr-Key")
+        request.timeoutInterval = 5
+
+        URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
+            let http = response as? HTTPURLResponse
 
-        URLSession.shared.dataTask(with: request) { [weak self] data, _, _ in
-            if let data = data,
+            // Check if we got a valid 2-letter country code
+            if let data = data, http?.statusCode == 200,
                let code = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines),
                code.count == 2, code != "XX" {
                 UserDefaults.standard.set(code, forKey: Self.countryKey)
                 DispatchQueue.main.async { self?.userCountry = code }
+                self?.fetchAds()
+            } else {
+                // Fallback to next endpoint
+                self?.detectCountryThenFetchAds(endpointIndex: endpointIndex + 1)
             }
-            self?.fetchAds()
         }.resume()
     }