signalk-polar-performance-plugin 1.3.3 → 2.0.0

package/public/index.html

@@ -82,9 +82,7 @@
         <ul id="main-nav" class="nav">
           <li class="nav-item"><a class="nav-link active" href="#" data-page="overview">Overview</a></li>
           <li class="nav-item"><a class="nav-link" href="#" data-page="inputs">Inputs</a></li>
-          <li class="nav-item"><a class="nav-link" href="#" data-page="settings">Polar</a></li>
           <li class="nav-item"><a class="nav-link" href="#" data-page="outputs">Outputs</a></li>
-          <li class="nav-item"><a class="nav-link" href="#" data-page="polars">Polar management</a></li>
         </ul>
       </nav>
       <button class="sidebar-minimizer brand-minimizer" type="button" id="sidebarMinimizer"></button>

package/public/plotter.html

@@ -126,19 +126,12 @@
 
     <div class="settings-row">
       <span class="settings-row-label">Active polar</span>
-      <button id="btn-polar-current" aria-label="Select polar">
-        <span id="polar-name-display">—</span>
-        <span class="polar-arrow">›</span>
-      </button>
+      <span id="polar-name-display">—</span>
     </div>
 
     <div class="settings-row">
       <span class="settings-row-label">Performance</span>
-      <div class="stepper">
-        <button class="btn-step" id="btn-perf-minus" aria-label="Decrease">−</button>
-        <span class="stepper-value" id="perf-display">100%</span>
-        <button class="btn-step" id="btn-perf-plus" aria-label="Increase">+</button>
-      </div>
+      <span id="perf-display">100%</span>
     </div>
 
     <div class="settings-row">
@@ -147,15 +140,6 @@
     </div>
   </div>
 
-  <!-- Polar picker (opens on top of settings panel) -->
-  <div id="polar-list-panel" class="overlay" style="z-index:30" role="dialog" aria-label="Select polar">
-    <div class="panel-header">
-      <button class="btn-icon" id="btn-back-from-polar" aria-label="Back">‹</button>
-      <span class="panel-header-title">Select polar</span>
-    </div>
-    <div id="polar-list-items"></div>
-  </div>
-
   <script src="polar-canvas.js"></script>
   <script>
     (function () {
@@ -189,10 +173,11 @@
       let libraryVersion = ''     // change detector
       let liveTws        = null   // last fetched live TWS (m/s)
       let liveCurve      = null   // interpolated curve for liveTws
-      let activePolarId  = null   // current active polar id
 
-      // Settings state — kept in sync with the server
-      let perfAdjust     = 1          // multiplier (1 = 100%)
+      // Active polar / performance factor are read-only here — selected in a
+      // separate polar management webapp (e.g. signalk-polar-management).
+      let activePolarName = null
+      let performanceFactor = 1
       let showAllTwsLines = true
 
       // -----------------------------------------------------------------------
@@ -220,26 +205,16 @@
       // -----------------------------------------------------------------------
 
       async function refreshLibrary() {
-        // Resolve active polar ID first
-        let polarId
-        try {
-          const active = await fetchJSON(BASE + '/polars/active')
-          polarId = active.id
-        } catch (_) {
-          return  // no active polar — try again on next cycle
-        }
-
         let newList
         try {
-          newList = await fetchJSON(BASE + '/polars/' + polarId + '/axes/tws')
+          newList = await fetchJSON(BASE + '/polar/axes/tws')
         } catch (_) {
-          return  // polar not yet loaded — try again on next cycle
+          return  // no active polar yet — try again on next cycle
         }
 
-        const version = polarId + ':' + JSON.stringify(newList)
+        const version = JSON.stringify(newList)
         if (version === libraryVersion) return  // no change
 
-        activePolarId  = polarId
         libraryVersion = version
         twsList = newList
         curves  = {}
@@ -248,7 +223,7 @@
         await Promise.all(twsList.map(async (tws) => {
           try {
             curves[tws] = await fetchJSON(
-              BASE + '/polars/' + polarId + '/queries/curve?tws=' + tws + '&step=' + STEP
+              BASE + '/polar/queries/curve?tws=' + tws + '&step=' + STEP
             )
           } catch (_) { /* skip individual failure */ }
         }))
@@ -272,10 +247,10 @@
       // -----------------------------------------------------------------------
 
       async function fetchCurveForTws(tws) {
-        if (!Number.isFinite(tws) || tws <= 0 || !activePolarId) return null
+        if (!Number.isFinite(tws) || tws <= 0) return null
         try {
           return await fetchJSON(
-            BASE + '/polars/' + activePolarId + '/queries/curve?tws=' + tws.toFixed(5) + '&step=' + STEP
+            BASE + '/polar/queries/curve?tws=' + tws.toFixed(5) + '&step=' + STEP
           )
         } catch (_) {
           return null
@@ -311,12 +286,16 @@
       async function loadSettings() {
         try {
           const s = await fetchJSON(BASE + '/settings')
-          perfAdjust      = Number.isFinite(s.perfAdjust) ? s.perfAdjust : 1
           showAllTwsLines = s.showAllTwsLines !== false
-          updatePerfDisplay()
           updateTwsToggle()
           polar.setShowAllTwsLines(showAllTwsLines)
         } catch (_) { /* keep defaults */ }
+        try {
+          const m = await fetchJSON(BASE + '/meta')
+          activePolarName = m.activePolar ? (m.activePolar.name || m.activePolar.id) : null
+          performanceFactor = Number.isFinite(m.performanceFactor) ? m.performanceFactor : 1
+          updatePerfDisplay()
+        } catch (_) { /* keep defaults */ }
       }
 
       // -----------------------------------------------------------------------
@@ -324,14 +303,12 @@
       // -----------------------------------------------------------------------
 
       var settingsPanel  = document.getElementById('settings-panel')
-      var polarListPanel = document.getElementById('polar-list-panel')
       var perfDisplay    = document.getElementById('perf-display')
       var twsToggle      = document.getElementById('btn-tws-toggle')
       var polarNameEl    = document.getElementById('polar-name-display')
-      var polarListEl    = document.getElementById('polar-list-items')
 
       function updatePerfDisplay() {
-        perfDisplay.textContent = Math.round(perfAdjust * 100) + '%'
+        perfDisplay.textContent = Math.round(performanceFactor * 100) + '%'
       }
 
       function updateTwsToggle() {
@@ -347,14 +324,7 @@
       // Open settings: fetch fresh state first
       document.getElementById('btn-settings').addEventListener('click', function () {
         loadSettings().then(function () {
-          // Update active polar name display
-          if (activePolarId) {
-            fetchJSON(BASE + '/polars/' + activePolarId)
-              .then(function (p) { polarNameEl.textContent = p.name || activePolarId })
-              .catch(function () { polarNameEl.textContent = activePolarId })
-          } else {
-            polarNameEl.textContent = '—'
-          }
+          polarNameEl.textContent = activePolarName || '—'
           settingsPanel.classList.add('open')
         })
       })
@@ -363,25 +333,6 @@
         settingsPanel.classList.remove('open')
       })
 
-      // Performance stepper — ±5%, clamped 50%–200%
-      function applyPerfAdjust(next) {
-        if (next === perfAdjust) return
-        perfAdjust = next
-        updatePerfDisplay()
-        putJSON(BASE + '/settings', { perfAdjust: perfAdjust }).then(function () {
-          libraryVersion = ''   // force full curve reload — perfAdjust changes speeds but not the TWS list
-          return refreshLibrary()
-        }).catch(function () {})
-      }
-
-      document.getElementById('btn-perf-minus').addEventListener('click', function () {
-        applyPerfAdjust(Math.max(0.5, Math.round((perfAdjust - 0.05) * 100) / 100))
-      })
-
-      document.getElementById('btn-perf-plus').addEventListener('click', function () {
-        applyPerfAdjust(Math.min(2.0, Math.round((perfAdjust + 0.05) * 100) / 100))
-      })
-
       // TWS toggle
       twsToggle.addEventListener('click', function () {
         showAllTwsLines = !showAllTwsLines
@@ -390,43 +341,6 @@
         putJSON(BASE + '/settings', { showAllTwsLines: showAllTwsLines }).catch(function () {})
       })
 
-      // Polar picker
-      document.getElementById('btn-polar-current').addEventListener('click', function () {
-        polarListEl.innerHTML = ''
-        fetchJSON(BASE + '/polars').then(function (list) {
-          list.forEach(function (p) {
-            var btn = document.createElement('button')
-            btn.className = 'polar-item' + (p.id === activePolarId ? ' is-active' : '')
-            var nameSpan = document.createElement('span')
-            nameSpan.className = 'polar-item-name'
-            nameSpan.textContent = p.name || p.id
-            btn.appendChild(nameSpan)
-            if (p.id === activePolarId) {
-              var check = document.createElement('span')
-              check.className = 'polar-item-check'
-              check.textContent = '✓'
-              btn.appendChild(check)
-            }
-            btn.addEventListener('click', function () {
-              putJSON(BASE + '/polars/active', { id: p.id })
-                .then(function () {
-                  polarNameEl.textContent = p.name || p.id
-                  polarListPanel.classList.remove('open')
-                  // Force library refresh on next cycle
-                  libraryVersion = ''
-                })
-                .catch(function () {})
-            })
-            polarListEl.appendChild(btn)
-          })
-          polarListPanel.classList.add('open')
-        }).catch(function () {})
-      })
-
-      document.getElementById('btn-back-from-polar').addEventListener('click', function () {
-        polarListPanel.classList.remove('open')
-      })
-
       // -----------------------------------------------------------------------
       // Start
       // -----------------------------------------------------------------------

package/test/lifecycle.test.js

@@ -16,7 +16,12 @@ function makeApp(dataDir) {
     error: () => {},
     setPluginStatus: () => {},
     setPluginError: () => {},
-    savePluginOptions: () => {},
+    savePluginOptions: (_options, callback) => {
+      if (typeof callback !== 'function') {
+        throw new TypeError('callback is not a function')
+      }
+      callback(null)
+    },
     getDataDirPath: () => dataDir,
     handleMessage: () => {},
     config: { port: 3000 },

package/plugin/PolarFileStore.js

@@ -1,133 +0,0 @@
-'use strict'
-
-const fs = require('fs')
-const path = require('path')
-const { PolarTable } = require('./PolarTable')
-
-/**
- * PolarFileStore — manages stored polar resources in the plugin data directory.
- *
- * All file names are bare names (no path, no extension).
- * Files are stored as canonical <name>.json resources in the configured data directory.
- */
-class PolarFileStore {
-  /**
-   * @param {string} dataDir - Absolute path to the directory where polar files are stored.
-   */
-  constructor(dataDir) {
-    this.dataDir = dataDir
-    if (!fs.existsSync(dataDir)) {
-      fs.mkdirSync(dataDir, { recursive: true })
-    }
-  }
-
-  /** Resolves a bare name to its full JSON file path. */
-  _jsonPath(name) {
-    const safe = path.basename(name)
-    return path.join(this.dataDir, `${safe}.json`)
-  }
-
-  /** Checks whether a canonical polar resource exists. */
-  exists(name) {
-    return fs.existsSync(this._jsonPath(name))
-  }
-
-  /**
-   * List all canonical polar resources in the data directory.
-   * @returns {string[]} Array of bare names, sorted alphabetically.
-   */
-  list() {
-    return fs.readdirSync(this.dataDir)
-      .filter(fileName => fileName.endsWith('.json'))
-      .map(fileName => fileName.slice(0, -5))
-      .sort()
-  }
-
-  /**
-   * Read the raw JSON content of a stored canonical polar resource.
-   * @param {string} name - Bare name of the polar.
-   * @returns {string} Raw file content.
-   * @throws {Error} If the file does not exist.
-   */
-  read(name) {
-    const jp = this._jsonPath(name)
-    if (!fs.existsSync(jp)) throw new Error(`Polar not found: ${name}`)
-    return fs.readFileSync(jp, 'utf8')
-  }
-
-  /**
-   * Load a canonical polar resource and return a populated PolarTable.
-   * @param {string} name - Bare name of the polar.
-   * @returns {PolarTable}
-   * @throws {Error} If the file does not exist or is not a canonical resource.
-   */
-  load(name) {
-    const stored = this.readObject(name)
-    if (stored.kind !== 'polarTable') {
-      throw new Error(`Stored polar is not a canonical polarTable resource: ${name}`)
-    }
-    return new PolarTable().loadFromCanonical(stored)
-  }
-
-  /** Reads and parses a stored JSON polar resource. */
-  readObject(name) {
-    const jp = this._jsonPath(name)
-    if (!fs.existsSync(jp)) throw new Error(`Polar not found: ${name}`)
-    return JSON.parse(fs.readFileSync(jp, 'utf8'))
-  }
-
-  /**
-   * Read metadata for a polar.
-   * Reads directly from the stored canonical resource.
-   */
-  readMeta(name) {
-    try {
-      const stored = this.readObject(name)
-      return {
-        ...(stored.name       ? { boatName:   stored.name       } : {}),
-        ...(stored.boatType   ? { boatType:   stored.boatType   } : {}),
-        ...(stored.sailnumber ? { sailnumber: stored.sailnumber } : {}),
-        ...(Number.isInteger(stored.year) ? { year: stored.year } : {}),
-        ...(stored.source     ? { source:     stored.source     } : {}),
-        ...(stored.notes      ? { notes:      stored.notes      } : {}),
-      }
-    } catch (_) { return {} }
-  }
-
-  /**
-   * List all polar files with their stored metadata.
-   * @returns {{ name: string, boatName?: string, boatType?: string, sailnumber?: string }[]}
-   */
-  listWithMeta() {
-    return this.list().map(name => ({ name, ...this.readMeta(name) }))
-  }
-
-  /** Save a canonical polar resource as JSON. */
-  saveCanonical(name, resource) {
-    const stored = { ...resource, id: name, kind: 'polarTable' }
-    fs.writeFileSync(this._jsonPath(name), JSON.stringify(stored, null, 2), 'utf8')
-    return name
-  }
-
-  /**
-   * Copy a stored canonical polar resource to a new name.
-   */
-  copy(srcName, dstName) {
-    const srcJson = this._jsonPath(srcName)
-    if (!fs.existsSync(srcJson)) throw new Error(`Polar not found: ${srcName}`)
-    fs.copyFileSync(srcJson, this._jsonPath(dstName))
-  }
-
-  /**
-   * Delete a stored canonical polar resource.
-   * @param {string} name - Bare name of the polar to delete.
-   * @throws {Error} If the file does not exist.
-   */
-  delete(name) {
-    const jp = this._jsonPath(name)
-    if (!fs.existsSync(jp)) throw new Error(`Polar not found: ${name}`)
-    fs.unlinkSync(jp)
-  }
-}
-
-module.exports = PolarFileStore