@enyo-energy/sunspec-sdk 0.0.46 → 0.0.48

package/dist/cjs/sunspec-devices.cjs

@@ -74,8 +74,10 @@ class BaseSunspecDevice {
         const phase = this.retryManager.getCurrentPhase();
         const attempt = this.retryManager.getAttemptCount();
         const elapsed = Math.round(this.retryManager.getElapsedMs() / 1000);
+        const stats = this.sunspecClient.getConnectionStats();
         console.log(`${this.constructor.name} ${this.applianceId}: Reconnect attempt #${attempt} ` +
-            `(phase: ${phase.intervalMs / 1000}s interval, elapsed: ${elapsed}s)`);
+            `(phase: ${phase.intervalMs / 1000}s interval, elapsed: ${elapsed}s, ` +
+            `opens=${stats.opens}, closes=${stats.closes}, current=${stats.currentlyOpen})`);
         try {
             const success = await this.sunspecClient.reconnect();
             if (success) {
@@ -86,7 +88,8 @@ class BaseSunspecDevice {
                 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)`);
+                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})`);
                 return true;
             }
         }
@@ -96,10 +99,22 @@ class BaseSunspecDevice {
         return false;
     }
     /**
-     * Mark the device as offline: update appliance state and start tracking disconnection.
+     * Mark the device as offline: close the underlying socket so the next readData()
+     * cycle sees isConnected() === false and tryReconnect() can establish a fresh
+     * connection after the backoff interval. Then update appliance state.
      */
     async markOffline() {
         this.retryManager.markDisconnected();
+        try {
+            if (this.sunspecClient.isConnected()) {
+                await this.sunspecClient.disconnect();
+            }
+        }
+        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})`);
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
@@ -248,6 +263,7 @@ class SunspecInverter extends BaseSunspecDevice {
                         voltageL1: inverterData.voltageAN || 0,
                         voltageL2: inverterData.voltageBN ?? undefined,
                         voltageL3: inverterData.voltageCN ?? undefined,
+                        meterValueWh: inverterData.acEnergy,
                         strings: dcStrings
                     }
                 };
@@ -305,6 +321,7 @@ class SunspecInverter extends BaseSunspecDevice {
                     current: mppt.dcCurrent,
                     voltage: mppt.dcVoltage,
                     powerW: mppt.dcPower,
+                    meterValueWh: mppt.dcEnergy,
                 });
             }
         });

package/dist/cjs/sunspec-devices.d.cts

@@ -54,7 +54,9 @@ export declare abstract class BaseSunspecDevice {
      */
     protected tryReconnect(): Promise<boolean>;
     /**
-     * Mark the device as offline: update appliance state and start tracking disconnection.
+     * Mark the device as offline: close the underlying socket so the next readData()
+     * cycle sees isConnected() === false and tryReconnect() can establish a fresh
+     * connection after the backoff interval. Then update appliance state.
      */
     protected markOffline(): Promise<void>;
     protected sendCommandAcknowledge(messageId: string, acknowledgeMessage: EnyoDataBusMessageEnum | string, answer: EnyoCommandAcknowledgeAnswerEnum, rejectionReason?: string): void;

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

@@ -33,6 +33,9 @@ class SunspecModbusClient {
     modbusDataTypeConverter;
     connectionParams = null;
     autoReconnectEnabled = true;
+    openCount = 0;
+    closeCount = 0;
+    currentlyOpen = 0;
     constructor(energyApp) {
         this.energyApp = energyApp;
         this.connectionHealth = new EnergyAppModbusConnectionHealth_js_1.EnergyAppModbusConnectionHealth();
@@ -63,10 +66,14 @@ class SunspecModbusClient {
         }
         this.connected = true;
         this.connectionHealth.recordSuccess();
-        console.log(`Connected to Sunspec device at ${host}:${port} unit ${unitId}`);
+        this.recordOpen();
+        console.log(`Connected to Sunspec device at ${host}:${port} unit ${unitId} (opens=${this.openCount}, closes=${this.closeCount}, current=${this.currentlyOpen})`);
     }
     /**
-     * Disconnect from Modbus device
+     * Disconnect from Modbus device.
+     *
+     * Note: connection parameters are preserved so reconnect() can be called afterwards.
+     * They will be overwritten by the next connect() call anyway.
      */
     async disconnect() {
         if (this.modbusClient && this.connected) {
@@ -75,9 +82,12 @@ class SunspecModbusClient {
             this.faultTolerantReader = null;
             this.connected = false;
             this.discoveredModels.clear();
+            this.recordClose();
+            const host = this.connectionParams?.primaryHost ?? 'unknown';
+            const port = this.connectionParams?.port ?? 0;
+            const unitId = this.connectionParams?.unitId ?? 0;
+            console.log(`Disconnected from Sunspec device at ${host}:${port} unit ${unitId} (opens=${this.openCount}, closes=${this.closeCount}, current=${this.currentlyOpen})`);
         }
-        // Clear stored connection params
-        this.connectionParams = null;
     }
     /**
      * Reconnect using stored connection parameters
@@ -118,6 +128,7 @@ class SunspecModbusClient {
         try {
             // Disconnect existing connection if any
             if (this.modbusClient) {
+                const wasConnected = this.connected;
                 try {
                     await this.modbusClient.disconnect();
                 }
@@ -126,6 +137,10 @@ class SunspecModbusClient {
                 }
                 this.modbusClient = null;
                 this.faultTolerantReader = null;
+                if (wasConnected) {
+                    this.connected = false;
+                    this.recordClose();
+                }
             }
             // Attempt connection
             this.modbusClient = await this.energyApp.useModbus().connect({
@@ -140,6 +155,8 @@ class SunspecModbusClient {
             }
             this.connected = true;
             this.connectionHealth.recordSuccess();
+            this.recordOpen();
+            console.log(`Connection attempt to ${host}:${port} unit ${unitId} succeeded (opens=${this.openCount}, closes=${this.closeCount}, current=${this.currentlyOpen})`);
             return true;
         }
         catch (error) {
@@ -147,6 +164,25 @@ class SunspecModbusClient {
             return false;
         }
     }
+    recordOpen() {
+        this.openCount++;
+        this.currentlyOpen++;
+    }
+    recordClose() {
+        this.closeCount++;
+        if (this.currentlyOpen > 0) {
+            this.currentlyOpen--;
+        }
+        else {
+            console.warn(`SunspecModbusClient: closeCount incremented while currentlyOpen was 0 — possible double-close`);
+        }
+    }
+    /**
+     * Get cumulative open/close counts for this client. Useful for spotting connection leaks.
+     */
+    getConnectionStats() {
+        return { opens: this.openCount, closes: this.closeCount, currentlyOpen: this.currentlyOpen };
+    }
     /**
      * Enable or disable automatic reconnection
      */
@@ -585,6 +621,7 @@ class SunspecModbusClient {
                 V_SF: this.extractValue(buffer, 13, 'int16'),
                 W_SF: this.extractValue(buffer, 10, 'int16'),
                 Hz_SF: this.extractValue(buffer, 12, 'int16'),
+                WH_SF: this.extractValue(buffer, 26, 'int16'),
                 DCA_SF: this.extractValue(buffer, 18, 'int16'),
                 DCV_SF: this.extractValue(buffer, 19, 'int16'),
                 DCW_SF: this.extractValue(buffer, 21, 'int16')
@@ -593,6 +630,7 @@ class SunspecModbusClient {
             this.logRegisterRead(101, 13, 'V_SF', scaleFactors.V_SF, 'int16');
             this.logRegisterRead(101, 10, 'W_SF', scaleFactors.W_SF, 'int16');
             this.logRegisterRead(101, 12, 'Hz_SF', scaleFactors.Hz_SF, 'int16');
+            this.logRegisterRead(101, 26, 'WH_SF', scaleFactors.WH_SF, 'int16');
             this.logRegisterRead(101, 18, 'DCA_SF', scaleFactors.DCA_SF, 'int16');
             this.logRegisterRead(101, 19, 'DCV_SF', scaleFactors.DCV_SF, 'int16');
             this.logRegisterRead(101, 21, 'DCW_SF', scaleFactors.DCW_SF, 'int16');
@@ -617,6 +655,12 @@ class SunspecModbusClient {
                 dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF, 'int16', 'DC Power', 20, 101),
                 operatingState: stateRaw
             };
+            // Read AC Energy (32-bit accumulator) - Offset 24-25
+            const acEnergy = this.extractValue(buffer, 24, 'uint32', 2);
+            this.logRegisterRead(101, 24, 'AC Energy', acEnergy, 'acc32');
+            data.acEnergy = !this.isUnimplementedValue(acEnergy, 'acc32')
+                ? acEnergy * Math.pow(10, scaleFactors.WH_SF)
+                : undefined;
             console.debug('[Model 101] Single Phase Inverter Data:', data);
             return data;
         }

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

@@ -29,6 +29,9 @@ export declare class SunspecModbusClient {
     private modbusDataTypeConverter;
     private connectionParams;
     private autoReconnectEnabled;
+    private openCount;
+    private closeCount;
+    private currentlyOpen;
     constructor(energyApp: EnergyApp);
     /**
      * Connect to Modbus device
@@ -39,7 +42,10 @@ export declare class SunspecModbusClient {
      */
     connect(host: string, port?: number, unitId?: number, secondaryHost?: string): Promise<void>;
     /**
-     * Disconnect from Modbus device
+     * Disconnect from Modbus device.
+     *
+     * Note: connection parameters are preserved so reconnect() can be called afterwards.
+     * They will be overwritten by the next connect() call anyway.
      */
     disconnect(): Promise<void>;
     /**
@@ -53,6 +59,16 @@ export declare class SunspecModbusClient {
      * Returns true if successful, false otherwise
      */
     private attemptConnection;
+    private recordOpen;
+    private recordClose;
+    /**
+     * Get cumulative open/close counts for this client. Useful for spotting connection leaks.
+     */
+    getConnectionStats(): {
+        opens: number;
+        closes: number;
+        currentlyOpen: number;
+    };
     /**
      * Enable or disable automatic reconnection
      */

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.46';
+exports.SDK_VERSION = '0.0.48';
 /**
  * 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.46";
+export declare const SDK_VERSION = "0.0.48";
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/dist/sunspec-devices.d.ts

@@ -54,7 +54,9 @@ export declare abstract class BaseSunspecDevice {
      */
     protected tryReconnect(): Promise<boolean>;
     /**
-     * Mark the device as offline: update appliance state and start tracking disconnection.
+     * Mark the device as offline: close the underlying socket so the next readData()
+     * cycle sees isConnected() === false and tryReconnect() can establish a fresh
+     * connection after the backoff interval. Then update appliance state.
      */
     protected markOffline(): Promise<void>;
     protected sendCommandAcknowledge(messageId: string, acknowledgeMessage: EnyoDataBusMessageEnum | string, answer: EnyoCommandAcknowledgeAnswerEnum, rejectionReason?: string): void;

package/dist/sunspec-devices.js

@@ -71,8 +71,10 @@ export class BaseSunspecDevice {
         const phase = this.retryManager.getCurrentPhase();
         const attempt = this.retryManager.getAttemptCount();
         const elapsed = Math.round(this.retryManager.getElapsedMs() / 1000);
+        const stats = this.sunspecClient.getConnectionStats();
         console.log(`${this.constructor.name} ${this.applianceId}: Reconnect attempt #${attempt} ` +
-            `(phase: ${phase.intervalMs / 1000}s interval, elapsed: ${elapsed}s)`);
+            `(phase: ${phase.intervalMs / 1000}s interval, elapsed: ${elapsed}s, ` +
+            `opens=${stats.opens}, closes=${stats.closes}, current=${stats.currentlyOpen})`);
         try {
             const success = await this.sunspecClient.reconnect();
             if (success) {
@@ -83,7 +85,8 @@ export class BaseSunspecDevice {
                 if (this.applianceId) {
                     await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Connected);
                 }
-                console.log(`${this.constructor.name} ${this.applianceId}: Reconnection successful after ${attempt} attempt(s)`);
+                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})`);
                 return true;
             }
         }
@@ -93,10 +96,22 @@ export class BaseSunspecDevice {
         return false;
     }
     /**
-     * Mark the device as offline: update appliance state and start tracking disconnection.
+     * Mark the device as offline: close the underlying socket so the next readData()
+     * cycle sees isConnected() === false and tryReconnect() can establish a fresh
+     * connection after the backoff interval. Then update appliance state.
      */
     async markOffline() {
         this.retryManager.markDisconnected();
+        try {
+            if (this.sunspecClient.isConnected()) {
+                await this.sunspecClient.disconnect();
+            }
+        }
+        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})`);
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Offline);
@@ -244,6 +259,7 @@ export class SunspecInverter extends BaseSunspecDevice {
                         voltageL1: inverterData.voltageAN || 0,
                         voltageL2: inverterData.voltageBN ?? undefined,
                         voltageL3: inverterData.voltageCN ?? undefined,
+                        meterValueWh: inverterData.acEnergy,
                         strings: dcStrings
                     }
                 };
@@ -301,6 +317,7 @@ export class SunspecInverter extends BaseSunspecDevice {
                     current: mppt.dcCurrent,
                     voltage: mppt.dcVoltage,
                     powerW: mppt.dcPower,
+                    meterValueWh: mppt.dcEnergy,
                 });
             }
         });

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

@@ -29,6 +29,9 @@ export declare class SunspecModbusClient {
     private modbusDataTypeConverter;
     private connectionParams;
     private autoReconnectEnabled;
+    private openCount;
+    private closeCount;
+    private currentlyOpen;
     constructor(energyApp: EnergyApp);
     /**
      * Connect to Modbus device
@@ -39,7 +42,10 @@ export declare class SunspecModbusClient {
      */
     connect(host: string, port?: number, unitId?: number, secondaryHost?: string): Promise<void>;
     /**
-     * Disconnect from Modbus device
+     * Disconnect from Modbus device.
+     *
+     * Note: connection parameters are preserved so reconnect() can be called afterwards.
+     * They will be overwritten by the next connect() call anyway.
      */
     disconnect(): Promise<void>;
     /**
@@ -53,6 +59,16 @@ export declare class SunspecModbusClient {
      * Returns true if successful, false otherwise
      */
     private attemptConnection;
+    private recordOpen;
+    private recordClose;
+    /**
+     * Get cumulative open/close counts for this client. Useful for spotting connection leaks.
+     */
+    getConnectionStats(): {
+        opens: number;
+        closes: number;
+        currentlyOpen: number;
+    };
     /**
      * Enable or disable automatic reconnection
      */

package/dist/sunspec-modbus-client.js

@@ -30,6 +30,9 @@ export class SunspecModbusClient {
     modbusDataTypeConverter;
     connectionParams = null;
     autoReconnectEnabled = true;
+    openCount = 0;
+    closeCount = 0;
+    currentlyOpen = 0;
     constructor(energyApp) {
         this.energyApp = energyApp;
         this.connectionHealth = new EnergyAppModbusConnectionHealth();
@@ -60,10 +63,14 @@ export class SunspecModbusClient {
         }
         this.connected = true;
         this.connectionHealth.recordSuccess();
-        console.log(`Connected to Sunspec device at ${host}:${port} unit ${unitId}`);
+        this.recordOpen();
+        console.log(`Connected to Sunspec device at ${host}:${port} unit ${unitId} (opens=${this.openCount}, closes=${this.closeCount}, current=${this.currentlyOpen})`);
     }
     /**
-     * Disconnect from Modbus device
+     * Disconnect from Modbus device.
+     *
+     * Note: connection parameters are preserved so reconnect() can be called afterwards.
+     * They will be overwritten by the next connect() call anyway.
      */
     async disconnect() {
         if (this.modbusClient && this.connected) {
@@ -72,9 +79,12 @@ export class SunspecModbusClient {
             this.faultTolerantReader = null;
             this.connected = false;
             this.discoveredModels.clear();
+            this.recordClose();
+            const host = this.connectionParams?.primaryHost ?? 'unknown';
+            const port = this.connectionParams?.port ?? 0;
+            const unitId = this.connectionParams?.unitId ?? 0;
+            console.log(`Disconnected from Sunspec device at ${host}:${port} unit ${unitId} (opens=${this.openCount}, closes=${this.closeCount}, current=${this.currentlyOpen})`);
         }
-        // Clear stored connection params
-        this.connectionParams = null;
     }
     /**
      * Reconnect using stored connection parameters
@@ -115,6 +125,7 @@ export class SunspecModbusClient {
         try {
             // Disconnect existing connection if any
             if (this.modbusClient) {
+                const wasConnected = this.connected;
                 try {
                     await this.modbusClient.disconnect();
                 }
@@ -123,6 +134,10 @@ export class SunspecModbusClient {
                 }
                 this.modbusClient = null;
                 this.faultTolerantReader = null;
+                if (wasConnected) {
+                    this.connected = false;
+                    this.recordClose();
+                }
             }
             // Attempt connection
             this.modbusClient = await this.energyApp.useModbus().connect({
@@ -137,6 +152,8 @@ export class SunspecModbusClient {
             }
             this.connected = true;
             this.connectionHealth.recordSuccess();
+            this.recordOpen();
+            console.log(`Connection attempt to ${host}:${port} unit ${unitId} succeeded (opens=${this.openCount}, closes=${this.closeCount}, current=${this.currentlyOpen})`);
             return true;
         }
         catch (error) {
@@ -144,6 +161,25 @@ export class SunspecModbusClient {
             return false;
         }
     }
+    recordOpen() {
+        this.openCount++;
+        this.currentlyOpen++;
+    }
+    recordClose() {
+        this.closeCount++;
+        if (this.currentlyOpen > 0) {
+            this.currentlyOpen--;
+        }
+        else {
+            console.warn(`SunspecModbusClient: closeCount incremented while currentlyOpen was 0 — possible double-close`);
+        }
+    }
+    /**
+     * Get cumulative open/close counts for this client. Useful for spotting connection leaks.
+     */
+    getConnectionStats() {
+        return { opens: this.openCount, closes: this.closeCount, currentlyOpen: this.currentlyOpen };
+    }
     /**
      * Enable or disable automatic reconnection
      */
@@ -582,6 +618,7 @@ export class SunspecModbusClient {
                 V_SF: this.extractValue(buffer, 13, 'int16'),
                 W_SF: this.extractValue(buffer, 10, 'int16'),
                 Hz_SF: this.extractValue(buffer, 12, 'int16'),
+                WH_SF: this.extractValue(buffer, 26, 'int16'),
                 DCA_SF: this.extractValue(buffer, 18, 'int16'),
                 DCV_SF: this.extractValue(buffer, 19, 'int16'),
                 DCW_SF: this.extractValue(buffer, 21, 'int16')
@@ -590,6 +627,7 @@ export class SunspecModbusClient {
             this.logRegisterRead(101, 13, 'V_SF', scaleFactors.V_SF, 'int16');
             this.logRegisterRead(101, 10, 'W_SF', scaleFactors.W_SF, 'int16');
             this.logRegisterRead(101, 12, 'Hz_SF', scaleFactors.Hz_SF, 'int16');
+            this.logRegisterRead(101, 26, 'WH_SF', scaleFactors.WH_SF, 'int16');
             this.logRegisterRead(101, 18, 'DCA_SF', scaleFactors.DCA_SF, 'int16');
             this.logRegisterRead(101, 19, 'DCV_SF', scaleFactors.DCV_SF, 'int16');
             this.logRegisterRead(101, 21, 'DCW_SF', scaleFactors.DCW_SF, 'int16');
@@ -614,6 +652,12 @@ export class SunspecModbusClient {
                 dcPower: this.applyScaleFactor(dcPowerRaw, scaleFactors.DCW_SF, 'int16', 'DC Power', 20, 101),
                 operatingState: stateRaw
             };
+            // Read AC Energy (32-bit accumulator) - Offset 24-25
+            const acEnergy = this.extractValue(buffer, 24, 'uint32', 2);
+            this.logRegisterRead(101, 24, 'AC Energy', acEnergy, 'acc32');
+            data.acEnergy = !this.isUnimplementedValue(acEnergy, 'acc32')
+                ? acEnergy * Math.pow(10, scaleFactors.WH_SF)
+                : undefined;
             console.debug('[Model 101] Single Phase Inverter Data:', data);
             return data;
         }

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.46";
+export declare const SDK_VERSION = "0.0.48";
 /**
  * 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.46';
+export const SDK_VERSION = '0.0.48';
 /**
  * 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.46",
+  "version": "0.0.48",
   "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.110"
+    "@enyo-energy/energy-app-sdk": "^0.0.113"
   },
   "volta": {
     "node": "22.17.0"