@aguacerowx/react-native 0.0.50 → 0.0.52

package/android/src/main/java/com/aguacerowx/reactnative/SatelliteLayerView.java

@@ -299,9 +299,17 @@ public class SatelliteLayerView extends FrameLayout {
                             reqBuilder.header("x-app-identifier", bundleId);
                         }
                         // Match WeatherFrameProcessorModule + AguaceroCore grid fetch (CloudFront allowlists on RN).
-                        if (gridRequestSiteOrigin != null && !gridRequestSiteOrigin.isEmpty()) {
-                            reqBuilder.header("Origin", gridRequestSiteOrigin);
-                            reqBuilder.header("Referer", gridRequestSiteOrigin + "/");
+                        String gridOrigin = gridRequestSiteOrigin;
+                        if (gridOrigin == null || gridOrigin.trim().isEmpty()) {
+                            gridOrigin = "https://localhost";
+                        }
+                        gridOrigin = gridOrigin.trim();
+                        while (gridOrigin.endsWith("/")) {
+                            gridOrigin = gridOrigin.substring(0, gridOrigin.length() - 1);
+                        }
+                        if (!gridOrigin.isEmpty()) {
+                            reqBuilder.header("Origin", gridOrigin);
+                            reqBuilder.header("Referer", gridOrigin + "/");
                         }
                         Request req = reqBuilder.build();
                         Call call = HTTP.newCall(req);

package/android/src/main/java/com/aguacerowx/reactnative/WeatherFrameProcessorModule.java

@@ -1,276 +1,316 @@
-package com.aguacerowx.reactnative;
-
-import androidx.annotation.NonNull;
-import android.util.Base64;
-import android.util.Log;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.ConnectionPool;
-import okhttp3.Dispatcher;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
-
-    private static final String TAG = "AguaceroWX_Perf";
-    private final AtomicInteger currentRunToken = new AtomicInteger(0);
-    private final ReactApplicationContext reactContext;
-    private final OkHttpClient httpClient;
-    
-    // FIX 1: Use an ExecutorService instead of "new Thread()". 
-    // CachedThreadPool reuses threads and scales down when idle.
-    private final ExecutorService taskExecutor = Executors.newCachedThreadPool();
-
-    // FIX 2: Reduce concurrency to 4. 
-    // 6 concurrent JSON parsings + Base64 decodings causes GC thrashing on mobile.
-    // 4 is the "sweet spot" for throughput vs memory.
-    private static final int MAX_CONCURRENT = 4;
-    private final Semaphore semaphore = new Semaphore(MAX_CONCURRENT, true);
-
-    private final Set<Call> activeCalls = Collections.newSetFromMap(new ConcurrentHashMap<>());
-
-    WeatherFrameProcessorModule(ReactApplicationContext context) {
-        super(context);
-        this.reactContext = context;
-
-        Dispatcher dispatcher = new Dispatcher();
-        dispatcher.setMaxRequests(64);
-        dispatcher.setMaxRequestsPerHost(32);
-
-        this.httpClient = new OkHttpClient.Builder()
-            .dispatcher(dispatcher)
-            .connectionPool(new ConnectionPool(MAX_CONCURRENT, 30, TimeUnit.SECONDS))
-            .connectTimeout(15, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .writeTimeout(15, TimeUnit.SECONDS)
-            .build();
-    }
-
-    @ReactMethod
-    public void cancelAllFrames() {
-        currentRunToken.incrementAndGet();
-
-        for (Call call : activeCalls) {
-            if (!call.isCanceled()) {
-                call.cancel();
-            }
-        }
-        activeCalls.clear();
-
-        // Release all semaphore permits to unblock the Executor queue
-        semaphore.drainPermits();
-        semaphore.release(MAX_CONCURRENT);
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "WeatherFrameProcessorModule";
-    }
-
-    @ReactMethod
-    public void processFrame(ReadableMap options, Promise promise) {
-        final int taskToken = currentRunToken.get();
-
-        final String urlString = options.getString("url");
-        final String apiKey = options.getString("apiKey");
-        final String bundleId = options.hasKey("bundleId") ? options.getString("bundleId") : null;
-        final String gridRequestSiteOrigin =
-                options.hasKey("gridRequestSiteOrigin") && !options.isNull("gridRequestSiteOrigin")
-                        ? options.getString("gridRequestSiteOrigin")
-                        : null;
-
-        // FIX 3: Submit to Executor instead of spinning up a raw OS thread
-        taskExecutor.execute(() -> {
-            try {
-                if (currentRunToken.get() != taskToken) {
-                    promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                    return;
-                }
-
-                // This blocks the Executor thread (which is fine, it's a pool) 
-                // until a slot is available
-                semaphore.acquire();
-
-                if (currentRunToken.get() != taskToken) {
-                    semaphore.release();
-                    promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                    return;
-                }
-
-                Request.Builder requestBuilder = new Request.Builder()
-                        .url(urlString)
-                        .header("x-api-key", apiKey);
-                if (bundleId != null && !bundleId.isEmpty()) {
-                    requestBuilder.header("x-app-identifier", bundleId);
-                }
-                if (gridRequestSiteOrigin != null) {
-                    String origin = gridRequestSiteOrigin.trim();
-                    while (origin.endsWith("/")) {
-                        origin = origin.substring(0, origin.length() - 1);
-                    }
-                    if (!origin.isEmpty()) {
-                        requestBuilder.header("Origin", origin);
-                        requestBuilder.header("Referer", origin + "/");
-                    }
-                }
-                Request request = requestBuilder.build();
-
-                Call call = httpClient.newCall(request);
-                activeCalls.add(call);
-
-                call.enqueue(new Callback() {
-                    @Override
-                    public void onFailure(@NonNull Call call, @NonNull IOException e) {
-                        activeCalls.remove(call);
-                        semaphore.release(); // IMPORTANT: Release immediately on fail
-                        
-                        if (currentRunToken.get() != taskToken) {
-                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                            return;
-                        }
-                        if (!call.isCanceled()) {
-                            Log.e(TAG, "[FrameProcessor] Network failure: " + e.getMessage());
-                            promise.reject("NETWORK_ERROR", e.getMessage(), e);
-                        } else {
-                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                        }
-                    }
-
-                    @Override
-                    public void onResponse(@NonNull Call call, @NonNull Response response) {
-                        activeCalls.remove(call);
-                        // NOTE: We hold the semaphore until processing is done to prevent
-                        // CPU saturation from JSON parsing.
-                        
-                        // Check token immediately
-                        if (currentRunToken.get() != taskToken) {
-                            response.close();
-                            semaphore.release();
-                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                            return;
-                        }
-
-                        FileOutputStream fos = null;
-                        try {
-                            if (!response.isSuccessful()) {
-                                promise.reject("HTTP_ERROR", "HTTP " + response.code());
-                                return;
-                            }
-
-                            ResponseBody body = response.body();
-                            if (body == null) {
-                                promise.reject("NO_DATA", "Response body was null");
-                                return;
-                            }
-
-                            byte[] bodyBytes = body.bytes();
-
-                            if (currentRunToken.get() != taskToken) {
-                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                                return;
-                            }
-
-                            // JSON parse
-                            String jsonString = new String(bodyBytes);
-                            bodyBytes = null; // FIX 4: Nullify immediately to help GC
-                            
-                            JSONObject jsonResponse = new JSONObject(jsonString);
-                            jsonString = null; // FIX 4: Nullify immediately
-
-                            if (!jsonResponse.has("data") || !jsonResponse.has("encoding")) {
-                                promise.reject("INVALID_RESPONSE", "Invalid API response structure");
-                                return;
-                            }
-                            
-                            String b64CompressedData = jsonResponse.getString("data");
-                            JSONObject encoding = jsonResponse.getJSONObject("encoding");
-                            
-                            // Don't need the huge JSON object anymore
-                            jsonResponse = null;
-
-                            // Base64 decode
-                            byte[] compressedData = Base64.decode(b64CompressedData, Base64.DEFAULT);
-                            b64CompressedData = null; // FIX 4: Nullify immediately
-
-                            if (currentRunToken.get() != taskToken) {
-                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                                return;
-                            }
-
-                            // Disk write
-                            File cacheDir = reactContext.getCacheDir();
-                            // Use a unique name based on hash
-                            String fileName = "frame_" + urlString.hashCode() + ".zst";
-                            File dataFile = new File(cacheDir, fileName);
-                            
-                            fos = new FileOutputStream(dataFile);
-                            fos.write(compressedData);
-                            fos.flush();
-
-                            WritableMap responseMap = Arguments.createMap();
-                            responseMap.putString("filePath", dataFile.getAbsolutePath());
-                            responseMap.putDouble("scale", encoding.getDouble("scale"));
-                            responseMap.putDouble("offset", encoding.getDouble("offset"));
-                            responseMap.putDouble("missing", encoding.getDouble("missing_quantized"));
-                            if (encoding.has("scale_type")) {
-                                responseMap.putString("scaleType", encoding.getString("scale_type"));
-                            }
-
-                            if (currentRunToken.get() != taskToken) {
-                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
-                                return;
-                            }
-
-                            promise.resolve(responseMap);
-
-                        } catch (Exception e) {
-                            if (currentRunToken.get() == taskToken) {
-                                Log.e(TAG, "[FrameProcessor] Error: " + e.getMessage(), e);
-                                promise.reject("PROCESSING_ERROR", e.getMessage(), e);
-                            }
-                        } finally {
-                            // FIX 5: Ensure resources are closed and semaphore is released
-                            if (fos != null) {
-                                try { fos.close(); } catch (IOException ex) { /* ignore */ }
-                            }
-                            response.close(); 
-                            semaphore.release();
-                        }
-                    }
-                });
-
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                // If interrupted while waiting for semaphore, just exit
-            } catch (Exception e) {
-                promise.reject("EXECUTION_ERROR", e.getMessage());
-            }
-        });
-    }
+package com.aguacerowx.reactnative;
+
+import androidx.annotation.NonNull;
+import android.util.Base64;
+import android.util.Log;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.ConnectionPool;
+import okhttp3.Dispatcher;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
+
+    private static final String TAG = "AguaceroWX_Perf";
+    /** CloudFront returns 403 without Origin; RN has no browser default. */
+    private static final String FALLBACK_GRID_REQUEST_SITE_ORIGIN = "https://localhost";
+    private final AtomicInteger currentRunToken = new AtomicInteger(0);
+    private final ReactApplicationContext reactContext;
+    private final OkHttpClient httpClient;
+    
+    // FIX 1: Use an ExecutorService instead of "new Thread()". 
+    // CachedThreadPool reuses threads and scales down when idle.
+    private final ExecutorService taskExecutor = Executors.newCachedThreadPool();
+
+    // FIX 2: Reduce concurrency to 4. 
+    // 6 concurrent JSON parsings + Base64 decodings causes GC thrashing on mobile.
+    // 4 is the "sweet spot" for throughput vs memory.
+    private static final int MAX_CONCURRENT = 4;
+    private final Semaphore semaphore = new Semaphore(MAX_CONCURRENT, true);
+
+    private final Set<Call> activeCalls = Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+    WeatherFrameProcessorModule(ReactApplicationContext context) {
+        super(context);
+        this.reactContext = context;
+
+        Dispatcher dispatcher = new Dispatcher();
+        dispatcher.setMaxRequests(64);
+        dispatcher.setMaxRequestsPerHost(32);
+
+        this.httpClient = new OkHttpClient.Builder()
+            .dispatcher(dispatcher)
+            .connectionPool(new ConnectionPool(MAX_CONCURRENT, 30, TimeUnit.SECONDS))
+            .connectTimeout(15, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .writeTimeout(15, TimeUnit.SECONDS)
+            .build();
+    }
+
+    @ReactMethod
+    public void cancelAllFrames() {
+        currentRunToken.incrementAndGet();
+
+        for (Call call : activeCalls) {
+            if (!call.isCanceled()) {
+                call.cancel();
+            }
+        }
+        activeCalls.clear();
+
+        // Release all semaphore permits to unblock the Executor queue
+        semaphore.drainPermits();
+        semaphore.release(MAX_CONCURRENT);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "WeatherFrameProcessorModule";
+    }
+
+    @ReactMethod
+    public void processFrame(ReadableMap options, Promise promise) {
+        final int taskToken = currentRunToken.get();
+
+        final String urlString = options.getString("url");
+        final String apiKey = options.getString("apiKey");
+        final String bundleId = options.hasKey("bundleId") ? options.getString("bundleId") : null;
+        final String gridRequestSiteOrigin =
+                options.hasKey("gridRequestSiteOrigin") && !options.isNull("gridRequestSiteOrigin")
+                        ? options.getString("gridRequestSiteOrigin")
+                        : null;
+        final boolean debug =
+                options.hasKey("debug") && !options.isNull("debug") && options.getBoolean("debug");
+
+        // FIX 3: Submit to Executor instead of spinning up a raw OS thread
+        taskExecutor.execute(() -> {
+            try {
+                if (currentRunToken.get() != taskToken) {
+                    promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                    return;
+                }
+
+                // This blocks the Executor thread (which is fine, it's a pool) 
+                // until a slot is available
+                semaphore.acquire();
+
+                if (currentRunToken.get() != taskToken) {
+                    semaphore.release();
+                    promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                    return;
+                }
+
+                Request.Builder requestBuilder = new Request.Builder()
+                        .url(urlString)
+                        .header("x-api-key", apiKey);
+                if (bundleId != null && !bundleId.isEmpty()) {
+                    requestBuilder.header("x-app-identifier", bundleId);
+                }
+                String originSource = gridRequestSiteOrigin;
+                if (originSource == null || originSource.trim().isEmpty()) {
+                    originSource = FALLBACK_GRID_REQUEST_SITE_ORIGIN;
+                }
+                String origin = originSource.trim();
+                while (origin.endsWith("/")) {
+                    origin = origin.substring(0, origin.length() - 1);
+                }
+                if (!origin.isEmpty()) {
+                    requestBuilder.header("Origin", origin);
+                    requestBuilder.header("Referer", origin + "/");
+                }
+                Request request = requestBuilder.build();
+
+                if (debug) {
+                    String redactedUrl = urlString.replaceAll("([?&])apiKey=[^&]*", "$1apiKey=(redacted)");
+                    Log.w("AguaceroRN", "[debug][FrameProcessor] REQUEST "
+                            + "method=GET url=" + redactedUrl
+                            + " apiKey.len=" + (apiKey != null ? apiKey.length() : 0)
+                            + " bundleId=" + (bundleId != null && !bundleId.isEmpty() ? bundleId : "(none)")
+                            + " gridOrigin=" + (gridRequestSiteOrigin != null ? gridRequestSiteOrigin : "(none)")
+                            + " headers=[x-api-key, "
+                            + (bundleId != null && !bundleId.isEmpty() ? "x-app-identifier, " : "")
+                            + (gridRequestSiteOrigin != null ? "Origin, Referer" : "no Origin/Referer")
+                            + "]");
+                }
+
+                Call call = httpClient.newCall(request);
+                activeCalls.add(call);
+
+                call.enqueue(new Callback() {
+                    @Override
+                    public void onFailure(@NonNull Call call, @NonNull IOException e) {
+                        activeCalls.remove(call);
+                        semaphore.release(); // IMPORTANT: Release immediately on fail
+                        
+                        if (currentRunToken.get() != taskToken) {
+                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                            return;
+                        }
+                        if (!call.isCanceled()) {
+                            Log.e(TAG, "[FrameProcessor] Network failure: " + e.getMessage());
+                            promise.reject("NETWORK_ERROR", e.getMessage(), e);
+                        } else {
+                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                        }
+                    }
+
+                    @Override
+                    public void onResponse(@NonNull Call call, @NonNull Response response) {
+                        activeCalls.remove(call);
+                        // NOTE: We hold the semaphore until processing is done to prevent
+                        // CPU saturation from JSON parsing.
+                        
+                        // Check token immediately
+                        if (currentRunToken.get() != taskToken) {
+                            response.close();
+                            semaphore.release();
+                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                            return;
+                        }
+
+                        FileOutputStream fos = null;
+                        try {
+                            if (!response.isSuccessful()) {
+                                if (debug) {
+                                    String bodyPeek = "";
+                                    try {
+                                        ResponseBody peekBody = response.peekBody(512);
+                                        if (peekBody != null) {
+                                            bodyPeek = peekBody.string();
+                                        }
+                                    } catch (Exception ignored) {
+                                        bodyPeek = "(unreadable)";
+                                    }
+                                    String redactedUrl = urlString.replaceAll("([?&])apiKey=[^&]*", "$1apiKey=(redacted)");
+                                    Log.e("AguaceroRN", "[debug][FrameProcessor] HTTP_ERROR code=" + response.code()
+                                            + " url=" + redactedUrl
+                                            + " apiKey.len=" + (apiKey != null ? apiKey.length() : 0)
+                                            + " bundleId=" + (bundleId != null && !bundleId.isEmpty() ? bundleId : "(none)")
+                                            + " gridOrigin=" + (gridRequestSiteOrigin != null ? gridRequestSiteOrigin : "(none)")
+                                            + " body=" + bodyPeek);
+                                    if (response.code() == 403) {
+                                        Log.e("AguaceroRN", "[debug][FrameProcessor] 403 hint: verify API key, allowlisted bundleId (x-app-identifier), and gridRequestSiteOrigin (Origin/Referer) match your web app.");
+                                    }
+                                }
+                                promise.reject("HTTP_ERROR", "HTTP " + response.code());
+                                return;
+                            }
+
+                            ResponseBody body = response.body();
+                            if (body == null) {
+                                promise.reject("NO_DATA", "Response body was null");
+                                return;
+                            }
+
+                            byte[] bodyBytes = body.bytes();
+
+                            if (currentRunToken.get() != taskToken) {
+                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                                return;
+                            }
+
+                            // JSON parse
+                            String jsonString = new String(bodyBytes);
+                            bodyBytes = null; // FIX 4: Nullify immediately to help GC
+                            
+                            JSONObject jsonResponse = new JSONObject(jsonString);
+                            jsonString = null; // FIX 4: Nullify immediately
+
+                            if (!jsonResponse.has("data") || !jsonResponse.has("encoding")) {
+                                promise.reject("INVALID_RESPONSE", "Invalid API response structure");
+                                return;
+                            }
+                            
+                            String b64CompressedData = jsonResponse.getString("data");
+                            JSONObject encoding = jsonResponse.getJSONObject("encoding");
+                            
+                            // Don't need the huge JSON object anymore
+                            jsonResponse = null;
+
+                            // Base64 decode
+                            byte[] compressedData = Base64.decode(b64CompressedData, Base64.DEFAULT);
+                            b64CompressedData = null; // FIX 4: Nullify immediately
+
+                            if (currentRunToken.get() != taskToken) {
+                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                                return;
+                            }
+
+                            // Disk write
+                            File cacheDir = reactContext.getCacheDir();
+                            // Use a unique name based on hash
+                            String fileName = "frame_" + urlString.hashCode() + ".zst";
+                            File dataFile = new File(cacheDir, fileName);
+                            
+                            fos = new FileOutputStream(dataFile);
+                            fos.write(compressedData);
+                            fos.flush();
+
+                            WritableMap responseMap = Arguments.createMap();
+                            responseMap.putString("filePath", dataFile.getAbsolutePath());
+                            responseMap.putDouble("scale", encoding.getDouble("scale"));
+                            responseMap.putDouble("offset", encoding.getDouble("offset"));
+                            responseMap.putDouble("missing", encoding.getDouble("missing_quantized"));
+                            if (encoding.has("scale_type")) {
+                                responseMap.putString("scaleType", encoding.getString("scale_type"));
+                            }
+
+                            if (currentRunToken.get() != taskToken) {
+                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                                return;
+                            }
+
+                            promise.resolve(responseMap);
+
+                        } catch (Exception e) {
+                            if (currentRunToken.get() == taskToken) {
+                                Log.e(TAG, "[FrameProcessor] Error: " + e.getMessage(), e);
+                                promise.reject("PROCESSING_ERROR", e.getMessage(), e);
+                            }
+                        } finally {
+                            // FIX 5: Ensure resources are closed and semaphore is released
+                            if (fos != null) {
+                                try { fos.close(); } catch (IOException ex) { /* ignore */ }
+                            }
+                            response.close(); 
+                            semaphore.release();
+                        }
+                    }
+                });
+
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                // If interrupted while waiting for semaphore, just exit
+            } catch (Exception e) {
+                promise.reject("EXECUTION_ERROR", e.getMessage());
+            }
+        });
+    }
 }