@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.
Files changed (205) hide show
  1. package/.gitattributes +7 -0
  2. package/.prettierrc.json +1 -0
  3. package/README.md +154 -24
  4. package/config.schema.json +73 -2
  5. package/dist/accessories/batteries/batteryAccessoryBase.d.ts +26 -0
  6. package/dist/accessories/batteries/batteryAccessoryBase.js +126 -0
  7. package/dist/accessories/batteries/batteryAccessoryBase.js.map +1 -0
  8. package/dist/accessories/batteries/batteryAccessoryBase.spec.d.ts +1 -0
  9. package/dist/accessories/batteries/delta2Accessory.d.ts +2 -2
  10. package/dist/accessories/batteries/delta2Accessory.js +6 -2
  11. package/dist/accessories/batteries/delta2Accessory.js.map +1 -1
  12. package/dist/accessories/batteries/delta2maxAccessory.d.ts +2 -2
  13. package/dist/accessories/batteries/delta2maxAccessory.js +6 -2
  14. package/dist/accessories/batteries/delta2maxAccessory.js.map +1 -1
  15. package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.d.ts +33 -0
  16. package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js +3 -0
  17. package/dist/accessories/batteries/interfaces/httpApiBatteryContracts.js.map +1 -0
  18. package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.d.ts +36 -0
  19. package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.js +18 -0
  20. package/dist/accessories/batteries/interfaces/mqttApiBatteryContracts.js.map +1 -0
  21. package/dist/accessories/batteries/services/outletAcService.d.ts +8 -0
  22. package/dist/accessories/batteries/services/outletAcService.js +24 -0
  23. package/dist/accessories/batteries/services/outletAcService.js.map +1 -0
  24. package/dist/accessories/batteries/services/outletAcService.spec.d.ts +1 -0
  25. package/dist/accessories/batteries/services/outletBatteryServiceBase.d.ts +5 -0
  26. package/dist/accessories/batteries/services/outletBatteryServiceBase.js +18 -0
  27. package/dist/accessories/batteries/services/outletBatteryServiceBase.js.map +1 -0
  28. package/dist/accessories/batteries/services/outletCarService.d.ts +6 -0
  29. package/dist/accessories/batteries/services/outletCarService.js +17 -0
  30. package/dist/accessories/batteries/services/outletCarService.js.map +1 -0
  31. package/dist/accessories/batteries/services/outletCarService.spec.d.ts +1 -0
  32. package/dist/accessories/batteries/services/outletUsbService.d.ts +6 -0
  33. package/dist/accessories/batteries/services/outletUsbService.js +15 -0
  34. package/dist/accessories/batteries/services/outletUsbService.js.map +1 -0
  35. package/dist/accessories/batteries/services/outletUsbService.spec.d.ts +1 -0
  36. package/dist/accessories/batteries/simulations/batterySimulator.d.ts +6 -0
  37. package/dist/accessories/batteries/simulations/batterySimulator.js +60 -0
  38. package/dist/accessories/batteries/simulations/batterySimulator.js.map +1 -0
  39. package/dist/accessories/ecoFlowAccessoryBase.d.ts +41 -0
  40. package/dist/accessories/ecoFlowAccessoryBase.js +114 -0
  41. package/dist/accessories/ecoFlowAccessoryBase.js.map +1 -0
  42. package/dist/accessories/ecoFlowAccessoryBase.spec.d.ts +1 -0
  43. package/dist/accessories/ecoFlowAccessoryWithQuotaBase.d.ts +15 -0
  44. package/dist/accessories/ecoFlowAccessoryWithQuotaBase.js +34 -0
  45. package/dist/accessories/ecoFlowAccessoryWithQuotaBase.js.map +1 -0
  46. package/dist/accessories/ecoFlowAccessoryWithQuotaBase.spec.d.ts +1 -0
  47. package/dist/accessories/powerstream/interfaces/httpApiPowerStreamContracts.d.ts +16 -0
  48. package/dist/accessories/powerstream/interfaces/httpApiPowerStreamContracts.js +3 -0
  49. package/dist/accessories/powerstream/interfaces/httpApiPowerStreamContracts.js.map +1 -0
  50. package/dist/accessories/powerstream/interfaces/mqttApiPowerStreamContracts.d.ts +41 -0
  51. package/dist/accessories/powerstream/interfaces/mqttApiPowerStreamContracts.js +21 -0
  52. package/dist/accessories/powerstream/interfaces/mqttApiPowerStreamContracts.js.map +1 -0
  53. package/dist/accessories/powerstream/powerStreamAccessory.d.ts +26 -0
  54. package/dist/accessories/powerstream/powerStreamAccessory.js +113 -0
  55. package/dist/accessories/powerstream/powerStreamAccessory.js.map +1 -0
  56. package/dist/accessories/powerstream/powerStreamAccessory.spec.d.ts +1 -0
  57. package/dist/accessories/powerstream/services/brightnessService.d.ts +7 -0
  58. package/dist/accessories/powerstream/services/brightnessService.js +27 -0
  59. package/dist/accessories/powerstream/services/brightnessService.js.map +1 -0
  60. package/dist/accessories/powerstream/services/brightnessService.spec.d.ts +1 -0
  61. package/dist/accessories/powerstream/services/outletInvService.d.ts +7 -0
  62. package/dist/accessories/powerstream/services/outletInvService.js +14 -0
  63. package/dist/accessories/powerstream/services/outletInvService.js.map +1 -0
  64. package/dist/accessories/powerstream/services/outletInvService.spec.d.ts +1 -0
  65. package/dist/accessories/powerstream/services/outletService.d.ts +8 -0
  66. package/dist/accessories/powerstream/services/outletService.js +14 -0
  67. package/dist/accessories/powerstream/services/outletService.js.map +1 -0
  68. package/dist/accessories/powerstream/services/outletService.spec.d.ts +1 -0
  69. package/dist/accessories/powerstream/services/powerDemandService.d.ts +7 -0
  70. package/dist/accessories/powerstream/services/powerDemandService.js +27 -0
  71. package/dist/accessories/powerstream/services/powerDemandService.js.map +1 -0
  72. package/dist/accessories/powerstream/services/powerDemandService.spec.d.ts +1 -0
  73. package/dist/accessories/powerstream/simulations/powerStreamSimulator.d.ts +6 -0
  74. package/dist/accessories/powerstream/simulations/powerStreamSimulator.js +39 -0
  75. package/dist/accessories/powerstream/simulations/powerStreamSimulator.js.map +1 -0
  76. package/dist/apis/containers/deviceInfo.d.ts +13 -0
  77. package/dist/apis/containers/deviceInfo.js +23 -0
  78. package/dist/apis/containers/deviceInfo.js.map +1 -0
  79. package/dist/apis/containers/deviceInfo.spec.d.ts +1 -0
  80. package/dist/apis/containers/mqttClientContainer.d.ts +17 -0
  81. package/dist/apis/containers/mqttClientContainer.js +45 -0
  82. package/dist/apis/containers/mqttClientContainer.js.map +1 -0
  83. package/dist/apis/containers/mqttClientContainer.spec.d.ts +1 -0
  84. package/dist/apis/containers/mqttDevice.d.ts +15 -0
  85. package/dist/apis/containers/mqttDevice.js +43 -0
  86. package/dist/apis/containers/mqttDevice.js.map +1 -0
  87. package/dist/apis/containers/mqttDevice.spec.d.ts +1 -0
  88. package/dist/apis/ecoFlowHttpApiManager.d.ts +13 -0
  89. package/dist/apis/{ecoFlowHttpApi.js → ecoFlowHttpApiManager.js} +58 -44
  90. package/dist/apis/ecoFlowHttpApiManager.js.map +1 -0
  91. package/dist/apis/ecoFlowHttpApiManager.spec.d.ts +1 -0
  92. package/dist/apis/ecoFlowMqttApiManager.d.ts +25 -0
  93. package/dist/apis/ecoFlowMqttApiManager.js +152 -0
  94. package/dist/apis/ecoFlowMqttApiManager.js.map +1 -0
  95. package/dist/apis/ecoFlowMqttApiManager.spec.d.ts +1 -0
  96. package/dist/apis/interfaces/httpApiContracts.d.ts +30 -0
  97. package/dist/apis/interfaces/httpApiContracts.js +9 -0
  98. package/dist/apis/interfaces/httpApiContracts.js.map +1 -0
  99. package/dist/apis/interfaces/mqttApiContracts.d.ts +26 -0
  100. package/dist/apis/interfaces/mqttApiContracts.js +9 -0
  101. package/dist/apis/interfaces/mqttApiContracts.js.map +1 -0
  102. package/dist/apis/simulations/mockMqttClient.d.ts +15 -0
  103. package/dist/apis/simulations/mockMqttClient.js +59 -0
  104. package/dist/apis/simulations/mockMqttClient.js.map +1 -0
  105. package/dist/apis/simulations/mockMqttClient.spec.d.ts +1 -0
  106. package/dist/apis/simulations/simulator.d.ts +13 -0
  107. package/dist/apis/simulations/simulator.js +26 -0
  108. package/dist/apis/simulations/simulator.js.map +1 -0
  109. package/dist/characteristics/customCharacteristic.d.ts +18 -0
  110. package/dist/characteristics/customCharacteristic.js +94 -0
  111. package/dist/characteristics/customCharacteristic.js.map +1 -0
  112. package/dist/characteristics/customCharacteristic.spec.d.ts +1 -0
  113. package/dist/config.d.ts +33 -4
  114. package/dist/config.js +18 -4
  115. package/dist/config.js.map +1 -1
  116. package/dist/helpers/logger.js +5 -1
  117. package/dist/helpers/logger.js.map +1 -1
  118. package/dist/helpers/logger.spec.d.ts +1 -0
  119. package/dist/helpers/machineIdProvider.d.ts +4 -0
  120. package/dist/helpers/machineIdProvider.js +19 -0
  121. package/dist/helpers/machineIdProvider.js.map +1 -0
  122. package/dist/helpers/machineIdProvider.spec.d.ts +1 -0
  123. package/dist/helpers/tests/accessoryTestHelper.d.ts +5 -0
  124. package/dist/helpers/tests/serviceTestHelper.d.ts +6 -0
  125. package/dist/helpers/tests/sleep.d.ts +1 -0
  126. package/dist/homebridge-ui/public/index.d.ts +2 -0
  127. package/dist/homebridge-ui/public/index.html +6 -0
  128. package/dist/homebridge-ui/public/index.js +1 -0
  129. package/dist/homebridge-ui/public/index.spec.d.ts +1 -0
  130. package/dist/homebridge-ui/public/interfaces/contracts.d.ts +13 -0
  131. package/dist/homebridge-ui/public/interfaces/homebridge.d.ts +52 -0
  132. package/dist/homebridge-ui/public/renderers/componentRenderer.d.ts +6 -0
  133. package/dist/homebridge-ui/public/renderers/componentRenderer.spec.d.ts +1 -0
  134. package/dist/homebridge-ui/public/renderers/pluginConfigDevicesRenderer.d.ts +20 -0
  135. package/dist/homebridge-ui/public/renderers/pluginConfigDevicesRenderer.spec.d.ts +1 -0
  136. package/dist/homebridge-ui/public/renderers/pluginConfigNameRenderer.d.ts +5 -0
  137. package/dist/homebridge-ui/public/renderers/pluginConfigNameRenderer.spec.d.ts +1 -0
  138. package/dist/homebridge-ui/public/renderers/pluginConfigRenderer.d.ts +6 -0
  139. package/dist/homebridge-ui/public/renderers/pluginConfigRenderer.spec.d.ts +1 -0
  140. package/dist/homebridge-ui/public/renderers/pluginConfigRendererBase.d.ts +9 -0
  141. package/dist/index.js +7 -4
  142. package/dist/index.js.map +1 -1
  143. package/dist/index.spec.d.ts +1 -0
  144. package/dist/platform.d.ts +12 -8
  145. package/dist/platform.js +91 -30
  146. package/dist/platform.js.map +1 -1
  147. package/dist/platform.spec.d.ts +1 -0
  148. package/dist/services/accessoryInformationService.d.ts +5 -3
  149. package/dist/services/accessoryInformationService.js +15 -12
  150. package/dist/services/accessoryInformationService.js.map +1 -1
  151. package/dist/services/accessoryInformationService.spec.d.ts +1 -0
  152. package/dist/services/batteryStatusService.d.ts +6 -4
  153. package/dist/services/batteryStatusService.js +19 -17
  154. package/dist/services/batteryStatusService.js.map +1 -1
  155. package/dist/services/batteryStatusService.spec.d.ts +1 -0
  156. package/dist/services/fanServiceBase.d.ts +16 -0
  157. package/dist/services/fanServiceBase.js +42 -0
  158. package/dist/services/fanServiceBase.js.map +1 -0
  159. package/dist/services/fanServiceBase.spec.d.ts +1 -0
  160. package/dist/services/lightBulbServiceBase.d.ts +16 -0
  161. package/dist/services/lightBulbServiceBase.js +42 -0
  162. package/dist/services/lightBulbServiceBase.js.map +1 -0
  163. package/dist/services/lightBulbServiceBase.spec.d.ts +1 -0
  164. package/dist/services/outletServiceBase.d.ts +7 -15
  165. package/dist/services/outletServiceBase.js +20 -28
  166. package/dist/services/outletServiceBase.js.map +1 -1
  167. package/dist/services/outletServiceBase.spec.d.ts +1 -0
  168. package/dist/services/serviceBase.d.ts +10 -5
  169. package/dist/services/serviceBase.js +31 -8
  170. package/dist/services/serviceBase.js.map +1 -1
  171. package/dist/settings.js +5 -2
  172. package/dist/settings.js.map +1 -1
  173. package/docs/images/plugin_icon.png +0 -0
  174. package/jest.config.ts +46 -0
  175. package/junit.xml +843 -0
  176. package/package.json +42 -12
  177. package/tsconfig.build.json +5 -0
  178. package/tsconfig.spec.json +8 -0
  179. package/dist/accessories/batteries/batteryAccessory.d.ts +0 -59
  180. package/dist/accessories/batteries/batteryAccessory.js +0 -120
  181. package/dist/accessories/batteries/batteryAccessory.js.map +0 -1
  182. package/dist/accessories/ecoFlowAccessory.d.ts +0 -42
  183. package/dist/accessories/ecoFlowAccessory.js +0 -116
  184. package/dist/accessories/ecoFlowAccessory.js.map +0 -1
  185. package/dist/apis/ecoFlowHttpApi.d.ts +0 -46
  186. package/dist/apis/ecoFlowHttpApi.js.map +0 -1
  187. package/dist/apis/ecoFlowMqttApi.d.ts +0 -53
  188. package/dist/apis/ecoFlowMqttApi.js +0 -100
  189. package/dist/apis/ecoFlowMqttApi.js.map +0 -1
  190. package/dist/characteristics/CustomCharacteristic.d.ts +0 -16
  191. package/dist/characteristics/CustomCharacteristic.js +0 -78
  192. package/dist/characteristics/CustomCharacteristic.js.map +0 -1
  193. package/dist/helpers/machineId.d.ts +0 -2
  194. package/dist/helpers/machineId.js +0 -15
  195. package/dist/helpers/machineId.js.map +0 -1
  196. package/dist/helpers/machineIdHelper.cjs +0 -5
  197. package/dist/services/outletAcService.d.ts +0 -8
  198. package/dist/services/outletAcService.js +0 -17
  199. package/dist/services/outletAcService.js.map +0 -1
  200. package/dist/services/outletCarService.d.ts +0 -6
  201. package/dist/services/outletCarService.js +0 -12
  202. package/dist/services/outletCarService.js.map +0 -1
  203. package/dist/services/outletUsbService.d.ts +0 -6
  204. package/dist/services/outletUsbService.js +0 -10
  205. package/dist/services/outletUsbService.js.map +0 -1
package/package.json CHANGED
@@ -1,11 +1,14 @@
1
1
  {
2
- "displayName": "Homebridge Ecoflow",
2
+ "displayName": "Homebridge EcoFlow",
3
3
  "name": "@pietrolubini/homebridge-ecoflow",
4
- "version": "1.2.0",
4
+ "version": "1.3.0",
5
5
  "description": "Homebridge plugin for EcoFlow devices",
6
6
  "license": "MIT",
7
7
  "author": "PietroLubini",
8
- "type": "module",
8
+ "funding": {
9
+ "type": "donation",
10
+ "url": "https://commerce.coinbase.com/checkout/d56df2da-7609-41a3-af91-289cb6ec4d9b"
11
+ },
9
12
  "repository": {
10
13
  "type": "git",
11
14
  "url": "git+https://github.com/PietroLubini/homebridge-ecoflow.git"
@@ -16,23 +19,39 @@
16
19
  "homepage": "https://github.com/PietroLubini/homebridge-ecoflow#readme",
17
20
  "engines": {
18
21
  "node": "^18.16.0 || ^20.9.0",
19
- "homebridge": "^1.7.0"
22
+ "homebridge": "^1.7.0 || ^2.0.0-beta.11"
20
23
  },
21
24
  "main": "dist/index.js",
22
25
  "scripts": {
23
- "lint": "eslint src/**/*.ts --max-warnings=0",
24
- "watch": "npm run build && npm link && nodemon",
25
- "build": "rimraf ./dist && tsc && npm run copy:cjs",
26
- "copy:cjs": "copyfiles -u 1 src/**/*.cjs dist",
27
- "prepublishOnly": "npm run lint && npm run build"
26
+ "lint": "eslint \"src/**/*.ts\" --max-warnings=0",
27
+ "lint:fix": "eslint \"src/**/*.ts\" --max-warnings=0 --fix",
28
+ "watch": "npm link && nodemon",
29
+ "clean": "rimraf ./dist",
30
+ "build": "npm run clean && npm run build:all",
31
+ "build:all": "npm run build:be && npm run build:fe",
32
+ "build:be": "tsc -p tsconfig.build.json",
33
+ "build:fe": "npx webpack --config src/homebridge-ui/webpack.config.ts --mode production",
34
+ "test": "jest --forceExit",
35
+ "test:cov": "jest --coverage",
36
+ "test:ci": "jest --coverage --ci --json --coverage --testLocationInResults --outputFile=coverage/new_report.json --reporters=default --reporters=jest-junit --forceExit",
37
+ "prepublishOnly": "npm run lint && npm run build && npm run test:ci"
28
38
  },
29
39
  "keywords": [
30
40
  "homebridge-plugin",
31
41
  "homebridge-ecoflow",
32
42
  "ecoflow",
33
- "delta 2 max"
43
+ "delta 2 max",
44
+ "delta2 max",
45
+ "delta2max",
46
+ "delta 2",
47
+ "delta2",
48
+ "powerstream"
34
49
  ],
50
+ "_moduleAliases": {
51
+ "@ecoflow": "dist"
52
+ },
35
53
  "dependencies": {
54
+ "module-alias": "^2.2.3",
36
55
  "mqtt": "^5.8.0",
37
56
  "node-cache": "^5.1.2",
38
57
  "node-machine-id": "^1.1.12",
@@ -40,18 +59,29 @@
40
59
  "uuid": "^10.0.0"
41
60
  },
42
61
  "devDependencies": {
62
+ "@types/jest": "^29.5.12",
63
+ "@types/jquery": "^3.5.30",
43
64
  "@types/node": "^20.12.13",
44
65
  "@types/uuid": "^10.0.0",
45
66
  "@typescript-eslint/eslint-plugin": "^7.11.0",
46
67
  "@typescript-eslint/parser": "^7.11.0",
47
- "copyfiles": "^2.4.1",
48
68
  "eslint": "^8.57.0",
49
69
  "homebridge": "^1.7.0",
70
+ "html-webpack-plugin": "^5.6.0",
71
+ "jest": "^29.7.0",
72
+ "jest-environment-jsdom": "^29.7.0",
73
+ "jest-junit": "^16.0.0",
74
+ "jquery": "^3.7.1",
75
+ "jsdom": "^25.0.0",
50
76
  "nodemon": "^3.1.2",
51
77
  "prettier": "^3.3.3",
52
78
  "prettier-plugin-organize-imports": "^4.0.0",
53
79
  "rimraf": "^5.0.7",
80
+ "ts-jest": "^29.2.4",
81
+ "ts-loader": "^9.5.1",
54
82
  "ts-node": "^10.9.2",
55
- "typescript": "^5.4.5"
83
+ "typescript": "^5.4.5",
84
+ "webpack": "^5.94.0",
85
+ "webpack-cli": "^5.1.4"
56
86
  }
57
87
  }
@@ -0,0 +1,5 @@
1
+ {
2
+ "extends": "./tsconfig.json",
3
+ "include": ["./src"],
4
+ "exclude": ["node_modules", "dist", "**/*.spec.ts", "jest.config.ts", "**/tests/*.*", "src/homebridge-ui"]
5
+ }
@@ -0,0 +1,8 @@
1
+ {
2
+ "extends": "./tsconfig.json",
3
+ "compilerOptions": {
4
+ "types": ["jest"],
5
+ "emitDecoratorMetadata": true
6
+ },
7
+ "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
8
+ }
@@ -1,59 +0,0 @@
1
- import { Logging, PlatformAccessory } from 'homebridge';
2
- import { MqttQuotaMessage } from '../../apis/ecoFlowMqttApi.js';
3
- import { DeviceConfig } from '../../config.js';
4
- import { EcoFlowHomebridgePlatform } from '../../platform.js';
5
- import { ServiceBase } from '../../services/serviceBase.js';
6
- import { EcoFlowAccessoryWithQuota } from '../ecoFlowAccessory.js';
7
- export declare abstract class BatteryAccessory extends EcoFlowAccessoryWithQuota<BatteryAllQuotaData> {
8
- private readonly batteryService;
9
- private readonly outletUsbService;
10
- private readonly outletAcService;
11
- private readonly outletCarService;
12
- constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging);
13
- protected getServices(): ServiceBase[];
14
- protected processQuotaMessage(message: MqttQuotaMessage): void;
15
- protected updateInitialValues(initialData: BatteryAllQuotaData): void;
16
- private updateBmsInitialValues;
17
- private updateInvInitialValues;
18
- private updatePdInitialValues;
19
- private updateBmsValues;
20
- private updateInvValues;
21
- private updatePdValues;
22
- private getUsbWatts;
23
- }
24
- interface BmsStatus {
25
- f32ShowSoc: number;
26
- }
27
- interface InvStatusAc {
28
- outputWatts?: number;
29
- cfgAcEnabled?: boolean;
30
- cfgAcXboost?: boolean;
31
- cfgAcOutFreq?: number;
32
- cfgAcOutVol?: number;
33
- }
34
- interface InvStatus extends InvStatusAc {
35
- inputWatts: number;
36
- }
37
- interface PdStatusCar {
38
- carState?: boolean;
39
- carWatts?: number;
40
- }
41
- interface PdStatusUsb {
42
- dcOutState?: boolean;
43
- usb1Watts?: number;
44
- usb2Watts?: number;
45
- qcUsb1Watts?: number;
46
- qcUsb2Watts?: number;
47
- typec1Watts?: number;
48
- typec2Watts?: number;
49
- }
50
- interface PdStatus extends PdStatusUsb, PdStatusCar {
51
- carState?: boolean;
52
- carWatts?: number;
53
- }
54
- export interface BatteryAllQuotaData {
55
- bms_bmsStatus: BmsStatus;
56
- inv: InvStatus;
57
- pd: PdStatus;
58
- }
59
- export {};
@@ -1,120 +0,0 @@
1
- import { MqttMessageType } from '../../apis/ecoFlowMqttApi.js';
2
- import { BatteryStatusService } from '../../services/batteryStatusService.js';
3
- import { OutletAcService } from '../../services/outletAcService.js';
4
- import { OutletCarService } from '../../services/outletCarService.js';
5
- import { OutletUsbService } from '../../services/outletUsbService.js';
6
- import { EcoFlowAccessoryWithQuota } from '../ecoFlowAccessory.js';
7
- export class BatteryAccessory extends EcoFlowAccessoryWithQuota {
8
- batteryService;
9
- outletUsbService;
10
- outletAcService;
11
- outletCarService;
12
- constructor(platform, accessory, config, log) {
13
- super(platform, accessory, config, log);
14
- this.batteryService = new BatteryStatusService(this);
15
- this.outletUsbService = new OutletUsbService(this);
16
- this.outletAcService = new OutletAcService(this);
17
- this.outletCarService = new OutletCarService(this);
18
- }
19
- getServices() {
20
- return [this.batteryService, this.outletUsbService, this.outletAcService, this.outletCarService];
21
- }
22
- processQuotaMessage(message) {
23
- if (message.typeCode === MqttMessageType.BMS) {
24
- const bmsStatus = message.params;
25
- this.log.debug('BMS:', bmsStatus);
26
- Object.assign(this.quota.bms_bmsStatus, bmsStatus);
27
- this.updateBmsValues(bmsStatus);
28
- }
29
- else if (message.typeCode === MqttMessageType.INV) {
30
- const invStatus = message.params;
31
- this.log.debug('INV:', invStatus);
32
- Object.assign(this.quota.inv, invStatus);
33
- this.updateInvValues(invStatus);
34
- }
35
- else if (message.typeCode === MqttMessageType.PD) {
36
- const pdStatus = message.params;
37
- this.log.debug('PD:', pdStatus);
38
- Object.assign(this.quota.pd, pdStatus);
39
- this.updatePdValues(pdStatus);
40
- }
41
- }
42
- updateInitialValues(initialData) {
43
- this.updateBmsInitialValues(initialData.bms_bmsStatus);
44
- this.updateInvInitialValues(initialData.inv);
45
- this.updatePdInitialValues(initialData.pd);
46
- }
47
- updateBmsInitialValues(params) {
48
- const message = {
49
- typeCode: MqttMessageType.BMS,
50
- params,
51
- };
52
- this.processQuotaMessage(message);
53
- }
54
- updateInvInitialValues(params) {
55
- const message = {
56
- typeCode: MqttMessageType.INV,
57
- params,
58
- };
59
- this.processQuotaMessage(message);
60
- }
61
- updatePdInitialValues(params) {
62
- const message = {
63
- typeCode: MqttMessageType.PD,
64
- params,
65
- };
66
- this.processQuotaMessage(message);
67
- }
68
- updateBmsValues(params) {
69
- if (params.f32ShowSoc !== undefined) {
70
- this.batteryService.updateStatusLowBattery(params.f32ShowSoc);
71
- this.batteryService.updateBatteryLevel(params.f32ShowSoc);
72
- this.outletAcService.updateBatteryLevel(params.f32ShowSoc);
73
- this.outletUsbService.updateBatteryLevel(params.f32ShowSoc);
74
- this.outletCarService.updateBatteryLevel(params.f32ShowSoc);
75
- }
76
- }
77
- updateInvValues(params) {
78
- if (params.inputWatts !== undefined) {
79
- this.batteryService.updateChargingState(params.inputWatts);
80
- this.outletAcService.updateInputConsumption(params.inputWatts);
81
- this.outletUsbService.updateInputConsumption(params.inputWatts);
82
- this.outletCarService.updateInputConsumption(params.inputWatts);
83
- }
84
- if (params.cfgAcEnabled !== undefined) {
85
- this.outletAcService.updateState(params.cfgAcEnabled);
86
- }
87
- if (params.outputWatts !== undefined) {
88
- this.outletAcService.updateOutputConsumption(params.outputWatts);
89
- }
90
- }
91
- updatePdValues(params) {
92
- if (params.carState !== undefined) {
93
- this.outletCarService.updateState(params.carState);
94
- }
95
- if (params.carWatts !== undefined) {
96
- this.outletCarService.updateOutputConsumption(params.carWatts);
97
- }
98
- if (params.dcOutState !== undefined) {
99
- this.outletUsbService.updateState(params.dcOutState);
100
- }
101
- if (params.usb1Watts !== undefined ||
102
- params.usb2Watts !== undefined ||
103
- params.qcUsb1Watts !== undefined ||
104
- params.qcUsb2Watts !== undefined ||
105
- params.typec1Watts !== undefined ||
106
- params.typec2Watts !== undefined) {
107
- const usbWatts = this.getUsbWatts(params.usb1Watts, params.usb2Watts, params.qcUsb1Watts, params.qcUsb2Watts, params.typec1Watts, params.typec2Watts);
108
- this.outletUsbService.updateOutputConsumption(usbWatts);
109
- }
110
- }
111
- getUsbWatts(usb1Watts, usb2Watts, qcUsb1Watts, qcUsb2Watts, typec1Watts, typec2Watts) {
112
- return ((usb1Watts ?? 0) +
113
- (usb2Watts ?? 0) +
114
- (qcUsb1Watts ?? 0) +
115
- (qcUsb2Watts ?? 0) +
116
- (typec1Watts ?? 0) +
117
- (typec2Watts ?? 0));
118
- }
119
- }
120
- //# sourceMappingURL=batteryAccessory.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"batteryAccessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/batteryAccessory.ts"],"names":[],"mappings":"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"}
@@ -1,42 +0,0 @@
1
- import { Logging, PlatformAccessory } from 'homebridge';
2
- import { Subscription } from 'rxjs';
3
- import { EcoFlowHttpApi } from '../apis/ecoFlowHttpApi.js';
4
- import { EcoFlowMqttApi, MqttQuotaMessage, MqttSetMessage, MqttSetReplyMessage } from '../apis/ecoFlowMqttApi.js';
5
- import { DeviceConfig } from '../config.js';
6
- import { EcoFlowHomebridgePlatform } from '../platform.js';
7
- import { ServiceBase } from '../services/serviceBase.js';
8
- export declare abstract class EcoFlowAccessory {
9
- readonly platform: EcoFlowHomebridgePlatform;
10
- readonly accessory: PlatformAccessory;
11
- readonly config: DeviceConfig;
12
- readonly log: Logging;
13
- protected readonly mqttApi: EcoFlowMqttApi;
14
- protected readonly httpApi: EcoFlowHttpApi;
15
- private services;
16
- private reconnectMqttTimeoutId;
17
- private isMqttConnected;
18
- private subscriptions;
19
- readonly setReplies: Record<string, {
20
- requestMessage: MqttSetMessage;
21
- revert: () => void;
22
- }>;
23
- constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging);
24
- initialize(): Promise<void>;
25
- destroy(): void;
26
- sendSetCommand<TParams>(moduleType: number, operateType: string, params: TParams, revert: () => void): Promise<void>;
27
- protected abstract getServices(): ServiceBase[];
28
- protected subscribeOnParameterUpdates(): Subscription[];
29
- protected abstract processQuotaMessage(message: MqttQuotaMessage): void;
30
- protected processSetReplyMessage(message: MqttSetReplyMessage): void;
31
- private getMqttSetMessageKey;
32
- private initializeServices;
33
- private cleanupServices;
34
- private connectMqtt;
35
- private initMqtt;
36
- }
37
- export declare abstract class EcoFlowAccessoryWithQuota<TAllQuotaData> extends EcoFlowAccessory {
38
- private _quota;
39
- initialize(): Promise<void>;
40
- get quota(): TAllQuotaData;
41
- protected abstract updateInitialValues(quota: TAllQuotaData): void;
42
- }
@@ -1,116 +0,0 @@
1
- import { EcoFlowHttpApi } from '../apis/ecoFlowHttpApi.js';
2
- import { EcoFlowMqttApi, } from '../apis/ecoFlowMqttApi.js';
3
- import { AccessoryInformationService } from '../services/accessoryInformationService.js';
4
- export class EcoFlowAccessory {
5
- platform;
6
- accessory;
7
- config;
8
- log;
9
- mqttApi;
10
- httpApi;
11
- services = [];
12
- reconnectMqttTimeoutId = null;
13
- isMqttConnected = false;
14
- subscriptions = [];
15
- setReplies = {};
16
- constructor(platform, accessory, config, log) {
17
- this.platform = platform;
18
- this.accessory = accessory;
19
- this.config = config;
20
- this.log = log;
21
- this.httpApi = new EcoFlowHttpApi(this.config, this.log);
22
- this.mqttApi = new EcoFlowMqttApi(this.httpApi, this.log);
23
- }
24
- async initialize() {
25
- this.services = this.getServices();
26
- this.services.push(new AccessoryInformationService(this));
27
- this.initializeServices();
28
- this.subscriptions = this.subscribeOnParameterUpdates();
29
- await this.connectMqtt();
30
- }
31
- destroy() {
32
- if (this.reconnectMqttTimeoutId !== null) {
33
- clearTimeout(this.reconnectMqttTimeoutId);
34
- this.reconnectMqttTimeoutId = null;
35
- }
36
- this.subscriptions.forEach(subscription => subscription.unsubscribe());
37
- }
38
- async sendSetCommand(moduleType, operateType, params, revert) {
39
- const requestMessage = {
40
- id: Math.floor(Math.random() * 1000000),
41
- version: '1.0',
42
- moduleType,
43
- operateType,
44
- params,
45
- };
46
- this.setReplies[this.getMqttSetMessageKey(requestMessage)] = { requestMessage, revert };
47
- await this.mqttApi.sendSetCommand(this.config.serialNumber, requestMessage);
48
- }
49
- subscribeOnParameterUpdates() {
50
- return [
51
- this.mqttApi.quota$.subscribe(message => this.processQuotaMessage(message)),
52
- this.mqttApi.setReply$.subscribe(message => this.processSetReplyMessage(message)),
53
- ];
54
- }
55
- processSetReplyMessage(message) {
56
- const messageKey = this.getMqttSetMessageKey(message);
57
- const command = this.setReplies[messageKey];
58
- delete this.setReplies[messageKey];
59
- if (message.data.ack) {
60
- this.log.warn('Failed to set a value. Reverts value back for:', command.requestMessage.operateType);
61
- command.revert();
62
- }
63
- else {
64
- this.log.debug('Setting of a value was successful for:', command.requestMessage.operateType);
65
- }
66
- }
67
- getMqttSetMessageKey(message) {
68
- return `${message.operateType}_${message.id}`;
69
- }
70
- initializeServices() {
71
- this.services.forEach(service => {
72
- service.initialize();
73
- });
74
- this.cleanupServices();
75
- }
76
- cleanupServices() {
77
- const services = this.services.map(service => service.service);
78
- this.accessory.services
79
- .filter(service => !services.includes(service))
80
- .forEach(service => {
81
- this.log.info('Removing obsolete service from accessory:', service.displayName);
82
- this.accessory.removeService(service);
83
- });
84
- this.services
85
- .filter(service => this.accessory.services.includes(service.service))
86
- .forEach(service => service.cleanupCharacteristics());
87
- }
88
- async connectMqtt() {
89
- await this.initMqtt();
90
- this.reconnectMqttTimeoutId = setInterval(async () => {
91
- // Check MQTT is connected every minute
92
- if (!this.isMqttConnected) {
93
- await this.initMqtt();
94
- }
95
- }, 60 * 1000);
96
- }
97
- async initMqtt() {
98
- this.isMqttConnected =
99
- (await this.mqttApi.subscribeOnQuota(this.config.serialNumber)) &&
100
- (await this.mqttApi.subscribeOnSetReply(this.config.serialNumber));
101
- }
102
- }
103
- export class EcoFlowAccessoryWithQuota extends EcoFlowAccessory {
104
- _quota = null;
105
- async initialize() {
106
- if (!this._quota) {
107
- this._quota = await this.httpApi.getAllQuotas();
108
- }
109
- await super.initialize();
110
- this.updateInitialValues(this._quota);
111
- }
112
- get quota() {
113
- return this._quota;
114
- }
115
- }
116
- //# sourceMappingURL=ecoFlowAccessory.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ecoFlowAccessory.js","sourceRoot":"","sources":["../../src/accessories/ecoFlowAccessory.ts"],"names":[],"mappings":"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"}
@@ -1,46 +0,0 @@
1
- import { Logging } from 'homebridge';
2
- import { DeviceConfig } from '../config.js';
3
- export declare enum HttpMethod {
4
- Get = "GET",
5
- Post = "POST"
6
- }
7
- export interface CmdResponse {
8
- code: string;
9
- message: string;
10
- failed: boolean;
11
- }
12
- export interface CmdResponseWithData<TData> extends CmdResponse {
13
- code: string;
14
- message: string;
15
- data: TData;
16
- }
17
- export interface GetCmdRequest {
18
- sn: string;
19
- }
20
- export interface GetQuotasCmdRequest extends GetCmdRequest {
21
- params: GetQuotasCmdRequestParams;
22
- }
23
- export interface GetQuotasCmdRequestParams {
24
- quotas: string[];
25
- }
26
- export interface AcquireCertificateData {
27
- certificateAccount: string;
28
- certificatePassword: string;
29
- url: string;
30
- port: string;
31
- protocol: string;
32
- }
33
- export declare class EcoFlowHttpApi {
34
- private readonly config;
35
- private readonly log;
36
- constructor(config: DeviceConfig, log: Logging);
37
- getQuotas<TData>(quotas: string[]): Promise<TData>;
38
- getAllQuotas<TData>(): Promise<TData>;
39
- acquireCertificate(): Promise<AcquireCertificateData | null>;
40
- protected execute<TResponse extends CmdResponse>(relativeUrl: string, method: HttpMethod, queryParameters?: object | null, body?: object | null): Promise<TResponse>;
41
- private getNonce;
42
- private composeSignMessage;
43
- private createHmacSha256;
44
- private stringifyOptions;
45
- private convertData;
46
- }
@@ -1 +0,0 @@
1
- {"version":3,"file":"ecoFlowHttpApi.js","sourceRoot":"","sources":["../../src/apis/ecoFlowHttpApi.ts"],"names":[],"mappings":"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"}
@@ -1,53 +0,0 @@
1
- import { Logging } from 'homebridge';
2
- import { EcoFlowHttpApi } from './ecoFlowHttpApi.js';
3
- export declare enum MqttMessageType {
4
- PD = "pdStatus",
5
- MPPT = "mpptStatus",
6
- INV = "invStatus",
7
- BMS = "bmsStatus",
8
- EMS = "emsStatus"
9
- }
10
- export interface MqttQuotaMessage {
11
- typeCode: MqttMessageType;
12
- }
13
- export interface MqttQuotaMessageWithParams<TParams> extends MqttQuotaMessage {
14
- typeCode: MqttMessageType;
15
- params: TParams;
16
- }
17
- export interface MqttSetMessage {
18
- id: number;
19
- version: string;
20
- operateType: string;
21
- }
22
- export interface MqttSetMessageWithParams<TParams> extends MqttSetMessage {
23
- moduleType: number;
24
- params: TParams;
25
- }
26
- export interface MqttSetReplyMessage extends MqttSetMessage {
27
- data: {
28
- ack: boolean;
29
- };
30
- }
31
- export declare enum MqttTopicType {
32
- Quota = "quota",
33
- SetReply = "set_reply"
34
- }
35
- export declare class EcoFlowMqttApi {
36
- private httpApi;
37
- private log;
38
- private client;
39
- private certificateData;
40
- private readonly quotaSubject;
41
- private readonly setReplySubject;
42
- readonly quota$: import("rxjs").Observable<MqttQuotaMessage>;
43
- readonly setReply$: import("rxjs").Observable<MqttSetReplyMessage>;
44
- constructor(httpApi: EcoFlowHttpApi, log: Logging);
45
- destroy(): Promise<void>;
46
- subscribeOnQuota(serialNumber: string): Promise<boolean>;
47
- subscribeOnSetReply(serialNumber: string): Promise<boolean>;
48
- sendSetCommand(serialNumber: string, message: MqttSetMessage): Promise<void>;
49
- private connect;
50
- private subscribe;
51
- private processReceivedMessage;
52
- private acquireCertificate;
53
- }