@aguacerowx/react-native 0.0.50 → 0.0.52

package/lib/commonjs/WeatherLayerManager.js

@@ -18,6 +18,9 @@ var _satelliteAndroidController = require("./satellite/satelliteAndroidControlle
 var _NwsAlertsOverlay = _interopRequireDefault(require("./nws/NwsAlertsOverlay"));
 var _MapRegistry = require("./MapRegistry");
 var _satelliteBridgeDiag = require("./satelliteBridgeDiag");
+var _aguaceroRnDebug = require("./aguaceroRnDebug");
+var _aguaceroCoreDebugHooks = require("./aguaceroCoreDebugHooks");
+var _gridCdnAuth = require("./gridCdnAuth");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // packages/react-native/src/WeatherLayerManager.js
@@ -30,9 +33,9 @@ const SATELLITE_NATIVE = _reactNative.Platform.OS === 'android' || _reactNative.
   note: 'If you never see sat-bridge logs, the app bundle is not loading this WeatherLayerManager build.'
 });
 
-/**
- * Same filtering as {@link AguaceroCore#_getFilteredMrmsTimestampsForVariable} for older cores
- * where that helper (or {@code setMRMSDurationValue}) is missing from the prototype chain.
+/**
+ * Same filtering as {@link AguaceroCore#_getFilteredMrmsTimestampsForVariable} for older cores
+ * where that helper (or {@code setMRMSDurationValue}) is missing from the prototype chain.
  */
 function getFilteredMrmsTimestampsCompat(core, variable) {
   const raw = core.mrmsStatus?.[variable];
@@ -47,9 +50,9 @@ function getFilteredMrmsTimestampsCompat(core, variable) {
   return list;
 }
 
-/**
- * Older npm installs may resolve an {@link AguaceroCore} without {@code setMRMSDurationValue} /
- * {@code setNexradDurationValue}; mirror those methods here using the same logic as the SDK.
+/**
+ * Older npm installs may resolve an {@link AguaceroCore} without {@code setMRMSDurationValue} /
+ * {@code setNexradDurationValue}; mirror those methods here using the same logic as the SDK.
  */
 async function applyMrmsDurationValue(core, value) {
   if (typeof core.setMRMSDurationValue === 'function') {
@@ -114,12 +117,12 @@ const {
   InspectorModule
 } = _reactNative.NativeModules;
 
-/**
- * `state:change` payloads can briefly have {@code isNexrad} before {@code nexradSite} / {@code nexradTimestamp}
- * are populated; {@code core.state} is updated first. Merge so readouts match the active radar.
- *
- * @param {object | null} emitted
- * @param {object | null} coreState
+/**
+ * `state:change` payloads can briefly have {@code isNexrad} before {@code nexradSite} / {@code nexradTimestamp}
+ * are populated; {@code core.state} is updated first. Merge so readouts match the active radar.
+ *
+ * @param {object | null} emitted
+ * @param {object | null} coreState
  */
 function mergeNexradEmittedWithCore(emitted, coreState) {
   if (!emitted || !coreState) return null;
@@ -134,10 +137,10 @@ function mergeNexradEmittedWithCore(emitted, coreState) {
   };
 }
 
-/**
- * Compact timeline identity for deduping {@code state:change}: extending the NEXRAD/satellite window
- * often keeps the same selected unix — without this, {@link WeatherLayerManager} short-circuits and
- * never calls native {@code sync} / preload with the expanded frame list.
+/**
+ * Compact timeline identity for deduping {@code state:change}: extending the NEXRAD/satellite window
+ * often keeps the same selected unix — without this, {@link WeatherLayerManager} short-circuits and
+ * never calls native {@code sync} / preload with the expanded frame list.
  */
 function nexradObsTimelineSig(state) {
   const arr = [...(state?.availableNexradTimestamps || [])].map(Number).filter(t => Number.isFinite(t)).sort((a, b) => a - b);
@@ -150,8 +153,9 @@ function satelliteObsTimelineSig(state) {
   return `${keys.length}:${keys[0]}:${keys[keys.length - 1]}`;
 }
 
-/** True in __DEV__, or set `globalThis.__AGUACERO_WX_GRID_DEBUG__ = true` in the app entry for release builds. */
+/** True when {@link WeatherLayerManager} `debug` / {@link configureAguaceroRnDebug}, or legacy `__AGUACERO_WX_GRID_DEBUG__`. */
 function wxGridDebugEnabled() {
+  if ((0, _aguaceroRnDebug.isAguaceroRnDebugEnabled)()) return true;
   try {
     if (typeof __DEV__ !== 'undefined' && __DEV__) return true;
     return Boolean(typeof globalThis !== 'undefined' && globalThis.__AGUACERO_WX_GRID_DEBUG__);
@@ -177,37 +181,34 @@ function wxGridWarn(tag, detail) {
   }
 }
 
-/**
- * Native {@code processFrame} must mirror browser/AguaceroCore grid auth: encoded {@code apiKey}
- * in the query string and optional {@code Origin} / {@code Referer} (many CloudFront setups require them).
- *
- * @param {string} baseGridUrl
- * @param {string} resourcePath
- * @param {string} apiKey
- * @param {string | null | undefined} bundleId
- * @param {string | undefined} gridRequestSiteOrigin - e.g. production web origin your edge allowlists (no trailing slash)
+/**
+ * Native {@code processFrame} must mirror browser/AguaceroCore grid auth: encoded {@code apiKey}
+ * in the query string and optional {@code Origin} / {@code Referer} (many CloudFront setups require them).
+ *
+ * @param {string} baseGridUrl
+ * @param {string} resourcePath
+ * @param {string} apiKey
+ * @param {string | null | undefined} bundleId
+ * @param {string | undefined} gridRequestSiteOrigin - prop or core origin (see {@link resolveGridRequestSiteOrigin})
+ * @param {import('@aguacerowx/javascript-sdk').AguaceroCore | null | undefined} core
  */
-function buildGridFrameProcessOptions(baseGridUrl, resourcePath, apiKey, bundleId, gridRequestSiteOrigin) {
-  const url = `${baseGridUrl}${resourcePath}?apiKey=${encodeURIComponent(apiKey)}`;
+function buildGridFrameProcessOptions(baseGridUrl, resourcePath, apiKey, bundleId, gridRequestSiteOrigin, core) {
+  const trimmedKey = typeof apiKey === 'string' ? apiKey.trim() : apiKey;
+  const url = `${baseGridUrl}${resourcePath}?apiKey=${encodeURIComponent(trimmedKey || '')}`;
   const options = {
     url,
-    apiKey,
+    apiKey: trimmedKey,
     bundleId
   };
-  if (typeof gridRequestSiteOrigin === 'string') {
-    let origin = gridRequestSiteOrigin.trim();
-    while (origin.endsWith('/')) {
-      origin = origin.slice(0, -1);
-    }
-    if (origin.length > 0) {
-      options.gridRequestSiteOrigin = origin;
-    }
+  const origin = (0, _gridCdnAuth.resolveGridRequestSiteOrigin)(gridRequestSiteOrigin, core);
+  if (origin) {
+    options.gridRequestSiteOrigin = origin;
   }
   return options;
 }
 
-/**
- * A helper function to generate the raw RGBA byte buffer for the colormap texture.
+/**
+ * A helper function to generate the raw RGBA byte buffer for the colormap texture.
  */
 const _generateColormapBytes = colormap => {
   const width = 256;
@@ -269,8 +270,15 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
     onNwsAlertClick,
     /** Same semantics as mapsgl / AguaceroCore: Origin + Referer for grid CDN (required by many CloudFront rules). */
     gridRequestSiteOrigin,
+    /** When true, logs auth/HTTP diagnostics under `[AguaceroRN][debug]` (Metro / Logcat / Xcode). */
+    debug = false,
     ...restProps
   } = props;
+  (0, _react.useEffect)(() => {
+    (0, _aguaceroRnDebug.configureAguaceroRnDebug)({
+      enabled: Boolean(debug)
+    });
+  }, [debug]);
   const context = (0, _react.useContext)(_AguaceroContext.AguaceroContext);
 
   // Create the core here instead of getting it from context
@@ -285,6 +293,24 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
     },
     autoRefresh: false // <-- add this
   }), [apiKey, gridRequestSiteOrigin]);
+  (0, _react.useEffect)(() => {
+    if (!core) return;
+    (0, _aguaceroCoreDebugHooks.installAguaceroCoreDebugHooks)(core, {
+      gridRequestSiteOriginProp: gridRequestSiteOrigin ?? null,
+      debugProp: Boolean(debug)
+    });
+    if ((0, _aguaceroRnDebug.isAguaceroRnDebugEnabled)() && !apiKey) {
+      (0, _aguaceroRnDebug.aguaceroDebugWarn)('WeatherLayerManager.missingApiKey', {
+        hint: 'apiKey prop is empty — all CDN requests will fail or return 403'
+      });
+    }
+    if ((0, _aguaceroRnDebug.isAguaceroRnDebugEnabled)() && apiKey && !gridRequestSiteOrigin) {
+      (0, _aguaceroRnDebug.aguaceroDebugWarn)('WeatherLayerManager.missingGridOrigin', {
+        hint: 'gridRequestSiteOrigin is not set — CloudFront often returns 403 without Origin/Referer on React Native',
+        snapshot: (0, _aguaceroRnDebug.getAguaceroAuthDiagnosticSnapshot)(core)
+      });
+    }
+  }, [core, debug, gridRequestSiteOrigin, apiKey]);
   const [watchesWarningsOptions, setWatchesWarningsOptions] = (0, _react.useState)(() => ({
     alertInteractionEnabled: true,
     ...(watchesWarningsProp ?? {})
@@ -388,6 +414,8 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
   // Track if we've done the initial load
   const hasInitialLoad = (0, _react.useRef)(false);
   const hasPreloadedRef = (0, _react.useRef)(false);
+  /** Bumped on {@code cancelAllFrames} / full reload so stale {@code processFrame} results are ignored. */
+  const preloadGenerationRef = (0, _react.useRef)(0);
 
   // Track the last state we processed to avoid redundant updates
   const lastProcessedState = (0, _react.useRef)(null);
@@ -468,9 +496,9 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
       refreshData: () => {
         _checkForUpdates();
       },
-      /**
-       * NWS watches/warnings (native map, iOS + Android): same options as mapsgl {@link WeatherLayerManager#configureWatchesWarnings}.
-       * @param {object} partial
+      /**
+       * NWS watches/warnings (native map, iOS + Android): same options as mapsgl {@link WeatherLayerManager#configureWatchesWarnings}.
+       * @param {object} partial
        */
       configureWatchesWarnings: partial => {
         setWatchesWarningsOptions(prev => ({
@@ -534,6 +562,8 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
 
     // Only mark as "has preloaded" after validation passes
     hasPreloadedRef.current = true;
+    const generation = preloadGenerationRef.current;
+    const isStaleGeneration = () => generation !== preloadGenerationRef.current;
     wxGridVerbose('preloadStart', {
       isMRMS,
       model,
@@ -650,7 +680,11 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
       } else {
         resourcePath = `/grids/${model}/${date}/${run}/${currentFrame}/${variable}/0`;
       }
-      const options = buildGridFrameProcessOptions(core.baseGridUrl, resourcePath, core.apiKey, core.bundleId, gridRequestSiteOrigin);
+      const options = (0, _aguaceroRnDebug.augmentProcessFrameOptionsForDebug)(buildGridFrameProcessOptions(core.baseGridUrl, resourcePath, core.apiKey, core.bundleId, gridRequestSiteOrigin, core), core);
+      (0, _aguaceroCoreDebugHooks.logProcessFrameAuthMismatch)(core, options, {
+        phase: 'preloadCurrent',
+        currentCacheKey
+      });
       try {
         wxGridVerbose('processFrameRequest', {
           currentCacheKey,
@@ -658,6 +692,13 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
           frame: currentFrame
         });
         const result = await WeatherFrameProcessorModule.processFrame(options);
+        if (isStaleGeneration()) {
+          wxGridVerbose('preloadCurrentFrameStale', {
+            currentCacheKey,
+            generation
+          });
+          return;
+        }
         if (!result || !result.filePath) {
           hasPreloadedRef.current = false;
           wxGridWarn('preloadAbort', {
@@ -755,12 +796,20 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         const cancelled = e && (e.code === 'E_CANCELLED' || e?.userInfo?.code === 'E_CANCELLED' || typeof e?.message === 'string' && e.message.includes('superseded'));
         if (!cancelled) {
           hasPreloadedRef.current = false;
-          wxGridWarn('preloadProcessFrameError', {
+          const errDetail = {
             currentCacheKey,
             code: e?.code,
             message: e?.message,
             userInfo: e?.userInfo
-          });
+          };
+          wxGridWarn('preloadProcessFrameError', errDetail);
+          if ((0, _aguaceroRnDebug.isAguaceroRnDebugEnabled)()) {
+            (0, _aguaceroRnDebug.aguaceroDebugWarn)('preloadProcessFrameError', {
+              ...errDetail,
+              auth: (0, _aguaceroRnDebug.getAguaceroAuthDiagnosticSnapshot)(core),
+              is403: e?.code === 'HTTP_ERROR' && typeof e?.message === 'string' && e.message.includes('403')
+            });
+          }
         } else {
           wxGridVerbose('preloadProcessFrameCancelled', {
             currentCacheKey
@@ -785,8 +834,15 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
       } else {
         resourcePath = `/grids/${model}/${date}/${run}/${frame}/${variable}/0`;
       }
-      const options = buildGridFrameProcessOptions(core.baseGridUrl, resourcePath, core.apiKey, core.bundleId, gridRequestSiteOrigin);
+      const options = (0, _aguaceroRnDebug.augmentProcessFrameOptionsForDebug)(buildGridFrameProcessOptions(core.baseGridUrl, resourcePath, core.apiKey, core.bundleId, gridRequestSiteOrigin, core), core);
+      (0, _aguaceroCoreDebugHooks.logProcessFrameAuthMismatch)(core, options, {
+        phase: 'preloadBackground',
+        cacheKey
+      });
       WeatherFrameProcessorModule.processFrame(options).then(result => {
+        if (isStaleGeneration()) {
+          return;
+        }
         if (!result || !result.filePath) {
           return;
         }
@@ -1174,7 +1230,11 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
             m = (frameDate.getUTCMonth() + 1).toString().padStart(2, '0'),
             d = frameDate.getUTCDate().toString().padStart(2, '0');
           const resourcePath = `/grids/mrms/${y}${m}${d}/${frame}/0/${currentVariable}/0`;
-          const options = buildGridFrameProcessOptions(core.baseGridUrl, resourcePath, core.apiKey, core.bundleId, gridRequestSiteOrigin);
+          const options = (0, _aguaceroRnDebug.augmentProcessFrameOptionsForDebug)(buildGridFrameProcessOptions(core.baseGridUrl, resourcePath, core.apiKey, core.bundleId, gridRequestSiteOrigin, core), core);
+          (0, _aguaceroCoreDebugHooks.logProcessFrameAuthMismatch)(core, options, {
+            phase: 'mrmsRefresh',
+            cacheKey
+          });
           WeatherFrameProcessorModule.processFrame(options).then(result => {
             if (!result || !result.filePath) return;
             const frameData = {
@@ -1439,6 +1499,7 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
           }
         }
         hasPreloadedRef.current = false;
+        preloadGenerationRef.current += 1;
         preloadedDataCache.current.clear();
         cachedGeometry.current = null;
         cachedColormap.current = null;
@@ -1446,7 +1507,8 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
         WeatherFrameProcessorModule.cancelAllFrames();
         wxGridVerbose('cancelAllFrames', {
           reason: 'needsFullLoad',
-          variable: newState.variable
+          variable: newState.variable,
+          generation: preloadGenerationRef.current
         });
         if (!newState.variable) {
           previousStateRef.current = newState;
@@ -1468,6 +1530,8 @@ const WeatherLayerManager = exports.WeatherLayerManager = /*#__PURE__*/(0, _reac
             mrmsTimestamp: newState.mrmsTimestamp,
             forecastHour: newState.forecastHour
           });
+          hasPreloadedRef.current = false;
+          void preloadAllFramesToDisk(newState);
         }
         if (success && newState.opacity !== renderProps.opacity) {
           setRenderProps(prev => ({