@enyo-energy/sunspec-sdk 0.0.80 → 0.0.82

package/dist/cjs/sunspec-devices.cjs

@@ -107,6 +107,15 @@ class BaseSunspecDevice {
     dataBus;
     retryManager;
     consecutiveReconnectFailures = 0;
+    /**
+     * True once {@link markOffline} has set the appliance state to Offline and
+     * it has not yet been re-asserted Connected. Used by
+     * {@link reassertConnectedIfRecovered} to heal the shared-socket case: when
+     * a sibling device on the same unit wins the reconnect race, this device's
+     * readData() sees isConnected() === true and skips tryReconnect(), so it
+     * would otherwise stay Offline forever despite reading data fine.
+     */
+    appliedOffline = false;
     /**
      * Prefix used when persisting calibration snapshots via the library's
      * {@link SnapshotService}. Kept identical to the key the SDK used before
@@ -181,6 +190,7 @@ class BaseSunspecDevice {
                 if (this.applianceId) {
                     await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Connected);
                 }
+                this.appliedOffline = false;
                 await this.onConnectionRestored();
                 const postStats = this.sunspecClient.getConnectionStats();
                 console.log(`${this.constructor.name} ${this.applianceId}: Reconnection successful after ${attempt} attempt(s) (opens=${postStats.opens}, closes=${postStats.closes}, openUnits=${postStats.openUnits})`);
@@ -249,12 +259,46 @@ class BaseSunspecDevice {
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Offline);
+                this.appliedOffline = true;
             }
             catch (error) {
                 console.error(`${this.constructor.name} ${this.applianceId}: Failed to mark appliance offline: ${error}`);
             }
         }
     }
+    /**
+     * Heal the shared-socket recovery gap. When several devices share one
+     * SunspecModbusClient on the same unit (e.g. a Fronius GEN24 inverter and
+     * its battery), only the device that detects !isConnected() first runs
+     * tryReconnect() — and that is the only path that flips the appliance back
+     * to Connected. Siblings then see isConnected() === true on their next
+     * readData() and skip tryReconnect() entirely, so without this they would
+     * stay Offline forever despite reading data fine.
+     *
+     * Call this on the success path of readData() (after the
+     * markOfflineIfUnhealthy() guard has confirmed the unit is healthy). It is
+     * a cheap no-op unless this device was previously marked offline.
+     */
+    async reassertConnectedIfRecovered() {
+        if (!this.appliedOffline || !this.applianceId) {
+            return;
+        }
+        if (!this.sunspecClient.isHealthy(this.unitId)) {
+            return;
+        }
+        console.log(`${this.constructor.name} ${this.applianceId}: connection recovered via shared socket — re-asserting Connected`);
+        try {
+            await this.applianceManager.updateApplianceState(this.applianceId, enyo_appliance_js_1.EnyoApplianceConnectionType.Connector, enyo_appliance_js_1.EnyoApplianceStateEnum.Connected);
+        }
+        catch (error) {
+            console.error(`${this.constructor.name} ${this.applianceId}: Failed to re-assert Connected: ${error}`);
+            return;
+        }
+        this.appliedOffline = false;
+        this.retryManager.reset();
+        this.consecutiveReconnectFailures = 0;
+        await this.onConnectionRestored();
+    }
     sendCommandAcknowledge(messageId, acknowledgeMessage, answer, rejectionReason) {
         if (!this.dataBus || !this.applianceId) {
             return;
@@ -420,6 +464,10 @@ class SunspecInverter extends BaseSunspecDevice {
             if (await this.markOfflineIfUnhealthy()) {
                 return messages;
             }
+            // Healthy read: if a sibling on the same shared socket reconnected us
+            // (so our own tryReconnect() never ran), flip our appliance state back
+            // to Connected. No-op unless this device is still marked offline.
+            await this.reassertConnectedIfRecovered();
             if (inverterData) {
                 const pvPowerW = dcStrings.reduce((sum, s) => sum + (s.powerW || 0), 0);
                 console.debug(`Got PV Power from DC strings: ${pvPowerW}W`);
@@ -1183,6 +1231,10 @@ class SunspecBattery extends BaseSunspecDevice {
             if (await this.markOfflineIfUnhealthy()) {
                 return messages;
             }
+            // Healthy read: if a sibling on the same shared socket reconnected us
+            // (so our own tryReconnect() never ran), flip our appliance state back
+            // to Connected. No-op unless this device is still marked offline.
+            await this.reassertConnectedIfRecovered();
             if (batteryData) {
                 // See `selectLiveBatteryPowerW` for the source-preference rationale.
                 const batteryPowerW = selectLiveBatteryPowerW(mpptBatteryPowerW, batteryData);
@@ -1696,6 +1748,10 @@ class SunspecMeter extends BaseSunspecDevice {
             if (await this.markOfflineIfUnhealthy()) {
                 return messages;
             }
+            // Healthy read: if a sibling on the same shared socket reconnected us
+            // (so our own tryReconnect() never ran), flip our appliance state back
+            // to Connected. No-op unless this device is still marked offline.
+            await this.reassertConnectedIfRecovered();
             if (meterData) {
                 const meterMessage = {
                     id: (0, node_crypto_1.randomUUID)(),

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

@@ -27,6 +27,15 @@ export declare abstract class BaseSunspecDevice {
     protected dataBus?: EnergyAppDataBus;
     protected retryManager: ConnectionRetryManager;
     protected consecutiveReconnectFailures: number;
+    /**
+     * True once {@link markOffline} has set the appliance state to Offline and
+     * it has not yet been re-asserted Connected. Used by
+     * {@link reassertConnectedIfRecovered} to heal the shared-socket case: when
+     * a sibling device on the same unit wins the reconnect race, this device's
+     * readData() sees isConnected() === true and skips tryReconnect(), so it
+     * would otherwise stay Offline forever despite reading data fine.
+     */
+    private appliedOffline;
     /**
      * Prefix used when persisting calibration snapshots via the library's
      * {@link SnapshotService}. Kept identical to the key the SDK used before
@@ -90,6 +99,20 @@ export declare abstract class BaseSunspecDevice {
      * connection after the backoff interval. Then update appliance state.
      */
     protected markOffline(): Promise<void>;
+    /**
+     * Heal the shared-socket recovery gap. When several devices share one
+     * SunspecModbusClient on the same unit (e.g. a Fronius GEN24 inverter and
+     * its battery), only the device that detects !isConnected() first runs
+     * tryReconnect() — and that is the only path that flips the appliance back
+     * to Connected. Siblings then see isConnected() === true on their next
+     * readData() and skip tryReconnect() entirely, so without this they would
+     * stay Offline forever despite reading data fine.
+     *
+     * Call this on the success path of readData() (after the
+     * markOfflineIfUnhealthy() guard has confirmed the unit is healthy). It is
+     * a cheap no-op unless this device was previously marked offline.
+     */
+    protected reassertConnectedIfRecovered(): Promise<void>;
     protected sendCommandAcknowledge(messageId: string, acknowledgeMessage: EnyoDataBusMessageEnum | string, answer: EnyoCommandAcknowledgeAnswerEnum, rejectionReason?: string): void;
     /**
      * Build a typed {@link SnapshotService} bound to this appliance's calibration storage,

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

package/dist/sunspec-devices.d.ts

@@ -27,6 +27,15 @@ export declare abstract class BaseSunspecDevice {
     protected dataBus?: EnergyAppDataBus;
     protected retryManager: ConnectionRetryManager;
     protected consecutiveReconnectFailures: number;
+    /**
+     * True once {@link markOffline} has set the appliance state to Offline and
+     * it has not yet been re-asserted Connected. Used by
+     * {@link reassertConnectedIfRecovered} to heal the shared-socket case: when
+     * a sibling device on the same unit wins the reconnect race, this device's
+     * readData() sees isConnected() === true and skips tryReconnect(), so it
+     * would otherwise stay Offline forever despite reading data fine.
+     */
+    private appliedOffline;
     /**
      * Prefix used when persisting calibration snapshots via the library's
      * {@link SnapshotService}. Kept identical to the key the SDK used before
@@ -90,6 +99,20 @@ export declare abstract class BaseSunspecDevice {
      * connection after the backoff interval. Then update appliance state.
      */
     protected markOffline(): Promise<void>;
+    /**
+     * Heal the shared-socket recovery gap. When several devices share one
+     * SunspecModbusClient on the same unit (e.g. a Fronius GEN24 inverter and
+     * its battery), only the device that detects !isConnected() first runs
+     * tryReconnect() — and that is the only path that flips the appliance back
+     * to Connected. Siblings then see isConnected() === true on their next
+     * readData() and skip tryReconnect() entirely, so without this they would
+     * stay Offline forever despite reading data fine.
+     *
+     * Call this on the success path of readData() (after the
+     * markOfflineIfUnhealthy() guard has confirmed the unit is healthy). It is
+     * a cheap no-op unless this device was previously marked offline.
+     */
+    protected reassertConnectedIfRecovered(): Promise<void>;
     protected sendCommandAcknowledge(messageId: string, acknowledgeMessage: EnyoDataBusMessageEnum | string, answer: EnyoCommandAcknowledgeAnswerEnum, rejectionReason?: string): void;
     /**
      * Build a typed {@link SnapshotService} bound to this appliance's calibration storage,

package/dist/sunspec-devices.js

@@ -101,6 +101,15 @@ export class BaseSunspecDevice {
     dataBus;
     retryManager;
     consecutiveReconnectFailures = 0;
+    /**
+     * True once {@link markOffline} has set the appliance state to Offline and
+     * it has not yet been re-asserted Connected. Used by
+     * {@link reassertConnectedIfRecovered} to heal the shared-socket case: when
+     * a sibling device on the same unit wins the reconnect race, this device's
+     * readData() sees isConnected() === true and skips tryReconnect(), so it
+     * would otherwise stay Offline forever despite reading data fine.
+     */
+    appliedOffline = false;
     /**
      * Prefix used when persisting calibration snapshots via the library's
      * {@link SnapshotService}. Kept identical to the key the SDK used before
@@ -175,6 +184,7 @@ export class BaseSunspecDevice {
                 if (this.applianceId) {
                     await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Connected);
                 }
+                this.appliedOffline = false;
                 await this.onConnectionRestored();
                 const postStats = this.sunspecClient.getConnectionStats();
                 console.log(`${this.constructor.name} ${this.applianceId}: Reconnection successful after ${attempt} attempt(s) (opens=${postStats.opens}, closes=${postStats.closes}, openUnits=${postStats.openUnits})`);
@@ -243,12 +253,46 @@ export class BaseSunspecDevice {
         if (this.applianceId) {
             try {
                 await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Offline);
+                this.appliedOffline = true;
             }
             catch (error) {
                 console.error(`${this.constructor.name} ${this.applianceId}: Failed to mark appliance offline: ${error}`);
             }
         }
     }
+    /**
+     * Heal the shared-socket recovery gap. When several devices share one
+     * SunspecModbusClient on the same unit (e.g. a Fronius GEN24 inverter and
+     * its battery), only the device that detects !isConnected() first runs
+     * tryReconnect() — and that is the only path that flips the appliance back
+     * to Connected. Siblings then see isConnected() === true on their next
+     * readData() and skip tryReconnect() entirely, so without this they would
+     * stay Offline forever despite reading data fine.
+     *
+     * Call this on the success path of readData() (after the
+     * markOfflineIfUnhealthy() guard has confirmed the unit is healthy). It is
+     * a cheap no-op unless this device was previously marked offline.
+     */
+    async reassertConnectedIfRecovered() {
+        if (!this.appliedOffline || !this.applianceId) {
+            return;
+        }
+        if (!this.sunspecClient.isHealthy(this.unitId)) {
+            return;
+        }
+        console.log(`${this.constructor.name} ${this.applianceId}: connection recovered via shared socket — re-asserting Connected`);
+        try {
+            await this.applianceManager.updateApplianceState(this.applianceId, EnyoApplianceConnectionType.Connector, EnyoApplianceStateEnum.Connected);
+        }
+        catch (error) {
+            console.error(`${this.constructor.name} ${this.applianceId}: Failed to re-assert Connected: ${error}`);
+            return;
+        }
+        this.appliedOffline = false;
+        this.retryManager.reset();
+        this.consecutiveReconnectFailures = 0;
+        await this.onConnectionRestored();
+    }
     sendCommandAcknowledge(messageId, acknowledgeMessage, answer, rejectionReason) {
         if (!this.dataBus || !this.applianceId) {
             return;
@@ -413,6 +457,10 @@ export class SunspecInverter extends BaseSunspecDevice {
             if (await this.markOfflineIfUnhealthy()) {
                 return messages;
             }
+            // Healthy read: if a sibling on the same shared socket reconnected us
+            // (so our own tryReconnect() never ran), flip our appliance state back
+            // to Connected. No-op unless this device is still marked offline.
+            await this.reassertConnectedIfRecovered();
             if (inverterData) {
                 const pvPowerW = dcStrings.reduce((sum, s) => sum + (s.powerW || 0), 0);
                 console.debug(`Got PV Power from DC strings: ${pvPowerW}W`);
@@ -1175,6 +1223,10 @@ export class SunspecBattery extends BaseSunspecDevice {
             if (await this.markOfflineIfUnhealthy()) {
                 return messages;
             }
+            // Healthy read: if a sibling on the same shared socket reconnected us
+            // (so our own tryReconnect() never ran), flip our appliance state back
+            // to Connected. No-op unless this device is still marked offline.
+            await this.reassertConnectedIfRecovered();
             if (batteryData) {
                 // See `selectLiveBatteryPowerW` for the source-preference rationale.
                 const batteryPowerW = selectLiveBatteryPowerW(mpptBatteryPowerW, batteryData);
@@ -1687,6 +1739,10 @@ export class SunspecMeter extends BaseSunspecDevice {
             if (await this.markOfflineIfUnhealthy()) {
                 return messages;
             }
+            // Healthy read: if a sibling on the same shared socket reconnected us
+            // (so our own tryReconnect() never ran), flip our appliance state back
+            // to Connected. No-op unless this device is still marked offline.
+            await this.reassertConnectedIfRecovered();
             if (meterData) {
                 const meterMessage = {
                     id: randomUUID(),

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.80";
+export declare const SDK_VERSION = "0.0.82";
 /**
  * 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.80';
+export const SDK_VERSION = '0.0.82';
 /**
  * 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.80",
+  "version": "0.0.82",
   "description": "enyo Energy Sunspec SDK",
   "type": "module",
   "main": "dist/index.js",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@enyo-energy/appliance-calibration": "0.0.2",
-    "@enyo-energy/energy-app-sdk": "^0.0.149"
+    "@enyo-energy/energy-app-sdk": "^0.0.160"
   },
   "volta": {
     "node": "22.17.0"