@enyo-energy/sunspec-sdk 0.0.51 → 0.0.54

package/dist/cjs/sunspec-devices.cjs

@@ -116,7 +116,7 @@ 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
@@ -125,11 +125,11 @@ 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);
         }
     }
     /**
@@ -149,12 +149,15 @@ 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
@@ -162,7 +165,7 @@ class BaseSunspecDevice {
                     await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.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;
@@ -190,15 +193,15 @@ 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, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
@@ -246,16 +249,16 @@ 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 {
@@ -305,7 +308,7 @@ class SunspecInverter extends BaseSunspecDevice {
             }
         }
         // Check for MPPT models
-        const mpptModel = this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.MPPT);
+        const mpptModel = this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MPPT);
         if (mpptModel) {
             console.log(`MPPT model found for inverter ${this.networkDevice.hostname}`);
         }
@@ -329,9 +332,9 @@ 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);
@@ -657,7 +660,7 @@ 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, enyo_data_bus_value_js_1.EnyoCommandAcknowledgeAnswerEnum.Rejected, 'Failed to set feed-in limit');
             return;
@@ -682,14 +685,14 @@ class SunspecBattery extends BaseSunspecDevice {
         // Ensure Sunspec client is connected
         await this.ensureConnected();
         // Check if battery models exist
-        const hasBattery = this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.Battery) !== undefined ||
-            this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.BatteryBase) !== undefined;
+        const hasBattery = this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.Battery) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.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) {
@@ -798,12 +801,12 @@ 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(sunspec_interfaces_js_1.SunspecModelId.BatteryBase);
+                const advancedBatteryModel = this.sunspecClient.findModel(this.unitId, 801);
+                const batteryBaseModel = this.sunspecClient.findModel(this.unitId, 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)) {
@@ -913,7 +916,7 @@ 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
@@ -933,7 +936,7 @@ 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
@@ -951,7 +954,7 @@ 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
@@ -963,7 +966,7 @@ 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
@@ -978,7 +981,7 @@ 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
@@ -995,7 +998,7 @@ 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) {
@@ -1204,14 +1207,14 @@ class SunspecMeter extends BaseSunspecDevice {
         // Connect with specific unit ID for meter
         await this.ensureConnected();
         // Check if meter models exist
-        const hasMeter = this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.Meter3Phase) !== undefined ||
-            this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.MeterWye) !== undefined ||
-            this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.MeterSinglePhase) !== undefined;
+        const hasMeter = this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.Meter3Phase) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.SunspecModelId.MeterWye) !== undefined ||
+            this.sunspecClient.findModel(this.unitId, sunspec_interfaces_js_1.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 {
@@ -1265,8 +1268,8 @@ class SunspecMeter extends BaseSunspecDevice {
         if (this.applianceId) {
             await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.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
@@ -1281,7 +1284,7 @@ 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: (0, node_crypto_1.randomUUID)(),

package/dist/cjs/sunspec-interfaces.cjs

@@ -20,6 +20,9 @@ var SunspecModelId;
     SunspecModelId[SunspecModelId["Common"] = 1] = "Common";
     SunspecModelId[SunspecModelId["Inverter3Phase"] = 103] = "Inverter3Phase";
     SunspecModelId[SunspecModelId["InverterSinglePhase"] = 101] = "InverterSinglePhase";
+    SunspecModelId[SunspecModelId["InverterSinglePhaseFloat"] = 111] = "InverterSinglePhaseFloat";
+    SunspecModelId[SunspecModelId["InverterSplitPhaseFloat"] = 112] = "InverterSplitPhaseFloat";
+    SunspecModelId[SunspecModelId["Inverter3PhaseFloat"] = 113] = "Inverter3PhaseFloat";
     SunspecModelId[SunspecModelId["MPPT"] = 160] = "MPPT";
     SunspecModelId[SunspecModelId["Battery"] = 124] = "Battery";
     SunspecModelId[SunspecModelId["BatteryBase"] = 802] = "BatteryBase";

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

@@ -30,6 +30,9 @@ export declare enum SunspecModelId {
     Common = 1,
     Inverter3Phase = 103,
     InverterSinglePhase = 101,
+    InverterSinglePhaseFloat = 111,
+    InverterSplitPhaseFloat = 112,
+    Inverter3PhaseFloat = 113,
     MPPT = 160,
     Battery = 124,
     BatteryBase = 802,
@@ -74,10 +77,12 @@ export interface SunspecCommonBlock extends SunspecBlock {
     deviceAddress?: number;
 }
 /**
- * Inverter data structure based on Model 103
+ * Inverter data structure. Covers SunSpec int+SF inverter models 101/103 and float variants 111/112/113.
+ * The per-field offset comments below describe the int+SF (101/103) layout; float variants 111/112/113
+ * use 32-bit IEEE 754 float values at different offsets — see the float reader implementations.
  */
 export interface SunspecInverterData extends SunspecBlock {
-    blockNumber: 103 | 101;
+    blockNumber: 103 | 101 | 113 | 112 | 111;
     acCurrent?: number;
     phaseACurrent?: number;
     phaseBCurrent?: number;