signalk-race-control 0.5.0 → 0.6.0

package/README.md

@@ -25,7 +25,13 @@ and a live projected finishing order — during and after the race.
 - **Add/remove boats explicitly** — type a name (autocompletes against the VET
   register, the cross-race boat registry, and any live AIS/self vessel — matching
   anywhere in the name, not just the start) and click **Add Boat**. Boats aren't
-  auto-populated from AIS; you control exactly who's racing.
+  auto-populated from AIS; you control exactly who's racing. Rows stay in the order
+  boats were added — adding or removing one doesn't reshuffle the rest — until the
+  race actually starts, when the table switches to rank order; whichever boat is
+  marked **self** always stays on top regardless of phase. The **Boat** column stays
+  pinned in place while scrolling sideways through the rest of the (wide) table, and
+  the page itself isn't width-capped, so a larger screen shows more columns at once
+  without scrolling.
 - **Elapsed / corrected time** — Time-on-Time correction: `corrected = elapsed × TCF`,
   where TCF is edited per boat directly in the webapp and persisted server-side,
   shared by everyone viewing the page.
@@ -43,12 +49,21 @@ and a live projected finishing order — during and after the race.
   default** — turn it on in the plugin's settings (`vetEnabled`) for clubs that
   actually race under VET-tall; see **Cross-race TCF memory** below for what happens
   to handicaps while it's off.
-- **Cross-race TCF memory for boats outside VET** — whenever a boat isn't matched in
-  the VET register (or the register is disabled altogether), the TCF you set for it by
-  hand is remembered by boat name and applied automatically the next time a boat with
-  that name is added to any race. A boat that *is* VET-matched never has its TCF
-  carried over this way — it always starts from the default until you pick a VET
-  alternative or edit it again.
+- **KTK import** — the same idea as VET-tall, for [Klassisk Treseiler
+  Klubb](http://klassisktreseilerklubb.blogspot.com/)'s (KTK) own KLR handicap
+  register, published each season as a table in a blog post — this plugin always
+  reads whichever post is most recent, so it tracks the current season without
+  needing an update. A KLR number isn't a TCF directly: corrected time is elapsed ×
+  (KLR / 100), so that conversion happens automatically. Off by default — turn it on
+  in the plugin's settings (`ktkEnabled`) for clubs that race under KLR. If a boat is
+  listed in **both** VET-tall and KTK, the dropdown shows alternatives from both
+  (labeled by which is which), rather than picking one register over the other.
+- **Cross-race TCF memory for boats outside every register** — whenever a boat isn't
+  matched in VET-tall or KTK (or both are disabled), the TCF you set for it by hand is
+  remembered by boat name and applied automatically the next time a boat with that
+  name is added to any race. A boat matched in either register never has its TCF
+  carried over this way — it always starts from the default until you pick an
+  alternative from the dropdown or edit it again.
 - **MMSI and sail number, remembered across races** — set once per boat (MMSI can
   also be picked up automatically from a live AIS/self vessel with a matching name),
   both are remembered in a small cross-race registry: add a boat with the same name
@@ -158,7 +173,10 @@ and a live projected finishing order — during and after the race.
   download time and a **Refresh VET register** link lets the offline page re-fetch the
   current sheet straight from Google Sheets (no plugin server needed for that — just
   whatever internet connection the browser has), with the same alternatives dropdown
-  and autocomplete as the main webapp. AIS boat names/positions, the course/chart, and
+  and autocomplete as the main webapp. If KTK is enabled too, its KLR numbers are
+  seeded in the same way, but — since KTK's own page doesn't allow that kind of direct
+  browser fetch — only as a snapshot from download time, with no offline refresh
+  equivalent. AIS boat names/positions, the course/chart, and
   importing a fleet from Manage2Sail still need the live server (Manage2Sail's own API
   doesn't allow browser-side fetches at all) — TCF is entered by hand for anything the
   VET register doesn't cover. Also has its own "Download results as CSV" button.
@@ -230,11 +248,14 @@ finish time/rank for boats still racing, when the plugin has enough to estimate
   tracks for a fresh run.
 - The VET-tall source page can be overridden in the plugin's settings
   (`handicapSourceUrl`) — point it at a specific year's Google Sheet link directly to
-  skip the SSCA page lookup, e.g. if a club uses its own register.
-- Whether the VET-tall register is used at all (`vetEnabled`, off by default) is also a plugin
-  setting, not a per-race or webapp-side option — change it under
-  **Server → Plugin Config → Race Control** and restart the plugin (the server does
-  this automatically on save) for the webapp to pick it up.
+  skip the SSCA page lookup, e.g. if a club uses its own register. KTK's source page
+  can likewise be overridden (`ktkSourceUrl`) — point it at a specific post directly to
+  skip the label-listing lookup.
+- Whether the VET-tall register is used at all (`vetEnabled`, off by default) is also a
+  plugin setting, not a per-race or webapp-side option — same for KTK's KLR register
+  (`ktkEnabled`) — change either under **Server → Plugin Config → Race Control** and
+  restart the plugin (the server does this automatically on save) for the webapp to
+  pick it up.
 - The mark-rounding radius used for the estimated finish time and remaining-distance
   calculations (`markRoundingRadiusM`, 100m by default) is also a plugin setting —
   loosen it for a fleet with noisier AIS tracks, or tighten it if marks sit close

package/index.js

@@ -5,6 +5,16 @@ const ExcelJS = require('exceljs');
 const DEFAULT_HANDICAP_SOURCE_PAGE = 'https://ssca.no/aktiviteter/vet-tall';
 const HANDICAP_CACHE_TTL_MS = 60 * 60 * 1000;
 
+// KTK (Klassisk Treseiler Klubb) publishes its own handicap register, KLR,
+// as an HTML table embedded directly in a Blogger post tagged "KLR" — the
+// label listing page below always shows the most recent post first (with
+// its full content, not just an excerpt), so it doubles as "whichever
+// season's numbers are current" without needing to track individual post
+// URLs across years, the same way the VET-tall page above always links to
+// the current sheet. A specific post URL works too, since it has the exact
+// same table.
+const DEFAULT_KTK_SOURCE_PAGE = 'http://klassisktreseilerklubb.blogspot.com/search/label/KLR';
+
 function parseCsvText(text) {
   const rows = [];
   let row = [];
@@ -99,6 +109,51 @@ function parseHandicapSheet(csvText) {
   return boats;
 }
 
+function stripHtmlToText(html) {
+  return html
+    .replace(/<[^>]*>/g, '')
+    .replace(/&nbsp;/gi, ' ')
+    .replace(/&amp;/gi, '&')
+    .trim();
+}
+
+// KTK's KLR table has just two columns (boat name, KLR number) and no label
+// text distinguishing multiple entries for the same boat (unlike VET-tall's
+// named sail configurations) — a boat with more than one row just gets
+// numbered alternatives. The published KLR number isn't a TCF directly:
+// corrected time = elapsed × (KLR / 100), so that division happens here,
+// once, rather than at every point KLR values get used downstream — same
+// as VET-tall's own numbers, which likewise need no conversion once parsed.
+function parseKtkHtml(html) {
+  const tableMatch = html.match(/<table[\s\S]*?<\/table>/i);
+  if (!tableMatch) {
+    throw new Error('Could not find the KLR table on the page');
+  }
+  const rowMatches = tableMatch[0].match(/<tr[\s\S]*?<\/tr>/gi) || [];
+  const boatsByKey = new Map();
+  rowMatches.forEach((rowHtml) => {
+    const cellMatches = rowHtml.match(/<td[\s\S]*?<\/td>/gi) || [];
+    if (cellMatches.length < 2) return;
+    const name = stripHtmlToText(cellMatches[0]);
+    const rawValue = parseNorwegianNumber(stripHtmlToText(cellMatches[1]));
+    if (!name || rawValue == null || rawValue <= 0) return;
+    const key = name.toLowerCase();
+    const existing = boatsByKey.get(key) || { name, vets: [] };
+    // raw is the published KLR number itself (e.g. 166) — kept alongside
+    // the converted TCF (1.66) so the dropdown can show the number sailors
+    // actually recognize, not just the already-divided multiplier.
+    existing.vets.push({ label: '', value: Math.round((rawValue / 100) * 1000) / 1000, raw: rawValue });
+    boatsByKey.set(key, existing);
+  });
+  const boats = Array.from(boatsByKey.values());
+  boats.forEach((b) => {
+    b.vets.forEach((v, i) => {
+      v.label = b.vets.length > 1 ? `KLR ${i + 1}` : 'KLR';
+    });
+  });
+  return boats;
+}
+
 function extractGoogleSheetId(text) {
   const m = text.match(/docs\.google\.com\/spreadsheets\/d\/([a-zA-Z0-9_-]+)/);
   return m ? m[1] : null;
@@ -358,6 +413,10 @@ function buildOfflineTimerHtml(race, defaultTcf, vetOptions) {
     vetEnabled: !!vetOptions.vetEnabled,
     handicapCsvUrl: vetOptions.handicapCsvUrl || null,
     handicapBoats: vetOptions.handicapBoats || [],
+    // KTK has no live-refresh counterpart offline (see the route handler) —
+    // just this one-time snapshot from export time.
+    ktkEnabled: !!vetOptions.ktkEnabled,
+    ktkBoats: vetOptions.ktkBoats || [],
     boats: Object.values(race.boats).map((b) => ({
       id: b.id,
       name: b.name,
@@ -382,6 +441,12 @@ function buildOfflineTimerHtml(race, defaultTcf, vetOptions) {
   // title, the iOS home-screen app title) — escaped the normal way for that
   // context, distinct from the JSON escaping above.
   const escapedRaceName = String(race.name || 'Race').replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
+  const handicapNotes = [];
+  if (vetOptions.vetEnabled) handicapNotes.push('VET-tall handicaps can be refreshed here directly from the internet (see below)');
+  if (vetOptions.ktkEnabled) handicapNotes.push("KTK's KLR numbers are included as of download time, but can't be refreshed offline (no direct internet fetch support)");
+  const handicapNote = handicapNotes.length
+    ? handicapNotes.join(', and ') + '. Importing a whole fleet from Manage2Sail still needs the live plugin server, though.'
+    : 'TCF is entered by hand.';
 
   return `<!doctype html>
 <html lang="en">
@@ -426,7 +491,7 @@ button.confirming { background: var(--bad); color: #2a0a0a; border-color: var(--
 button:disabled { opacity: 0.5; cursor: not-allowed; }
 .status { min-height: 1.2em; margin-top: 0.5rem; font-size: 0.85rem; color: var(--muted); }
 .status.error { color: var(--bad); }
-main { padding: 1rem 1.5rem max(2rem, env(safe-area-inset-bottom)); max-width: 900px; margin: 0 auto; }
+main { padding: 1rem 1.5rem max(2rem, env(safe-area-inset-bottom)); margin: 0 auto; }
 .add-boat-row { display: flex; gap: 0.5rem; margin-bottom: 1rem; flex-wrap: wrap; }
 .add-boat-row input[type='text'] { flex: 1; min-width: 12rem; padding: 0.45rem 0.6rem; background: var(--panel); color: var(--text); border: 1px solid var(--border); border-radius: 6px; font-size: 0.9rem; }
 .add-boat-row input[type='number'] { width: 6rem; padding: 0.45rem 0.6rem; background: var(--panel); color: var(--text); border: 1px solid var(--border); border-radius: 6px; font-size: 0.9rem; }
@@ -434,6 +499,8 @@ main { padding: 1rem 1.5rem max(2rem, env(safe-area-inset-bottom)); max-width: 9
 table { width: 100%; min-width: 44rem; border-collapse: collapse; font-variant-numeric: tabular-nums; }
 thead th { text-align: left; font-size: 0.75rem; text-transform: uppercase; letter-spacing: 0.05em; color: var(--muted); padding: 0.5rem 0.6rem; border-bottom: 1px solid var(--border); }
 tbody td { padding: 0.55rem 0.6rem; border-bottom: 1px solid var(--border); }
+.boat-name-col { position: sticky; left: 0; z-index: 1; background: var(--bg); }
+thead .boat-name-col { z-index: 2; }
 tbody tr.finished td { color: var(--good); }
 tbody tr.dnf td { color: var(--muted); }
 .dnf-tag { color: var(--bad); font-weight: 700; font-size: 0.85rem; letter-spacing: 0.03em; }
@@ -466,7 +533,7 @@ tbody tr.dnf td { color: var(--muted); }
   <p class="offline-note">Standalone backup — works with no server connection to this plugin.
     Everything you do here is saved in this browser only (reopen this same downloaded file
     to continue). Boat names/positions from AIS and the course/chart aren't available
-    offline. ${vetOptions.vetEnabled ? 'VET-tall handicaps can be refreshed here directly from the internet (see below) — importing a whole fleet from Manage2Sail still needs the live plugin server, though.' : 'TCF is entered by hand.'}</p>
+    offline. ${handicapNote}</p>
   <h2 id="raceName"></h2>
   <div id="clock" class="clock">00:00:00</div>
   <div class="controls">
@@ -498,10 +565,10 @@ tbody tr.dnf td { color: var(--muted); }
     <table id="boatsTable">
       <thead>
         <tr>
-          <th>Boat</th>
+          <th class="boat-name-col">Boat</th>
           <th>Sail #</th>
           <th>TCF</th>
-          <th id="vetAlternativesTh" hidden>VET alternatives</th>
+          <th id="vetAlternativesTh" hidden>Handicap alternatives</th>
           <th>Start time</th>
           <th>Elapsed</th>
           <th>Corrected</th>
@@ -546,8 +613,12 @@ tbody tr.dnf td { color: var(--muted); }
     race.vetEnabled = !!seed.vetEnabled;
     race.handicapCsvUrl = seed.handicapCsvUrl || null;
     if (!Array.isArray(race.handicapBoats)) race.handicapBoats = seed.handicapBoats || [];
+    // KTK has no live refresh offline (see the seed's own comment above), so
+    // its snapshot only ever comes from the seed — always take it fresh.
+    race.ktkEnabled = !!seed.ktkEnabled;
+    race.ktkBoats = seed.ktkBoats || [];
   } catch (e) {
-    race = { name: 'Race', startTime: null, stopTime: null, selfBoatId: null, multiDay: false, boats: [], defaultTcf: 1.0, vetEnabled: false, handicapCsvUrl: null, handicapBoats: [] };
+    race = { name: 'Race', startTime: null, stopTime: null, selfBoatId: null, multiDay: false, boats: [], defaultTcf: 1.0, vetEnabled: false, handicapCsvUrl: null, handicapBoats: [], ktkEnabled: false, ktkBoats: [] };
   }
 
   function save() {
@@ -687,7 +758,7 @@ tbody tr.dnf td { color: var(--muted); }
   function rebuildAddBoatSuggestions() {
     addBoatSuggestions.innerHTML = '';
     var seen = {};
-    race.handicapBoats.forEach(function (b) {
+    race.handicapBoats.concat(race.ktkBoats).forEach(function (b) {
       var key = b.name.toLowerCase();
       if (seen[key]) return;
       seen[key] = true;
@@ -722,25 +793,41 @@ tbody tr.dnf td { color: var(--muted); }
       });
   }
 
-  // Rebuilds a row's VET-alternatives <select> from the current register —
-  // only called when the register itself (re)loads, not every render tick.
+  // Rebuilds a row's alternatives <select> from the current register(s) —
+  // only called when a register itself (re)loads, not every render tick.
+  // Merges VET-tall and KTK when both are enabled and a boat matches both,
+  // rather than picking one over the other.
   function refreshVetAlternatives(row, boatName) {
-    var entry = race.handicapBoats.find(function (h) { return h.name.toLowerCase() === boatName.trim().toLowerCase(); });
+    var name = boatName.trim().toLowerCase();
+    var vetEntry = race.vetEnabled ? race.handicapBoats.find(function (h) { return h.name.toLowerCase() === name; }) : null;
+    var ktkEntry = race.ktkEnabled ? race.ktkBoats.find(function (h) { return h.name.toLowerCase() === name; }) : null;
+    var bothEnabled = race.vetEnabled && race.ktkEnabled;
+    var options = [];
+    if (vetEntry) {
+      vetEntry.vets.forEach(function (v) {
+        options.push({ value: v.value, text: (bothEnabled ? 'VET ' : '') + v.label + ': ' + v.value });
+      });
+    }
+    if (ktkEntry) {
+      ktkEntry.vets.forEach(function (v) {
+        options.push({ value: v.value, text: (bothEnabled ? 'KTK ' : '') + v.label + ': ' + v.raw + ' → ' + v.value });
+      });
+    }
     row.vetSelect.innerHTML = '';
     var placeholder = document.createElement('option');
     placeholder.value = '';
-    placeholder.textContent = entry ? 'Pick VET…' : 'No VET match';
+    placeholder.textContent = options.length ? 'Pick…' : 'No match';
     row.vetSelect.appendChild(placeholder);
-    row.vetSelect.disabled = !entry;
-    if (entry) {
-      entry.vets.forEach(function (v) {
-        var opt = document.createElement('option');
-        opt.value = String(v.value);
-        opt.textContent = v.label + ': ' + v.value;
-        row.vetSelect.appendChild(opt);
-      });
-      var notValid = /ikke/i.test(entry.validity || '');
-      row.vetBadge.textContent = entry.validity ? (notValid ? '⚠ ' + entry.validity : entry.validity) : '';
+    row.vetSelect.disabled = !options.length;
+    options.forEach(function (o) {
+      var opt = document.createElement('option');
+      opt.value = String(o.value);
+      opt.textContent = o.text;
+      row.vetSelect.appendChild(opt);
+    });
+    if (vetEntry) {
+      var notValid = /ikke/i.test(vetEntry.validity || '');
+      row.vetBadge.textContent = vetEntry.validity ? (notValid ? '⚠ ' + vetEntry.validity : vetEntry.validity) : '';
       row.vetBadge.classList.toggle('warn', notValid);
     } else {
       row.vetBadge.textContent = '';
@@ -817,6 +904,14 @@ tbody tr.dnf td { color: var(--muted); }
         return { boat: boat, elapsedMs: elapsedMs, correctedMs: correctedMs, rankMs: rankMs };
       })
       .sort(function (a, b) {
+        // Self always leads, whatever else is true.
+        var aSelf = a.boat.id === race.selfBoatId;
+        var bSelf = b.boat.id === race.selfBoatId;
+        if (aSelf !== bSelf) return aSelf ? -1 : 1;
+        // Before the race actually starts, nobody has a corrected time to
+        // rank by anyway — leave order exactly as race.boats gave it
+        // (registration order) rather than reshuffling on every add/remove.
+        if (!race.startTime) return 0;
         if (a.rankMs == null && b.rankMs == null) return a.boat.name.localeCompare(b.boat.name);
         if (a.rankMs == null) return 1;
         if (b.rankMs == null) return -1;
@@ -938,6 +1033,7 @@ tbody tr.dnf td { color: var(--muted); }
     });
     var nameSpan = document.createElement('span');
     var tdName = document.createElement('td');
+    tdName.className = 'boat-name-col';
     tdName.append(selfBtn, nameSpan);
 
     var sailNumberInput = document.createElement('input');
@@ -991,7 +1087,7 @@ tbody tr.dnf td { color: var(--muted); }
     vetBadge.className = 'vet-badge';
     var tdVet = document.createElement('td');
     tdVet.className = 'vet-cell';
-    tdVet.hidden = !race.vetEnabled;
+    tdVet.hidden = !race.vetEnabled && !race.ktkEnabled;
     tdVet.append(vetSelect, vetBadge);
 
     var startTimeInput = document.createElement('input');
@@ -1178,7 +1274,7 @@ tbody tr.dnf td { color: var(--muted); }
       row.selfBtn.classList.toggle('active', isSelf);
       if (document.activeElement !== row.sailNumberInput) row.sailNumberInput.value = b.sailNumber || '';
       if (document.activeElement !== row.tcfInput) row.tcfInput.value = b.tcf;
-      if (race.vetEnabled) {
+      if (race.vetEnabled || race.ktkEnabled) {
         if (row.vetHandicapVersion !== handicapVersion && document.activeElement !== row.vetSelect) {
           refreshVetAlternatives(row, b.name);
           row.vetHandicapVersion = handicapVersion;
@@ -1278,8 +1374,9 @@ tbody tr.dnf td { color: var(--muted); }
   });
 
   vetStatusLine.hidden = !race.vetEnabled;
-  vetAlternativesTh.hidden = !race.vetEnabled;
+  vetAlternativesTh.hidden = !race.vetEnabled && !race.ktkEnabled;
   vetRefreshBtn.addEventListener('click', function () { loadHandicapRegister(true); });
+  if (race.ktkEnabled) rebuildAddBoatSuggestions();
   if (race.vetEnabled) {
     rebuildAddBoatSuggestions();
     if (race.handicapBoats.length) {
@@ -1325,6 +1422,18 @@ module.exports = function (app) {
           'Use the VET-tall register for autocomplete and per-boat handicap alternatives. When off, every boat is treated as outside VET: TCF is remembered per boat name across races instead.',
         default: false
       },
+      ktkSourceUrl: {
+        type: 'string',
+        title:
+          "KTK page to fetch the current season's KLR numbers from — either the label listing (whose most recent post is used) or a specific post directly",
+        default: DEFAULT_KTK_SOURCE_PAGE
+      },
+      ktkEnabled: {
+        type: 'boolean',
+        title:
+          "Use KTK's KLR register for autocomplete and per-boat handicap alternatives too, alongside VET-tall if that's also on — a boat listed in both shows alternatives from both. Corrected time from a KLR number is elapsed × (KLR / 100).",
+        default: false
+      },
       raceImportEnabled: {
         type: 'boolean',
         title:
@@ -1351,6 +1460,7 @@ module.exports = function (app) {
   const scheduleTimers = new Map(); // raceId -> Timeout, for scheduledStart
   const callOffTimers = new Map(); // raceId -> Timeout, for scheduledCallOff
   let handicapCache = { fetchedAt: 0, boats: [], sourceUrl: null, csvUrl: null };
+  let ktkCache = { fetchedAt: 0, boats: [], sourceUrl: null };
 
   function loadState() {
     try {
@@ -1394,20 +1504,29 @@ module.exports = function (app) {
     return !!(plugin.options && plugin.options.vetEnabled === true);
   }
 
+  // Same pattern as vetEnabled, for KTK's KLR register.
+  function isKtkEnabled() {
+    return !!(plugin.options && plugin.options.ktkEnabled === true);
+  }
+
   // Plugin config setting, same pattern as vetEnabled — off by default, not
   // per-race, not writable from the webapp itself.
   function isRaceImportEnabled() {
     return !!(plugin.options && plugin.options.raceImportEnabled === true);
   }
 
-  // A boat only counts as "in VET" for registry-TCF purposes while the
-  // config setting has VET enabled and the register (whatever's currently
-  // cached) actually has a matching name — disabling VET makes every boat
-  // "outside VET" for this purpose too, per the setting's whole point.
-  function isVetMatch(name) {
-    if (!isVetEnabled()) return false;
+  // A boat only counts as "in a handicap register" for registry-TCF
+  // purposes while that register is enabled and (whatever's currently
+  // cached of) it actually has a matching name — disabling a register makes
+  // every boat "outside" it for this purpose too, per the setting's whole
+  // point. Checks both VET-tall and KTK, since a boat matched by either one
+  // should be picked fresh from its own dropdown rather than carrying over
+  // a remembered TCF.
+  function isHandicapRegisterMatch(name) {
     const n = (name || '').trim().toLowerCase();
-    return handicapCache.boats.some((b) => b.name.toLowerCase() === n);
+    if (isVetEnabled() && handicapCache.boats.some((b) => b.name.toLowerCase() === n)) return true;
+    if (isKtkEnabled() && ktkCache.boats.some((b) => b.name.toLowerCase() === n)) return true;
+    return false;
   }
 
   function saveState() {
@@ -1788,6 +1907,22 @@ module.exports = function (app) {
     return handicapCache;
   }
 
+  async function fetchKtkBoats(forceRefresh) {
+    const sourceUrl = (plugin.options && plugin.options.ktkSourceUrl) || DEFAULT_KTK_SOURCE_PAGE;
+    const age = Date.now() - ktkCache.fetchedAt;
+    if (!forceRefresh && ktkCache.sourceUrl === sourceUrl && age < HANDICAP_CACHE_TTL_MS) {
+      return ktkCache;
+    }
+    const res = await fetch(sourceUrl);
+    if (!res.ok) {
+      throw new Error(`KTK page returned HTTP ${res.status}`);
+    }
+    const html = await res.text();
+    const boats = parseKtkHtml(html);
+    ktkCache = { fetchedAt: Date.now(), boats, sourceUrl };
+    return ktkCache;
+  }
+
   async function fetchManage2SailClasses(eventUrl) {
     const res = await fetch(eventUrl);
     if (!res.ok) {
@@ -1985,10 +2120,26 @@ module.exports = function (app) {
           }
         }
       }
+      // KTK's page has no CORS support (unlike the VET-tall CSV export), so
+      // unlike handicapBoats above this is a one-time snapshot only — the
+      // offline page can't refresh it live itself. Still seeded in, since a
+      // snapshot from export time is better than nothing.
+      let ktkBoats = [];
+      if (isKtkEnabled()) {
+        try {
+          const data = await fetchKtkBoats();
+          ktkBoats = data.boats;
+        } catch (e) {
+          // Leave ktkBoats empty — same best-effort spirit as the rest of
+          // this route.
+        }
+      }
       const html = buildOfflineTimerHtml(race, defaultTcf, {
         vetEnabled: isVetEnabled(),
         handicapCsvUrl,
-        handicapBoats
+        handicapBoats,
+        ktkEnabled: isKtkEnabled(),
+        ktkBoats
       });
       const safeName = (race.name || 'race').replace(/[^a-z0-9\-_]+/gi, '_').slice(0, 60) || 'race';
       res.setHeader('Content-Type', 'text/html; charset=utf-8');
@@ -2222,11 +2373,12 @@ module.exports = function (app) {
       const sailNumber = givenSailNumber || (registryEntry && registryEntry.sailNumber) || null;
       if (sailNumber) upsertBoatRegistry(name, { sailNumber });
       const defaultTcf = (plugin.options && plugin.options.defaultTcf) || 1.0;
-      // A remembered TCF only applies to boats outside VET — a VET-matched
-      // boat should be picked fresh from the register's own dropdown rather
-      // than silently carrying over a number from wherever it last raced.
+      // A remembered TCF only applies to boats outside every enabled
+      // register — a matched boat should be picked fresh from the
+      // register's own dropdown rather than silently carrying over a
+      // number from wherever it last raced.
       let tcf = defaultTcf;
-      if (!isVetMatch(name) && registryEntry && registryEntry.tcf != null) {
+      if (!isHandicapRegisterMatch(name) && registryEntry && registryEntry.tcf != null) {
         tcf = registryEntry.tcf;
       }
       const boat = {
@@ -2402,6 +2554,11 @@ module.exports = function (app) {
       res.json({ enabled: isVetEnabled() });
     });
 
+    // Same pattern as vet-enabled, for KTK's KLR register.
+    router.get('/ktk-enabled', (req, res) => {
+      res.json({ enabled: isKtkEnabled() });
+    });
+
     // Lets the course editor offer existing SignalK waypoints (e.g. ones
     // already placed on a chart plotter) as start/mark/finish positions,
     // instead of only typing lat/lon by hand. Best-effort, same spirit as
@@ -2438,9 +2595,10 @@ module.exports = function (app) {
         return res.status(400).json({ error: 'tcf must be a positive number' });
       }
       boat.tcf = tcf;
-      // Remembered across races only for boats outside VET — see the note
-      // on upsertBoatRegistry/isVetMatch above.
-      if (!isVetMatch(boat.name)) upsertBoatRegistry(boat.name, { tcf });
+      // Remembered across races only for boats outside every enabled
+      // register — see the note on upsertBoatRegistry/isHandicapRegisterMatch
+      // above.
+      if (!isHandicapRegisterMatch(boat.name)) upsertBoatRegistry(boat.name, { tcf });
       saveState();
       res.json(boat);
     });
@@ -2455,6 +2613,16 @@ module.exports = function (app) {
       }
     });
 
+    router.get('/ktk-source', async (req, res) => {
+      try {
+        const force = req.query.refresh === 'true' || req.query.refresh === '1';
+        const data = await fetchKtkBoats(force);
+        res.json(data);
+      } catch (e) {
+        res.status(502).json({ error: 'Could not load KTK register: ' + e.message });
+      }
+    });
+
     // Plugin config setting (Server -> Plugin Config), same pattern as
     // vet-enabled — the webapp only reads it to know whether to show the
     // import section at all.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-race-control",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "SignalK plugin and webapp for tracking elapsed and handicap-corrected (Time-on-Time) race time, with a per-boat editable TCF and boat names pulled from AIS when available.",
   "main": "index.js",
   "author": "Joachim Bakke <github@heiamoss.com>",

package/public/app.js

@@ -11,8 +11,10 @@
   let suggestionItems = []; // currently-shown filtered suggestions
   let suggestionActiveIndex = -1;
   let handicapBoats = [];
-  let handicapVersion = 0; // bumped each successful VET-register load
+  let handicapVersion = 0; // bumped each successful VET-register (or KTK) load
   let vetEnabled = false; // plugin config setting (Server -> Plugin Config), read-only here; off by default
+  let ktkBoats = []; // [{name, vets: [{label, value}]}] from KTK's KLR register — same shape as handicapBoats
+  let ktkEnabled = false; // plugin config setting, same pattern as vetEnabled
   let raceImportEnabled = false; // plugin config setting, same pattern as vetEnabled
   let importEventId = null; // Manage2Sail event id from the last successful "Find Classes" lookup
   let importClasses = []; // [{id, name}] from that same lookup
@@ -60,6 +62,9 @@
   const vetStatusText = document.getElementById('vetStatusText');
   const vetRefreshBtn = document.getElementById('vetRefreshBtn');
   const vetAlternativesTh = document.getElementById('vetAlternativesTh');
+  const ktkStatusLine = document.getElementById('ktkStatusLine');
+  const ktkStatusText = document.getElementById('ktkStatusText');
+  const ktkRefreshBtn = document.getElementById('ktkRefreshBtn');
   const addBoatRow = document.getElementById('addBoatRow');
   const addBoatName = document.getElementById('addBoatName');
   const addBoatBtn = document.getElementById('addBoatBtn');
@@ -225,6 +230,11 @@
     vetStatusText.classList.toggle('error', !!isError);
   }
 
+  function setKtkStatus(msg, isError) {
+    ktkStatusText.textContent = msg || '';
+    ktkStatusText.classList.toggle('error', !!isError);
+  }
+
   // Vessels are only used as autocomplete suggestions when adding a boat
   // (name + MMSI hint) — a race's boat list is otherwise entered explicitly,
   // not auto-populated from AIS.
@@ -264,6 +274,7 @@
       }
     }
     if (vetEnabled) handicapBoats.forEach((b) => upsert(b.name, ''));
+    if (ktkEnabled) ktkBoats.forEach((b) => upsert(b.name, ''));
     boatRegistry.forEach((b) => upsert(b.name, b.mmsi));
     vesselSuggestions.forEach((v) => upsert(v.name, v.mmsi));
     nameSuggestionPool = Array.from(byName.values());
@@ -362,10 +373,23 @@
     }
     // When disabled, every trace of VET is removed from the webapp rather
     // than shown as a disabled/placeholder state — the status line (register
-    // status text + refresh link) and the whole "VET alternatives" table
-    // column disappear entirely.
+    // status text + refresh link) disappears entirely. The "Handicap
+    // alternatives" column is shared with KTK, so it's only hidden once
+    // both are off — see loadKtkEnabled.
     vetStatusLine.hidden = !vetEnabled;
-    vetAlternativesTh.hidden = !vetEnabled;
+    vetAlternativesTh.hidden = !vetEnabled && !ktkEnabled;
+  }
+
+  // Same pattern as loadVetEnabled, for KTK's KLR register.
+  async function loadKtkEnabled() {
+    try {
+      const data = await fetchJSON(`${API}/ktk-enabled`);
+      ktkEnabled = data.enabled === true;
+    } catch (e) {
+      ktkEnabled = false;
+    }
+    ktkStatusLine.hidden = !ktkEnabled;
+    vetAlternativesTh.hidden = !vetEnabled && !ktkEnabled;
   }
 
   // Same pattern as loadVetEnabled — when disabled, the whole import
@@ -406,6 +430,20 @@
     }
   }
 
+  async function loadKtkRegister(force) {
+    if (!ktkEnabled) return;
+    try {
+      setKtkStatus('Loading KTK register…');
+      const data = await fetchJSON(`${API}/ktk-source${force ? '?refresh=true' : ''}`);
+      ktkBoats = data.boats || [];
+      handicapVersion++;
+      rebuildNameSuggestionPool();
+      setKtkStatus(`KTK register: ${ktkBoats.length} boats loaded.`);
+    } catch (e) {
+      setKtkStatus('Could not load KTK register: ' + e.message, true);
+    }
+  }
+
   async function loadRacesList() {
     try {
       const data = await fetchJSON(`${API}/races`);
@@ -1607,6 +1645,19 @@
         };
       })
       .sort((a, b) => {
+        // Self always leads, whatever else is true — it's the boat whoever
+        // is looking at this screen cares about finding without hunting
+        // for it.
+        const aSelf = a.boatId === raceState.selfBoatId;
+        const bSelf = b.boatId === raceState.selfBoatId;
+        if (aSelf !== bSelf) return aSelf ? -1 : 1;
+        // Before the race actually starts, nobody has a corrected time to
+        // rank by anyway — sorting by name (or anything else derived) just
+        // reshuffled the rows confusingly every time a boat was added or
+        // removed. Rely on sort's stability and leave order exactly as
+        // Object.values(raceState.boats) gave it (i.e. registration order)
+        // until there's an actual race to rank.
+        if (!raceState.startTime) return 0;
         if (a.rankMs == null && b.rankMs == null) return a.name.localeCompare(b.name);
         if (a.rankMs == null) return 1;
         if (b.rankMs == null) return -1;
@@ -1692,6 +1743,7 @@
     nameSpan.className = 'boat-name-text';
 
     const tdName = document.createElement('td');
+    tdName.className = 'boat-name-col';
     tdName.append(selfBtn, nameSpan);
 
     const sailNumberInput = document.createElement('input');
@@ -1754,7 +1806,7 @@
     vetBadge.className = 'vet-badge';
     const tdVet = document.createElement('td');
     tdVet.className = 'vet-cell';
-    tdVet.hidden = !vetEnabled;
+    tdVet.hidden = !vetEnabled && !ktkEnabled;
     tdVet.append(vetSelect, vetBadge);
 
     // A boat's own start time, for a staggered/pursuit start or to correct
@@ -1909,28 +1961,43 @@
     };
   }
 
-  // Rebuilds a row's VET-alternatives <select> from the current register —
-  // only called when the register itself (re)loads, not every render tick,
-  // so an open dropdown or mid-pick isn't disrupted every second. Never
-  // called at all while vetEnabled is false (see the call site) — the
-  // "VET alternatives" column is hidden entirely in that case.
+  // Rebuilds a row's handicap-alternatives <select> from the current
+  // register(s) — only called when a register itself (re)loads, not every
+  // render tick, so an open dropdown or mid-pick isn't disrupted every
+  // second. Never called at all while both vetEnabled and ktkEnabled are
+  // false (see the call site) — the "Handicap alternatives" column is
+  // hidden entirely in that case. Merges VET-tall and KTK when both are
+  // enabled and a boat matches both, rather than picking one over the
+  // other.
   function refreshVetAlternatives(row, boatName) {
-    const entry = handicapBoats.find((h) => h.name.toLowerCase() === boatName.trim().toLowerCase());
+    const name = boatName.trim().toLowerCase();
+    const vetEntry = vetEnabled ? handicapBoats.find((h) => h.name.toLowerCase() === name) : null;
+    const ktkEntry = ktkEnabled ? ktkBoats.find((h) => h.name.toLowerCase() === name) : null;
+    const bothEnabled = vetEnabled && ktkEnabled;
+    const options = [];
+    if (vetEntry) {
+      vetEntry.vets.forEach((v) => options.push({ value: v.value, text: `${bothEnabled ? 'VET ' : ''}${v.label}: ${v.value}` }));
+    }
+    if (ktkEntry) {
+      ktkEntry.vets.forEach((v) =>
+        options.push({ value: v.value, text: `${bothEnabled ? 'KTK ' : ''}${v.label}: ${v.raw} → ${v.value}` })
+      );
+    }
     row.vetSelect.innerHTML = '';
     const placeholder = document.createElement('option');
     placeholder.value = '';
-    placeholder.textContent = entry ? 'Pick VET…' : 'No VET match';
+    placeholder.textContent = options.length ? 'Pick…' : 'No match';
     row.vetSelect.appendChild(placeholder);
-    row.vetSelect.disabled = !entry;
-    if (entry) {
-      entry.vets.forEach((v) => {
-        const opt = document.createElement('option');
-        opt.value = String(v.value);
-        opt.textContent = `${v.label}: ${v.value}`;
-        row.vetSelect.appendChild(opt);
-      });
-      const notValid = /ikke/i.test(entry.validity || '');
-      row.vetBadge.textContent = entry.validity ? (notValid ? '⚠ ' + entry.validity : entry.validity) : '';
+    row.vetSelect.disabled = !options.length;
+    options.forEach((o) => {
+      const opt = document.createElement('option');
+      opt.value = String(o.value);
+      opt.textContent = o.text;
+      row.vetSelect.appendChild(opt);
+    });
+    if (vetEntry) {
+      const notValid = /ikke/i.test(vetEntry.validity || '');
+      row.vetBadge.textContent = vetEntry.validity ? (notValid ? '⚠ ' + vetEntry.validity : vetEntry.validity) : '';
       row.vetBadge.classList.toggle('warn', notValid);
     } else {
       row.vetBadge.textContent = '';
@@ -2041,20 +2108,28 @@
     const vsSelfMap = computeVsSelf(boats, raceState.selfBoatId);
 
     boats.forEach((b) => {
-      let row = rows.get(b.boatId);
-      if (!row) {
-        row = buildRow(b.boatId);
-        rows.set(b.boatId, row);
-      }
-      // Moving an already-attached node to its sorted position keeps it
-      // intact (focus, in-progress edits) rather than recreating it — but
-      // the move itself still resets a text cursor and closes an open
-      // <select>, so skip it entirely while the user has something in this
-      // row focused. It'll snap to its correct position as soon as they're
-      // done (next render after focus moves away).
-      if (!row.tr.contains(document.activeElement)) {
-        boatsBody.appendChild(row.tr);
+      if (!rows.get(b.boatId)) {
+        rows.set(b.boatId, buildRow(b.boatId));
       }
+    });
+    // Moving already-attached nodes to their sorted position keeps them
+    // intact (focus, in-progress edits) rather than recreating them — but
+    // the move itself still resets a text cursor and closes an open
+    // <select>, so the whole reorder pass is skipped while the user has
+    // anything in ANY row focused, not just the row that would move.
+    // Reordering around a skipped row by moving everyone else in sequence
+    // can still shuffle it to a different spot as a side effect of those
+    // other moves, which is exactly the "keep self on top" guarantee this
+    // was supposed to preserve — so it's all-or-nothing instead. It'll
+    // snap to the fully correct order on the next render once focus moves
+    // away.
+    const anyRowFocused = boats.some((b) => rows.get(b.boatId).tr.contains(document.activeElement));
+    if (!anyRowFocused) {
+      boats.forEach((b) => boatsBody.appendChild(rows.get(b.boatId).tr));
+    }
+
+    boats.forEach((b) => {
+      const row = rows.get(b.boatId);
 
       row.tr.classList.toggle('finished', !!b.finishTime);
       row.tr.classList.toggle('dnf', !!b.dnf);
@@ -2071,7 +2146,7 @@
       if (document.activeElement !== row.tcfInput) {
         row.tcfInput.value = b.tcf;
       }
-      if (vetEnabled && row.vetHandicapVersion !== handicapVersion && document.activeElement !== row.vetSelect) {
+      if ((vetEnabled || ktkEnabled) && row.vetHandicapVersion !== handicapVersion && document.activeElement !== row.vetSelect) {
         refreshVetAlternatives(row, b.name);
         row.vetHandicapVersion = handicapVersion;
       }
@@ -2214,6 +2289,7 @@
   scheduleCallOffBtn.addEventListener('click', scheduleCallOff);
   cancelCallOffBtn.addEventListener('click', cancelCallOffSchedule);
   vetRefreshBtn.addEventListener('click', () => loadHandicapRegister(true));
+  ktkRefreshBtn.addEventListener('click', () => loadKtkRegister(true));
   addBoatBtn.addEventListener('click', () => {
     hideSuggestions();
     addBoat();
@@ -2337,11 +2413,13 @@
 
   async function init() {
     await loadVetEnabled();
+    await loadKtkEnabled();
     await loadRaceImportEnabled();
     await Promise.all([
       loadVessels(),
       loadBoatRegistry(),
       loadHandicapRegister(false),
+      loadKtkRegister(false),
       loadWaypoints(),
       loadRacesList(),
       refreshSelfNav()

package/public/index.html

@@ -55,6 +55,10 @@
       <span id="vetStatusText"></span>
       <button id="vetRefreshBtn" class="link-btn">Refresh VET register</button>
     </div>
+    <div id="ktkStatusLine" class="status vet-status">
+      <span id="ktkStatusText"></span>
+      <button id="ktkRefreshBtn" class="link-btn">Refresh KTK register</button>
+    </div>
   </header>
   <main>
     <p id="noRacesMsg" class="empty" hidden>No races yet. Click "+ New Race" to plan one.</p>
@@ -147,11 +151,11 @@
       <table id="boatsTable">
         <thead>
           <tr>
-            <th>Boat</th>
+            <th class="boat-name-col">Boat</th>
             <th>Sail #</th>
             <th>MMSI</th>
             <th>TCF</th>
-            <th id="vetAlternativesTh">VET alternatives</th>
+            <th id="vetAlternativesTh">Handicap alternatives</th>
             <th>Start time</th>
             <th>Elapsed</th>
             <th>Corrected</th>

package/public/style.css

@@ -216,7 +216,6 @@ button:disabled {
 
 main {
   padding: 1rem 1.5rem 2rem;
-  max-width: 1000px;
   margin: 0 auto;
 }
 
@@ -591,6 +590,21 @@ tbody td {
   border-bottom: 1px solid var(--border);
 }
 
+/* Frozen first column, so the boat's name stays visible while scrolling
+   the (much wider than most screens, especially phones in landscape)
+   table sideways to reach the other columns. Needs its own opaque
+   background so scrolled-under cells don't show through. */
+.boat-name-col {
+  position: sticky;
+  left: 0;
+  z-index: 1;
+  background: var(--bg);
+}
+
+thead .boat-name-col {
+  z-index: 2;
+}
+
 tbody tr.finished td {
   color: var(--good);
 }