@aguacerowx/mapsgl 0.0.54 → 0.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aguacerowx/mapsgl",
-  "version": "0.0.54",
+  "version": "0.0.55",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -10,6 +10,7 @@
   "scripts": {
     "prepublishOnly": "npm run bundle-nexrad",
     "bundle-nexrad": "esbuild src/nexrad/radarDecode.worker.ts --bundle --format=esm --platform=browser --outfile=src/nexrad/radarDecode.worker.bundled.js && esbuild src/nexrad/radarArchiveCore.ts --bundle --format=esm --platform=browser --outfile=src/nexrad/radarArchiveCore.bundled.js --external:@aguacerowx/javascript-sdk && esbuild src/nexrad/MapboxRadarLayer.ts --bundle --format=esm --platform=browser --outfile=src/nexrad/MapboxRadarLayer.bundled.js --external:mapbox-gl --external:@aguacerowx/javascript-sdk && esbuild src/nexrad/nexradCrossSectionSampleAtLatLon.ts --format=esm --platform=browser --outfile=src/nexrad/nexradCrossSectionSampleAtLatLon.bundled.js && esbuild src/nexrad/radarFrameGpuMatch.ts --format=esm --platform=browser --outfile=src/nexrad/radarFrameGpuMatch.bundled.js && esbuild src/nexrad/nexradMapboxFrameOpts.ts --bundle --format=esm --platform=browser --outfile=src/nexrad/nexradMapboxFrameOpts.bundled.js --external:@aguacerowx/javascript-sdk",
+    "bundle-nexrad-rn": "node scripts/bundle-nexrad-rn.mjs",
     "gen:nws-key": "esbuild ../../../aguacero-frontend/src/components/WarningsMenu/nwsWarningCustomizationKey.ts --bundle --format=esm --platform=neutral --outfile=src/nwsWarningCustomizationKey.gen.js"
   },
   "files": [
@@ -21,7 +22,7 @@
     "esbuild": "^0.21.5"
   },
   "dependencies": {
-    "@aguacerowx/javascript-sdk": "^0.0.24",
+    "@aguacerowx/javascript-sdk": "^0.0.25",
     "buffer": "^6.0.3",
     "fzstd": "^0.1.1",
     "mapbox-gl": "^3.4.0",

package/src/NexradWeatherController.js

@@ -3,7 +3,13 @@
  * Preloads all timestamps on the active timeline (MRMS/satellite-style) so scrubbing does not trigger loads.
  */
 import { getUnitConversionFunction, getDefaultRadarTilt } from '@aguacerowx/javascript-sdk';
-import { fetchAndParseArchive, objectKeyToUrl, setNexradArchiveApiKey } from './nexrad/radarArchiveCore.bundled.js';
+import {
+    fetchAndParseArchive,
+    objectKeyToUrl,
+    setNexradArchiveApiKey,
+    setNexradArchiveBundleId,
+    setNexradSitesFetchAuth,
+} from './nexrad/radarArchiveCore.bundled.js';
 import { MapboxRadarLayer } from './nexrad/MapboxRadarLayer.bundled.js';
 import { nexradBinGroupIdForKey, variableToNexradGroup } from '@aguacerowx/javascript-sdk';
 import { sampleNexradFrameAtLatLon } from './nexrad/nexradCrossSectionSampleAtLatLon.bundled.js';
@@ -268,6 +274,8 @@ export class NexradWeatherController {
         this._frameCache.clear();
 
         setNexradArchiveApiKey(this.core.apiKey || '');
+        setNexradArchiveBundleId(this.core.bundleId || '');
+        setNexradSitesFetchAuth(this.core.apiKey || '', this.core.bundleId || '');
 
         const times = [...(state.availableNexradTimestamps || [])]
             .map(Number)
@@ -353,6 +361,8 @@ export class NexradWeatherController {
         }
 
         setNexradArchiveApiKey(this.core.apiKey || '');
+        setNexradArchiveBundleId(this.core.bundleId || '');
+        setNexradSitesFetchAuth(this.core.apiKey || '', this.core.bundleId || '');
 
         const unix = Number(state.nexradTimestamp);
         const p = this._buildFetchParamsForUnix(state, unix);

package/src/NwsWatchesWarningsOverlay.js

@@ -842,14 +842,6 @@ export class NwsWatchesWarningsOverlay {
 
     async _initialLoad() {
         if (this._destroyed || !this.options.enabled) return;
-        try {
-            const baseline = await this._fetchBaseline();
-            if (baseline) {
-                this._workingFc = baseline;
-            }
-        } catch (err) {
-            console.warn('[NwsWatchesWarningsOverlay] Baseline fetch failed:', err);
-        }
 
         const paintWhenReady = () => {
             this._ensureLayers();
@@ -862,6 +854,18 @@ export class NwsWatchesWarningsOverlay {
             paintWhenReady();
         }
 
+        void this._fetchBaseline()
+            .then((baseline) => {
+                if (this._destroyed || !this.options.enabled) return;
+                if (baseline) {
+                    this._workingFc = baseline;
+                }
+                this._setWorkingData(this._workingFc);
+            })
+            .catch((err) => {
+                console.warn('[NwsWatchesWarningsOverlay] Baseline fetch failed:', err);
+            });
+
         this._connectSse();
     }
 

package/src/nexrad/loadNexradSites.ts

@@ -1,4 +1,6 @@
 import type { NexradSite } from './PreprocessedSweepParser.js';
+import nexradSitesDefault from './nexradSitesDefault.json';
+import { nexradArchiveDiag, redactApiKeyFromUrl } from './nexradArchiveDiag.js';
 
 type NexradSitesPayload = {
     sites?: NexradSite[];
@@ -13,22 +15,98 @@ export function setNexradSitesJsonUrl(url: string) {
     sitesUrl = url || sitesUrl;
 }
 
+/**
+ * When sitesUrl is HTTPS (e.g. CloudFront), use the same auth as AguaceroCore grid fetches:
+ * `?apiKey=`, `x-api-key`, and `x-app-identifier` on React Native when bundle id is set.
+ */
+let SITES_FETCH_API_KEY = '';
+let SITES_FETCH_BUNDLE_ID = '';
+export function setNexradSitesFetchAuth(apiKey: string, bundleId?: string) {
+    SITES_FETCH_API_KEY = apiKey || '';
+    if (bundleId !== undefined) {
+        SITES_FETCH_BUNDLE_ID = bundleId || '';
+    }
+}
+
 let nexradSitesPayloadPromise: Promise<NexradSitesPayload> | null = null;
 
+function sitesFetchUrl(): string {
+    if (!sitesUrl.startsWith('http') || !SITES_FETCH_API_KEY) {
+        return sitesUrl;
+    }
+    const sep = sitesUrl.includes('?') ? '&' : '?';
+    return `${sitesUrl}${sep}apiKey=${SITES_FETCH_API_KEY}`;
+}
+
+function sitesFetchHeaders(): Record<string, string> | undefined {
+    if (!SITES_FETCH_API_KEY) {
+        return undefined;
+    }
+    const headers: Record<string, string> = {
+        'x-api-key': SITES_FETCH_API_KEY,
+    };
+    const nav = (globalThis as { navigator?: { product?: string } }).navigator;
+    if (nav?.product === 'ReactNative' && SITES_FETCH_BUNDLE_ID) {
+        headers['x-app-identifier'] = SITES_FETCH_BUNDLE_ID;
+    }
+    return headers;
+}
+
+function embeddedSitesPayload(): NexradSitesPayload {
+    return nexradSitesDefault as NexradSitesPayload;
+}
+
 export function loadNexradSitesPayload(): Promise<NexradSitesPayload> {
     if (nexradSitesPayloadPromise) {
         return nexradSitesPayloadPromise;
     }
-    nexradSitesPayloadPromise = fetch(sitesUrl)
-        .then((response) => {
-            if (!response.ok) throw new Error(`nexrad.json fetch failed: HTTP ${response.status}`);
-            return response.json() as Promise<NexradSitesPayload>;
-        })
-        .catch((error) => {
+    nexradSitesPayloadPromise = (async (): Promise<NexradSitesPayload> => {
+        const url = sitesFetchUrl();
+        const headers = sitesFetchHeaders();
+        const headerKeys = headers ? Object.keys(headers).join(',') : '';
+        nexradArchiveDiag('sites.fetch.start', {
+            canonicalUrl: sitesUrl,
+            fetchUrl: redactApiKeyFromUrl(url),
+            hasApiKeyQuery: url.includes('apiKey='),
+            headerKeys: headerKeys || '(none)',
+            apiKeyLen: SITES_FETCH_API_KEY.length,
+            bundleIdLen: SITES_FETCH_BUNDLE_ID.length,
+        });
+        try {
+            const response = await fetch(url, headers ? { headers } : undefined);
+            if (response.ok) {
+                nexradArchiveDiag('sites.fetch.ok', {
+                    status: response.status,
+                    canonicalUrl: sitesUrl,
+                });
+                return (await response.json()) as NexradSitesPayload;
+            }
+            if (sitesUrl.startsWith('https://')) {
+                console.warn(
+                    `[mapsgl] nexrad.json HTTP ${response.status} for ${sitesUrl} — using embedded site list`,
+                );
+                nexradArchiveDiag('sites.fetch.fallbackEmbedded', {
+                    httpStatus: response.status,
+                    reason: 'HTTPS non-OK — CloudFront may not host /data/nexrad.json; embedded list used',
+                    canonicalUrl: sitesUrl,
+                });
+                return embeddedSitesPayload();
+            }
+            throw new Error(`nexrad.json fetch failed: HTTP ${response.status}`);
+        } catch (error) {
+            if (sitesUrl.startsWith('https://')) {
+                console.warn('[mapsgl] nexrad.json load failed — using embedded site list:', error);
+                nexradArchiveDiag('sites.fetch.catchFallbackEmbedded', {
+                    message: error instanceof Error ? error.message : String(error),
+                    canonicalUrl: sitesUrl,
+                });
+                return embeddedSitesPayload();
+            }
             console.error('[mapsgl] Could not load nexrad.json:', error);
             nexradSitesPayloadPromise = null;
             throw error;
-        });
+        }
+    })();
     return nexradSitesPayloadPromise;
 }
 

package/src/nexrad/nexradArchiveDiag.ts

@@ -0,0 +1,26 @@
+/**
+ * Verbose NEXRAD archive pipeline logs for React Native (Hermes / Logcat).
+ * Filter: {@code [Aguacero][NEXRAD][archive]}
+ *
+ * Omits raw API keys; use lengths / booleans only.
+ */
+export type NexradArchiveDiagDetail = Record<string, string | number | boolean | null | undefined>;
+
+export function redactApiKeyFromUrl(u: string): string {
+    return u.replace(/([?&])apiKey=[^&]*/gi, '$1apiKey=(redacted)');
+}
+
+function isReactNative(): boolean {
+    const nav = (globalThis as { navigator?: { product?: string } }).navigator;
+    return nav?.product === 'ReactNative';
+}
+
+/** Logs only on React Native to avoid noisy web consoles (mapsgl path is already observable in DevTools). */
+export function nexradArchiveDiag(phase: string, detail?: NexradArchiveDiagDetail): void {
+    if (!isReactNative()) return;
+    if (detail !== undefined) {
+        console.warn(`[Aguacero][NEXRAD][archive] ${phase}`, detail);
+    } else {
+        console.warn(`[Aguacero][NEXRAD][archive] ${phase}`);
+    }
+}

package/src/nexrad/nexradMapboxFrameOpts.bundled.js

@@ -221,7 +221,8 @@ function nexradLevel3S3ProductForSiteTilt(siteId, radarVariable, tilt) {
   return products[idx];
 }
 function mapboxFrameUploadOptionsForNexradState(state) {
-  if (!state || state.nexradDataSource !== "level3") return void 0;
+  if (!state) return { geometryLayoutKey: "canonical" };
+  if (state.nexradDataSource !== "level3") return { geometryLayoutKey: "canonical" };
   const site = state.nexradSite;
   const radarVar = (state.nexradProduct || "REF").toUpperCase();
   if (nexradLevel3UsesTiltIndexedS3Products(radarVar) && site) {
@@ -235,7 +236,7 @@ function mapboxFrameUploadOptionsForNexradState(state) {
     const mnemonic = nexradLevel3S3VelocityProductForSiteTilt(site, tilt);
     return { geometryLayoutKey: `${site}|${radarVar}|${mnemonic}` };
   }
-  return { geometryCacheKeysRayBoundaries: true };
+  return { geometryLayoutKey: "canonical" };
 }
 export {
   mapboxFrameUploadOptionsForNexradState,

package/src/nexrad/nexradMapboxFrameOpts.ts

@@ -104,7 +104,8 @@ type NexradStateForMapbox = {
 export function mapboxFrameUploadOptionsForNexradState(
     state: NexradStateForMapbox | null | undefined,
 ): MapboxRadarFrameUploadOptions | undefined {
-    if (!state || state.nexradDataSource !== 'level3') return undefined;
+    if (!state) return { geometryLayoutKey: 'canonical' };
+    if (state.nexradDataSource !== 'level3') return { geometryLayoutKey: 'canonical' };
     const site = state.nexradSite;
     const radarVar = (state.nexradProduct || 'REF').toUpperCase();
 
@@ -121,5 +122,5 @@ export function mapboxFrameUploadOptionsForNexradState(
         return { geometryLayoutKey: `${site}|${radarVar}|${mnemonic}` };
     }
 
-    return { geometryCacheKeysRayBoundaries: true };
+    return { geometryLayoutKey: 'canonical' };
 }