@enyo-energy/sunspec-sdk 0.0.31 → 0.0.33

package/dist/cjs/connection-retry-manager.cjs

@@ -1,122 +1,105 @@
 "use strict";
 /**
- * Connection Retry Manager with Exponential Backoff
+ * Connection Retry Manager with Tiered Schedule
  *
- * Manages automatic connection retries with configurable exponential backoff.
- * Backoff sequence (with defaults): 1s → 1.5s → 2.25s → 3.375s → 5.06s → 7.59s → 11.39s → 17.09s → 25.63s → 30s (capped)
+ * Poll-based retry manager — no timers or setTimeout loops.
+ * Called on each readData() cycle; determines whether enough time has elapsed
+ * to attempt a reconnection based on the current retry phase.
+ *
+ * Default schedule:
+ * - Phase 1: every 10s for 1 minute
+ * - Phase 2: every 30s for 2 minutes
+ * - Phase 3: every 1m for 5 minutes
+ * - Phase 4: every 5m forever
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionRetryManager = void 0;
 const sunspec_interfaces_js_1 = require("./sunspec-interfaces.cjs");
 class ConnectionRetryManager {
     config;
-    currentAttempt = 0;
-    pendingRetryTimeout = null;
-    isRetrying = false;
+    disconnectedSince = null;
+    lastAttemptTime = 0;
+    attemptCount = 0;
     constructor(config) {
-        this.config = { ...sunspec_interfaces_js_1.DEFAULT_RETRY_CONFIG, ...config };
+        this.config = config ?? sunspec_interfaces_js_1.DEFAULT_RETRY_CONFIG;
     }
     /**
-     * Calculate the next delay using exponential backoff
-     * Formula: min(initialDelayMs * backoffFactor^attempt, maxDelayMs)
+     * Mark the connection as disconnected. Sets the timestamp if not already set.
      */
-    getNextDelay() {
-        const delay = this.config.initialDelayMs * Math.pow(this.config.backoffFactor, this.currentAttempt);
-        return Math.min(delay, this.config.maxDelayMs);
+    markDisconnected() {
+        if (this.disconnectedSince === null) {
+            this.disconnectedSince = Date.now();
+        }
     }
     /**
-     * Reset the retry state on successful connection
+     * Reset all retry state (call on successful reconnect).
      */
     reset() {
-        this.currentAttempt = 0;
-        this.isRetrying = false;
-        this.cancelPendingRetry();
+        this.disconnectedSince = null;
+        this.lastAttemptTime = 0;
+        this.attemptCount = 0;
     }
     /**
-     * Check if we should retry based on max attempts
-     * Returns true if we haven't exceeded maxAttempts or if maxAttempts is -1 (infinite)
+     * Determine which retry phase we're currently in based on elapsed time since disconnect.
      */
-    shouldRetry() {
-        if (this.config.maxAttempts === -1) {
-            return true;
+    getCurrentPhase() {
+        const elapsed = this.getElapsedMs();
+        let cumulativeDuration = 0;
+        for (const phase of this.config.phases) {
+            if (phase.durationMs === 0) {
+                // This is the final "forever" phase
+                return phase;
+            }
+            cumulativeDuration += phase.durationMs;
+            if (elapsed < cumulativeDuration) {
+                return phase;
+            }
         }
-        return this.currentAttempt < this.config.maxAttempts;
+        // Fallback: return last phase
+        return this.config.phases[this.config.phases.length - 1];
     }
     /**
-     * Get the current attempt number (0-indexed)
+     * Check if we should attempt a reconnection now.
+     * Called on every readData() poll cycle.
      */
-    getCurrentAttempt() {
-        return this.currentAttempt;
+    shouldAttemptNow() {
+        if (this.disconnectedSince === null) {
+            return false;
+        }
+        const now = Date.now();
+        const phase = this.getCurrentPhase();
+        return (now - this.lastAttemptTime) >= phase.intervalMs;
     }
     /**
-     * Get the max attempts configuration
+     * Record that an attempt was just made.
      */
-    getMaxAttempts() {
-        return this.config.maxAttempts;
+    recordAttempt() {
+        this.lastAttemptTime = Date.now();
+        this.attemptCount++;
     }
     /**
-     * Check if a retry is currently in progress
+     * Get the number of reconnection attempts made.
      */
-    isRetryInProgress() {
-        return this.isRetrying;
+    getAttemptCount() {
+        return this.attemptCount;
     }
     /**
-     * Schedule a reconnection attempt with exponential backoff delay
-     * Returns a promise that resolves when the callback completes
+     * Get milliseconds elapsed since disconnect was first detected.
      */
-    async scheduleRetry(callback) {
-        if (!this.shouldRetry()) {
-            console.log(`Max retry attempts (${this.config.maxAttempts}) reached. Giving up.`);
-            return false;
-        }
-        if (this.isRetrying) {
-            console.log('Retry already in progress, skipping duplicate request.');
-            return false;
+    getElapsedMs() {
+        if (this.disconnectedSince === null) {
+            return 0;
         }
-        this.isRetrying = true;
-        const delay = this.getNextDelay();
-        const attemptNumber = this.currentAttempt + 1;
-        const maxAttemptsStr = this.config.maxAttempts === -1 ? '∞' : this.config.maxAttempts.toString();
-        console.log(`Scheduling reconnection attempt ${attemptNumber}/${maxAttemptsStr} in ${delay}ms`);
-        return new Promise((resolve) => {
-            this.pendingRetryTimeout = setTimeout(async () => {
-                this.pendingRetryTimeout = null;
-                this.currentAttempt++;
-                try {
-                    console.log(`Attempting reconnection (attempt ${attemptNumber}/${maxAttemptsStr})...`);
-                    const success = await callback();
-                    if (success) {
-                        console.log('Reconnection successful!');
-                        this.reset();
-                        resolve(true);
-                    }
-                    else {
-                        console.log('Reconnection attempt failed.');
-                        this.isRetrying = false;
-                        resolve(false);
-                    }
-                }
-                catch (error) {
-                    console.error(`Reconnection attempt failed with error: ${error}`);
-                    this.isRetrying = false;
-                    resolve(false);
-                }
-            }, delay);
-        });
+        return Date.now() - this.disconnectedSince;
     }
     /**
-     * Cancel any pending retry attempt
+     * Check if the manager is currently tracking a disconnection.
      */
-    cancelPendingRetry() {
-        if (this.pendingRetryTimeout) {
-            clearTimeout(this.pendingRetryTimeout);
-            this.pendingRetryTimeout = null;
-            this.isRetrying = false;
-            console.log('Pending retry cancelled.');
-        }
+    isDisconnected() {
+        return this.disconnectedSince !== null;
     }
     /**
-     * Get the current configuration
+     * Get the current configuration.
      */
     getConfig() {
         return { ...this.config };

package/dist/cjs/connection-retry-manager.d.cts

@@ -1,53 +1,58 @@
 /**
- * Connection Retry Manager with Exponential Backoff
+ * Connection Retry Manager with Tiered Schedule
  *
- * Manages automatic connection retries with configurable exponential backoff.
- * Backoff sequence (with defaults): 1s → 1.5s → 2.25s → 3.375s → 5.06s → 7.59s → 11.39s → 17.09s → 25.63s → 30s (capped)
+ * Poll-based retry manager — no timers or setTimeout loops.
+ * Called on each readData() cycle; determines whether enough time has elapsed
+ * to attempt a reconnection based on the current retry phase.
+ *
+ * Default schedule:
+ * - Phase 1: every 10s for 1 minute
+ * - Phase 2: every 30s for 2 minutes
+ * - Phase 3: every 1m for 5 minutes
+ * - Phase 4: every 5m forever
  */
-import { IRetryConfig } from './sunspec-interfaces.cjs';
+import { IRetryConfig, IRetryPhase } from './sunspec-interfaces.cjs';
 export declare class ConnectionRetryManager {
     private config;
-    private currentAttempt;
-    private pendingRetryTimeout;
-    private isRetrying;
-    constructor(config?: Partial<IRetryConfig>);
+    private disconnectedSince;
+    private lastAttemptTime;
+    private attemptCount;
+    constructor(config?: IRetryConfig);
     /**
-     * Calculate the next delay using exponential backoff
-     * Formula: min(initialDelayMs * backoffFactor^attempt, maxDelayMs)
+     * Mark the connection as disconnected. Sets the timestamp if not already set.
      */
-    getNextDelay(): number;
+    markDisconnected(): void;
     /**
-     * Reset the retry state on successful connection
+     * Reset all retry state (call on successful reconnect).
      */
     reset(): void;
     /**
-     * Check if we should retry based on max attempts
-     * Returns true if we haven't exceeded maxAttempts or if maxAttempts is -1 (infinite)
+     * Determine which retry phase we're currently in based on elapsed time since disconnect.
      */
-    shouldRetry(): boolean;
+    getCurrentPhase(): IRetryPhase;
     /**
-     * Get the current attempt number (0-indexed)
+     * Check if we should attempt a reconnection now.
+     * Called on every readData() poll cycle.
      */
-    getCurrentAttempt(): number;
+    shouldAttemptNow(): boolean;
     /**
-     * Get the max attempts configuration
+     * Record that an attempt was just made.
      */
-    getMaxAttempts(): number;
+    recordAttempt(): void;
     /**
-     * Check if a retry is currently in progress
+     * Get the number of reconnection attempts made.
      */
-    isRetryInProgress(): boolean;
+    getAttemptCount(): number;
     /**
-     * Schedule a reconnection attempt with exponential backoff delay
-     * Returns a promise that resolves when the callback completes
+     * Get milliseconds elapsed since disconnect was first detected.
      */
-    scheduleRetry(callback: () => Promise<boolean>): Promise<boolean>;
+    getElapsedMs(): number;
     /**
-     * Cancel any pending retry attempt
+     * Check if the manager is currently tracking a disconnection.
      */
-    cancelPendingRetry(): void;
+    isDisconnected(): boolean;
     /**
-     * Get the current configuration
+     * Get the current configuration.
      */
     getConfig(): IRetryConfig;
 }

package/dist/cjs/sunspec-devices.cjs

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SunspecMeter = exports.SunspecBattery = exports.SunspecInverter = exports.BaseSunspecDevice = void 0;
+exports.SunspecMeter = exports.SunspecBattery = exports.SunspecInverter = exports.BaseSunspecDevice = exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = void 0;
 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 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");
+// TODO: Remove once added to @enyo-energy/energy-app-sdk EnyoDataBusMessageEnum
+exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = 'SetInverterFeedInLimitV1';
 /**
  * Extract battery discharge power from MPPT data.
  * Returns the discharge power in Watts (positive value), or 0 if no discharge.
@@ -35,7 +38,10 @@ class BaseSunspecDevice {
     baseAddress;
     applianceId;
     lastUpdateTime = 0;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000) {
+    dataBusListenerId;
+    dataBus;
+    retryManager;
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, retryConfig) {
         this.energyApp = energyApp;
         this.name = name;
         this.networkDevice = networkDevice;
@@ -44,6 +50,7 @@ class BaseSunspecDevice {
         this.unitId = unitId;
         this.port = port;
         this.baseAddress = baseAddress;
+        this.retryManager = new connection_retry_manager_js_1.ConnectionRetryManager(retryConfig);
     }
     /**
      * Check if the device is connected
@@ -65,12 +72,87 @@ class BaseSunspecDevice {
             await this.sunspecClient.discoverModels(this.baseAddress);
         }
     }
+    /**
+     * Attempt a reconnection if the tiered retry schedule allows it.
+     * Called from readData() when the device is disconnected.
+     * Returns true if reconnection succeeded.
+     */
+    async tryReconnect() {
+        this.retryManager.markDisconnected();
+        if (!this.retryManager.shouldAttemptNow()) {
+            return false;
+        }
+        this.retryManager.recordAttempt();
+        const phase = this.retryManager.getCurrentPhase();
+        const attempt = this.retryManager.getAttemptCount();
+        const elapsed = Math.round(this.retryManager.getElapsedMs() / 1000);
+        console.log(`${this.constructor.name} ${this.applianceId}: Reconnect attempt #${attempt} ` +
+            `(phase: ${phase.intervalMs / 1000}s interval, elapsed: ${elapsed}s)`);
+        try {
+            const success = await this.sunspecClient.reconnect();
+            if (success) {
+                // Re-discover models after reconnect
+                await this.sunspecClient.discoverModels(this.baseAddress);
+                this.retryManager.reset();
+                // Update appliance state to Connected
+                if (this.applianceId) {
+                    await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Connected);
+                }
+                console.log(`${this.constructor.name} ${this.applianceId}: Reconnection successful after ${attempt} attempt(s)`);
+                return true;
+            }
+        }
+        catch (error) {
+            console.error(`${this.constructor.name} ${this.applianceId}: Reconnect attempt #${attempt} failed: ${error}`);
+        }
+        return false;
+    }
+    /**
+     * Mark the device as offline: update appliance state and start tracking disconnection.
+     */
+    async markOffline() {
+        this.retryManager.markDisconnected();
+        if (this.applianceId) {
+            try {
+                await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
+            }
+            catch (error) {
+                console.error(`${this.constructor.name} ${this.applianceId}: Failed to mark appliance offline: ${error}`);
+            }
+        }
+    }
+    sendCommandAcknowledge(messageId, acknowledgeMessage, answer, rejectionReason) {
+        if (!this.dataBus || !this.applianceId) {
+            return;
+        }
+        const ackMessage = {
+            id: (0, node_crypto_1.randomUUID)(),
+            message: enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.CommandAcknowledgeV1,
+            type: 'answer',
+            source: enyo_source_enum_js_1.EnyoSourceEnum.Device,
+            applianceId: this.applianceId,
+            timestampIso: new Date().toISOString(),
+            data: {
+                messageId,
+                acknowledgeMessage: acknowledgeMessage,
+                answer,
+                rejectionReason
+            }
+        };
+        console.log(`${this.constructor.name} ${this.applianceId}: sending ${answer} for ${acknowledgeMessage} (messageId=${messageId}${rejectionReason ? `, reason=${rejectionReason}` : ''})`);
+        this.dataBus.sendMessage([ackMessage]);
+    }
 }
 exports.BaseSunspecDevice = BaseSunspecDevice;
 /**
  * Sunspec Inverter implementation using dynamic model discovery
  */
 class SunspecInverter extends BaseSunspecDevice {
+    capabilities;
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+        this.capabilities = capabilities;
+    }
     async connect() {
         // Ensure Sunspec client is connected
         if (!this.sunspecClient.isConnected()) {
@@ -111,8 +193,10 @@ class SunspecInverter extends BaseSunspecDevice {
         if (mpptModel) {
             console.log(`MPPT model found for inverter ${this.networkDevice.hostname}`);
         }
+        this.startDataBusListening();
     }
     async disconnect() {
+        this.stopDataBusListening();
         if (this.applianceId) {
             await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
         }
@@ -123,7 +207,9 @@ class SunspecInverter extends BaseSunspecDevice {
     }
     async readData(clockId, resolution) {
         if (!this.isConnected()) {
-            return [];
+            await this.tryReconnect();
+            if (!this.isConnected())
+                return [];
         }
         const messages = [];
         const timestamp = new Date();
@@ -173,6 +259,7 @@ class SunspecInverter extends BaseSunspecDevice {
         }
         catch (error) {
             console.error(`Error updating inverter data: ${error}`);
+            await this.markOffline();
         }
         return messages;
     }
@@ -243,14 +330,73 @@ class SunspecInverter extends BaseSunspecDevice {
     mapDcStringToApplianceMetadata(mpptDataList) {
         return mpptDataList.map(s => ({ index: s.index, name: s.name }));
     }
+    /**
+     * Start listening for inverter commands on the data bus.
+     * Idempotent — does nothing if already listening.
+     */
+    startDataBusListening() {
+        if (this.dataBusListenerId) {
+            return;
+        }
+        this.dataBus = this.energyApp.useDataBus();
+        this.dataBusListenerId = this.dataBus.listenForMessages([exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1], (entry) => this.handleInverterCommand(entry));
+        console.log(`Inverter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
+    }
+    /**
+     * Stop listening for inverter commands on the data bus.
+     */
+    stopDataBusListening() {
+        if (this.dataBusListenerId && this.dataBus) {
+            this.dataBus.unsubscribe(this.dataBusListenerId);
+            console.log(`Inverter ${this.applianceId}: stopped data bus listening (listener ${this.dataBusListenerId})`);
+        }
+        this.dataBusListenerId = undefined;
+        this.dataBus = undefined;
+    }
+    handleInverterCommand(entry) {
+        if (entry.applianceId !== this.applianceId) {
+            return;
+        }
+        void (async () => {
+            try {
+                if (entry.message === exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1) {
+                    await this.handleSetFeedInLimit(entry);
+                }
+            }
+            catch (error) {
+                console.error(`Inverter ${this.applianceId}: error handling ${entry.message}:`, error);
+            }
+        })();
+    }
+    async handleSetFeedInLimit(msg) {
+        // Check capability
+        if (!this.capabilities.includes(sunspec_interfaces_js_1.SunspecInverterCapability.FeedInLimit)) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported, 'FeedInLimit capability not enabled');
+            return;
+        }
+        if (!this.isConnected() || !this.applianceId) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Not connected');
+            return;
+        }
+        console.log(`Inverter ${this.applianceId}: handling SetInverterFeedInLimitV1 (feedInLimitW=${msg.data.feedInLimitW})`);
+        const success = await this.sunspecClient.setFeedInLimit(msg.data.feedInLimitW);
+        if (!success) {
+            this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set feed-in limit');
+            return;
+        }
+        this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
+    }
 }
 exports.SunspecInverter = SunspecInverter;
 /**
  * Sunspec Battery implementation
  */
 class SunspecBattery extends BaseSunspecDevice {
-    dataBusListenerId;
-    dataBus;
+    capabilities;
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+        this.capabilities = capabilities;
+    }
     /**
      * Connect to the battery and create/update the appliance
      */
@@ -337,7 +483,9 @@ class SunspecBattery extends BaseSunspecDevice {
      */
     async readData(clockId, resolution) {
         if (!this.isConnected()) {
-            return [];
+            await this.tryReconnect();
+            if (!this.isConnected())
+                return [];
         }
         const messages = [];
         const timestamp = new Date();
@@ -348,6 +496,16 @@ class SunspecBattery extends BaseSunspecDevice {
             const mpptBatteryPowerW = this.extractBatteryPowerFromMPPT(mpptDataList);
             if (batteryData) {
                 const advancedBatteryModel = this.sunspecClient.findModel(801);
+                const batteryBaseModel = this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.BatteryBase);
+                // Determine battery power: prefer model 802 w field, then MPPT extraction, then undefined
+                let batteryPowerW;
+                if (batteryBaseModel && (batteryData.chargePower !== undefined || batteryData.dischargePower !== undefined)) {
+                    // Model 802 provides power directly: positive = charge, negative = discharge
+                    batteryPowerW = (batteryData.chargePower || 0) - (batteryData.dischargePower || 0);
+                }
+                else if (!advancedBatteryModel) {
+                    batteryPowerW = mpptBatteryPowerW;
+                }
                 const batteryMessage = {
                     id: (0, node_crypto_1.randomUUID)(),
                     message: enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.BatteryValuesUpdateV1,
@@ -359,7 +517,7 @@ class SunspecBattery extends BaseSunspecDevice {
                     resolution,
                     data: {
                         batterySoC: batteryData.soc || batteryData.chaState || 0,
-                        batteryPowerW: advancedBatteryModel ? undefined : mpptBatteryPowerW,
+                        batteryPowerW,
                         state: this.mapToEnyoBatteryState(batteryData.chaSt),
                     }
                 };
@@ -385,6 +543,7 @@ class SunspecBattery extends BaseSunspecDevice {
         }
         catch (error) {
             console.error(`Error updating battery data: ${error}`);
+            await this.markOffline();
         }
         return messages;
     }
@@ -499,6 +658,21 @@ class SunspecBattery extends BaseSunspecDevice {
         }
         return this.sunspecClient.readBatteryControls();
     }
+    /**
+     * Read full battery base data from Model 802
+     *
+     * Returns the complete Model 802 data structure with all fields,
+     * including nameplate, SoC/health, status, events, voltage, current, and power.
+     *
+     * @returns Promise<SunspecBatteryBaseData | null> - Full model 802 data or null if not available
+     */
+    async readBatteryBaseData() {
+        if (!this.isConnected()) {
+            console.error('Battery not connected');
+            return null;
+        }
+        return this.sunspecClient.readBatteryBaseData();
+    }
     /**
      * Write custom battery control settings
      *
@@ -686,45 +860,36 @@ class SunspecBattery extends BaseSunspecDevice {
             this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.NotSupported);
             return;
         }
-        console.log(`Battery ${this.applianceId}: handling SetStorageDischargeLimitV1 (dischargeLimitPercent=${msg.data.dischargeLimitPercent})`);
-        // Read current state for logging
+        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}`);
+        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: msg.data.dischargeLimitPercent });
+        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;
         }
         this.sendCommandAcknowledge(msg.id, msg.message, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Accepted);
     }
-    sendCommandAcknowledge(messageId, acknowledgeMessage, answer, rejectionReason) {
-        if (!this.dataBus || !this.applianceId) {
-            return;
-        }
-        const ackMessage = {
-            id: (0, node_crypto_1.randomUUID)(),
-            message: enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.CommandAcknowledgeV1,
-            type: 'answer',
-            source: enyo_source_enum_js_1.EnyoSourceEnum.Device,
-            applianceId: this.applianceId,
-            timestampIso: new Date().toISOString(),
-            data: {
-                messageId,
-                acknowledgeMessage,
-                answer,
-                rejectionReason
-            }
-        };
-        console.log(`Battery ${this.applianceId}: sending ${answer} for ${acknowledgeMessage} (messageId=${messageId}${rejectionReason ? `, reason=${rejectionReason}` : ''})`);
-        this.dataBus.sendMessage([ackMessage]);
-    }
 }
 exports.SunspecBattery = SunspecBattery;
 /**
  * Sunspec Meter implementation
  */
 class SunspecMeter extends BaseSunspecDevice {
+    capabilities;
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+        this.capabilities = capabilities;
+    }
     /**
      * Connect to the meter and create/update the appliance
      */
@@ -781,7 +946,9 @@ class SunspecMeter extends BaseSunspecDevice {
      */
     async readData(clockId, resolution) {
         if (!this.isConnected()) {
-            return [];
+            await this.tryReconnect();
+            if (!this.isConnected())
+                return [];
         }
         const messages = [];
         const timestamp = new Date();
@@ -812,6 +979,7 @@ class SunspecMeter extends BaseSunspecDevice {
         }
         catch (error) {
             console.error(`Error updating meter data: ${error}`);
+            await this.markOffline();
         }
         return messages;
     }