@enyo-energy/sunspec-sdk 0.0.71 → 0.0.73

package/dist/cjs/sunspec-devices.cjs

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SunspecMeter = exports.SunspecBattery = exports.SunspecInverter = exports.BaseSunspecDevice = void 0;
+exports.detectFeaturesFromRegisters = detectFeaturesFromRegisters;
+exports.filterFeaturesByCalibrationResult = filterFeaturesByCalibrationResult;
 const sunspec_interfaces_js_1 = require("./sunspec-interfaces.cjs");
 const node_crypto_1 = require("node:crypto");
 const enyo_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js");
 const connection_retry_manager_js_1 = require("./connection-retry-manager.cjs");
 const enyo_data_bus_value_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js");
-const calibration_snapshot_service_js_1 = require("./calibration-snapshot-service.cjs");
+const appliance_calibration_1 = require("@enyo-energy/appliance-calibration");
+const sunspec_calibration_storage_js_1 = require("./sunspec-calibration-storage.cjs");
+const sunspec_battery_calibration_driver_js_1 = require("./sunspec-battery-calibration-driver.cjs");
+const sunspec_battery_schedule_handler_js_1 = require("./sunspec-battery-schedule-handler.cjs");
+const sunspec_battery_feature_calibrator_js_1 = require("./sunspec-battery-feature-calibrator.cjs");
 const enyo_source_enum_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-source.enum.js");
 const enyo_meter_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-meter-appliance.js");
 const enyo_battery_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-battery-appliance.js");
@@ -100,7 +106,13 @@ class BaseSunspecDevice {
     dataBus;
     retryManager;
     consecutiveReconnectFailures = 0;
-    calibrationService;
+    /**
+     * Prefix used when persisting calibration snapshots via the library's
+     * {@link SnapshotService}. Kept identical to the key the SDK used before
+     * the migration to `@enyo-energy/appliance-calibration` so existing
+     * snapshots stored by older builds are still picked up on startup.
+     */
+    static CALIBRATION_SNAPSHOT_KEY_PREFIX = "sunspec-calibration-snapshot-";
     constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, retryConfig, appliance, useTls) {
         this.energyApp = energyApp;
         this.name = name;
@@ -255,25 +267,18 @@ class BaseSunspecDevice {
         this.dataBus.sendMessage([ackMessage]);
     }
     /**
-     * Lazily construct and initialize the per-appliance CalibrationSnapshotService. Reloads
-     * any persisted snapshot from storage so an in-flight calibration survives restarts.
-     * Idempotent — subsequent calls are no-ops once the service exists.
+     * Build a typed {@link SnapshotService} bound to this appliance's calibration storage,
+     * using the legacy SDK storage key prefix so prior installs upgrade seamlessly. Returns
+     * undefined if the appliance has not been registered yet.
      */
-    async initCalibrationService(deviceType) {
-        if (this.calibrationService || !this.applianceId) {
-            return;
+    buildSnapshotService(onRestore) {
+        if (!this.applianceId) {
+            return undefined;
         }
-        this.calibrationService = new calibration_snapshot_service_js_1.CalibrationSnapshotService(this.energyApp.useStorage(), this.applianceId, (snapshot, reason) => this.restoreFromCalibrationSnapshot(snapshot, reason));
-        await this.calibrationService.initialize();
-        console.log(`${this.constructor.name} ${this.applianceId}: calibration service initialized (${deviceType})`);
-    }
-    /**
-     * Subclasses implement how to write the modified fields of a snapshot back to the device.
-     * Called both on explicit StopCalibrationV1 and when the 5-minute auto-stop fires.
-     */
-    async restoreFromCalibrationSnapshot(_snapshot, _reason) {
-        // Default: subclasses override. Base implementation is a no-op so meter and other
-        // non-controllable devices don't need to implement it.
+        const storage = new sunspec_calibration_storage_js_1.SunspecCalibrationStorage(this.energyApp.useStorage());
+        return new appliance_calibration_1.SnapshotService(storage, this.applianceId, onRestore, {
+            storageKeyPrefix: BaseSunspecDevice.CALIBRATION_SNAPSHOT_KEY_PREFIX,
+        });
     }
 }
 exports.BaseSunspecDevice = BaseSunspecDevice;
@@ -286,6 +291,7 @@ class SunspecInverter extends BaseSunspecDevice {
     static CONNECTION_FAULT_THRESHOLD = 3;
     storage;
     errorState = { activeCodes: [], lastStatus: 'healthy' };
+    snapshotService;
     constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance, useTls) {
         super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance, useTls);
         this.capabilities = capabilities;
@@ -698,10 +704,10 @@ class SunspecInverter extends BaseSunspecDevice {
         if (this.dataBusListenerId) {
             return;
         }
-        // Fire and forget — calibration service hydration must not block listening setup.
+        // Fire and forget — snapshot service hydration must not block listener setup.
         // Listener registration before await ensures we don't miss messages that arrive
-        // during initial load.
-        void this.initCalibrationService('inverter');
+        // during the initial load.
+        void this.initSnapshotService();
         this.dataBus = this.energyApp.useDataBus();
         this.dataBusListenerId = this.dataBus.listenForMessages([
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetInverterFeedInLimitV1,
@@ -762,22 +768,39 @@ class SunspecInverter extends BaseSunspecDevice {
         }
         // setFeedInLimit writes WMaxLimPct + WMaxLim_Ena (see SunspecModbusClient.setFeedInLimit).
         // Record both so an active calibration can roll them back on stop.
-        await this.calibrationService?.recordModification(['WMaxLimPct', 'WMaxLim_Ena']);
+        await this.snapshotService?.recordModification(['WMaxLimPct', 'WMaxLim_Ena']);
         this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
+    /**
+     * Lazily construct the per-appliance {@link SnapshotService}. Reloads any
+     * persisted snapshot from storage so an in-flight calibration survives
+     * process restarts. Idempotent.
+     */
+    async initSnapshotService() {
+        if (this.snapshotService) {
+            return;
+        }
+        const service = this.buildSnapshotService((snapshot, reason) => this.restoreInverterSnapshot(snapshot, reason));
+        if (!service) {
+            return;
+        }
+        this.snapshotService = service;
+        await this.snapshotService.initialize();
+        console.log(`Inverter ${this.applianceId}: snapshot service initialized`);
+    }
     async handleStartCalibration(msg) {
         if (!this.isConnected() || !this.applianceId) {
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
             return;
         }
-        if (!this.calibrationService) {
-            await this.initCalibrationService('inverter');
+        if (!this.snapshotService) {
+            await this.initSnapshotService();
         }
-        if (!this.calibrationService) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Calibration service unavailable');
+        if (!this.snapshotService) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Snapshot service unavailable');
             return;
         }
-        if (this.calibrationService.isCalibrating()) {
+        if (this.snapshotService.isCalibrating()) {
             console.log(`Inverter ${this.applianceId}: calibration already active — ack idempotently`);
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
             return;
@@ -789,11 +812,7 @@ class SunspecInverter extends BaseSunspecDevice {
             return;
         }
         try {
-            await this.calibrationService.startCalibration({
-                deviceType: 'inverter',
-                unitId: this.unitId,
-                inverterControls: controls,
-            });
+            await this.snapshotService.startCalibration(controls);
         }
         catch (error) {
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to persist snapshot: ${error}`);
@@ -807,30 +826,23 @@ class SunspecInverter extends BaseSunspecDevice {
             return;
         }
         console.log(`Inverter ${this.applianceId}: handling StopCalibrationV1`);
-        const snapshot = await this.calibrationService?.stopCalibration();
-        if (!snapshot) {
-            // No active calibration — treat as a no-op success.
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-            return;
-        }
-        try {
-            await this.restoreFromCalibrationSnapshot(snapshot, 'stop');
-        }
-        catch (error) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to restore registers: ${error}`);
-            return;
-        }
+        // SnapshotService.stopCalibration fires `restoreInverterSnapshot` internally with
+        // reason="stop" before returning. Any restore failure is logged by the callback
+        // (the persisted snapshot is already gone by then — see library notes) so we
+        // always ack Accepted from here.
+        await this.snapshotService?.stopCalibration();
         this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
-    async restoreFromCalibrationSnapshot(snapshot, reason) {
-        if (snapshot.deviceType !== 'inverter' || !snapshot.inverterControls) {
-            return;
-        }
-        const source = snapshot.inverterControls;
+    /**
+     * `onRestore` callback for the inverter's {@link SnapshotService}. Writes only the
+     * subset of writable inverter fields that other commands actually touched during the
+     * calibration. Catches and logs failures rather than throwing — the snapshot has
+     * already been removed from storage by the time this runs, so a throw is unrecoverable
+     * and is best logged for operator action.
+     */
+    async restoreInverterSnapshot(snapshot, reason) {
+        const source = snapshot.payload;
         const partial = {};
-        // Whitelist of inverter fields that writeInverterControls actually writes (Model 123).
-        // Iterating a typed const list keeps the projection type-safe and bounds the rollback
-        // to fields the SDK knows how to restore.
         const WRITABLE_INVERTER_FIELDS = ['Conn', 'WMaxLimPct', 'WMaxLim_Ena', 'OutPFSet', 'OutPFSet_Ena'];
         for (const field of WRITABLE_INVERTER_FIELDS) {
             if (snapshot.modifiedFields.includes(field) && source[field] !== undefined) {
@@ -842,22 +854,175 @@ class SunspecInverter extends BaseSunspecDevice {
             return;
         }
         console.log(`Inverter ${this.applianceId}: calibration ${reason} — restoring [${Object.keys(partial).join(', ')}]`);
-        const ok = await this.sunspecClient.writeInverterControls(snapshot.unitId, partial);
-        if (!ok) {
-            throw new Error('writeInverterControls returned false');
+        try {
+            const ok = await this.sunspecClient.writeInverterControls(this.unitId, partial);
+            if (!ok) {
+                console.error(`Inverter ${this.applianceId}: calibration ${reason} — writeInverterControls returned false`);
+            }
+        }
+        catch (error) {
+            console.error(`Inverter ${this.applianceId}: calibration ${reason} — writeInverterControls threw: ${error}`);
         }
     }
 }
 exports.SunspecInverter = SunspecInverter;
+/**
+ * Pure register-presence detection — exported so it can be unit-tested
+ * without the full `SunspecBattery` scaffold. Maps each Model 124 writable
+ * register to the `EnyoBatteryFeature` it represents:
+ *
+ * - `chaGriSet`  → `GridCharging` (charge source PV/GRID)
+ * - `wChaMax`    → `ChargeLimitation` (max charge power)
+ * - `outWRte`    → `DischargeLimitation` (discharge rate %)
+ * - `storCtlMod` → `GridDischarging` (closest signal that external discharge
+ *                  control is available; the inverter decides where it goes)
+ */
+function detectFeaturesFromRegisters(batteryData) {
+    const features = [];
+    if (batteryData?.chaGriSet !== undefined)
+        features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.GridCharging);
+    if (batteryData?.wChaMax !== undefined)
+        features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.ChargeLimitation);
+    if (batteryData?.outWRte !== undefined)
+        features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.DischargeLimitation);
+    if (batteryData?.storCtlMod !== undefined)
+        features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.GridDischarging);
+    return features;
+}
+/**
+ * Apply the per-feature calibration filter to a register-detected set.
+ * Exported for unit-test access to the legacy-result fallback branch.
+ *
+ * The contract:
+ * - No `result` or `result.state !== 'calibrated'` → strip every controllable
+ *   feature (safe fallback while waiting for calibration).
+ * - `result.state === 'calibrated'` with a decodable per-feature payload →
+ *   publish only the controllable features whose probes passed.
+ * - `result.state === 'calibrated'` with **no** decodable payload → legacy
+ *   data (pre-feature-calibrator SDK). The new calibrator only marks
+ *   `state=calibrated` when at least one probe passes, so an empty decoded
+ *   set with `state=calibrated` unambiguously signals legacy results. Publish
+ *   the full detected set to preserve the old all-or-nothing semantics on
+ *   upgrade.
+ */
+function filterFeaturesByCalibrationResult(detected, result, controllable) {
+    if (!result || result.state !== 'calibrated') {
+        return detected.filter(f => !controllable.includes(f));
+    }
+    const passed = (0, sunspec_battery_feature_calibrator_js_1.decodeFeatureResults)(result.notes);
+    if (passed.size === 0)
+        return detected;
+    return detected.filter(f => !controllable.includes(f) || passed.has(f));
+}
 /**
  * Sunspec Battery implementation
  */
 class SunspecBattery extends BaseSunspecDevice {
+    featureMode;
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance, useTls) {
+    snapshotService;
+    calibrationDriver;
+    batteryCalibrator;
+    calibrationResultStore;
+    scheduleHandler;
+    /**
+     * Battery features that imply outbound control writes from the host action-taker.
+     * These are stripped from `appliance.battery.features` until the calibration result
+     * store says this battery has been successfully calibrated — see
+     * {@link computeAdvertisedFeatures}.
+     */
+    static CONTROLLABLE_FEATURES = [
+        enyo_battery_appliance_js_1.EnyoBatteryFeature.GridCharging,
+        enyo_battery_appliance_js_1.EnyoBatteryFeature.GridDischarging,
+        enyo_battery_appliance_js_1.EnyoBatteryFeature.ChargeLimitation,
+        enyo_battery_appliance_js_1.EnyoBatteryFeature.DischargeLimitation,
+    ];
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, featureMode, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance, useTls) {
         super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance, useTls);
+        this.featureMode = featureMode;
         this.capabilities = capabilities;
     }
+    /**
+     * Wire the battery into `@enyo-energy/appliance-calibration`'s
+     * `BatteryCalibrator` test-charge flow. Call once after {@link connect}.
+     *
+     * Consumers own the `CalibrationResultStore` (shared across appliances so
+     * the persisted result map doesn't get clobbered) and the
+     * `CalibrationTrigger` that drives `runCalibration()` on whatever schedule
+     * makes sense for the host. Pass overrides for the calibrator's defaults
+     * (`testPowerW`, response thresholds, etc.) via `opts.config`.
+     */
+    configureCalibration(opts) {
+        if (this.featureMode.kind !== sunspec_interfaces_js_1.SunspecBatteryFeatureModeKind.CalibrationBased) {
+            throw new Error(`SunspecBattery.configureCalibration: featureMode is '${this.featureMode.kind}', ` +
+                `but calibration is only valid in '${sunspec_interfaces_js_1.SunspecBatteryFeatureModeKind.CalibrationBased}' mode. ` +
+                `Pass { kind: SunspecBatteryFeatureModeKind.CalibrationBased } to the constructor.`);
+        }
+        if (this.batteryCalibrator) {
+            return this.batteryCalibrator;
+        }
+        if (!this.applianceId) {
+            throw new Error("SunspecBattery.configureCalibration: connect() must complete first (applianceId required)");
+        }
+        if (!this.snapshotService) {
+            throw new Error("SunspecBattery.configureCalibration: snapshot service not initialized — call connect() first");
+        }
+        const driver = new sunspec_battery_calibration_driver_js_1.SunspecBatteryCalibrationDriver(this.sunspecClient, this.unitId, this.energyApp.useDataBus());
+        this.calibrationDriver = driver;
+        this.calibrationResultStore = opts.resultStore;
+        this.batteryCalibrator = new sunspec_battery_feature_calibrator_js_1.SunspecBatteryFeatureCalibrator({
+            applianceId: this.applianceId,
+            driver,
+            sunspecClient: this.sunspecClient,
+            unitId: this.unitId,
+            readBatteryData: () => this.sunspecClient.readBatteryData(this.unitId),
+            snapshotService: this.snapshotService,
+            resultStore: opts.resultStore,
+            config: opts.config,
+        });
+        return this.batteryCalibrator;
+    }
+    /**
+     * Detect which battery features the device's registers expose. This is the
+     * raw, register-only view; the {@link featureMode} configured at
+     * construction decides what is actually published — see
+     * {@link resolveAdvertisedFeatures}.
+     */
+    detectFromRegisters(batteryData) {
+        return detectFeaturesFromRegisters(batteryData);
+    }
+    /**
+     * Resolve `appliance.battery.features` for the configured mode. Called on
+     * every connect() and readData() cycle so that, in calibration-based mode,
+     * the controllable features appear as soon as the calibrator flips
+     * `isCalibrated` (no synchronous push).
+     */
+    resolveAdvertisedFeatures(batteryData) {
+        const allow = this.featureMode.allowedFeatures;
+        const intersect = (xs) => allow ? xs.filter(f => allow.includes(f)) : xs;
+        switch (this.featureMode.kind) {
+            case sunspec_interfaces_js_1.SunspecBatteryFeatureModeKind.Disabled:
+                return allow ? [...allow] : [];
+            case sunspec_interfaces_js_1.SunspecBatteryFeatureModeKind.RegisterBased:
+                return intersect(this.detectFromRegisters(batteryData));
+            case sunspec_interfaces_js_1.SunspecBatteryFeatureModeKind.CalibrationBased: {
+                const detected = intersect(this.detectFromRegisters(batteryData));
+                const result = this.applianceId
+                    ? this.calibrationResultStore?.getResult(this.applianceId)
+                    : undefined;
+                return filterFeaturesByCalibrationResult(detected, result, SunspecBattery.CONTROLLABLE_FEATURES);
+            }
+        }
+    }
+    /**
+     * Returns the per-battery `BatteryCalibrator` created by
+     * {@link configureCalibration}, or `undefined` if calibration was never
+     * configured. Consumers register the returned instance with their own
+     * `CalibrationTrigger`.
+     */
+    getBatteryCalibrator() {
+        return this.batteryCalibrator;
+    }
     /**
      * Connect to the battery and create/update the appliance
      */
@@ -874,13 +1039,7 @@ class SunspecBattery extends BaseSunspecDevice {
         const commonData = await this.sunspecClient.readCommonBlock(this.unitId);
         const batteryData = await this.sunspecClient.readBatteryData(this.unitId);
         const storageMode = this.determineStorageMode(batteryData);
-        const features = [];
-        if (batteryData?.chaGriSet !== undefined) {
-            features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.GridCharging);
-        }
-        if (batteryData?.wChaMax !== undefined) {
-            features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.ChargeLimitation);
-        }
+        const features = this.resolveAdvertisedFeatures(batteryData);
         const activeChargeLimitW = this.computeActiveChargeLimitW(batteryData);
         const activeDischargeLimitW = this.computeActiveDischargeLimitW(batteryData);
         // Create or update appliance (skip if an existing appliance was provided)
@@ -947,6 +1106,11 @@ class SunspecBattery extends BaseSunspecDevice {
     }
     async disconnect() {
         this.stopDataBusListening();
+        if (this.calibrationDriver) {
+            this.calibrationDriver.stop();
+            this.calibrationDriver = undefined;
+            this.batteryCalibrator = undefined;
+        }
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
@@ -1015,6 +1179,11 @@ class SunspecBattery extends BaseSunspecDevice {
                 else if (!advancedBatteryModel) {
                     batteryPowerW = mpptBatteryPowerW;
                 }
+                // Feed the calibration driver's synchronous power cache. No-op when calibration
+                // was never configured.
+                if (batteryPowerW !== undefined && this.calibrationDriver) {
+                    this.calibrationDriver.updateBatteryPowerCache(batteryPowerW);
+                }
                 const batteryMessage = {
                     id: (0, node_crypto_1.randomUUID)(),
                     message: enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.BatteryValuesUpdateV1,
@@ -1038,6 +1207,9 @@ class SunspecBattery extends BaseSunspecDevice {
             if (this.applianceId) {
                 const appliance = await this.applianceManager.findApplianceById(this.applianceId);
                 const storageMode = this.determineStorageMode(batteryData);
+                // Republish features each cycle so the controllable set appears as soon
+                // as the calibrator flips isCalibrated — see resolveAdvertisedFeatures.
+                const features = this.resolveAdvertisedFeatures(batteryData);
                 await this.applianceManager.updateAppliance(this.applianceId, {
                     battery: {
                         ...appliance?.battery,
@@ -1046,6 +1218,7 @@ class SunspecBattery extends BaseSunspecDevice {
                         maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
                         activeChargeLimitW: this.computeActiveChargeLimitW(batteryData),
                         activeDischargeLimitW: this.computeActiveDischargeLimitW(batteryData),
+                        features,
                         gridChargingEnabled: batteryData?.chaGriSet === 1
                     }
                 });
@@ -1291,17 +1464,27 @@ class SunspecBattery extends BaseSunspecDevice {
         if (this.dataBusListenerId) {
             return;
         }
-        // Fire and forget — calibration service hydration must not block listening setup.
-        void this.initCalibrationService('battery');
+        // Fire and forget — snapshot service hydration must not block listener setup.
+        void this.initSnapshotService();
         this.dataBus = this.energyApp.useDataBus();
         this.dataBusListenerId = this.dataBus.listenForMessages([
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartStorageGridChargeV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopStorageGridChargeV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageDischargeLimitV1,
-            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageChargeLimitV1,
+            enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageScheduleV1,
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1,
             enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopCalibrationV1,
         ], (entry) => this.handleStorageCommand(entry));
+        if (!this.applianceId) {
+            throw new Error("SunspecBattery.startDataBusListening: applianceId required — call connect() first.");
+        }
+        this.scheduleHandler = new sunspec_battery_schedule_handler_js_1.SunspecBatteryScheduleHandler({
+            dataBus: this.dataBus,
+            interval: this.energyApp.useInterval(),
+            storage: this.energyApp.useStorage(),
+            applianceId: this.applianceId,
+            sunspecClient: this.sunspecClient,
+            unitId: this.unitId,
+            getSnapshotService: () => this.snapshotService,
+            onErrorCallback: (err) => console.warn(`Battery ${this.applianceId}: schedule handler rejected input: ${err.message}`),
+        });
         console.log(`Battery ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
     /**
@@ -1314,6 +1497,7 @@ class SunspecBattery extends BaseSunspecDevice {
         }
         this.dataBusListenerId = undefined;
         this.dataBus = undefined;
+        this.scheduleHandler?.dispose();
     }
     handleStorageCommand(entry) {
         if (entry.applianceId !== this.applianceId) {
@@ -1322,17 +1506,8 @@ class SunspecBattery extends BaseSunspecDevice {
         void (async () => {
             try {
                 switch (entry.message) {
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartStorageGridChargeV1:
-                        await this.handleStartGridCharge(entry);
-                        break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StopStorageGridChargeV1:
-                        await this.handleStopGridCharge(entry);
-                        break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageDischargeLimitV1:
-                        await this.handleSetDischargeLimit(entry);
-                        break;
-                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageChargeLimitV1:
-                        await this.handleSetChargeLimit(entry);
+                    case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetStorageScheduleV1:
+                        this.handleSetStorageScheduleAck(entry);
                         break;
                     case enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.StartCalibrationV1:
                         await this.handleStartCalibration(entry);
@@ -1347,132 +1522,51 @@ class SunspecBattery extends BaseSunspecDevice {
             }
         })();
     }
-    async handleStartGridCharge(msg) {
+    /**
+     * Acknowledge a SetStorageScheduleV1 message. The actual schedule application
+     * is owned by `this.scheduleHandler` (subscribed independently via its own
+     * data-bus listener registered in its constructor). The ack reports "received
+     * & queued" rather than "applied" — schedule entries play out over time, and
+     * per-entry write failures land in `console.error` via the handler's
+     * onChange wrapper.
+     */
+    handleSetStorageScheduleAck(msg) {
         if (!this.isConnected() || !this.applianceId) {
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, "Not connected");
             return;
         }
-        console.log(`Battery ${this.applianceId}: handling StartStorageGridChargeV1 (powerLimitW=${msg.data.powerLimitW})`);
-        // Read current state for logging and rollback
-        const controls = await this.getBatteryControls();
-        console.log(`Battery ${this.applianceId}: current state - chaGriSet=${controls?.chaGriSet}, wChaMax=${controls?.wChaMax}, storCtlMod=${controls?.storCtlMod}`);
-        const originalChaGriSet = controls?.chaGriSet;
-        const originalWChaMax = controls?.wChaMax;
-        // Step 1: Enable grid charging (Register 17: chaGriSet=GRID)
-        const step1 = await this.enableGridCharging(true);
-        if (!step1) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to enable grid charging');
-            return;
-        }
-        // Step 2: Set charging power (Register 2: wChaMax)
-        const step2 = await this.setChargingPower(msg.data.powerLimitW);
-        if (!step2) {
-            // Rollback step 1
-            await this.writeBatteryControls({ chaGriSet: originalChaGriSet });
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set charging power');
-            return;
-        }
-        // Step 3: Set storage mode to CHARGE (Register 5: storCtlMod=0x0001)
-        const step3 = await this.setStorageMode(sunspec_interfaces_js_1.SunspecStorageMode.CHARGE);
-        if (!step3) {
-            // Rollback steps 1+2
-            await this.writeBatteryControls({ chaGriSet: originalChaGriSet, wChaMax: originalWChaMax });
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set storage mode to charge');
-            return;
-        }
-        await this.calibrationService?.recordModification(['chaGriSet', 'wChaMax', 'storCtlMod']);
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
-    async handleStopGridCharge(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported);
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling StopStorageGridChargeV1`);
-        // Read current state for logging and rollback
-        const controls = await this.getBatteryControls();
-        console.log(`Battery ${this.applianceId}: current state - chaGriSet=${controls?.chaGriSet}, storCtlMod=${controls?.storCtlMod}`);
-        const originalChaGriSet = controls?.chaGriSet;
-        // Step 1: Disable grid charging (Register 17: chaGriSet=PV)
-        const step1 = await this.enableGridCharging(false);
-        if (!step1) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to disable grid charging');
-            return;
-        }
-        // Step 2: Set storage mode to AUTO (Register 5: storCtlMod=0x0003)
-        const step2 = await this.setStorageMode(sunspec_interfaces_js_1.SunspecStorageMode.AUTO);
-        if (!step2) {
-            // Rollback step 1
-            await this.writeBatteryControls({ chaGriSet: originalChaGriSet });
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set storage mode to auto');
-            return;
-        }
-        await this.calibrationService?.recordModification(['chaGriSet', 'storCtlMod']);
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-    }
-    async handleSetDischargeLimit(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported);
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling SetStorageDischargeLimitV1 (dischargeLimitW=${msg.data.dischargeLimitW})`);
-        // Read current state to get wChaMax for percentage conversion
-        const controls = await this.getBatteryControls();
-        console.log(`Battery ${this.applianceId}: current state - outWRte=${controls?.outWRte}, wChaMax=${controls?.wChaMax}`);
-        if (!controls?.wChaMax) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read wChaMax for discharge limit conversion');
-            return;
-        }
-        // Convert watts to percentage of WDisChaMax (using wChaMax), clamped to 0-100%
-        const dischargeLimitPercent = Math.min(100, Math.max(0, (msg.data.dischargeLimitW / controls.wChaMax) * 100));
-        console.log(`Battery ${this.applianceId}: calculated discharge limit: ${dischargeLimitPercent.toFixed(1)}% (${msg.data.dischargeLimitW}W / ${controls.wChaMax}W)`);
-        // Set discharge limit (Register 12: outWRte)
-        const success = await this.writeBatteryControls({ outWRte: dischargeLimitPercent });
-        if (!success) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set discharge limit');
-            return;
-        }
-        await this.calibrationService?.recordModification(['outWRte']);
         this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
-    async handleSetChargeLimit(msg) {
-        if (!this.isConnected() || !this.applianceId) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported);
-            return;
-        }
-        console.log(`Battery ${this.applianceId}: handling SetStorageChargeLimitV1 (chargeLimitW=${msg.data.chargeLimitW})`);
-        // Read current state to get wChaMax for percentage conversion
-        const controls = await this.getBatteryControls();
-        console.log(`Battery ${this.applianceId}: current state - inWRte=${controls?.inWRte}, wChaMax=${controls?.wChaMax}`);
-        if (!controls?.wChaMax) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to read wChaMax for charge limit conversion');
+    /**
+     * Lazily construct the per-appliance {@link SnapshotService}. Reloads any
+     * persisted snapshot from storage so an in-flight calibration survives
+     * process restarts. Idempotent.
+     */
+    async initSnapshotService() {
+        if (this.snapshotService) {
             return;
         }
-        // Convert watts to percentage of WChaMax, clamped to 0-100%
-        const chargeLimitPercent = Math.min(100, Math.max(0, (msg.data.chargeLimitW / controls.wChaMax) * 100));
-        console.log(`Battery ${this.applianceId}: calculated charge limit: ${chargeLimitPercent.toFixed(1)}% (${msg.data.chargeLimitW}W / ${controls.wChaMax}W)`);
-        // Set charge limit (Register 13: inWRte)
-        const success = await this.writeBatteryControls({ inWRte: chargeLimitPercent });
-        if (!success) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set charge limit');
+        const service = this.buildSnapshotService((snapshot, reason) => this.restoreBatterySnapshot(snapshot, reason));
+        if (!service) {
             return;
         }
-        await this.calibrationService?.recordModification(['inWRte']);
-        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
+        this.snapshotService = service;
+        await this.snapshotService.initialize();
+        console.log(`Battery ${this.applianceId}: snapshot service initialized`);
     }
     async handleStartCalibration(msg) {
         if (!this.isConnected() || !this.applianceId) {
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
             return;
         }
-        if (!this.calibrationService) {
-            await this.initCalibrationService('battery');
+        if (!this.snapshotService) {
+            await this.initSnapshotService();
         }
-        if (!this.calibrationService) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Calibration service unavailable');
+        if (!this.snapshotService) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Snapshot service unavailable');
             return;
         }
-        if (this.calibrationService.isCalibrating()) {
+        if (this.snapshotService.isCalibrating()) {
             console.log(`Battery ${this.applianceId}: calibration already active — ack idempotently`);
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
             return;
@@ -1484,11 +1578,7 @@ class SunspecBattery extends BaseSunspecDevice {
             return;
         }
         try {
-            await this.calibrationService.startCalibration({
-                deviceType: 'battery',
-                unitId: this.unitId,
-                batteryControls: controls,
-            });
+            await this.snapshotService.startCalibration(controls);
         }
         catch (error) {
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to persist snapshot: ${error}`);
@@ -1502,27 +1592,22 @@ class SunspecBattery extends BaseSunspecDevice {
             return;
         }
         console.log(`Battery ${this.applianceId}: handling StopCalibrationV1`);
-        const snapshot = await this.calibrationService?.stopCalibration();
-        if (!snapshot) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
-            return;
-        }
-        try {
-            await this.restoreFromCalibrationSnapshot(snapshot, 'stop');
-        }
-        catch (error) {
-            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, `Failed to restore registers: ${error}`);
-            return;
-        }
+        // SnapshotService.stopCalibration fires `restoreBatterySnapshot` internally
+        // with reason="stop" before returning. Failures from the restore callback are
+        // logged inside the callback (the persisted snapshot is already gone — see
+        // library notes) so we always ack Accepted here.
+        await this.snapshotService?.stopCalibration();
         this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
-    async restoreFromCalibrationSnapshot(snapshot, reason) {
-        if (snapshot.deviceType !== 'battery' || !snapshot.batteryControls) {
-            return;
-        }
-        const source = snapshot.batteryControls;
+    /**
+     * `onRestore` callback for the battery's {@link SnapshotService}. Writes only the
+     * subset of writable battery fields touched during the calibration. Errors are
+     * caught and logged — by the time this fires the snapshot is gone from storage,
+     * so a throw would just propagate into the void.
+     */
+    async restoreBatterySnapshot(snapshot, reason) {
+        const source = snapshot.payload;
         const partial = {};
-        // Whitelist of battery fields that writeBatteryControls actually writes (Model 124).
         const WRITABLE_BATTERY_FIELDS = ['storCtlMod', 'chaGriSet', 'wChaMax', 'inWRte', 'outWRte', 'minRsvPct'];
         for (const field of WRITABLE_BATTERY_FIELDS) {
             if (snapshot.modifiedFields.includes(field) && source[field] !== undefined) {
@@ -1534,9 +1619,14 @@ class SunspecBattery extends BaseSunspecDevice {
             return;
         }
         console.log(`Battery ${this.applianceId}: calibration ${reason} — restoring [${Object.keys(partial).join(', ')}]`);
-        const ok = await this.sunspecClient.writeBatteryControls(snapshot.unitId, partial);
-        if (!ok) {
-            throw new Error('writeBatteryControls returned false');
+        try {
+            const ok = await this.sunspecClient.writeBatteryControls(this.unitId, partial);
+            if (!ok) {
+                console.error(`Battery ${this.applianceId}: calibration ${reason} — writeBatteryControls returned false`);
+            }
+        }
+        catch (error) {
+            console.error(`Battery ${this.applianceId}: calibration ${reason} — writeBatteryControls threw: ${error}`);
         }
     }
 }