fix: harden frontend hook lifecycle cleanup
This commit is contained in:
parent
0b7b421c52
commit
e048be18d1
3 changed files with 100 additions and 16 deletions
|
|
@ -6,7 +6,7 @@ import { LiveSocket } from "phoenix_live_view";
|
|||
|
||||
declare global {
|
||||
interface Window {
|
||||
topbar: {
|
||||
topbar?: {
|
||||
config: (opts: { barColors: Record<number, string>; shadowColor: string }) => void;
|
||||
show: (delay?: number) => void;
|
||||
hide: () => void;
|
||||
|
|
@ -47,6 +47,12 @@ interface HookDef {
|
|||
[key: string]: unknown;
|
||||
}
|
||||
|
||||
interface DeferredHookContext {
|
||||
el?: HTMLElement;
|
||||
__appDestroyed?: boolean;
|
||||
__chartBundleCheckCount?: number;
|
||||
}
|
||||
|
||||
const Hooks: Record<string, HookDef> = {};
|
||||
|
||||
// Singleton map bundle loader — ensures the script is only appended once
|
||||
|
|
@ -79,7 +85,9 @@ function loadMapBundle(callback: () => void) {
|
|||
script.onerror = () => {
|
||||
console.error("Failed to load map bundle");
|
||||
mapBundleLoading = false;
|
||||
const cbs = mapBundleCallbacks;
|
||||
mapBundleCallbacks = [];
|
||||
cbs.forEach((cb) => cb());
|
||||
};
|
||||
document.head.appendChild(script);
|
||||
} else {
|
||||
|
|
@ -87,30 +95,52 @@ function loadMapBundle(callback: () => void) {
|
|||
}
|
||||
}
|
||||
|
||||
function isHookActive(context: DeferredHookContext): boolean {
|
||||
return !context.__appDestroyed && !!context.el?.isConnected;
|
||||
}
|
||||
|
||||
// Map hooks - load map bundle when needed
|
||||
const originalMapMounted = MapAPRSMap.mounted;
|
||||
const originalMapDestroyed = MapAPRSMap.destroyed;
|
||||
Hooks.APRSMap = {
|
||||
...MapAPRSMap,
|
||||
mounted() {
|
||||
const self = this;
|
||||
const self = this as DeferredHookContext;
|
||||
self.__appDestroyed = false;
|
||||
loadMapBundle(() => {
|
||||
if (originalMapMounted) {
|
||||
if (originalMapMounted && isHookActive(self)) {
|
||||
originalMapMounted.call(self);
|
||||
}
|
||||
});
|
||||
},
|
||||
destroyed() {
|
||||
const self = this as DeferredHookContext;
|
||||
self.__appDestroyed = true;
|
||||
if (originalMapDestroyed) {
|
||||
originalMapDestroyed.call(self);
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
const originalInfoMapDestroyed = InfoMap.destroyed;
|
||||
Hooks.InfoMap = {
|
||||
...InfoMap,
|
||||
mounted() {
|
||||
const self = this;
|
||||
const self = this as DeferredHookContext;
|
||||
self.__appDestroyed = false;
|
||||
loadMapBundle(() => {
|
||||
if (InfoMap.mounted) {
|
||||
if (InfoMap.mounted && isHookActive(self)) {
|
||||
InfoMap.mounted.call(self);
|
||||
}
|
||||
});
|
||||
},
|
||||
destroyed() {
|
||||
const self = this as DeferredHookContext;
|
||||
self.__appDestroyed = true;
|
||||
if (originalInfoMapDestroyed) {
|
||||
originalInfoMapDestroyed.call(self);
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// Chart hooks - load chart bundle when needed
|
||||
|
|
@ -120,15 +150,27 @@ Object.keys(WeatherChartHooks).forEach((hookName) => {
|
|||
Hooks[hookName] = {
|
||||
...originalHook,
|
||||
mounted() {
|
||||
const self = this;
|
||||
const self = this as DeferredHookContext;
|
||||
self.__appDestroyed = false;
|
||||
self.__chartBundleCheckCount = 0;
|
||||
if (window.VendorLoader && !window.chartBundleLoaded) {
|
||||
window.VendorLoader.loadCharts();
|
||||
const checkChartLoaded = () => {
|
||||
if (!isHookActive(self)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ((self.__chartBundleCheckCount || 0) >= 100) {
|
||||
console.error(`Timed out waiting for chart bundle for ${hookName}`);
|
||||
return;
|
||||
}
|
||||
|
||||
if (window.Chart) {
|
||||
if (originalHook.mounted) {
|
||||
originalHook.mounted.call(self);
|
||||
}
|
||||
} else {
|
||||
self.__chartBundleCheckCount = (self.__chartBundleCheckCount || 0) + 1;
|
||||
setTimeout(checkChartLoaded, 50);
|
||||
}
|
||||
};
|
||||
|
|
@ -139,6 +181,13 @@ Object.keys(WeatherChartHooks).forEach((hookName) => {
|
|||
}
|
||||
}
|
||||
},
|
||||
destroyed() {
|
||||
const self = this as DeferredHookContext;
|
||||
self.__appDestroyed = true;
|
||||
if (originalHook.destroyed) {
|
||||
originalHook.destroyed.call(self);
|
||||
}
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -194,12 +243,14 @@ const liveSocket = new LiveSocket("/live", Socket, {
|
|||
});
|
||||
|
||||
// Show progress bar on live navigation and form submits
|
||||
topbar.config({
|
||||
barColors: { 0: "#29d" },
|
||||
shadowColor: "rgba(0, 0, 0, .3)",
|
||||
});
|
||||
window.addEventListener("phx:page-loading-start", (_info) => topbar.show(100));
|
||||
window.addEventListener("phx:page-loading-stop", (_info) => topbar.hide());
|
||||
if (topbar) {
|
||||
topbar.config({
|
||||
barColors: { 0: "#29d" },
|
||||
shadowColor: "rgba(0, 0, 0, .3)",
|
||||
});
|
||||
window.addEventListener("phx:page-loading-start", (_info) => topbar.show(100));
|
||||
window.addEventListener("phx:page-loading-stop", (_info) => topbar.hide());
|
||||
}
|
||||
|
||||
// Handle connection draining reconnect events
|
||||
window.addEventListener("phx:reconnect", ((e: CustomEvent<{ delay?: number }>) => {
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@ interface ChartHookContext extends Hook {
|
|||
chart?: Chart;
|
||||
themeChangeHandler?: () => void;
|
||||
renderChart: () => void;
|
||||
isDestroyed?: boolean;
|
||||
chartLoadRetryTimer?: ReturnType<typeof setTimeout> | null;
|
||||
chartLoadRetryCount?: number;
|
||||
}
|
||||
|
||||
// Type for weather history data
|
||||
|
|
@ -260,8 +263,14 @@ function createChartHook(configKey: string): Hook {
|
|||
return {
|
||||
mounted() {
|
||||
const self = this as ChartHookContext;
|
||||
self.isDestroyed = false;
|
||||
self.chartLoadRetryTimer = null;
|
||||
self.chartLoadRetryCount = 0;
|
||||
registerChartInstance(self.el, self);
|
||||
self.renderChart = () => {
|
||||
if (self.isDestroyed || !self.el.isConnected) {
|
||||
return;
|
||||
}
|
||||
if (self.chart) self.chart.destroy();
|
||||
|
||||
const data: WeatherHistoryDatum[] = parseWeatherHistory(
|
||||
|
|
@ -360,11 +369,24 @@ function createChartHook(configKey: string): Hook {
|
|||
|
||||
// Check if Chart.js is loaded
|
||||
if (!window.Chart) {
|
||||
if ((self.chartLoadRetryCount || 0) >= 20) {
|
||||
console.error("Chart.js failed to load for weather chart");
|
||||
return;
|
||||
}
|
||||
|
||||
console.warn("Chart.js not loaded yet, retrying...");
|
||||
setTimeout(() => self.renderChart(), 100);
|
||||
self.chartLoadRetryCount = (self.chartLoadRetryCount || 0) + 1;
|
||||
if (self.chartLoadRetryTimer) {
|
||||
clearTimeout(self.chartLoadRetryTimer);
|
||||
}
|
||||
self.chartLoadRetryTimer = setTimeout(() => {
|
||||
self.chartLoadRetryTimer = null;
|
||||
self.renderChart();
|
||||
}, 100);
|
||||
return;
|
||||
}
|
||||
|
||||
self.chartLoadRetryCount = 0;
|
||||
self.chart = new window.Chart(canvas, chartConfig);
|
||||
};
|
||||
|
||||
|
|
@ -381,11 +403,19 @@ function createChartHook(configKey: string): Hook {
|
|||
},
|
||||
|
||||
updated() {
|
||||
(this as ChartHookContext).renderChart();
|
||||
const self = this as ChartHookContext;
|
||||
if (!self.isDestroyed) {
|
||||
self.renderChart();
|
||||
}
|
||||
},
|
||||
|
||||
destroyed() {
|
||||
const self = this as ChartHookContext;
|
||||
self.isDestroyed = true;
|
||||
if (self.chartLoadRetryTimer) {
|
||||
clearTimeout(self.chartLoadRetryTimer);
|
||||
self.chartLoadRetryTimer = null;
|
||||
}
|
||||
if (self.themeChangeHandler) {
|
||||
window.removeEventListener("themeChanged", self.themeChangeHandler);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ interface InfoMapContext {
|
|||
lastSymbolHtml: string | null;
|
||||
initializing: boolean;
|
||||
resizeTimer: ReturnType<typeof setTimeout> | null;
|
||||
destroyed?: boolean;
|
||||
}
|
||||
|
||||
export const InfoMap = {
|
||||
|
|
@ -18,6 +19,7 @@ export const InfoMap = {
|
|||
this.lastSymbolHtml = null;
|
||||
this.initializing = false;
|
||||
this.resizeTimer = null;
|
||||
this.destroyed = false;
|
||||
initializeMap.call(this);
|
||||
},
|
||||
|
||||
|
|
@ -64,6 +66,7 @@ export const InfoMap = {
|
|||
},
|
||||
|
||||
destroyed(this: InfoMapContext) {
|
||||
this.destroyed = true;
|
||||
if (this.resizeTimer) {
|
||||
clearTimeout(this.resizeTimer);
|
||||
this.resizeTimer = null;
|
||||
|
|
@ -79,7 +82,7 @@ export const InfoMap = {
|
|||
};
|
||||
|
||||
function initializeMap(this: InfoMapContext) {
|
||||
if (this.initializing) return;
|
||||
if (this.initializing || this.destroyed) return;
|
||||
|
||||
if (typeof L === "undefined") {
|
||||
console.error("Leaflet not loaded for InfoMap");
|
||||
|
|
@ -135,7 +138,7 @@ function initializeMap(this: InfoMapContext) {
|
|||
|
||||
const map = this.map;
|
||||
this.resizeTimer = setTimeout(() => {
|
||||
if (map) {
|
||||
if (!this.destroyed && this.el.isConnected && map && this.map === map) {
|
||||
map.invalidateSize();
|
||||
}
|
||||
this.resizeTimer = null;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue