@aguacerowx/react-native 0.0.50 → 0.0.52

package/ios/SatelliteLayerView.swift

@@ -381,10 +381,17 @@ public final class SatelliteLayerView: UIView {
             if !bundleId.isEmpty {
                 req.setValue(bundleId, forHTTPHeaderField: "x-app-identifier")
             }
-            // Match WeatherFrameProcessorModule + AguaceroCore grid fetch (CloudFront allowlists often require these on RN).
-            if !gridRequestSiteOrigin.isEmpty {
-                req.setValue(gridRequestSiteOrigin, forHTTPHeaderField: "Origin")
-                req.setValue("\(gridRequestSiteOrigin)/", forHTTPHeaderField: "Referer")
+            // Match WeatherFrameProcessorModule + AguaceroCore grid fetch (CloudFront returns 403 without Origin on RN).
+            var gridOrigin = gridRequestSiteOrigin.trimmingCharacters(in: .whitespacesAndNewlines)
+            if gridOrigin.isEmpty {
+                gridOrigin = "https://localhost"
+            }
+            while gridOrigin.hasSuffix("/") {
+                gridOrigin.removeLast()
+            }
+            if !gridOrigin.isEmpty {
+                req.setValue(gridOrigin, forHTTPHeaderField: "Origin")
+                req.setValue("\(gridOrigin)/", forHTTPHeaderField: "Referer")
             }
 
             let sem = DispatchSemaphore(value: 0)

package/ios/WeatherFrameProcessorModule.swift

@@ -1,189 +1,223 @@
-import Foundation
-import React
-
-@objc(WeatherFrameProcessorModule)
-class WeatherFrameProcessorModule: NSObject {
-
-    private var currentRunToken = 0
-    private let session = URLSession(configuration: .default)
-
-    // MARK: - Performance Helper
-    private func getMemoryUsage() -> String {
-        var taskInfo = mach_task_basic_info()
-        var count = mach_msg_type_number_t(MemoryLayout<mach_task_basic_info>.size)/4
-        let kerr: kern_return_t = withUnsafeMutablePointer(to: &taskInfo) {
-            $0.withMemoryRebound(to: integer_t.self, capacity: 1) {
-                task_info(mach_task_self_, task_flavor_t(MACH_TASK_BASIC_INFO), $0, &count)
-            }
-        }
-        if kerr == KERN_SUCCESS {
-            let usedMB = Float(taskInfo.resident_size) / 1024.0 / 1024.0
-            return String(format: "%.2f MB", usedMB)
-        }
-        return "Unknown"
-    }
-
-    @objc(cancelAllFrames)
-    func cancelAllFrames() {
-        currentRunToken += 1
-        print("🔍 [WeatherFrameProcessor] cancelAllFrames → new runToken=\(currentRunToken) (in-flight fetches will reject with E_CANCELLED). RAM: \(getMemoryUsage())")
-    }
-
-    @objc(processFrame:resolver:rejecter:)
-    func processFrame(options: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        let taskToken = self.currentRunToken
-        let startTime = CFAbsoluteTimeGetCurrent()
-
-        guard let urlString = options["url"] as? String, let url = URL(string: urlString) else {
-            print("🔍 [WeatherFrameProcessor] processFrame REJECT invalid url options=\(options.keys.sorted())")
-            reject("INVALID_URL", "The provided URL is not valid.", nil)
-            return
-        }
-        
-        // Extract filename for log identification
-        let fileId = url.lastPathComponent
-        print("🔍 [WeatherFrameProcessor] processFrame START fileId=\(fileId) host=\(url.host ?? "?") runToken=\(taskToken) RAM=\(getMemoryUsage())")
-
-        let apiKey = options["apiKey"] as? String ?? ""
-        let bundleId = options["bundleId"] as? String
-
-        var request = URLRequest(url: url)
-        request.setValue(apiKey, forHTTPHeaderField: "x-api-key")
-        if let bundleId = bundleId, !bundleId.isEmpty {
-            request.setValue(bundleId, forHTTPHeaderField: "x-app-identifier")
-        }
-        if let site = options["gridRequestSiteOrigin"] as? String {
-            var origin = site.trimmingCharacters(in: .whitespacesAndNewlines)
-            while origin.hasSuffix("/") {
-                origin.removeLast()
-            }
-            if !origin.isEmpty {
-                request.setValue(origin, forHTTPHeaderField: "Origin")
-                request.setValue("\(origin)/", forHTTPHeaderField: "Referer")
-            }
-        }
-
-        let task = session.dataTask(with: request) { data, response, error in
-            let fetchDuration = (CFAbsoluteTimeGetCurrent() - startTime) * 1000
-
-            // Must reject so JS `await processFrame` does not hang forever (otherwise WeatherLayerManager
-            // leaves hasPreloadedRef stuck and grid data never loads after cancelAllFrames).
-            let finishCancelled = {
-                print("⚡️ [PERF] [WeatherFrameProcessor] CANCELLED: \(fileId) after \(String(format: "%.2f", fetchDuration))ms")
-                DispatchQueue.main.async {
-                    reject("E_CANCELLED", "Weather frame fetch superseded", nil)
-                }
-            }
-
-            if self.currentRunToken != taskToken {
-                print("🔍 [WeatherFrameProcessor] \(fileId) aborted: runToken mismatch (task=\(taskToken) current=\(self.currentRunToken)) → E_CANCELLED")
-                finishCancelled()
-                return
-            }
-
-            if let error = error {
-                print("🔍 [WeatherFrameProcessor] \(fileId) NETWORK_ERROR: \(error.localizedDescription)")
-                reject("NETWORK_ERROR", "Failed to fetch frame data: \(error.localizedDescription)", error)
-                return
-            }
-
-            guard let httpResponse = response as? HTTPURLResponse, (200...299).contains(httpResponse.statusCode) else {
-                let statusCode = (response as? HTTPURLResponse)?.statusCode ?? -1
-                print("🔍 [WeatherFrameProcessor] \(fileId) HTTP_ERROR status=\(statusCode)")
-                reject("HTTP_ERROR", "HTTP request failed with status code: \(statusCode)", nil)
-                return
-            }
-
-            guard let data = data else {
-                print("🔍 [WeatherFrameProcessor] \(fileId) NO_DATA")
-                reject("NO_DATA", "The server returned no data.", nil)
-                return
-            }
-            
-            print("⚡️ [PERF] [WeatherFrameProcessor] NETWORK DONE: \(fileId) | Time: \(String(format: "%.2f", fetchDuration))ms | Size: \(data.count / 1024)KB | RAM: \(self.getMemoryUsage())")
-
-            do {
-                // 1. JSON Parsing
-                let jsonStart = CFAbsoluteTimeGetCurrent()
-                guard let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
-                    print("🔍 [WeatherFrameProcessor] \(fileId) INVALID_RESPONSE: top-level JSON not object")
-                    reject("INVALID_RESPONSE", "The API response format was invalid JSON.", nil)
-                    return
-                }
-                let jsonTime = (CFAbsoluteTimeGetCurrent() - jsonStart) * 1000
-                
-                guard let b64CompressedData = jsonResponse["data"] as? String,
-                      let encoding = jsonResponse["encoding"] as? [String: Any],
-                      let scale = encoding["scale"] as? NSNumber,
-                      let offset = encoding["offset"] as? NSNumber,
-                      let missing = encoding["missing_quantized"] as? NSNumber else {
-                    let encKeys = (jsonResponse["encoding"] as? [String: Any])?.keys.sorted() ?? []
-                    print("🔍 [WeatherFrameProcessor] \(fileId) INVALID_RESPONSE: keys=\(Array(jsonResponse.keys).sorted()) encodingKeys=\(encKeys)")
-                    reject("INVALID_RESPONSE", "The API response format was invalid structure.", nil)
-                    return
-                }
-                
-                // 2. Base64 Decoding
-                let decodeStart = CFAbsoluteTimeGetCurrent()
-                guard let compressedData = Data(base64Encoded: b64CompressedData) else {
-                    print("🔍 [WeatherFrameProcessor] \(fileId) DECODING_ERROR: base64 decode failed (b64 len=\(b64CompressedData.count))")
-                    reject("DECODING_ERROR", "Failed to decode base64 data string.", nil)
-                    return
-                }
-                let decodeTime = (CFAbsoluteTimeGetCurrent() - decodeStart) * 1000
-
-                // 3. Disk Write
-                let writeStart = CFAbsoluteTimeGetCurrent()
-                let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-                let fileName = "frame_\(urlString.hashValue).zst"
-                let dataFile = cacheDir.appendingPathComponent(fileName)
-                
-                try compressedData.write(to: dataFile)
-                let writeTime = (CFAbsoluteTimeGetCurrent() - writeStart) * 1000
-
-                var responseMap: [String: Any] = [
-                    "filePath": dataFile.path,
-                    "scale": scale,
-                    "offset": offset,
-                    "missing": missing,
-                ]
-                
-                if let scaleType = encoding["scale_type"] as? String {
-                    responseMap["scaleType"] = scaleType
-                }
-
-                let totalTime = (CFAbsoluteTimeGetCurrent() - startTime) * 1000
-                
-                print("""
-                ⚡️ [PERF] [WeatherFrameProcessor] FINISHED: \(fileId)
-                   - Total: \(String(format: "%.2f", totalTime))ms
-                   - JSON: \(String(format: "%.2f", jsonTime))ms
-                   - B64 Decode: \(String(format: "%.2f", decodeTime))ms
-                   - Disk Write: \(String(format: "%.2f", writeTime))ms
-                   - RAM End: \(self.getMemoryUsage())
-                """)
-
-                if self.currentRunToken != taskToken {
-                    print("🔍 [WeatherFrameProcessor] \(fileId) discarded after disk write: runToken mismatch before resolve")
-                    finishCancelled()
-                    return
-                }
-                DispatchQueue.main.async {
-                    print("🔍 [WeatherFrameProcessor] \(fileId) RESOLVE ok path=\(dataFile.path)")
-                    resolve(responseMap)
-                }
-
-            } catch {
-                print("🔍 [WeatherFrameProcessor] \(fileId) PROCESSING_ERROR: \(error.localizedDescription)")
-                reject("PROCESSING_ERROR", "Failed to process the frame data: \(error.localizedDescription)", error)
-            }
-        }
-        print("🔍 [WeatherFrameProcessor] \(fileId) URLSession.dataTask.resume() (runToken=\(taskToken))")
-        task.resume()
-    }
-    
-    @objc
-    static func requiresMainQueueSetup() -> Bool {
-        return false
-    }
+import Foundation
+import React
+
+@objc(WeatherFrameProcessorModule)
+class WeatherFrameProcessorModule: NSObject {
+
+    private var currentRunToken = 0
+    private let session = URLSession(configuration: .default)
+
+    // MARK: - Performance Helper
+    private func getMemoryUsage() -> String {
+        var taskInfo = mach_task_basic_info()
+        var count = mach_msg_type_number_t(MemoryLayout<mach_task_basic_info>.size)/4
+        let kerr: kern_return_t = withUnsafeMutablePointer(to: &taskInfo) {
+            $0.withMemoryRebound(to: integer_t.self, capacity: 1) {
+                task_info(mach_task_self_, task_flavor_t(MACH_TASK_BASIC_INFO), $0, &count)
+            }
+        }
+        if kerr == KERN_SUCCESS {
+            let usedMB = Float(taskInfo.resident_size) / 1024.0 / 1024.0
+            return String(format: "%.2f MB", usedMB)
+        }
+        return "Unknown"
+    }
+
+    @objc(cancelAllFrames)
+    func cancelAllFrames() {
+        currentRunToken += 1
+        print("🔍 [WeatherFrameProcessor] cancelAllFrames → new runToken=\(currentRunToken) (in-flight fetches will reject with E_CANCELLED). RAM: \(getMemoryUsage())")
+    }
+
+    @objc(processFrame:resolver:rejecter:)
+    func processFrame(options: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        let taskToken = self.currentRunToken
+        let startTime = CFAbsoluteTimeGetCurrent()
+
+        guard let urlString = options["url"] as? String, let url = URL(string: urlString) else {
+            print("🔍 [WeatherFrameProcessor] processFrame REJECT invalid url options=\(options.keys.sorted())")
+            reject("INVALID_URL", "The provided URL is not valid.", nil)
+            return
+        }
+        
+        // Extract filename for log identification
+        let fileId = url.lastPathComponent
+        print("🔍 [WeatherFrameProcessor] processFrame START fileId=\(fileId) host=\(url.host ?? "?") runToken=\(taskToken) RAM=\(getMemoryUsage())")
+
+        let apiKey = options["apiKey"] as? String ?? ""
+        let bundleId = options["bundleId"] as? String
+        let debug = (options["debug"] as? Bool) == true
+        let gridOriginOpt = options["gridRequestSiteOrigin"] as? String
+        let fallbackGridOrigin = "https://localhost"
+
+        var request = URLRequest(url: url)
+        request.setValue(apiKey, forHTTPHeaderField: "x-api-key")
+        if let bundleId = bundleId, !bundleId.isEmpty {
+            request.setValue(bundleId, forHTTPHeaderField: "x-app-identifier")
+        }
+        var originCandidate = (gridOriginOpt ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        if originCandidate.isEmpty {
+            originCandidate = fallbackGridOrigin
+        }
+        var origin = originCandidate
+        while origin.hasSuffix("/") {
+            origin.removeLast()
+        }
+        if !origin.isEmpty {
+            request.setValue(origin, forHTTPHeaderField: "Origin")
+            request.setValue("\(origin)/", forHTTPHeaderField: "Referer")
+        }
+
+        if debug {
+            let redacted = urlString.replacingOccurrences(
+                of: #"([?&])apiKey=[^&]*"#,
+                with: "$1apiKey=(redacted)",
+                options: .regularExpression
+            )
+            let bundleStr = (bundleId?.isEmpty == false) ? bundleId! : "(none)"
+            let originStr = (gridOriginOpt?.isEmpty == false) ? gridOriginOpt! : "(none)"
+            print("[AguaceroRN][debug][FrameProcessor] REQUEST url=\(redacted) apiKey.len=\(apiKey.count) bundleId=\(bundleStr) gridOrigin=\(originStr)")
+        }
+
+        let task = session.dataTask(with: request) { data, response, error in
+            let fetchDuration = (CFAbsoluteTimeGetCurrent() - startTime) * 1000
+
+            // Must reject so JS `await processFrame` does not hang forever (otherwise WeatherLayerManager
+            // leaves hasPreloadedRef stuck and grid data never loads after cancelAllFrames).
+            let finishCancelled = {
+                print("⚡️ [PERF] [WeatherFrameProcessor] CANCELLED: \(fileId) after \(String(format: "%.2f", fetchDuration))ms")
+                DispatchQueue.main.async {
+                    reject("E_CANCELLED", "Weather frame fetch superseded", nil)
+                }
+            }
+
+            if self.currentRunToken != taskToken {
+                print("🔍 [WeatherFrameProcessor] \(fileId) aborted: runToken mismatch (task=\(taskToken) current=\(self.currentRunToken)) → E_CANCELLED")
+                finishCancelled()
+                return
+            }
+
+            if let error = error {
+                print("🔍 [WeatherFrameProcessor] \(fileId) NETWORK_ERROR: \(error.localizedDescription)")
+                reject("NETWORK_ERROR", "Failed to fetch frame data: \(error.localizedDescription)", error)
+                return
+            }
+
+            guard let httpResponse = response as? HTTPURLResponse, (200...299).contains(httpResponse.statusCode) else {
+                let statusCode = (response as? HTTPURLResponse)?.statusCode ?? -1
+                if debug {
+                    let redacted = urlString.replacingOccurrences(
+                        of: #"([?&])apiKey=[^&]*"#,
+                        with: "$1apiKey=(redacted)",
+                        options: .regularExpression
+                    )
+                    var bodySnippet = ""
+                    if let data = data, let text = String(data: data, encoding: .utf8) {
+                        bodySnippet = text.count > 512 ? String(text.prefix(512)) + "…" : text
+                    }
+                    let bundleStr = (bundleId?.isEmpty == false) ? bundleId! : "(none)"
+                    let originStr = (gridOriginOpt?.isEmpty == false) ? gridOriginOpt! : "(none)"
+                    print("[AguaceroRN][debug][FrameProcessor] HTTP_ERROR status=\(statusCode) url=\(redacted) apiKey.len=\(apiKey.count) bundleId=\(bundleStr) gridOrigin=\(originStr) body=\(bodySnippet)")
+                    if statusCode == 403 {
+                        print("[AguaceroRN][debug][FrameProcessor] 403 hint: verify API key, allowlisted bundleId (x-app-identifier), and gridRequestSiteOrigin (Origin/Referer) match your web app.")
+                    }
+                } else {
+                    print("🔍 [WeatherFrameProcessor] \(fileId) HTTP_ERROR status=\(statusCode)")
+                }
+                reject("HTTP_ERROR", "HTTP request failed with status code: \(statusCode)", nil)
+                return
+            }
+
+            guard let data = data else {
+                print("🔍 [WeatherFrameProcessor] \(fileId) NO_DATA")
+                reject("NO_DATA", "The server returned no data.", nil)
+                return
+            }
+            
+            print("⚡️ [PERF] [WeatherFrameProcessor] NETWORK DONE: \(fileId) | Time: \(String(format: "%.2f", fetchDuration))ms | Size: \(data.count / 1024)KB | RAM: \(self.getMemoryUsage())")
+
+            do {
+                // 1. JSON Parsing
+                let jsonStart = CFAbsoluteTimeGetCurrent()
+                guard let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
+                    print("🔍 [WeatherFrameProcessor] \(fileId) INVALID_RESPONSE: top-level JSON not object")
+                    reject("INVALID_RESPONSE", "The API response format was invalid JSON.", nil)
+                    return
+                }
+                let jsonTime = (CFAbsoluteTimeGetCurrent() - jsonStart) * 1000
+                
+                guard let b64CompressedData = jsonResponse["data"] as? String,
+                      let encoding = jsonResponse["encoding"] as? [String: Any],
+                      let scale = encoding["scale"] as? NSNumber,
+                      let offset = encoding["offset"] as? NSNumber,
+                      let missing = encoding["missing_quantized"] as? NSNumber else {
+                    let encKeys = (jsonResponse["encoding"] as? [String: Any])?.keys.sorted() ?? []
+                    print("🔍 [WeatherFrameProcessor] \(fileId) INVALID_RESPONSE: keys=\(Array(jsonResponse.keys).sorted()) encodingKeys=\(encKeys)")
+                    reject("INVALID_RESPONSE", "The API response format was invalid structure.", nil)
+                    return
+                }
+                
+                // 2. Base64 Decoding
+                let decodeStart = CFAbsoluteTimeGetCurrent()
+                guard let compressedData = Data(base64Encoded: b64CompressedData) else {
+                    print("🔍 [WeatherFrameProcessor] \(fileId) DECODING_ERROR: base64 decode failed (b64 len=\(b64CompressedData.count))")
+                    reject("DECODING_ERROR", "Failed to decode base64 data string.", nil)
+                    return
+                }
+                let decodeTime = (CFAbsoluteTimeGetCurrent() - decodeStart) * 1000
+
+                // 3. Disk Write
+                let writeStart = CFAbsoluteTimeGetCurrent()
+                let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
+                let fileName = "frame_\(urlString.hashValue).zst"
+                let dataFile = cacheDir.appendingPathComponent(fileName)
+                
+                try compressedData.write(to: dataFile)
+                let writeTime = (CFAbsoluteTimeGetCurrent() - writeStart) * 1000
+
+                var responseMap: [String: Any] = [
+                    "filePath": dataFile.path,
+                    "scale": scale,
+                    "offset": offset,
+                    "missing": missing,
+                ]
+                
+                if let scaleType = encoding["scale_type"] as? String {
+                    responseMap["scaleType"] = scaleType
+                }
+
+                let totalTime = (CFAbsoluteTimeGetCurrent() - startTime) * 1000
+                
+                print("""
+                ⚡️ [PERF] [WeatherFrameProcessor] FINISHED: \(fileId)
+                   - Total: \(String(format: "%.2f", totalTime))ms
+                   - JSON: \(String(format: "%.2f", jsonTime))ms
+                   - B64 Decode: \(String(format: "%.2f", decodeTime))ms
+                   - Disk Write: \(String(format: "%.2f", writeTime))ms
+                   - RAM End: \(self.getMemoryUsage())
+                """)
+
+                if self.currentRunToken != taskToken {
+                    print("🔍 [WeatherFrameProcessor] \(fileId) discarded after disk write: runToken mismatch before resolve")
+                    finishCancelled()
+                    return
+                }
+                DispatchQueue.main.async {
+                    print("🔍 [WeatherFrameProcessor] \(fileId) RESOLVE ok path=\(dataFile.path)")
+                    resolve(responseMap)
+                }
+
+            } catch {
+                print("🔍 [WeatherFrameProcessor] \(fileId) PROCESSING_ERROR: \(error.localizedDescription)")
+                reject("PROCESSING_ERROR", "Failed to process the frame data: \(error.localizedDescription)", error)
+            }
+        }
+        print("🔍 [WeatherFrameProcessor] \(fileId) URLSession.dataTask.resume() (runToken=\(taskToken))")
+        task.resume()
+    }
+    
+    @objc
+    static func requiresMainQueueSetup() -> Bool {
+        return false
+    }
 }