signalk-siparu 0.2.14 → 0.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-siparu",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Kept aboard, proven ashore. Position, wind, depth and voyage history, recorded on the boat and readable from anywhere: sealed to the devices you name, signed on the way out. A read-only Signal K plugin with a built-in dashboard.",
   "keywords": [
     "signalk-node-server-plugin",

package/plugin/dist/live.d.ts

@@ -2,6 +2,7 @@ import type { RemoteLink } from './remotelink';
 import type { PathSeriesResult, SnapshotsQuery, SnapshotsResult, TrackResult, VoyageListResult, PhaseListResult, RollupsResult, VoyageStatsResult, FuelPathsView, AisFeed, HealthResult } from './contract';
 export declare const FRAME_EVERY_MS = 2000;
 export declare const STILL_FRAME_EVERY_MS = 60000;
+export declare const PROMPTED_FRAME_FLOOR_MS = 5000;
 export declare const REPORTING_STALE_MS: number;
 export declare const PING_EVERY_MS = 25000;
 export interface LiveSocket {
@@ -87,6 +88,7 @@ export declare class LiveUplink {
     private kill;
     private dispatch;
     private openSealedAsk;
+    private greet;
     private sendFrame;
     private scheduleFrame;
     private wayStreak;

package/plugin/dist/live.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiveUplink = exports.PING_EVERY_MS = exports.REPORTING_STALE_MS = exports.STILL_FRAME_EVERY_MS = exports.FRAME_EVERY_MS = void 0;
+exports.LiveUplink = exports.PING_EVERY_MS = exports.REPORTING_STALE_MS = exports.PROMPTED_FRAME_FLOOR_MS = exports.STILL_FRAME_EVERY_MS = exports.FRAME_EVERY_MS = void 0;
 exports.rpcEnvelope = rpcEnvelope;
 exports.isWatchingNote = isWatchingNote;
 exports.FRAME_EVERY_MS = 2_000;
 exports.STILL_FRAME_EVERY_MS = 60_000;
+exports.PROMPTED_FRAME_FLOOR_MS = 5_000;
 exports.REPORTING_STALE_MS = exports.STILL_FRAME_EVERY_MS * 3;
 const UNDERWAY_SOG_MS = 0.3 * 0.514444;
 const CLEARLY_UNDERWAY_SOG_MS = 1.5 * 0.514444;
@@ -140,6 +141,7 @@ class LiveUplink {
             }
             if (isWatchingNote(data)) {
                 this.deps.onWatching?.();
+                this.greet(gen);
                 return;
             }
             const opened = this.openSealedAsk(data);
@@ -207,6 +209,12 @@ class LiveUplink {
         }
         return open(envelope);
     }
+    greet(gen) {
+        if (this.lastFrameTs !== null && Date.now() - this.lastFrameTs < exports.PROMPTED_FRAME_FLOOR_MS) {
+            return;
+        }
+        this.sendFrame(gen);
+    }
     sendFrame(gen) {
         if (gen !== this.gen || !this.sock)
             return;

package/plugin/dist/metrics.d.ts

@@ -1,7 +1,7 @@
 import { MetricField, Snapshot } from './contract';
 import { Options } from './config';
 export declare const SUBSCRIBED_PATHS: string[];
-export declare const DYNAMIC_PREFIXES: readonly ["propulsion.", "tanks.", "electrical.generators."];
+export declare const DYNAMIC_PREFIXES: readonly ["propulsion.", "tanks.", "electrical.ac.", "electrical.alternators.", "electrical.batteries.", "electrical.chargers.", "electrical.generators.", "electrical.inverters.", "electrical.solar."];
 export interface Diagnosis {
     code: 'ok' | 'instruments-off' | 'energy-only' | 'no-data';
     message: string;
@@ -22,6 +22,7 @@ export declare class MetricsState {
     private conceptNumeric;
     snapshot(now: number, flushGust: boolean, freshnessMs?: number): Snapshot;
     private dynamicPathCount;
+    private evictFiller;
     dynamicPaths(now: number): Record<string, number | string>;
     dynamicPathAges(now: number): Record<string, number>;
     coreFieldAges(now: number): Partial<Record<MetricField, number>>;

package/plugin/dist/metrics.js

@@ -34,10 +34,20 @@ exports.SUBSCRIBED_PATHS = [
     ...DEPTH_PATHS,
     ...Object.keys(DIRECT_PATHS)
 ];
-exports.DYNAMIC_PREFIXES = ['propulsion.', 'tanks.', 'electrical.generators.'];
+exports.DYNAMIC_PREFIXES = [
+    'propulsion.',
+    'tanks.',
+    'electrical.ac.',
+    'electrical.alternators.',
+    'electrical.batteries.',
+    'electrical.chargers.',
+    'electrical.generators.',
+    'electrical.inverters.',
+    'electrical.solar.'
+];
 const CORE_PATH_SET = new Set(exports.SUBSCRIBED_PATHS);
 const TEXT_MAX = 32;
-const MAX_DYNAMIC_PATHS = 64;
+const MAX_DYNAMIC_PATHS = 128;
 const PATH_MAX_LEN = 128;
 const PATH_RE = /^[A-Za-z][A-Za-z0-9]*(\.[A-Za-z0-9_-]+)+$/;
 function isDynamicPath(path) {
@@ -46,6 +56,41 @@ function isDynamicPath(path) {
         PATH_RE.test(path) &&
         exports.DYNAMIC_PREFIXES.some((p) => path.startsWith(p)));
 }
+const PRIORITY_LEAVES = new Set([
+    'revolutions',
+    'temperature',
+    'oilPressure',
+    'runTime',
+    'fuel.rate',
+    'alternatorVoltage',
+    'engineLoad',
+    'exhaustTemperature',
+    'state',
+    'voltage',
+    'current',
+    'frequency',
+    'power',
+    'realPower',
+    'lineNeutralVoltage',
+    'lineLineVoltage',
+    'acin.voltage',
+    'acin.current',
+    'currentLevel',
+    'capacity',
+    'capacity.stateOfCharge',
+    'capacity.timeRemaining',
+    'chargingMode',
+    'controllerMode',
+    'inverterMode',
+    'panelPower',
+    'yieldToday'
+]);
+function isPriorityPath(path) {
+    const seg = path.split('.');
+    if (PRIORITY_LEAVES.has(seg[seg.length - 1]))
+        return true;
+    return seg.length >= 2 && PRIORITY_LEAVES.has(`${seg[seg.length - 2]}.${seg[seg.length - 1]}`);
+}
 const STRING_FIELDS = new Set(['nav_state', 'ais_class']);
 const TWS_SET = new Set(TWS_PATHS);
 class MetricsState {
@@ -82,8 +127,10 @@ class MetricsState {
                     stored = value.slice(0, TEXT_MAX);
                 else
                     return false;
-                if (!this.paths.has(path) && this.dynamicPathCount() >= MAX_DYNAMIC_PATHS)
-                    return false;
+                if (!this.paths.has(path) && this.dynamicPathCount() >= MAX_DYNAMIC_PATHS) {
+                    if (!isPriorityPath(path) || !this.evictFiller())
+                        return false;
+                }
             }
             else {
                 if (typeof value !== 'number' || !Number.isFinite(value))
@@ -230,6 +277,25 @@ class MetricsState {
                 n++;
         return n;
     }
+    evictFiller() {
+        let victim = null;
+        let victimTs = Infinity;
+        for (const [path, bySource] of this.paths) {
+            if (!isDynamicPath(path) || isPriorityPath(path))
+                continue;
+            let last = 0;
+            for (const entry of bySource.values())
+                last = Math.max(last, entry.ts);
+            if (last < victimTs) {
+                victimTs = last;
+                victim = path;
+            }
+        }
+        if (victim === null)
+            return false;
+        this.paths.delete(victim);
+        return true;
+    }
     dynamicPaths(now) {
         const out = {};
         for (const path of this.paths.keys()) {