@enyo-energy/energy-app-sdk 0.0.92 → 0.0.93

package/dist/cjs/implementations/appliances/appliance-manager.cjs

@@ -14,6 +14,42 @@ class ApplianceManager {
     listenerIds = [];
     disposed = false;
     config;
+    /**
+     * Merges partial appliance data with an existing appliance, performing a shallow merge
+     * on each metadata sub-object (metadata, inverter, charger, battery, heatpump, meter,
+     * temperatureSensor) so that only the provided keys are overwritten and existing keys
+     * are preserved.
+     * @param existing The existing appliance data
+     * @param update The partial update data to merge
+     * @returns The merged appliance data
+     */
+    mergeApplianceData(existing, update) {
+        return {
+            ...existing,
+            ...update,
+            metadata: update.metadata
+                ? { ...existing.metadata, ...update.metadata }
+                : existing.metadata,
+            inverter: update.inverter
+                ? { ...existing.inverter, ...update.inverter }
+                : existing.inverter,
+            charger: update.charger
+                ? { ...existing.charger, ...update.charger }
+                : existing.charger,
+            battery: update.battery
+                ? { ...existing.battery, ...update.battery }
+                : existing.battery,
+            heatpump: update.heatpump
+                ? { ...existing.heatpump, ...update.heatpump }
+                : existing.heatpump,
+            meter: update.meter
+                ? { ...existing.meter, ...update.meter }
+                : existing.meter,
+            temperatureSensor: update.temperatureSensor
+                ? { ...existing.temperatureSensor, ...update.temperatureSensor }
+                : existing.temperatureSensor,
+        };
+    }
     /**
      * Creates a new ApplianceManager instance.
      * @param energyApp The EnergyApp instance to use for API calls
@@ -74,8 +110,8 @@ class ApplianceManager {
         if (this.config.defaultVendorName && !metadata.vendorName) {
             metadata.vendorName = this.config.defaultVendorName;
         }
-        // Build appliance data
-        const applianceData = {
+        // Build new appliance data
+        const newApplianceData = {
             name: appliance.name,
             type: appliance.type,
             networkDeviceIds,
@@ -88,6 +124,14 @@ class ApplianceManager {
             inverter: appliance.inverter,
             temperatureSensor: appliance.temperatureSensor,
         };
+        // When updating an existing appliance, merge metadata to preserve existing keys
+        let applianceData = newApplianceData;
+        if (existingApplianceId) {
+            const existingAppliance = await this.energyApp.useAppliances().getById(existingApplianceId);
+            if (existingAppliance) {
+                applianceData = this.mergeApplianceData(existingAppliance, newApplianceData);
+            }
+        }
         // Save appliance
         const applianceId = await this.energyApp.useAppliances().save(applianceData, existingApplianceId);
         // Update cache
@@ -309,10 +353,7 @@ class ApplianceManager {
         try {
             const appliance = await this.energyApp.useAppliances().getById(applianceId);
             if (appliance) {
-                const updatedAppliance = {
-                    ...appliance,
-                    ...attributes
-                };
+                const updatedAppliance = this.mergeApplianceData(appliance, attributes);
                 await this.energyApp.useAppliances().save(updatedAppliance, applianceId);
                 // Update cache
                 this.applianceCache.set(applianceId, { id: applianceId, ...updatedAppliance });
@@ -408,15 +449,11 @@ class ApplianceManager {
             try {
                 const appliance = await this.energyApp.useAppliances().getById(update.applianceId);
                 if (appliance) {
-                    const updatedAppliance = {
-                        ...appliance,
-                        ...update.data
-                    };
+                    const updatedAppliance = this.mergeApplianceData(appliance, update.data);
                     await this.energyApp.useAppliances().save(updatedAppliance, update.applianceId);
                     succeeded.push(update.applianceId);
                     // Update cache
-                    Object.assign(appliance, update.data);
-                    this.applianceCache.set(update.applianceId, appliance);
+                    this.applianceCache.set(update.applianceId, { id: update.applianceId, ...updatedAppliance });
                 }
                 else {
                     failed.push(update.applianceId);

package/dist/cjs/implementations/appliances/appliance-manager.d.cts

@@ -67,6 +67,16 @@ export declare class ApplianceManager {
     private listenerIds;
     private disposed;
     protected config: Required<ApplianceManagerConfig>;
+    /**
+     * Merges partial appliance data with an existing appliance, performing a shallow merge
+     * on each metadata sub-object (metadata, inverter, charger, battery, heatpump, meter,
+     * temperatureSensor) so that only the provided keys are overwritten and existing keys
+     * are preserved.
+     * @param existing The existing appliance data
+     * @param update The partial update data to merge
+     * @returns The merged appliance data
+     */
+    private mergeApplianceData;
     /**
      * Creates a new ApplianceManager instance.
      * @param energyApp The EnergyApp instance to use for API calls

package/dist/cjs/types/enyo-battery-appliance.d.cts

@@ -12,6 +12,8 @@ export declare enum EnyoBatteryFeature {
 }
 export interface EnyoBatteryApplianceMetadata {
     connectedToApplianceId?: string;
+    /** If the battery is connected in between dc strings, you can configure it here*/
+    connectedWithDcStrings?: number[];
     maxDischargePowerW?: number;
     maxChargingPowerW?: number;
     maxCapacityWh?: number;

package/dist/cjs/types/enyo-data-bus-value.d.cts

@@ -255,7 +255,7 @@ export interface EnyoDataBusBatteryValuesUpdateV1 extends EnyoDataBusMessage {
     applianceId: string;
     data: {
         state?: EnyoBatteryStateEnum;
-        /** Current Battery Power (in Watt). Positive = Consumption from the Battery, Negative = Feed in / charging of the battery. */
+        /** Current Battery Power (in Watt). Positive = charging of the battery, Negative = Consumption from the Battery. */
         batteryPowerW?: number;
         /** Battery State of Charge. Value between 0 and 100 */
         batterySoC: number;
@@ -975,9 +975,10 @@ export interface EnyoDataBusHeatpumpTemperaturesV1 extends EnyoDataBusMessage {
         }[];
         /** Buffer tank temperature */
         bufferTank?: {
+            index: number;
             /** Current buffer tank temperature in Celsius */
             temperatureC: number;
-        };
+        }[];
     };
 }
 /**

package/dist/cjs/types/enyo-heatpump-appliance.d.cts

@@ -24,6 +24,12 @@ export interface EnyoHeatpumpApplianceDomesticHotWater {
     targetTemperatureC: number;
     hysteresisK?: number;
 }
+export interface EnyoHeatpumpApplianceBufferTank {
+    index: number;
+    tankSizeLiter?: number;
+    targetTemperatureC?: number;
+    hysteresisK?: number;
+}
 export interface EnyoHeatpumpApplianceCompressor {
     index: number;
 }
@@ -35,6 +41,7 @@ export interface EnyoHeatpumpApplianceMetadata {
     availableFeatures: EnyoHeatpumpApplianceAvailableFeaturesEnum[];
     mode?: EnyoHeatpumpApplianceModeEnum;
     domesticHotWater?: EnyoHeatpumpApplianceDomesticHotWater[];
+    bufferTanks?: EnyoHeatpumpApplianceBufferTank[];
     compressors?: EnyoHeatpumpApplianceCompressor[];
     heatingCircuits?: EnyoHeatpumpApplianceHeatingCircuit[];
 }

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

package/dist/implementations/appliances/appliance-manager.d.ts

@@ -67,6 +67,16 @@ export declare class ApplianceManager {
     private listenerIds;
     private disposed;
     protected config: Required<ApplianceManagerConfig>;
+    /**
+     * Merges partial appliance data with an existing appliance, performing a shallow merge
+     * on each metadata sub-object (metadata, inverter, charger, battery, heatpump, meter,
+     * temperatureSensor) so that only the provided keys are overwritten and existing keys
+     * are preserved.
+     * @param existing The existing appliance data
+     * @param update The partial update data to merge
+     * @returns The merged appliance data
+     */
+    private mergeApplianceData;
     /**
      * Creates a new ApplianceManager instance.
      * @param energyApp The EnergyApp instance to use for API calls

package/dist/implementations/appliances/appliance-manager.js

@@ -11,6 +11,42 @@ export class ApplianceManager {
     listenerIds = [];
     disposed = false;
     config;
+    /**
+     * Merges partial appliance data with an existing appliance, performing a shallow merge
+     * on each metadata sub-object (metadata, inverter, charger, battery, heatpump, meter,
+     * temperatureSensor) so that only the provided keys are overwritten and existing keys
+     * are preserved.
+     * @param existing The existing appliance data
+     * @param update The partial update data to merge
+     * @returns The merged appliance data
+     */
+    mergeApplianceData(existing, update) {
+        return {
+            ...existing,
+            ...update,
+            metadata: update.metadata
+                ? { ...existing.metadata, ...update.metadata }
+                : existing.metadata,
+            inverter: update.inverter
+                ? { ...existing.inverter, ...update.inverter }
+                : existing.inverter,
+            charger: update.charger
+                ? { ...existing.charger, ...update.charger }
+                : existing.charger,
+            battery: update.battery
+                ? { ...existing.battery, ...update.battery }
+                : existing.battery,
+            heatpump: update.heatpump
+                ? { ...existing.heatpump, ...update.heatpump }
+                : existing.heatpump,
+            meter: update.meter
+                ? { ...existing.meter, ...update.meter }
+                : existing.meter,
+            temperatureSensor: update.temperatureSensor
+                ? { ...existing.temperatureSensor, ...update.temperatureSensor }
+                : existing.temperatureSensor,
+        };
+    }
     /**
      * Creates a new ApplianceManager instance.
      * @param energyApp The EnergyApp instance to use for API calls
@@ -71,8 +107,8 @@ export class ApplianceManager {
         if (this.config.defaultVendorName && !metadata.vendorName) {
             metadata.vendorName = this.config.defaultVendorName;
         }
-        // Build appliance data
-        const applianceData = {
+        // Build new appliance data
+        const newApplianceData = {
             name: appliance.name,
             type: appliance.type,
             networkDeviceIds,
@@ -85,6 +121,14 @@ export class ApplianceManager {
             inverter: appliance.inverter,
             temperatureSensor: appliance.temperatureSensor,
         };
+        // When updating an existing appliance, merge metadata to preserve existing keys
+        let applianceData = newApplianceData;
+        if (existingApplianceId) {
+            const existingAppliance = await this.energyApp.useAppliances().getById(existingApplianceId);
+            if (existingAppliance) {
+                applianceData = this.mergeApplianceData(existingAppliance, newApplianceData);
+            }
+        }
         // Save appliance
         const applianceId = await this.energyApp.useAppliances().save(applianceData, existingApplianceId);
         // Update cache
@@ -306,10 +350,7 @@ export class ApplianceManager {
         try {
             const appliance = await this.energyApp.useAppliances().getById(applianceId);
             if (appliance) {
-                const updatedAppliance = {
-                    ...appliance,
-                    ...attributes
-                };
+                const updatedAppliance = this.mergeApplianceData(appliance, attributes);
                 await this.energyApp.useAppliances().save(updatedAppliance, applianceId);
                 // Update cache
                 this.applianceCache.set(applianceId, { id: applianceId, ...updatedAppliance });
@@ -405,15 +446,11 @@ export class ApplianceManager {
             try {
                 const appliance = await this.energyApp.useAppliances().getById(update.applianceId);
                 if (appliance) {
-                    const updatedAppliance = {
-                        ...appliance,
-                        ...update.data
-                    };
+                    const updatedAppliance = this.mergeApplianceData(appliance, update.data);
                     await this.energyApp.useAppliances().save(updatedAppliance, update.applianceId);
                     succeeded.push(update.applianceId);
                     // Update cache
-                    Object.assign(appliance, update.data);
-                    this.applianceCache.set(update.applianceId, appliance);
+                    this.applianceCache.set(update.applianceId, { id: update.applianceId, ...updatedAppliance });
                 }
                 else {
                     failed.push(update.applianceId);

package/dist/types/enyo-battery-appliance.d.ts

@@ -12,6 +12,8 @@ export declare enum EnyoBatteryFeature {
 }
 export interface EnyoBatteryApplianceMetadata {
     connectedToApplianceId?: string;
+    /** If the battery is connected in between dc strings, you can configure it here*/
+    connectedWithDcStrings?: number[];
     maxDischargePowerW?: number;
     maxChargingPowerW?: number;
     maxCapacityWh?: number;

package/dist/types/enyo-data-bus-value.d.ts

@@ -255,7 +255,7 @@ export interface EnyoDataBusBatteryValuesUpdateV1 extends EnyoDataBusMessage {
     applianceId: string;
     data: {
         state?: EnyoBatteryStateEnum;
-        /** Current Battery Power (in Watt). Positive = Consumption from the Battery, Negative = Feed in / charging of the battery. */
+        /** Current Battery Power (in Watt). Positive = charging of the battery, Negative = Consumption from the Battery. */
         batteryPowerW?: number;
         /** Battery State of Charge. Value between 0 and 100 */
         batterySoC: number;
@@ -975,9 +975,10 @@ export interface EnyoDataBusHeatpumpTemperaturesV1 extends EnyoDataBusMessage {
         }[];
         /** Buffer tank temperature */
         bufferTank?: {
+            index: number;
             /** Current buffer tank temperature in Celsius */
             temperatureC: number;
-        };
+        }[];
     };
 }
 /**

package/dist/types/enyo-heatpump-appliance.d.ts

@@ -24,6 +24,12 @@ export interface EnyoHeatpumpApplianceDomesticHotWater {
     targetTemperatureC: number;
     hysteresisK?: number;
 }
+export interface EnyoHeatpumpApplianceBufferTank {
+    index: number;
+    tankSizeLiter?: number;
+    targetTemperatureC?: number;
+    hysteresisK?: number;
+}
 export interface EnyoHeatpumpApplianceCompressor {
     index: number;
 }
@@ -35,6 +41,7 @@ export interface EnyoHeatpumpApplianceMetadata {
     availableFeatures: EnyoHeatpumpApplianceAvailableFeaturesEnum[];
     mode?: EnyoHeatpumpApplianceModeEnum;
     domesticHotWater?: EnyoHeatpumpApplianceDomesticHotWater[];
+    bufferTanks?: EnyoHeatpumpApplianceBufferTank[];
     compressors?: EnyoHeatpumpApplianceCompressor[];
     heatingCircuits?: EnyoHeatpumpApplianceHeatingCircuit[];
 }

package/dist/version.d.ts

@@ -5,7 +5,7 @@
 /**
  * Current version of the enyo Energy App SDK.
  */
-export declare const SDK_VERSION = "0.0.92";
+export declare const SDK_VERSION = "0.0.93";
 /**
  * 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.92';
+export const SDK_VERSION = '0.0.93';
 /**
  * Gets the current SDK version.
  * @returns The semantic version string of the SDK

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enyo-energy/energy-app-sdk",
-  "version": "0.0.92",
+  "version": "0.0.93",
   "description": "enyo Energy App SDK",
   "type": "module",
   "main": "dist/index.js",