@pietrolubini/homebridge-ecoflow 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.gitattributes +7 -0
- package/.prettierrc.json +1 -0
- package/README.md +154 -24
- package/config.schema.json +73 -2
- package/dist/accessories/batteries/batteryAccessoryBase.d.ts +26 -0
- package/dist/accessories/batteries/batteryAccessoryBase.js +126 -0
- package/dist/accessories/batteries/batteryAccessoryBase.js.map +1 -0
- package/dist/accessories/batteries/batteryAccessoryBase.spec.d.ts +1 -0
- package/dist/accessories/batteries/delta2Accessory.d.ts +2 -2
- package/dist/accessories/batteries/delta2Accessory.js +6 -2
- package/dist/accessories/batteries/delta2Accessory.js.map +1 -1
- package/dist/accessories/batteries/delta2maxAccessory.d.ts +2 -2
- package/dist/accessories/batteries/delta2maxAccessory.js +6 -2
- package/dist/accessories/batteries/delta2maxAccessory.js.map +1 -1
- package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.d.ts +33 -0
- package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js +3 -0
- package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js.map +1 -0
- package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.d.ts +36 -0
- package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.js +18 -0
- package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.js.map +1 -0
- package/dist/accessories/batteries/services/outletAcService.d.ts +8 -0
- package/dist/accessories/batteries/services/outletAcService.js +24 -0
- package/dist/accessories/batteries/services/outletAcService.js.map +1 -0
- package/dist/accessories/batteries/services/outletAcService.spec.d.ts +1 -0
- package/dist/accessories/batteries/services/outletBatteryServiceBase.d.ts +5 -0
- package/dist/accessories/batteries/services/outletBatteryServiceBase.js +18 -0
- package/dist/accessories/batteries/services/outletBatteryServiceBase.js.map +1 -0
- package/dist/accessories/batteries/services/outletCarService.d.ts +6 -0
- package/dist/accessories/batteries/services/outletCarService.js +17 -0
- package/dist/accessories/batteries/services/outletCarService.js.map +1 -0
- package/dist/accessories/batteries/services/outletCarService.spec.d.ts +1 -0
- package/dist/accessories/batteries/services/outletUsbService.d.ts +6 -0
- package/dist/accessories/batteries/services/outletUsbService.js +15 -0
- package/dist/accessories/batteries/services/outletUsbService.js.map +1 -0
- package/dist/accessories/batteries/services/outletUsbService.spec.d.ts +1 -0
- package/dist/accessories/batteries/simulations/batterySimulator.d.ts +6 -0
- package/dist/accessories/batteries/simulations/batterySimulator.js +60 -0
- package/dist/accessories/batteries/simulations/batterySimulator.js.map +1 -0
- package/dist/accessories/ecoFlowAccessoryBase.d.ts +41 -0
- package/dist/accessories/ecoFlowAccessoryBase.js +114 -0
- package/dist/accessories/ecoFlowAccessoryBase.js.map +1 -0
- package/dist/accessories/ecoFlowAccessoryBase.spec.d.ts +1 -0
- package/dist/accessories/ecoFlowAccessoryWithQuotaBase.d.ts +15 -0
- package/dist/accessories/ecoFlowAccessoryWithQuotaBase.js +34 -0
- package/dist/accessories/ecoFlowAccessoryWithQuotaBase.js.map +1 -0
- package/dist/accessories/ecoFlowAccessoryWithQuotaBase.spec.d.ts +1 -0
- package/dist/accessories/powerstream/interfaces/httpApiPowerStreamContracts.d.ts +16 -0
- package/dist/accessories/powerstream/interfaces/httpApiPowerStreamContracts.js +3 -0
- package/dist/accessories/powerstream/interfaces/httpApiPowerStreamContracts.js.map +1 -0
- package/dist/accessories/powerstream/interfaces/mqttApiPowerStreamContracts.d.ts +41 -0
- package/dist/accessories/powerstream/interfaces/mqttApiPowerStreamContracts.js +21 -0
- package/dist/accessories/powerstream/interfaces/mqttApiPowerStreamContracts.js.map +1 -0
- package/dist/accessories/powerstream/powerStreamAccessory.d.ts +26 -0
- package/dist/accessories/powerstream/powerStreamAccessory.js +113 -0
- package/dist/accessories/powerstream/powerStreamAccessory.js.map +1 -0
- package/dist/accessories/powerstream/powerStreamAccessory.spec.d.ts +1 -0
- package/dist/accessories/powerstream/services/brightnessService.d.ts +7 -0
- package/dist/accessories/powerstream/services/brightnessService.js +27 -0
- package/dist/accessories/powerstream/services/brightnessService.js.map +1 -0
- package/dist/accessories/powerstream/services/brightnessService.spec.d.ts +1 -0
- package/dist/accessories/powerstream/services/outletInvService.d.ts +7 -0
- package/dist/accessories/powerstream/services/outletInvService.js +14 -0
- package/dist/accessories/powerstream/services/outletInvService.js.map +1 -0
- package/dist/accessories/powerstream/services/outletInvService.spec.d.ts +1 -0
- package/dist/accessories/powerstream/services/outletService.d.ts +8 -0
- package/dist/accessories/powerstream/services/outletService.js +14 -0
- package/dist/accessories/powerstream/services/outletService.js.map +1 -0
- package/dist/accessories/powerstream/services/outletService.spec.d.ts +1 -0
- package/dist/accessories/powerstream/services/powerDemandService.d.ts +7 -0
- package/dist/accessories/powerstream/services/powerDemandService.js +27 -0
- package/dist/accessories/powerstream/services/powerDemandService.js.map +1 -0
- package/dist/accessories/powerstream/services/powerDemandService.spec.d.ts +1 -0
- package/dist/accessories/powerstream/simulations/powerStreamSimulator.d.ts +6 -0
- package/dist/accessories/powerstream/simulations/powerStreamSimulator.js +39 -0
- package/dist/accessories/powerstream/simulations/powerStreamSimulator.js.map +1 -0
- package/dist/apis/containers/deviceInfo.d.ts +13 -0
- package/dist/apis/containers/deviceInfo.js +23 -0
- package/dist/apis/containers/deviceInfo.js.map +1 -0
- package/dist/apis/containers/deviceInfo.spec.d.ts +1 -0
- package/dist/apis/containers/mqttClientContainer.d.ts +17 -0
- package/dist/apis/containers/mqttClientContainer.js +45 -0
- package/dist/apis/containers/mqttClientContainer.js.map +1 -0
- package/dist/apis/containers/mqttClientContainer.spec.d.ts +1 -0
- package/dist/apis/containers/mqttDevice.d.ts +15 -0
- package/dist/apis/containers/mqttDevice.js +43 -0
- package/dist/apis/containers/mqttDevice.js.map +1 -0
- package/dist/apis/containers/mqttDevice.spec.d.ts +1 -0
- package/dist/apis/ecoFlowHttpApiManager.d.ts +13 -0
- package/dist/apis/{ecoFlowHttpApi.js → ecoFlowHttpApiManager.js} +58 -44
- package/dist/apis/ecoFlowHttpApiManager.js.map +1 -0
- package/dist/apis/ecoFlowHttpApiManager.spec.d.ts +1 -0
- package/dist/apis/ecoFlowMqttApiManager.d.ts +25 -0
- package/dist/apis/ecoFlowMqttApiManager.js +152 -0
- package/dist/apis/ecoFlowMqttApiManager.js.map +1 -0
- package/dist/apis/ecoFlowMqttApiManager.spec.d.ts +1 -0
- package/dist/apis/interfaces/httpApiContracts.d.ts +30 -0
- package/dist/apis/interfaces/httpApiContracts.js +9 -0
- package/dist/apis/interfaces/httpApiContracts.js.map +1 -0
- package/dist/apis/interfaces/mqttApiContracts.d.ts +26 -0
- package/dist/apis/interfaces/mqttApiContracts.js +9 -0
- package/dist/apis/interfaces/mqttApiContracts.js.map +1 -0
- package/dist/apis/simulations/mockMqttClient.d.ts +15 -0
- package/dist/apis/simulations/mockMqttClient.js +59 -0
- package/dist/apis/simulations/mockMqttClient.js.map +1 -0
- package/dist/apis/simulations/mockMqttClient.spec.d.ts +1 -0
- package/dist/apis/simulations/simulator.d.ts +13 -0
- package/dist/apis/simulations/simulator.js +26 -0
- package/dist/apis/simulations/simulator.js.map +1 -0
- package/dist/characteristics/customCharacteristic.d.ts +18 -0
- package/dist/characteristics/customCharacteristic.js +94 -0
- package/dist/characteristics/customCharacteristic.js.map +1 -0
- package/dist/characteristics/customCharacteristic.spec.d.ts +1 -0
- package/dist/config.d.ts +33 -4
- package/dist/config.js +18 -4
- package/dist/config.js.map +1 -1
- package/dist/helpers/logger.js +5 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/logger.spec.d.ts +1 -0
- package/dist/helpers/machineIdProvider.d.ts +4 -0
- package/dist/helpers/machineIdProvider.js +19 -0
- package/dist/helpers/machineIdProvider.js.map +1 -0
- package/dist/helpers/machineIdProvider.spec.d.ts +1 -0
- package/dist/helpers/tests/accessoryTestHelper.d.ts +5 -0
- package/dist/helpers/tests/serviceTestHelper.d.ts +6 -0
- package/dist/helpers/tests/sleep.d.ts +1 -0
- package/dist/homebridge-ui/public/index.d.ts +2 -0
- package/dist/homebridge-ui/public/index.html +6 -0
- package/dist/homebridge-ui/public/index.js +1 -0
- package/dist/homebridge-ui/public/index.spec.d.ts +1 -0
- package/dist/homebridge-ui/public/interfaces/contracts.d.ts +13 -0
- package/dist/homebridge-ui/public/interfaces/homebridge.d.ts +52 -0
- package/dist/homebridge-ui/public/renderers/componentRenderer.d.ts +6 -0
- package/dist/homebridge-ui/public/renderers/componentRenderer.spec.d.ts +1 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigDevicesRenderer.d.ts +20 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigDevicesRenderer.spec.d.ts +1 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigNameRenderer.d.ts +5 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigNameRenderer.spec.d.ts +1 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigRenderer.d.ts +6 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigRenderer.spec.d.ts +1 -0
- package/dist/homebridge-ui/public/renderers/pluginConfigRendererBase.d.ts +9 -0
- package/dist/index.js +7 -4
- package/dist/index.js.map +1 -1
- package/dist/index.spec.d.ts +1 -0
- package/dist/platform.d.ts +12 -8
- package/dist/platform.js +91 -30
- package/dist/platform.js.map +1 -1
- package/dist/platform.spec.d.ts +1 -0
- package/dist/services/accessoryInformationService.d.ts +5 -3
- package/dist/services/accessoryInformationService.js +15 -12
- package/dist/services/accessoryInformationService.js.map +1 -1
- package/dist/services/accessoryInformationService.spec.d.ts +1 -0
- package/dist/services/batteryStatusService.d.ts +6 -4
- package/dist/services/batteryStatusService.js +19 -17
- package/dist/services/batteryStatusService.js.map +1 -1
- package/dist/services/batteryStatusService.spec.d.ts +1 -0
- package/dist/services/fanServiceBase.d.ts +16 -0
- package/dist/services/fanServiceBase.js +42 -0
- package/dist/services/fanServiceBase.js.map +1 -0
- package/dist/services/fanServiceBase.spec.d.ts +1 -0
- package/dist/services/lightBulbServiceBase.d.ts +16 -0
- package/dist/services/lightBulbServiceBase.js +42 -0
- package/dist/services/lightBulbServiceBase.js.map +1 -0
- package/dist/services/lightBulbServiceBase.spec.d.ts +1 -0
- package/dist/services/outletServiceBase.d.ts +7 -15
- package/dist/services/outletServiceBase.js +20 -28
- package/dist/services/outletServiceBase.js.map +1 -1
- package/dist/services/outletServiceBase.spec.d.ts +1 -0
- package/dist/services/serviceBase.d.ts +10 -5
- package/dist/services/serviceBase.js +31 -8
- package/dist/services/serviceBase.js.map +1 -1
- package/dist/settings.js +5 -2
- package/dist/settings.js.map +1 -1
- package/docs/images/plugin_icon.png +0 -0
- package/jest.config.ts +46 -0
- package/junit.xml +843 -0
- package/package.json +42 -12
- package/tsconfig.build.json +5 -0
- package/tsconfig.spec.json +8 -0
- package/dist/accessories/batteries/batteryAccessory.d.ts +0 -59
- package/dist/accessories/batteries/batteryAccessory.js +0 -120
- package/dist/accessories/batteries/batteryAccessory.js.map +0 -1
- package/dist/accessories/ecoFlowAccessory.d.ts +0 -42
- package/dist/accessories/ecoFlowAccessory.js +0 -116
- package/dist/accessories/ecoFlowAccessory.js.map +0 -1
- package/dist/apis/ecoFlowHttpApi.d.ts +0 -46
- package/dist/apis/ecoFlowHttpApi.js.map +0 -1
- package/dist/apis/ecoFlowMqttApi.d.ts +0 -53
- package/dist/apis/ecoFlowMqttApi.js +0 -100
- package/dist/apis/ecoFlowMqttApi.js.map +0 -1
- package/dist/characteristics/CustomCharacteristic.d.ts +0 -16
- package/dist/characteristics/CustomCharacteristic.js +0 -78
- package/dist/characteristics/CustomCharacteristic.js.map +0 -1
- package/dist/helpers/machineId.d.ts +0 -2
- package/dist/helpers/machineId.js +0 -15
- package/dist/helpers/machineId.js.map +0 -1
- package/dist/helpers/machineIdHelper.cjs +0 -5
- package/dist/services/outletAcService.d.ts +0 -8
- package/dist/services/outletAcService.js +0 -17
- package/dist/services/outletAcService.js.map +0 -1
- package/dist/services/outletCarService.d.ts +0 -6
- package/dist/services/outletCarService.js +0 -12
- package/dist/services/outletCarService.js.map +0 -1
- package/dist/services/outletUsbService.d.ts +0 -6
- package/dist/services/outletUsbService.js +0 -10
- package/dist/services/outletUsbService.js.map +0 -1
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.OutletServiceBase = void 0;
|
|
4
|
+
const config_1 = require("@ecoflow/config");
|
|
5
|
+
const serviceBase_1 = require("@ecoflow/services/serviceBase");
|
|
6
|
+
class OutletServiceBase extends serviceBase_1.ServiceBase {
|
|
7
|
+
additionalCharacteristics;
|
|
8
|
+
constructor(ecoFlowAccessory, serviceSubType, additionalCharacteristics) {
|
|
9
|
+
super(ecoFlowAccessory.platform.Service.Outlet, ecoFlowAccessory, serviceSubType);
|
|
10
|
+
this.additionalCharacteristics = additionalCharacteristics;
|
|
8
11
|
}
|
|
9
12
|
updateState(state) {
|
|
10
13
|
this.updateCharacteristic(this.platform.Characteristic.On, 'State', state);
|
|
11
14
|
}
|
|
12
15
|
updateOutputConsumption(watt) {
|
|
13
16
|
this.updateCharacteristic(this.platform.Characteristic.OutletInUse, 'InUse', watt > 0);
|
|
14
|
-
this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, 'Output Consumption, W', watt,
|
|
17
|
+
this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, 'Output Consumption, W', watt, config_1.AdditionalBatteryCharacteristicType.OutputConsumptionInWatts);
|
|
15
18
|
}
|
|
16
19
|
updateInputConsumption(watt) {
|
|
17
|
-
this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, 'Input Consumption, W', watt,
|
|
20
|
+
this.updateCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, 'Input Consumption, W', watt, config_1.AdditionalBatteryCharacteristicType.InputConsumptionInWatts);
|
|
18
21
|
}
|
|
19
22
|
updateBatteryLevel(batteryLevel) {
|
|
20
|
-
this.updateCustomCharacteristic(this.platform.Characteristic.BatteryLevel, 'Battery Level, %', batteryLevel,
|
|
21
|
-
}
|
|
22
|
-
createService() {
|
|
23
|
-
return this.getOrAddServiceById(this.platform.Service.Outlet, this.serviceName, this.serviceSubType);
|
|
23
|
+
this.updateCustomCharacteristic(this.platform.Characteristic.BatteryLevel, 'Battery Level, %', batteryLevel, config_1.AdditionalBatteryCharacteristicType.BatteryLevel);
|
|
24
24
|
}
|
|
25
25
|
addCharacteristics() {
|
|
26
26
|
const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On);
|
|
@@ -31,32 +31,24 @@ export class OutletsServiceBase extends ServiceBase {
|
|
|
31
31
|
const characteristics = [
|
|
32
32
|
this.addCharacteristic(this.platform.Characteristic.OutletInUse),
|
|
33
33
|
onCharacteristic,
|
|
34
|
-
this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts,
|
|
35
|
-
this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts,
|
|
36
|
-
this.tryAddCustomCharacteristic(this.platform.Characteristic.BatteryLevel,
|
|
34
|
+
this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.InputConsumptionWatts, config_1.AdditionalBatteryCharacteristicType.InputConsumptionInWatts),
|
|
35
|
+
this.tryAddCustomCharacteristic(this.platform.Characteristic.PowerConsumption.OutputConsumptionWatts, config_1.AdditionalBatteryCharacteristicType.OutputConsumptionInWatts),
|
|
36
|
+
this.tryAddCustomCharacteristic(this.platform.Characteristic.BatteryLevel, config_1.AdditionalBatteryCharacteristicType.BatteryLevel),
|
|
37
37
|
];
|
|
38
38
|
this.service.setCharacteristic(this.platform.Characteristic.Name, this.serviceName);
|
|
39
39
|
return characteristics.filter(characteristic => characteristic !== null);
|
|
40
40
|
}
|
|
41
|
-
sendOn(moduleType, operateType, params, revert) {
|
|
42
|
-
return this.ecoFlowAccessory.sendSetCommand(moduleType, operateType, params, revert);
|
|
43
|
-
}
|
|
44
|
-
updateCharacteristic(characteristic, name, value) {
|
|
45
|
-
super.updateCharacteristic(characteristic, `${this.serviceSubType} ${name}`, value);
|
|
46
|
-
}
|
|
47
41
|
tryAddCustomCharacteristic(characteristic, characteristicType) {
|
|
48
|
-
if (this.
|
|
42
|
+
if (this.additionalCharacteristics?.includes(characteristicType)) {
|
|
49
43
|
return this.addCharacteristic(characteristic);
|
|
50
44
|
}
|
|
51
45
|
return null;
|
|
52
46
|
}
|
|
53
47
|
updateCustomCharacteristic(characteristic, name, value, characteristicType) {
|
|
54
|
-
if (this.
|
|
55
|
-
|
|
48
|
+
if (this.additionalCharacteristics?.includes(characteristicType)) {
|
|
49
|
+
this.updateCharacteristic(characteristic, name, value);
|
|
56
50
|
}
|
|
57
51
|
}
|
|
58
|
-
get serviceName() {
|
|
59
|
-
return `${this.ecoFlowAccessory.config.name} ${this.serviceSubType}`;
|
|
60
|
-
}
|
|
61
52
|
}
|
|
53
|
+
exports.OutletServiceBase = OutletServiceBase;
|
|
62
54
|
//# sourceMappingURL=outletServiceBase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletServiceBase.js","sourceRoot":"","sources":["../../src/services/outletServiceBase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outletServiceBase.js","sourceRoot":"","sources":["../../src/services/outletServiceBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -1,17 +1,20 @@
|
|
|
1
|
+
import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
|
|
2
|
+
import { EcoFlowHomebridgePlatform } from '@ecoflow/platform';
|
|
1
3
|
import { Characteristic, CharacteristicValue, Logging, Service, WithUUID } from 'homebridge';
|
|
2
|
-
import { EcoFlowAccessory } from '../accessories/ecoFlowAccessory.js';
|
|
3
|
-
import { EcoFlowHomebridgePlatform } from '../platform.js';
|
|
4
4
|
export declare abstract class ServiceBase {
|
|
5
|
-
|
|
5
|
+
private readonly serviceType;
|
|
6
|
+
protected readonly ecoFlowAccessory: EcoFlowAccessoryBase;
|
|
7
|
+
protected readonly serviceSubType?: string | undefined;
|
|
6
8
|
protected readonly log: Logging;
|
|
7
9
|
protected readonly platform: EcoFlowHomebridgePlatform;
|
|
8
10
|
protected characteristics: Characteristic[];
|
|
9
11
|
private _service;
|
|
10
|
-
constructor(ecoFlowAccessory:
|
|
12
|
+
constructor(serviceType: WithUUID<typeof Service>, ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType?: string | undefined);
|
|
11
13
|
initialize(): void;
|
|
12
14
|
cleanupCharacteristics(): void;
|
|
13
15
|
get service(): Service;
|
|
14
|
-
protected
|
|
16
|
+
protected get serviceName(): string;
|
|
17
|
+
protected createService(): Service;
|
|
15
18
|
protected abstract addCharacteristics(): Characteristic[];
|
|
16
19
|
protected addCharacteristic(characteristic: WithUUID<{
|
|
17
20
|
new (): Characteristic;
|
|
@@ -21,4 +24,6 @@ export declare abstract class ServiceBase {
|
|
|
21
24
|
protected updateCharacteristic(characteristic: WithUUID<{
|
|
22
25
|
new (): Characteristic;
|
|
23
26
|
}>, name: string, value: CharacteristicValue): void;
|
|
27
|
+
protected covertPercentsToValue(percents: number, maxValue: number): number;
|
|
28
|
+
protected covertValueToPercents(value: number, maxValue: number): number;
|
|
24
29
|
}
|
|
@@ -1,11 +1,18 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ServiceBase = void 0;
|
|
4
|
+
class ServiceBase {
|
|
5
|
+
serviceType;
|
|
2
6
|
ecoFlowAccessory;
|
|
7
|
+
serviceSubType;
|
|
3
8
|
log;
|
|
4
9
|
platform;
|
|
5
10
|
characteristics = [];
|
|
6
11
|
_service = null;
|
|
7
|
-
constructor(ecoFlowAccessory) {
|
|
12
|
+
constructor(serviceType, ecoFlowAccessory, serviceSubType) {
|
|
13
|
+
this.serviceType = serviceType;
|
|
8
14
|
this.ecoFlowAccessory = ecoFlowAccessory;
|
|
15
|
+
this.serviceSubType = serviceSubType;
|
|
9
16
|
this.log = ecoFlowAccessory.log;
|
|
10
17
|
this.platform = ecoFlowAccessory.platform;
|
|
11
18
|
}
|
|
@@ -24,14 +31,22 @@ export class ServiceBase {
|
|
|
24
31
|
}
|
|
25
32
|
// Getter for service
|
|
26
33
|
get service() {
|
|
34
|
+
if (!this._service) {
|
|
35
|
+
this.log.error('Service is not initialized:', this.constructor.name);
|
|
36
|
+
throw new Error(`Service is not initialized: ${this.constructor.name}`);
|
|
37
|
+
}
|
|
27
38
|
return this._service;
|
|
28
39
|
}
|
|
40
|
+
get serviceName() {
|
|
41
|
+
return `${this.ecoFlowAccessory.config.name} ${this.serviceSubType}`;
|
|
42
|
+
}
|
|
43
|
+
createService() {
|
|
44
|
+
return this.serviceSubType
|
|
45
|
+
? this.getOrAddServiceById(this.serviceType, this.serviceName, this.serviceSubType)
|
|
46
|
+
: this.getOrAddService(this.serviceType, this.ecoFlowAccessory.config.name);
|
|
47
|
+
}
|
|
29
48
|
addCharacteristic(characteristic) {
|
|
30
|
-
|
|
31
|
-
if (!existingCharacteristic) {
|
|
32
|
-
return this.service.addCharacteristic(characteristic);
|
|
33
|
-
}
|
|
34
|
-
return existingCharacteristic;
|
|
49
|
+
return this.service.getCharacteristic(characteristic);
|
|
35
50
|
}
|
|
36
51
|
getOrAddService(service, displayName) {
|
|
37
52
|
const result = this.ecoFlowAccessory.accessory.getService(service) ||
|
|
@@ -45,8 +60,16 @@ export class ServiceBase {
|
|
|
45
60
|
return result;
|
|
46
61
|
}
|
|
47
62
|
updateCharacteristic(characteristic, name, value) {
|
|
48
|
-
this.
|
|
63
|
+
const newName = this.serviceSubType !== undefined ? `${this.serviceSubType} ${name}` : name;
|
|
64
|
+
this.log.debug(`${newName} ->`, value);
|
|
49
65
|
this.service.getCharacteristic(characteristic).updateValue(value);
|
|
50
66
|
}
|
|
67
|
+
covertPercentsToValue(percents, maxValue) {
|
|
68
|
+
return (percents * maxValue) / 100;
|
|
69
|
+
}
|
|
70
|
+
covertValueToPercents(value, maxValue) {
|
|
71
|
+
return (value * 100) / maxValue;
|
|
72
|
+
}
|
|
51
73
|
}
|
|
74
|
+
exports.ServiceBase = ServiceBase;
|
|
52
75
|
//# sourceMappingURL=serviceBase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceBase.js","sourceRoot":"","sources":["../../src/services/serviceBase.ts"],"names":[],"mappings":"AAIA,
|
|
1
|
+
{"version":3,"file":"serviceBase.js","sourceRoot":"","sources":["../../src/services/serviceBase.ts"],"names":[],"mappings":"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"}
|
package/dist/settings.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PLUGIN_NAME = exports.PLATFORM_NAME = void 0;
|
|
1
4
|
/**
|
|
2
5
|
* This is the name of the platform that users will use to register the plugin in the Homebridge config.json
|
|
3
6
|
*/
|
|
4
|
-
|
|
7
|
+
exports.PLATFORM_NAME = 'EcoFlowHomebridge';
|
|
5
8
|
/**
|
|
6
9
|
* This must match the name of your plugin as defined the package.json
|
|
7
10
|
*/
|
|
8
|
-
|
|
11
|
+
exports.PLUGIN_NAME = '@pietrolubini/homebridge-ecoflow';
|
|
9
12
|
//# sourceMappingURL=settings.js.map
|
package/dist/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,aAAa,GAAG,mBAAmB,CAAC;AAEjD;;GAEG;AACU,QAAA,WAAW,GAAG,kCAAkC,CAAC"}
|
|
Binary file
|
package/jest.config.ts
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { Config } from '@jest/types';
|
|
2
|
+
|
|
3
|
+
const commonProjectSettings: Config.InitialOptions = {
|
|
4
|
+
rootDir: 'src',
|
|
5
|
+
preset: 'ts-jest',
|
|
6
|
+
moduleDirectories: ['node_modules', 'src'],
|
|
7
|
+
moduleFileExtensions: ['js', 'json', 'ts', 'node'],
|
|
8
|
+
transform: {
|
|
9
|
+
'^.+\\.(t|j)s$': 'ts-jest',
|
|
10
|
+
},
|
|
11
|
+
moduleNameMapper: {
|
|
12
|
+
'^@ecoflow/(.*)$': '<rootDir>/$1',
|
|
13
|
+
},
|
|
14
|
+
collectCoverageFrom: ['**/*.(t|j)s'],
|
|
15
|
+
coverageDirectory: '../coverage',
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
const config: Config.InitialOptions = {
|
|
19
|
+
projects: [
|
|
20
|
+
{
|
|
21
|
+
...commonProjectSettings,
|
|
22
|
+
displayName: 'plugin-tests',
|
|
23
|
+
testEnvironment: 'node',
|
|
24
|
+
testMatch: ['**/*.spec.ts'],
|
|
25
|
+
testPathIgnorePatterns: ['<rootDir>/homebridge-ui/'],
|
|
26
|
+
coveragePathIgnorePatterns: ['helpers/tests/', 'Simulator.ts', 'simulator.ts'],
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
...commonProjectSettings,
|
|
30
|
+
displayName: 'homebridge-ui-tests',
|
|
31
|
+
testEnvironment: 'jsdom',
|
|
32
|
+
testMatch: ['<rootDir>/homebridge-ui/**/*.spec.ts'],
|
|
33
|
+
coveragePathIgnorePatterns: ['webpack.config.ts'],
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
coverageThreshold: {
|
|
37
|
+
global: {
|
|
38
|
+
branches: 100,
|
|
39
|
+
functions: 100,
|
|
40
|
+
lines: 100,
|
|
41
|
+
statements: 100,
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
export default config;
|