feat(houseofrc): fetch driver names and brands by transponder (1.79.0)

This commit is contained in:
larssand committed 2026-11-07 22:45:38 +01:00
1 parent 0c54e8b58a
commit 3829ca1cab
17 files changed
+319 -7

No files matched your search

+4
View File
@@ -8,6 +8,10 @@ The application version is maintained in `package.json` and displayed in the adm
No changes recorded yet.
## 1.79.0
- **Drivers from House of RC:** Drivers → **🏠 Fetch from House of RC** looks up every transponder in one go and lists what differs: the name, the brand and the car (e.g. "7700001 → Anna Andersson · Associated B7"). Only empty fields, or a name that is just the transponder number, are pre-ticked; nothing is overwritten unless you tick it. Drivers whose name matches are linked to their House of RC member for posting results later. Typing a known transponder for a new driver fills in an empty name and brand. Changing a driver's transponder removes the link.
## 1.78.0
- **House of RC connection (step 1):** Settings → System → 🏠 House of RC. Paste the club's API key once and press **Save key**; it is stored only on the server (`data/houseofrc.json`, readable by the server user only) and is never sent back to any browser, export or backup. **Test connection** shows the account and the request limit, e.g. "Connected as (name) (id …) · 60 requests/min". With the admin PIN on, saving, removing and using the key needs a login. The key can also come from the `HOUSEOFRC_API_KEY` environment variable.
+1 -1
View File
@@ -322,7 +322,7 @@ Erik Eriksson;654321;4WD;Associated;;
RaceCore is meant for a trusted race network:
- **Admin PIN** (Settings → System & backup, off by default) protects every change through the API. The login lasts 30 days and is throttled against guessing.
- **Race Controller Master:** one computer at a time runs the race (the decoder, start, pause, resume, stop, false start, resetting a heat and the autopilot, also from the speaker panel). Judging corrections and the other calls work from any computer. The computer running the server (page opened on `localhost`) becomes master on its own and shows a green line "🎙 You are the Race Controller Master" with **Release master**. Phones and other computers follow the race live (updated every second), show "You are following the race …" and become master only when someone presses the button; that computer then remembers the role. They can also prepare drivers and races. Whoever works as race controller presses **Take over as master**, and the previous master lets go of the decoder within seconds. With the admin PIN on, taking over needs a login. Name the computer under Settings → System, e.g. "Speaker booth". Overlays and OBS are always view-only.
- **House of RC:** under Settings → System → 🏠 House of RC you save the club's API key once (stored on the server only, never shown again) and press **Test connection**. Importing entries and posting results back are being built together with House of RC (see ROADMAP.md).
- **House of RC:** under Settings → System → 🏠 House of RC you save the club's API key once (stored on the server only, never shown again) and press **Test connection**. Drivers → **🏠 Fetch from House of RC** fills in names and brands from the transponders (only what you tick), and a known transponder fills in a new driver. Importing entries and posting results back are being built together with House of RC (see ROADMAP.md).
- **`RC_ADMIN_ALLOWED_CIDRS`** restricts admin changes to certain addresses or networks, e.g. `192.168.1.0/24`.
- **`RC_ALLOWED_ORIGINS`** is for a UI deliberately served from another address.
- **Don't expose port 8081 to the internet.** Reads are not PIN protected. Publish only the public overlay and mobile profile paths through a reverse proxy or VPN.
+1 -1
View File
@@ -335,7 +335,7 @@ Erik Eriksson;654321;4WD;Associated;;
RaceCore är tänkt för ett betrott racenätverk:
- **Admin-PIN** (Inställningar → System & backup, av som standard) skyddar alla ändringar via API:t. Inloggningen gäller i 30 dagar och är skyddad mot gissning.
- **Race Controller Master:** bara en dator åt gången kör racet (decodern, start, paus, fortsätt, stopp, tjuvstart, nollställ heat och autopiloten, även från speakerpanelen). Domarvyns korrigeringar och övriga utrop fungerar från alla datorer. Datorn som kör servern (sidan öppnad på `localhost`) blir master av sig själv och visar en grön rad "🎙 Du är Race Controller Master" med **Släpp master**. Mobiler och andra datorer följer racet live (uppdateras varje sekund), visar "Du följer racet …" och blir master bara när någon trycker på knappen; den datorn minns sedan rollen. De kan också förbereda förare och race. Den som jobbar som race controller trycker **Ta över som master**, och den förra mastern släpper decodern inom några sekunder. Med admin-PIN krävs inloggning för att ta över. Ge datorn ett namn under Inställningar → System, t.ex. "Speakerbåset". Overlays och OBS är alltid bara visning.
- **House of RC:** under Inställningar → System → 🏠 House of RC sparar du klubbens API-nyckel en gång (bara på servern, visas aldrig igen) och trycker **Testa anslutning**. Att hämta anmälningar och skicka tillbaka resultat byggs tillsammans med House of RC (se ROADMAP.md).
- **House of RC:** under Inställningar → System → 🏠 House of RC sparar du klubbens API-nyckel en gång (bara på servern, visas aldrig igen) och trycker **Testa anslutning**. Förare → **🏠 Hämta från House of RC** fyller i namn och märke utifrån transpondrarna (bara det du bockar i), och en känd transponder fyller i en ny förare. Att hämta anmälningar och skicka tillbaka resultat byggs tillsammans med House of RC (se ROADMAP.md).
- **`RC_ADMIN_ALLOWED_CIDRS`** begränsar adminändringar till vissa adresser eller nät, till exempel `192.168.1.0/24`.
- **`RC_ALLOWED_ORIGINS`** används för ett gränssnitt som medvetet körs från en annan adress.
- **Exponera inte port 8081 mot internet.** Läsningar skyddas inte av PIN. Publicera bara sökvägarna för publik overlay och mobilprofil via reverse proxy eller VPN.
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "rc-racecore",
"version": "1.78.0",
"version": "1.79.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "rc-racecore",
"version": "1.78.0",
"version": "1.79.0",
"hasInstallScript": true,
"dependencies": {
"better-sqlite3": "^12.11.1",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "rc-racecore",
"version": "1.78.0",
"version": "1.79.0",
"private": true,
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
"engines": {
+4
View File
@@ -484,6 +484,10 @@ app.post("/api/houseofrc/test", async (_req, res) => {
const result = await houseOfRc.testConnection();
res.status(result.ok ? 200 : 502).json(result);
});
app.post("/api/houseofrc/transponders", async (req, res) => {
const result = await houseOfRc.lookupTransponders(req.body?.transponders);
res.status(result.ok ? 200 : 502).json(result);
});
app.post("/api/state", (req, res) => {
if (!req.body || typeof req.body !== "object") {
+23 -1
View File
@@ -73,7 +73,29 @@ function createHouseOfRc({ dataDir, env = process.env, fetchImpl = globalThis.fe
return { ok: true, status: result.status, user: body.user || null, rateLimit: body.rate_limit ?? null };
}
return { status, setKey, get, testConnection };
// Members owning these transponders (/timing/users, max 200 per call). The newest owner of a
// transponder comes first, so the first hit per number wins.
async function lookupTransponders(list) {
const numbers = [...new Set((Array.isArray(list) ? list : []).map((value) => String(value || "").trim()).filter((value) => /^[A-Za-z0-9]{1,20}$/.test(value)))];
const members = {};
for (let index = 0; index < numbers.length; index += 200) {
const result = await get("/timing/users", { transponders: numbers.slice(index, index + 200).join(",") });
if (!result.ok) return result;
(Array.isArray(result.data) ? result.data : []).forEach((user) => {
const transponder = String(user?.transponder || "").trim();
if (!transponder || members[transponder]) return;
members[transponder] = {
id: user.id ?? null,
name: String(user.name || "").trim(),
model: String(user.model?.name || "").trim(),
brand: String(user.model?.brand?.name || "").trim(),
};
});
}
return { ok: true, status: 200, asked: numbers.length, members };
}
return { status, setKey, get, testConnection, lookupTransponders };
}
module.exports = { createHouseOfRc, DEFAULT_BASE_URL };
+24
View File
@@ -2184,6 +2184,17 @@ const TRANSLATIONS = {
"tts.download": "Hämta",
"tts.downloading": "Hämtar...",
"tts.test_failed": "Kunde inte spela upp den lokala rösten - kontrollera installationen.",
"houseofrc.import_button": "Hämta från House of RC",
"houseofrc.import_button_hint": "Slå upp alla transpondrar på House of RC och fyll i namn och märke",
"houseofrc.import_title": "Förare från House of RC",
"houseofrc.import_loading": "Slår upp transpondrar…",
"houseofrc.import_no_transponders": "Inga förare har transponder ännu.",
"houseofrc.import_summary": "{found} av {asked} transpondrar finns på House of RC.",
"houseofrc.import_nothing": "Allt stämmer redan, inget att uppdatera.",
"houseofrc.import_hint": "Bocka i det som ska ändras. Bara tomma fält är förvalda, inget skrivs över utan att du väljer det.",
"houseofrc.import_model": "Bil",
"houseofrc.import_apply": "Uppdatera valda",
"houseofrc.filled_from": "Ifyllt från House of RC ({model})",
"houseofrc.title": "House of RC",
"houseofrc.hint": "Klubbens API-nyckel från House of RC. Den sparas bara på servern (data/houseofrc.json) och visas aldrig igen, inte ens här.",
"houseofrc.key": "API-nyckel",
@@ -4354,6 +4365,17 @@ const TRANSLATIONS = {
"tts.download": "Download",
"tts.downloading": "Downloading...",
"tts.test_failed": "Could not play the local voice - check the installation.",
"houseofrc.import_button": "Fetch from House of RC",
"houseofrc.import_button_hint": "Look up every transponder on House of RC and fill in names and brands",
"houseofrc.import_title": "Drivers from House of RC",
"houseofrc.import_loading": "Looking up transponders…",
"houseofrc.import_no_transponders": "No driver has a transponder yet.",
"houseofrc.import_summary": "{found} of {asked} transponders are on House of RC.",
"houseofrc.import_nothing": "Everything already matches, nothing to update.",
"houseofrc.import_hint": "Tick what to change. Only empty fields are pre-ticked; nothing is overwritten unless you choose it.",
"houseofrc.import_model": "Car",
"houseofrc.import_apply": "Update selected",
"houseofrc.filled_from": "Filled in from House of RC ({model})",
"houseofrc.title": "House of RC",
"houseofrc.hint": "The club's House of RC API key. It is stored on the server only (data/houseofrc.json) and never shown again, not even here.",
"houseofrc.key": "API key",
@@ -5640,6 +5662,8 @@ function normalizeDriver(driver = {}) {
club: String(driver?.club || "").trim(),
country: String(driver?.country || "").trim(),
passSound: String(driver?.passSound || "").trim(),
// House of RC member id, set when the transponder lookup matched this driver.
...(driver?.houseOfRcId ? { houseOfRcId: String(driver.houseOfRcId) } : {}),
// Sponsor event guest: only shown inside that event, deleted with it.
...(driver?.guestEventId ? { guestEventId: String(driver.guestEventId) } : {}),
};
+20 -1
View File
@@ -1,6 +1,7 @@
import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js";
import { isPracticeSessionType } from "./track_layouts_logic.js";
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
import { openHouseOfRcDriverImport, lookupHouseOfRcTransponders } from "./houseofrc_view.js";
function getScheduleDriftSummary(state) {
const scheduledSessions = state.sessions
@@ -438,7 +439,7 @@ export function renderDriversView(deps) {
</section>
<section class="panel">
<div class="panel-header"><h3>${t("drivers.title")}</h3></div>
<div class="panel-header"><h3>${t("drivers.title")}</h3><button class="btn" id="driversHouseOfRc" type="button" title="${escapeHtml(t("houseofrc.import_button_hint"))}">🏠 ${t("houseofrc.import_button")}</button></div>
<div class="panel-body">
<input id="driverBrandFilter" value="${escapeHtml(driverBrandFilter())}" placeholder="${t("drivers.brand_filter_placeholder")}" />
</div>
@@ -553,6 +554,22 @@ export function renderDriversView(deps) {
renderView();
});
document.getElementById("driversHouseOfRc")?.addEventListener("click", () => openHouseOfRcDriverImport({ state, t, escapeHtml, saveState, renderView }));
// New driver: a known transponder fills in an empty name and brand from House of RC.
const newDriverForm = document.getElementById("driverForm");
newDriverForm?.elements.namedItem("transponder")?.addEventListener("change", async (event) => {
const transponder = String(event.target.value || "").trim();
const nameInput = newDriverForm.elements.namedItem("name");
const brandInput = newDriverForm.elements.namedItem("brand");
if (!transponder || nameInput.value.trim()) return;
const result = await lookupHouseOfRcTransponders([transponder]);
const member = result.ok ? result.members[transponder] : null;
if (!member || nameInput.value.trim() || event.target.value.trim() !== transponder) return;
nameInput.value = member.name;
if (!brandInput.value.trim() && member.brand) brandInput.value = member.brand;
nameInput.title = t("houseofrc.filled_from", { model: [member.brand, member.model].filter(Boolean).join(" ") || "House of RC" });
});
// Hear the spoken name as race audio will say it, before saving: the form's current
// spoken name (or name) and passing sound.
dom.view.querySelectorAll("[data-driver-voice-test]").forEach((button) => button.addEventListener("click", () => {
@@ -690,6 +707,8 @@ export function renderDriversView(deps) {
speechName: cleanedSpeechName,
passSound: cleanedPassSound,
profileId: cleanedProfileId,
// A new transponder may belong to someone else on House of RC.
houseOfRcId: cleanedTp === item.transponder ? item.houseOfRcId : "",
club: cleanedClub,
country: cleanedCountry,
});
+43
View File
@@ -0,0 +1,43 @@
// House of RC driver lookup: compare our drivers with the members owning their transponders
// and apply only what the user ticked. Nothing is overwritten by default: a field is pre-ticked
// only when ours is empty (a name that is just the transponder number counts as empty).
const sameText = (a, b) => String(a || "").trim().toLocaleLowerCase().replace(/\s+/g, " ") === String(b || "").trim().toLocaleLowerCase().replace(/\s+/g, " ");
export function planHouseOfRcDriverUpdates(drivers = [], members = {}) {
return drivers
.filter((driver) => !driver.guestEventId && driver.transponder && members[driver.transponder])
.map((driver) => {
const member = members[driver.transponder];
const nameDiffers = Boolean(member.name) && !sameText(member.name, driver.name);
const brandDiffers = Boolean(member.brand) && !sameText(member.brand, driver.brand);
return {
driverId: driver.id,
transponder: driver.transponder,
currentName: driver.name || "",
currentBrand: driver.brand || "",
member,
nameDiffers,
brandDiffers,
nameDefault: nameDiffers && (!driver.name || sameText(driver.name, driver.transponder)),
brandDefault: brandDiffers && !driver.brand,
linked: String(driver.houseOfRcId || "") === String(member.id ?? ""),
};
});
}
// choices: { [driverId]: { name: bool, brand: bool } }. Links the driver to the member
// (houseOfRcId, for posting results later) when the names agree after the update.
export function applyHouseOfRcDriverUpdates(drivers = [], members = {}, choices = {}) {
let changed = 0;
drivers.forEach((driver) => {
const member = driver.transponder ? members[driver.transponder] : null;
if (!member || driver.guestEventId) return;
const choice = choices[driver.id] || {};
const before = JSON.stringify(driver);
if (choice.name && member.name) driver.name = member.name;
if (choice.brand && member.brand) driver.brand = member.brand;
if (member.id != null && sameText(driver.name, member.name)) driver.houseOfRcId = String(member.id);
if (JSON.stringify(driver) !== before) changed += 1;
});
return changed;
}
+75
View File
@@ -1,3 +1,5 @@
import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates } from "./houseofrc_logic.js";
// Settings → System → House of RC: save the club's API key on the server and test it.
// The key is never read back; the server only tells whether one is set (and its last 4 chars).
async function postJson(path, body) {
@@ -75,3 +77,76 @@ export async function mountHouseOfRcSettings(container, { t, escapeHtml }) {
remount();
});
}
// Ask the server (which holds the key) who owns these transponders on House of RC.
export async function lookupHouseOfRcTransponders(transponders) {
const { status: code, body } = await postJson("/api/houseofrc/transponders", { transponders });
return code === 200 && body.ok ? { ok: true, members: body.members || {}, asked: body.asked || 0 } : { ok: false, code, body };
}
// Drivers → "Fetch from House of RC": one lookup for every transponder, then a list of what
// differs. Only fields that are empty on our side are pre-ticked; nothing changes until Apply.
export async function openHouseOfRcDriverImport({ state, t, escapeHtml, saveState, renderView }) {
document.getElementById("houseOfRcImportOverlay")?.remove();
const overlay = document.createElement("div");
overlay.className = "modal-overlay";
overlay.id = "houseOfRcImportOverlay";
overlay.innerHTML = `<div class="modal-card hor-import"><div class="panel-header"><h3>🏠 ${escapeHtml(t("houseofrc.import_title"))}</h3><button class="btn" type="button" data-hor-close>${escapeHtml(t("common.cancel"))}</button></div><div class="panel-body" data-hor-body><p class="hint">${escapeHtml(t("houseofrc.import_loading"))}</p></div></div>`;
document.body.append(overlay);
const close = () => { overlay.remove(); document.removeEventListener("keydown", onKey); };
const onKey = (event) => { if (event.key === "Escape") close(); };
document.addEventListener("keydown", onKey);
overlay.addEventListener("click", (event) => { if (event.target === overlay || event.target.closest("[data-hor-close]")) close(); });
const body = overlay.querySelector("[data-hor-body]");
const transponders = state.drivers.filter((driver) => !driver.guestEventId && driver.transponder).map((driver) => driver.transponder);
if (!transponders.length) {
body.innerHTML = `<p>${escapeHtml(t("houseofrc.import_no_transponders"))}</p>`;
return;
}
const result = await lookupHouseOfRcTransponders(transponders);
if (!overlay.isConnected) return;
if (!result.ok) {
body.innerHTML = `<p class="error">${escapeHtml(describeHouseOfRcError(t, result.code, result.body))}</p>`;
return;
}
const plan = planHouseOfRcDriverUpdates(state.drivers, result.members);
const found = Object.keys(result.members).length;
const summary = t("houseofrc.import_summary", { found, asked: result.asked });
const changes = plan.filter((row) => row.nameDiffers || row.brandDiffers || !row.linked);
if (!changes.length) {
body.innerHTML = `<p>${escapeHtml(summary)}</p><p>${escapeHtml(t("houseofrc.import_nothing"))}</p>`;
return;
}
const cell = (row, field, current, incoming) => (row[`${field}Differs`]
? `<label class="hor-choice"><input type="checkbox" data-hor-field="${field}" data-hor-driver="${escapeHtml(row.driverId)}" ${row[`${field}Default`] ? "checked" : ""} /> <span><s>${escapeHtml(current || "–")}</s> → <strong>${escapeHtml(incoming)}</strong></span></label>`
: `<span class="hint">${escapeHtml(current || incoming || "–")}</span>`);
body.innerHTML = `
<p>${escapeHtml(summary)}</p>
<p class="hint">${escapeHtml(t("houseofrc.import_hint"))}</p>
<div class="table-wrap"><table class="hor-import-table">
<thead><tr><th>${escapeHtml(t("table.transponder"))}</th><th>${escapeHtml(t("table.name"))}</th><th>${escapeHtml(t("table.brand"))}</th><th>${escapeHtml(t("houseofrc.import_model"))}</th></tr></thead>
<tbody>${changes.map((row) => `<tr>
<td>${escapeHtml(row.transponder)}</td>
<td>${cell(row, "name", row.currentName, row.member.name)}</td>
<td>${cell(row, "brand", row.currentBrand, row.member.brand)}</td>
<td>${escapeHtml(row.member.model || "–")}</td>
</tr>`).join("")}</tbody>
</table></div>
<div class="actions mt-16">
<button class="btn btn-primary" type="button" data-hor-apply>${escapeHtml(t("houseofrc.import_apply"))}</button>
<button class="btn" type="button" data-hor-close>${escapeHtml(t("common.cancel"))}</button>
</div>`;
body.querySelector("[data-hor-apply]").addEventListener("click", () => {
const choices = {};
body.querySelectorAll("[data-hor-field]").forEach((box) => {
choices[box.dataset.horDriver] = { ...choices[box.dataset.horDriver], [box.dataset.horField]: box.checked };
});
const changed = applyHouseOfRcDriverUpdates(state.drivers, result.members, choices);
close();
if (changed) {
saveState();
renderView();
}
});
}
+6
View File
@@ -4941,3 +4941,9 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
.controller-badge { background: color-mix(in srgb, var(--accent) 22%, var(--panel)); color: var(--text); }
.controller-badge[hidden] { display: none; }
.controller-banner.is-master { border-color: #2fa84f; background: color-mix(in srgb, #2fa84f 14%, var(--panel)); }
/* House of RC driver import */
.hor-import { width: min(900px, 100%); }
.hor-import-table td { vertical-align: middle; }
.hor-choice { display: inline-flex; align-items: center; gap: 6px; cursor: pointer; }
.hor-choice s { opacity: 0.6; }
+66
View File
@@ -0,0 +1,66 @@
import assert from "node:assert/strict";
// Drivers → "Fetch from House of RC": one lookup for all transponders; only empty fields are
// pre-ticked, an existing name is kept unless ticked; a new driver's transponder fills the name.
export async function runHouseOfRcSmoke({ evaluate, navigate, savedState, waitFor, base }) {
const patchState = async (patch) => {
const current = await savedState();
Object.assign(current, patch);
assert.equal((await fetch(base + "/api/state", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(current) })).ok, true);
};
const seeded = await savedState();
await patchState({ drivers: [...seeded.drivers,
{ id: "hor_a", name: "7700001", transponder: "7700001", brand: "" },
{ id: "hor_b", name: "Bosse", transponder: "7700002", brand: "Team Berg" },
] });
try {
await navigate("drivers", "driverForm");
await evaluate(`(() => {
const realFetch = window.fetch;
window.__horAsked = [];
window.fetch = async (url, options) => {
if (String(url).includes("/api/houseofrc/transponders")) {
const asked = JSON.parse(options.body).transponders;
window.__horAsked.push(asked);
const members = {};
if (asked.includes("7700001")) members["7700001"] = { id: 68, name: "Anna Andersson", brand: "Associated", model: "B7" };
if (asked.includes("7700002")) members["7700002"] = { id: 70, name: "Bo Berg", brand: "Xray", model: "XB4" };
if (asked.includes("7700003")) members["7700003"] = { id: 72, name: "Nya Nisse", brand: "Mugen", model: "MBX8" };
return new Response(JSON.stringify({ ok: true, asked: asked.length, members }), { status: 200, headers: { "Content-Type": "application/json" } });
}
return realFetch(url, options);
};
})()`);
await evaluate(`document.getElementById("driversHouseOfRc").click()`);
await waitFor(async () => evaluate(`Boolean(document.querySelector("[data-hor-apply]"))`), "the import list opens");
const boxes = await evaluate(`[...document.querySelectorAll("[data-hor-field]")].map((box) => box.dataset.horDriver + ":" + box.dataset.horField + ":" + box.checked)`);
assert.deepEqual(boxes, ["hor_a:name:true", "hor_a:brand:true", "hor_b:name:false", "hor_b:brand:false"], "only empty fields are pre-ticked");
assert.equal(await evaluate(`window.__horAsked.length`), 1, "one lookup for all transponders");
await evaluate(`(() => { document.querySelector('[data-hor-driver="hor_b"][data-hor-field="brand"]').checked = true; document.querySelector("[data-hor-apply]").click(); })()`);
await waitFor(async () => {
const drivers = (await savedState()).drivers;
const a = drivers.find((driver) => driver.id === "hor_a");
return a?.name === "Anna Andersson";
}, "the ticked changes are saved");
const drivers = (await savedState()).drivers;
const a = drivers.find((driver) => driver.id === "hor_a");
const b = drivers.find((driver) => driver.id === "hor_b");
assert.deepEqual([a.name, a.brand, a.houseOfRcId], ["Anna Andersson", "Associated", "68"]);
assert.deepEqual([b.name, b.brand, b.houseOfRcId], ["Bosse", "Xray", undefined], "unticked name is kept, so not linked");
console.log("PASS House of RC driver import: one lookup, only empty fields pre-ticked, nothing overwritten unless ticked");
await evaluate(`(() => {
const form = document.getElementById("driverForm");
form.elements.transponder.value = "7700003";
form.elements.transponder.dispatchEvent(new Event("change", { bubbles: true }));
})()`);
await waitFor(async () => (await evaluate(`document.getElementById("driverForm").elements.name.value`)) === "Nya Nisse", "a known transponder fills the new driver's name");
assert.equal(await evaluate(`document.getElementById("driverForm").elements.brand.value`), "Mugen");
console.log("PASS House of RC fills an empty name and brand when a known transponder is typed for a new driver");
} finally {
await evaluate(`document.getElementById("houseOfRcImportOverlay")?.remove()`).catch(() => {});
const current = await savedState();
await patchState({ drivers: current.drivers.filter((driver) => !driver.id.startsWith("hor_")) });
}
}
+2
View File
@@ -22,6 +22,7 @@ import { runProfileClassSmoke } from "./browser_profile_class.js";
import { runDecoderClockSmoke } from "./browser_decoder_clock.js";
import { runCorrectionsScopeSmoke } from "./browser_corrections_scope.js";
import { runDriversPageSmoke } from "./browser_drivers_page.js";
import { runHouseOfRcSmoke } from "./browser_houseofrc.js";
import { runSeriesSmoke } from "./browser_series.js";
import { runTrainingSourceSmoke } from "./browser_training_source.js";
import { runDecoderUrlSmoke } from "./browser_decoder_url.js";
@@ -181,6 +182,7 @@ try {
await runDecoderClockSmoke({ evaluate, navigate, savedState, waitFor, base });
await runCorrectionsScopeSmoke({ evaluate, navigate, savedState, waitFor, base });
await runDriversPageSmoke({ evaluate, navigate, savedState, waitFor, base });
await runHouseOfRcSmoke({ evaluate, navigate, savedState, waitFor, base });
await runSeriesSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs });
await runTrainingSourceSmoke({ evaluate, navigate, savedState, waitFor, base });
await runDecoderUrlSmoke({ evaluate, navigate, savedState, waitFor, base });
+36
View File
@@ -0,0 +1,36 @@
import test from "node:test";
import assert from "node:assert/strict";
import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates } from "../src/houseofrc_logic.js";
const members = {
"1001": { id: 68, name: "Anna Andersson", brand: "Associated", model: "B7" },
"1002": { id: 70, name: "Bo Berg", brand: "Xray", model: "XB4" },
"1003": { id: 71, name: "Cecilia Carlsson", brand: "", model: "" },
};
const drivers = () => [
{ id: "a", name: "1001", transponder: "1001", brand: "" },
{ id: "b", name: "Bosse", transponder: "1002", brand: "Team Berg" },
{ id: "c", name: "cecilia carlsson", transponder: "1003", brand: "" },
{ id: "d", name: "Dan", transponder: "9999", brand: "" },
{ id: "g", name: "", transponder: "1001", brand: "", guestEventId: "e1" },
];
test("House of RC plan: only matched drivers, pre-ticked only where our field is empty or just the transponder number", () => {
const plan = planHouseOfRcDriverUpdates(drivers(), members);
assert.deepEqual(plan.map((row) => row.driverId), ["a", "b", "c"], "unknown transponders and sponsor guests are left out");
const [a, b, c] = plan;
assert.deepEqual([a.nameDiffers, a.nameDefault, a.brandDiffers, a.brandDefault], [true, true, true, true]);
assert.deepEqual([b.nameDiffers, b.nameDefault, b.brandDiffers, b.brandDefault], [true, false, true, false], "an existing name or brand is never pre-ticked");
assert.deepEqual([c.nameDiffers, c.brandDiffers], [false, false], "same name ignoring case and spaces; no brand from HoR");
});
test("House of RC apply: writes only the ticked fields and links drivers whose name matches", () => {
const list = drivers();
const changed = applyHouseOfRcDriverUpdates(list, members, { a: { name: true, brand: true }, b: { name: false, brand: true } });
const byId = Object.fromEntries(list.map((driver) => [driver.id, driver]));
assert.deepEqual([byId.a.name, byId.a.brand, byId.a.houseOfRcId], ["Anna Andersson", "Associated", "68"]);
assert.deepEqual([byId.b.name, byId.b.brand, byId.b.houseOfRcId], ["Bosse", "Xray", undefined], "name kept, so not linked (could be a borrowed transponder)");
assert.deepEqual([byId.c.name, byId.c.houseOfRcId], ["cecilia carlsson", "71"], "same person: linked without renaming");
assert.equal(byId.g.name, "", "sponsor guests untouched");
assert.equal(changed, 3);
});
+1
View File
@@ -1,5 +1,6 @@
import "./auth.test.js";
import "./backend_url.test.js";
import "./houseofrc_logic.test.js";
import "./judging_penalties.test.js";
import "./practice_rank.test.js";
import "./team_race_logic.test.js";
@@ -734,6 +734,13 @@ test("House of RC: the key is stored server-side only, never returned, and the t
seen.push({ url: req.url, auth: req.headers.authorization });
const ok = req.headers.authorization === "Bearer hrc_test_secret_key_1234";
res.writeHead(ok ? 200 : 401, { "Content-Type": "application/json" });
if (ok && req.url.startsWith("/timing/users")) {
// Newest owner first; an unknown number is simply missing.
return res.end(JSON.stringify([
{ id: 5, name: "Bo Berg", transponder: "1234567", model: { name: "B7", brand: { name: "Associated" } } },
{ id: 9, name: "Old Owner", transponder: "1234567" },
]));
}
res.end(JSON.stringify(ok ? { data: { user: { id: 68, name: "Test Club" }, rate_limit: 60 } } : { error: "unauthorized" }));
});
await new Promise((resolve) => mock.listen(0, "127.0.0.1", resolve));
@@ -762,6 +769,9 @@ test("House of RC: the key is stored server-side only, never returned, and the t
const test = await (await post("/api/houseofrc/test", {})).json();
assert.deepEqual([test.ok, test.user.name, test.rateLimit], [true, "Test Club", 60]);
assert.equal(seen.at(-1).url, "/v1/me");
const lookup = await (await post("/api/houseofrc/transponders", { transponders: ["1234567", "7654321", "1234567", "bad value"] })).json();
assert.equal(seen.at(-1).url, "/timing/users?transponders=1234567%2C7654321", "deduplicated, invalid numbers dropped");
assert.deepEqual(lookup.members, { 1234567: { id: 5, name: "Bo Berg", model: "B7", brand: "Associated" } }, "the newest owner wins");
const keyFile = join(dataDir, "houseofrc.json");
assert.equal(statSync(keyFile).mode & 0o777, 0o600, "only the server user can read the key file");