@enyo-energy/sunspec-sdk 0.0.28 → 0.0.30

package/dist/sunspec-devices.js

@@ -1,7 +1,7 @@
 import { SunspecBatteryChargeState, SunspecModelId, SunspecMPPTOperatingState, SunspecStorageMode } from "./sunspec-interfaces.js";
 import { randomUUID } from "node:crypto";
 import { EnyoApplianceConnectionType, EnyoApplianceStateEnum, EnyoApplianceTopologyFeatureEnum, EnyoApplianceTypeEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
-import { EnyoBatteryStateEnum, EnyoDataBusMessageEnum, EnyoInverterStateEnum, EnyoStringStateEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
+import { EnyoBatteryStateEnum, EnyoCommandAcknowledgeAnswerEnum, EnyoDataBusMessageEnum, EnyoInverterStateEnum, EnyoStringStateEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
 import { EnyoSourceEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-source.enum.js";
 import { EnyoMeterApplianceAvailableFeaturesEnum } from "@enyo-energy/energy-app-sdk/dist/types/enyo-meter-appliance.js";
 import { EnyoBatteryFeature, EnyoBatteryStorageMode } from "@enyo-energy/energy-app-sdk/dist/types/enyo-battery-appliance.js";
@@ -28,15 +28,19 @@ export class BaseSunspecDevice {
     sunspecClient;
     applianceManager;
     unitId;
+    port;
+    baseAddress;
     applianceId;
     lastUpdateTime = 0;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1) {
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000) {
         this.energyApp = energyApp;
         this.name = name;
         this.networkDevice = networkDevice;
         this.sunspecClient = sunspecClient;
         this.applianceManager = applianceManager;
         this.unitId = unitId;
+        this.port = port;
+        this.baseAddress = baseAddress;
     }
     /**
      * Check if the device is connected
@@ -52,8 +56,10 @@ export class BaseSunspecDevice {
      */
     async ensureConnected() {
         if (!this.sunspecClient.isConnected()) {
-            await this.sunspecClient.connect(this.networkDevice.ipAddress, 502, this.unitId);
-            await this.sunspecClient.discoverModels();
+            await this.sunspecClient.connect(this.networkDevice.hostname, // primary
+            this.port, this.unitId, this.networkDevice.ipAddress // secondary fallback
+            );
+            await this.sunspecClient.discoverModels(this.baseAddress);
         }
     }
 }
@@ -64,8 +70,10 @@ export class SunspecInverter extends BaseSunspecDevice {
     async connect() {
         // Ensure Sunspec client is connected
         if (!this.sunspecClient.isConnected()) {
-            await this.sunspecClient.connect(this.networkDevice.ipAddress, 502, this.unitId);
-            await this.sunspecClient.discoverModels();
+            await this.sunspecClient.connect(this.networkDevice.hostname, // primary
+            this.port, this.unitId, this.networkDevice.ipAddress // secondary fallback
+            );
+            await this.sunspecClient.discoverModels(this.baseAddress);
         }
         // Get device info from common block
         const commonData = await this.sunspecClient.readCommonBlock();
@@ -236,6 +244,8 @@ export class SunspecInverter extends BaseSunspecDevice {
  * Sunspec Battery implementation
  */
 export class SunspecBattery extends BaseSunspecDevice {
+    dataBusListenerId;
+    dataBus;
     /**
      * Connect to the battery and create/update the appliance
      */
@@ -279,12 +289,14 @@ export class SunspecBattery extends BaseSunspecDevice {
                 }
             });
             console.log(`Sunspec Battery connected: ${this.networkDevice.hostname} (${this.applianceId})`);
+            this.startDataBusListening();
         }
         catch (error) {
             console.error(`Failed to create battery appliance: ${error}`);
         }
     }
     async disconnect() {
+        this.stopDataBusListening();
         if (this.applianceId) {
             await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Offline);
         }
@@ -553,6 +565,155 @@ export class SunspecBattery extends BaseSunspecDevice {
         }
         return controls.chaGriSet === 1; // 1 = GRID, 0 = PV
     }
+    /**
+     * Start listening for storage 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([
+            EnyoDataBusMessageEnum.StartStorageGridChargeV1,
+            EnyoDataBusMessageEnum.StopStorageGridChargeV1,
+            EnyoDataBusMessageEnum.SetStorageDischargeLimitV1
+        ], (entry) => this.handleStorageCommand(entry));
+        console.log(`Battery ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
+    }
+    /**
+     * Stop listening for storage commands on the data bus.
+     */
+    stopDataBusListening() {
+        if (this.dataBusListenerId && this.dataBus) {
+            this.dataBus.unsubscribe(this.dataBusListenerId);
+            console.log(`Battery ${this.applianceId}: stopped data bus listening (listener ${this.dataBusListenerId})`);
+        }
+        this.dataBusListenerId = undefined;
+        this.dataBus = undefined;
+    }
+    handleStorageCommand(entry) {
+        if (entry.applianceId !== this.applianceId) {
+            return;
+        }
+        void (async () => {
+            try {
+                switch (entry.message) {
+                    case EnyoDataBusMessageEnum.StartStorageGridChargeV1:
+                        await this.handleStartGridCharge(entry);
+                        break;
+                    case EnyoDataBusMessageEnum.StopStorageGridChargeV1:
+                        await this.handleStopGridCharge(entry);
+                        break;
+                    case EnyoDataBusMessageEnum.SetStorageDischargeLimitV1:
+                        await this.handleSetDischargeLimit(entry);
+                        break;
+                }
+            }
+            catch (error) {
+                console.error(`Battery ${this.applianceId}: error handling ${entry.message}:`, error);
+            }
+        })();
+    }
+    async handleStartGridCharge(msg) {
+        if (!this.isConnected() || !this.applianceId) {
+            this.sendCommandAcknowledge(msg.id, msg.message, 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, 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, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set charging power');
+            return;
+        }
+        // Step 3: Set storage mode to CHARGE (Register 5: storCtlMod=0x0001)
+        const step3 = await this.setStorageMode(SunspecStorageMode.CHARGE);
+        if (!step3) {
+            // Rollback steps 1+2
+            await this.writeBatteryControls({ chaGriSet: originalChaGriSet, wChaMax: originalWChaMax });
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set storage mode to charge');
+            return;
+        }
+        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
+    }
+    async handleStopGridCharge(msg) {
+        if (!this.isConnected() || !this.applianceId) {
+            this.sendCommandAcknowledge(msg.id, msg.message, 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, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to disable grid charging');
+            return;
+        }
+        // Step 2: Set storage mode to AUTO (Register 5: storCtlMod=0x0003)
+        const step2 = await this.setStorageMode(SunspecStorageMode.AUTO);
+        if (!step2) {
+            // Rollback step 1
+            await this.writeBatteryControls({ chaGriSet: originalChaGriSet });
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set storage mode to auto');
+            return;
+        }
+        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
+    }
+    async handleSetDischargeLimit(msg) {
+        if (!this.isConnected() || !this.applianceId) {
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.NotSupported);
+            return;
+        }
+        console.log(`Battery ${this.applianceId}: handling SetStorageDischargeLimitV1 (dischargeLimitPercent=${msg.data.dischargeLimitPercent})`);
+        // Read current state for logging
+        const controls = await this.getBatteryControls();
+        console.log(`Battery ${this.applianceId}: current state - outWRte=${controls?.outWRte}`);
+        // Set discharge limit (Register 12: outWRte)
+        const success = await this.writeBatteryControls({ outWRte: msg.data.dischargeLimitPercent });
+        if (!success) {
+            this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set discharge limit');
+            return;
+        }
+        this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Accepted);
+    }
+    sendCommandAcknowledge(messageId, acknowledgeMessage, answer, rejectionReason) {
+        if (!this.dataBus || !this.applianceId) {
+            return;
+        }
+        const ackMessage = {
+            id: randomUUID(),
+            message: EnyoDataBusMessageEnum.CommandAcknowledgeV1,
+            type: 'answer',
+            source: 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]);
+    }
 }
 /**
  * Sunspec Meter implementation

package/dist/sunspec-interfaces.d.ts

@@ -1,6 +1,16 @@
 /**
  * SunSpec block interfaces with block numbers
  */
+/**
+ * Configuration for connection retry with exponential backoff
+ */
+export interface IRetryConfig {
+    initialDelayMs: number;
+    maxDelayMs: number;
+    backoffFactor: number;
+    maxAttempts: number;
+}
+export declare const DEFAULT_RETRY_CONFIG: IRetryConfig;
 /**
  * Base interface for all SunSpec blocks
  */

package/dist/sunspec-interfaces.js

@@ -1,6 +1,12 @@
 /**
  * SunSpec block interfaces with block numbers
  */
+export const DEFAULT_RETRY_CONFIG = {
+    initialDelayMs: 1000,
+    maxDelayMs: 30000,
+    backoffFactor: 1.5,
+    maxAttempts: 10
+};
 /**
  * Common Sunspec Model IDs
  */

package/dist/sunspec-modbus-client.d.ts

@@ -16,7 +16,8 @@
  * - pad: 0x8000 (always returns this value)
  * - string: all registers 0x0000 (NULL)
  */
-import { type SunspecInverterControls, type SunspecInverterData, type SunspecInverterSettings, type SunspecMeterData, type SunspecModel, type SunspecMPPTData, type SunspecBatteryData, type SunspecBatteryControls, SunspecStorageMode } from "./sunspec-interfaces.js";
+import { type SunspecInverterControls, type SunspecInverterData, type SunspecInverterSettings, type SunspecMeterData, type SunspecModel, type SunspecMPPTData, type SunspecBatteryData, type SunspecBatteryControls, SunspecStorageMode, type IRetryConfig } from "./sunspec-interfaces.js";
+import { ConnectionRetryManager } from "./connection-retry-manager.js";
 import { IConnectionHealth } from "@enyo-energy/energy-app-sdk/dist/implementations/modbus/interfaces.js";
 import { EnergyApp } from "@enyo-energy/energy-app-sdk";
 export declare class SunspecModbusClient {
@@ -24,23 +25,57 @@ export declare class SunspecModbusClient {
     private modbusClient;
     private discoveredModels;
     private connected;
-    private baseAddress;
     private connectionHealth;
     private faultTolerantReader;
     private modbusDataTypeConverter;
-    constructor(energyApp: EnergyApp);
+    private connectionParams;
+    private retryManager;
+    private autoReconnectEnabled;
+    constructor(energyApp: EnergyApp, retryConfig?: Partial<IRetryConfig>);
     /**
      * Connect to Modbus device
+     * @param host Primary host (hostname) to connect to
+     * @param port Modbus port (default 502)
+     * @param unitId Modbus unit ID (default 1)
+     * @param secondaryHost Optional secondary host (ipAddress) for fallback during reconnection
      */
-    connect(host: string, port?: number, unitId?: number): Promise<void>;
+    connect(host: string, port?: number, unitId?: number, secondaryHost?: string): Promise<void>;
     /**
      * Disconnect from Modbus device
      */
     disconnect(): Promise<void>;
+    /**
+     * Reconnect using stored connection parameters
+     * First tries primaryHost (hostname), then falls back to secondaryHost (ipAddress) if available
+     * Returns true if reconnection was successful, false otherwise
+     */
+    reconnect(): Promise<boolean>;
+    /**
+     * Attempt to establish a connection to a specific host
+     * Returns true if successful, false otherwise
+     */
+    private attemptConnection;
+    /**
+     * Check connection health and trigger automatic reconnection if unhealthy
+     * Returns true if connection is healthy or was successfully restored
+     */
+    ensureHealthyConnection(): Promise<boolean>;
+    /**
+     * Enable or disable automatic reconnection
+     */
+    setAutoReconnect(enabled: boolean): void;
+    /**
+     * Check if auto-reconnect is enabled
+     */
+    isAutoReconnectEnabled(): boolean;
+    /**
+     * Get the retry manager for advanced configuration
+     */
+    getRetryManager(): ConnectionRetryManager;
     /**
      * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
      */
-    detectSunspecBaseAddress(): Promise<{
+    detectSunspecBaseAddress(customBaseAddress?: number): Promise<{
         baseAddress: number;
         isZeroBased: boolean;
         nextAddress: number;
@@ -49,7 +84,7 @@ export declare class SunspecModbusClient {
      * Discover all available Sunspec models
      * Automatically detects base address (40000 or 40001) and scans from there
      */
-    discoverModels(): Promise<Map<number, SunspecModel>>;
+    discoverModels(customBaseAddress?: number): Promise<Map<number, SunspecModel>>;
     /**
      * Find a specific model by ID
      */

package/dist/sunspec-modbus-client.js

@@ -17,6 +17,7 @@
  * - string: all registers 0x0000 (NULL)
  */
 import { SunspecModelId, SunspecBatteryChargeState, SunspecStorageControlMode, SunspecChargeSource, SunspecStorageMode } from "./sunspec-interfaces.js";
+import { ConnectionRetryManager } from "./connection-retry-manager.js";
 import { EnergyAppModbusConnectionHealth } from "@enyo-energy/energy-app-sdk/dist/implementations/modbus/EnergyAppModbusConnectionHealth.js";
 import { EnergyAppModbusFaultTolerantReader } from "@enyo-energy/energy-app-sdk/dist/implementations/modbus/EnergyAppModbusFaultTolerantReader.js";
 import { EnergyAppModbusDataTypeConverter } from "@enyo-energy/energy-app-sdk/dist/implementations/modbus/EnergyAppModbusDataTypeConverter.js";
@@ -25,22 +26,31 @@ export class SunspecModbusClient {
     modbusClient = null;
     discoveredModels = new Map();
     connected = false;
-    baseAddress = 40001;
     connectionHealth;
     faultTolerantReader = null;
     modbusDataTypeConverter;
-    constructor(energyApp) {
+    connectionParams = null;
+    retryManager;
+    autoReconnectEnabled = true;
+    constructor(energyApp, retryConfig) {
         this.energyApp = energyApp;
         this.connectionHealth = new EnergyAppModbusConnectionHealth();
         this.modbusDataTypeConverter = new EnergyAppModbusDataTypeConverter();
+        this.retryManager = new ConnectionRetryManager(retryConfig);
     }
     /**
      * Connect to Modbus device
+     * @param host Primary host (hostname) to connect to
+     * @param port Modbus port (default 502)
+     * @param unitId Modbus unit ID (default 1)
+     * @param secondaryHost Optional secondary host (ipAddress) for fallback during reconnection
      */
-    async connect(host, port = 502, unitId = 1) {
+    async connect(host, port = 502, unitId = 1, secondaryHost) {
         if (this.connected) {
             await this.disconnect();
         }
+        // Store connection parameters for potential reconnection
+        this.connectionParams = { primaryHost: host, secondaryHost, port, unitId };
         this.modbusClient = await this.energyApp.useModbus().connect({
             host,
             port,
@@ -53,12 +63,15 @@ export class SunspecModbusClient {
         }
         this.connected = true;
         this.connectionHealth.recordSuccess();
+        this.retryManager.reset();
         console.log(`Connected to Sunspec device at ${host}:${port} unit ${unitId}`);
     }
     /**
      * Disconnect from Modbus device
      */
     async disconnect() {
+        // Cancel any pending retry attempts
+        this.retryManager.cancelPendingRetry();
         if (this.modbusClient && this.connected) {
             await this.modbusClient.disconnect();
             this.modbusClient = null;
@@ -66,20 +79,190 @@ export class SunspecModbusClient {
             this.connected = false;
             this.discoveredModels.clear();
         }
+        // Clear stored connection params
+        this.connectionParams = null;
+    }
+    /**
+     * Reconnect using stored connection parameters
+     * First tries primaryHost (hostname), then falls back to secondaryHost (ipAddress) if available
+     * Returns true if reconnection was successful, false otherwise
+     */
+    async reconnect() {
+        if (!this.connectionParams) {
+            console.error('Cannot reconnect: no connection parameters stored. Call connect() first.');
+            return false;
+        }
+        const { primaryHost, secondaryHost, port, unitId } = this.connectionParams;
+        // Try primary host first
+        console.log(`Attempting to reconnect to primary host ${primaryHost}:${port} unit ${unitId}...`);
+        const primarySuccess = await this.attemptConnection(primaryHost, port, unitId);
+        if (primarySuccess) {
+            console.log(`Successfully reconnected to primary host ${primaryHost}:${port} unit ${unitId}`);
+            return true;
+        }
+        // If primary failed and secondary is available, try secondary
+        if (secondaryHost && secondaryHost !== primaryHost) {
+            console.log(`Primary host failed, attempting secondary host ${secondaryHost}:${port} unit ${unitId}...`);
+            const secondarySuccess = await this.attemptConnection(secondaryHost, port, unitId);
+            if (secondarySuccess) {
+                console.log(`Successfully reconnected to secondary host ${secondaryHost}:${port} unit ${unitId}`);
+                return true;
+            }
+        }
+        console.error(`Reconnection failed to all available hosts`);
+        this.connected = false;
+        return false;
+    }
+    /**
+     * Attempt to establish a connection to a specific host
+     * Returns true if successful, false otherwise
+     */
+    async attemptConnection(host, port, unitId) {
+        try {
+            // Disconnect existing connection if any
+            if (this.modbusClient) {
+                try {
+                    await this.modbusClient.disconnect();
+                }
+                catch (e) {
+                    // Ignore disconnect errors during reconnection
+                }
+                this.modbusClient = null;
+                this.faultTolerantReader = null;
+            }
+            // Attempt connection
+            this.modbusClient = await this.energyApp.useModbus().connect({
+                host,
+                port,
+                unitId,
+                timeout: 5000
+            });
+            // Create fault-tolerant reader with connection health monitoring
+            if (this.modbusClient) {
+                this.faultTolerantReader = new EnergyAppModbusFaultTolerantReader(this.modbusClient, this.connectionHealth);
+            }
+            this.connected = true;
+            this.connectionHealth.recordSuccess();
+            return true;
+        }
+        catch (error) {
+            console.error(`Connection attempt to ${host}:${port} failed: ${error}`);
+            return false;
+        }
+    }
+    /**
+     * Check connection health and trigger automatic reconnection if unhealthy
+     * Returns true if connection is healthy or was successfully restored
+     */
+    async ensureHealthyConnection() {
+        // If already healthy, return immediately
+        if (this.isHealthy()) {
+            return true;
+        }
+        // If no connection params, we can't reconnect
+        if (!this.connectionParams) {
+            console.error('Connection unhealthy and no connection parameters stored for reconnection.');
+            return false;
+        }
+        // If auto-reconnect is disabled, just report the status
+        if (!this.autoReconnectEnabled) {
+            console.log('Connection unhealthy but auto-reconnect is disabled.');
+            return false;
+        }
+        // If a retry is already in progress, don't start another
+        if (this.retryManager.isRetryInProgress()) {
+            console.log('Retry already in progress...');
+            return false;
+        }
+        console.log('Connection unhealthy, initiating reconnection with exponential backoff...');
+        // Attempt reconnection with exponential backoff
+        let success = false;
+        while (this.retryManager.shouldRetry() && !success) {
+            success = await this.retryManager.scheduleRetry(() => this.reconnect());
+            if (success) {
+                // Re-discover models after successful reconnection
+                try {
+                    await this.discoverModels();
+                    console.log('Models re-discovered after reconnection.');
+                }
+                catch (e) {
+                    console.warn('Failed to re-discover models after reconnection:', e);
+                }
+                return true;
+            }
+        }
+        if (!success) {
+            console.error('Failed to restore healthy connection after all retry attempts.');
+        }
+        return success;
+    }
+    /**
+     * Enable or disable automatic reconnection
+     */
+    setAutoReconnect(enabled) {
+        this.autoReconnectEnabled = enabled;
+        console.log(`Auto-reconnect ${enabled ? 'enabled' : 'disabled'}`);
+        if (!enabled) {
+            this.retryManager.cancelPendingRetry();
+        }
+    }
+    /**
+     * Check if auto-reconnect is enabled
+     */
+    isAutoReconnectEnabled() {
+        return this.autoReconnectEnabled;
+    }
+    /**
+     * Get the retry manager for advanced configuration
+     */
+    getRetryManager() {
+        return this.retryManager;
     }
     /**
      * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
      */
-    async detectSunspecBaseAddress() {
+    async detectSunspecBaseAddress(customBaseAddress) {
         if (!this.modbusClient) {
             throw new Error('Modbus client not initialized');
         }
+        // If custom base address provided, try it first (1-based, then 0-based variant)
+        if (customBaseAddress !== undefined) {
+            // Try 1-based at custom address (customBaseAddress + 1)
+            try {
+                const sunspecId = await this.modbusClient.readRegisterStringValue(customBaseAddress + 1, 2);
+                if (sunspecId.includes('SunS')) {
+                    console.log(`Detected 1-based addressing mode (base address: ${customBaseAddress + 1})`);
+                    return {
+                        baseAddress: customBaseAddress + 1,
+                        isZeroBased: false,
+                        nextAddress: customBaseAddress + 3
+                    };
+                }
+            }
+            catch (error) {
+                console.debug(`Could not read SunS at ${customBaseAddress + 1}:`, error);
+            }
+            // Try 0-based at custom address
+            try {
+                const sunspecId = await this.modbusClient.readRegisterStringValue(customBaseAddress, 2);
+                if (sunspecId.includes('SunS')) {
+                    console.log(`Detected 0-based addressing mode (base address: ${customBaseAddress})`);
+                    return {
+                        baseAddress: customBaseAddress,
+                        isZeroBased: true,
+                        nextAddress: customBaseAddress + 2
+                    };
+                }
+            }
+            catch (error) {
+                console.debug(`Could not read SunS at ${customBaseAddress}:`, error);
+            }
+        }
         // Try 1-based addressing first (most common)
         try {
             const sunspecId = await this.modbusClient.readRegisterStringValue(40001, 2);
             if (sunspecId.includes('SunS')) {
                 console.log('Detected 1-based addressing mode (base address: 40001)');
-                this.baseAddress = 40001;
                 return {
                     baseAddress: 40001,
                     isZeroBased: false,
@@ -95,7 +278,6 @@ export class SunspecModbusClient {
             const sunspecId = await this.modbusClient.readRegisterStringValue(40000, 2);
             if (sunspecId.includes('SunS')) {
                 console.log('Detected 0-based addressing mode (base address: 40000)');
-                this.baseAddress = 40000;
                 return {
                     baseAddress: 40000,
                     isZeroBased: true,
@@ -106,13 +288,16 @@ export class SunspecModbusClient {
         catch (error) {
             console.debug('Could not read SunS at 40000:', error);
         }
-        throw new Error('Device is not SunSpec compliant - "SunS" identifier not found at addresses 40000 or 40001');
+        const addressesChecked = customBaseAddress !== undefined
+            ? `${customBaseAddress}, ${customBaseAddress + 1}, 40000, or 40001`
+            : '40000 or 40001';
+        throw new Error(`Device is not SunSpec compliant - "SunS" identifier not found at addresses ${addressesChecked}`);
     }
     /**
      * Discover all available Sunspec models
      * Automatically detects base address (40000 or 40001) and scans from there
      */
-    async discoverModels() {
+    async discoverModels(customBaseAddress) {
         if (!this.connected) {
             throw new Error('Not connected to Modbus device');
         }
@@ -122,7 +307,7 @@ export class SunspecModbusClient {
         console.log('Starting Sunspec model discovery...');
         try {
             // Detect the base address and addressing mode
-            const addressInfo = await this.detectSunspecBaseAddress();
+            const addressInfo = await this.detectSunspecBaseAddress(customBaseAddress);
             currentAddress = addressInfo.nextAddress;
             while (currentAddress < maxAddress) {
                 // Read model ID and length

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.28";
+export declare const SDK_VERSION = "0.0.30";
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/version.js

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export const SDK_VERSION = '0.0.28';
+export const SDK_VERSION = '0.0.30';
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enyo-energy/sunspec-sdk",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@enyo-energy/energy-app-sdk": "^0.0.52"
+    "@enyo-energy/energy-app-sdk": "^0.0.60"
   },
   "volta": {
     "node": "22.17.0"