Compare commits

..

10 Commits

Author SHA1 Message Date
Samuel Enocsson e25f66c5d3 1.2.8
Build and deploy / build-and-push (push) Successful in 21s
Build and deploy / deploy (push) Successful in 7s
2026-05-22 15:52:55 +02:00
shcizo 1442396418 Merge pull request 'feat: target rating calculator (#2)' (#17) from feat/target-rating-calculator-2 into main
Reviewed-on: #17
2026-05-22 15:46:05 +02:00
Samuel Enocsson 307dffd3a7 docs: update CLAUDE.md for consolidated deploy.yml workflow 2026-05-22 15:45:04 +02:00
Samuel Enocsson 46f78b42dc 1.2.6
Build and deploy / build-and-push (push) Successful in 20s
Build and deploy / deploy (push) Successful in 3s
2026-05-22 15:27:42 +02:00
Samuel Enocsson d0c278ea1b ci: use full Gitea URL for package-updater-action 2026-05-22 15:27:30 +02:00
Samuel Enocsson d0040901ab 1.2.5
Build and deploy / build-and-push (push) Successful in 21s
Build and deploy / deploy (push) Failing after 2s
2026-05-22 15:25:51 +02:00
Samuel Enocsson c0f9dd5f33 ci: fix updater secret name (UPDATER_API_KEY) 2026-05-22 15:25:38 +02:00
Samuel Enocsson e29bc8ee80 feat: show sensitivity bracket around required average
After the binary search converges, also simulate predicted rating at
required±1 average. Display the three rows in the modal so the user can
see how sharp the requirement is — e.g. whether averaging 1 point lower
costs them 1 point of predicted rating or 5.
2026-05-22 13:43:25 +02:00
Samuel Enocsson 96edc606d3 fix: offer refresh button when round history is empty
When a player has rating_history (graph) but no round_history (per-round
detail), calculating a target produced a dead-end error. Now the modal
detects the NO_ROUNDS case and shows a button that triggers the existing
refresh-round-history endpoint and re-runs the calculation on success.
Handles the 24h rate-limit and other refresh errors explicitly.
2026-05-22 13:32:02 +02:00
Samuel Enocsson 1e66b9f94f feat: add target rating calculator (#2) 2026-05-22 13:21:41 +02:00
10 changed files with 478 additions and 7 deletions
+2 -2
View File
@@ -34,9 +34,9 @@ jobs:
runs-on: ubuntu-latest
needs: [build-and-push]
steps:
- uses: shcizo/package-updater-action@v1
- uses: https://gitea.shcizo.se/shcizo/package-updater-action@v1
with:
endpoint: https://updater.shcizo.se/update
image: gitea.shcizo.se/shcizo/pdga-rating
tag: ${{ gitea.ref_name }}
token: ${{ secrets.UPDATER_TOKEN }}
token: ${{ secrets.UPDATER_API_KEY }}
+2 -2
View File
@@ -11,7 +11,7 @@ PDGA rating scraper and display app. Scrapes player ratings and course data from
- **Frontend:** HTMX + vanilla JS (in `public/js/`)
- **Scraping:** Puppeteer (with stealth plugin) + direct HTTP
- **Logging:** Pino (JSON in production, pino-pretty in dev)
- **CI/CD:** Gitea Actions (tag-triggered docker build/push to `gitea.shcizo.se/shcizo/pdga-rating`)
- **CI/CD:** Gitea Actions (tag-triggered build + push + deploy via `.gitea/workflows/deploy.yml`)
## Project Structure
@@ -46,7 +46,7 @@ public/
- **Logging:** Use `require('./logger')` (or relative path). Never use `console.log/error` in backend code. Use appropriate Pino levels: `debug` for verbose/diagnostic data, `info` for operational status, `warn` for retries/degraded state, `error` for failures, `fatal` for startup crashes.
- **Frontend JS:** `console.error` is fine in `public/js/` — runs in browser, no Pino.
- **Commits:** Conventional commits (`feat:`, `fix:`, `refactor:`, `chore:`, `ci:`).
- **Releases:** Manual version bump — edit `version` in `package.json` + `package-lock.json`, commit as `<version>`, tag `v<version>`, push commit + tag (`git push origin main v<version>`). Triggers `.gitea/workflows/docker-build.yml` which builds and pushes the image. Auth uses repo secret `PACKAGES_TOKEN` (PAT with `write:package`) — the auto-injected `GITEA_TOKEN` does not have effective registry access.
- **Releases:** Manual version bump — edit `version` in `package.json` + `package-lock.json`, commit as `<version>`, tag `v<version>`, push commit + tag (`git push origin main v<version>`). Triggers `.gitea/workflows/deploy.yml` which (1) builds and pushes the image to `gitea.shcizo.se/shcizo/pdga-rating:<tag>` + `:latest`, then (2) calls `package-updater-action` against `updater.shcizo.se/update` to roll out the new image. Required secrets: `PACKAGES_TOKEN` (PAT with `write:package`, for registry auth — the auto-injected `GITEA_TOKEN` does not have effective registry access) and `UPDATER_API_KEY` (for the updater endpoint). The action repo `shcizo/package-updater-action` is referenced via full Gitea URL (`https://gitea.shcizo.se/...`) since `uses:` defaults to GitHub.
- **Scraping:** Two strategies per entity: direct HTTP (fast, preferred) with Puppeteer fallback (stealth plugin for anti-bot). Rate limiting must be respected.
- **Database:** Migrations run automatically on startup in `db.js`. Schema changes go there.
- **Templates:** EJS with shared layout in `views/partials/`. Pages use HTMX for dynamic content loading.
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "pdga-ratings",
"version": "1.2.4",
"version": "1.2.8",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "pdga-ratings",
"version": "1.2.4",
"version": "1.2.8",
"dependencies": {
"ejs": "^4.0.1",
"express": "^4.18.2",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "pdga-ratings",
"version": "1.2.4",
"version": "1.2.8",
"description": "PDGA rating scraper and display",
"main": "server.js",
"scripts": {
+83
View File
@@ -298,3 +298,86 @@
font-size: 13px;
}
}
/* ── Target Rating Calculator ─────────────────── */
.target-rating-icon {
color: var(--accent);
}
#target-rating-form .form-row {
display: flex;
flex-direction: column;
gap: 4px;
margin-bottom: 12px;
}
#target-rating-form .form-row label {
font-size: 0.9em;
}
#target-rating-form .form-row input {
padding: 6px 8px;
}
#target-rating-form .form-actions {
display: flex;
justify-content: flex-end;
margin-top: 8px;
}
.target-rating-result {
margin-top: 16px;
padding-top: 12px;
border-top: 1px solid var(--border);
}
.target-rating-result .target-summary div {
margin-bottom: 6px;
}
.target-rating-result .warning {
color: var(--down);
margin-top: 8px;
}
.target-rating-result .error {
color: var(--red);
}
.target-rating-result .muted {
color: var(--text-muted);
font-size: 0.9em;
}
.target-rating-result .loading {
color: var(--text-muted);
}
.target-rating-result .no-history-prompt {
display: flex;
flex-direction: column;
gap: 12px;
align-items: flex-start;
}
.target-rating-result .sensitivity {
margin-top: 12px;
padding-top: 12px;
border-top: 1px dashed var(--border);
}
.target-rating-result .sensitivity-heading {
font-size: 0.9em;
color: var(--text-muted);
margin-bottom: 4px;
}
.target-rating-result .sensitivity-row {
font-variant-numeric: tabular-nums;
padding-left: 12px;
}
.target-rating-result .sensitivity-row.is-target {
font-weight: 600;
}
+211
View File
@@ -540,3 +540,214 @@ document.addEventListener('keydown', function(e) {
const pdgaNumber = row.id.replace('row-', '');
togglePlayerHistory(parseInt(pdgaNumber, 10));
});
// ── Target Rating Calculator ───────────────────────
function openTargetRatingModal(pdgaNumber) {
const modal = document.getElementById('target-rating-modal');
const header = document.getElementById('target-rating-modal-header');
const pdgaField = document.getElementById('target-rating-pdga');
const result = document.getElementById('target-rating-result');
const targetInput = document.getElementById('target-rating-input');
const roundsInput = document.getElementById('target-rounds-input');
const submitBtn = document.getElementById('target-rating-submit');
const playerNameEl = document.querySelector('#row-' + pdgaNumber + ' .player-name a');
const playerName = playerNameEl ? playerNameEl.textContent : 'PDGA #' + pdgaNumber;
header.textContent = 'Calculate Target Rating — ' + playerName;
pdgaField.value = pdgaNumber;
result.style.display = 'none';
while (result.firstChild) result.removeChild(result.firstChild);
targetInput.value = '';
roundsInput.value = '4';
submitBtn.disabled = false;
submitBtn.textContent = 'Calculate';
modal.style.display = 'flex';
targetInput.focus();
}
function _targetResultMsg(parent, cls, text) {
const d = document.createElement('div');
d.className = cls;
d.textContent = text;
parent.appendChild(d);
}
async function calculateTargetRating(event) {
if (event) event.preventDefault();
const pdgaNumber = document.getElementById('target-rating-pdga').value;
const targetRating = parseInt(document.getElementById('target-rating-input').value, 10);
const rounds = parseInt(document.getElementById('target-rounds-input').value, 10);
const result = document.getElementById('target-rating-result');
const submitBtn = document.getElementById('target-rating-submit');
function clearResult() {
while (result.firstChild) result.removeChild(result.firstChild);
}
if (!Number.isInteger(targetRating) || targetRating < 400 || targetRating > 1200) {
result.style.display = 'block';
clearResult();
_targetResultMsg(result, 'error', 'Target rating must be 400-1200.');
return;
}
if (!Number.isInteger(rounds) || rounds < 1 || rounds > 20) {
result.style.display = 'block';
clearResult();
_targetResultMsg(result, 'error', 'Rounds must be an integer 1-20.');
return;
}
submitBtn.disabled = true;
submitBtn.textContent = 'Calculating...';
result.style.display = 'block';
clearResult();
_targetResultMsg(result, 'loading', 'Calculating...');
try {
const response = await fetch('/api/calculate-target-rating/' + pdgaNumber, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ targetRating: targetRating, rounds: rounds })
});
const data = await response.json();
clearResult();
if (!response.ok || !data.success) {
if (response.status === 404 && data.errorType === 'NO_ROUNDS') {
renderNoHistoryPrompt(pdgaNumber, result);
return;
}
const msg = data.details ? data.error + ': ' + data.details : (data.error || 'Calculation failed');
_targetResultMsg(result, 'error', msg);
return;
}
const summary = document.createElement('div');
summary.className = 'target-summary';
const avgLine = document.createElement('div');
const avgStrong = document.createElement('strong');
avgStrong.textContent = 'Required round average: ';
avgLine.appendChild(avgStrong);
avgLine.appendChild(document.createTextNode(String(data.requiredAverage)));
summary.appendChild(avgLine);
const currentLine = document.createElement('div');
currentLine.textContent = 'Current predicted rating: ' + data.currentRating;
summary.appendChild(currentLine);
const simLine = document.createElement('div');
simLine.textContent = 'Simulated predicted rating at this average: ' + data.predictedRating;
summary.appendChild(simLine);
const mutedLine = document.createElement('div');
mutedLine.className = 'muted';
mutedLine.textContent = 'Across ' + data.rounds + ' synthetic rounds before the next PDGA update.';
summary.appendChild(mutedLine);
if (data.sensitivity) {
renderSensitivity(data.sensitivity, summary);
}
if (data.warning) {
_targetResultMsg(summary, 'warning', data.warning);
}
result.appendChild(summary);
} catch (err) {
console.error('Error calculating target rating:', err);
clearResult();
_targetResultMsg(result, 'error', 'Network error. Please try again.');
} finally {
submitBtn.disabled = false;
submitBtn.textContent = 'Calculate';
}
}
function closeTargetRatingModal(event) {
document.getElementById('target-rating-modal').style.display = 'none';
}
function renderSensitivity(sensitivity, container) {
const wrapper = document.createElement('div');
wrapper.className = 'sensitivity';
const heading = document.createElement('div');
heading.className = 'sensitivity-heading';
heading.textContent = 'Sensitivity:';
wrapper.appendChild(heading);
const rows = [
{ row: sensitivity.lower, isTarget: false },
{ row: sensitivity.target, isTarget: true },
{ row: sensitivity.upper, isTarget: false }
];
for (const { row, isTarget } of rows) {
const line = document.createElement('div');
line.className = 'sensitivity-row' + (isTarget ? ' is-target' : '');
line.textContent = 'Average ' + row.average + ' → predicted ' + row.predicted + (isTarget ? ' (target)' : '');
wrapper.appendChild(line);
}
container.appendChild(wrapper);
}
function renderNoHistoryPrompt(pdgaNumber, container) {
const wrapper = document.createElement('div');
wrapper.className = 'no-history-prompt';
const msg = document.createElement('div');
msg.textContent = 'No round-level history is stored for this player yet. Refresh from PDGA to enable the calculation.';
wrapper.appendChild(msg);
const btn = document.createElement('button');
btn.type = 'button';
btn.className = 'btn btn-confirm';
btn.textContent = 'Refresh round history & calculate';
btn.addEventListener('click', function () { refreshHistoryThenCalculate(pdgaNumber); });
wrapper.appendChild(btn);
container.appendChild(wrapper);
}
async function refreshHistoryThenCalculate(pdgaNumber) {
const result = document.getElementById('target-rating-result');
while (result.firstChild) result.removeChild(result.firstChild);
_targetResultMsg(result, 'loading', 'Refreshing round history from PDGA — this may take up to 30 seconds...');
try {
const response = await fetch('/api/refresh-round-history/' + pdgaNumber, { method: 'POST' });
const data = await response.json();
while (result.firstChild) result.removeChild(result.firstChild);
if (response.status === 429) {
const hours = data.hoursRemaining ? data.hoursRemaining + ' hour(s)' : 'a while';
_targetResultMsg(result, 'error', 'Round history was refreshed recently. Try again in ' + hours + '.');
return;
}
if (!response.ok || !data.success) {
const msg = data.details ? data.error + ': ' + data.details : (data.error || 'Refresh failed');
_targetResultMsg(result, 'error', msg);
return;
}
if (data.debugLog) cachedDebugInfo[pdgaNumber] = data.debugLog;
const predictedCell = document.getElementById('predicted-' + pdgaNumber);
if (predictedCell) {
const predictedValue = predictedCell.querySelector('.predicted-value');
if (predictedValue) {
predictedValue.textContent = data.predictedRating || 'N/A';
predictedValue.dataset.stddev = data.stdDev || '';
}
}
await calculateTargetRating(null);
} catch (err) {
console.error('Error refreshing round history:', err);
while (result.firstChild) result.removeChild(result.firstChild);
_targetResultMsg(result, 'error', 'Network error during refresh. Please try again.');
}
}
+68
View File
@@ -8,6 +8,7 @@ const { launchBrowser } = require('../scrapers/browser');
const { getPlayerDataFromDB, scrapePDGARating, getAllRatingsFromDB, refreshAllPlayersInDB, getPredictedRatingFromDB, formatDisplayDate } = require('../services/player-service');
const { getTopbarLocals } = require('../services/topbar-service');
const { calculatePredictedRating } = require('../services/rating-calculator');
const { calculateRequiredAverage } = require('../services/target-rating-calculator');
const logger = require('../logger');
let refreshInProgress = false;
@@ -442,4 +443,71 @@ router.post('/api/refresh-round-history/:pdgaNumber', async (req, res) => {
}
});
router.post('/api/calculate-target-rating/:pdgaNumber', async (req, res) => {
const { pdgaNumber } = req.params;
const pdgaNum = parseInt(pdgaNumber, 10);
const { targetRating, rounds } = req.body || {};
if (!Number.isFinite(pdgaNum) || pdgaNum <= 0) {
return res.status(400).json({ error: 'Invalid PDGA number' });
}
const target = Number(targetRating);
const numRounds = Number(rounds);
if (!Number.isFinite(target) || target < 400 || target > 1200) {
return res.status(400).json({
error: 'Invalid target rating',
details: 'targetRating must be a number between 400 and 1200'
});
}
if (!Number.isInteger(numRounds) || numRounds < 1 || numRounds > 20) {
return res.status(400).json({
error: 'Invalid round count',
details: 'rounds must be an integer between 1 and 20'
});
}
try {
const dbRounds = await getRoundHistoryFromDB(pdgaNum);
if (!dbRounds || dbRounds.length === 0) {
return res.status(404).json({
error: 'No round history available',
details: 'Refresh the player round history before calculating a target.',
errorType: 'NO_ROUNDS'
});
}
const roundRatings = dbRounds.map(r => ({
rating: r.rating,
date: new Date(r.date),
competition: r.competition_name
}));
const result = calculateRequiredAverage(roundRatings, target, numRounds);
logger.info(`Target rating calc for PDGA ${pdgaNum}: target=${target} rounds=${numRounds} -> avg=${result.requiredAverage}`);
return res.json({
success: true,
pdgaNumber: pdgaNum,
targetRating: target,
rounds: numRounds,
currentRating: result.currentPredicted,
requiredAverage: result.requiredAverage,
predictedRating: result.simulatedPredicted,
warning: result.warning,
iterations: result.iterations,
sensitivity: result.sensitivity
});
} catch (err) {
logger.error(`Target rating calc failed for PDGA ${pdgaNum}: ${err.message}`);
return res.status(500).json({
error: 'Failed to calculate target rating',
details: err.message,
errorType: err.code || 'CALC_ERROR',
timestamp: new Date().toISOString(),
suggestion: 'Try refreshing the round history and retrying.'
});
}
});
module.exports = router;
+81
View File
@@ -0,0 +1,81 @@
const { calculatePredictedRating, getNextPDGAUpdateDate } = require('./rating-calculator');
const logger = require('../logger');
function calculateRequiredAverage(roundRatings, targetRating, numRounds) {
if (!Array.isArray(roundRatings) || roundRatings.length === 0) {
const err = new Error('No round history');
err.code = 'NO_ROUNDS';
throw err;
}
const currentPredicted = calculatePredictedRating(roundRatings).rating;
const nextUpdate = getNextPDGAUpdateDate();
const syntheticDate = new Date(nextUpdate.getTime() - 24 * 60 * 60 * 1000);
const simulate = (R) => {
const synthetic = [];
for (let i = 0; i < numRounds; i++) {
synthetic.push({ rating: R, date: syntheticDate, competition: 'TARGET_SIM' });
}
return calculatePredictedRating([...roundRatings, ...synthetic]).rating;
};
let lo = 400;
let hi = 1200;
let iterations = 0;
const maxIterations = 30;
let exactMatchAvg = null;
while (iterations < maxIterations && (hi - lo) >= 0.5) {
const mid = (lo + hi) / 2;
const predicted = simulate(mid);
if (predicted === targetRating) {
exactMatchAvg = mid;
// Narrow toward smaller R that still hits target — but break to bound iterations.
hi = mid;
} else if (predicted < targetRating) {
lo = mid;
} else {
hi = mid;
}
iterations++;
}
const candidate = exactMatchAvg !== null ? exactMatchAvg : (lo + hi) / 2;
const requiredAverage = Math.round(candidate * 10) / 10;
const simulatedPredicted = simulate(requiredAverage);
let warning = null;
if (requiredAverage >= 1199.5) {
warning = 'Target may be unreachable with this number of rounds within the simulated range [400, 1200].';
} else if (requiredAverage <= 400.5) {
warning = 'Required average is at the lower bound — target may already be exceeded or rounds would drag rating down.';
} else if (requiredAverage > 1050) {
warning = 'Required average is extremely high (>1050) — practically very difficult.';
} else if (requiredAverage < 600) {
warning = 'Required average is very low (<600) — check that your target is reasonable.';
} else if (iterations >= maxIterations && Math.abs(simulatedPredicted - targetRating) > 1) {
warning = 'Could not converge precisely; result is approximate.';
}
const lowerAvg = Math.max(400, Math.round((requiredAverage - 1) * 10) / 10);
const upperAvg = Math.min(1200, Math.round((requiredAverage + 1) * 10) / 10);
const sensitivity = {
lower: { average: lowerAvg, predicted: simulate(lowerAvg) },
target: { average: requiredAverage, predicted: simulatedPredicted },
upper: { average: upperAvg, predicted: simulate(upperAvg) }
};
logger.debug(`Target rating calc: target=${targetRating} rounds=${numRounds} → avg=${requiredAverage} (iterations=${iterations}, simulated=${simulatedPredicted})`);
return {
requiredAverage,
currentPredicted,
simulatedPredicted,
iterations,
warning,
sensitivity
};
}
module.exports = { calculateRequiredAverage };
+25
View File
@@ -102,6 +102,31 @@
</div>
</div>
</div>
<!-- Target Rating Modal -->
<div id="target-rating-modal" class="modal" onclick="closeTargetRatingModal(event)">
<div class="modal-content" onclick="event.stopPropagation()">
<button class="modal-close" onclick="closeTargetRatingModal()">&times;</button>
<div class="modal-header" id="target-rating-modal-header">Calculate Target Rating</div>
<div class="modal-body" id="target-rating-modal-body">
<form id="target-rating-form" onsubmit="calculateTargetRating(event)">
<input type="hidden" id="target-rating-pdga" value="">
<div class="form-row">
<label for="target-rating-input">Target predicted rating</label>
<input type="number" id="target-rating-input" min="400" max="1200" step="1" required>
</div>
<div class="form-row">
<label for="target-rounds-input">Number of rounds</label>
<input type="number" id="target-rounds-input" min="1" max="20" step="1" value="4" required>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-confirm" id="target-rating-submit">Calculate</button>
</div>
</form>
<div id="target-rating-result" class="target-rating-result" style="display:none;"></div>
</div>
</div>
</div>
`; %>
<%- include('../partials/layout', {
+3
View File
@@ -82,6 +82,9 @@ function renderSparkline(values) {
<button class="icon-btn refresh-icon" onclick="refreshPlayerData(<%= player.pdgaNumber %>)" title="Refresh rating + prediction" aria-label="Refresh rating and prediction">
<i class="fas fa-sync-alt"></i>
</button>
<button class="icon-btn target-rating-icon" onclick="openTargetRatingModal(<%= player.pdgaNumber %>)" title="Calculate target rating" aria-label="Calculate target rating">
<i class="fas fa-bullseye"></i>
</button>
<button class="icon-btn icon-chev" onclick="togglePlayerHistory(<%= player.pdgaNumber %>)" title="Expand row" aria-label="Expand">
<i class="fas fa-chevron-down"></i>
</button>