npm - signalk-race-control - Versions diffs - 0.4.0 → 0.4.2 - Mend

signalk-race-control 0.4.0 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/README.md CHANGED Viewed

@@ -49,10 +49,10 @@ and a live projected finishing order — during and after the race.
   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.
-- **MMSI, remembered across races** — set once per boat (or picked up automatically
-  from a live AIS/self vessel with a matching name), it's remembered in a small
-  cross-race registry: add a boat with the same name in a later race and its MMSI
-  fills in on its own.
+- **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
+  in a later race and its MMSI and sail number fill in on their own.
 - **Import a whole fleet from Manage2Sail** — off by default (`raceImportEnabled` in
   the plugin's settings, alongside `vetEnabled`); once turned on, an **Import boats
   from Manage2Sail** section lets you paste a Manage2Sail event URL, pick one or more

package/index.js CHANGED Viewed

@@ -377,13 +377,27 @@ function buildOfflineTimerHtml(race, defaultTcf, vetOptions) {
   // prematurely close the tag, e.g. via "</script>" in a boat name) is
   // escaped. JSON.parse doesn't need this reversed; < is valid JSON.
   const seedJson = JSON.stringify(seed).replace(/</g, '\\u003c');
+  // The race name also goes straight into HTML attributes/text below (page
+  // 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]));
   return `<!doctype html>
 <html lang="en">
 <head>
 <meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<title>Race Control — Offline Timer</title>
+<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
+<title>${escapedRaceName} — Offline Timer</title>
+<meta name="theme-color" content="#0f172a" />
+<!-- Lets "Add to Home Screen" on iOS launch this as a standalone app rather
+     than a Safari bookmark — standalone home-screen apps get their own
+     persistent storage that isn't subject to Safari's usual after-a-week
+     cleanup of unvisited sites, which is what actually makes the saved race
+     state stick around between uses. -->
+<meta name="apple-mobile-web-app-capable" content="yes" />
+<meta name="mobile-web-app-capable" content="yes" />
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta name="apple-mobile-web-app-title" content="${escapedRaceName}" />
 <style>
 :root {
   --bg: #0f172a; --panel: #1e293b; --border: #334155; --text: #e2e8f0;
@@ -392,7 +406,7 @@ function buildOfflineTimerHtml(race, defaultTcf, vetOptions) {
 * { box-sizing: border-box; }
 [hidden] { display: none !important; }
 body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; background: var(--bg); color: var(--text); }
-header { padding: 1.25rem 1.5rem; border-bottom: 1px solid var(--border); text-align: center; }
+header { padding: max(1.25rem, env(safe-area-inset-top)) 1.5rem 1.25rem; border-bottom: 1px solid var(--border); text-align: center; }
 h1 { margin: 0 0 0.4rem; font-size: 1.1rem; font-weight: 600; letter-spacing: 0.02em; color: var(--muted); text-transform: uppercase; }
 h2 { margin: 0 0 0.75rem; font-size: 1.3rem; }
 .offline-note { max-width: 40rem; margin: 0 auto 1rem; font-size: 0.8rem; color: var(--muted); }
@@ -411,7 +425,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 2rem; max-width: 900px; margin: 0 auto; }
+main { padding: 1rem 1.5rem max(2rem, env(safe-area-inset-bottom)); max-width: 900px; 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; }
@@ -1321,9 +1335,10 @@ module.exports = function (app) {
   // Races are kept by id so several can be planned ahead and reviewed after
   // the fact, rather than a single race getting overwritten by Reset.
-  // boatRegistry is a separate, cross-race name->MMSI/TCF memory: once a
-  // boat's MMSI or (for boats outside VET) TCF is entered anywhere, it's
-  // applied automatically next time that name is used in any race.
+  // boatRegistry is a separate, cross-race name->MMSI/sail number/TCF
+  // memory: once a boat's MMSI, sail number, or (for boats outside VET) TCF
+  // is entered anywhere, it's applied automatically next time that name is
+  // used in any race.
   let state = { races: {}, order: [], currentRaceId: null, boatRegistry: {} };
   let dataFile = null;
   const scheduleTimers = new Map(); // raceId -> Timeout, for scheduledStart
@@ -1346,14 +1361,16 @@ module.exports = function (app) {
   }
   // Cross-race memory keyed by boat name, merging in whichever fields are
-  // given (mmsi and/or tcf) without clobbering the other. tcf is only ever
-  // written here for boats outside the VET register — see the callers.
+  // given (mmsi, sailNumber, and/or tcf) without clobbering the others. tcf
+  // is only ever written here for boats outside the VET register — see the
+  // callers.
   function upsertBoatRegistry(name, fields) {
     if (!name) return;
     const key = name.trim().toLowerCase();
     const existing = state.boatRegistry[key] || { name: name.trim() };
     existing.name = name.trim();
     if (fields.mmsi) existing.mmsi = String(fields.mmsi).trim();
+    if (fields.sailNumber) existing.sailNumber = String(fields.sailNumber).trim();
     if (fields.tcf != null) existing.tcf = fields.tcf;
     state.boatRegistry[key] = existing;
   }
@@ -1362,11 +1379,6 @@ module.exports = function (app) {
     return state.boatRegistry[(name || '').trim().toLowerCase()] || null;
   }
-  function lookupBoatRegistry(name) {
-    const entry = getRegistryEntry(name);
-    return entry ? entry.mmsi : null;
-  }
   // vetEnabled is a plugin config setting (Server -> Plugin Config), not
   // per-race and not editable from the webapp itself. Off by default — a
   // fresh install (or one that's never touched this setting) treats every
@@ -2151,23 +2163,26 @@ module.exports = function (app) {
       if (!name) {
         return res.status(400).json({ error: 'name is required' });
       }
+      const registryEntry = getRegistryEntry(name);
       const givenMmsi = ((req.body && req.body.mmsi) || '').toString().trim();
-      const mmsi = givenMmsi || lookupBoatRegistry(name);
+      const mmsi = givenMmsi || (registryEntry && registryEntry.mmsi) || null;
       if (mmsi) upsertBoatRegistry(name, { mmsi });
+      const givenSailNumber = ((req.body && req.body.sailNumber) || '').toString().trim();
+      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.
       let tcf = defaultTcf;
-      if (!isVetMatch(name)) {
-        const remembered = getRegistryEntry(name);
-        if (remembered && remembered.tcf != null) tcf = remembered.tcf;
+      if (!isVetMatch(name) && registryEntry && registryEntry.tcf != null) {
+        tcf = registryEntry.tcf;
       }
       const boat = {
         id: makeBoatId(),
         name,
         mmsi: mmsi || null,
-        sailNumber: null,
+        sailNumber,
         tcf,
         finishTime: null,
         startTime: null,
@@ -2278,6 +2293,7 @@ module.exports = function (app) {
       if (!boat) return res.status(404).json({ error: 'No such boat' });
       const sailNumber = ((req.body && req.body.sailNumber) || '').toString().trim();
       boat.sailNumber = sailNumber || null;
+      if (boat.sailNumber) upsertBoatRegistry(boat.name, { sailNumber: boat.sailNumber });
       saveState();
       res.json(boat);
     });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "signalk-race-control",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "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",
   "keywords": [