@aguacerowx/react-native 0.0.46 → 0.0.49

package/aguacerowx-react-native.podspec

@@ -12,13 +12,30 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/AguaceroWx/aguacero-sdks.git", :tag => "v#{s.version}" }
   s.swift_version = "5.0"
   s.static_framework = false
-  
+
+  fabric = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+  header_search_paths =
+    '$(inherited) "$(PODS_TARGET_SRCROOT)/ios/cpp" "$(PODS_TARGET_SRCROOT)/ios/vendor/basis_universal/transcoder" "$(PODS_TARGET_SRCROOT)/ios/vendor/basis_universal/zstd"'
+  header_search_paths =
+    "#{header_search_paths} \"$(PODS_ROOT)/../build/generated/ios\" \"$(PODS_ROOT)/../../node_modules/react-native/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"" if fabric
+
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
     'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
-    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) ZSTD_DISABLE_ASM=1'
+    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) ZSTD_DISABLE_ASM=1',
+    'HEADER_SEARCH_PATHS' => header_search_paths
   }
+
+  s.prepare_command = <<-SCRIPT
+    set -e
+    VENDOR="$PWD/ios/vendor/basis_universal"
+    if [ ! -f "$VENDOR/transcoder/basisu_transcoder.cpp" ]; then
+      mkdir -p "$(dirname "$VENDOR")"
+      rm -rf "$VENDOR"
+      git clone --depth 1 https://github.com/BinomialLLC/basis_universal.git "$VENDOR"
+    fi
+  SCRIPT
   
   s.user_target_xcconfig = {
     'DEFINES_MODULE' => 'YES'
@@ -28,11 +45,29 @@ Pod::Spec.new do |s|
   s.resources = [
     'ios/compiled-shaders/Shaders-simulator.metallib',
     'ios/compiled-shaders/Shaders-device.metallib',
-    'ios/Shaders.metal'
+    'ios/Shaders.metal',
+    'ios/vendor/proj4/proj4.js'
   ]
-  
-  s.source_files = "ios/**/*.{h,m,mm,swift}", "ios/generated/**/*.{h,m,mm,cpp}"
-  
+
+  # Do not use ios/**/*.h: basis_universal contains Windows/OpenCL headers that must not enter the umbrella.
+  # Transcoder/zstd headers are found via HEADER_SEARCH_PATHS for basisu_transcoder.cpp / zstddeclib.c only.
+  s.source_files = [
+    "ios/*.{h,m,mm,swift}",
+    "ios/**/*.{m,mm,swift}",
+    "ios/generated/**/*.{h,m,mm,cpp}",
+    "ios/cpp/**/*.{cpp,h}",
+    "ios/vendor/basis_universal/transcoder/basisu_transcoder.cpp",
+    "ios/vendor/basis_universal/zstd/zstddeclib.c",
+  ]
+
+  s.exclude_files = "ios/RCTSatelliteLayerComponentView.mm" unless fabric
+
+  # Fabric-only: hosts SatelliteLayerView and implements handleCommand (JS dispatchCommand).
+  if fabric
+    s.dependency "ReactCodegen"
+    s.dependency "React-RCTFabric"
+  end
+
   s.dependency "React-Core"
   s.dependency "MapboxMaps", "~> 11.0"
   s.dependency "libzstd", "~> 1.5.5"

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

@@ -31,7 +31,7 @@ public class NexradRadarLayer implements CustomLayerHost {
     private static final String TAG = "AguaceroNexrad";
     private static final int LUT_SIZE = 256;
     /** Max decoded gate textures retained for instant scrub-back (matches JS controller). */
-    private static final int MAX_GPU_CACHED_FRAMES = 16;
+    private static final int MAX_GPU_CACHED_FRAMES = 64;
 
     /** Called on UI thread after a frame is registered in {@link #gpuFrameSlots} (GL thread). */
     public interface GpuFrameRegisteredListener {

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

@@ -26,7 +26,7 @@ import java.util.Map;
 public class SatelliteLayer implements CustomLayerHost {
 
     private static final String TAG = "AguaceroSatellite";
-    private static final int MAX_GPU_CACHED_FRAMES = 16;
+    private static final int MAX_GPU_CACHED_FRAMES = 64;
 
     private static final int GL_COMPRESSED_RGBA_ASTC_4x4_KHR = 0x93B0;
     private static final int GL_COMPRESSED_RGBA8_ETC2_EAC = 0x9278;

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

@@ -30,6 +30,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import okhttp3.Call;
+import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -73,6 +74,23 @@ public class SatelliteLayerView extends FrameLayout {
                     .followSslRedirects(true)
                     .build();
 
+    /**
+     * Match grid {@code buildGridFrameProcessOptions}: authoritative {@code apiKey} in the query string
+     * plus {@code x-api-key} header (same pattern as AguaceroCore grid / NEXRAD CDN).
+     */
+    private static String satelliteUrlWithQueryApiKey(String url, String apiKey) {
+        HttpUrl parsed = HttpUrl.parse(url);
+        if (parsed == null) {
+            return url;
+        }
+        HttpUrl.Builder b = parsed.newBuilder();
+        b.setQueryParameter("apiKey", apiKey);
+        if (parsed.queryParameter("userId") == null) {
+            b.setQueryParameter("userId", "sdk-user");
+        }
+        return b.build().toString();
+    }
+
     public SatelliteLayerView(@NonNull ThemedReactContext context) {
         super(context);
         this.satelliteLayer = new SatelliteLayer();
@@ -229,6 +247,10 @@ public class SatelliteLayerView extends FrameLayout {
 
             String apiKey = o.optString("apiKey", "");
             String bundleId = o.optString("bundleId", "");
+            String gridSiteOrigin = o.optString("gridRequestSiteOrigin", "").trim();
+            while (gridSiteOrigin.endsWith("/")) {
+                gridSiteOrigin = gridSiteOrigin.substring(0, gridSiteOrigin.length() - 1);
+            }
             JSONArray frames = o.optJSONArray("frames");
             if (frames == null || apiKey.isEmpty()) {
                 triggerRepaint();
@@ -241,7 +263,7 @@ public class SatelliteLayerView extends FrameLayout {
                 long unix = f.getLong("unix");
                 String url = f.getString("url");
                 String shaderFileName = f.optString("shaderFileName", "");
-                scheduleFetchIfNeeded(gen, unix, url, shaderFileName, apiKey, bundleId);
+                scheduleFetchIfNeeded(gen, unix, url, shaderFileName, apiKey, bundleId, gridSiteOrigin);
             }
             triggerRepaint();
         } catch (Exception e) {
@@ -255,7 +277,8 @@ public class SatelliteLayerView extends FrameLayout {
             @NonNull String url,
             @NonNull String shaderFileName,
             @NonNull String apiKey,
-            @NonNull String bundleId) {
+            @NonNull String bundleId,
+            @NonNull String gridRequestSiteOrigin) {
         if (satelliteLayer.isFrameCached(unix)) {
             return;
         }
@@ -269,11 +292,17 @@ public class SatelliteLayerView extends FrameLayout {
                         if (gen != decodeGeneration.get()) {
                             return;
                         }
+                        String fetchUrl = satelliteUrlWithQueryApiKey(url, apiKey);
                         Request.Builder reqBuilder =
-                                new Request.Builder().url(url).header("x-api-key", apiKey);
+                                new Request.Builder().url(fetchUrl).header("x-api-key", apiKey);
                         if (bundleId != null && !bundleId.isEmpty()) {
                             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 + "/");
+                        }
                         Request req = reqBuilder.build();
                         Call call = HTTP.newCall(req);
                         try (Response resp = call.execute()) {

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

@@ -100,11 +100,18 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
         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) return;
+                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
@@ -112,13 +119,26 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
 
                 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) requestBuilder.header("x-app-identifier", bundleId);
+                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);
@@ -130,10 +150,15 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
                         activeCalls.remove(call);
                         semaphore.release(); // IMPORTANT: Release immediately on fail
                         
-                        if (currentRunToken.get() != taskToken) return;
+                        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");
                         }
                     }
 
@@ -147,6 +172,7 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
                         if (currentRunToken.get() != taskToken) {
                             response.close();
                             semaphore.release();
+                            promise.reject("E_CANCELLED", "Weather frame fetch superseded");
                             return;
                         }
 
@@ -165,7 +191,10 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
 
                             byte[] bodyBytes = body.bytes();
 
-                            if (currentRunToken.get() != taskToken) return;
+                            if (currentRunToken.get() != taskToken) {
+                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                                return;
+                            }
 
                             // JSON parse
                             String jsonString = new String(bodyBytes);
@@ -189,7 +218,10 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
                             byte[] compressedData = Base64.decode(b64CompressedData, Base64.DEFAULT);
                             b64CompressedData = null; // FIX 4: Nullify immediately
 
-                            if (currentRunToken.get() != taskToken) return;
+                            if (currentRunToken.get() != taskToken) {
+                                promise.reject("E_CANCELLED", "Weather frame fetch superseded");
+                                return;
+                            }
 
                             // Disk write
                             File cacheDir = reactContext.getCacheDir();
@@ -210,6 +242,11 @@ public class WeatherFrameProcessorModule extends ReactContextBaseJavaModule {
                                 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) {

package/index.js

@@ -1,4 +1 @@
-export { MapManager } from './src/MapManager';
-export { WeatherLayerManager } from './src/WeatherLayerManager';
-export { default as GridRenderLayer } from './src/GridRenderLayerNativeComponent';
-export { AGUACERO_NEXRAD_MAP_LAYER_ID, AGUACERO_SATELLITE_MAP_LAYER_ID } from './src/nws/nwsAndroidConstants';
+export * from './src/index';

package/ios/GridRenderLayer.swift

@@ -193,7 +193,7 @@ public class GridRenderLayer: NSObject {
 
     @objc(clearGpuCache)
     public func clearGpuCache() {
-        print("ℹ️ [GridRenderLayer] clearGpuCache called")
+        print("ℹ️ [GridRenderLayer] clearGpuCache called (weather grid frame cache — not NEXRAD)")
         frameProcessingQueue.async { [weak self] in
             guard let self = self else { return }
             self.frameCacheQueue.async {

package/ios/GridRenderLayerBridge.swift

@@ -42,4 +42,55 @@ import Foundation
             print("❌ [GridRenderLayerBridge] Failed to remove layer \(layerId): \(error)")
         }
     }
+
+    /// NEXRAD must draw above the weather grid custom layer when both exist (Android `NexradRadarLayerView` parity).
+    @objc public static func addNexradCustomLayer(
+        to mapView: MapView,
+        layerHost: CustomLayerHost,
+        layerId: String,
+        weatherGridLayerId: String,
+        belowLayerId: String?
+    ) -> Bool {
+        var customLayer = CustomLayer(id: layerId, renderer: layerHost)
+        let gridThere = layerExists(in: mapView, layerId: weatherGridLayerId)
+        do {
+            if gridThere {
+                try mapView.mapboxMap.addLayer(customLayer, layerPosition: .above(weatherGridLayerId))
+                return true
+            }
+            let position: LayerPosition? = belowLayerId.map { .below($0) }
+            let posDesc = belowLayerId.map { "below(\($0))" } ?? "default(top)"
+            try mapView.mapboxMap.addLayer(customLayer, layerPosition: position)
+            return true
+        } catch {
+            return false
+        }
+    }
+
+    /// Satellite draws above the weather grid when the grid layer exists (Android `SatelliteLayerView` parity).
+    @objc public static func addSatelliteCustomLayer(
+        to mapView: MapView,
+        layerHost: CustomLayerHost,
+        layerId: String,
+        weatherGridLayerId: String,
+        belowLayerId: String?
+    ) -> Bool {
+        var customLayer = CustomLayer(id: layerId, renderer: layerHost)
+        let gridThere = layerExists(in: mapView, layerId: weatherGridLayerId)
+        do {
+            if gridThere {
+                try mapView.mapboxMap.addLayer(customLayer, layerPosition: .above(weatherGridLayerId))
+                print("🛰️ [GridRenderLayerBridge] addSatelliteCustomLayer OK id=\(layerId) position=above(\(weatherGridLayerId))")
+                return true
+            }
+            let position: LayerPosition? = belowLayerId.map { .below($0) }
+            let posDesc = belowLayerId.map { "below(\($0))" } ?? "default(top)"
+            try mapView.mapboxMap.addLayer(customLayer, layerPosition: position)
+            print("🛰️ [GridRenderLayerBridge] addSatelliteCustomLayer OK id=\(layerId) gridAbsent position=\(posDesc)")
+            return true
+        } catch {
+            print("❌ [GridRenderLayerBridge] addSatelliteCustomLayer FAILED id=\(layerId) gridThere=\(gridThere) below=\(belowLayerId ?? "nil"): \(error)")
+            return false
+        }
+    }
 }