@pietrolubini/homebridge-ecoflow 1.2.0 → 1.3.0

package/dist/platform.js

@@ -1,10 +1,19 @@
-import { Delta2Accessory } from './accessories/batteries/delta2Accessory.js';
-import { Delta2MaxAccessory } from './accessories/batteries/delta2maxAccessory.js';
-import { CustomCharacteristic } from './characteristics/CustomCharacteristic.js';
-import { DeviceModel } from './config.js';
-import { Logger } from './helpers/logger.js';
-import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
-export class EcoFlowHomebridgePlatform {
+"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 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 logger_1 = require("@ecoflow/helpers/logger");
+const machineIdProvider_1 = require("@ecoflow/helpers/machineIdProvider");
+const settings_1 = require("@ecoflow/settings");
+class EcoFlowHomebridgePlatform {
     commonLog;
     config;
     api;
@@ -13,15 +22,18 @@ export class EcoFlowHomebridgePlatform {
     Characteristic;
     // this is used to track restored cached accessories
     accessories = [];
+    httpApiManager = new ecoFlowHttpApiManager_1.EcoFlowHttpApiManager();
+    mqttApiManager = new ecoFlowMqttApiManager_1.EcoFlowMqttApiManager(this.httpApiManager, new machineIdProvider_1.MachineIdProvider());
     constructor(commonLog, config, api) {
         this.commonLog = commonLog;
         this.config = config;
         this.api = api;
+        EcoFlowHomebridgePlatform.InitCustomCharacteristics(api.hap);
         this.ecoFlowConfig = this.config;
         this.Service = api.hap.Service;
         this.Characteristic = {
             ...api.hap.Characteristic,
-            ...CustomCharacteristic,
+            ...customCharacteristic_1.CustomCharacteristics,
         };
         this.commonLog.debug('Finished initializing platform:', this.config.platform);
         // Homebridge 1.8.0 introduced a `log.success` method that can be used to log success messages
@@ -34,10 +46,13 @@ export class EcoFlowHomebridgePlatform {
         // in order to ensure they weren't added to homebridge already. This event can also be used
         // to start discovery of new accessories.
         this.api.on('didFinishLaunching', () => {
-            this.commonLog.debug('Executed didFinishLaunching callback');
             this.registerDevices();
         });
     }
+    static InitCustomCharacteristics(hap) {
+        customCharacteristic_1.CustomCharacteristics.PowerConsumption.InputConsumptionWatts = (0, customCharacteristic_1.InputConsumptionWattFactory)(hap);
+        customCharacteristic_1.CustomCharacteristics.PowerConsumption.OutputConsumptionWatts = (0, customCharacteristic_1.OutputConsumptionWattFactory)(hap);
+    }
     /**
      * This function is invoked when homebridge restores cached accessories from disk at startup.
      * It should be used to set up event handlers for characteristics and update respective values.
@@ -47,15 +62,39 @@ export class EcoFlowHomebridgePlatform {
         // add the restored accessory to the accessories cache, so we can track if it has already been registered
         this.accessories.push(accessory);
     }
+    validateDeviceConfig(config) {
+        if (config.disabled === true) {
+            return 'Device is disabled';
+        }
+        if (config.name === undefined) {
+            return "Device's 'name' must be configured";
+        }
+        if (config.serialNumber === undefined) {
+            return "Device's 'serialNumber' must be configured";
+        }
+        if (config.accessKey === undefined) {
+            return "Device's 'accessKey' must be configured";
+        }
+        if (config.secretKey === undefined) {
+            return "Device's 'secretKey' must be configured";
+        }
+        return undefined;
+    }
     registerDevices() {
         const logs = {};
         const configuredAccessories = [];
         const configuredEcoFlowAccessories = [];
         if (!this.ecoFlowConfig.devices) {
+            this.commonLog.warn('Devices are not configured');
             return;
         }
         for (const config of this.ecoFlowConfig.devices) {
-            const log = Logger.create(this.commonLog, config.name);
+            const log = logger_1.Logger.create(this.commonLog, config.name);
+            const validationMessage = this.validateDeviceConfig(config);
+            if (validationMessage !== undefined) {
+                log.warn(`${validationMessage}. Ignoring the device`);
+                continue;
+            }
             const existingAccessory = configuredAccessories.find(accessory => accessory.context.deviceConfig.serialNumber === config.serialNumber);
             if (existingAccessory) {
                 log.warn(`Device with the same SN (${config.serialNumber}) already exists. Ignoring the device`);
@@ -74,12 +113,7 @@ export class EcoFlowHomebridgePlatform {
                 ecoFlowAccessory = this.createAccessory(accessory, config, log);
             }
             else {
-                log.info('Adding new accessory');
-                accessory = new this.api.platformAccessory(config.name, uuid);
-                accessory.context.deviceConfig = config;
-                ecoFlowAccessory = this.createAccessory(accessory, config, log);
-                // link the accessory to your platform
-                this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
+                ({ accessory, ecoFlowAccessory } = this.addNewDevice(log, config, uuid));
             }
             configuredAccessories.push(accessory);
             if (ecoFlowAccessory) {
@@ -89,35 +123,62 @@ export class EcoFlowHomebridgePlatform {
         }
         this.cleanupDevices(configuredAccessories, configuredEcoFlowAccessories, logs);
     }
+    addNewDevice(log, config, uuid) {
+        log.info('Adding new accessory');
+        const accessory = new this.api.platformAccessory(config.name, uuid);
+        accessory.context.deviceConfig = config;
+        const ecoFlowAccessory = this.createAccessory(accessory, config, log);
+        if (ecoFlowAccessory) {
+            this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
+        }
+        return { accessory, ecoFlowAccessory };
+    }
     cleanupDevices(configuredAccessories, configuredEcoFlowAccessories, logs) {
         const removedAccessories = [];
         this.accessories
             .filter(accessory => !configuredAccessories.includes(accessory))
             .forEach(accessory => {
-            logs[accessory.displayName].info('Removing obsolete accessory');
-            this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
+            this.commonLog.info('Removing obsolete accessory:', accessory.displayName);
+            this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
             removedAccessories.push(accessory);
         });
-        configuredEcoFlowAccessories
-            .filter(ecoFlowAccessory => !removedAccessories.includes(ecoFlowAccessory.accessory))
-            .forEach(ecoFlowAccessory => {
-            logs[ecoFlowAccessory.accessory.displayName].info('Initializing accessory');
-            ecoFlowAccessory.initialize();
-        });
+        const ecoFlowAccessories = configuredEcoFlowAccessories.filter(ecoFlowAccessory => !removedAccessories.includes(ecoFlowAccessory.accessory));
+        this.initialize(ecoFlowAccessories, logs);
+    }
+    async initialize(accessories, logs) {
+        for (const accessory of accessories) {
+            logs[accessory.accessory.displayName].info('Initializing accessory');
+            await accessory.initialize();
+            if (accessory.config.simulate !== true) {
+                await accessory.initializeDefaultValues();
+            }
+            await accessory.cleanupServices();
+        }
     }
     createAccessory(accessory, config, log) {
-        let ecoFlowAccessory = null;
+        let EcoFlowAccessoryType = null;
+        let EcoFlowAccessorySimulatorType = undefined;
         switch (config.model) {
-            case DeviceModel.Delta2Max:
-                ecoFlowAccessory = new Delta2MaxAccessory(this, accessory, config, log);
+            case config_1.DeviceModel.Delta2Max:
+                EcoFlowAccessoryType = delta2maxAccessory_1.Delta2MaxAccessory;
+                EcoFlowAccessorySimulatorType = batterySimulator_1.BatterySimulator;
+                break;
+            case config_1.DeviceModel.Delta2:
+                EcoFlowAccessoryType = delta2Accessory_1.Delta2Accessory;
+                EcoFlowAccessorySimulatorType = batterySimulator_1.BatterySimulator;
                 break;
-            case DeviceModel.Delta2:
-                ecoFlowAccessory = new Delta2Accessory(this, accessory, config, log);
+            case config_1.DeviceModel.PowerStream:
+                EcoFlowAccessoryType = powerStreamAccessory_1.PowerStreamAccessory;
+                EcoFlowAccessorySimulatorType = powerStreamSimulator_1.PowerStreamSimulator;
                 break;
             default:
                 log.warn(`"${config.model}" is not supported. Ignoring the device`);
         }
-        return ecoFlowAccessory;
+        config.simulator = EcoFlowAccessorySimulatorType;
+        return EcoFlowAccessoryType === null
+            ? null
+            : new EcoFlowAccessoryType(this, accessory, config, log, this.httpApiManager, this.mqttApiManager);
     }
 }
+exports.EcoFlowHomebridgePlatform = EcoFlowHomebridgePlatform;
 //# sourceMappingURL=platform.js.map

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":"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"}

package/dist/platform.spec.d.ts

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

package/dist/services/accessoryInformationService.d.ts

@@ -1,7 +1,9 @@
-import { Characteristic, Service } from 'homebridge';
-import { ServiceBase } from './serviceBase.js';
+import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Characteristic } from 'homebridge';
 export declare class AccessoryInformationService extends ServiceBase {
-    protected createService(): Service;
+    protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase);
     protected addCharacteristics(): Characteristic[];
     private getVersion;
 }

package/dist/services/accessoryInformationService.js

@@ -1,10 +1,15 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { ServiceBase } from './serviceBase.js';
-export class AccessoryInformationService extends ServiceBase {
-    createService() {
-        return this.getOrAddService(this.platform.Service.AccessoryInformation, 'Information');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccessoryInformationService = void 0;
+const serviceBase_1 = require("@ecoflow/services/serviceBase");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const packageJsonPath = (0, path_1.join)(__dirname, '../../package.json');
+class AccessoryInformationService extends serviceBase_1.ServiceBase {
+    ecoFlowAccessory;
+    constructor(ecoFlowAccessory) {
+        super(ecoFlowAccessory.platform.Service.AccessoryInformation, ecoFlowAccessory);
+        this.ecoFlowAccessory = ecoFlowAccessory;
     }
     addCharacteristics() {
         const characteristics = [
@@ -22,11 +27,9 @@ export class AccessoryInformationService extends ServiceBase {
         return characteristics;
     }
     getVersion() {
-        const filename = fileURLToPath(import.meta.url);
-        const dirname = path.dirname(filename);
-        const packageJsonPath = path.resolve(dirname, '../../package.json');
-        const packageData = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-        return packageData?.version;
+        const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, 'utf-8'));
+        return packageJson?.version;
     }
 }
+exports.AccessoryInformationService = AccessoryInformationService;
 //# sourceMappingURL=accessoryInformationService.js.map

package/dist/services/accessoryInformationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessoryInformationService.js","sourceRoot":"","sources":["../../src/services/accessoryInformationService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,OAAO,2BAA4B,SAAQ,WAAW;IACvC,aAAa;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;IACzF,CAAC;IAEkB,kBAAkB;QACnC,MAAM,eAAe,GAAG;YACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC;YAC1D,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC;YACrE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;SAC9D,CAAC;QAEF,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC;aACvE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC;aACzF,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC;aACvG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,OAAO,eAAe,CAAC;IACzB,CAAC;IAEO,UAAU;QAChB,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;QACzE,OAAO,WAAW,EAAE,OAAO,CAAC;IAC9B,CAAC;CACF"}
+{"version":3,"file":"accessoryInformationService.js","sourceRoot":"","sources":["../../src/services/accessoryInformationService.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAC5D,2BAAkC;AAElC,+BAA4B;AAE5B,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAE9D,MAAa,2BAA4B,SAAQ,yBAAW;IAC3B;IAA/B,YAA+B,gBAAsC;QACnE,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;QADnD,qBAAgB,GAAhB,gBAAgB,CAAsB;IAErE,CAAC;IAEkB,kBAAkB;QACnC,MAAM,eAAe,GAAG;YACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC;YAC1D,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC;YACrE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;SAC9D,CAAC;QAEF,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC;aACvE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC;aACzF,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC;aACvG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QACvF,OAAO,eAAe,CAAC;IACzB,CAAC;IAEO,UAAU;QAChB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,OAAO,WAAW,EAAE,OAAO,CAAC;IAC9B,CAAC;CACF;AA1BD,kEA0BC"}

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

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

package/dist/services/batteryStatusService.d.ts

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

package/dist/services/batteryStatusService.js

@@ -1,7 +1,12 @@
-import { ServiceBase } from './serviceBase.js';
-export class BatteryStatusService extends ServiceBase {
-    createService() {
-        return this.getOrAddService(this.platform.Service.Battery, this.ecoFlowAccessory.config.name);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BatteryStatusService = void 0;
+const serviceBase_1 = require("@ecoflow/services/serviceBase");
+class BatteryStatusService extends serviceBase_1.ServiceBase {
+    ecoFlowAccessory;
+    constructor(ecoFlowAccessory, serviceSubType) {
+        super(ecoFlowAccessory.platform.Service.Battery, ecoFlowAccessory, serviceSubType);
+        this.ecoFlowAccessory = ecoFlowAccessory;
     }
     addCharacteristics() {
         return [
@@ -10,23 +15,20 @@ export class BatteryStatusService extends ServiceBase {
             this.addCharacteristic(this.platform.Characteristic.ChargingState),
         ];
     }
-    updateStatusLowBattery(batteryLevel) {
-        const statusLowBattery = batteryLevel < 20;
-        this.log.debug('Status Low Battery ->', statusLowBattery);
-        this.service
-            .getCharacteristic(this.platform.Characteristic.StatusLowBattery)
-            .updateValue(statusLowBattery
-            ? this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
-            : this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL);
-    }
     updateBatteryLevel(batteryLevel) {
-        this.log.debug('BatteryLevel ->', batteryLevel);
-        this.service.getCharacteristic(this.platform.Characteristic.BatteryLevel).updateValue(batteryLevel);
+        this.updateCharacteristic(this.platform.Characteristic.BatteryLevel, 'BatteryLevel', batteryLevel);
+        this.updateStatusLowBattery(batteryLevel);
     }
     updateChargingState(chargingPower) {
         const isCharging = chargingPower > 0;
-        this.log.debug('ChargingState ->', isCharging);
-        this.service.getCharacteristic(this.platform.Characteristic.ChargingState).updateValue(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;
+        this.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, 'StatusLowBattery', statusLowBattery);
     }
 }
+exports.BatteryStatusService = BatteryStatusService;
 //# sourceMappingURL=batteryStatusService.js.map

package/dist/services/batteryStatusService.js.map

@@ -1 +1 @@
-{"version":3,"file":"batteryStatusService.js","sourceRoot":"","sources":["../../src/services/batteryStatusService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IAChC,aAAa;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChG,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,sBAAsB,CAAC,YAAoB;QAChD,MAAM,gBAAgB,GAAG,YAAY,GAAG,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC;aAChE,WAAW,CACV,gBAAgB;YACd,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,iBAAiB;YACjE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,oBAAoB,CACvE,CAAC;IACN,CAAC;IAEM,kBAAkB,CAAC,YAAoB;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACtG,CAAC;IAEM,mBAAmB,CAAC,aAAqB;QAC9C,MAAM,UAAU,GAAG,aAAa,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACrG,CAAC;CACF"}
+{"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"}

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

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

package/dist/services/fanServiceBase.d.ts

@@ -0,0 +1,16 @@
+import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Characteristic } from 'homebridge';
+export declare abstract class FanServiceBase extends ServiceBase {
+    protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
+    private readonly maxRotationSpeed;
+    private currentRotationSpeed;
+    private rotationSpeedCharacteristic;
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, maxRotationSpeed: number, serviceSubType: string);
+    protected addCharacteristics(): Characteristic[];
+    updateState(state: boolean): void;
+    updateRotationSpeed(value: number): void;
+    protected setRotationSpeed(value: number): void;
+    protected abstract processOnSetOn(value: boolean, revert: () => void): Promise<void>;
+    protected abstract processOnSetRotationSpeed(value: number, revert: () => void): Promise<void>;
+}

package/dist/services/fanServiceBase.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FanServiceBase = void 0;
+const serviceBase_1 = require("@ecoflow/services/serviceBase");
+class FanServiceBase extends serviceBase_1.ServiceBase {
+    ecoFlowAccessory;
+    maxRotationSpeed;
+    currentRotationSpeed = 0;
+    rotationSpeedCharacteristic = null;
+    constructor(ecoFlowAccessory, maxRotationSpeed, serviceSubType) {
+        super(ecoFlowAccessory.platform.Service.Fan, ecoFlowAccessory, serviceSubType);
+        this.ecoFlowAccessory = ecoFlowAccessory;
+        this.maxRotationSpeed = maxRotationSpeed;
+    }
+    addCharacteristics() {
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
+        onCharacteristic.onSet(value => {
+            const newValue = value;
+            this.processOnSetOn(newValue, () => this.updateState(!newValue));
+        });
+        this.rotationSpeedCharacteristic = this.addCharacteristic(this.platform.Characteristic.RotationSpeed);
+        this.rotationSpeedCharacteristic.onSet(percents => {
+            const prevRotationSpeed = this.currentRotationSpeed;
+            this.currentRotationSpeed = this.covertPercentsToValue(percents, this.maxRotationSpeed);
+            this.processOnSetRotationSpeed(this.currentRotationSpeed, () => this.updateRotationSpeed(prevRotationSpeed));
+        });
+        return [onCharacteristic, this.rotationSpeedCharacteristic];
+    }
+    updateState(state) {
+        this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
+    }
+    updateRotationSpeed(value) {
+        const percents = this.covertValueToPercents(value, this.maxRotationSpeed);
+        this.updateCharacteristic(this.platform.Characteristic.RotationSpeed, 'RotationSpeed', percents);
+        this.currentRotationSpeed = value;
+    }
+    setRotationSpeed(value) {
+        this.rotationSpeedCharacteristic?.setValue(value);
+    }
+}
+exports.FanServiceBase = FanServiceBase;
+//# sourceMappingURL=fanServiceBase.js.map

package/dist/services/fanServiceBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fanServiceBase.js","sourceRoot":"","sources":["../../src/services/fanServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,cAAe,SAAQ,yBAAW;IAKjC;IACF;IALX,oBAAoB,GAAG,CAAC,CAAC;IACzB,2BAA2B,GAA0B,IAAI,CAAC;IAElE,YACqB,gBAAsC,EACxC,gBAAwB,EACzC,cAAsB;QAEtB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJ5D,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAQ;IAI3C,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,KAAK,CAAC,EAAE;YAC7B,MAAM,QAAQ,GAAG,KAAgB,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QACtG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC;YACpD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAkB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAClG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC9D,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;IAEM,mBAAmB,CAAC,KAAa;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1E,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;QACjG,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACpC,CAAC;IAES,gBAAgB,CAAC,KAAa;QACtC,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;CAKF;AA9CD,wCA8CC"}

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

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

package/dist/services/lightBulbServiceBase.d.ts

@@ -0,0 +1,16 @@
+import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Characteristic } from 'homebridge';
+export declare abstract class LightBulbServiceBase extends ServiceBase {
+    protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
+    private readonly maxBrightness;
+    private currentBrightness;
+    private brightnessCharacteristic;
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, maxBrightness: number, serviceSubType: string);
+    protected addCharacteristics(): Characteristic[];
+    updateState(state: boolean): void;
+    updateBrightness(value: number): void;
+    protected setBrightness(value: number): void;
+    protected abstract processOnSetOn(value: boolean, revert: () => void): Promise<void>;
+    protected abstract processOnSetBrightness(value: number, revert: () => void): Promise<void>;
+}

package/dist/services/lightBulbServiceBase.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LightBulbServiceBase = void 0;
+const serviceBase_1 = require("@ecoflow/services/serviceBase");
+class LightBulbServiceBase extends serviceBase_1.ServiceBase {
+    ecoFlowAccessory;
+    maxBrightness;
+    currentBrightness = 0;
+    brightnessCharacteristic = null;
+    constructor(ecoFlowAccessory, maxBrightness, serviceSubType) {
+        super(ecoFlowAccessory.platform.Service.Lightbulb, ecoFlowAccessory, serviceSubType);
+        this.ecoFlowAccessory = ecoFlowAccessory;
+        this.maxBrightness = maxBrightness;
+    }
+    addCharacteristics() {
+        const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
+        onCharacteristic.onSet(value => {
+            const newValue = value;
+            this.processOnSetOn(newValue, () => this.updateState(!newValue));
+        });
+        this.brightnessCharacteristic = this.addCharacteristic(this.platform.Characteristic.Brightness);
+        this.brightnessCharacteristic.onSet(percents => {
+            const prevBrightness = this.currentBrightness;
+            this.currentBrightness = this.covertPercentsToValue(percents, this.maxBrightness);
+            this.processOnSetBrightness(this.currentBrightness, () => this.updateBrightness(prevBrightness));
+        });
+        return [onCharacteristic, this.brightnessCharacteristic];
+    }
+    updateState(state) {
+        this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
+    }
+    updateBrightness(value) {
+        const percents = this.covertValueToPercents(value, this.maxBrightness);
+        this.updateCharacteristic(this.platform.Characteristic.Brightness, 'Brightness', percents);
+        this.currentBrightness = value;
+    }
+    setBrightness(value) {
+        this.brightnessCharacteristic?.setValue(value);
+    }
+}
+exports.LightBulbServiceBase = LightBulbServiceBase;
+//# sourceMappingURL=lightBulbServiceBase.js.map

package/dist/services/lightBulbServiceBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lightBulbServiceBase.js","sourceRoot":"","sources":["../../src/services/lightBulbServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,oBAAqB,SAAQ,yBAAW;IAKvC;IACF;IALX,iBAAiB,GAAG,CAAC,CAAC;IACtB,wBAAwB,GAA0B,IAAI,CAAC;IAE/D,YACqB,gBAAsC,EACxC,aAAqB,EACtC,cAAsB;QAEtB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJlE,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,kBAAa,GAAb,aAAa,CAAQ;IAIxC,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,KAAK,CAAC,EAAE;YAC7B,MAAM,QAAQ,GAAG,KAAgB,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAChG,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC;YAC9C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5F,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC3D,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;IAEM,gBAAgB,CAAC,KAAa;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC3F,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IAES,aAAa,CAAC,KAAa;QACnC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;CAKF;AA9CD,oDA8CC"}

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

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

package/dist/services/outletServiceBase.d.ts

@@ -1,24 +1,16 @@
-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);
+import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { AdditionalBatteryCharacteristicType as CharacteristicType } from '@ecoflow/config';
+import { ServiceBase } from '@ecoflow/services/serviceBase';
+import { Characteristic } from 'homebridge';
+export declare abstract class OutletServiceBase extends ServiceBase {
+    private readonly additionalCharacteristics?;
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType: string, additionalCharacteristics?: CharacteristicType[] | undefined);
     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();
 }