@pietrolubini/homebridge-ecoflow 1.0.3 → 1.2.0

package/dist/services/outletAcService.js

@@ -0,0 +1,17 @@
+import { OutletsServiceBase } from './outletServiceBase.js';
+export class OutletAcService extends OutletsServiceBase {
+    ecoFlowAccessory;
+    constructor(ecoFlowAccessory) {
+        super('AC', ecoFlowAccessory);
+        this.ecoFlowAccessory = ecoFlowAccessory;
+    }
+    setOn(value, revert) {
+        return this.sendOn(3, 'acOutCfg', {
+            out_voltage: this.ecoFlowAccessory.quota.inv.cfgAcOutVol,
+            out_freq: this.ecoFlowAccessory.quota.inv.cfgAcOutFreq,
+            xboost: Number(this.ecoFlowAccessory.quota.inv.cfgAcXboost !== undefined ? this.ecoFlowAccessory.quota.inv.cfgAcXboost : true),
+            enabled: Number(value),
+        }, revert);
+    }
+}
+//# sourceMappingURL=outletAcService.js.map

package/dist/services/outletAcService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outletAcService.js","sourceRoot":"","sources":["../../src/services/outletAcService.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEzF,MAAM,OAAO,eAA2D,SAAQ,kBAAkB;IACjE;IAA/B,YAA+B,gBAA0D;QACvF,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QADD,qBAAgB,GAAhB,gBAAgB,CAA0C;IAEzF,CAAC;IAEkB,KAAK,CAAC,KAAc,EAAE,MAAkB;QACzD,OAAO,IAAI,CAAC,MAAM,CAChB,CAAC,EACD,UAAU,EACV;YACE,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAY;YACzD,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,YAAa;YACvD,MAAM,EAAE,MAAM,CACZ,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAC/G;YACD,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;SACvB,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF"}

package/dist/{accessories/services → services}/outletCarService.d.ts

@@ -1,6 +1,6 @@
+import { EcoFlowAccessory } from '../accessories/ecoFlowAccessory.js';
 import { OutletsServiceBase } from './outletServiceBase.js';
-import { EcoFlowAccessory } from 'accessories/ecoFlowAccessory.js';
 export declare class OutletCarService extends OutletsServiceBase {
     constructor(ecoFlowAccessory: EcoFlowAccessory);
-    protected setOn(value: boolean): Promise<void>;
+    protected setOn(value: boolean, revert: () => void): Promise<void>;
 }

package/dist/{accessories/services → services}/outletCarService.js

@@ -3,8 +3,10 @@ export class OutletCarService extends OutletsServiceBase {
     constructor(ecoFlowAccessory) {
         super('CAR', ecoFlowAccessory);
     }
-    setOn(value) {
-        return this.publishEnabled(5, 'mpptCar', { enabled: Number(value) });
+    setOn(value, revert) {
+        return this.sendOn(5, 'mpptCar', {
+            enabled: Number(value),
+        }, revert);
     }
 }
 //# sourceMappingURL=outletCarService.js.map

package/dist/services/outletCarService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outletCarService.js","sourceRoot":"","sources":["../../src/services/outletCarService.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEzF,MAAM,OAAO,gBAAiB,SAAQ,kBAAkB;IACtD,YAAY,gBAAkC;QAC5C,KAAK,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAEkB,KAAK,CAAC,KAAc,EAAE,MAAkB;QACzD,OAAO,IAAI,CAAC,MAAM,CAChB,CAAC,EACD,SAAS,EACT;YACE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;SACvB,EACD,MAAM,CACP,CAAC;IACJ,CAAC;CACF"}

package/dist/services/outletServiceBase.d.ts

@@ -0,0 +1,24 @@
+import { Characteristic, CharacteristicValue, Service, WithUUID } from 'homebridge';
+import { EcoFlowAccessory } from '../accessories/ecoFlowAccessory.js';
+import { ServiceBase } from './serviceBase.js';
+export interface MqttSetEnabledMessageParams {
+    enabled: number;
+}
+export declare abstract class OutletsServiceBase extends ServiceBase {
+    private readonly serviceSubType;
+    constructor(serviceSubType: string, ecoFlowAccessory: EcoFlowAccessory);
+    updateState(state: boolean): void;
+    updateOutputConsumption(watt: number): void;
+    updateInputConsumption(watt: number): void;
+    updateBatteryLevel(batteryLevel: number): void;
+    protected createService(): Service;
+    protected addCharacteristics(): Characteristic[];
+    protected abstract setOn(value: boolean, revert: () => void): Promise<void>;
+    protected sendOn<TParams>(moduleType: number, operateType: string, params: TParams, revert: () => void): Promise<void>;
+    protected updateCharacteristic(characteristic: WithUUID<{
+        new (): Characteristic;
+    }>, name: string, value: CharacteristicValue): void;
+    private tryAddCustomCharacteristic;
+    private updateCustomCharacteristic;
+    private get serviceName();
+}

package/dist/services/outletServiceBase.js

@@ -0,0 +1,62 @@
+import { AdditionalBatteryCharacteristicType as CharacteristicType } from '../config.js';
+import { ServiceBase } from './serviceBase.js';
+export class OutletsServiceBase extends ServiceBase {
+    serviceSubType;
+    constructor(serviceSubType, ecoFlowAccessory) {
+        super(ecoFlowAccessory);
+        this.serviceSubType = serviceSubType;
+    }
+    updateState(state) {
+        this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
+    }
+    updateOutputConsumption(watt) {
+        this.updateCharacteristic(this.platform.Characteristic.OutletInUse, 'InUse', watt > 0);
+        this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, 'Output Consumption, W', watt, CharacteristicType.OutputConsumptionInWatts);
+    }
+    updateInputConsumption(watt) {
+        this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, 'Input Consumption, W', watt, CharacteristicType.InputConsumptionInWatts);
+    }
+    updateBatteryLevel(batteryLevel) {
+        this.updateCustomCharacteristic(this.platform.Characteristic.BatteryLevel, 'Battery Level, %', batteryLevel, CharacteristicType.BatteryLevel);
+    }
+    createService() {
+        return this.getOrAddServiceById(this.platform.Service.Outlet, this.serviceName, this.serviceSubType);
+    }
+    addCharacteristics() {
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
+        onCharacteristic.onSet(value => {
+            const newValue = value;
+            this.setOn(newValue, () => this.updateState(!newValue));
+        });
+        const characteristics = [
+            this.addCharacteristic(this.platform.Characteristic.OutletInUse),
+            onCharacteristic,
+            this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, CharacteristicType.InputConsumptionInWatts),
+            this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, CharacteristicType.OutputConsumptionInWatts),
+            this.tryAddCustomCharacteristic(this.platform.Characteristic.BatteryLevel, CharacteristicType.BatteryLevel),
+        ];
+        this.service.setCharacteristic(this.platform.Characteristic.Name, this.serviceName);
+        return characteristics.filter(characteristic => characteristic !== null);
+    }
+    sendOn(moduleType, operateType, params, revert) {
+        return this.ecoFlowAccessory.sendSetCommand(moduleType, operateType, params, revert);
+    }
+    updateCharacteristic(characteristic, name, value) {
+        super.updateCharacteristic(characteristic, `${this.serviceSubType} ${name}`, value);
+    }
+    tryAddCustomCharacteristic(characteristic, characteristicType) {
+        if (this.ecoFlowAccessory.config.battery?.additionalCharacteristics?.includes(characteristicType)) {
+            return this.addCharacteristic(characteristic);
+        }
+        return null;
+    }
+    updateCustomCharacteristic(characteristic, name, value, characteristicType) {
+        if (this.ecoFlowAccessory.config.battery?.additionalCharacteristics?.includes(characteristicType)) {
+            super.updateCharacteristic(characteristic, name, value);
+        }
+    }
+    get serviceName() {
+        return `${this.ecoFlowAccessory.config.name} ${this.serviceSubType}`;
+    }
+}
+//# sourceMappingURL=outletServiceBase.js.map

package/dist/services/outletServiceBase.js.map

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

package/dist/{accessories/services → services}/outletUsbService.d.ts

@@ -1,6 +1,6 @@
+import { EcoFlowAccessory } from '../accessories/ecoFlowAccessory.js';
 import { OutletsServiceBase } from './outletServiceBase.js';
-import { EcoFlowAccessory } from 'accessories/ecoFlowAccessory.js';
 export declare class OutletUsbService extends OutletsServiceBase {
     constructor(ecoFlowAccessory: EcoFlowAccessory);
-    protected setOn(value: boolean): Promise<void>;
+    protected setOn(value: boolean, revert: () => void): Promise<void>;
 }

package/dist/{accessories/services → services}/outletUsbService.js

@@ -3,8 +3,8 @@ export class OutletUsbService extends OutletsServiceBase {
     constructor(ecoFlowAccessory) {
         super('USB', ecoFlowAccessory);
     }
-    setOn(value) {
-        return this.publishEnabled(1, 'dcOutCfg', { enabled: Number(value) });
+    setOn(value, revert) {
+        return this.sendOn(1, 'dcOutCfg', { enabled: Number(value) }, revert);
     }
 }
 //# sourceMappingURL=outletUsbService.js.map

package/dist/services/outletUsbService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outletUsbService.js","sourceRoot":"","sources":["../../src/services/outletUsbService.ts"],"names":[],"mappings":"AACA,OAAO,EAA+B,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEzF,MAAM,OAAO,gBAAiB,SAAQ,kBAAkB;IACtD,YAAY,gBAAkC;QAC5C,KAAK,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAEkB,KAAK,CAAC,KAAc,EAAE,MAAkB;QACzD,OAAO,IAAI,CAAC,MAAM,CAA8B,CAAC,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACrG,CAAC;CACF"}

package/dist/services/serviceBase.d.ts

@@ -0,0 +1,24 @@
+import { Characteristic, CharacteristicValue, Logging, Service, WithUUID } from 'homebridge';
+import { EcoFlowAccessory } from '../accessories/ecoFlowAccessory.js';
+import { EcoFlowHomebridgePlatform } from '../platform.js';
+export declare abstract class ServiceBase {
+    protected readonly ecoFlowAccessory: EcoFlowAccessory;
+    protected readonly log: Logging;
+    protected readonly platform: EcoFlowHomebridgePlatform;
+    protected characteristics: Characteristic[];
+    private _service;
+    constructor(ecoFlowAccessory: EcoFlowAccessory);
+    initialize(): void;
+    cleanupCharacteristics(): void;
+    get service(): Service;
+    protected abstract createService(): Service;
+    protected abstract addCharacteristics(): Characteristic[];
+    protected addCharacteristic(characteristic: WithUUID<{
+        new (): Characteristic;
+    }>): Characteristic;
+    protected getOrAddService(service: WithUUID<typeof Service>, displayName?: string): Service;
+    protected getOrAddServiceById(service: WithUUID<typeof Service>, serviceName: string, serviceSubType: string): Service;
+    protected updateCharacteristic(characteristic: WithUUID<{
+        new (): Characteristic;
+    }>, name: string, value: CharacteristicValue): void;
+}

package/dist/services/serviceBase.js

@@ -0,0 +1,52 @@
+export class ServiceBase {
+    ecoFlowAccessory;
+    log;
+    platform;
+    characteristics = [];
+    _service = null;
+    constructor(ecoFlowAccessory) {
+        this.ecoFlowAccessory = ecoFlowAccessory;
+        this.log = ecoFlowAccessory.log;
+        this.platform = ecoFlowAccessory.platform;
+    }
+    initialize() {
+        this._service = this.createService();
+        this.characteristics = this.addCharacteristics();
+        this.characteristics.push(this.addCharacteristic(this.platform.Characteristic.Name));
+    }
+    cleanupCharacteristics() {
+        this.service.characteristics
+            .filter(characteristic => !this.characteristics.includes(characteristic))
+            .forEach(characteristic => {
+            this.log.warn(`[${this.service.displayName}] Removing obsolete characteristic:`, characteristic.displayName);
+            this.service.removeCharacteristic(characteristic);
+        });
+    }
+    // Getter for service
+    get service() {
+        return this._service;
+    }
+    addCharacteristic(characteristic) {
+        const existingCharacteristic = this.service.getCharacteristic(characteristic);
+        if (!existingCharacteristic) {
+            return this.service.addCharacteristic(characteristic);
+        }
+        return existingCharacteristic;
+    }
+    getOrAddService(service, displayName) {
+        const result = this.ecoFlowAccessory.accessory.getService(service) ||
+            this.ecoFlowAccessory.accessory.addService(service, displayName, service.UUID);
+        result.displayName = displayName ?? result.displayName;
+        return result;
+    }
+    getOrAddServiceById(service, serviceName, serviceSubType) {
+        const result = this.ecoFlowAccessory.accessory.getServiceById(service, serviceSubType) ||
+            this.ecoFlowAccessory.accessory.addService(service, serviceName, serviceSubType);
+        return result;
+    }
+    updateCharacteristic(characteristic, name, value) {
+        this.log.debug(`${name} ->`, value);
+        this.service.getCharacteristic(characteristic).updateValue(value);
+    }
+}
+//# sourceMappingURL=serviceBase.js.map

package/dist/services/serviceBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serviceBase.js","sourceRoot":"","sources":["../../src/services/serviceBase.ts"],"names":[],"mappings":"AAIA,MAAM,OAAgB,WAAW;IAMA;IALZ,GAAG,CAAU;IACb,QAAQ,CAA4B;IAC7C,eAAe,GAAqB,EAAE,CAAC;IACzC,QAAQ,GAAmB,IAAI,CAAC;IAExC,YAA+B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAC/D,IAAI,CAAC,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IAC5C,CAAC;IAEM,UAAU;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACjD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IACvF,CAAC;IAEM,sBAAsB;QAC3B,IAAI,CAAC,OAAO,CAAC,eAAe;aACzB,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;aACxE,OAAO,CAAC,cAAc,CAAC,EAAE;YACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,qCAAqC,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;YAC7G,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qBAAqB;IACrB,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,QAAS,CAAC;IACxB,CAAC;IAMS,iBAAiB,CAAC,cAAoD;QAC9E,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAC9E,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAES,eAAe,CAAC,OAAiC,EAAE,WAAoB;QAC/E,MAAM,MAAM,GACV,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC;YACnD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjF,MAAM,CAAC,WAAW,GAAG,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC;QAEvD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,mBAAmB,CAC3B,OAAiC,EACjC,WAAmB,EACnB,cAAsB;QAEtB,MAAM,MAAM,GACV,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC;YACvE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QAEnF,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,oBAAoB,CAC5B,cAAoD,EACpD,IAAY,EACZ,KAA0B;QAE1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,KAAK,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;CACF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Homebridge Ecoflow",
   "name": "@pietrolubini/homebridge-ecoflow",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "Homebridge plugin for EcoFlow devices",
   "license": "MIT",
   "author": "PietroLubini",
@@ -48,6 +48,8 @@
     "eslint": "^8.57.0",
     "homebridge": "^1.7.0",
     "nodemon": "^3.1.2",
+    "prettier": "^3.3.3",
+    "prettier-plugin-organize-imports": "^4.0.0",
     "rimraf": "^5.0.7",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"

package/dist/accessories/apis/ecoFlowHttpApi.d.ts

@@ -1,16 +0,0 @@
-import { Logging } from 'homebridge';
-import { AcquireCertificateResponseData, CmdResponseBase, CmdResponseData, HttpMethod } from './interfaces/ecoFlowHttpContacts.js';
-import { DeviceConfig } from '../../config.js';
-export declare class EcoFlowHttpApi {
-    private readonly config;
-    private readonly log;
-    constructor(config: DeviceConfig, log: Logging);
-    getQuotas<TCmdResponseData extends CmdResponseData>(quotas: string[]): Promise<TCmdResponseData>;
-    getAllQuotas<TCmdResponseData extends CmdResponseData>(): Promise<TCmdResponseData>;
-    acquireCertificate(): Promise<AcquireCertificateResponseData | null>;
-    protected execute<TResponse extends CmdResponseBase>(relativeUrl: string, method: HttpMethod, queryParameters?: object | null, body?: object | null): Promise<TResponse>;
-    private getNonce;
-    private composeSignMessage;
-    private createHmacSha256;
-    private stringifyOptions;
-}

package/dist/accessories/apis/ecoFlowHttpApi.js.map

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

package/dist/accessories/apis/ecoFlowMqttApi.d.ts

@@ -1,23 +0,0 @@
-import { Logging } from 'homebridge';
-import { BmsStatusMqttMessageParams, InvStatusMqttMessageParams, MqttMessage, MqttMessageParams, MqttSetMessageBase, PdStatusMqttMessageParams } from './interfaces/ecoFlowMqttContacts.js';
-import { EcoFlowHttpApi } from './ecoFlowHttpApi.js';
-export declare class EcoFlowMqttApi {
-    private httpApi;
-    private log;
-    private client;
-    private certificateData;
-    private readonly bmsParamsSubject;
-    private readonly invParamsSubject;
-    private readonly pdParamsSubject;
-    bmsParams$: import("rxjs").Observable<BmsStatusMqttMessageParams>;
-    invParams$: import("rxjs").Observable<InvStatusMqttMessageParams>;
-    pdParams$: import("rxjs").Observable<PdStatusMqttMessageParams>;
-    constructor(httpApi: EcoFlowHttpApi, log: Logging);
-    destroy(): Promise<void>;
-    subscribe(topicPattern: string, serialNumber: string): Promise<boolean>;
-    publish(topicPattern: string, serialNumber: string, data: MqttSetMessageBase): Promise<void>;
-    processMqttMessage(message: MqttMessage<MqttMessageParams>): void;
-    private connect;
-    private acquireCertificate;
-    private composeTopic;
-}

package/dist/accessories/apis/ecoFlowMqttApi.js

@@ -1,94 +0,0 @@
-import mqtt from 'mqtt';
-import { MqttMessageType, } from './interfaces/ecoFlowMqttContacts.js';
-import { Subject } from 'rxjs';
-import { getMachineId } from './../../helpers/machineId.js';
-export class EcoFlowMqttApi {
-    httpApi;
-    log;
-    client = null;
-    certificateData = null;
-    bmsParamsSubject = new Subject();
-    invParamsSubject = new Subject();
-    pdParamsSubject = new Subject();
-    bmsParams$ = this.bmsParamsSubject.asObservable();
-    invParams$ = this.invParamsSubject.asObservable();
-    pdParams$ = this.pdParamsSubject.asObservable();
-    constructor(httpApi, log) {
-        this.httpApi = httpApi;
-        this.log = log;
-    }
-    async destroy() {
-        await this.client?.unsubscribeAsync('#');
-        this.log.debug('Unsubscribed from all topics');
-        await this.client?.end();
-        this.log.info('Disconnected from EcoFlow MQTT Service');
-    }
-    async subscribe(topicPattern, serialNumber) {
-        const client = await this.connect();
-        if (client) {
-            const topic = this.composeTopic(topicPattern, serialNumber);
-            await client.subscribeAsync(topic);
-            this.log.debug('Subscribed to topic:', topic);
-            client.on('message', (_, message) => {
-                const mqttMessage = JSON.parse(message.toString());
-                this.processMqttMessage(mqttMessage);
-            });
-            return true;
-        }
-        return false;
-    }
-    async publish(topicPattern, serialNumber, data) {
-        const client = await this.connect();
-        if (client) {
-            const topic = this.composeTopic(topicPattern, serialNumber);
-            const message = JSON.stringify(data);
-            await client.publishAsync(topic, message);
-            this.log.debug(`Published to topic '${topic}'`, message);
-        }
-    }
-    processMqttMessage(message) {
-        if (message.typeCode === MqttMessageType.BMS) {
-            const params = message.params;
-            this.log.debug('BMS:', params);
-            this.bmsParamsSubject.next(params);
-        }
-        else if (message.typeCode === MqttMessageType.INV) {
-            const params = message.params;
-            this.log.debug('INV:', params);
-            this.invParamsSubject.next(params);
-        }
-        else if (message.typeCode === MqttMessageType.PD) {
-            const params = message.params;
-            this.log.debug('PD:', params);
-            this.pdParamsSubject.next(params);
-        }
-    }
-    async connect() {
-        if (!this.client) {
-            const certificateData = await this.acquireCertificate();
-            if (certificateData) {
-                const clientId = `HOMEBRIDGE_${(await getMachineId(this.log)).toUpperCase()}`;
-                this.client = await mqtt.connectAsync(`${certificateData.protocol}://${certificateData.url}:${certificateData.port}`, {
-                    username: `${certificateData.certificateAccount}`,
-                    password: `${certificateData.certificatePassword}`,
-                    clientId,
-                    protocolVersion: 5,
-                });
-                this.log.info('Connected to EcoFlow MQTT Service');
-            }
-        }
-        return this.client;
-    }
-    async acquireCertificate() {
-        if (!this.certificateData) {
-            this.certificateData = await this.httpApi.acquireCertificate();
-        }
-        return this.certificateData;
-    }
-    composeTopic(topicPattern, serialNumber) {
-        return topicPattern
-            .replace('<certificateAccount>', this.certificateData.certificateAccount)
-            .replace('<sn>', serialNumber);
-    }
-}
-//# sourceMappingURL=ecoFlowMqttApi.js.map

package/dist/accessories/apis/ecoFlowMqttApi.js.map

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

package/dist/accessories/apis/interfaces/ecoFlowHttpContacts.d.ts

@@ -1,47 +0,0 @@
-export declare enum HttpMethod {
-    Get = "GET",
-    Post = "POST"
-}
-export interface CmdResponseBase {
-    code: string;
-    message: string;
-    failed: boolean;
-}
-export interface CmdResponseData {
-}
-export interface CmdResponse<TData extends CmdResponseData> extends CmdResponseBase {
-    code: string;
-    message: string;
-    data: TData;
-}
-export interface GetCmdRequest {
-    sn: string;
-}
-export interface GetQuotasCmdRequest extends GetCmdRequest {
-    params: GetQuotasCmdRequestParams;
-}
-export interface GetQuotasCmdRequestParams {
-    quotas: string[];
-}
-export interface AcquireCertificateResponseData extends CmdResponseData {
-    certificateAccount: string;
-    certificatePassword: string;
-    url: string;
-    port: string;
-    protocol: string;
-}
-export interface GetQuotaAllCmdResponseData extends CmdResponseData {
-    'bms_bmsStatus.f32ShowSoc': number;
-    'inv.inputWatts': number;
-    'inv.cfgAcEnabled': boolean;
-    'inv.outputWatts': number;
-    'pd.carState': boolean;
-    'pd.carWatts': number;
-    'pd.dcOutState': boolean;
-    'pd.usb1Watts': number;
-    'pd.usb2Watts': number;
-    'pd.qcUsb1Watts': number;
-    'pd.qcUsb2Watts': number;
-    'pd.typec1Watts': number;
-    'pd.typec2Watts': number;
-}

package/dist/accessories/apis/interfaces/ecoFlowHttpContacts.js

@@ -1,6 +0,0 @@
-export var HttpMethod;
-(function (HttpMethod) {
-    HttpMethod["Get"] = "GET";
-    HttpMethod["Post"] = "POST";
-})(HttpMethod || (HttpMethod = {}));
-//# sourceMappingURL=ecoFlowHttpContacts.js.map

package/dist/accessories/apis/interfaces/ecoFlowHttpContacts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ecoFlowHttpContacts.js","sourceRoot":"","sources":["../../../../src/accessories/apis/interfaces/ecoFlowHttpContacts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB"}

package/dist/accessories/apis/interfaces/ecoFlowMqttContacts.d.ts

@@ -1,68 +0,0 @@
-export declare enum MqttMessageType {
-    PD = "pdStatus",
-    MPPT = "mpptStatus",
-    INV = "invStatus",
-    BMS = "bmsStatus",
-    EMS = "emsStatus"
-}
-export interface MqttMessageBase {
-    typeCode: MqttMessageType;
-}
-export interface MqttMessage<TParams extends MqttMessageParams> extends MqttMessageBase {
-    params: TParams;
-}
-export interface MqttMessageParams {
-}
-export interface PdStatusMqttMessageCarParams {
-    carState?: boolean;
-    carWatts?: number;
-}
-export interface PdStatusMqttMessageUsbParams {
-    dcOutState?: boolean;
-    usb1Watts?: number;
-    usb2Watts?: number;
-    qcUsb1Watts?: number;
-    qcUsb2Watts?: number;
-    typec1Watts?: number;
-    typec2Watts?: number;
-}
-export interface PdStatusMqttMessageParams extends MqttMessageParams, PdStatusMqttMessageCarParams, PdStatusMqttMessageUsbParams {
-    beepMode?: boolean;
-}
-export interface MpptStatusMqttMessageParams extends MqttMessageParams {
-}
-export interface InvStatusMqttMessageAcParams {
-    cfgAcEnabled?: boolean;
-    outputWatts?: number;
-}
-export interface InvStatusMqttMessageParams extends MqttMessageParams, InvStatusMqttMessageAcParams {
-    inputWatts?: number;
-}
-export interface BmsStatusMqttMessageParams extends MqttMessageParams {
-    soc?: number;
-    vol?: number;
-    amp?: number;
-    temp?: number;
-    f32ShowSoc?: number;
-}
-export interface EmsStatusMqttMessageParams extends MqttMessageParams {
-}
-export interface MqttSetMessageBase {
-    id: number;
-    version: string;
-    moduleType: number;
-    operateType: string;
-}
-export interface MqttSetMessageParams {
-}
-export interface MqttSetEnabledMessageParams extends MqttSetMessageParams {
-    enabled: number;
-}
-export interface MqttSetAcEnabledMessageParams extends MqttSetEnabledMessageParams {
-    out_voltage: number;
-    out_freq: number;
-    xboost: number;
-}
-export interface MqttSetMessage<TParams extends MqttSetMessageParams> extends MqttSetMessageBase {
-    params: TParams;
-}

package/dist/accessories/apis/interfaces/ecoFlowMqttContacts.js

@@ -1,9 +0,0 @@
-export var MqttMessageType;
-(function (MqttMessageType) {
-    MqttMessageType["PD"] = "pdStatus";
-    MqttMessageType["MPPT"] = "mpptStatus";
-    MqttMessageType["INV"] = "invStatus";
-    MqttMessageType["BMS"] = "bmsStatus";
-    MqttMessageType["EMS"] = "emsStatus";
-})(MqttMessageType || (MqttMessageType = {}));
-//# sourceMappingURL=ecoFlowMqttContacts.js.map

package/dist/accessories/apis/interfaces/ecoFlowMqttContacts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ecoFlowMqttContacts.js","sourceRoot":"","sources":["../../../../src/accessories/apis/interfaces/ecoFlowMqttContacts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;AACnB,CAAC,EANW,eAAe,KAAf,eAAe,QAM1B"}

package/dist/accessories/delta2maxAccessory.d.ts

@@ -1,24 +0,0 @@
-import { EcoFlowAccessoryWithQuota } from './ecoFlowAccessory.js';
-import { ServiceBase } from './services/serviceBase.js';
-import { GetQuotaAllCmdResponseData } from './apis/interfaces/ecoFlowHttpContacts.js';
-import { Subscription } from 'rxjs';
-import { EcoFlowHomebridgePlatform } from 'platform.js';
-import { Logging, PlatformAccessory } from 'homebridge';
-import { DeviceConfig } from 'config.js';
-export declare class Delta2MaxAccessory extends EcoFlowAccessoryWithQuota<GetQuotaAllCmdResponseData> {
-    private readonly batteryService;
-    private readonly outletUsbService;
-    private readonly outletAcService;
-    private readonly outletCarService;
-    constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging);
-    protected getServices(): ServiceBase[];
-    protected updateInitialValues(initialData: GetQuotaAllCmdResponseData): void;
-    protected subscribeOnParameterUpdates(): Subscription[];
-    private updateBmsInitialValues;
-    private updateInvInitialValues;
-    private updatePdInitialValues;
-    private updateBmsValues;
-    private updateInvValues;
-    private updatePdValues;
-    private getUsbWatts;
-}