Skip to content

fix(map): restore seamarks + PNBOIA debug stability #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cheewye merged 1 commit into from
Mar 3, 2026
Merged

fix(map): restore seamarks + PNBOIA debug stability #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 113 additions & 7 deletions frontend/src/components/maps/PnboiaLayerLeaflet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,30 @@ const normalizeBuoys = (rawItems: any[]): BuoyData[] =>
})
.filter((item): item is BuoyData => item !== null);

function resolvePnboiaUrl(lastFetchUrl: string | null): string | null {
if (!lastFetchUrl) return null;
const raw = String(lastFetchUrl);
if (raw.startsWith("http://") || raw.startsWith("https://")) return raw;
return `${window.location.origin}${raw.startsWith("/") ? raw : `/${raw}`}`;
}

function inferRequestOutcome(args: {
loading: boolean;
fetchErrorName: string | null;
lastAttempt: { outcome: string | null } | null;
lastHttpStatus: number | null;
lastError: string | null;
}): "ok" | "aborted" | "blocked" | "pending" {
if (args.loading) return "pending";
const outcome = args.lastAttempt?.outcome || null;
if (outcome === "ok") return "ok";
if (outcome === "abort" || args.fetchErrorName === "AbortError") return "aborted";
if (outcome === "error" || outcome === "empty") return "blocked";
if (args.lastHttpStatus && args.lastHttpStatus >= 200 && args.lastHttpStatus < 400) return "ok";
if (args.lastError) return "blocked";
return "pending";
}

export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
maxVisible = 50,
showLabels = false,
Expand Down Expand Up @@ -120,11 +144,18 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
const [lastFetchUrl, setLastFetchUrl] = useState<string>("/api/v1/pnboia/list");
const [lastOkAtISO, setLastOkAtISO] = useState<string | null>(null);
const [loadingMs, setLoadingMs] = useState<number>(0);
const [abortReason, setAbortReason] = useState<"timeout" | "cleanup" | null>(null);
const [retryNonce, setRetryNonce] = useState(0);
const [mapViewKey, setMapViewKey] = useState(0);
const inFlightRef = useRef(false);
const loadingStartedAtRef = useRef<number | null>(null);
const staleCacheRef = useRef<{ ts: number; buoys: BuoyData[] } | null>(null);
const abortReasonRef = useRef<"timeout" | "cleanup" | null>(null);

const onBuoysLoadedRef = useRef<PnboiaLayerProps["onBuoysLoaded"]>(onBuoysLoaded);
const onLoadingChangeRef = useRef<PnboiaLayerProps["onLoadingChange"]>(onLoadingChange);
const onErrorChangeRef = useRef<PnboiaLayerProps["onErrorChange"]>(onErrorChange);
const onDebugInfoChangeRef = useRef<PnboiaLayerProps["onDebugInfoChange"]>(onDebugInfoChange);

const paneName = pane || "pnboia";

Expand All @@ -149,8 +180,50 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
return () => window.removeEventListener("iuri:pnboia-retry", onRetry as EventListener);
}, []);

useEffect(() => onLoadingChange?.(loading), [loading, onLoadingChange]);
useEffect(() => onErrorChange?.(lastError), [lastError, onErrorChange]);
useEffect(() => {
onBuoysLoadedRef.current = onBuoysLoaded;
}, [onBuoysLoaded]);
useEffect(() => {
onLoadingChangeRef.current = onLoadingChange;
}, [onLoadingChange]);
useEffect(() => {
onErrorChangeRef.current = onErrorChange;
}, [onErrorChange]);
useEffect(() => {
onDebugInfoChangeRef.current = onDebugInfoChange;
}, [onDebugInfoChange]);

useEffect(() => onLoadingChangeRef.current?.(loading), [loading]);
useEffect(() => onErrorChangeRef.current?.(lastError), [lastError]);

useEffect(() => {
loadedBuoysRef.current = loadedBuoys;
}, [loadedBuoys]);

useEffect(() => {
// Cold start: hydrate last-good from localStorage cache (best-effort).
try {
const raw = localStorage.getItem(CACHE_KEY);
if (!raw) return;
const parsed = JSON.parse(raw) as any;
const ts = Number(parsed?.ts);
const buoys = Array.isArray(parsed?.buoys) ? parsed.buoys : null;
if (!Number.isFinite(ts) || !buoys) return;
const normalized = normalizeBuoys(buoys);
if (normalized.length === 0) return;
const ageMs = Math.max(0, Date.now() - ts);
if (ageMs <= CACHE_TTL_MS) {
cacheTsRef.current = ts;
setLoadedBuoys(normalized);
setSource("cache");
setLastOkAtISO(new Date(ts).toISOString());
} else {
staleCacheRef.current = { ts, buoys: normalized };
}
} catch {
// ignore
}
}, []);

useEffect(() => {
loadedBuoysRef.current = loadedBuoys;
Expand Down Expand Up @@ -207,6 +280,8 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
setFetchErrorName(null);
setLastHttpStatus(null);
setLastError(null);
setAbortReason(null);
abortReasonRef.current = null;

const nextAttempt = attemptRef.current + 1;
attemptRef.current = nextAttempt;
Expand All @@ -223,7 +298,10 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({

let cancelled = false;
const controller = new AbortController();
const abortTimer = window.setTimeout(() => controller.abort(), ABORT_MS);
const abortTimer = window.setTimeout(() => {
abortReasonRef.current = "timeout";
controller.abort();
}, ABORT_MS);
const url = "/api/v1/pnboia/list";
setLastFetchUrl(url);

Expand Down Expand Up @@ -270,7 +348,7 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
} catch {
// ignore
}
onBuoysLoaded?.(items.length);
onBuoysLoadedRef.current?.(items.length);
setLastAttempt((prev) =>
prev ? { ...prev, endedAtISO: new Date().toISOString(), elapsedMs: now - startedAt, outcome: "ok" } : prev
);
Expand All @@ -286,6 +364,7 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
// Fail-open: keep the last loaded list, only update error.
setLastError(message);
setFetchErrorName(isAbort ? "AbortError" : errName);
setAbortReason(isAbort ? (abortReasonRef.current ?? "cleanup") : null);
// keep current list (fail-open); keep source as-is (live/cache)
setLastAttempt((prev) =>
prev
Expand Down Expand Up @@ -323,10 +402,13 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
return () => {
cancelled = true;
window.clearTimeout(abortTimer);
if (!controller.signal.aborted) {
abortReasonRef.current = abortReasonRef.current ?? "cleanup";
}
controller.abort();
inFlightRef.current = false;
};
}, [ABORT_MS, onBuoysLoaded, retryNonce, fallbackBuoys]);
}, [retryNonce]);

const { visibleCount, nearest, paddedBounds } = useMemo(() => {
const bounds = map.getBounds().pad(0.15);
Expand Down Expand Up @@ -371,6 +453,14 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
const status = loading ? "loading" : lastError ? "error" : loadedBuoys.length > 0 ? "ok" : "empty";
const cacheAgeMs = cacheTsRef.current ? Math.max(0, Date.now() - cacheTsRef.current) : null;
const lastOkAgeMs = lastOkTs ? Math.max(0, Date.now() - lastOkTs) : null;
const resolvedUrl = resolvePnboiaUrl(lastFetchUrl);
const requestOutcome = inferRequestOutcome({
loading,
fetchErrorName,
lastAttempt,
lastHttpStatus,
lastError,
});
window.dispatchEvent(
new CustomEvent("iuri:pnboia-status", {
detail: {
Expand All @@ -387,10 +477,14 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
slow,
slowMs: SLOW_MS,
abortMs: ABORT_MS,
abortReason,
fetchErrorName,
source,
cacheAgeMs,
lastOkAgeMs,
lastFetchUrl,
resolvedUrl,
requestOutcome,
attempt,
timing: lastAttempt,
},
Expand All @@ -403,6 +497,7 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
fetchErrorName,
lastAttempt,
lastError,
lastFetchUrl,
lastOkTs,
loadedBuoys.length,
loading,
Expand All @@ -420,6 +515,14 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
const ne = bounds.getNorthEast();
const cacheAgeMs = cacheTsRef.current ? Math.max(0, Date.now() - cacheTsRef.current) : null;
const lastOkAgeMs = lastOkTs ? Math.max(0, Date.now() - lastOkTs) : null;
const resolvedUrl = resolvePnboiaUrl(lastFetchUrl);
const requestOutcome = inferRequestOutcome({
loading,
fetchErrorName,
lastAttempt,
lastHttpStatus,
lastError,
});
window.dispatchEvent(
new CustomEvent("iuri:pnboia-runtime", {
detail: {
Expand All @@ -429,6 +532,7 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
loadedCount: loadedBuoys.length,
visibleCount,
lastFetchUrl,
resolvedUrl,
httpStatus: lastHttpStatus,
lastOkAtISO,
zoom: map.getZoom(),
Expand All @@ -437,10 +541,12 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
slow,
slowMs: SLOW_MS,
abortMs: ABORT_MS,
abortReason,
fetchErrorName,
source,
cacheAgeMs,
lastOkAgeMs,
requestOutcome,
attempt,
timing: lastAttempt,
},
Expand Down Expand Up @@ -484,8 +590,8 @@ export const PnboiaLayer: React.FC<PnboiaLayerProps> = ({
lastOkTs,
lastError,
};
onDebugInfoChange?.(info);
}, [lastError, lastOkTs, loadedBuoys, map, maxVisible, onDebugInfoChange, visibleCount]);
onDebugInfoChangeRef.current?.(info);
}, [lastError, lastOkTs, loadedBuoys, map, maxVisible, visibleCount]);

const toRender = loadedBuoys.slice(0, Math.max(0, maxVisible));

Expand Down
Loading