@enyo-energy/sunspec-sdk 0.0.51 → 0.0.52

package/dist/cjs/sunspec-modbus-client.d.cts

@@ -19,23 +19,38 @@
 import { type SunspecInverterControls, type SunspecInverterData, type SunspecInverterSettings, type SunspecMeterData, type SunspecModel, type SunspecMPPTData, type SunspecBatteryData, type SunspecBatteryBaseData, type SunspecBatteryControls, SunspecStorageMode } from "./sunspec-interfaces.cjs";
 import { EnergyAppModbusDataType, IConnectionHealth } from "@enyo-energy/energy-app-sdk/dist/implementations/modbus/interfaces.js";
 import { EnergyApp } from "@enyo-energy/energy-app-sdk";
+/**
+ * Get (or create) the singleton SunspecModbusClient for this network device.
+ * Increments the refcount; pair with `releaseSunspecClient` on teardown.
+ */
+export declare function getOrCreateSunspecClient(energyApp: EnergyApp, host: string, port?: number): SunspecModbusClient;
+/**
+ * Release a refcount on the network-device client. When the last consumer releases,
+ * the client is fully disconnected (all units closed) and removed from the registry.
+ *
+ * Releasing more times than acquired is a programming error and is logged; the count
+ * is clamped at zero so repeat releases are no-ops.
+ */
+export declare function releaseSunspecClient(host: string, port?: number): Promise<void>;
 export declare class SunspecModbusClient {
     private energyApp;
-    private modbusClient;
-    private discoveredModels;
-    private connected;
+    private modbusInstances;
+    private faultTolerantReaders;
+    private discoveredModelsByUnit;
     private connectionHealth;
-    private faultTolerantReader;
     private modbusDataTypeConverter;
     private connectionParams;
+    private knownUnits;
     private autoReconnectEnabled;
     private openCount;
     private closeCount;
-    private currentlyOpen;
     private operationChain;
     constructor(energyApp: EnergyApp);
     /**
-     * Connect to Modbus device
+     * Connect to a Modbus device unit. Multiple unit IDs on the same network device share this
+     * client; calling connect() with different unit IDs adds each as a separately-managed unit.
+     * The first call locks in the host/port for this client; later calls for a different host
+     * are rejected.
      * @param host Primary host (hostname) to connect to
      * @param port Modbus port (default 502)
      * @param unitId Modbus unit ID (default 1)
@@ -43,33 +58,47 @@ export declare class SunspecModbusClient {
      */
     connect(host: string, port?: number, unitId?: number, secondaryHost?: string): Promise<void>;
     /**
-     * Disconnect from Modbus device.
+     * Disconnect from all units of this network device.
      *
-     * Note: connection parameters are preserved so reconnect() can be called afterwards.
-     * They will be overwritten by the next connect() call anyway.
+     * Note: connection parameters and the set of known units are preserved so reconnect() can
+     * be called afterwards. They will be overwritten by the next connect() call anyway.
      */
     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
+     * Disconnect a single unit on this network device. Other units on the same device stay open.
+     */
+    disconnectUnit(unitId: number): Promise<void>;
+    /**
+     * Reconnect every previously-known unit on this network device using stored connection
+     * parameters. First tries primaryHost (hostname), then falls back to secondaryHost
+     * (ipAddress) if available. Returns true only if every known unit reconnected successfully.
      */
     reconnect(): Promise<boolean>;
     /**
-     * Attempt to establish a connection to a specific host. Caller must hold the connection lock.
-     * Returns true if successful, false otherwise.
+     * Reconnect a single previously-known unit on this network device. Other units on the
+     * same client stay open. Useful when one device's polling loop detects a dropped
+     * connection and only needs to recover its own unit, not thrash siblings.
+     *
+     * Returns true if the unit reconnected successfully (on primary or secondary host).
+     */
+    reconnectUnit(unitId: number): Promise<boolean>;
+    /**
+     * Attempt to (re)open every requested unit on a specific host. Caller must hold the
+     * connection lock. Closes any pre-existing per-unit instances first. Returns true only
+     * if every unit succeeded.
      */
     private attemptConnection;
     /**
-     * Open a new Modbus socket and wire up the fault-tolerant reader. On any failure, the
-     * just-opened socket (if any) is closed so we never leak. Caller must hold the connection
-     * lock and ensure no prior socket is open (use _closeSocket first).
+     * Open a new Modbus instance for one unit ID and wire up its fault-tolerant reader.
+     * On any failure, the just-opened instance (if any) is closed so we never leak. Caller must
+     * hold the connection lock and ensure the unit is not already open.
      */
-    private _openSocket;
+    private _openUnit;
     /**
-     * Close the current Modbus socket if any. Idempotent. Caller must hold the connection lock.
+     * Close the Modbus instance for a single unit. Idempotent. Caller must hold the
+     * connection lock.
      */
-    private _closeSocket;
+    private _closeUnit;
     /**
      * Run `fn` with exclusive access to connection-state transitions. Subsequent calls queue
      * behind any in-flight one. A rejected `fn` does not poison the chain for later callers.
@@ -78,13 +107,26 @@ export declare class SunspecModbusClient {
     private recordOpen;
     private recordClose;
     /**
-     * Get cumulative open/close counts for this client. Useful for spotting connection leaks.
+     * Get cumulative open/close counts for this client (across all unit IDs). Useful for
+     * spotting connection leaks.
      */
     getConnectionStats(): {
         opens: number;
         closes: number;
-        currentlyOpen: number;
+        openUnits: number;
     };
+    /**
+     * Get the EnergyAppModbusInstance for a unit, throwing if it isn't open.
+     */
+    private getInstance;
+    /**
+     * Get the fault-tolerant reader for a unit, throwing if it isn't open.
+     */
+    private getReader;
+    /**
+     * Get (or create) the discovered-models map for a unit.
+     */
+    private getModelsMap;
     /**
      * Enable or disable automatic reconnection
      */
@@ -96,20 +138,20 @@ export declare class SunspecModbusClient {
     /**
      * Detect the base address and addressing mode (0-based or 1-based) for SunSpec
      */
-    detectSunspecBaseAddress(customBaseAddress?: number): Promise<{
+    detectSunspecBaseAddress(unitId: number, customBaseAddress?: number): Promise<{
         baseAddress: number;
         isZeroBased: boolean;
         nextAddress: number;
     }>;
     /**
-     * Discover all available Sunspec models
+     * Discover all available Sunspec models for a unit
      * Automatically detects base address (40000 or 40001) and scans from there
      */
-    discoverModels(customBaseAddress?: number): Promise<Map<number, SunspecModel>>;
+    discoverModels(unitId: number, customBaseAddress?: number): Promise<Map<number, SunspecModel>>;
     /**
-     * Find a specific model by ID
+     * Find a specific model by ID for a given unit
      */
-    findModel(modelId: number): SunspecModel | undefined;
+    findModel(unitId: number, modelId: number): SunspecModel | undefined;
     /**
      * Check if a value is "unimplemented" according to Sunspec specification
      * Returns true if the value represents an unimplemented/not applicable register
@@ -153,15 +195,15 @@ export declare class SunspecModbusClient {
     /**
      * Helper to read register value(s) using the fault-tolerant reader with data type conversion
      */
-    readRegisterValue(address: number, quantity: number | undefined, dataType: EnergyAppModbusDataType): Promise<number | string | number[]>;
+    readRegisterValue(unitId: number, address: number, quantity: number | undefined, dataType: EnergyAppModbusDataType): Promise<number | string | number[]>;
     /**
      * Helper to write register value(s)
      */
-    writeRegisterValue(address: number, value: number | number[], dataType?: EnergyAppModbusDataType): Promise<boolean>;
+    writeRegisterValue(unitId: number, address: number, value: number | number[], dataType?: EnergyAppModbusDataType): Promise<boolean>;
     /**
      * Read inverter data from Model 101 (Single Phase) / Model 103 (Three Phase)
      */
-    readInverterData(): Promise<SunspecInverterData | null>;
+    readInverterData(unitId: number): Promise<SunspecInverterData | null>;
     /**
      * Read single phase inverter data (Model 101)
      */
@@ -191,7 +233,7 @@ export declare class SunspecModbusClient {
      * Extract MPPT scale factors from a pre-read model buffer
      */
     private extractMPPTScaleFactors;
-    readMPPTScaleFactors(): Promise<{
+    readMPPTScaleFactors(unitId: number): Promise<{
         DCA_SF: number;
         DCV_SF: number;
         DCW_SF: number;
@@ -204,11 +246,11 @@ export declare class SunspecModbusClient {
     /**
      * Read MPPT data from Model 160
      */
-    readMPPTData(moduleId?: number): Promise<SunspecMPPTData | null>;
+    readMPPTData(unitId: number, moduleId?: number): Promise<SunspecMPPTData | null>;
     /**
      * Read all MPPT strings from Model 160 (Multiple MPPT)
      */
-    readAllMPPTData(): Promise<SunspecMPPTData[]>;
+    readAllMPPTData(unitId: number): Promise<SunspecMPPTData[]>;
     /**
      * Map battery charge state to human-readable name
      * @param state The numeric charge state value
@@ -230,67 +272,67 @@ export declare class SunspecModbusClient {
     /**
      * Read battery base data from Model 802 (Battery Base)
      */
-    readBatteryBaseData(): Promise<SunspecBatteryBaseData | null>;
+    readBatteryBaseData(unitId: number): Promise<SunspecBatteryBaseData | null>;
     /**
      * Read battery data from Model 124 (Basic Storage) with fallback to Model 802 / Model 803
      */
-    readBatteryData(): Promise<SunspecBatteryData | null>;
+    readBatteryData(unitId: number): Promise<SunspecBatteryData | null>;
     /**
      * Write battery control settings to Model 124
      */
-    writeBatteryControls(controls: Partial<SunspecBatteryControls>): Promise<boolean>;
+    writeBatteryControls(unitId: number, controls: Partial<SunspecBatteryControls>): Promise<boolean>;
     /**
      * Set battery storage mode (simplified interface)
      */
-    setStorageMode(mode: SunspecStorageMode): Promise<boolean>;
+    setStorageMode(unitId: number, mode: SunspecStorageMode): Promise<boolean>;
     /**
      * Enable or disable grid charging
      */
-    enableGridCharging(enable: boolean): Promise<boolean>;
+    enableGridCharging(unitId: number, enable: boolean): Promise<boolean>;
     /**
      * Read battery control settings from Model 124 (Basic Storage Controls)
      */
-    readBatteryControls(): Promise<SunspecBatteryControls | null>;
+    readBatteryControls(unitId: number): Promise<SunspecBatteryControls | null>;
     /**
      * Read meter data from Model 201 (Single Phase) / Model 203 (Three Phase) / Model 204 (Split Phase)
      */
-    readMeterData(): Promise<SunspecMeterData | null>;
+    readMeterData(unitId: number): Promise<SunspecMeterData | null>;
     /**
      * Read common block data (Model 1)
      */
-    readCommonBlock(): Promise<any>;
+    readCommonBlock(unitId: number): Promise<any>;
     /**
      * Get serial number from device
      */
-    getSerialNumber(): Promise<string | undefined>;
+    getSerialNumber(unitId: number): Promise<string | undefined>;
     /**
-     * Check if connected
+     * Check if a specific unit is connected on this network device
      */
-    isConnected(): boolean;
+    isConnected(unitId: number): boolean;
     /**
-     * Check if connection is healthy
+     * Check if a specific unit's connection is healthy
      */
-    isHealthy(): boolean;
+    isHealthy(unitId: number): boolean;
     /**
-     * Get connection health details
+     * Get connection health details (shared across all units on this network device)
      */
     getConnectionHealth(): IConnectionHealth;
     /**
      * Read inverter settings from Model 121 (Inverter Settings)
      */
-    readInverterSettings(): Promise<SunspecInverterSettings | null>;
+    readInverterSettings(unitId: number): Promise<SunspecInverterSettings | null>;
     /**
      * Read inverter controls from Model 123 (Immediate Inverter Controls)
      */
-    readInverterControls(): Promise<SunspecInverterControls | null>;
+    readInverterControls(unitId: number): Promise<SunspecInverterControls | null>;
     /**
      * Write Block 121 - Inverter Basic Settings
      */
-    writeInverterSettings(settings: Partial<SunspecInverterSettings>): Promise<boolean>;
+    writeInverterSettings(unitId: number, settings: Partial<SunspecInverterSettings>): Promise<boolean>;
     /**
      * Write inverter controls to Model 123 (Immediate Inverter Controls)
      */
-    writeInverterControls(controls: Partial<SunspecInverterControls>): Promise<boolean>;
+    writeInverterControls(unitId: number, controls: Partial<SunspecInverterControls>): Promise<boolean>;
     /**
      * Set the inverter feed-in power limit using Model 123 (Immediate Inverter Controls)
      *
@@ -301,5 +343,5 @@ export declare class SunspecModbusClient {
      * @param limitW - Power limit in Watts, or null to remove the limit
      * @returns true if successful, false otherwise
      */
-    setFeedInLimit(limitW: number | null): Promise<boolean>;
+    setFeedInLimit(unitId: number, limitW: number | null): Promise<boolean>;
 }

package/dist/cjs/version.cjs

@@ -9,7 +9,7 @@ exports.getSdkVersion = getSdkVersion;
 /**
  * Current version of the enyo Energy App SDK.
  */
-exports.SDK_VERSION = '0.0.51';
+exports.SDK_VERSION = '0.0.52';
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/cjs/version.d.cts

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

package/dist/sunspec-devices.js

@@ -113,7 +113,7 @@ export class BaseSunspecDevice {
      * Check if the device is connected
      */
     isConnected() {
-        return this.sunspecClient.isHealthy();
+        return this.sunspecClient.isHealthy(this.unitId);
     }
     /**
      * Get the appliance IDs managed by this device
@@ -122,11 +122,11 @@ export class BaseSunspecDevice {
      * Ensure the Sunspec client is connected and models are discovered
      */
     async ensureConnected() {
-        if (!this.sunspecClient.isConnected()) {
+        if (!this.sunspecClient.isConnected(this.unitId)) {
             await this.sunspecClient.connect(this.networkDevice.hostname, // primary
             this.port, this.unitId, this.networkDevice.ipAddress // secondary fallback
             );
-            await this.sunspecClient.discoverModels(this.baseAddress);
+            await this.sunspecClient.discoverModels(this.unitId, this.baseAddress);
         }
     }
     /**
@@ -146,12 +146,15 @@ export class BaseSunspecDevice {
         const stats = this.sunspecClient.getConnectionStats();
         console.log(`${this.constructor.name} ${this.applianceId}: Reconnect attempt #${attempt} ` +
             `(phase: ${phase.intervalMs / 1000}s interval, elapsed: ${elapsed}s, ` +
-            `opens=${stats.opens}, closes=${stats.closes}, current=${stats.currentlyOpen})`);
+            `opens=${stats.opens}, closes=${stats.closes}, openUnits=${stats.openUnits})`);
         try {
-            const success = await this.sunspecClient.reconnect();
+            // Reconnect just this device's unit, not every unit on the shared client.
+            // This avoids thrashing sibling devices on the same network device when one
+            // device's poll loop detects a dropped connection.
+            const success = await this.sunspecClient.reconnectUnit(this.unitId);
             if (success) {
-                // Re-discover models after reconnect
-                await this.sunspecClient.discoverModels(this.baseAddress);
+                // Re-discover models for this unit after reconnect
+                await this.sunspecClient.discoverModels(this.unitId, this.baseAddress);
                 this.retryManager.reset();
                 this.consecutiveReconnectFailures = 0;
                 // Update appliance state to Connected
@@ -159,7 +162,7 @@ export class BaseSunspecDevice {
                     await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Connected);
                 }
                 const postStats = this.sunspecClient.getConnectionStats();
-                console.log(`${this.constructor.name} ${this.applianceId}: Reconnection successful after ${attempt} attempt(s) (opens=${postStats.opens}, closes=${postStats.closes}, current=${postStats.currentlyOpen})`);
+                console.log(`${this.constructor.name} ${this.applianceId}: Reconnection successful after ${attempt} attempt(s) (opens=${postStats.opens}, closes=${postStats.closes}, openUnits=${postStats.openUnits})`);
                 return true;
             }
             this.consecutiveReconnectFailures += 1;
@@ -187,15 +190,15 @@ export class BaseSunspecDevice {
     async markOffline() {
         this.retryManager.markDisconnected();
         try {
-            if (this.sunspecClient.isConnected()) {
-                await this.sunspecClient.disconnect();
+            if (this.sunspecClient.isConnected(this.unitId)) {
+                await this.sunspecClient.disconnectUnit(this.unitId);
             }
         }
         catch (error) {
             console.error(`${this.constructor.name} ${this.applianceId}: error closing socket on markOffline: ${error}`);
         }
         const stats = this.sunspecClient.getConnectionStats();
-        console.log(`${this.constructor.name} ${this.applianceId}: marked offline (opens=${stats.opens}, closes=${stats.closes}, current=${stats.currentlyOpen})`);
+        console.log(`${this.constructor.name} ${this.applianceId}: marked offline (opens=${stats.opens}, closes=${stats.closes}, openUnits=${stats.openUnits})`);
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Offline);
@@ -242,16 +245,16 @@ export class SunspecInverter extends BaseSunspecDevice {
     }
     async connect() {
         // Ensure Sunspec client is connected
-        if (!this.sunspecClient.isConnected()) {
+        if (!this.sunspecClient.isConnected(this.unitId)) {
             await this.sunspecClient.connect(this.networkDevice.hostname, // primary
             this.port, this.unitId, this.networkDevice.ipAddress // secondary fallback
             );
-            await this.sunspecClient.discoverModels(this.baseAddress);
+            await this.sunspecClient.discoverModels(this.unitId, this.baseAddress);
         }
         // Get device info from common block
-        const commonData = await this.sunspecClient.readCommonBlock();
-        const inverterSettings = await this.sunspecClient.readInverterSettings();
-        const mpptDataList = await this.sunspecClient.readAllMPPTData();
+        const commonData = await this.sunspecClient.readCommonBlock(this.unitId);
+        const inverterSettings = await this.sunspecClient.readInverterSettings(this.unitId);
+        const mpptDataList = await this.sunspecClient.readAllMPPTData(this.unitId);
         // Create or update appliance (skip if an existing appliance was provided)
         if (!this.applianceId) {
             try {
@@ -301,7 +304,7 @@ export class SunspecInverter extends BaseSunspecDevice {
             }
         }
         // Check for MPPT models
-        const mpptModel = this.sunspecClient.findModel(SunspecModelId.MPPT);
+        const mpptModel = this.sunspecClient.findModel(this.unitId, SunspecModelId.MPPT);
         if (mpptModel) {
             console.log(`MPPT model found for inverter ${this.networkDevice.hostname}`);
         }
@@ -325,9 +328,9 @@ export class SunspecInverter extends BaseSunspecDevice {
         const timestamp = new Date();
         try {
             // Read inverter data
-            const inverterData = await this.sunspecClient.readInverterData();
-            const mpptDataList = await this.sunspecClient.readAllMPPTData();
-            const inverterSettings = await this.sunspecClient.readInverterSettings();
+            const inverterData = await this.sunspecClient.readInverterData(this.unitId);
+            const mpptDataList = await this.sunspecClient.readAllMPPTData(this.unitId);
+            const inverterSettings = await this.sunspecClient.readInverterSettings(this.unitId);
             const dcStrings = this.mapMPPTToStrings(mpptDataList);
             if (inverterData) {
                 const pvPowerW = dcStrings.reduce((sum, s) => sum + (s.powerW || 0), 0);
@@ -653,7 +656,7 @@ export class SunspecInverter extends BaseSunspecDevice {
             return;
         }
         console.log(`Inverter ${this.applianceId}: handling SetInverterFeedInLimitV1 (feedInLimitW=${msg.data.feedInLimitW})`);
-        const success = await this.sunspecClient.setFeedInLimit(msg.data.feedInLimitW);
+        const success = await this.sunspecClient.setFeedInLimit(this.unitId, msg.data.feedInLimitW);
         if (!success) {
             this.sendCommandAcknowledge(msg.id, msg.message, EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set feed-in limit');
             return;
@@ -677,14 +680,14 @@ export class SunspecBattery extends BaseSunspecDevice {
         // Ensure Sunspec client is connected
         await this.ensureConnected();
         // Check if battery models exist
-        const hasBattery = this.sunspecClient.findModel(SunspecModelId.Battery) !== undefined ||
-            this.sunspecClient.findModel(SunspecModelId.BatteryBase) !== undefined;
+        const hasBattery = this.sunspecClient.findModel(this.unitId, SunspecModelId.Battery) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.BatteryBase) !== undefined;
         if (!hasBattery) {
             throw new Error('No battery model found in device');
         }
         // Get device info
-        const commonData = await this.sunspecClient.readCommonBlock();
-        const batteryData = await this.sunspecClient.readBatteryData();
+        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) {
@@ -793,12 +796,12 @@ export class SunspecBattery extends BaseSunspecDevice {
         const timestamp = new Date();
         try {
             // Read actual battery data from SunSpec device
-            const batteryData = await this.sunspecClient.readBatteryData();
-            const mpptDataList = await this.sunspecClient.readAllMPPTData();
+            const batteryData = await this.sunspecClient.readBatteryData(this.unitId);
+            const mpptDataList = await this.sunspecClient.readAllMPPTData(this.unitId);
             const mpptBatteryPowerW = this.extractBatteryPowerFromMPPT(mpptDataList);
             if (batteryData) {
-                const advancedBatteryModel = this.sunspecClient.findModel(801);
-                const batteryBaseModel = this.sunspecClient.findModel(SunspecModelId.BatteryBase);
+                const advancedBatteryModel = this.sunspecClient.findModel(this.unitId, 801);
+                const batteryBaseModel = this.sunspecClient.findModel(this.unitId, 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)) {
@@ -908,7 +911,7 @@ export class SunspecBattery extends BaseSunspecDevice {
             return false;
         }
         console.log(`Setting battery storage mode to: ${mode}`);
-        return this.sunspecClient.setStorageMode(mode);
+        return this.sunspecClient.setStorageMode(this.unitId, mode);
     }
     /**
      * Enable or disable grid charging
@@ -928,7 +931,7 @@ export class SunspecBattery extends BaseSunspecDevice {
             return false;
         }
         console.log(`${enable ? 'Enabling' : 'Disabling'} grid charging for battery`);
-        return this.sunspecClient.enableGridCharging(enable);
+        return this.sunspecClient.enableGridCharging(this.unitId, enable);
     }
     /**
      * Set battery charging power from grid
@@ -946,7 +949,7 @@ export class SunspecBattery extends BaseSunspecDevice {
             return false;
         }
         console.log(`Setting battery charging power to: ${powerW}W`);
-        return this.sunspecClient.writeBatteryControls({ wChaMax: powerW });
+        return this.sunspecClient.writeBatteryControls(this.unitId, { wChaMax: powerW });
     }
     /**
      * Get current battery control settings
@@ -958,7 +961,7 @@ export class SunspecBattery extends BaseSunspecDevice {
             console.error('Battery not connected');
             return null;
         }
-        return this.sunspecClient.readBatteryControls();
+        return this.sunspecClient.readBatteryControls(this.unitId);
     }
     /**
      * Read full battery base data from Model 802
@@ -973,7 +976,7 @@ export class SunspecBattery extends BaseSunspecDevice {
             console.error('Battery not connected');
             return null;
         }
-        return this.sunspecClient.readBatteryBaseData();
+        return this.sunspecClient.readBatteryBaseData(this.unitId);
     }
     /**
      * Write custom battery control settings
@@ -990,7 +993,7 @@ export class SunspecBattery extends BaseSunspecDevice {
             return false;
         }
         console.log('Writing battery controls:', controls);
-        return this.sunspecClient.writeBatteryControls(controls);
+        return this.sunspecClient.writeBatteryControls(this.unitId, controls);
     }
     mapToEnyoStorageMode(storageMode) {
         switch (storageMode) {
@@ -1198,14 +1201,14 @@ export class SunspecMeter extends BaseSunspecDevice {
         // Connect with specific unit ID for meter
         await this.ensureConnected();
         // Check if meter models exist
-        const hasMeter = this.sunspecClient.findModel(SunspecModelId.Meter3Phase) !== undefined ||
-            this.sunspecClient.findModel(SunspecModelId.MeterWye) !== undefined ||
-            this.sunspecClient.findModel(SunspecModelId.MeterSinglePhase) !== undefined;
+        const hasMeter = this.sunspecClient.findModel(this.unitId, SunspecModelId.Meter3Phase) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterWye) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, SunspecModelId.MeterSinglePhase) !== undefined;
         if (!hasMeter) {
             throw new Error('No meter model found in device');
         }
         // Get device info
-        const commonData = await this.sunspecClient.readCommonBlock();
+        const commonData = await this.sunspecClient.readCommonBlock(this.unitId);
         // Create or update appliance (skip if an existing appliance was provided)
         if (!this.applianceId) {
             try {
@@ -1259,8 +1262,8 @@ export class SunspecMeter extends BaseSunspecDevice {
         if (this.applianceId) {
             await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Offline);
         }
-        // Disconnect the client since meter uses its own connection
-        await this.sunspecClient.disconnect();
+        // Close just this meter's unit; other devices on the same network device stay open.
+        await this.sunspecClient.disconnectUnit(this.unitId);
     }
     /**
      * Update meter data and return data bus messages
@@ -1275,7 +1278,7 @@ export class SunspecMeter extends BaseSunspecDevice {
         const timestamp = new Date();
         try {
             // Read meter data
-            const meterData = await this.sunspecClient.readMeterData();
+            const meterData = await this.sunspecClient.readMeterData(this.unitId);
             if (meterData) {
                 const meterMessage = {
                     id: randomUUID(),