signalk-endurance 1.0.0 → 1.0.1

package/README.md

@@ -37,7 +37,7 @@ npm install github:SCarns/signalk-endurance
 Or install a downloaded package with:
 
 ```sh
-npm install /absolute/path/signalk-endurance-1.0.0.tgz
+npm install /absolute/path/signalk-endurance-1.0.1.tgz
 ```
 
 Restart Signal K, enable **Endurance** in **Server → Plugin Config**, then open its
@@ -178,6 +178,13 @@ The server's preferred-source model values are used.
   `electrical.energy.prediction.status`, or enter a custom path. Healthy measured SOC plus
   `deficit` gives informational WATCH; forecast `critical` gives WARNING. Measured
   low SOC takes priority. A missing forecast does not prevent SOC assessment.
+  Forecasts use `resources.energy.predictionStaleSeconds` (default 7200 seconds),
+  independently of measured SOC and battery duration (`staleSeconds`, default 300).
+  Energy Predictor 0.12.3 recalculates every 60 minutes by default (configurable
+  5–60 minutes) and republishes status on each successful cycle, including unchanged
+  values. Two hours allows one delayed cycle while still expiring stopped forecasts.
+  Configure a shorter forecast window if desired. Missing, expired, or invalidly
+  timestamped forecasts leave measured-SOC assessment in control.
 - **Battery duration:** leave `timePath` blank to discover `capacity.timeRemaining`
   for the selected SOC battery bank. For example, selecting
   `electrical.batteries.House.capacity.stateOfCharge` discovers

package/docs/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.1
+
+- Fix forecasts disappearing after five minutes: use an independent configurable
+  `resources.energy.predictionStaleSeconds` window, default two hours, matching
+  Energy Predictor's default hourly refresh with allowance for one delayed cycle.
+- Keep measured SOC and battery duration freshness unchanged, including standalone
+  SOC fallback when the optional forecast is missing or expired.
+
 # Release notes
 
 ## 1.0.0

package/lib/config.js

@@ -1,7 +1,7 @@
 'use strict';
 const {unitSchema,toM3,migrateOptions}=require('./input-units');
 const defaults = {
-  energy: { warning: 0.70, critical: 0.50, staleSeconds: 300 },
+  energy: { warning: 0.70, critical: 0.50, staleSeconds: 300, predictionStaleSeconds: 7200 },
   freshwater: { warning: 0.35, critical: 0.20, staleSeconds: 1200 },
   fuel: { warning: 0.30, critical: 0.20, staleSeconds: 1200 },
   propane: { warning: 0.25, critical: 0.10, staleSeconds: 86400 },
@@ -37,7 +37,7 @@ const schema = {
         warning: ratio('Warning threshold (ratio)', d.warning),
         critical: ratio('Critical threshold (ratio)', d.critical),
         staleSeconds: { type: 'integer', default: d.staleSeconds, minimum: 1, maximum: 604800 },
-        ...(name === 'energy' ? { predictionPath: path('Energy Predictor status path (blank: discover electrical.energy.prediction.status)'), timePath: path('Measured time remaining path in seconds (blank: discover for selected battery bank)') } : {
+        ...(name === 'energy' ? { predictionStaleSeconds: { type: 'integer', title: 'Forecast freshness window (seconds)', description: 'Separate from measured SOC and battery time. Energy Predictor defaults to hourly forecasts; two hours allows one delayed cycle.', default: 7200, minimum: 1, maximum: 604800 }, predictionPath: path('Energy Predictor status path (blank: discover electrical.energy.prediction.status)'), timePath: path('Measured time remaining path in seconds (blank: discover for selected battery bank)') } : {
           tanks: { type: 'array', title: 'Tanks', default: [], maxItems: 64, items: tankSchema },
           ...(name !== 'holding' ? { assessmentMode: { type: 'string', enum: ['combined', 'individual'], default: name === 'freshwater' ? 'combined' : 'individual', title: 'Assess combined supply or each tank individually' } } : {})
         }),
@@ -72,6 +72,7 @@ function normalize(options = {}) {
     for (const k of ['warning', 'critical']) if (typeof r[k] !== 'number' || !Number.isFinite(r[k]) || r[k] < 0 || r[k] > 1) throw Error(`${name}: invalid ${k} ratio`);
     if (name === 'holding' ? r.critical <= r.warning : r.critical >= r.warning) throw Error(`${name}: thresholds are reversed or equal`);
     if (!Number.isInteger(r.staleSeconds) || r.staleSeconds < 1 || r.staleSeconds > 604800) throw Error(`${name}: invalid freshness window`);
+    if (name === 'energy' && (!Number.isInteger(r.predictionStaleSeconds) || r.predictionStaleSeconds < 1 || r.predictionStaleSeconds > 604800)) throw Error('energy: invalid forecast freshness window');
     for (const k of ['levelPath', 'predictionPath', 'timePath', 'volumePath', 'consumptionPath']) if (r[k] !== undefined && !validPath(r[k])) throw Error(`${name}: invalid input path`);
     if (name !== 'energy') {
       r.assessmentMode ??= name === 'freshwater' ? 'combined' : 'individual';

package/lib/resources/energy.js

@@ -4,7 +4,7 @@ const { read, resolveEnergyInputs } = require('../discovery');
 module.exports = (config, app, selection, now) => {
   const r = assessLevel('energy', config, app, selection, now);
   const paths=resolveEnergyInputs(app,config,selection.path);
-  r.prediction = {...read(app, paths.prediction.path, config.staleSeconds, now),selection:paths.prediction.selection};
+  r.prediction = {...read(app, paths.prediction.path, config.predictionStaleSeconds, now),selection:paths.prediction.selection};
   r.duration = {...read(app, paths.duration.path, config.staleSeconds, now),selection:paths.duration.selection};
   if (r.status === 'UNKNOWN') return r;
   if (r.duration.valid && typeof r.duration.value === 'number' && Number.isFinite(r.duration.value) && r.duration.value >= 0) r.time = r.duration.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-endurance",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Standalone vessel resource assessment for Signal K",
   "main": "index.js",
   "license": "MIT",