@enyo-energy/sunspec-sdk 0.0.42 → 0.0.43

package/dist/cjs/sunspec-devices.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SunspecMeter = exports.SunspecBattery = exports.SunspecInverter = exports.BaseSunspecDevice = exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = void 0;
+exports.SunspecMeter = exports.SunspecBattery = exports.SunspecInverter = exports.BaseSunspecDevice = void 0;
 const sunspec_interfaces_js_1 = require("./sunspec-interfaces.cjs");
 const node_crypto_1 = require("node:crypto");
 const enyo_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js");
@@ -9,8 +9,6 @@ const enyo_data_bus_value_js_1 = require("@enyo-energy/energy-app-sdk/dist/types
 const enyo_source_enum_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-source.enum.js");
 const enyo_meter_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-meter-appliance.js");
 const enyo_battery_appliance_js_1 = require("@enyo-energy/energy-app-sdk/dist/types/enyo-battery-appliance.js");
-// TODO: Remove once added to @enyo-energy/energy-app-sdk EnyoDataBusMessageEnum
-exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = 'SetInverterFeedInLimitV1';
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -28,7 +26,7 @@ class BaseSunspecDevice {
     dataBusListenerId;
     dataBus;
     retryManager;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, retryConfig) {
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, retryConfig, appliance) {
         this.energyApp = energyApp;
         this.name = name;
         this.networkDevice = networkDevice;
@@ -38,12 +36,15 @@ class BaseSunspecDevice {
         this.port = port;
         this.baseAddress = baseAddress;
         this.retryManager = new connection_retry_manager_js_1.ConnectionRetryManager(retryConfig);
+        if (appliance) {
+            this.applianceId = appliance.id;
+        }
     }
     /**
      * Check if the device is connected
      */
     isConnected() {
-        return this.sunspecClient.isConnected();
+        return this.sunspecClient.isHealthy();
     }
     /**
      * Get the appliance IDs managed by this device
@@ -136,8 +137,8 @@ exports.BaseSunspecDevice = BaseSunspecDevice;
  */
 class SunspecInverter extends BaseSunspecDevice {
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
-        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance);
         this.capabilities = capabilities;
     }
     async connect() {
@@ -152,29 +153,31 @@ class SunspecInverter extends BaseSunspecDevice {
         const commonData = await this.sunspecClient.readCommonBlock();
         const inverterSettings = await this.sunspecClient.readInverterSettings();
         const mpptDataList = await this.sunspecClient.readAllMPPTData();
-        // Create or update appliance
-        try {
-            this.applianceId = await this.applianceManager.createOrUpdateAppliance({
-                name: this.name,
-                type: enyo_appliance_js_1.EnyoApplianceTypeEnum.Inverter,
-                networkDevices: [this.networkDevice],
-                metadata: {
-                    connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
-                    state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber,
-                    modelName: commonData?.model,
-                    vendorName: commonData?.manufacturer,
-                    modbus: { unitId: this.unitId },
-                },
-                inverter: {
-                    dcStrings: this.mapDcStringToApplianceMetadata(this.mapMPPTToStrings(mpptDataList)),
-                    maxPvProductionW: inverterSettings?.WMax
-                }
-            });
-            console.log(`Sunspec Inverter connected: ${this.networkDevice.hostname} (${this.applianceId})`);
-        }
-        catch (error) {
-            console.error(`Failed to create inverter appliance: ${error}`);
+        // Create or update appliance (skip if an existing appliance was provided)
+        if (!this.applianceId) {
+            try {
+                this.applianceId = await this.applianceManager.createOrUpdateAppliance({
+                    name: this.name,
+                    type: enyo_appliance_js_1.EnyoApplianceTypeEnum.Inverter,
+                    networkDevices: [this.networkDevice],
+                    metadata: {
+                        connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
+                        state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
+                        serialNumber: commonData?.serialNumber,
+                        modelName: commonData?.model,
+                        vendorName: commonData?.manufacturer,
+                        modbus: { unitId: this.unitId },
+                    },
+                    inverter: {
+                        dcStrings: this.mapDcStringToApplianceMetadata(this.mapMPPTToStrings(mpptDataList)),
+                        maxPvProductionW: inverterSettings?.WMax
+                    }
+                });
+                console.log(`Sunspec Inverter connected: ${this.networkDevice.hostname} (${this.applianceId})`);
+            }
+            catch (error) {
+                console.error(`Failed to create inverter appliance: ${error}`);
+            }
         }
         // Check for MPPT models
         const mpptModel = this.sunspecClient.findModel(sunspec_interfaces_js_1.SunspecModelId.MPPT);
@@ -190,9 +193,6 @@ class SunspecInverter extends BaseSunspecDevice {
         }
         // Note: We don't disconnect the sunspecClient as it may be shared
     }
-    isConnected() {
-        return this.sunspecClient.isConnected();
-    }
     async readData(clockId, resolution) {
         if (!this.isConnected()) {
             await this.tryReconnect();
@@ -324,7 +324,7 @@ class SunspecInverter extends BaseSunspecDevice {
             return;
         }
         this.dataBus = this.energyApp.useDataBus();
-        this.dataBusListenerId = this.dataBus.listenForMessages([exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1], (entry) => this.handleInverterCommand(entry));
+        this.dataBusListenerId = this.dataBus.listenForMessages([enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetInverterFeedInLimitV1], (entry) => this.handleInverterCommand(entry));
         console.log(`Inverter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
     /**
@@ -344,7 +344,7 @@ class SunspecInverter extends BaseSunspecDevice {
         }
         void (async () => {
             try {
-                if (entry.message === exports.ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1) {
+                if (entry.message === enyo_data_bus_value_js_1.EnyoDataBusMessageEnum.SetInverterFeedInLimitV1) {
                     await this.handleSetFeedInLimit(entry);
                 }
             }
@@ -378,8 +378,8 @@ exports.SunspecInverter = SunspecInverter;
  */
 class SunspecBattery extends BaseSunspecDevice {
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
-        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance);
         this.capabilities = capabilities;
     }
     /**
@@ -399,38 +399,40 @@ class SunspecBattery extends BaseSunspecDevice {
         const batteryData = await this.sunspecClient.readBatteryData();
         const storageMode = this.determineStorageMode(batteryData);
         const features = [];
-        // Create or update appliance
         if (batteryData?.chaGriSet !== undefined) {
             features.push(enyo_battery_appliance_js_1.EnyoBatteryFeature.GridCharging);
         }
-        try {
-            this.applianceId = await this.applianceManager.createOrUpdateAppliance({
-                name: this.name,
-                type: enyo_appliance_js_1.EnyoApplianceTypeEnum.Storage,
-                networkDevices: [this.networkDevice],
-                metadata: {
-                    connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
-                    state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber,
-                    modelName: commonData?.model,
-                    vendorName: commonData?.manufacturer,
-                    modbus: { unitId: this.unitId },
-                },
-                battery: {
-                    connectedToApplianceId: inverterApplianceId,
-                    storageMode: this.mapToEnyoStorageMode(storageMode),
-                    maxChargingPowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.inWRte !== undefined ? batteryData.wChaMax * batteryData.inWRte : undefined,
-                    maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
-                    features,
-                    gridChargingEnabled: batteryData?.chaGriSet === 1
-                }
-            });
-            console.log(`Sunspec Battery connected: ${this.networkDevice.hostname} (${this.applianceId})`);
-            this.startDataBusListening();
-        }
-        catch (error) {
-            console.error(`Failed to create battery appliance: ${error}`);
+        // Create or update appliance (skip if an existing appliance was provided)
+        if (!this.applianceId) {
+            try {
+                this.applianceId = await this.applianceManager.createOrUpdateAppliance({
+                    name: this.name,
+                    type: enyo_appliance_js_1.EnyoApplianceTypeEnum.Storage,
+                    networkDevices: [this.networkDevice],
+                    metadata: {
+                        connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
+                        state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
+                        serialNumber: commonData?.serialNumber,
+                        modelName: commonData?.model,
+                        vendorName: commonData?.manufacturer,
+                        modbus: { unitId: this.unitId },
+                    },
+                    battery: {
+                        connectedToApplianceId: inverterApplianceId,
+                        storageMode: this.mapToEnyoStorageMode(storageMode),
+                        maxChargingPowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.inWRte !== undefined ? batteryData.wChaMax * batteryData.inWRte : undefined,
+                        maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
+                        features,
+                        gridChargingEnabled: batteryData?.chaGriSet === 1
+                    }
+                });
+                console.log(`Sunspec Battery connected: ${this.networkDevice.hostname} (${this.applianceId})`);
+            }
+            catch (error) {
+                console.error(`Failed to create battery appliance: ${error}`);
+            }
         }
+        this.startDataBusListening();
     }
     async disconnect() {
         this.stopDataBusListening();
@@ -872,8 +874,8 @@ exports.SunspecBattery = SunspecBattery;
  */
 class SunspecMeter extends BaseSunspecDevice {
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
-        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance);
         this.capabilities = capabilities;
     }
     /**
@@ -891,31 +893,33 @@ class SunspecMeter extends BaseSunspecDevice {
         }
         // Get device info
         const commonData = await this.sunspecClient.readCommonBlock();
-        // Create or update appliance
-        try {
-            this.applianceId = await this.applianceManager.createOrUpdateAppliance({
-                name: this.name,
-                type: enyo_appliance_js_1.EnyoApplianceTypeEnum.Meter,
-                networkDevices: [this.networkDevice],
-                metadata: {
-                    connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
-                    state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber,
-                    modelName: commonData?.model,
-                    vendorName: commonData?.manufacturer,
-                    modbus: { unitId: this.unitId },
-                },
-                topology: {
-                    features: [enyo_appliance_js_1.EnyoApplianceTopologyFeatureEnum.IntermediateOfPrimaryMeter]
-                },
-                meter: {
-                    availableFeatures: [enyo_meter_appliance_js_1.EnyoMeterApplianceAvailableFeaturesEnum.LivePowerConsumption]
-                }
-            });
-            console.log(`Sunspec Meter connected: ${this.networkDevice.hostname} unit ${this.unitId} (${this.applianceId})`);
-        }
-        catch (error) {
-            console.error(`Failed to create meter appliance: ${error}`);
+        // Create or update appliance (skip if an existing appliance was provided)
+        if (!this.applianceId) {
+            try {
+                this.applianceId = await this.applianceManager.createOrUpdateAppliance({
+                    name: this.name,
+                    type: enyo_appliance_js_1.EnyoApplianceTypeEnum.Meter,
+                    networkDevices: [this.networkDevice],
+                    metadata: {
+                        connectionType: enyo_appliance_js_1.EnyoApplianceConnectionType.Connector,
+                        state: enyo_appliance_js_1.EnyoApplianceStateEnum.Connected,
+                        serialNumber: commonData?.serialNumber,
+                        modelName: commonData?.model,
+                        vendorName: commonData?.manufacturer,
+                        modbus: { unitId: this.unitId },
+                    },
+                    topology: {
+                        features: [enyo_appliance_js_1.EnyoApplianceTopologyFeatureEnum.IntermediateOfPrimaryMeter]
+                    },
+                    meter: {
+                        availableFeatures: [enyo_meter_appliance_js_1.EnyoMeterApplianceAvailableFeaturesEnum.LivePowerConsumption]
+                    }
+                });
+                console.log(`Sunspec Meter connected: ${this.networkDevice.hostname} unit ${this.unitId} (${this.applianceId})`);
+            }
+            catch (error) {
+                console.error(`Failed to create meter appliance: ${error}`);
+            }
         }
     }
     /**

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

@@ -1,22 +1,11 @@
-import { type SunspecBatteryBaseData, type SunspecBatteryControls, SunspecStorageMode, SunspecInverterCapability, SunspecBatteryCapability, SunspecMeterCapability } from "./sunspec-interfaces.cjs";
+import { type IRetryConfig, type SunspecBatteryBaseData, SunspecBatteryCapability, type SunspecBatteryControls, SunspecInverterCapability, SunspecMeterCapability, SunspecStorageMode } from "./sunspec-interfaces.cjs";
 import { ApplianceManager, EnergyApp } from "@enyo-energy/energy-app-sdk";
-import { EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
+import { type EnyoAppliance, EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
 import { EnyoNetworkDevice } from "@enyo-energy/energy-app-sdk/dist/types/enyo-network-device.js";
 import { SunspecModbusClient } from "./sunspec-modbus-client.cjs";
 import { ConnectionRetryManager } from "./connection-retry-manager.cjs";
-import { type IRetryConfig } from "./sunspec-interfaces.cjs";
 import { EnyoCommandAcknowledgeAnswerEnum, EnyoDataBusMessage, EnyoDataBusMessageEnum, EnyoDataBusMessageResolution } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
 import { EnergyAppDataBus } from "@enyo-energy/energy-app-sdk/dist/packages/energy-app-data-bus.js";
-export declare const ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = "SetInverterFeedInLimitV1";
-export interface EnyoDataBusSetInverterFeedInLimitV1 {
-    id: string;
-    type: 'message';
-    message: string;
-    applianceId: string;
-    data: {
-        feedInLimitW: number | null;
-    };
-}
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -34,7 +23,7 @@ export declare abstract class BaseSunspecDevice {
     protected dataBusListenerId?: string;
     protected dataBus?: EnergyAppDataBus;
     protected retryManager: ConnectionRetryManager;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     /**
      * Connect to the device and create/update the appliance
      */
@@ -75,10 +64,9 @@ export declare abstract class BaseSunspecDevice {
  */
 export declare class SunspecInverter extends BaseSunspecDevice {
     private readonly capabilities;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecInverterCapability[], retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecInverterCapability[], retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     connect(): Promise<void>;
     disconnect(): Promise<void>;
-    isConnected(): boolean;
     readData(clockId: string, resolution: '10s' | '30s' | '1m' | '15m'): Promise<EnyoDataBusMessage[]>;
     private mapOperatingState;
     /**
@@ -105,7 +93,7 @@ export declare class SunspecInverter extends BaseSunspecDevice {
  */
 export declare class SunspecBattery extends BaseSunspecDevice {
     private readonly capabilities;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecBatteryCapability[], retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecBatteryCapability[], retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     /**
      * Connect to the battery and create/update the appliance
      */
@@ -222,7 +210,7 @@ export declare class SunspecBattery extends BaseSunspecDevice {
  */
 export declare class SunspecMeter extends BaseSunspecDevice {
     private readonly capabilities;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecMeterCapability[], retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecMeterCapability[], retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     /**
      * Connect to the meter and create/update the appliance
      */

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

package/dist/sunspec-devices.d.ts

@@ -1,22 +1,11 @@
-import { type SunspecBatteryBaseData, type SunspecBatteryControls, SunspecStorageMode, SunspecInverterCapability, SunspecBatteryCapability, SunspecMeterCapability } from "./sunspec-interfaces.js";
+import { type IRetryConfig, type SunspecBatteryBaseData, SunspecBatteryCapability, type SunspecBatteryControls, SunspecInverterCapability, SunspecMeterCapability, SunspecStorageMode } from "./sunspec-interfaces.js";
 import { ApplianceManager, EnergyApp } from "@enyo-energy/energy-app-sdk";
-import { EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
+import { type EnyoAppliance, EnyoApplianceName } from "@enyo-energy/energy-app-sdk/dist/types/enyo-appliance.js";
 import { EnyoNetworkDevice } from "@enyo-energy/energy-app-sdk/dist/types/enyo-network-device.js";
 import { SunspecModbusClient } from "./sunspec-modbus-client.js";
 import { ConnectionRetryManager } from "./connection-retry-manager.js";
-import { type IRetryConfig } from "./sunspec-interfaces.js";
 import { EnyoCommandAcknowledgeAnswerEnum, EnyoDataBusMessage, EnyoDataBusMessageEnum, EnyoDataBusMessageResolution } from "@enyo-energy/energy-app-sdk/dist/types/enyo-data-bus-value.js";
 import { EnergyAppDataBus } from "@enyo-energy/energy-app-sdk/dist/packages/energy-app-data-bus.js";
-export declare const ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = "SetInverterFeedInLimitV1";
-export interface EnyoDataBusSetInverterFeedInLimitV1 {
-    id: string;
-    type: 'message';
-    message: string;
-    applianceId: string;
-    data: {
-        feedInLimitW: number | null;
-    };
-}
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -34,7 +23,7 @@ export declare abstract class BaseSunspecDevice {
     protected dataBusListenerId?: string;
     protected dataBus?: EnergyAppDataBus;
     protected retryManager: ConnectionRetryManager;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     /**
      * Connect to the device and create/update the appliance
      */
@@ -75,10 +64,9 @@ export declare abstract class BaseSunspecDevice {
  */
 export declare class SunspecInverter extends BaseSunspecDevice {
     private readonly capabilities;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecInverterCapability[], retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecInverterCapability[], retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     connect(): Promise<void>;
     disconnect(): Promise<void>;
-    isConnected(): boolean;
     readData(clockId: string, resolution: '10s' | '30s' | '1m' | '15m'): Promise<EnyoDataBusMessage[]>;
     private mapOperatingState;
     /**
@@ -105,7 +93,7 @@ export declare class SunspecInverter extends BaseSunspecDevice {
  */
 export declare class SunspecBattery extends BaseSunspecDevice {
     private readonly capabilities;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecBatteryCapability[], retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecBatteryCapability[], retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     /**
      * Connect to the battery and create/update the appliance
      */
@@ -222,7 +210,7 @@ export declare class SunspecBattery extends BaseSunspecDevice {
  */
 export declare class SunspecMeter extends BaseSunspecDevice {
     private readonly capabilities;
-    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecMeterCapability[], retryConfig?: IRetryConfig);
+    constructor(energyApp: EnergyApp, name: EnyoApplianceName[], networkDevice: EnyoNetworkDevice, sunspecClient: SunspecModbusClient, applianceManager: ApplianceManager, unitId?: number, port?: number, baseAddress?: number, capabilities?: SunspecMeterCapability[], retryConfig?: IRetryConfig, appliance?: EnyoAppliance);
     /**
      * Connect to the meter and create/update the appliance
      */

package/dist/sunspec-devices.js

@@ -1,4 +1,4 @@
-import { SunspecBatteryChargeState, SunspecModelId, SunspecMPPTOperatingState, SunspecStorageMode, SunspecInverterCapability } from "./sunspec-interfaces.js";
+import { SunspecBatteryChargeState, SunspecInverterCapability, 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 { ConnectionRetryManager } from "./connection-retry-manager.js";
@@ -6,8 +6,6 @@ import { EnyoBatteryStateEnum, EnyoCommandAcknowledgeAnswerEnum, EnyoDataBusMess
 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";
-// TODO: Remove once added to @enyo-energy/energy-app-sdk EnyoDataBusMessageEnum
-export const ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1 = 'SetInverterFeedInLimitV1';
 /**
  * Base abstract class for all Sunspec devices
  */
@@ -25,7 +23,7 @@ export class BaseSunspecDevice {
     dataBusListenerId;
     dataBus;
     retryManager;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, retryConfig) {
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, retryConfig, appliance) {
         this.energyApp = energyApp;
         this.name = name;
         this.networkDevice = networkDevice;
@@ -35,12 +33,15 @@ export class BaseSunspecDevice {
         this.port = port;
         this.baseAddress = baseAddress;
         this.retryManager = new ConnectionRetryManager(retryConfig);
+        if (appliance) {
+            this.applianceId = appliance.id;
+        }
     }
     /**
      * Check if the device is connected
      */
     isConnected() {
-        return this.sunspecClient.isConnected();
+        return this.sunspecClient.isHealthy();
     }
     /**
      * Get the appliance IDs managed by this device
@@ -132,8 +133,8 @@ export class BaseSunspecDevice {
  */
 export class SunspecInverter extends BaseSunspecDevice {
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
-        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance);
         this.capabilities = capabilities;
     }
     async connect() {
@@ -148,29 +149,31 @@ export class SunspecInverter extends BaseSunspecDevice {
         const commonData = await this.sunspecClient.readCommonBlock();
         const inverterSettings = await this.sunspecClient.readInverterSettings();
         const mpptDataList = await this.sunspecClient.readAllMPPTData();
-        // Create or update appliance
-        try {
-            this.applianceId = await this.applianceManager.createOrUpdateAppliance({
-                name: this.name,
-                type: EnyoApplianceTypeEnum.Inverter,
-                networkDevices: [this.networkDevice],
-                metadata: {
-                    connectionType: EnyoApplianceConnectionType.Connector,
-                    state: EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber,
-                    modelName: commonData?.model,
-                    vendorName: commonData?.manufacturer,
-                    modbus: { unitId: this.unitId },
-                },
-                inverter: {
-                    dcStrings: this.mapDcStringToApplianceMetadata(this.mapMPPTToStrings(mpptDataList)),
-                    maxPvProductionW: inverterSettings?.WMax
-                }
-            });
-            console.log(`Sunspec Inverter connected: ${this.networkDevice.hostname} (${this.applianceId})`);
-        }
-        catch (error) {
-            console.error(`Failed to create inverter appliance: ${error}`);
+        // Create or update appliance (skip if an existing appliance was provided)
+        if (!this.applianceId) {
+            try {
+                this.applianceId = await this.applianceManager.createOrUpdateAppliance({
+                    name: this.name,
+                    type: EnyoApplianceTypeEnum.Inverter,
+                    networkDevices: [this.networkDevice],
+                    metadata: {
+                        connectionType: EnyoApplianceConnectionType.Connector,
+                        state: EnyoApplianceStateEnum.Connected,
+                        serialNumber: commonData?.serialNumber,
+                        modelName: commonData?.model,
+                        vendorName: commonData?.manufacturer,
+                        modbus: { unitId: this.unitId },
+                    },
+                    inverter: {
+                        dcStrings: this.mapDcStringToApplianceMetadata(this.mapMPPTToStrings(mpptDataList)),
+                        maxPvProductionW: inverterSettings?.WMax
+                    }
+                });
+                console.log(`Sunspec Inverter connected: ${this.networkDevice.hostname} (${this.applianceId})`);
+            }
+            catch (error) {
+                console.error(`Failed to create inverter appliance: ${error}`);
+            }
         }
         // Check for MPPT models
         const mpptModel = this.sunspecClient.findModel(SunspecModelId.MPPT);
@@ -186,9 +189,6 @@ export class SunspecInverter extends BaseSunspecDevice {
         }
         // Note: We don't disconnect the sunspecClient as it may be shared
     }
-    isConnected() {
-        return this.sunspecClient.isConnected();
-    }
     async readData(clockId, resolution) {
         if (!this.isConnected()) {
             await this.tryReconnect();
@@ -320,7 +320,7 @@ export class SunspecInverter extends BaseSunspecDevice {
             return;
         }
         this.dataBus = this.energyApp.useDataBus();
-        this.dataBusListenerId = this.dataBus.listenForMessages([ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1], (entry) => this.handleInverterCommand(entry));
+        this.dataBusListenerId = this.dataBus.listenForMessages([EnyoDataBusMessageEnum.SetInverterFeedInLimitV1], (entry) => this.handleInverterCommand(entry));
         console.log(`Inverter ${this.applianceId}: started data bus listening (listener ${this.dataBusListenerId})`);
     }
     /**
@@ -340,7 +340,7 @@ export class SunspecInverter extends BaseSunspecDevice {
         }
         void (async () => {
             try {
-                if (entry.message === ENYO_DATA_BUS_SET_INVERTER_FEED_IN_LIMIT_V1) {
+                if (entry.message === EnyoDataBusMessageEnum.SetInverterFeedInLimitV1) {
                     await this.handleSetFeedInLimit(entry);
                 }
             }
@@ -373,8 +373,8 @@ export class SunspecInverter extends BaseSunspecDevice {
  */
 export class SunspecBattery extends BaseSunspecDevice {
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
-        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance);
         this.capabilities = capabilities;
     }
     /**
@@ -394,38 +394,40 @@ export class SunspecBattery extends BaseSunspecDevice {
         const batteryData = await this.sunspecClient.readBatteryData();
         const storageMode = this.determineStorageMode(batteryData);
         const features = [];
-        // Create or update appliance
         if (batteryData?.chaGriSet !== undefined) {
             features.push(EnyoBatteryFeature.GridCharging);
         }
-        try {
-            this.applianceId = await this.applianceManager.createOrUpdateAppliance({
-                name: this.name,
-                type: EnyoApplianceTypeEnum.Storage,
-                networkDevices: [this.networkDevice],
-                metadata: {
-                    connectionType: EnyoApplianceConnectionType.Connector,
-                    state: EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber,
-                    modelName: commonData?.model,
-                    vendorName: commonData?.manufacturer,
-                    modbus: { unitId: this.unitId },
-                },
-                battery: {
-                    connectedToApplianceId: inverterApplianceId,
-                    storageMode: this.mapToEnyoStorageMode(storageMode),
-                    maxChargingPowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.inWRte !== undefined ? batteryData.wChaMax * batteryData.inWRte : undefined,
-                    maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
-                    features,
-                    gridChargingEnabled: batteryData?.chaGriSet === 1
-                }
-            });
-            console.log(`Sunspec Battery connected: ${this.networkDevice.hostname} (${this.applianceId})`);
-            this.startDataBusListening();
-        }
-        catch (error) {
-            console.error(`Failed to create battery appliance: ${error}`);
+        // Create or update appliance (skip if an existing appliance was provided)
+        if (!this.applianceId) {
+            try {
+                this.applianceId = await this.applianceManager.createOrUpdateAppliance({
+                    name: this.name,
+                    type: EnyoApplianceTypeEnum.Storage,
+                    networkDevices: [this.networkDevice],
+                    metadata: {
+                        connectionType: EnyoApplianceConnectionType.Connector,
+                        state: EnyoApplianceStateEnum.Connected,
+                        serialNumber: commonData?.serialNumber,
+                        modelName: commonData?.model,
+                        vendorName: commonData?.manufacturer,
+                        modbus: { unitId: this.unitId },
+                    },
+                    battery: {
+                        connectedToApplianceId: inverterApplianceId,
+                        storageMode: this.mapToEnyoStorageMode(storageMode),
+                        maxChargingPowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.inWRte !== undefined ? batteryData.wChaMax * batteryData.inWRte : undefined,
+                        maxDischargePowerW: batteryData && batteryData.wChaMax !== undefined && batteryData.outWRte !== undefined ? batteryData.wChaMax * batteryData.outWRte : undefined,
+                        features,
+                        gridChargingEnabled: batteryData?.chaGriSet === 1
+                    }
+                });
+                console.log(`Sunspec Battery connected: ${this.networkDevice.hostname} (${this.applianceId})`);
+            }
+            catch (error) {
+                console.error(`Failed to create battery appliance: ${error}`);
+            }
         }
+        this.startDataBusListening();
     }
     async disconnect() {
         this.stopDataBusListening();
@@ -866,8 +868,8 @@ export class SunspecBattery extends BaseSunspecDevice {
  */
 export class SunspecMeter extends BaseSunspecDevice {
     capabilities;
-    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig) {
-        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig);
+    constructor(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId = 1, port = 502, baseAddress = 40000, capabilities = [], retryConfig, appliance) {
+        super(energyApp, name, networkDevice, sunspecClient, applianceManager, unitId, port, baseAddress, retryConfig, appliance);
         this.capabilities = capabilities;
     }
     /**
@@ -885,31 +887,33 @@ export class SunspecMeter extends BaseSunspecDevice {
         }
         // Get device info
         const commonData = await this.sunspecClient.readCommonBlock();
-        // Create or update appliance
-        try {
-            this.applianceId = await this.applianceManager.createOrUpdateAppliance({
-                name: this.name,
-                type: EnyoApplianceTypeEnum.Meter,
-                networkDevices: [this.networkDevice],
-                metadata: {
-                    connectionType: EnyoApplianceConnectionType.Connector,
-                    state: EnyoApplianceStateEnum.Connected,
-                    serialNumber: commonData?.serialNumber,
-                    modelName: commonData?.model,
-                    vendorName: commonData?.manufacturer,
-                    modbus: { unitId: this.unitId },
-                },
-                topology: {
-                    features: [EnyoApplianceTopologyFeatureEnum.IntermediateOfPrimaryMeter]
-                },
-                meter: {
-                    availableFeatures: [EnyoMeterApplianceAvailableFeaturesEnum.LivePowerConsumption]
-                }
-            });
-            console.log(`Sunspec Meter connected: ${this.networkDevice.hostname} unit ${this.unitId} (${this.applianceId})`);
-        }
-        catch (error) {
-            console.error(`Failed to create meter appliance: ${error}`);
+        // Create or update appliance (skip if an existing appliance was provided)
+        if (!this.applianceId) {
+            try {
+                this.applianceId = await this.applianceManager.createOrUpdateAppliance({
+                    name: this.name,
+                    type: EnyoApplianceTypeEnum.Meter,
+                    networkDevices: [this.networkDevice],
+                    metadata: {
+                        connectionType: EnyoApplianceConnectionType.Connector,
+                        state: EnyoApplianceStateEnum.Connected,
+                        serialNumber: commonData?.serialNumber,
+                        modelName: commonData?.model,
+                        vendorName: commonData?.manufacturer,
+                        modbus: { unitId: this.unitId },
+                    },
+                    topology: {
+                        features: [EnyoApplianceTopologyFeatureEnum.IntermediateOfPrimaryMeter]
+                    },
+                    meter: {
+                        availableFeatures: [EnyoMeterApplianceAvailableFeaturesEnum.LivePowerConsumption]
+                    }
+                });
+                console.log(`Sunspec Meter connected: ${this.networkDevice.hostname} unit ${this.unitId} (${this.applianceId})`);
+            }
+            catch (error) {
+                console.error(`Failed to create meter appliance: ${error}`);
+            }
         }
     }
     /**

package/dist/version.d.ts

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