@pietrolubini/homebridge-ecoflow 1.5.0-beta.0 → 1.5.0-beta.2

package/README.md

@@ -33,6 +33,7 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
 - [Delta Pro 3](#delta-pro-3)
 - [Delta Pro Ultra](#delta-pro-ultra)
 - [PowerStream Micro-inverter](#powerstream-micro-inverter)
+- [Smart Plug](#smart-plug)
 
 For a full list of devices that could be potentially added check [here](https://developer-eu.ecoflow.com/us/document/introduction)
 
@@ -427,6 +428,48 @@ The following additional characteristics is available:
 }
 ```
 
+### Smart Plug
+
+#### Services
+
+| EcoFlow Parameter   | Service           | Characteristic        | Standard | Permission                                           |
+| ------------------- | ----------------- | --------------------- | -------- | ---------------------------------------------------- |
+| Outlet              | Outlet            | On                    | ✅       | Read/write                                           |
+| Outlet Output       | Outlet            | OutletInUse           | ✅       | Read                                                 |
+| Consumption         | Outlet            | Output Consumption, W | 🔲       | Read                                                 |
+| Voltage             | Outlet            | Output Voltage, V     | 🔲       | Read                                                 |
+| Current             | Outlet            | Output Current, V     | 🔲       | Read                                                 |
+| Lighting brightness | Lightbulb         | On                    | ✅       | Read (> 0%: ON; 0%: OFF) / write (ON: 100%; OFF: 0%) |
+| Lighting brightness | Lightbulb         | Brightness            | ✅       | Read/write                                           |
+| Temperature         | TemperatureSensor | CurrentTemperature    | ✅       | Read                                                 |
+
+#### Configuration
+
+The following additional characteristics is available:
+
+- Output Consumption, W
+- Output Voltage, V
+- Output Current, A
+
+```json
+{
+  ...
+  "devices": [
+    {
+      ...
+      "model": "SmartPlug",
+      "smartPlug": {
+        "additionalCharacteristics": [
+          "Output Consumption, W",
+          "Output Voltage, V",
+          "Output Current, A"
+        ]
+      }
+    }
+  ],
+}
+```
+
 ## Troubleshooting
 
 ### Debug

package/config.schema.json

@@ -32,7 +32,7 @@
               "type": "string",
               "default": "Delta 2",
               "required": true,
-              "enum": ["Delta 2", "Delta 2 Max", "Delta Pro 3", "PowerStream"]
+              "enum": ["Delta 2", "Delta 2 Max", "Delta Pro 3", "PowerStream", "Smart Plug"]
             },
             "serialNumber": {
               "title": "Serial Number",
@@ -147,6 +147,23 @@
                   }
                 }
               }
+            },
+            "outlet": {
+              "title": "Outlet Settings",
+              "type": "object",
+              "properties": {
+                "additionalCharacteristics": {
+                  "title": "Outlet Additional Characteristics",
+                  "description": "List of additional characteristics for Outlet",
+                  "type": "array",
+                  "uniqueItems": true,
+                  "items": {
+                    "title": "Characteristic",
+                    "type": "string",
+                    "enum": ["Output Consumption, W", "Output Voltage, V", "Output Current, A"]
+                  }
+                }
+              }
             }
           }
         }

package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.d.ts

@@ -1,5 +1,5 @@
 import { Delta2MqttSetMessageParams, Delta2MqttSetModuleType, Delta2MqttSetOperationType } from '@ecoflow/accessories/batteries/delta2/interfaces/delta2MqttApiContracts';
-import { OutletServiceBase } from '@ecoflow/services/outletServiceBase';
-export declare abstract class Delta2OutletServiceBase extends OutletServiceBase {
+import { BatteryOutletServiceBase } from '@ecoflow/services/batteryOutletServiceBase';
+export declare abstract class Delta2OutletServiceBase extends BatteryOutletServiceBase {
     protected sendOn<TParams extends Delta2MqttSetMessageParams>(moduleType: Delta2MqttSetModuleType, operateType: Delta2MqttSetOperationType, params: TParams, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Delta2OutletServiceBase = void 0;
-const outletServiceBase_1 = require("@ecoflow/services/outletServiceBase");
-class Delta2OutletServiceBase extends outletServiceBase_1.OutletServiceBase {
+const batteryOutletServiceBase_1 = require("@ecoflow/services/batteryOutletServiceBase");
+class Delta2OutletServiceBase extends batteryOutletServiceBase_1.BatteryOutletServiceBase {
     sendOn(moduleType, operateType, params, revert) {
         const message = {
             id: 0,

package/dist/accessories/batteries/delta2/services/delta2OutletServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"delta2OutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/delta2OutletServiceBase.ts"],"names":[],"mappings":";;;AAMA,2EAAwE;AAExE,MAAsB,uBAAwB,SAAQ,qCAAiB;IAC3D,MAAM,CACd,UAAmC,EACnC,WAAuC,EACvC,MAAe,EACf,MAAkB;QAElB,MAAM,OAAO,GAA4C;YACvD,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,UAAU;YACV,WAAW;YACX,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAjBD,0DAiBC"}
+{"version":3,"file":"delta2OutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/delta2/services/delta2OutletServiceBase.ts"],"names":[],"mappings":";;;AAMA,yFAAsF;AAEtF,MAAsB,uBAAwB,SAAQ,mDAAwB;IAClE,MAAM,CACd,UAAmC,EACnC,WAAuC,EACvC,MAAe,EACf,MAAkB;QAElB,MAAM,OAAO,GAA4C;YACvD,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,UAAU;YACV,WAAW;YACX,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAjBD,0DAiBC"}

package/dist/accessories/batteries/deltapro/deltaProAccessory.d.ts

@@ -1,3 +1,25 @@
-import { DeltaProAccessoryBase } from '@ecoflow/accessories/batteries/deltapro/deltaProAccessoryBase';
-export declare class DeltaProAccessory extends DeltaProAccessoryBase {
+import { DeltaProAllQuotaData } from '@ecoflow/accessories/batteries/deltapro/interfaces/deltaProHttpApiContracts';
+import { EcoFlowAccessoryWithQuotaBase } from '@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase';
+import { EcoFlowHttpApiManager } from '@ecoflow/apis/ecoFlowHttpApiManager';
+import { EcoFlowMqttApiManager } from '@ecoflow/apis/ecoFlowMqttApiManager';
+import { MqttQuotaMessage } from '@ecoflow/apis/interfaces/mqttApiContracts';
+import { DeviceConfig } from '@ecoflow/config';
+import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
+import { EcoFlowHomebridgePlatform } from '@ecoflow/platform';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Logging, PlatformAccessory } from 'homebridge';
+export declare class DeltaProAccessory extends EcoFlowAccessoryWithQuotaBase<DeltaProAllQuotaData> {
+    private readonly batteryStatusService;
+    private readonly outletUsbService;
+    private readonly outletAcService;
+    private readonly outletCarService;
+    private readonly switchXboostService;
+    constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging, httpApiManager: EcoFlowHttpApiManager, mqttApiManager: EcoFlowMqttApiManager, batteryStatusProvider: BatteryStatusProvider);
+    protected getServices(): ServiceBase[];
+    protected processQuotaMessage(message: MqttQuotaMessage): void;
+    protected initializeQuota(quota: DeltaProAllQuotaData | null): DeltaProAllQuotaData;
+    protected updateInitialValues(data: DeltaProAllQuotaData): void;
+    private updateEmsValues;
+    private updateInvValues;
+    private updatePdValues;
 }

package/dist/accessories/batteries/deltapro/deltaProAccessory.js

@@ -1,8 +1,119 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeltaProAccessory = void 0;
-const deltaProAccessoryBase_1 = require("@ecoflow/accessories/batteries/deltapro/deltaProAccessoryBase");
-class DeltaProAccessory extends deltaProAccessoryBase_1.DeltaProAccessoryBase {
+const outletAcService_1 = require("@ecoflow/accessories/batteries/deltapro/services/outletAcService");
+const outletCarService_1 = require("@ecoflow/accessories/batteries/deltapro/services/outletCarService");
+const outletUsbService_1 = require("@ecoflow/accessories/batteries/deltapro/services/outletUsbService");
+const switchXboostService_1 = require("@ecoflow/accessories/batteries/deltapro/services/switchXboostService");
+const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
+const ecoFlowAccessoryWithQuotaBase_1 = require("@ecoflow/accessories/ecoFlowAccessoryWithQuotaBase");
+const batteryStatusService_1 = require("@ecoflow/services/batteryStatusService");
+class DeltaProAccessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessoryWithQuotaBase {
+    batteryStatusService;
+    outletUsbService;
+    outletAcService;
+    outletCarService;
+    switchXboostService;
+    constructor(platform, accessory, config, log, httpApiManager, mqttApiManager, batteryStatusProvider) {
+        super(platform, accessory, config, log, httpApiManager, mqttApiManager);
+        this.batteryStatusService = new batteryStatusService_1.BatteryStatusService(this, batteryStatusProvider);
+        this.outletUsbService = new outletUsbService_1.OutletUsbService(this, batteryStatusProvider);
+        this.outletAcService = new outletAcService_1.OutletAcService(this, batteryStatusProvider);
+        this.outletCarService = new outletCarService_1.OutletCarService(this, batteryStatusProvider);
+        this.switchXboostService = new switchXboostService_1.SwitchXboostService(this);
+    }
+    getServices() {
+        return [
+            this.batteryStatusService,
+            this.outletUsbService,
+            this.outletAcService,
+            this.outletCarService,
+            this.switchXboostService,
+        ];
+    }
+    processQuotaMessage(message) {
+        const data = message.data;
+        if (data?.ems !== undefined && Object.keys(data.ems).length > 0) {
+            Object.assign(this.quota.ems, data.ems);
+            this.updateEmsValues(data.ems);
+        }
+        if (data?.inv !== undefined && Object.keys(data.inv).length > 0) {
+            Object.assign(this.quota.inv, data.inv);
+            this.updateInvValues(data.inv);
+        }
+        if (data?.pd !== undefined && Object.keys(data.pd).length > 0) {
+            Object.assign(this.quota.pd, data.pd);
+            this.updatePdValues(data.pd);
+        }
+    }
+    initializeQuota(quota) {
+        const result = quota ?? {};
+        if (!result.ems) {
+            result.ems = {};
+        }
+        if (!result.inv) {
+            result.inv = {};
+        }
+        if (!result.pd) {
+            result.pd = {};
+        }
+        return result;
+    }
+    updateInitialValues(data) {
+        const message = {
+            data,
+        };
+        this.processQuotaMessage(message);
+    }
+    updateEmsValues(params) {
+        if (params.f32LcdShowSoc !== undefined && params.minDsgSoc !== undefined) {
+            this.batteryStatusService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
+            this.outletAcService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
+            this.outletUsbService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
+            this.outletCarService.updateBatteryLevel(params.f32LcdShowSoc, params.minDsgSoc);
+        }
+    }
+    updateInvValues(params) {
+        if (params.inputWatts !== undefined) {
+            const isCharging = params.inputWatts > 0 && (params.outputWatts === undefined || params.inputWatts !== params.outputWatts);
+            this.batteryStatusService.updateChargingState(isCharging);
+            this.outletAcService.updateChargingState(isCharging);
+            this.outletUsbService.updateChargingState(isCharging);
+            this.outletCarService.updateChargingState(isCharging);
+            this.outletAcService.updateInputConsumption(params.inputWatts);
+            this.outletUsbService.updateInputConsumption(params.inputWatts);
+            this.outletCarService.updateInputConsumption(params.inputWatts);
+        }
+        if (params.outputWatts !== undefined) {
+            this.outletAcService.updateOutputConsumption(params.outputWatts);
+        }
+        if (params.cfgAcEnabled !== undefined && params.cfgAcEnabled !== batteryHttpApiContracts_1.AcEnableType.Ignore) {
+            this.outletAcService.updateState(params.cfgAcEnabled === batteryHttpApiContracts_1.AcEnableType.On);
+        }
+        if (params.cfgAcXboost !== undefined && params.cfgAcXboost !== batteryHttpApiContracts_1.AcXBoostType.Ignore) {
+            this.switchXboostService.updateState(params.cfgAcXboost === batteryHttpApiContracts_1.AcXBoostType.On);
+        }
+    }
+    updatePdValues(params) {
+        if (params.carState !== undefined) {
+            this.outletCarService.updateState(params.carState === batteryHttpApiContracts_1.EnableType.On);
+        }
+        if (params.carWatts !== undefined) {
+            this.outletCarService.updateOutputConsumption(params.carWatts);
+        }
+        if (params.dcOutState !== undefined) {
+            this.outletUsbService.updateState(params.dcOutState === batteryHttpApiContracts_1.EnableType.On);
+        }
+        if (params.usb1Watts !== undefined ||
+            params.usb2Watts !== undefined ||
+            params.qcUsb1Watts !== undefined ||
+            params.qcUsb2Watts !== undefined ||
+            params.typec1Watts !== undefined ||
+            params.typec2Watts !== undefined) {
+            const usbWatts = this.sum(params.usb1Watts, params.usb2Watts, params.qcUsb1Watts, params.qcUsb2Watts, params.typec1Watts, params.typec2Watts);
+            this.outletUsbService.updateOutputConsumption(usbWatts);
+        }
+    }
 }
 exports.DeltaProAccessory = DeltaProAccessory;
 //# sourceMappingURL=deltaProAccessory.js.map

package/dist/accessories/batteries/deltapro/deltaProAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaProAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro/deltaProAccessory.ts"],"names":[],"mappings":";;;AAAA,yGAAsG;AAEtG,MAAa,iBAAkB,SAAQ,6CAAqB;CAAG;AAA/D,8CAA+D"}
+{"version":3,"file":"deltaProAccessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro/deltaProAccessory.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/deltapro/services/deltaProOutletServiceBase.d.ts

@@ -1,5 +1,5 @@
 import { DeltaProMqttSetMessageParams } from '@ecoflow/accessories/batteries/deltapro/interfaces/deltaProMqttApiContracts';
-import { OutletServiceBase } from '@ecoflow/services/outletServiceBase';
-export declare abstract class DeltaProOutletServiceBase extends OutletServiceBase {
+import { BatteryOutletServiceBase } from '@ecoflow/services/batteryOutletServiceBase';
+export declare abstract class DeltaProOutletServiceBase extends BatteryOutletServiceBase {
     protected sendOn<TParams extends DeltaProMqttSetMessageParams>(params: TParams, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/deltapro/services/deltaProOutletServiceBase.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeltaProOutletServiceBase = void 0;
-const outletServiceBase_1 = require("@ecoflow/services/outletServiceBase");
-class DeltaProOutletServiceBase extends outletServiceBase_1.OutletServiceBase {
+const batteryOutletServiceBase_1 = require("@ecoflow/services/batteryOutletServiceBase");
+class DeltaProOutletServiceBase extends batteryOutletServiceBase_1.BatteryOutletServiceBase {
     sendOn(params, revert) {
         const message = {
             id: 0,

package/dist/accessories/batteries/deltapro/services/deltaProOutletServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaProOutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro/services/deltaProOutletServiceBase.ts"],"names":[],"mappings":";;;AAIA,2EAAwE;AAExE,MAAsB,yBAA0B,SAAQ,qCAAiB;IAC7D,MAAM,CAA+C,MAAe,EAAE,MAAkB;QAChG,MAAM,OAAO,GAA8C;YACzD,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,KAAK;YAClB,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAXD,8DAWC"}
+{"version":3,"file":"deltaProOutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro/services/deltaProOutletServiceBase.ts"],"names":[],"mappings":";;;AAIA,yFAAsF;AAEtF,MAAsB,yBAA0B,SAAQ,mDAAwB;IACpE,MAAM,CAA+C,MAAe,EAAE,MAAkB;QAChG,MAAM,OAAO,GAA8C;YACzD,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,KAAK;YAClB,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAXD,8DAWC"}

package/dist/accessories/batteries/deltapro3/deltaPro3Accessory.js

@@ -33,7 +33,7 @@ class DeltaPro3Accessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessor
         ];
     }
     processQuotaMessage(message) {
-        const data = message.data;
+        const data = message;
         Object.assign(this.quota, data);
         this.updateSocValues(data);
         this.updateInputWattsValues(data);
@@ -45,10 +45,7 @@ class DeltaPro3Accessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessor
         return result;
     }
     updateInitialValues(data) {
-        const message = {
-            data,
-        };
-        this.processQuotaMessage(message);
+        this.processQuotaMessage(data);
     }
     updateSocValues(params) {
         if (params.cmsBattSoc !== undefined && params.cmsMinDsgSoc !== undefined) {
@@ -59,26 +56,26 @@ class DeltaPro3Accessory extends ecoFlowAccessoryWithQuotaBase_1.EcoFlowAccessor
         }
     }
     updateInputWattsValues(params) {
-        if (params.powInSumW !== undefined) {
-            const isCharging = params.powInSumW > 0 && (params.powOutSumW === undefined || params.powInSumW !== params.powOutSumW);
+        if (params.inputWatts !== undefined) {
+            const isCharging = params.inputWatts > 0 && (params.outputWatts === undefined || params.inputWatts !== params.outputWatts);
             this.batteryStatusService.updateChargingState(isCharging);
             this.outletAcHvService.updateChargingState(isCharging);
             this.outletAcLvService.updateChargingState(isCharging);
             this.outletDc12vService.updateChargingState(isCharging);
-            this.outletAcHvService.updateInputConsumption(params.powInSumW);
-            this.outletAcLvService.updateInputConsumption(params.powInSumW);
-            this.outletDc12vService.updateInputConsumption(params.powInSumW);
+            this.outletAcHvService.updateInputConsumption(params.inputWatts);
+            this.outletAcLvService.updateInputConsumption(params.inputWatts);
+            this.outletDc12vService.updateInputConsumption(params.inputWatts);
         }
     }
     updateOutputWattsValues(params) {
         if (params.powGetAcHvOut !== undefined) {
-            this.outletAcHvService.updateOutputConsumption(params.powGetAcHvOut);
+            this.outletAcHvService.updateOutputConsumption(Math.abs(params.powGetAcHvOut));
         }
         if (params.powGetAcLvOut !== undefined) {
-            this.outletAcLvService.updateOutputConsumption(params.powGetAcLvOut);
+            this.outletAcLvService.updateOutputConsumption(Math.abs(params.powGetAcLvOut));
         }
         if (params.powGet12v !== undefined) {
-            this.outletDc12vService.updateOutputConsumption(params.powGet12v);
+            this.outletDc12vService.updateOutputConsumption(Math.abs(params.powGet12v));
         }
     }
     updateSwitchStateValues(params) {

package/dist/accessories/batteries/deltapro3/deltaPro3Accessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaPro3Accessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro3/deltaPro3Accessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deltaPro3Accessory.js","sourceRoot":"","sources":["../../../../src/accessories/batteries/deltapro3/deltaPro3Accessory.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/deltapro3/interfaces/deltaPro3HttpApiContracts.d.ts

@@ -8,8 +8,8 @@ export interface DeltaPro3AllQuotaData {
     cmsBattSoc?: number;
     cmsMinDsgSoc?: number;
     xboostEn?: AcXBoostType;
-    powInSumW?: number;
-    powOutSumW?: number;
+    inputWatts?: number;
+    outputWatts?: number;
     flowInfoAcLvOut?: DeltaPro3AcEnableType;
     powGetAcLvOut?: number;
     flowInfoAcHvOut?: DeltaPro3AcEnableType;

package/dist/accessories/batteries/deltapro3/interfaces/deltaPro3MqttApiContracts.d.ts

@@ -1,8 +1,6 @@
-import { DeltaPro3AcEnableType } from '@ecoflow/accessories/batteries/deltapro3/interfaces/deltaPro3HttpApiContracts';
-import { MqttQuotaMessage, MqttQuotaMessageWithData, MqttSetMessage, MqttSetMessageWithParams, MqttSetReplyMessageData, MqttSetReplyMessageWithData } from '@ecoflow/apis/interfaces/mqttApiContracts';
-export interface DeltaPro3MqttQuotaMessage extends MqttQuotaMessage {
-}
-export interface DeltaPro3MqttQuotaMessageWithParams<TParams> extends MqttQuotaMessageWithData<TParams>, DeltaPro3MqttQuotaMessage {
+import { DeltaPro3AcEnableType, DeltaPro3AllQuotaData } from '@ecoflow/accessories/batteries/deltapro3/interfaces/deltaPro3HttpApiContracts';
+import { MqttQuotaMessage, MqttSetMessage, MqttSetMessageWithParams, MqttSetReplyMessageData, MqttSetReplyMessageWithData } from '@ecoflow/apis/interfaces/mqttApiContracts';
+export interface DeltaPro3MqttQuotaMessage extends MqttQuotaMessage, DeltaPro3AllQuotaData {
 }
 export type DeltaPro3MqttSetCmdIdType = 17;
 export type DeltaPro3MqttSetDirType = 1;

package/dist/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase.d.ts

@@ -1,5 +1,5 @@
 import { DeltaPro3MqttSetMessageParams } from '@ecoflow/accessories/batteries/deltapro3/interfaces/deltaPro3MqttApiContracts';
-import { OutletServiceBase } from '@ecoflow/services/outletServiceBase';
-export declare abstract class DeltaPro3OutletServiceBase extends OutletServiceBase {
+import { BatteryOutletServiceBase } from '@ecoflow/services/batteryOutletServiceBase';
+export declare abstract class DeltaPro3OutletServiceBase extends BatteryOutletServiceBase {
     protected sendOn<TParams extends DeltaPro3MqttSetMessageParams>(params: TParams, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeltaPro3OutletServiceBase = void 0;
-const outletServiceBase_1 = require("@ecoflow/services/outletServiceBase");
-class DeltaPro3OutletServiceBase extends outletServiceBase_1.OutletServiceBase {
+const batteryOutletServiceBase_1 = require("@ecoflow/services/batteryOutletServiceBase");
+class DeltaPro3OutletServiceBase extends batteryOutletServiceBase_1.BatteryOutletServiceBase {
     sendOn(params, revert) {
         const message = {
             id: 0,

package/dist/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaPro3OutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase.ts"],"names":[],"mappings":";;;AAIA,2EAAwE;AAExE,MAAsB,0BAA2B,SAAQ,qCAAiB;IAC9D,MAAM,CAAgD,MAAe,EAAE,MAAkB;QACjG,MAAM,OAAO,GAA+C;YAC1D,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY;YAC7C,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,GAAG;YACZ,IAAI,EAAE,CAAC;YACP,OAAO,EAAE,IAAI;YACb,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAjBD,gEAiBC"}
+{"version":3,"file":"deltaPro3OutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/services/deltaPro3OutletServiceBase.ts"],"names":[],"mappings":";;;AAIA,yFAAsF;AAEtF,MAAsB,0BAA2B,SAAQ,mDAAwB;IACrE,MAAM,CAAgD,MAAe,EAAE,MAAkB;QACjG,MAAM,OAAO,GAA+C;YAC1D,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY;YAC7C,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,GAAG;YACZ,IAAI,EAAE,CAAC;YACP,OAAO,EAAE,IAAI;YACb,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAjBD,gEAiBC"}

package/dist/accessories/batteries/deltapro3/simulations/deltaPro3Simulator.js

@@ -7,24 +7,22 @@ const simulator_1 = require("@ecoflow/apis/simulations/simulator");
 class DeltaPro3Simulator extends simulator_1.SimulatorTyped {
     generateQuota() {
         const quota = {
-            data: {
-                cmsBattSoc: this.getRandomNumber(0, 100),
-                cmsMinDsgSoc: this.getRandomNumber(0, 20),
-                flowInfo12v: this.getRandomBoolean() ? deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.On : deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.Off,
-                flowInfoAcHvOut: this.getRandomBoolean() ? deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.On : deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.Off,
-                flowInfoAcLvOut: this.getRandomBoolean() ? deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.On : deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.Off,
-                powGet12v: this.getRandomNumber(0, 100),
-                powGetAc: this.getRandomNumber(0, 1000),
-                powGetAcHvOut: this.getRandomNumber(0, 1000),
-                powGetAcLvOut: this.getRandomNumber(0, 1000),
-                powGetQcusb1: this.getRandomNumber(0, 100),
-                powGetQcusb2: this.getRandomNumber(0, 100),
-                powGetTypec1: this.getRandomNumber(0, 100),
-                powGetTypec2: this.getRandomNumber(0, 100),
-                powInSumW: this.getRandomNumber(0, 1000),
-                powOutSumW: this.getRandomNumber(0, 1000),
-                xboostEn: this.getRandomBoolean() ? batteryHttpApiContracts_1.AcXBoostType.On : batteryHttpApiContracts_1.AcXBoostType.Off,
-            },
+            cmsBattSoc: this.getRandomNumber(0, 100),
+            cmsMinDsgSoc: this.getRandomNumber(0, 20),
+            flowInfo12v: this.getRandomBoolean() ? deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.On : deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.Off,
+            flowInfoAcHvOut: this.getRandomBoolean() ? deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.On : deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.Off,
+            flowInfoAcLvOut: this.getRandomBoolean() ? deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.On : deltaPro3HttpApiContracts_1.DeltaPro3AcEnableType.Off,
+            powGet12v: -this.getRandomNumber(0, 100),
+            powGetAc: -this.getRandomNumber(0, 1000),
+            powGetAcHvOut: -this.getRandomNumber(0, 1000),
+            powGetAcLvOut: -this.getRandomNumber(0, 1000),
+            powGetQcusb1: -this.getRandomNumber(0, 100),
+            powGetQcusb2: -this.getRandomNumber(0, 100),
+            powGetTypec1: -this.getRandomNumber(0, 100),
+            powGetTypec2: -this.getRandomNumber(0, 100),
+            inputWatts: this.getRandomNumber(0, 1000),
+            outputWatts: this.getRandomNumber(0, 1000),
+            xboostEn: this.getRandomBoolean() ? batteryHttpApiContracts_1.AcXBoostType.On : batteryHttpApiContracts_1.AcXBoostType.Off,
         };
         return quota;
     }

package/dist/accessories/batteries/deltapro3/simulations/deltaPro3Simulator.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaPro3Simulator.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/simulations/deltaPro3Simulator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deltaPro3Simulator.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltapro3/simulations/deltaPro3Simulator.ts"],"names":[],"mappings":"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"}

package/dist/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.d.ts

@@ -1,5 +1,5 @@
 import { DeltaProUltraMqttSetCmdCodeType, DeltaProUltraMqttSetMessageParams } from '@ecoflow/accessories/batteries/deltaproultra/interfaces/deltaProUltraMqttApiContracts';
-import { OutletServiceBase } from '@ecoflow/services/outletServiceBase';
-export declare abstract class DeltaProUltraOutletServiceBase extends OutletServiceBase {
+import { BatteryOutletServiceBase } from '@ecoflow/services/batteryOutletServiceBase';
+export declare abstract class DeltaProUltraOutletServiceBase extends BatteryOutletServiceBase {
     protected sendOn<TParams extends DeltaProUltraMqttSetMessageParams>(cmdCode: DeltaProUltraMqttSetCmdCodeType, params: TParams, revert: () => void): Promise<void>;
 }

package/dist/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeltaProUltraOutletServiceBase = void 0;
-const outletServiceBase_1 = require("@ecoflow/services/outletServiceBase");
-class DeltaProUltraOutletServiceBase extends outletServiceBase_1.OutletServiceBase {
+const batteryOutletServiceBase_1 = require("@ecoflow/services/batteryOutletServiceBase");
+class DeltaProUltraOutletServiceBase extends batteryOutletServiceBase_1.BatteryOutletServiceBase {
     sendOn(cmdCode, params, revert) {
         const message = {
             id: 0,

package/dist/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaProUltraOutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.ts"],"names":[],"mappings":";;;AAKA,2EAAwE;AAExE,MAAsB,8BAA+B,SAAQ,qCAAiB;IAClE,MAAM,CACd,OAAwC,EACxC,MAAe,EACf,MAAkB;QAElB,MAAM,OAAO,GAAmD;YAC9D,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,OAAO;YACP,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAfD,wEAeC"}
+{"version":3,"file":"deltaProUltraOutletServiceBase.js","sourceRoot":"","sources":["../../../../../src/accessories/batteries/deltaproultra/services/deltaProUltraOutletServiceBase.ts"],"names":[],"mappings":";;;AAKA,yFAAsF;AAEtF,MAAsB,8BAA+B,SAAQ,mDAAwB;IACzE,MAAM,CACd,OAAwC,EACxC,MAAe,EACf,MAAkB;QAElB,MAAM,OAAO,GAAmD;YAC9D,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,OAAO;YACP,MAAM;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AAfD,wEAeC"}

package/dist/accessories/powerstream/interfaces/powerStreamMqttApiContracts.d.ts

@@ -14,11 +14,9 @@ export interface PowerStreamMqttQuotaMessage extends MqttQuotaMessage {
 export interface PowerStreamMqttQuotaMessageWithParams<TParams> extends MqttQuotaMessageWithParam<TParams>, PowerStreamMqttQuotaMessage {
 }
 export declare enum PowerStreamMqttSetCmdCodeType {
-    WN511_SET_SUPPLY_PRIORITY_PACK = "WN511_SET_SUPPLY_PRIORITY_PACK",
-    WN511_SET_PERMANENT_WATTS_PACK = "WN511_SET_PERMANENT_WATTS_PACK",
-    WN511_SET_BAT_LOWER_PACK = "WN511_SET_BAT_LOWER_PACK",
-    WN511_SET_BAT_UPPER_PACK = "WN511_SET_BAT_UPPER_PACK",
-    WN511_SET_BRIGHTNESS_PACK = "WN511_SET_BRIGHTNESS_PACK"
+    SupplyPriority = "WN511_SET_SUPPLY_PRIORITY_PACK",
+    PowerDemand = "WN511_SET_PERMANENT_WATTS_PACK",
+    Brightness = "WN511_SET_BRIGHTNESS_PACK"
 }
 export interface PowerStreamMqttSetMessage extends MqttSetMessage {
     cmdCode: PowerStreamMqttSetCmdCodeType;

package/dist/accessories/powerstream/interfaces/powerStreamMqttApiContracts.js

@@ -12,10 +12,8 @@ var PowerStreamMqttMessageFuncType;
 })(PowerStreamMqttMessageFuncType || (exports.PowerStreamMqttMessageFuncType = PowerStreamMqttMessageFuncType = {}));
 var PowerStreamMqttSetCmdCodeType;
 (function (PowerStreamMqttSetCmdCodeType) {
-    PowerStreamMqttSetCmdCodeType["WN511_SET_SUPPLY_PRIORITY_PACK"] = "WN511_SET_SUPPLY_PRIORITY_PACK";
-    PowerStreamMqttSetCmdCodeType["WN511_SET_PERMANENT_WATTS_PACK"] = "WN511_SET_PERMANENT_WATTS_PACK";
-    PowerStreamMqttSetCmdCodeType["WN511_SET_BAT_LOWER_PACK"] = "WN511_SET_BAT_LOWER_PACK";
-    PowerStreamMqttSetCmdCodeType["WN511_SET_BAT_UPPER_PACK"] = "WN511_SET_BAT_UPPER_PACK";
-    PowerStreamMqttSetCmdCodeType["WN511_SET_BRIGHTNESS_PACK"] = "WN511_SET_BRIGHTNESS_PACK";
+    PowerStreamMqttSetCmdCodeType["SupplyPriority"] = "WN511_SET_SUPPLY_PRIORITY_PACK";
+    PowerStreamMqttSetCmdCodeType["PowerDemand"] = "WN511_SET_PERMANENT_WATTS_PACK";
+    PowerStreamMqttSetCmdCodeType["Brightness"] = "WN511_SET_BRIGHTNESS_PACK";
 })(PowerStreamMqttSetCmdCodeType || (exports.PowerStreamMqttSetCmdCodeType = PowerStreamMqttSetCmdCodeType = {}));
 //# sourceMappingURL=powerStreamMqttApiContracts.js.map

package/dist/accessories/powerstream/interfaces/powerStreamMqttApiContracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"powerStreamMqttApiContracts.js","sourceRoot":"","sources":["../../../../src/accessories/powerstream/interfaces/powerStreamMqttApiContracts.ts"],"names":[],"mappings":";;;AAQA,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,qFAAa,CAAA;IACb,6EAAU,CAAA;AACZ,CAAC,EAHW,0BAA0B,0CAA1B,0BAA0B,QAGrC;AAED,IAAY,8BAEX;AAFD,WAAY,8BAA8B;IACxC,wFAAW,CAAA;AACb,CAAC,EAFW,8BAA8B,8CAA9B,8BAA8B,QAEzC;AAWD,IAAY,6BAMX;AAND,WAAY,6BAA6B;IACvC,kGAAiE,CAAA;IACjE,kGAAiE,CAAA;IACjE,sFAAqD,CAAA;IACrD,sFAAqD,CAAA;IACrD,wFAAuD,CAAA;AACzD,CAAC,EANW,6BAA6B,6CAA7B,6BAA6B,QAMxC"}
+{"version":3,"file":"powerStreamMqttApiContracts.js","sourceRoot":"","sources":["../../../../src/accessories/powerstream/interfaces/powerStreamMqttApiContracts.ts"],"names":[],"mappings":";;;AAQA,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,qFAAa,CAAA;IACb,6EAAU,CAAA;AACZ,CAAC,EAHW,0BAA0B,0CAA1B,0BAA0B,QAGrC;AAED,IAAY,8BAEX;AAFD,WAAY,8BAA8B;IACxC,wFAAW,CAAA;AACb,CAAC,EAFW,8BAA8B,8CAA9B,8BAA8B,QAEzC;AAWD,IAAY,6BAIX;AAJD,WAAY,6BAA6B;IACvC,kFAAiD,CAAA;IACjD,+EAA8C,CAAA;IAC9C,yEAAwC,CAAA;AAC1C,CAAC,EAJW,6BAA6B,6CAA7B,6BAA6B,QAIxC"}

package/dist/accessories/powerstream/services/brightnessService.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrightnessService = void 0;
-const mqttApiPowerStreamContracts_1 = require("@ecoflow/accessories/powerstream/interfaces/mqttApiPowerStreamContracts");
+const powerStreamMqttApiContracts_1 = require("@ecoflow/accessories/powerstream/interfaces/powerStreamMqttApiContracts");
 const lightBulbServiceBase_1 = require("@ecoflow/services/lightBulbServiceBase");
 class BrightnessService extends lightBulbServiceBase_1.LightBulbServiceBase {
     constructor(ecoFlowAccessory, maxBrightness) {
@@ -15,7 +15,7 @@ class BrightnessService extends lightBulbServiceBase_1.LightBulbServiceBase {
         const message = {
             id: 0,
             version: '',
-            cmdCode: mqttApiPowerStreamContracts_1.MqttPowerStreamSetCmdCodeType.WN511_SET_BRIGHTNESS_PACK,
+            cmdCode: powerStreamMqttApiContracts_1.PowerStreamMqttSetCmdCodeType.Brightness,
             params: {
                 brightness: Math.round(value),
             },

package/dist/accessories/powerstream/services/brightnessService.js.map

@@ -1 +1 @@
-{"version":3,"file":"brightnessService.js","sourceRoot":"","sources":["../../../../src/accessories/powerstream/services/brightnessService.ts"],"names":[],"mappings":";;;AACA,yHAIiF;AACjF,iFAA8E;AAE9E,MAAa,iBAAkB,SAAQ,2CAAoB;IACzD,YAAY,gBAAsC,EAAE,aAAqB;QACvE,KAAK,CAAC,gBAAgB,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;IACvD,CAAC;IAEkB,cAAc,CAAC,KAAc;QAC9C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEkB,sBAAsB,CAAC,KAAa,EAAE,MAAkB;QACzE,MAAM,OAAO,GAAmF;YAC9F,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,2DAA6B,CAAC,yBAAyB;YAChE,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;aAC9B;SACF,CAAC;QACF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AArBD,8CAqBC"}
+{"version":3,"file":"brightnessService.js","sourceRoot":"","sources":["../../../../src/accessories/powerstream/services/brightnessService.ts"],"names":[],"mappings":";;;AACA,yHAIiF;AACjF,iFAA8E;AAE9E,MAAa,iBAAkB,SAAQ,2CAAoB;IACzD,YAAY,gBAAsC,EAAE,aAAqB;QACvE,KAAK,CAAC,gBAAgB,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;IACvD,CAAC;IAEkB,cAAc,CAAC,KAAc;QAC9C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEkB,sBAAsB,CAAC,KAAa,EAAE,MAAkB;QACzE,MAAM,OAAO,GAAmF;YAC9F,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,2DAA6B,CAAC,UAAU;YACjD,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;aAC9B;SACF,CAAC;QACF,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACF;AArBD,8CAqBC"}

package/dist/accessories/powerstream/services/outletInvService.d.ts

@@ -1,8 +1,8 @@
 import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
 import { AdditionalBatteryCharacteristicType as CharacteristicType } from '@ecoflow/config';
 import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
-import { OutletServiceBase } from '@ecoflow/services/outletServiceBase';
-export declare class OutletInvService extends OutletServiceBase {
+import { BatteryOutletServiceBase } from '@ecoflow/services/batteryOutletServiceBase';
+export declare class OutletInvService extends BatteryOutletServiceBase {
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, additionalCharacteristics?: CharacteristicType[]);
     protected setOn(): Promise<void>;
 }