@pietrolubini/homebridge-ecoflow 1.3.0 → 1.4.0

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PowerDemandService = void 0;
-const mqttApiPowerStreamContracts_1 = require("@ecoflow/accessories/powerstream/interfaces/mqttApiPowerStreamContracts");
+const powerStreamMqttApiContracts_1 = require("@ecoflow/accessories/powerstream/interfaces/powerStreamMqttApiContracts");
 const fanServiceBase_1 = require("@ecoflow/services/fanServiceBase");
 class PowerDemandService extends fanServiceBase_1.FanServiceBase {
     constructor(ecoFlowAccessory, maxPowerDemand) {
@@ -15,7 +15,7 @@ class PowerDemandService extends fanServiceBase_1.FanServiceBase {
         const message = {
             id: 0,
             version: '',
-            cmdCode: mqttApiPowerStreamContracts_1.MqttPowerStreamSetCmdCodeType.WN511_SET_PERMANENT_WATTS_PACK,
+            cmdCode: powerStreamMqttApiContracts_1.PowerStreamMqttSetCmdCodeType.WN511_SET_PERMANENT_WATTS_PACK,
             params: {
                 permanentWatts: value,
             },

package/dist/accessories/powerstream/simulations/powerStreamSimulator.d.ts

@@ -1,6 +1,6 @@
-import { MqttPowerStreamSetMessage } from '@ecoflow/accessories/powerstream/interfaces/mqttApiPowerStreamContracts';
+import { PowerStreamMqttSetMessage } from '@ecoflow/accessories/powerstream/interfaces/powerStreamMqttApiContracts';
 import { SimulatorTyped } from '@ecoflow/apis/simulations/simulator';
-export declare class PowerStreamSimulator extends SimulatorTyped<MqttPowerStreamSetMessage> {
+export declare class PowerStreamSimulator extends SimulatorTyped<PowerStreamMqttSetMessage> {
     generateQuota(): object;
-    generateSetReplyTyped(message: MqttPowerStreamSetMessage): object;
+    generateSetReplyTyped(message: PowerStreamMqttSetMessage): object;
 }

package/dist/accessories/powerstream/simulations/powerStreamSimulator.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PowerStreamSimulator = void 0;
-const mqttApiPowerStreamContracts_1 = require("@ecoflow/accessories/powerstream/interfaces/mqttApiPowerStreamContracts");
+const batteryHttpApiContracts_1 = require("@ecoflow/accessories/batteries/interfaces/batteryHttpApiContracts");
+const powerStreamMqttApiContracts_1 = require("@ecoflow/accessories/powerstream/interfaces/powerStreamMqttApiContracts");
 const simulator_1 = require("@ecoflow/apis/simulations/simulator");
 class PowerStreamSimulator extends simulator_1.SimulatorTyped {
     generateQuota() {
         const quota = {
-            cmdFunc: mqttApiPowerStreamContracts_1.MqttPowerStreamMessageFuncType.Func20,
-            cmdId: mqttApiPowerStreamContracts_1.MqttPowerStreamMessageType.Heartbeat,
+            cmdFunc: powerStreamMqttApiContracts_1.PowerStreamMqttMessageFuncType.Func20,
+            cmdId: powerStreamMqttApiContracts_1.PowerStreamMqttMessageType.Heartbeat,
             param: {
                 pv1InputWatts: this.getRandomNumber(1, 3000),
                 pv2InputWatts: this.getRandomNumber(1, 3000),
                 batInputWatts: this.getRandomNumber(-6000, 6000),
                 batSoc: this.getRandomNumber(0, 100),
                 invOutputWatts: this.getRandomNumber(-6000, 6000),
-                invOnOff: this.getRandomBoolean(),
+                invOnOff: this.getRandomBoolean() ? batteryHttpApiContracts_1.EnableType.On : batteryHttpApiContracts_1.EnableType.Off,
                 supplyPriority: Math.floor(this.getRandomNumber(0, 1)),
                 permanentWatts: this.getRandomNumber(0, 6000),
                 upperLimit: Math.floor(this.getRandomNumber(1, 30)),

package/dist/accessories/powerstream/simulations/powerStreamSimulator.js.map

@@ -1 +1 @@
-{"version":3,"file":"powerStreamSimulator.js","sourceRoot":"","sources":["../../../../src/accessories/powerstream/simulations/powerStreamSimulator.ts"],"names":[],"mappings":";;;AACA,yHAKiF;AAEjF,mEAAqE;AAErE,MAAa,oBAAqB,SAAQ,0BAAyC;IACjE,aAAa;QAC3B,MAAM,KAAK,GAAqD;YAC9D,OAAO,EAAE,4DAA8B,CAAC,MAAM;YAC9C,KAAK,EAAE,wDAA0B,CAAC,SAAS;YAC3C,KAAK,EAAE;gBACL,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC5C,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC5C,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;gBAChD,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,GAAG,CAAC;gBACpC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;gBACjD,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE;gBACjC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtD,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC7C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnD,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBACrD,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;aACzD;SACF,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAEe,qBAAqB,CAAC,OAAkC;QACtE,MAAM,KAAK,GAAwB;YACjC,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE;gBACJ,GAAG,EAAE,KAAK;aACX;SACF,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAhCD,oDAgCC"}
+{"version":3,"file":"powerStreamSimulator.js","sourceRoot":"","sources":["../../../../src/accessories/powerstream/simulations/powerStreamSimulator.ts"],"names":[],"mappings":";;;AAAA,+GAA+F;AAE/F,yHAKiF;AAEjF,mEAAqE;AAErE,MAAa,oBAAqB,SAAQ,0BAAyC;IACjE,aAAa;QAC3B,MAAM,KAAK,GAAqD;YAC9D,OAAO,EAAE,4DAA8B,CAAC,MAAM;YAC9C,KAAK,EAAE,wDAA0B,CAAC,SAAS;YAC3C,KAAK,EAAE;gBACL,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC5C,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC5C,aAAa,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;gBAChD,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,GAAG,CAAC;gBACpC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;gBACjD,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,EAAE,CAAC,CAAC,CAAC,oCAAU,CAAC,GAAG;gBAClE,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtD,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC7C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnD,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBACrD,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;aACzD;SACF,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAEe,qBAAqB,CAAC,OAAkC;QACtE,MAAM,KAAK,GAAwB;YACjC,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE;gBACJ,GAAG,EAAE,KAAK;aACX;SACF,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAhCD,oDAgCC"}

package/dist/apis/containers/mqttClientContainer.js

@@ -30,6 +30,11 @@ class MqttClientContainer {
         if (!(config.serialNumber in this.devicesCache)) {
             this.devicesCache[config.serialNumber] = [];
         }
+        const devices = this.devicesCache[config.serialNumber];
+        if (devices.find(d => d.config.name === config.name)) {
+            // Ignore adding the same device multiple times
+            return;
+        }
         this.devicesCache[config.serialNumber].push(new mqttDevice_1.MqttDevice(config, log));
     }
     getAllDevices() {

package/dist/apis/containers/mqttClientContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"mqttClientContainer.js","sourceRoot":"","sources":["../../../src/apis/containers/mqttClientContainer.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AAMjE,MAAa,mBAAmB;IAIF;IAHpB,OAAO,GAA2B,IAAI,CAAC;IAC9B,YAAY,GAAuC,EAAE,CAAC;IAEvE,YAA4B,eAAuC;QAAvC,oBAAe,GAAf,eAAe,CAAwB;IAAG,CAAC;IAEvE,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAW,MAAM,CAAC,UAA2B;QAC3C,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;QAC5B,CAAC;IACH,CAAC;IAEM,WAAW;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEM,UAAU,CAAC,YAA2B;QAC3C,IAAI,YAAY,IAAI,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtD,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,SAAS,CAAC,MAAwB,EAAE,GAAY;QACrD,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,uBAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3E,CAAC;IAEM,aAAa;QAClB,MAAM,UAAU,GAAiB,EAAE,CAAC;QACpC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA1CD,kDA0CC"}
+{"version":3,"file":"mqttClientContainer.js","sourceRoot":"","sources":["../../../src/apis/containers/mqttClientContainer.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AAMjE,MAAa,mBAAmB;IAIF;IAHpB,OAAO,GAA2B,IAAI,CAAC;IAC9B,YAAY,GAAuC,EAAE,CAAC;IAEvE,YAA4B,eAAuC;QAAvC,oBAAe,GAAf,eAAe,CAAwB;IAAG,CAAC;IAEvE,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAW,MAAM,CAAC,UAA2B;QAC3C,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;QAC5B,CAAC;IACH,CAAC;IAEM,WAAW;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEM,UAAU,CAAC,YAA2B;QAC3C,IAAI,YAAY,IAAI,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtD,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,SAAS,CAAC,MAAwB,EAAE,GAAY;QACrD,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QAC9C,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACrD,+CAA+C;YAC/C,OAAO;QACT,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,uBAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3E,CAAC;IAEM,aAAa;QAClB,MAAM,UAAU,GAAiB,EAAE,CAAC;QACpC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA/CD,kDA+CC"}

package/dist/apis/containers/mqttDevice.js

@@ -15,7 +15,7 @@ class MqttDevice {
         this.log = log;
     }
     processReceivedMessage(topicType, message) {
-        this.log.debug(`Received message: ${JSON.stringify(message, null, 2)}`);
+        this.log.debug(`Received message (topic: ${topicType}): ${JSON.stringify(message, null, 2)}`);
         switch (topicType) {
             case mqttApiContracts_1.MqttTopicType.Quota:
                 this.quotaSubject.next(message);

package/dist/apis/containers/mqttDevice.js.map

@@ -1 +1 @@
-{"version":3,"file":"mqttDevice.js","sourceRoot":"","sources":["../../../src/apis/containers/mqttDevice.ts"],"names":[],"mappings":";;;AAAA,gFAKmD;AAGnD,+BAAyD;AAEzD,MAAa,UAAU;IAOZ;IACS;IAPD,YAAY,GAA8B,IAAI,cAAO,EAAoB,CAAC;IAC1E,eAAe,GAAiC,IAAI,cAAO,EAAuB,CAAC;IACnF,MAAM,GAAiC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IACxE,SAAS,GAAoC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;IAElG,YACS,MAAwB,EACf,GAAY;QADrB,WAAM,GAAN,MAAM,CAAkB;QACf,QAAG,GAAH,GAAG,CAAS;IAC3B,CAAC;IAEG,sBAAsB,CAAC,SAAwB,EAAE,OAAoB;QAC1E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACxE,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,gCAAa,CAAC,KAAK;gBACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAA2B,CAAC,CAAC;gBACpD,MAAM;YACR,KAAK,gCAAa,CAAC,QAAQ;gBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAA8B,CAAC,CAAC;gBAC1D,MAAM;YACR;gBACE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAyC,EAAE,SAAS,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAEM,kBAAkB,CACvB,SAAwB,EACxB,QAAqC;QAErC,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,gCAAa,CAAC,KAAK;gBACtB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAmB,CAAC,CAAC,CAAC;YACzE,KAAK,gCAAa,CAAC,QAAQ;gBACzB,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAmB,CAAC,CAAC,CAAC;YAC5E;gBACE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,SAAS,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;CACF;AAvCD,gCAuCC"}
+{"version":3,"file":"mqttDevice.js","sourceRoot":"","sources":["../../../src/apis/containers/mqttDevice.ts"],"names":[],"mappings":";;;AAAA,gFAKmD;AAGnD,+BAAyD;AAEzD,MAAa,UAAU;IAOZ;IACS;IAPD,YAAY,GAA8B,IAAI,cAAO,EAAoB,CAAC;IAC1E,eAAe,GAAiC,IAAI,cAAO,EAAuB,CAAC;IACnF,MAAM,GAAiC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IACxE,SAAS,GAAoC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;IAElG,YACS,MAAwB,EACf,GAAY;QADrB,WAAM,GAAN,MAAM,CAAkB;QACf,QAAG,GAAH,GAAG,CAAS;IAC3B,CAAC;IAEG,sBAAsB,CAAC,SAAwB,EAAE,OAAoB;QAC1E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9F,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,gCAAa,CAAC,KAAK;gBACtB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAA2B,CAAC,CAAC;gBACpD,MAAM;YACR,KAAK,gCAAa,CAAC,QAAQ;gBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAA8B,CAAC,CAAC;gBAC1D,MAAM;YACR;gBACE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAyC,EAAE,SAAS,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAEM,kBAAkB,CACvB,SAAwB,EACxB,QAAqC;QAErC,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,gCAAa,CAAC,KAAK;gBACtB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAmB,CAAC,CAAC,CAAC;YACzE,KAAK,gCAAa,CAAC,QAAQ;gBACzB,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAmB,CAAC,CAAC,CAAC;YAC5E;gBACE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE,SAAS,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;CACF;AAvCD,gCAuCC"}

package/dist/apis/interfaces/mqttApiContracts.d.ts

@@ -8,6 +8,9 @@ export interface MqttQuotaMessageWithParams<TParams> extends MqttQuotaMessage {
 export interface MqttQuotaMessageWithParam<TParams> extends MqttQuotaMessage {
     param: TParams;
 }
+export interface MqttQuotaMessageWithData<TParams> extends MqttQuotaMessage {
+    data: TParams;
+}
 export interface MqttSetMessage extends MqttMessage {
     id: number;
     version: string;
@@ -15,10 +18,18 @@ export interface MqttSetMessage extends MqttMessage {
 export interface MqttSetMessageWithParams<TParams> extends MqttSetMessage {
     params: TParams;
 }
-export interface MqttSetReplyMessage extends MqttSetMessage {
-    data: {
-        ack: boolean;
-    };
+export interface MqttAckSetReplyMessageData {
+    ack?: boolean;
+}
+export interface MqttResultSetReplyMessageData {
+    result?: boolean;
+}
+export interface MqttSetReplyMessageData extends MqttAckSetReplyMessageData, MqttResultSetReplyMessageData {
+}
+export interface MqttSetReplyMessage extends MqttSetReplyMessageWithData<MqttSetReplyMessageData> {
+}
+export interface MqttSetReplyMessageWithData<TData extends MqttSetReplyMessageData> extends MqttSetMessage {
+    data: TData;
 }
 export declare enum MqttTopicType {
     Quota = "quota",

package/dist/apis/interfaces/mqttApiContracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"mqttApiContracts.js","sourceRoot":"","sources":["../../../src/apis/interfaces/mqttApiContracts.ts"],"names":[],"mappings":";;;AA2BA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,uCAAsB,CAAA;AACxB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB"}
+{"version":3,"file":"mqttApiContracts.js","sourceRoot":"","sources":["../../../src/apis/interfaces/mqttApiContracts.ts"],"names":[],"mappings":";;;AAyCA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,uCAAsB,CAAA;AACxB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB"}

package/dist/config.d.ts

@@ -38,7 +38,9 @@ export interface BatteryDeviceConfig {
 export declare enum AdditionalBatteryCharacteristicType {
     BatteryLevel = "Battery Level, %",
     InputConsumptionInWatts = "Input Consumption, W",
-    OutputConsumptionInWatts = "Output Consumption, W"
+    OutputConsumptionInWatts = "Output Consumption, W",
+    ChargingState = "Charging State",
+    StatusLowBattery = "Status Low Battery"
 }
 export declare enum PowerStreamConsumptionType {
     W600 = 600,

package/dist/config.js

@@ -5,6 +5,8 @@ var DeviceModel;
 (function (DeviceModel) {
     DeviceModel["Delta2Max"] = "Delta 2 Max";
     DeviceModel["Delta2"] = "Delta 2";
+    // DeltaPro = 'Delta Pro',
+    // DeltaProUltra = 'Delta Pro Ultra',
     DeviceModel["PowerStream"] = "PowerStream";
 })(DeviceModel || (exports.DeviceModel = DeviceModel = {}));
 var LocationType;
@@ -17,6 +19,8 @@ var AdditionalBatteryCharacteristicType;
     AdditionalBatteryCharacteristicType["BatteryLevel"] = "Battery Level, %";
     AdditionalBatteryCharacteristicType["InputConsumptionInWatts"] = "Input Consumption, W";
     AdditionalBatteryCharacteristicType["OutputConsumptionInWatts"] = "Output Consumption, W";
+    AdditionalBatteryCharacteristicType["ChargingState"] = "Charging State";
+    AdditionalBatteryCharacteristicType["StatusLowBattery"] = "Status Low Battery";
 })(AdditionalBatteryCharacteristicType || (exports.AdditionalBatteryCharacteristicType = AdditionalBatteryCharacteristicType = {}));
 var PowerStreamConsumptionType;
 (function (PowerStreamConsumptionType) {

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAOA,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,iCAAkB,CAAA;IAClB,0CAA2B,CAAA;AAC7B,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,yBAAS,CAAA;IACT,yBAAS,CAAA;AACX,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AA8BD,IAAY,mCAIX;AAJD,WAAY,mCAAmC;IAC7C,wEAAiC,CAAA;IACjC,uFAAgD,CAAA;IAChD,yFAAkD,CAAA;AACpD,CAAC,EAJW,mCAAmC,mDAAnC,mCAAmC,QAI9C;AAED,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,6EAAU,CAAA;IACV,6EAAU,CAAA;AACZ,CAAC,EAHW,0BAA0B,0CAA1B,0BAA0B,QAGrC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAOA,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,iCAAkB,CAAA;IAClB,0BAA0B;IAC1B,qCAAqC;IACrC,0CAA2B,CAAA;AAC7B,CAAC,EANW,WAAW,2BAAX,WAAW,QAMtB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,yBAAS,CAAA;IACT,yBAAS,CAAA;AACX,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AA8BD,IAAY,mCAMX;AAND,WAAY,mCAAmC;IAC7C,wEAAiC,CAAA;IACjC,uFAAgD,CAAA;IAChD,yFAAkD,CAAA;IAClD,uEAAgC,CAAA;IAChC,8EAAuC,CAAA;AACzC,CAAC,EANW,mCAAmC,mDAAnC,mCAAmC,QAM9C;AAED,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,6EAAU,CAAA;IACV,6EAAU,CAAA;AACZ,CAAC,EAHW,0BAA0B,0CAA1B,0BAA0B,QAGrC"}

package/dist/helpers/batteryStatusProvider.d.ts

@@ -0,0 +1,4 @@
+import { EcoFlowCharacteristic } from '@ecoflow/platform';
+export declare class BatteryStatusProvider {
+    getStatusLowBattery(characteristic: EcoFlowCharacteristic, batteryLevel: number, dischargeLimit: number): number;
+}

package/dist/helpers/batteryStatusProvider.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BatteryStatusProvider = void 0;
+class BatteryStatusProvider {
+    getStatusLowBattery(characteristic, batteryLevel, dischargeLimit) {
+        return batteryLevel < dischargeLimit + 5
+            ? characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+    }
+}
+exports.BatteryStatusProvider = BatteryStatusProvider;
+//# sourceMappingURL=batteryStatusProvider.js.map

package/dist/helpers/batteryStatusProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"batteryStatusProvider.js","sourceRoot":"","sources":["../../src/helpers/batteryStatusProvider.ts"],"names":[],"mappings":";;;AAEA,MAAa,qBAAqB;IACzB,mBAAmB,CACxB,cAAqC,EACrC,YAAoB,EACpB,cAAsB;QAEtB,OAAO,YAAY,GAAG,cAAc,GAAG,CAAC;YACtC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,iBAAiB;YACnD,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;IAC3D,CAAC;CACF;AAVD,sDAUC"}

package/dist/helpers/batteryStatusProvider.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/homebridge-ui/public/index.html

@@ -3,4 +3,4 @@
     if (typeof renderEcoFlowPluginConfig === 'function') {
       renderEcoFlowPluginConfig(homebridge);
     }
-  });</script><script defer="defer" src="./index.js?q=c634f5b376ebee080d80"></script>
+  });</script><script defer="defer" src="./index.js?q=019bc1170b56d7572cf0"></script>

package/dist/homebridge-ui/public/index.js

@@ -1 +1 @@
-(()=>{"use strict";var e={999:(e,n)=>{Object.defineProperty(n,"__esModule",{value:!0}),n.ComponentRenderer=void 0,n.ComponentRenderer=class{renderTextBox(e,n,i,r,t){const o='\n    <div class="form-group">\n      <label for="device{id}" class="{requiredClass}">{title}</label>\n      <input type="text" class="form-control" id="device{id}" placeholder="{description}" required="{required}" />\n    </div>'.replace(/{id}/g,n).replace(/{title}/g,i.title).replace(/{description}/g,i.description??"").replace(/{requiredClass}/g,i.required?"required-label":"").replace(/{required}/g,(i.required??!1).toString());e.append(o);const a=e.find(`#device${n}`);a.val(r),a.on("change",(()=>t(a.val()?.toString()||"")))}renderDropDown(e,n,i,r,t){const o='\n    <div class="form-group">\n      <label for="device{id}" class="{requiredClass}">{title}</label>\n      <select class="form-control" id="device{id}" required="{required}"></select>\n    </div>'.replace(/{id}/g,n).replace(/{title}/g,i.title).replace(/{requiredClass}/g,i.required?"required-label":"").replace(/{required}/g,(i.required??!1).toString());e.append(o);const a=e.find(`#device${n}`);i.enum.forEach((e=>{const n=$("<option>").val(e).text(e);a.append(n)})),a.val(r),a.on("change",(()=>t(a.val()?.toString()||"")))}}},84:(e,n,i)=>{Object.defineProperty(n,"__esModule",{value:!0}),n.PluginConfigDevicesRenderer=void 0;const r=i(536);class t extends r.PluginConfigRendererBase{form;$tabs;$tabPanels;constructor(e){super(e),this.$tabs=$("#devicesTabs"),this.$tabPanels=$("#devicesPanels")}render(e){this.renderDevicesSettings({homebridgeProvider:e.homebridgeProvider,configSchema:e.configSchema,configuration:e.configuration,hideDeviceSettingsPerModel:{"Delta 2":["powerStream"],"Delta 2 Max":["powerStream"],PowerStream:["battery"]}})}renderDevicesSettings(e,n){$("#devicesLabel").text(e.configSchema.schema.properties.devices.title);const i=!n||n<0?0:n;this.renderDeviceTabs(e,i)}renderDeviceTabs(e,n){this.clearDeviceTabs();const i='\n      <li class="nav-item">\n        <a class="nav-link {activeClass}" data-toggle="tab" href="#deviceTabPanel{index}" id="deviceTab{index}">{name}</a>\n      </li>\n    ';e.configuration.devices.forEach(((r,t)=>{const o=i.replace(/{activeClass}/g,t===n?"active":"").replace(/{index}/g,t.toString()).replace(/{name}/g,r.name??`Device${t+1}`);this.$tabs.append(o),this.renderDeviceTabPanel(e,r,t,n,this.$tabs.find(`#deviceTab${t}`))})),this.renderAddNewDeviceTab(i,e)}clearDeviceTabs(){this.$tabs.empty(),this.$tabPanels.empty(),this.form?.end()}renderAddNewDeviceTab(e,n){const i=e.replace(/{activeClass}/g,"").replace(/{index}/g,"Add").replace(/{name}/g,"Add Device");this.$tabs.append(i),this.$tabs.find("#deviceTabAdd").on("click",(()=>{n.configuration.devices.push(this.getDefaultDeviceConfiguration(n.configSchema)),this.renderDevicesSettings(n,n.configuration.devices.length-1)}))}renderDeviceTabPanel(e,n,i,r,t){const o='\n    <div class="tab-pane container fade {activeClass} card card-body list-group-item" id="deviceTabPanel{index}">\n      <button type="button" class="close pull-right" id="deviceTabPanelClose{index}">\n        <span>×</span>\n        <span class="sr-only">Close</span>\n      </button>\n    </div>\n  '.replace(/{activeClass}/g,i===r?"in show active":"").replace(/{index}/g,i.toString());this.$tabPanels.append(o);const a=this.$tabPanels.find(`#deviceTabPanel${i}`),s=this.clone(e.configSchema.schema.properties.devices.items),d=s.properties.model;this.renderModelDropDown(t,a,i,e,s,d,n),this.renderRemoveButton(a,i,e),this.renderForm(t,i,r,e,s,n)}renderModelDropDown(e,n,i,r,t,o,a){this.componentRenderer.renderDropDown(n,"model"+i,o,a.model,(n=>{a.model=n,this.renderForm(e,i,i,r,t,a)}))}renderRemoveButton(e,n,i){e.find(`#deviceTabPanelClose${n}`).on("click",(()=>{i.configuration.devices.splice(n,1),this.renderDevicesSettings(i,n-1)}))}renderForm(e,n,i,r,t,o){delete(t=this.clone(t)).properties.model,r.hideDeviceSettingsPerModel[o.model].forEach((e=>{delete t.properties[e]})),e.off("click").on("click",(()=>{this.form?.end(),this.form=r.homebridgeProvider.createForm({schema:t},o),this.form.onChange((async i=>{const t=r.configuration.devices[n].name;this.applyChanges(r.configuration.devices[n],i,["model"]),await this.updatePluginConfig(r),i.name!==t&&e.text(i.name)}))})),n===i&&e.trigger("click")}getDefaultDeviceConfiguration(e){const n={},i=e.schema.properties.devices.items.properties;return Object.keys(i).filter((e=>!!i[e]?.default)).forEach((e=>{n[e]=i[e]?.default})),n}applyChanges(e,n,i){Object.assign(e,n);for(const r in e)void 0!==n[r]||i.includes(r)||delete e[r]}}n.PluginConfigDevicesRenderer=t},102:(e,n,i)=>{Object.defineProperty(n,"__esModule",{value:!0}),n.PluginConfigNameRenderer=void 0;const r=i(536);class t extends r.PluginConfigRendererBase{render(e){this.componentRenderer.renderTextBox($("#generalSettings"),"name",e.configSchema.schema.properties.name,e.configuration.name,(async n=>{e.configuration.name=n,await this.updatePluginConfig(e)}))}}n.PluginConfigNameRenderer=t},653:(e,n)=>{Object.defineProperty(n,"__esModule",{value:!0}),n.PluginConfigRenderer=void 0,n.PluginConfigRenderer=class{renderers;constructor(e){this.renderers=e}render(e){void 0===e.configuration&&(e.configuration={name:void 0,devices:[]}),this.renderers.forEach((n=>n.render(e)))}}},536:(e,n)=>{Object.defineProperty(n,"__esModule",{value:!0}),n.PluginConfigRendererBase=void 0,n.PluginConfigRendererBase=class{componentRenderer;constructor(e){this.componentRenderer=e}async updatePluginConfig(e){const n=this.clone(e.configuration);delete n.platform,await e.homebridgeProvider.updatePluginConfig([n])}clone(e){return JSON.parse(JSON.stringify(e))}}}},n={};function i(r){var t=n[r];if(void 0!==t)return t.exports;var o=n[r]={exports:{}};return e[r](o,o.exports,i),o.exports}(()=>{const e=i(999),n=i(84),r=i(102),t=i(653);window.renderEcoFlowPluginConfig=async function(i){const o=await i.getPluginConfig(),a=await i.getPluginConfigSchema(),s=o[0],d=new e.ComponentRenderer;new t.PluginConfigRenderer([new r.PluginConfigNameRenderer(d),new n.PluginConfigDevicesRenderer(d)]).render({homebridgeProvider:i,configuration:s,configSchema:a})}})()})();
+(()=>{"use strict";var e={999:(e,i)=>{Object.defineProperty(i,"__esModule",{value:!0}),i.ComponentRenderer=void 0,i.ComponentRenderer=class{renderTextBox(e,i,n,r,t){const o='\n    <div class="form-group">\n      <label for="device{id}" class="{requiredClass}">{title}</label>\n      <input type="text" class="form-control" id="device{id}" placeholder="{description}" required="{required}" />\n    </div>'.replace(/{id}/g,i).replace(/{title}/g,n.title).replace(/{description}/g,n.description??"").replace(/{requiredClass}/g,n.required?"required-label":"").replace(/{required}/g,(n.required??!1).toString());e.append(o);const a=e.find(`#device${i}`);a.val(r),a.on("change",(()=>t(a.val()?.toString()||"")))}renderDropDown(e,i,n,r,t){const o='\n    <div class="form-group">\n      <label for="device{id}" class="{requiredClass}">{title}</label>\n      <select class="form-control" id="device{id}" required="{required}"></select>\n    </div>'.replace(/{id}/g,i).replace(/{title}/g,n.title).replace(/{requiredClass}/g,n.required?"required-label":"").replace(/{required}/g,(n.required??!1).toString());e.append(o);const a=e.find(`#device${i}`);n.enum.forEach((e=>{const i=$("<option>").val(e).text(e);a.append(i)})),a.val(r),a.on("change",(()=>t(a.val()?.toString()||"")))}}},84:(e,i,n)=>{Object.defineProperty(i,"__esModule",{value:!0}),i.PluginConfigDevicesRenderer=void 0;const r=n(536);class t extends r.PluginConfigRendererBase{form;$tabs;$tabPanels;_hideDeviceSettingsPerModel;constructor(e){super(e),this.$tabs=$("#devicesTabs"),this.$tabPanels=$("#devicesPanels"),this._hideDeviceSettingsPerModel={"Delta 2":["powerStream"],"Delta 2 Max":["powerStream"],"Delta Pro":["powerStream"],"Delta Pro Ultra":["powerStream"],PowerStream:["battery"]}}get hideDeviceSettingsPerModel(){return this._hideDeviceSettingsPerModel}render(e){this.renderDevicesSettings({homebridgeProvider:e.homebridgeProvider,configSchema:e.configSchema,configuration:e.configuration,hideDeviceSettingsPerModel:this.hideDeviceSettingsPerModel})}renderDevicesSettings(e,i){$("#devicesLabel").text(e.configSchema.schema.properties.devices.title);const n=!i||i<0?0:i;this.renderDeviceTabs(e,n)}renderDeviceTabs(e,i){this.clearDeviceTabs();const n='\n      <li class="nav-item">\n        <a class="nav-link {activeClass}" data-toggle="tab" href="#deviceTabPanel{index}" id="deviceTab{index}">{name}</a>\n      </li>\n    ';e.configuration.devices.forEach(((r,t)=>{const o=n.replace(/{activeClass}/g,t===i?"active":"").replace(/{index}/g,t.toString()).replace(/{name}/g,r.name??`Device${t+1}`);this.$tabs.append(o),this.renderDeviceTabPanel(e,r,t,i,this.$tabs.find(`#deviceTab${t}`))})),this.renderAddNewDeviceTab(n,e)}clearDeviceTabs(){this.$tabs.empty(),this.$tabPanels.empty(),this.form?.end()}renderAddNewDeviceTab(e,i){const n=e.replace(/{activeClass}/g,"").replace(/{index}/g,"Add").replace(/{name}/g,"Add Device");this.$tabs.append(n),this.$tabs.find("#deviceTabAdd").on("click",(()=>{i.configuration.devices.push(this.getDefaultDeviceConfiguration(i.configSchema)),this.renderDevicesSettings(i,i.configuration.devices.length-1)}))}renderDeviceTabPanel(e,i,n,r,t){const o='\n    <div class="tab-pane container fade {activeClass} card card-body list-group-item" id="deviceTabPanel{index}">\n      <button type="button" class="close pull-right" id="deviceTabPanelClose{index}">\n        <span>×</span>\n        <span class="sr-only">Close</span>\n      </button>\n    </div>\n  '.replace(/{activeClass}/g,n===r?"in show active":"").replace(/{index}/g,n.toString());this.$tabPanels.append(o);const a=this.$tabPanels.find(`#deviceTabPanel${n}`),s=this.clone(e.configSchema.schema.properties.devices.items),d=s.properties.model;this.renderModelDropDown(t,a,n,e,s,d,i),this.renderRemoveButton(a,n,e),this.renderForm(t,n,r,e,s,i)}renderModelDropDown(e,i,n,r,t,o,a){this.componentRenderer.renderDropDown(i,"model"+n,o,a.model,(i=>{a.model=i,this.renderForm(e,n,n,r,t,a)}))}renderRemoveButton(e,i,n){e.find(`#deviceTabPanelClose${i}`).on("click",(()=>{n.configuration.devices.splice(i,1),this.renderDevicesSettings(n,i-1)}))}renderForm(e,i,n,r,t,o){delete(t=this.clone(t)).properties.model,r.hideDeviceSettingsPerModel[o.model].forEach((e=>{delete t.properties[e]})),e.off("click").on("click",(()=>{this.form?.end(),this.form=r.homebridgeProvider.createForm({schema:t},o),this.form.onChange((async n=>{const t=r.configuration.devices[i].name;this.applyChanges(r.configuration.devices[i],n,["model"]),await this.updatePluginConfig(r),n.name!==t&&e.text(n.name)}))})),i===n&&e.trigger("click")}getDefaultDeviceConfiguration(e){const i={},n=e.schema.properties.devices.items.properties;return Object.keys(n).filter((e=>!!n[e]?.default)).forEach((e=>{i[e]=n[e]?.default})),i}applyChanges(e,i,n){Object.assign(e,i);for(const r in e)void 0!==i[r]||n.includes(r)||delete e[r]}}i.PluginConfigDevicesRenderer=t},102:(e,i,n)=>{Object.defineProperty(i,"__esModule",{value:!0}),i.PluginConfigNameRenderer=void 0;const r=n(536);class t extends r.PluginConfigRendererBase{render(e){this.componentRenderer.renderTextBox($("#generalSettings"),"name",e.configSchema.schema.properties.name,e.configuration.name,(async i=>{e.configuration.name=i,await this.updatePluginConfig(e)}))}}i.PluginConfigNameRenderer=t},653:(e,i)=>{Object.defineProperty(i,"__esModule",{value:!0}),i.PluginConfigRenderer=void 0,i.PluginConfigRenderer=class{renderers;constructor(e){this.renderers=e}render(e){void 0===e.configuration&&(e.configuration={name:void 0,devices:[]}),this.renderers.forEach((i=>i.render(e)))}}},536:(e,i)=>{Object.defineProperty(i,"__esModule",{value:!0}),i.PluginConfigRendererBase=void 0,i.PluginConfigRendererBase=class{componentRenderer;constructor(e){this.componentRenderer=e}async updatePluginConfig(e){const i=this.clone(e.configuration);delete i.platform,await e.homebridgeProvider.updatePluginConfig([i])}clone(e){return JSON.parse(JSON.stringify(e))}}}},i={};function n(r){var t=i[r];if(void 0!==t)return t.exports;var o=i[r]={exports:{}};return e[r](o,o.exports,n),o.exports}(()=>{const e=n(999),i=n(84),r=n(102),t=n(653);window.renderEcoFlowPluginConfig=async function(n){const o=await n.getPluginConfig(),a=await n.getPluginConfigSchema(),s=o[0],d=new e.ComponentRenderer;new t.PluginConfigRenderer([new r.PluginConfigNameRenderer(d),new i.PluginConfigDevicesRenderer(d)]).render({homebridgeProvider:n,configuration:s,configSchema:a})}})()})();

package/dist/homebridge-ui/public/renderers/pluginConfigDevicesRenderer.d.ts

@@ -5,7 +5,9 @@ export declare class PluginConfigDevicesRenderer extends PluginConfigRendererBas
     private form;
     private readonly $tabs;
     private readonly $tabPanels;
+    private readonly _hideDeviceSettingsPerModel;
     constructor(componentRenderer: ComponentRenderer);
+    get hideDeviceSettingsPerModel(): Record<string, string[]>;
     render(context: IContext): void;
     private renderDevicesSettings;
     private renderDeviceTabs;

package/dist/platform.d.ts

@@ -16,6 +16,7 @@ export declare class EcoFlowHomebridgePlatform implements DynamicPlatformPlugin
     readonly accessories: PlatformAccessory[];
     private readonly httpApiManager;
     private readonly mqttApiManager;
+    private readonly batteryStatusProvider;
     constructor(commonLog: Logging, config: PlatformConfig, api: API);
     static InitCustomCharacteristics(hap: HAP): void;
     /**

package/dist/platform.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EcoFlowHomebridgePlatform = void 0;
-const delta2Accessory_1 = require("@ecoflow/accessories/batteries/delta2Accessory");
-const delta2maxAccessory_1 = require("@ecoflow/accessories/batteries/delta2maxAccessory");
-const batterySimulator_1 = require("@ecoflow/accessories/batteries/simulations/batterySimulator");
+const delta2Accessory_1 = require("@ecoflow/accessories/batteries/delta2/delta2Accessory");
+const delta2MaxAccessory_1 = require("@ecoflow/accessories/batteries/delta2/delta2MaxAccessory");
+const delta2Simulator_1 = require("@ecoflow/accessories/batteries/delta2/simulations/delta2Simulator");
 const powerStreamAccessory_1 = require("@ecoflow/accessories/powerstream/powerStreamAccessory");
 const powerStreamSimulator_1 = require("@ecoflow/accessories/powerstream/simulations/powerStreamSimulator");
 const ecoFlowHttpApiManager_1 = require("@ecoflow/apis/ecoFlowHttpApiManager");
 const ecoFlowMqttApiManager_1 = require("@ecoflow/apis/ecoFlowMqttApiManager");
 const customCharacteristic_1 = require("@ecoflow/characteristics/customCharacteristic");
 const config_1 = require("@ecoflow/config");
+const batteryStatusProvider_1 = require("@ecoflow/helpers/batteryStatusProvider");
 const logger_1 = require("@ecoflow/helpers/logger");
 const machineIdProvider_1 = require("@ecoflow/helpers/machineIdProvider");
 const settings_1 = require("@ecoflow/settings");
@@ -24,6 +25,7 @@ class EcoFlowHomebridgePlatform {
     accessories = [];
     httpApiManager = new ecoFlowHttpApiManager_1.EcoFlowHttpApiManager();
     mqttApiManager = new ecoFlowMqttApiManager_1.EcoFlowMqttApiManager(this.httpApiManager, new machineIdProvider_1.MachineIdProvider());
+    batteryStatusProvider = new batteryStatusProvider_1.BatteryStatusProvider();
     constructor(commonLog, config, api) {
         this.commonLog = commonLog;
         this.config = config;
@@ -160,13 +162,21 @@ class EcoFlowHomebridgePlatform {
         let EcoFlowAccessorySimulatorType = undefined;
         switch (config.model) {
             case config_1.DeviceModel.Delta2Max:
-                EcoFlowAccessoryType = delta2maxAccessory_1.Delta2MaxAccessory;
-                EcoFlowAccessorySimulatorType = batterySimulator_1.BatterySimulator;
+                EcoFlowAccessoryType = delta2MaxAccessory_1.Delta2MaxAccessory;
+                EcoFlowAccessorySimulatorType = delta2Simulator_1.Delta2Simulator;
                 break;
             case config_1.DeviceModel.Delta2:
                 EcoFlowAccessoryType = delta2Accessory_1.Delta2Accessory;
-                EcoFlowAccessorySimulatorType = batterySimulator_1.BatterySimulator;
+                EcoFlowAccessorySimulatorType = delta2Simulator_1.Delta2Simulator;
                 break;
+            // case DeviceModel.DeltaPro:
+            //  EcoFlowAccessoryType = DeltaProAccessory;
+            //  EcoFlowAccessorySimulatorType = DeltaProSimulator;
+            //  break;
+            // case DeviceModel.DeltaProUltra:
+            //   EcoFlowAccessoryType = DeltaProUltraAccessory;
+            //   EcoFlowAccessorySimulatorType = DeltaProUltraSimulator;
+            //   break;
             case config_1.DeviceModel.PowerStream:
                 EcoFlowAccessoryType = powerStreamAccessory_1.PowerStreamAccessory;
                 EcoFlowAccessorySimulatorType = powerStreamSimulator_1.PowerStreamSimulator;
@@ -175,9 +185,10 @@ class EcoFlowHomebridgePlatform {
                 log.warn(`"${config.model}" is not supported. Ignoring the device`);
         }
         config.simulator = EcoFlowAccessorySimulatorType;
-        return EcoFlowAccessoryType === null
-            ? null
-            : new EcoFlowAccessoryType(this, accessory, config, log, this.httpApiManager, this.mqttApiManager);
+        if (EcoFlowAccessoryType === null) {
+            return null;
+        }
+        return new EcoFlowAccessoryType(this, accessory, config, log, this.httpApiManager, this.mqttApiManager, this.batteryStatusProvider);
     }
 }
 exports.EcoFlowHomebridgePlatform = EcoFlowHomebridgePlatform;

package/dist/platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AAYA,2FAAwF;AACxF,iGAA8F;AAC9F,uGAAoG;AAEpG,gGAA6F;AAC7F,4GAAyG;AACzG,+EAA4E;AAC5E,+EAA4E;AAE5E,wFAIuD;AACvD,4CAA2E;AAC3E,kFAA+E;AAC/E,oDAAiD;AACjD,0EAAuE;AACvE,gDAA+D;AAU/D,MAAa,yBAAyB;IAiBjB;IACD;IACA;IAlBD,aAAa,CAAgB;IAC9B,OAAO,CAAiB;IACxB,cAAc,CAAwB;IAEtD,oDAAoD;IACpC,WAAW,GAAwB,EAAE,CAAC;IAErC,cAAc,GAA0B,IAAI,6CAAqB,EAAE,CAAC;IACpE,cAAc,GAA0B,IAAI,6CAAqB,CAChF,IAAI,CAAC,cAAc,EACnB,IAAI,qCAAiB,EAAE,CACxB,CAAC;IAEe,qBAAqB,GAA0B,IAAI,6CAAqB,EAAE,CAAC;IAE5F,YACmB,SAAkB,EACnB,MAAsB,EACtB,GAAQ;QAFP,cAAS,GAAT,SAAS,CAAS;QACnB,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAExB,yBAAyB,CAAC,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAuB,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG;YACpB,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc;YACzB,GAAG,4CAAqB;SACW,CAAC;QAEtC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE9E,8FAA8F;QAC9F,uFAAuF;QACvF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;QAC1C,CAAC;QAED,8FAA8F;QAC9F,4FAA4F;QAC5F,2FAA2F;QAC3F,yCAAyC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACrC,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,yBAAyB,CAAC,GAAQ;QAC9C,4CAAqB,CAAC,gBAAgB,CAAC,qBAAqB,GAAG,IAAA,kDAA2B,EAAC,GAAG,CAAC,CAAC;QAChG,4CAAqB,CAAC,gBAAgB,CAAC,sBAAsB,GAAG,IAAA,mDAA4B,EAAC,GAAG,CAAC,CAAC;IACpG,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,SAA4B;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,+BAA+B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAE5E,yGAAyG;QACzG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEO,oBAAoB,CAAC,MAAoB;QAC/C,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,oBAAoB,CAAC;QAC9B,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,oCAAoC,CAAC;QAC9C,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,4CAA4C,CAAC;QACtD,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,yCAAyC,CAAC;QACnD,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,yCAAyC,CAAC;QACnD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,eAAe;QACrB,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,MAAM,qBAAqB,GAAwB,EAAE,CAAC;QACtD,MAAM,4BAA4B,GAA2B,EAAE,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM,GAAG,GAAG,eAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBACpC,GAAG,CAAC,IAAI,CAAC,GAAG,iBAAiB,uBAAuB,CAAC,CAAC;gBACtD,SAAS;YACX,CAAC;YAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,CAClD,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,CACjF,CAAC;YACF,IAAI,iBAAiB,EAAE,CAAC;gBACtB,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,YAAY,uCAAuC,CAAC,CAAC;gBACjG,SAAS;YACX,CAAC;YAED,uEAAuE;YACvE,0EAA0E;YAC1E,wBAAwB;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE7D,uFAAuF;YACvF,wEAAwE;YACxE,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC5E,IAAI,gBAAgB,GAAgC,IAAI,CAAC;YACzD,IAAI,SAAS,EAAE,CAAC;gBACd,GAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;gBACpD,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;YAC3E,CAAC;YACD,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,gBAAgB,EAAE,CAAC;gBACrB,4BAA4B,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,IAAI,CAAC,CAAC;IACjF,CAAC;IAEO,YAAY,CAClB,GAAY,EACZ,MAAoB,EACpB,IAAY;QAEZ,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpE,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;QACxC,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEtE,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;IACzC,CAAC;IAEO,cAAc,CACpB,qBAA0C,EAC1C,4BAAoD,EACpD,IAA6B;QAE7B,MAAM,kBAAkB,GAAwB,EAAE,CAAC;QACnD,IAAI,CAAC,WAAW;aACb,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aAC/D,OAAO,CAAC,SAAS,CAAC,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;YAC3E,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAChF,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACL,MAAM,kBAAkB,GAAG,4BAA4B,CAAC,MAAM,CAC5D,gBAAgB,CAAC,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAC7E,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,WAAmC,EAAE,IAA6B;QACzF,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACrE,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;YAC7B,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACvC,MAAM,SAAS,CAAC,uBAAuB,EAAE,CAAC;YAC5C,CAAC;YACD,MAAM,SAAS,CAAC,eAAe,EAAE,CAAC;QACpC,CAAC;IACH,CAAC;IAEO,eAAe,CACrB,SAA4C,EAC5C,MAAoB,EACpB,GAAY;QAEZ,IAAI,oBAAoB,GAAgC,IAAI,CAAC;QAC7D,IAAI,6BAA6B,GAA8C,SAAS,CAAC;QACzF,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,KAAK,oBAAW,CAAC,SAAS;gBACxB,oBAAoB,GAAG,uCAAkB,CAAC;gBAC1C,6BAA6B,GAAG,iCAAe,CAAC;gBAChD,MAAM;YACR,KAAK,oBAAW,CAAC,MAAM;gBACrB,oBAAoB,GAAG,iCAAe,CAAC;gBACvC,6BAA6B,GAAG,iCAAe,CAAC;gBAChD,MAAM;YACR,6BAA6B;YAC7B,6CAA6C;YAC7C,sDAAsD;YACtD,UAAU;YACV,kCAAkC;YAClC,mDAAmD;YACnD,4DAA4D;YAC5D,WAAW;YACX,KAAK,oBAAW,CAAC,WAAW;gBAC1B,oBAAoB,GAAG,2CAAoB,CAAC;gBAC5C,6BAA6B,GAAG,2CAAoB,CAAC;gBACrD,MAAM;YACR;gBACE,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,yCAAyC,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,CAAC,SAAS,GAAG,6BAA6B,CAAC;QACjD,IAAI,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,oBAAoB,CAC7B,IAAI,EACJ,SAAS,EACT,MAAM,EACN,GAAG,EACH,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,qBAAqB,CAC3B,CAAC;IACJ,CAAC;CACF;AAhOD,8DAgOC"}

package/dist/services/batteryStatusService.d.ts

@@ -1,11 +1,13 @@
 import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 import { ServiceBase } from '@ecoflow/services/serviceBase';
 import { Characteristic } from 'homebridge';
 export declare class BatteryStatusService extends ServiceBase {
     protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
-    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType?: string);
+    private readonly batteryStatusProvider;
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, serviceSubType?: string);
     protected addCharacteristics(): Characteristic[];
-    updateBatteryLevel(batteryLevel: number): void;
-    updateChargingState(chargingPower: number): void;
+    updateBatteryLevel(batteryLevel: number, dischargeLimit: number): void;
+    updateChargingState(isCharging: boolean): void;
     private updateStatusLowBattery;
 }

package/dist/services/batteryStatusService.js

@@ -4,9 +4,11 @@ exports.BatteryStatusService = void 0;
 const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class BatteryStatusService extends serviceBase_1.ServiceBase {
     ecoFlowAccessory;
-    constructor(ecoFlowAccessory, serviceSubType) {
+    batteryStatusProvider;
+    constructor(ecoFlowAccessory, batteryStatusProvider, serviceSubType) {
         super(ecoFlowAccessory.platform.Service.Battery, ecoFlowAccessory, serviceSubType);
         this.ecoFlowAccessory = ecoFlowAccessory;
+        this.batteryStatusProvider = batteryStatusProvider;
     }
     addCharacteristics() {
         return [
@@ -15,18 +17,15 @@ class BatteryStatusService extends serviceBase_1.ServiceBase {
             this.addCharacteristic(this.platform.Characteristic.ChargingState),
         ];
     }
-    updateBatteryLevel(batteryLevel) {
+    updateBatteryLevel(batteryLevel, dischargeLimit) {
         this.updateCharacteristic(this.platform.Characteristic.BatteryLevel, 'BatteryLevel', batteryLevel);
-        this.updateStatusLowBattery(batteryLevel);
+        this.updateStatusLowBattery(batteryLevel, dischargeLimit);
     }
-    updateChargingState(chargingPower) {
-        const isCharging = chargingPower > 0;
+    updateChargingState(isCharging) {
         this.updateCharacteristic(this.platform.Characteristic.ChargingState, 'ChargingState', isCharging);
     }
-    updateStatusLowBattery(batteryLevel) {
-        const statusLowBattery = batteryLevel < 20
-            ? this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
-            : this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+    updateStatusLowBattery(batteryLevel, dischargeLimit) {
+        const statusLowBattery = this.batteryStatusProvider.getStatusLowBattery(this.platform.Characteristic, batteryLevel, dischargeLimit);
         this.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, 'StatusLowBattery', statusLowBattery);
     }
 }

package/dist/services/batteryStatusService.js.map

@@ -1 +1 @@
-{"version":3,"file":"batteryStatusService.js","sourceRoot":"","sources":["../../src/services/batteryStatusService.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAa,oBAAqB,SAAQ,yBAAW;IAE9B;IADrB,YACqB,gBAAsC,EACzD,cAAuB;QAEvB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAHhE,qBAAgB,GAAhB,gBAAgB,CAAsB;IAI3D,CAAC;IAEkB,kBAAkB;QACnC,OAAO;YACL,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC;YACrE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC;SACnE,CAAC;IACJ,CAAC;IAEM,kBAAkB,CAAC,YAAoB;QAC5C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACnG,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IAEM,mBAAmB,CAAC,aAAqB;QAC9C,MAAM,UAAU,GAAG,aAAa,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;IACrG,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,MAAM,gBAAgB,GACpB,YAAY,GAAG,EAAE;YACf,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,iBAAiB;YACjE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;QACzE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACjH,CAAC;CACF;AAjCD,oDAiCC"}
+{"version":3,"file":"batteryStatusService.js","sourceRoot":"","sources":["../../src/services/batteryStatusService.ts"],"names":[],"mappings":";;;AAEA,+DAA4D;AAG5D,MAAa,oBAAqB,SAAQ,yBAAW;IAE9B;IACF;IAFnB,YACqB,gBAAsC,EACxC,qBAA4C,EAC7D,cAAuB;QAEvB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJhE,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,0BAAqB,GAArB,qBAAqB,CAAuB;IAI/D,CAAC;IAEkB,kBAAkB;QACnC,OAAO;YACL,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC;YACrE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC;SACnE,CAAC;IACJ,CAAC;IAEM,kBAAkB,CAAC,YAAoB,EAAE,cAAsB;QACpE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QACnG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAEM,mBAAmB,CAAC,UAAmB;QAC5C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;IACrG,CAAC;IAEO,sBAAsB,CAAC,YAAoB,EAAE,cAAsB;QACzE,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CACrE,IAAI,CAAC,QAAQ,CAAC,cAAc,EAC5B,YAAY,EACZ,cAAc,CACf,CAAC;QACF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACjH,CAAC;CACF;AAlCD,oDAkCC"}

package/dist/services/outletServiceBase.d.ts

@@ -1,16 +1,20 @@
 import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
 import { AdditionalBatteryCharacteristicType as CharacteristicType } from '@ecoflow/config';
+import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 import { ServiceBase } from '@ecoflow/services/serviceBase';
 import { Characteristic } from 'homebridge';
 export declare abstract class OutletServiceBase extends ServiceBase {
+    private readonly batteryStatusProvider;
     private readonly additionalCharacteristics?;
-    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType: string, additionalCharacteristics?: CharacteristicType[] | undefined);
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, serviceSubType: string, additionalCharacteristics?: CharacteristicType[] | undefined);
     updateState(state: boolean): void;
     updateOutputConsumption(watt: number): void;
     updateInputConsumption(watt: number): void;
-    updateBatteryLevel(batteryLevel: number): void;
+    updateBatteryLevel(batteryLevel: number, dischargeLimit: number): void;
+    updateChargingState(isCharging: boolean): void;
     protected addCharacteristics(): Characteristic[];
     protected abstract setOn(value: boolean, revert: () => void): Promise<void>;
+    private updateStatusLowBattery;
     private tryAddCustomCharacteristic;
     private updateCustomCharacteristic;
 }

package/dist/services/outletServiceBase.js

@@ -4,9 +4,11 @@ exports.OutletServiceBase = void 0;
 const config_1 = require("@ecoflow/config");
 const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class OutletServiceBase extends serviceBase_1.ServiceBase {
+    batteryStatusProvider;
     additionalCharacteristics;
-    constructor(ecoFlowAccessory, serviceSubType, additionalCharacteristics) {
+    constructor(ecoFlowAccessory, batteryStatusProvider, serviceSubType, additionalCharacteristics) {
         super(ecoFlowAccessory.platform.Service.Outlet, ecoFlowAccessory, serviceSubType);
+        this.batteryStatusProvider = batteryStatusProvider;
         this.additionalCharacteristics = additionalCharacteristics;
     }
     updateState(state) {
@@ -14,17 +16,21 @@ class OutletServiceBase extends serviceBase_1.ServiceBase {
     }
     updateOutputConsumption(watt) {
         this.updateCharacteristic(this.platform.Characteristic.OutletInUse, 'InUse', watt > 0);
-        this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, 'Output Consumption, W', watt, config_1.AdditionalBatteryCharacteristicType.OutputConsumptionInWatts);
+        this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, 'Output Consumption, W', () => watt, config_1.AdditionalBatteryCharacteristicType.OutputConsumptionInWatts);
     }
     updateInputConsumption(watt) {
-        this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, 'Input Consumption, W', watt, config_1.AdditionalBatteryCharacteristicType.InputConsumptionInWatts);
+        this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, 'Input Consumption, W', () => watt, config_1.AdditionalBatteryCharacteristicType.InputConsumptionInWatts);
     }
-    updateBatteryLevel(batteryLevel) {
-        this.updateCustomCharacteristic(this.platform.Characteristic.BatteryLevel, 'Battery Level, %', batteryLevel, config_1.AdditionalBatteryCharacteristicType.BatteryLevel);
+    updateBatteryLevel(batteryLevel, dischargeLimit) {
+        this.updateCustomCharacteristic(this.platform.Characteristic.BatteryLevel, 'Battery Level, %', () => batteryLevel, config_1.AdditionalBatteryCharacteristicType.BatteryLevel);
+        this.updateStatusLowBattery(batteryLevel, dischargeLimit);
+    }
+    updateChargingState(isCharging) {
+        this.updateCustomCharacteristic(this.platform.Characteristic.ChargingState, 'ChargingState', () => isCharging, config_1.AdditionalBatteryCharacteristicType.ChargingState);
     }
     addCharacteristics() {
         const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
-        onCharacteristic.onSet(value => {
+        onCharacteristic.onSet((value) => {
             const newValue = value;
             this.setOn(newValue, () => this.updateState(!newValue));
         });
@@ -34,19 +40,24 @@ class OutletServiceBase extends serviceBase_1.ServiceBase {
             this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, config_1.AdditionalBatteryCharacteristicType.InputConsumptionInWatts),
             this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, config_1.AdditionalBatteryCharacteristicType.OutputConsumptionInWatts),
             this.tryAddCustomCharacteristic(this.platform.Characteristic.BatteryLevel, config_1.AdditionalBatteryCharacteristicType.BatteryLevel),
+            this.tryAddCustomCharacteristic(this.platform.Characteristic.ChargingState, config_1.AdditionalBatteryCharacteristicType.ChargingState),
+            this.tryAddCustomCharacteristic(this.platform.Characteristic.StatusLowBattery, config_1.AdditionalBatteryCharacteristicType.StatusLowBattery),
         ];
         this.service.setCharacteristic(this.platform.Characteristic.Name, this.serviceName);
         return characteristics.filter(characteristic => characteristic !== null);
     }
+    updateStatusLowBattery(batteryLevel, dischargeLimit) {
+        this.updateCustomCharacteristic(this.platform.Characteristic.StatusLowBattery, 'StatusLowBattery', () => this.batteryStatusProvider.getStatusLowBattery(this.platform.Characteristic, batteryLevel, dischargeLimit), config_1.AdditionalBatteryCharacteristicType.StatusLowBattery);
+    }
     tryAddCustomCharacteristic(characteristic, characteristicType) {
         if (this.additionalCharacteristics?.includes(characteristicType)) {
             return this.addCharacteristic(characteristic);
         }
         return null;
     }
-    updateCustomCharacteristic(characteristic, name, value, characteristicType) {
+    updateCustomCharacteristic(characteristic, name, valueFunc, characteristicType) {
         if (this.additionalCharacteristics?.includes(characteristicType)) {
-            this.updateCharacteristic(characteristic, name, value);
+            this.updateCharacteristic(characteristic, name, valueFunc());
         }
     }
 }

package/dist/services/outletServiceBase.js.map

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

package/dist/services/switchXboostServiceBase.d.ts

@@ -0,0 +1,9 @@
+import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Characteristic } from 'homebridge';
+export declare abstract class SwitchXboostServiceBase extends ServiceBase {
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase);
+    updateState(state: boolean): void;
+    protected addCharacteristics(): Characteristic[];
+    protected abstract setOn(value: boolean, revert: () => void): Promise<void>;
+}

package/dist/services/switchXboostServiceBase.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchXboostServiceBase = void 0;
+const serviceBase_1 = require("@ecoflow/services/serviceBase");
+class SwitchXboostServiceBase extends serviceBase_1.ServiceBase {
+    constructor(ecoFlowAccessory) {
+        super(ecoFlowAccessory.platform.Service.Switch, ecoFlowAccessory, 'X-Boost');
+    }
+    updateState(state) {
+        this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
+    }
+    addCharacteristics() {
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
+        onCharacteristic.onSet((value) => {
+            const newValue = value;
+            this.setOn(newValue, () => this.updateState(!newValue));
+        });
+        this.service.setCharacteristic(this.platform.Characteristic.Name, this.serviceName);
+        return [onCharacteristic];
+    }
+}
+exports.SwitchXboostServiceBase = SwitchXboostServiceBase;
+//# sourceMappingURL=switchXboostServiceBase.js.map

package/dist/services/switchXboostServiceBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switchXboostServiceBase.js","sourceRoot":"","sources":["../../src/services/switchXboostServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,uBAAwB,SAAQ,yBAAW;IAC/D,YAAY,gBAAsC;QAChD,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC/E,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACjF,gBAAgB,CAAC,KAAK,CAAC,CAAC,KAA0B,EAAE,EAAE;YACpD,MAAM,QAAQ,GAAG,KAAgB,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpF,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5B,CAAC;CAGF;AArBD,0DAqBC"}

package/dist/services/switchXboostServiceBase.spec.d.ts

@@ -0,0 +1 @@
+export {};