@mxtommy/kip 4.7.0-beta.9 → 4.8.0-beta.1

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v4.7.0
+## New Features
+* Battery Monitor Widget: Stay on top of your vessel’s power system with a dedicated compact Battery Monitor Widget. Instantly view individual batteries or whole banks, including State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature. Batteries are detected automatically, with Signal K Zones support for clear warning and alarm visibility at a glance.
+## Improvements
+* Faster first-load widget data display so dashboards feel more immediate and alive
+* Smoother dashboard transitions with reduced startup animation on Radial, Linear, Compass, Compact Linear, Windsteer, Racesteer, and Autopilot widgets
+* More robust History API integration using the server-provided HistoryAPI type and improved registration cleanup. Thanks to @tkurki
+* Newly added widgets now open their options automatically, speeding up setup and reducing extra taps
+## Fixes
+* Fixed the plugin-config-data directory location. Fixes #1006
+* Fixed documentation link references
 # v4.6.0
 ## Improvements
 * Built-in Time-Series storage and History-API provider now use the native node:sqlite feature, eliminating binary and external dependencies.

package/README.md

@@ -96,31 +96,34 @@ Organize your dashboards and access tools.
 
 ## Widget Library
 All KIP widgets are visual presentation controls that are very versatile, with multiple advanced configuration options available to suit your needs:
-- **Numeric display**: Create gauges to display any numerical data sent by your system: SOG, depth, wind speed, VMG, refrigerator temperature, weather data, etc.
-- **Text display**: Create gauges to display any textual data sent by your system: MPPT state, vessel details, next waypoint, Fusion radio song information, noon and sun phases, any system component configuration detail or status available, etc.
-- **Label**: A static text widget.
-- **Date display**: A timezone-aware control with flexible presentation formatting support.
-- **Position display**: Position coordinates in textual format.
-- **Zones State Panel**: Monitor the health/state of multiple sensors and devices at a glance. Configure multiple paths per panel; each control uses KIP’s zone severity colors and status messages (driven by Signal K metadata zones) so warnings and alarms stand out immediately.
-- **Boolean Control Panel**: A switchboard to configure and operate remote devices: light switches, bilge pumps, solenoids, or any Signal K path that supports boolean PUT operations.
-- **Slider**: A versatile control that allows users to adjust values within a defined range by sliding. Commonly used for settings like light intensity, volume control, or any parameter requiring fine-tuned adjustments.
-- **Multi State Switch**: Lists all available device/path operating modes/states (e.g., On, Off, Charge Only, Invert Only), highlights the current state, and lets you select a new state to send to the device and see the result.
+- **Numeric**: Create gauges to display any numerical data sent by your system: SOG, depth, wind speed, VMG, refrigerator temperature, weather data, etc.
+- **Text**: Create gauges to display any textual data sent by your system: MPPT state, vessel details, next waypoint, Fusion radio song information, noon and sun phases, any system component configuration detail or status available, etc.
+- **Date & Time**: A timezone-aware control with flexible presentation formatting support.
+- **Position**: Position coordinates in textual format.
 - **Simple Linear gauge**: A visual display for electrical numerical data: chargers, MPPT, shunt, etc.
 - **Linear gauge**: Visually display any numerical data on a vertical or horizontal scale: tank and reservoir levels, battery remaining capacity, etc.
 - **Radial gauge**: Visually display any numerical data on a radial scale: boat speed, wind speed, engine RPM, etc.
 - **Compass gauge**: A card or marine compass to display directional data such as heading, bearing to next waypoint, wind angle, etc.
 - **Radial and linear Steel gauge**: Old-school look & feel gauges.
 - **Level gauge**: Dual-scale heel angle indicator combining a high‑precision ±5° fine level with a wide ±40° coarse arc for fast trim tuning and broader heel / sea‑state monitoring.
-- **Pitch & Roll**: Horizon-style attitude indicator showing live pitch and roll for monitoring trim, heel, and sea-state response.
-- **Wind Steering Display**: Your typical sailboat wind gauge.
-- **Freeboard-SK Chart Plotter**: A high-quality Signal K implementation of the Freeboard integration widget.
+- **Pitch & Roll gauge**: Horizon-style attitude indicator showing live pitch and roll for monitoring trim, heel, and sea-state response.
+- **Battery Monitor**: Stay on top of batteries or whole banks state with a compact view displaying State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature.
+- **Solar Charger**: Track solar generation and charging performance at a glance with live panel output, battery-side metrics, and clear charger and relay status indicators.
+- **Windsteer**: Combines wind, wind sectors, heading, COG, and waypoint info for sailboat wind steering.
+- **Racesteer**: Sailboat race steering display fusing polar performance data with live conditions for optimal tactics.
+- **Countdown Timer**: A simple start sequences timer.
+- **Racer Start Timer**: Advanced race countdown timer with OCS (On Course Side) detection and automatic dashboard switching.
+- **Start Line Insight**: Analyze and visualize the start line for tactical racing advantage, including favored end and distance-to-line.
+- **Boolean Control Panel**: A digital switchboard to configure and operate remote devices: lights, bilge pumps, solenoids, or any Signal K compatible device that supports On/Off operations.
+- **Slider**: A versatile control that allows users to adjust values within a defined range by sliding. Commonly used for settings like light intensity, volume control, or any parameter requiring fine-tuned adjustments.
+- **Multi State Switch**: Lists all available device modes/states (e.g., On, Off, Charge Only, Invert Only), highlights the current state, and lets you select a new state to send to the device and see the result.
+- **Zones State Panel**: Monitor the health/state of multiple sensors and devices at a glance. Configure multiple paths per panel; each control uses KIP’s zone severity colors and status messages so warnings and alarms stand out immediately.
+- **Freeboard-SK Chart Plotter**: High-quality Signal K chartplotter integration widget.
 - **Autopilot Head**: Operate your autopilot from any device remotely.
-- **Data Chart**: Visualize data trends over time.
 - **AIS Radar**: Display AIS targets with range rings, interactive target details, and quick zoom and filtering controls.
-- **Race Timer**: Track regatta start sequences.
-- **Start Line Insight**: Analyze and visualize the start line for tactical racing advantage, including favored end and distance-to-line.
-- **Racer Start Timer**: Advanced race countdown timer with OCS (On Course Side) detection and automatic dashboard switching.
+- **Data Chart**: Visualize data trends over time.
 - **Embedded Webpage**: A powerful way to display web-based apps published on your Signal K server, such as Grafana and Node-RED dashboards, or your own standalone web app.
+- **Label**: A static text widget.
 
 Get the latest version of KIP to see what's new!
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxtommy/kip",
-  "version": "4.7.0-beta.9",
+  "version": "4.8.0-beta.1",
   "description": "An advanced and versatile marine instrumentation package to display Signal K data.",
   "license": "MIT",
   "author": {
@@ -51,84 +51,73 @@
   ],
   "signalk-plugin-enabled-by-default": true,
   "scripts": {
-    "test": "CI=1 ng test --watch=false",
+    "test": "ng test --watch=false",
     "test:plugin": "npm run build:plugin && node --test --test-concurrency=1 kip-plugin/tests/index.test.cjs",
     "test:interactive": "ng test",
-    "test:headless": "CI=1 ng test --browsers=ChromeHeadless --watch=false",
+    "test:headless": "CI=1 ng test --watch=false",
     "lint": "ng lint",
     "dev": "ng serve --configuration=dev --serve-path=/@mxtommy/kip/",
     "build:plugin": "tsc -p ./kip-plugin/tsconfig.plugin.json",
     "build:dev": "ng build --configuration=dev",
     "build:prod": "ng build --configuration=production",
     "build:all": "npm run build:plugin && npm run build:prod",
-    "e2e": "ng e2e",
     "generate:widget": "npx schematics ./tools/schematics/collection.json:create-host2-widget --dry-run=false"
   },
   "schematics": "tools/schematics/collection.json",
   "devDependencies": {
-    "@angular/cdk": "21.2.1",
-    "@angular/common": "21.2.1",
-    "@angular/compiler": "21.2.1",
-    "@angular/core": "21.2.1",
-    "@angular/forms": "21.2.1",
-    "@angular/material": "21.2.1",
-    "@angular/animations": "21.2.1",
-    "@angular/platform-browser": "21.2.1",
-    "@angular/platform-browser-dynamic": "21.2.1",
-    "@angular/router": "21.2.1",
-    "@angular-devkit/build-angular": "^21.2.1",
+    "@angular-devkit/build-angular": "^21.2.3",
     "@angular-devkit/schematics-cli": "^20.1.6",
-    "@angular/build": "^21.2.1",
-    "@angular/cli": "^21.2.1",
-    "@angular/compiler-cli": "21.2.1",
-    "@angular/language-service": "21.2.1",
+    "@angular/animations": "21.2.5",
+    "@angular/build": "^21.2.3",
+    "@angular/cdk": "21.2.3",
+    "@angular/cli": "^21.2.3",
+    "@angular/common": "21.2.5",
+    "@angular/compiler": "21.2.5",
+    "@angular/compiler-cli": "21.2.5",
+    "@angular/core": "21.2.5",
+    "@angular/forms": "21.2.5",
+    "@angular/language-service": "21.2.5",
+    "@angular/material": "21.2.3",
+    "@angular/platform-browser": "21.2.5",
+    "@angular/platform-browser-dynamic": "21.2.5",
+    "@angular/router": "21.2.5",
+    "@aziham/chartjs-plugin-streaming": "^3.5.1",
+    "@godind/ng-canvas-gauges": "^6.2.1",
     "@types/canvas-gauges": "^2.1.8",
     "@types/d3": "^7.4.3",
-    "@types/jasmine": "~3.6.0",
-    "@types/jasminewd2": "^2.0.9",
     "@types/js-quantities": "^1.6.6",
     "@types/lodash-es": "^4.17.9",
     "@types/node": "^24.1.0",
-    "angular-eslint": "21.3.0",
-    "codelyzer": "^6.0.0",
-    "eslint": "^9.29.0",
-    "jasmine-core": "~4.0.1",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "^6.4.4",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-cli": "~2.0.0",
-    "karma-coverage": "^2.2.0",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.6.0",
-    "karma-spec-reporter": "^0.0.36",
-    "ng-packagr": "^21.0.1",
-    "protractor": "~7.0.0",
-    "pwa-asset-generator": "^8.1.1",
-    "sass": "^1.49.9",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.9.3",
-    "@aziham/chartjs-plugin-streaming": "^3.5.1",
-    "@godind/ng-canvas-gauges": "^6.2.1",
+    "@vitest/coverage-v8": "^4.1.0",
     "@zakj/no-sleep": "^0.13.5",
+    "angular-eslint": "21.3.1",
     "chart.js": "^4.5.1",
     "chartjs-adapter-date-fns": "^3.0.0",
     "chartjs-plugin-annotation": "^3.0.1",
     "clipboard": "^2.0.11",
+    "codelyzer": "^6.0.0",
     "compare-versions": "^6.1.1",
     "core-js": "^3.13.1",
     "d3": "^7.9.0",
     "date-fns": "^2.30.0",
+    "eslint": "^9.29.0",
     "gridstack": "^12.3.3",
     "js-quantities": "^1.8.0",
+    "jsdom": "^26.1.0",
     "lodash-es": "^4.17.23",
+    "ng-packagr": "^21.0.1",
     "ngx-markdown": "^21.0.1",
     "prismjs": "^1.30.0",
+    "pwa-asset-generator": "^8.1.1",
     "rxjs": "^7.8.2",
+    "sass": "^1.49.9",
     "screenfull": "^6.0.2",
     "sk-ais-status-plugin": "^1.0.0",
     "steelseries": "^2.0.9",
+    "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "zone.js": "^0.15.1"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.0"
   },
   "dependencies": {
     "@signalk/server-api": "^2.22.0"

package/plugin/history-series.service.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HistorySeriesService = exports.isKipTemplateSeriesDefinition = exports.isKipSeriesEnabled = exports.isKipConcreteSeriesDefinition = void 0;
+exports.HistorySeriesService = exports.isKipTemplateSeriesDefinition = exports.isKipSolarTemplateSeriesDefinition = exports.isKipSeriesEnabled = exports.isKipConcreteSeriesDefinition = exports.isKipBmsTemplateSeriesDefinition = void 0;
 const kip_series_contract_1 = require("./kip-series-contract");
+Object.defineProperty(exports, "isKipBmsTemplateSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipBmsTemplateSeriesDefinition; } });
 Object.defineProperty(exports, "isKipConcreteSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipConcreteSeriesDefinition; } });
 Object.defineProperty(exports, "isKipSeriesEnabled", { enumerable: true, get: function () { return kip_series_contract_1.isKipSeriesEnabled; } });
+Object.defineProperty(exports, "isKipSolarTemplateSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipSolarTemplateSeriesDefinition; } });
 Object.defineProperty(exports, "isKipTemplateSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipTemplateSeriesDefinition; } });
 /**
  * Manages history capture series definitions and serves History API-compatible query results.
@@ -327,6 +329,7 @@ class HistorySeriesService {
             && leftComparable.path === rightComparable.path
             && leftComparable.expansionMode === rightComparable.expansionMode
             && this.areStringArraysEquivalent(leftComparable.allowedBatteryIds, rightComparable.allowedBatteryIds)
+            && this.areStringArraysEquivalent(leftComparable.allowedSolarIds, rightComparable.allowedSolarIds)
             && leftComparable.source === rightComparable.source
             && leftComparable.context === rightComparable.context
             && leftComparable.timeScale === rightComparable.timeScale
@@ -342,6 +345,7 @@ class HistorySeriesService {
         return {
             ...comparable,
             allowedBatteryIds: this.normalizeComparableStringArray(comparable.allowedBatteryIds),
+            allowedSolarIds: this.normalizeComparableStringArray(comparable.allowedSolarIds),
             methods: this.normalizeComparableStringArray(comparable.methods)
         };
     }
@@ -390,10 +394,16 @@ class HistorySeriesService {
         if (expansionMode === 'bms-battery-tree' && ownerWidgetSelector !== 'widget-bms') {
             throw new Error('BMS template series must use ownerWidgetSelector "widget-bms"');
         }
+        if (expansionMode === 'solar-tree' && ownerWidgetSelector !== 'widget-solar-charger') {
+            throw new Error('Solar template series must use ownerWidgetSelector "widget-solar-charger"');
+        }
         const normalizedMethods = this.normalizeComparableStringArray(input.methods);
         const normalizedAllowedBatteryIds = expansionMode === 'bms-battery-tree'
             ? this.normalizeComparableStringArray(input.allowedBatteryIds)
             : undefined;
+        const normalizedAllowedSolarIds = expansionMode === 'solar-tree'
+            ? this.normalizeComparableStringArray(input.allowedSolarIds)
+            : undefined;
         const isDataWidget = this.isChartWidget(ownerWidgetSelector, ownerWidgetUuid);
         const retentionMs = this.resolveRetentionMs(input);
         let sampleTime;
@@ -428,14 +438,26 @@ class HistorySeriesService {
                 ...normalizedBase,
                 ownerWidgetSelector: 'widget-bms',
                 expansionMode,
-                allowedBatteryIds: normalizedAllowedBatteryIds ?? null
+                allowedBatteryIds: normalizedAllowedBatteryIds ?? null,
+                allowedSolarIds: null
+            };
+            return templateSeries;
+        }
+        if (expansionMode === 'solar-tree') {
+            const templateSeries = {
+                ...normalizedBase,
+                ownerWidgetSelector: 'widget-solar-charger',
+                expansionMode,
+                allowedBatteryIds: null,
+                allowedSolarIds: normalizedAllowedSolarIds ?? null
             };
             return templateSeries;
         }
         const concreteSeries = {
             ...normalizedBase,
             expansionMode: null,
-            allowedBatteryIds: null
+            allowedBatteryIds: null,
+            allowedSolarIds: null
         };
         return concreteSeries;
     }

package/plugin/index.js

@@ -88,7 +88,8 @@ const start = (server) => {
         }
     };
     const historySeries = new history_series_service_1.HistorySeriesService(() => Date.now(), typeof server.selfId === 'string' && server.selfId.trim().length > 0 ? `vessels.${server.selfId.trim()}` : null);
-    const storageService = new sqlite_history_storage_service_1.SqliteHistoryStorageService(server.getDataDirPath());
+    // Constructed in plugin.start — server.getDataDirPath() is only available after SK fully initializes
+    let storageService;
     let retentionSweepTimer = null;
     let storageFlushTimer = null;
     let sqliteInitializationPromise = null;
@@ -178,6 +179,30 @@ const start = (server) => {
             .filter(id => /^[a-z0-9_-]+$/i.test(id))
             .sort((left, right) => left.localeCompare(right));
     }
+    function resolveSolarIdsFromSelfPath() {
+        const solarPath = server.getSelfPath('electrical.solar');
+        const readCandidate = (node) => {
+            if (!node || typeof node !== 'object' || Array.isArray(node)) {
+                return null;
+            }
+            const root = node;
+            if (Object.prototype.hasOwnProperty.call(root, 'value')) {
+                const value = root.value;
+                if (value && typeof value === 'object' && !Array.isArray(value)) {
+                    return value;
+                }
+                return null;
+            }
+            return root;
+        };
+        const candidates = readCandidate(solarPath);
+        if (!candidates) {
+            return [];
+        }
+        return Object.keys(candidates)
+            .filter(id => /^[a-z0-9_-]+$/i.test(id))
+            .sort((left, right) => left.localeCompare(right));
+    }
     function getExistingConcreteBmsSeries(templateSeries, existingSeries) {
         return existingSeries
             .filter(series => series.ownerWidgetUuid === templateSeries.ownerWidgetUuid)
@@ -185,6 +210,14 @@ const start = (server) => {
             .filter(series => series.seriesId !== templateSeries.seriesId)
             .map(series => ({ ...series }));
     }
+    function getExistingConcreteSolarSeries(templateSeries, existingSeries) {
+        return existingSeries
+            .filter(series => series.ownerWidgetUuid === templateSeries.ownerWidgetUuid)
+            .filter(history_series_service_1.isKipConcreteSeriesDefinition)
+            .filter(series => series.seriesId !== templateSeries.seriesId)
+            .filter(series => series.path.startsWith('electrical.solar.'))
+            .map(series => ({ ...series }));
+    }
     function mergeSeriesDefinitions(series) {
         const mergedById = new Map();
         series.forEach(item => {
@@ -194,46 +227,90 @@ const start = (server) => {
     }
     function expandTemplateSeriesDefinitions(payload, existingSeries = []) {
         const bmsMetrics = ['capacity.stateOfCharge', 'current'];
+        const solarMetrics = ['current', 'panelPower'];
         const expandedById = new Map();
         const discoveredBatteryIds = resolveBmsBatteryIdsFromSelfPath();
+        const discoveredSolarIds = resolveSolarIdsFromSelfPath();
         payload.forEach(series => {
             if (!(0, history_series_service_1.isKipTemplateSeriesDefinition)(series)) {
                 expandedById.set(series.seriesId, series);
                 return;
             }
-            if (discoveredBatteryIds.length === 0) {
-                getExistingConcreteBmsSeries(series, existingSeries).forEach(existing => {
-                    expandedById.set(existing.seriesId, existing);
+            if ((0, history_series_service_1.isKipBmsTemplateSeriesDefinition)(series)) {
+                if (discoveredBatteryIds.length === 0) {
+                    getExistingConcreteBmsSeries(series, existingSeries).forEach(existing => {
+                        expandedById.set(existing.seriesId, existing);
+                    });
+                    return;
+                }
+                const allowedBatteryIds = Array.isArray(series.allowedBatteryIds)
+                    ? series.allowedBatteryIds
+                        .filter((id) => typeof id === 'string')
+                        .map(id => id.trim())
+                        .filter(id => id.length > 0)
+                    : [];
+                const allowedSet = allowedBatteryIds.length > 0 ? new Set(allowedBatteryIds) : null;
+                const batteryIds = discoveredBatteryIds.filter(id => !allowedSet || allowedSet.has(id));
+                if (batteryIds.length === 0) {
+                    return;
+                }
+                const source = series.source ?? 'default';
+                const sourceKey = slugify(source || 'default') || 'default';
+                batteryIds.forEach(batteryId => {
+                    bmsMetrics.forEach(metric => {
+                        const path = `self.electrical.batteries.${batteryId}.${metric}`;
+                        const seriesId = `${series.ownerWidgetUuid}:bms:${batteryId}:${metric}:${sourceKey}`;
+                        expandedById.set(seriesId, {
+                            ...series,
+                            seriesId,
+                            datasetUuid: `${series.ownerWidgetUuid}:bms:${batteryId}:${metric}:${sourceKey}`,
+                            path,
+                            retentionDurationMs: Number.isFinite(series.retentionDurationMs) ? series.retentionDurationMs : 24 * 60 * 60 * 1000,
+                            expansionMode: null,
+                            allowedBatteryIds: null,
+                            allowedSolarIds: null
+                        });
+                    });
                 });
                 return;
             }
-            const allowedBatteryIds = Array.isArray(series.allowedBatteryIds)
-                ? series.allowedBatteryIds
-                    .filter((id) => typeof id === 'string')
-                    .map(id => id.trim())
-                    .filter(id => id.length > 0)
-                : [];
-            const allowedSet = allowedBatteryIds.length > 0 ? new Set(allowedBatteryIds) : null;
-            const batteryIds = discoveredBatteryIds.filter(id => !allowedSet || allowedSet.has(id));
-            if (batteryIds.length === 0) {
-                return;
-            }
-            const source = series.source ?? 'default';
-            const sourceKey = slugify(source || 'default') || 'default';
-            batteryIds.forEach(batteryId => {
-                bmsMetrics.forEach(metric => {
-                    const path = `self.electrical.batteries.${batteryId}.${metric}`;
-                    const seriesId = `${series.ownerWidgetUuid}:bms:${batteryId}:${metric}:${sourceKey}`;
-                    expandedById.set(seriesId, {
-                        ...series,
-                        seriesId,
-                        datasetUuid: `${series.ownerWidgetUuid}:bms:${batteryId}:${metric}:${sourceKey}`,
-                        path,
-                        retentionDurationMs: Number.isFinite(series.retentionDurationMs) ? series.retentionDurationMs : 24 * 60 * 60 * 1000,
-                        expansionMode: null
+            if ((0, history_series_service_1.isKipSolarTemplateSeriesDefinition)(series)) {
+                if (discoveredSolarIds.length === 0) {
+                    getExistingConcreteSolarSeries(series, existingSeries).forEach(existing => {
+                        expandedById.set(existing.seriesId, existing);
+                    });
+                    return;
+                }
+                const allowedSolarIds = Array.isArray(series.allowedSolarIds)
+                    ? series.allowedSolarIds
+                        .filter((id) => typeof id === 'string')
+                        .map(id => id.trim())
+                        .filter(id => id.length > 0)
+                    : [];
+                const allowedSet = allowedSolarIds.length > 0 ? new Set(allowedSolarIds) : null;
+                const chargerIds = discoveredSolarIds.filter(id => !allowedSet || allowedSet.has(id));
+                if (chargerIds.length === 0) {
+                    return;
+                }
+                const source = series.source ?? 'default';
+                const sourceKey = slugify(source || 'default') || 'default';
+                chargerIds.forEach(chargerId => {
+                    solarMetrics.forEach(metric => {
+                        const path = `self.electrical.solar.${chargerId}.${metric}`;
+                        const seriesId = `${series.ownerWidgetUuid}:solar:${chargerId}:${metric}:${sourceKey}`;
+                        expandedById.set(seriesId, {
+                            ...series,
+                            seriesId,
+                            datasetUuid: `${series.ownerWidgetUuid}:solar:${chargerId}:${metric}:${sourceKey}`,
+                            path,
+                            retentionDurationMs: Number.isFinite(series.retentionDurationMs) ? series.retentionDurationMs : 24 * 60 * 60 * 1000,
+                            expansionMode: null,
+                            allowedBatteryIds: null,
+                            allowedSolarIds: null
+                        });
                     });
                 });
-            });
+            }
         });
         return Array.from(expandedById.values());
     }
@@ -682,6 +759,7 @@ const start = (server) => {
         description: 'KIP server plugin',
         start: async (settings) => {
             server.debug('[KIP][LIFECYCLE] start');
+            storageService = new sqlite_history_storage_service_1.SqliteHistoryStorageService(server.getDataDirPath());
             modeConfig = resolveHistoryModeConfig(settings);
             // Overwrite runtime-detected properties in modeConfig
             modeConfig.nodeSqliteAvailable = await detectSqliteRuntime();
@@ -1151,20 +1229,28 @@ const start = (server) => {
                         ...series
                     }));
                     const isBatteryDiscoveryUnavailable = resolveBmsBatteryIdsFromSelfPath().length === 0;
-                    const preservedBmsSeries = isBatteryDiscoveryUnavailable
-                        ? scopedPayload
-                            .filter(history_series_service_1.isKipTemplateSeriesDefinition)
-                            .flatMap(series => currentSeries.filter(current => current.ownerWidgetUuid === series.ownerWidgetUuid && (0, history_series_service_1.isKipConcreteSeriesDefinition)(current) && current.seriesId !== series.seriesId))
-                        : [];
+                    const isSolarDiscoveryUnavailable = resolveSolarIdsFromSelfPath().length === 0;
+                    const preservedTemplateConcreteSeries = scopedPayload
+                        .filter(history_series_service_1.isKipTemplateSeriesDefinition)
+                        .flatMap(series => {
+                        if ((0, history_series_service_1.isKipBmsTemplateSeriesDefinition)(series) && isBatteryDiscoveryUnavailable) {
+                            return getExistingConcreteBmsSeries(series, currentSeries);
+                        }
+                        if ((0, history_series_service_1.isKipSolarTemplateSeriesDefinition)(series) && isSolarDiscoveryUnavailable) {
+                            return getExistingConcreteSolarSeries(series, currentSeries);
+                        }
+                        return [];
+                    });
                     const expandedPayload = mergeSeriesDefinitions([
                         ...expandTemplateSeriesDefinitions(scopedPayload, currentSeries),
-                        ...preservedBmsSeries
+                        ...preservedTemplateConcreteSeries
                     ]);
                     const result = simulated.reconcileSeries(expandedPayload);
                     const nextSeries = simulated.listSeries();
                     await storageService.replaceSeriesDefinitions(nextSeries);
-                    const seriesOutsideScope = historySeries.listSeries();
-                    historySeries.reconcileSeries([...seriesOutsideScope, ...nextSeries]);
+                    // /series/reconcile expects the full desired set for KIP-managed series.
+                    // Keep in-memory state aligned with persisted state to avoid reintroducing stale series.
+                    historySeries.reconcileSeries(nextSeries);
                     server.debug(`[KIP][SERIES_RECONCILE] created=${result.created} updated=${result.updated} deleted=${result.deleted} total=${result.total}`);
                     rebuildSeriesCaptureSubscriptions();
                     return sendOk(res, result);

package/plugin/kip-series-contract.js

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isKipTemplateSeriesDefinition = isKipTemplateSeriesDefinition;
+exports.isKipBmsTemplateSeriesDefinition = isKipBmsTemplateSeriesDefinition;
+exports.isKipSolarTemplateSeriesDefinition = isKipSolarTemplateSeriesDefinition;
 exports.isKipConcreteSeriesDefinition = isKipConcreteSeriesDefinition;
 exports.isKipSeriesEnabled = isKipSeriesEnabled;
 function isKipTemplateSeriesDefinition(series) {
+    return series.expansionMode === 'bms-battery-tree' || series.expansionMode === 'solar-tree';
+}
+function isKipBmsTemplateSeriesDefinition(series) {
     return series.expansionMode === 'bms-battery-tree';
 }
+function isKipSolarTemplateSeriesDefinition(series) {
+    return series.expansionMode === 'solar-tree';
+}
 function isKipConcreteSeriesDefinition(series) {
     return series.expansionMode == null;
 }

package/plugin/openApi.json

@@ -224,6 +224,14 @@
                                     "type": "string"
                                 },
                                 "description": "Concrete series do not use battery filters and should leave this null."
+                            },
+                            "allowedSolarIds": {
+                                "type": "array",
+                                "nullable": true,
+                                "items": {
+                                    "type": "string"
+                                },
+                                "description": "Concrete series do not use solar charger filters and should leave this null."
                             }
                         }
                     }
@@ -240,13 +248,15 @@
                             "ownerWidgetSelector": {
                                 "type": "string",
                                 "enum": [
-                                    "widget-bms"
+                                    "widget-bms",
+                                    "widget-solar-charger"
                                 ]
                             },
                             "expansionMode": {
                                 "type": "string",
                                 "enum": [
-                                    "bms-battery-tree"
+                                    "bms-battery-tree",
+                                    "solar-tree"
                                 ]
                             },
                             "allowedBatteryIds": {
@@ -255,6 +265,13 @@
                                 "items": {
                                     "type": "string"
                                 }
+                            },
+                            "allowedSolarIds": {
+                                "type": "array",
+                                "nullable": true,
+                                "items": {
+                                    "type": "string"
+                                }
                             }
                         },
                         "required": [

package/public/3rdpartylicenses.txt

@@ -1061,32 +1061,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
---------------------------------------------------------------------------------
-Package: zone.js
-License: "MIT"
-
-The MIT License
-
-Copyright (c) 2010-2025 Google LLC. https://angular.dev/license
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
 --------------------------------------------------------------------------------
 Package: prismjs
 License: "MIT"

package/public/assets/help-docs/dashboards.md

@@ -81,6 +81,8 @@ KIP widgets turn Signal K data into readable visuals and controls. Available wid
 - **Classic Steel** – Traditional steel-look linear & radial gauges with range sizes and zone highlights.
 - **Windsteer** – Combines wind, wind sectors, heading, COG, and waypoint info for wind steering.
 - **Wind Trends** – Real-time True Wind trends with dual axes for direction and speed, live values, and averages.
+- **Battery Monitor** - Display batteries or whole banks state State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature.
+- **Solar Charger**- Track solar generation and charging performance at a glance with live panel output, battery-side metrics, and clear charger and relay status indicators.
 - **Freeboard-SK** – Adds the Freeboard-SK chart plotter as a widget with automatic sign-in.
 - **Autopilot Head** – Typical autopilot controls for compatible Signal K Autopilot devices.
 - **Realtime Data Chart** – Visualizes data on a real-time chart with actuals, averages, and min/max.

package/public/assets/svg/icons.svg

@@ -348,6 +348,18 @@
     <svg id="power_renewal" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
         <path fill="currentColor" d="M4.06445 13C4.55672 16.9461 7.92051 20 12 20c2.3364 -0.0002 4.4372 -1.0031 5.8994 -2.6006L15.5 15h6v6l-2.1855 -2.1855C17.4894 20.7734 14.8887 21.9998 12 22c-5.18532 0 -9.44843 -3.9467 -9.9502 -9zM12.5 10H16l-4.5 9v-5H8l4.5 -9zM12 2c5.1851 0.00028 9.4485 3.94685 9.9502 9h-2.0147C19.4434 7.05399 16.0793 4.00027 12 4 9.66354 4 7.56264 5.00292 6.10059 6.60059L8.5 9h-6V3l2.18457 2.18457C6.50965 3.22563 9.11128 2 12 2" stroke-width="1"></path>
     </svg>
+    <svg id="solar_charger" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24">
+      <path fill="currentColor" stroke="currentColor" stroke-width="1" d="M7.666666666666667 2a3.8333333333333335 3.8333333333333335 0 0 0 7.666666666666667 0z"></path>
+      <path stroke="currentColor" d="M3.8333333333333335 2.875h0.9583333333333334" stroke-width="1.5"></path>
+      <path stroke="currentColor" d="M18.208333333333336 2.875h0.9583333333333334" stroke-width="1.5"></path>
+      <path stroke="currentColor" d="M11.5 8.625v0.9583333333333334" stroke-width="1.5"></path>
+      <path stroke="currentColor" d="m16.483333333333334 6.9 0.6775416666666667 0.6775416666666667" stroke-width="1.5"></path>
+      <path stroke="currentColor" d="m6.516666666666667 6.9 -0.6708333333333333 0.6708333333333333" stroke-width="1.5"></path>
+      <path fill="var(--mat-sys-primary)" fill-opacity="0.5" stroke="var(--mat-sys-primary)" stroke-opacity="1" d="M4.1016666666666675 20.125h14.796666666666667a0.9583333333333334 0.9583333333333334 0 0 0 0.9295833333333333 -1.1912083333333334l-1.4375 -5.75a0.9583333333333334 0.9583333333333334 0 0 0 -0.9295833333333333 -0.7254583333333333H5.5391666666666675a0.9583333333333334 0.9583333333333334 0 0 0 -0.9295833333333333 0.7254583333333333l-1.4375 5.75A0.9583333333333334 0.9583333333333334 0 0 0 4.1016666666666675 20.125z" stroke-width="1"></path>
+      <path stroke="var(--mat-sys-primary)" stroke-width="1" d="M3.8333333333333335 16.291666666666668h15.333333333333334"></path>
+      <path stroke="var(--mat-sys-primary)" stroke-width="1" d="m9.583333333333334 12.458333333333334 -0.9583333333333334 7.666666666666667"></path>
+      <path stroke="var(--mat-sys-primary)" stroke-width="1" d="m13.416666666666668 12.458333333333334 0.9583333333333334 7.666666666666667"></path>
+    </svg>
     <svg id="dashboard-beating-starboard" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
       <g id="g9" transform="matrix(-0.70710678,0.70710678,0.70710678,0.70710678,8.8211956,-6.2237242)">
         <path d="M 12,5.9999999 C 16,9.777778 17.777778,15.444445 16,23 H 8.0000001 C 6.2222223,15.444445 8.0000001,9.777778 12,5.9999999 Z" fill="var(--mat-sys-tertiary)" id="path1" style="stroke-width:0.229061" />