Compare commits

..

2 Commits
v1.1.6 ... main

Author SHA1 Message Date
3555242c84 fix: statistiques vides en production — normalise les dates migrées
Les données migrées depuis "Minuteur Dragodinde" stockaient les dates
comme timestamps numériques, causant un crash sur `.slice()`.
Ajout de normalizeDate(), gardes défensives, migration robuste et
fallback d'erreur visible dans l'UI. Bump v1.1.7.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-06 12:36:36 +02:00
61bbac0adc perf: optimisations RAM et rendu + fix logo sidebar en production
- Fix logo sidebar : chemin relatif au lieu d'absolu (cassé en prod)
- Compression icone_sidebar.png : 448KB → 24KB (resize 128x128)
- Cache DOM EnclosView : élimine ~360 querySelector/sec dans le RAF
- Throttle RAF à 4fps quand aucun timer actif (idle)
- Cache version Sidebar : un seul appel IPC au lieu d'un par update()

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-06 11:51:23 +02:00
8 changed files with 183 additions and 76 deletions

View File

@ -1,6 +1,6 @@
{
"name": "obsidienne",
"version": "1.1.6",
"version": "1.1.7",
"description": "Obsidienne — Minuteur d'élevage Dragodinde pour Dofus 3",
"main": "dist-electron/main.js",
"author": "Mickael",

View File

@ -88,6 +88,15 @@ function toISO(d: Date): string {
return d.toISOString().slice(0, 10);
}
/** Normalise une date (string ISO, timestamp number, Date object) en string "YYYY-MM-DD". */
function normalizeDate(raw: unknown): string {
if (!raw) return '';
if (typeof raw === 'string') return raw.slice(0, 10);
if (typeof raw === 'number') return new Date(raw).toISOString().slice(0, 10);
if (raw instanceof Date) return raw.toISOString().slice(0, 10);
return String(raw).slice(0, 10);
}
function aggregate(entries: AccEntry[]) {
let couples = 0, babies = 0;
const races = new Set<string>();
@ -102,36 +111,60 @@ function aggregate(entries: AccEntry[]) {
const WEEKDAY_NAMES = ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'];
function emptyResult(days: number): StatisticsResult {
const kpi0: KpiDelta = { value: 0, delta: null };
const missingRaces: MissingRace[] = Object.entries(RACE_GEN)
.filter(([, gen]) => gen !== 1)
.map(([name, gen]) => ({ name, gen }))
.sort((a, b) => a.gen - b.gen || a.name.localeCompare(b.name));
return {
totalBabies: kpi0, totalCouples: kpi0, successRate: kpi0, racesCount: kpi0,
dailyBirths: [], raceShares: [], raceSuccessRates: [], bestCouples: [],
genBreakdown: [], missingRaces, weekdayActivity: [], days,
};
}
export function createGetStatisticsHandler(state: AppState) {
return (query: GetStatisticsQuery): StatisticsResult => {
const days = query.days ?? 30;
try {
return computeStatistics(state, days);
} catch (e) {
console.error('GetStatistics handler error:', e);
return emptyResult(days);
}
};
}
function computeStatistics(state: AppState, days: number): StatisticsResult {
// Collecter toutes les entrées normalisées (exclure Gen 1 : non créables, seulement capturables)
const all: AccEntry[] = [];
for (const acc of state.accouplements) {
const accouplements = Array.isArray(state.accouplements) ? state.accouplements : [];
for (const acc of accouplements) {
if (!acc || !acc.baby) continue;
if (acc.gen === 1 || (RACE_GEN[acc.baby] ?? 0) === 1) continue;
all.push({
parentA: acc.parentA, parentB: acc.parentB,
baby: acc.baby, gen: acc.gen,
couples: acc.couples, babiesObtained: acc.babiesObtained,
date: acc.date,
parentA: acc.parentA ?? '', parentB: acc.parentB ?? '',
baby: acc.baby, gen: acc.gen ?? (RACE_GEN[acc.baby] ?? 0),
couples: Number(acc.couples) || 0, babiesObtained: Number(acc.babiesObtained) || 0,
date: normalizeDate(acc.date),
});
}
for (const arch of state.archivedStats as Array<{
const archivedStats = Array.isArray(state.archivedStats) ? state.archivedStats : [];
for (const arch of archivedStats as Array<{
parentA?: string; parentB?: string; baby?: string; gen?: number;
couples?: number; babiesObtained?: number; date?: string;
}>) {
if (arch.baby) {
const gen = arch.gen ?? (RACE_GEN[arch.baby] ?? 0);
if (gen === 1) continue;
all.push({
parentA: arch.parentA ?? '', parentB: arch.parentB ?? '',
baby: arch.baby, gen,
couples: arch.couples ?? 0,
babiesObtained: arch.babiesObtained ?? 0,
date: arch.date ?? '',
});
}
if (!arch || !arch.baby) continue;
const gen = arch.gen ?? (RACE_GEN[arch.baby] ?? 0);
if (gen === 1) continue;
all.push({
parentA: arch.parentA ?? '', parentB: arch.parentB ?? '',
baby: arch.baby, gen,
couples: Number(arch.couples) || 0,
babiesObtained: Number(arch.babiesObtained) || 0,
date: normalizeDate(arch.date),
});
}
const now = new Date();
@ -284,5 +317,4 @@ export function createGetStatisticsHandler(state: AppState) {
weekdayActivity,
days,
};
};
}

View File

@ -34,7 +34,17 @@ if (process.env.ELECTRON_USER_DATA_DIR) {
if (app.isPackaged) {
const oldDataFile = path.join(app.getPath('appData'), 'Minuteur Dragodinde', 'dd-timer-data.json');
const newDataFile = path.join(app.getPath('userData'), 'dd-timer-data.json');
if (!fs.existsSync(newDataFile) && fs.existsSync(oldDataFile)) {
const shouldMigrate = (() => {
if (!fs.existsSync(oldDataFile)) return false;
if (!fs.existsSync(newDataFile)) return true;
// Si le nouveau fichier est quasi-vide (<200 octets = état par défaut), on remigre
try {
const newSize = fs.statSync(newDataFile).size;
const oldSize = fs.statSync(oldDataFile).size;
return newSize < 200 && oldSize > newSize;
} catch { return false; }
})();
if (shouldMigrate) {
try {
fs.mkdirSync(path.dirname(newDataFile), { recursive: true });
fs.copyFileSync(oldDataFile, newDataFile);

View File

@ -324,8 +324,18 @@ export class App {
}
// ── Live update loop ──────────────────────────────────────────
private lastRafTime = 0;
private startAnimationLoop(): void {
const loop = () => {
const loop = (now: number) => {
// Throttle à ~4fps quand aucun timer ne tourne (idle)
const data = this.getDashboardData();
const anyRunning = data.enclosSummaries.some(e => e.running);
if (!anyRunning && now - this.lastRafTime < 250) {
this.rafId = requestAnimationFrame(loop);
return;
}
this.lastRafTime = now;
this.updateTabDots();
if (this.activeChild) this.activeChild.update();
this.rafId = requestAnimationFrame(loop);

View File

@ -15,10 +15,28 @@ import { UndoManager } from '@presentation/services/UndoManager';
const ALL_GAUGES: GaugeType[] = ['baffeur', 'caresseur', 'foudroyeur', 'abreuvoir', 'dragofesse', 'mangeoire'];
interface CachedGaugeEls {
tier: Element | null;
bar: HTMLElement | null;
empty: Element | null;
inp: HTMLInputElement | null;
}
export class EnclosView {
private el: HTMLElement | null = null;
private enclosId = 0;
private ddCards: Map<number, DragodindeCard> = new Map();
private cachedEls: {
elapsed: Element | null;
gcd: Element | null;
tbtn: HTMLButtonElement | null;
resetBtn: HTMLElement | null;
doneBanner: HTMLElement | null;
doneResetBtn: HTMLElement | null;
ddCount: Element | null;
addBtn: HTMLButtonElement | null;
gauges: Map<string, CachedGaugeEls>;
} | null = null;
constructor(
private commandBus: CommandBus,
@ -179,9 +197,35 @@ export class EnclosView {
`;
this.bindEvents(enc);
this.cacheElements(enc);
this.renderDdCards(enc);
}
private cacheElements(enc: Enclos): void {
if (!this.el) return;
const eId = this.enclosId;
const gauges = new Map<string, CachedGaugeEls>();
enc.activeGauges.forEach(gid => {
gauges.set(gid, {
tier: this.el!.querySelector(`#gtier-${eId}-${gid}`),
bar: this.el!.querySelector<HTMLElement>(`#gbar-${eId}-${gid}`),
empty: this.el!.querySelector(`#gempty-${eId}-${gid}`),
inp: this.el!.querySelector<HTMLInputElement>(`#glvl-${eId}-${gid}`),
});
});
this.cachedEls = {
elapsed: this.el.querySelector(`#elapsed-${eId}`),
gcd: this.el.querySelector(`#gcd-${eId}`),
tbtn: this.el.querySelector<HTMLButtonElement>(`#tbtn-${eId}`),
resetBtn: this.el.querySelector<HTMLElement>(`#treset-${eId}`),
doneBanner: this.el.querySelector<HTMLElement>(`#done-banner-${eId}`),
doneResetBtn: this.el.querySelector<HTMLElement>(`#done-reset-${eId}`),
ddCount: this.el.querySelector(`#ddcount-${eId}`),
addBtn: this.el.querySelector<HTMLButtonElement>(`#adddd-${eId}`),
gauges,
};
}
private bindEvents(enc: Enclos): void {
if (!this.el) return;
const eId = this.enclosId;
@ -307,54 +351,52 @@ export class EnclosView {
}
update(): void {
if (!this.el) return;
if (!this.el || !this.cachedEls) return;
const enc = this.getEnc();
const eId = this.enclosId;
const { globalMax, allDone, started, el: elSec, ddDone } = enclosGlobalState(enc);
const c = this.cachedEls;
const { globalMax, allDone, started, el: elSec } = enclosGlobalState(enc);
const running = enc.timer.running;
/* Complétion automatique : toutes les cibles atteintes → une seule alarme */
if (allDone && running && enc.dragodindes.length > 0 && enc.activeGauges.length > 0) {
this.commandBus.execute({ type: 'complete-timer', enclosId: eId });
this.commandBus.execute({ type: 'complete-timer', enclosId: this.enclosId });
this.renderInner();
return;
}
/* Elapsed clock */
const elapsedEl = this.el.querySelector(`#elapsed-${eId}`);
if (elapsedEl) elapsedEl.textContent = fmtClock(elSec);
if (c.elapsed) c.elapsed.textContent = fmtClock(elSec);
/* Global countdown */
const gcdEl = this.el.querySelector(`#gcd-${eId}`);
if (gcdEl) {
if (c.gcd) {
if (enc.activeGauges.length > 0 && enc.dragodindes.length > 0) {
if (allDone) {
gcdEl.textContent = '✅';
c.gcd.textContent = '✅';
} else if (!isFinite(globalMax)) {
gcdEl.textContent = '∞';
c.gcd.textContent = '∞';
} else {
gcdEl.textContent = fmtClock(globalMax);
c.gcd.textContent = fmtClock(globalMax);
}
} else {
gcdEl.textContent = '--:--:--';
c.gcd.textContent = '--:--:--';
}
}
/* Timer button state */
const tbtn = this.el.querySelector<HTMLButtonElement>(`#tbtn-${eId}`);
if (tbtn) {
if (c.tbtn) {
const timerIcon = running ? 'pause' : 'play_arrow';
const timerText = running ? 'PAUSE' : (enc.timer.pausedAt && !enc.alerted['__done__'] ? 'REPRENDRE' : 'DÉMARRER');
tbtn.className = running ? 'enc-start-btn enc-btn-pause' : 'enc-start-btn';
tbtn.innerHTML = `<span class="material-symbols-outlined">${timerIcon}</span>${timerText}`;
c.tbtn.className = running ? 'enc-start-btn enc-btn-pause' : 'enc-start-btn';
c.tbtn.innerHTML = `<span class="material-symbols-outlined">${timerIcon}</span>${timerText}`;
}
/* Reset button visibility */
const resetBtn = this.el.querySelector<HTMLElement>(`#treset-${eId}`);
if (resetBtn) resetBtn.style.display = started ? '' : 'none';
if (c.resetBtn) c.resetBtn.style.display = started ? '' : 'none';
/* Gauge config live updates (tier badges and bars decay over time) */
/* Gauge config live updates (cached — no querySelector per frame) */
enc.activeGauges.forEach(gid => {
const g = c.gauges.get(gid);
if (!g) return;
const startGl = started ? (enc.timer.snapGauges[gid] ?? enc.gaugeLevels[gid]) : enc.gaugeLevels[gid];
const curGl = started ? enclosGaugeCurGl(enc, gid) : startGl;
const tn = tierNum(curGl);
@ -363,62 +405,48 @@ export class EnclosView {
const emptyTime = curGl > 0 ? timeToGain(curGl, curGl) : 0;
const emptyStr = emptyTime === Infinity ? '∞' : fmt(emptyTime);
const tierEl = this.el!.querySelector(`#gtier-${eId}-${gid}`);
if (tierEl) {
tierEl.textContent = curGl > 0 ? `Tier ${tn} · ±${tr}/tick` : 'Jauge vide';
if (g.tier) {
g.tier.textContent = curGl > 0 ? `Tier ${tn} · ±${tr}/tick` : 'Jauge vide';
}
const barEl = this.el!.querySelector<HTMLElement>(`#gbar-${eId}-${gid}`);
if (barEl) barEl.style.width = `${pct.toFixed(1)}%`;
const emptyEl = this.el!.querySelector(`#gempty-${eId}-${gid}`);
if (emptyEl) {
if (g.bar) g.bar.style.width = `${pct.toFixed(1)}%`;
if (g.empty) {
if (curGl > 0) {
emptyEl.textContent = `Vide en ${emptyStr}`;
emptyEl.classList.remove('enc-gauge-alert');
g.empty.textContent = `Vide en ${emptyStr}`;
g.empty.classList.remove('enc-gauge-alert');
} else if (started && running) {
emptyEl.textContent = '⚠ Rechargez la jauge';
emptyEl.classList.add('enc-gauge-alert');
g.empty.textContent = '⚠ Rechargez la jauge';
g.empty.classList.add('enc-gauge-alert');
} else {
emptyEl.textContent = 'Vide';
emptyEl.classList.remove('enc-gauge-alert');
g.empty.textContent = 'Vide';
g.empty.classList.remove('enc-gauge-alert');
}
}
/* Mettre à jour la valeur affichée de l'input et son état en temps réel */
const inp = this.el!.querySelector<HTMLInputElement>(`#glvl-${eId}-${gid}`);
if (inp) {
// Synchroniser data-running avec l'état réel du timer
inp.dataset.running = started ? '1' : '0';
// Mettre à jour la valeur affichée (sauf si l'utilisateur est en train de taper)
if (document.activeElement !== inp) {
inp.value = String(Math.round(started ? curGl : (enc.gaugeLevels[gid] ?? 0)));
if (g.inp) {
g.inp.dataset.running = started ? '1' : '0';
if (document.activeElement !== g.inp) {
g.inp.value = String(Math.round(started ? curGl : (enc.gaugeLevels[gid] ?? 0)));
}
}
});
/* Done banner */
const doneBanner = this.el.querySelector<HTMLElement>(`#done-banner-${eId}`);
if (doneBanner) {
doneBanner.style.display = (allDone && started && enc.dragodindes.length > 0 && enc.activeGauges.length > 0) ? '' : 'none';
if (c.doneBanner) {
c.doneBanner.style.display = (allDone && started && enc.dragodindes.length > 0 && enc.activeGauges.length > 0) ? '' : 'none';
}
/* Bouton "Nouvelle fournée" — visible uniquement si toutes les DD ont 20000 en maturité, endurance et amour */
const doneResetBtn = this.el.querySelector<HTMLElement>(`#done-reset-${eId}`);
if (doneResetBtn) {
/* Bouton "Nouvelle fournée" */
if (c.doneResetBtn) {
const allMaxed = enc.dragodindes.length > 0 && enc.dragodindes.every(dd =>
dd.stats.maturite >= 20000 && dd.stats.endurance >= 20000 && dd.stats.amour >= 20000
);
doneResetBtn.style.display = allMaxed ? '' : 'none';
c.doneResetBtn.style.display = allMaxed ? '' : 'none';
}
/* DD count */
const ddCountEl = this.el.querySelector(`#ddcount-${eId}`);
if (ddCountEl) ddCountEl.textContent = `${enc.dragodindes.length}/10`;
if (c.ddCount) c.ddCount.textContent = `${enc.dragodindes.length}/10`;
/* Add button state */
const addBtn = this.el.querySelector<HTMLButtonElement>(`#adddd-${eId}`);
if (addBtn) addBtn.disabled = enc.dragodindes.length >= 10;
if (c.addBtn) c.addBtn.disabled = enc.dragodindes.length >= 10;
/* Update each DD card */
enc.dragodindes.forEach(dd => {
@ -439,6 +467,7 @@ export class EnclosView {
destroy(): void {
this.ddCards.forEach(card => card.destroy());
this.ddCards.clear();
this.cachedEls = null;
this.el?.remove();
this.el = null;
}

View File

@ -5,6 +5,7 @@ import { esc } from '@presentation/helpers/format';
export class Sidebar {
private el: HTMLElement | null = null;
private cachedVersion: string | null = null;
constructor(
private uiState: UIState,
@ -32,7 +33,7 @@ export class Sidebar {
html += `
<div class="sb-header">
<div class="sb-logo-wrap">
<img src="/icone_sidebar.png" alt="logo" class="sb-logo-img" />
<img src="icone_sidebar.png" alt="logo" class="sb-logo-img" />
</div>
<div class="sb-brand">
<span class="sb-brand-name">Obsidienne</span>
@ -111,9 +112,15 @@ export class Sidebar {
}
private fetchAndInjectVersion(): void {
if (this.cachedVersion) {
const verEl = this.el?.querySelector('#sb-ver');
if (verEl) verEl.textContent = `v${this.cachedVersion}`;
return;
}
const api = (window as any).electronAPI;
if (!api?.getVersion) return;
api.getVersion().then((v: string) => {
this.cachedVersion = v;
const verEl = this.el?.querySelector('#sb-ver');
if (verEl) verEl.textContent = `v${v}`;
}).catch(() => {});

View File

@ -43,6 +43,25 @@ export class StatistiquesView {
private renderAll(): void {
if (!this.el) return;
try {
this.renderAllInner();
} catch (e) {
const msg = e instanceof Error ? e.message : String(e);
const stack = e instanceof Error ? e.stack ?? '' : '';
console.error('Erreur statistiques:', e);
this.el.innerHTML = `<div class="stats-hero">
<div>
<h2 class="stats-hero-title">Statistiques d'\u00c9levage</h2>
<p class="stats-hero-sub" style="color:#f87171">Erreur : ${esc(msg)}</p>
<pre style="color:#f87171;font-size:11px;white-space:pre-wrap;max-height:200px;overflow:auto;margin-top:8px">${esc(stack)}</pre>
</div>
</div>`;
}
}
private renderAllInner(): void {
if (!this.el) return;
const data = this.getData();
let html = '';

Binary file not shown.

Before

Width:  |  Height:  |  Size: 438 KiB

After

Width:  |  Height:  |  Size: 24 KiB