homebridge-easy-mqtt 1.4.0-beta.16 → 1.4.0-beta.3

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 (79) hide show
  1. package/CHANGELOG.md +7 -10
  2. package/README.md +25 -246
  3. package/config.schema.json +400 -1991
  4. package/dist/accessory/abstract/base.js +2 -2
  5. package/dist/accessory/abstract/base.js.map +1 -1
  6. package/dist/accessory/abstract/helper.d.ts +0 -1
  7. package/dist/accessory/abstract/helper.js +0 -19
  8. package/dist/accessory/abstract/helper.js.map +1 -1
  9. package/dist/accessory/abstract/mqtt.d.ts +26 -15
  10. package/dist/accessory/abstract/mqtt.js +148 -29
  11. package/dist/accessory/abstract/mqtt.js.map +1 -1
  12. package/dist/accessory/climate/{temperatureControl.d.ts → climate.d.ts} +2 -3
  13. package/dist/accessory/climate/{temperatureControl.js → climate.js} +5 -7
  14. package/dist/accessory/climate/climate.js.map +1 -0
  15. package/dist/accessory/climate/heaterCooler.d.ts +6 -2
  16. package/dist/accessory/climate/heaterCooler.js +37 -5
  17. package/dist/accessory/climate/heaterCooler.js.map +1 -1
  18. package/dist/accessory/climate/thermostat.d.ts +2 -2
  19. package/dist/accessory/climate/thermostat.js +2 -3
  20. package/dist/accessory/climate/thermostat.js.map +1 -1
  21. package/dist/accessory/lock.d.ts +2 -2
  22. package/dist/accessory/lock.js +3 -3
  23. package/dist/accessory/lock.js.map +1 -1
  24. package/dist/accessory/sensor/sensor.js +2 -2
  25. package/dist/accessory/sensor/sensor.js.map +1 -1
  26. package/dist/homebridge/platform.js +3 -5
  27. package/dist/homebridge/platform.js.map +1 -1
  28. package/dist/homebridge-ui/public/index.html +1 -1
  29. package/dist/homebridge-ui/public/ui.js +1 -1
  30. package/dist/i18n/en.d.ts +0 -155
  31. package/dist/i18n/en.js +1 -156
  32. package/dist/i18n/en.js.map +1 -1
  33. package/dist/i18n/fr.d.ts +0 -155
  34. package/dist/i18n/i18n.d.ts +1 -157
  35. package/dist/i18n/i18n.js +0 -6
  36. package/dist/i18n/i18n.js.map +1 -1
  37. package/dist/i18n/template.d.ts +0 -155
  38. package/dist/model/enums.d.ts +2 -39
  39. package/dist/model/enums.js +0 -39
  40. package/dist/model/enums.js.map +1 -1
  41. package/dist/model/mqtt.d.ts +4 -5
  42. package/dist/model/mqtt.js +25 -41
  43. package/dist/model/mqtt.js.map +1 -1
  44. package/dist/model/types.d.ts +24 -115
  45. package/package.json +1 -1
  46. package/dist/accessory/abstract/common.d.ts +0 -42
  47. package/dist/accessory/abstract/common.js +0 -158
  48. package/dist/accessory/abstract/common.js.map +0 -1
  49. package/dist/accessory/addons/addon.d.ts +0 -24
  50. package/dist/accessory/addons/addon.js +0 -52
  51. package/dist/accessory/addons/addon.js.map +0 -1
  52. package/dist/accessory/addons/filter.d.ts +0 -11
  53. package/dist/accessory/addons/filter.js +0 -37
  54. package/dist/accessory/addons/filter.js.map +0 -1
  55. package/dist/accessory/climate/active.d.ts +0 -11
  56. package/dist/accessory/climate/active.js +0 -44
  57. package/dist/accessory/climate/active.js.map +0 -1
  58. package/dist/accessory/climate/fan2.d.ts +0 -20
  59. package/dist/accessory/climate/fan2.js +0 -122
  60. package/dist/accessory/climate/fan2.js.map +0 -1
  61. package/dist/accessory/climate/purifier.d.ts +0 -19
  62. package/dist/accessory/climate/purifier.js +0 -114
  63. package/dist/accessory/climate/purifier.js.map +0 -1
  64. package/dist/accessory/climate/temperatureControl.js.map +0 -1
  65. package/dist/accessory/garage.d.ts +0 -17
  66. package/dist/accessory/garage.js +0 -110
  67. package/dist/accessory/garage.js.map +0 -1
  68. package/dist/accessory/sensor/air.d.ts +0 -14
  69. package/dist/accessory/sensor/air.js +0 -94
  70. package/dist/accessory/sensor/air.js.map +0 -1
  71. package/dist/accessory/valve.d.ts +0 -14
  72. package/dist/accessory/valve.js +0 -71
  73. package/dist/accessory/valve.js.map +0 -1
  74. package/dist/i18n/ro.d.ts +0 -846
  75. package/dist/i18n/ro.js +0 -381
  76. package/dist/i18n/ro.js.map +0 -1
  77. package/dist/tools/properties.d.ts +0 -11
  78. package/dist/tools/properties.js +0 -73
  79. package/dist/tools/properties.js.map +0 -1
@@ -1,11 +1,7 @@
1
1
  export declare enum AccessoryType {
2
- AirPurifier = "AirPurifier",
3
- AirQualitySensor = "AirQualitySensor",
4
2
  CarbonDioxideSensor = "CarbonDioxideSensor",
5
3
  CarbonMonoxideSensor = "CarbonMonoxideSensor",
6
4
  ContactSensor = "ContactSensor",
7
- Fanv2 = "Fanv2",
8
- GarageDoorOpener = "GarageDoorOpener",
9
5
  HeaterCooler = "HeaterCooler",
10
6
  HumiditySensor = "HumiditySensor",
11
7
  LeakSensor = "LeakSensor",
@@ -19,15 +15,10 @@ export declare enum AccessoryType {
19
15
  SmokeSensor = "SmokeSensor",
20
16
  Switch = "Switch",
21
17
  TemperatureSensor = "TemperatureSensor",
22
- Thermostat = "Thermostat",
23
- Valve = "Valve"
24
- }
25
- export declare enum AddonType {
26
- FilterMaintenance = "FilterMaintenance"
18
+ Thermostat = "Thermostat"
27
19
  }
28
20
  export declare enum CharacteristicKey {
29
21
  Active = "Active",
30
- AirQuality = "AirQuality",
31
22
  BatteryLevel = "BatteryLevel",
32
23
  Brightness = "Brightness",
33
24
  CarbonDioxideDetected = "CarbonDioxideDetected",
@@ -40,65 +31,37 @@ export declare enum CharacteristicKey {
40
31
  ContactSensorState = "ContactSensorState",
41
32
  CoolingThresholdTemperature = "CoolingThresholdTemperature",
42
33
  CurrentAmbientLightLevel = "CurrentAmbientLightLevel",
43
- CurrentAirPurifierState = "CurrentAirPurifierState",
44
- CurrentDoorState = "CurrentDoorState",
45
- CurrentFanState = "CurrentFanState",
46
34
  CurrentHeaterCoolerState = "CurrentHeaterCoolerState",
47
35
  CurrentHeatingCoolingState = "CurrentHeatingCoolingState",
48
36
  CurrentRelativeHumidity = "CurrentRelativeHumidity",
49
37
  CurrentTemperature = "CurrentTemperature",
50
- FilterChangeIndication = "FilterChangeIndication",
51
- FilterLifeLevel = "FilterLifeLevel",
52
38
  HeatingThresholdTemperature = "HeatingThresholdTemperature",
53
39
  Hue = "Hue",
54
- InUse = "InUse",
55
- IsConfigured = "IsConfigured",
56
40
  LeakDetected = "LeakDetected",
57
41
  LockCurrentState = "LockCurrentState",
58
42
  LockPhysicalControls = "LockPhysicalControls",
59
43
  LockTargetState = "LockTargetState",
60
44
  MotionDetected = "MotionDetected",
61
- NitrogenDioxideDensity = "NitrogenDioxideDensity",
62
- ObstructionDetected = "ObstructionDetected",
63
45
  OccupancyDetected = "OccupancyDetected",
64
46
  On = "On",
65
47
  OutletInUse = "OutletInUse",
66
- OzoneDensity = "OzoneDensity",
67
- PM10Density = "PM10Density",
68
- PM2_5Density = "PM2_5Density",
69
- RemainingDuration = "RemainingDuration",
70
- ResetFilterIndication = "ResetFilterIndication",
71
- RotationDirection = "RotationDirection",
72
48
  RotationSpeed = "RotationSpeed",
73
49
  Saturation = "Saturation",
74
50
  SecuritySystemCurrentState = "SecuritySystemCurrentState",
75
51
  SecuritySystemTargetState = "SecuritySystemTargetState",
76
- SetDuration = "SetDuration",
77
52
  SmokeDetected = "SmokeDetected",
78
53
  StatusActive = "StatusActive",
79
54
  StatusFault = "StatusFault",
80
55
  StatusLowBattery = "StatusLowBattery",
81
56
  StatusTampered = "StatusTampered",
82
- SulphurDioxideDensity = "SulphurDioxideDensity",
83
57
  SwingMode = "SwingMode",
84
- TargetAirPurifierState = "TargetAirPurifierState",
85
- TargetDoorState = "TargetDoorState",
86
- TargetFanState = "TargetFanState",
87
58
  TargetHeaterCoolerState = "TargetHeaterCoolerState",
88
59
  TargetHeatingCoolingState = "TargetHeatingCoolingState",
89
60
  TargetRelativeHumidity = "TargetRelativeHumidity",
90
61
  TargetTemperature = "TargetTemperature",
91
- TemperatureDisplayUnits = "TemperatureDisplayUnits",
92
- ValveType = "ValveType",
93
- VOCDensity = "VOCDensity"
62
+ TemperatureDisplayUnits = "TemperatureDisplayUnits"
94
63
  }
95
64
  export declare enum TemperatureUnits {
96
65
  CELSIUS = "C",
97
66
  FAHRENHEIT = "F"
98
67
  }
99
- export declare enum ValveType {
100
- GENERIC_VALVE = "GENERIC_VALVE",
101
- IRRIGATION = "IRRIGATION",
102
- SHOWER_HEAD = "SHOWER_HEAD",
103
- WATER_FAUCET = "WATER_FAUCET"
104
- }
@@ -1,12 +1,8 @@
1
1
  export var AccessoryType;
2
2
  (function (AccessoryType) {
3
- AccessoryType["AirPurifier"] = "AirPurifier";
4
- AccessoryType["AirQualitySensor"] = "AirQualitySensor";
5
3
  AccessoryType["CarbonDioxideSensor"] = "CarbonDioxideSensor";
6
4
  AccessoryType["CarbonMonoxideSensor"] = "CarbonMonoxideSensor";
7
5
  AccessoryType["ContactSensor"] = "ContactSensor";
8
- AccessoryType["Fanv2"] = "Fanv2";
9
- AccessoryType["GarageDoorOpener"] = "GarageDoorOpener";
10
6
  AccessoryType["HeaterCooler"] = "HeaterCooler";
11
7
  AccessoryType["HumiditySensor"] = "HumiditySensor";
12
8
  AccessoryType["LeakSensor"] = "LeakSensor";
@@ -21,16 +17,10 @@ export var AccessoryType;
21
17
  AccessoryType["Switch"] = "Switch";
22
18
  AccessoryType["TemperatureSensor"] = "TemperatureSensor";
23
19
  AccessoryType["Thermostat"] = "Thermostat";
24
- AccessoryType["Valve"] = "Valve";
25
20
  })(AccessoryType || (AccessoryType = {}));
26
- export var AddonType;
27
- (function (AddonType) {
28
- AddonType["FilterMaintenance"] = "FilterMaintenance";
29
- })(AddonType || (AddonType = {}));
30
21
  export var CharacteristicKey;
31
22
  (function (CharacteristicKey) {
32
23
  CharacteristicKey["Active"] = "Active";
33
- CharacteristicKey["AirQuality"] = "AirQuality";
34
24
  CharacteristicKey["BatteryLevel"] = "BatteryLevel";
35
25
  CharacteristicKey["Brightness"] = "Brightness";
36
26
  CharacteristicKey["CarbonDioxideDetected"] = "CarbonDioxideDetected";
@@ -43,68 +33,39 @@ export var CharacteristicKey;
43
33
  CharacteristicKey["ContactSensorState"] = "ContactSensorState";
44
34
  CharacteristicKey["CoolingThresholdTemperature"] = "CoolingThresholdTemperature";
45
35
  CharacteristicKey["CurrentAmbientLightLevel"] = "CurrentAmbientLightLevel";
46
- CharacteristicKey["CurrentAirPurifierState"] = "CurrentAirPurifierState";
47
- CharacteristicKey["CurrentDoorState"] = "CurrentDoorState";
48
- CharacteristicKey["CurrentFanState"] = "CurrentFanState";
49
36
  CharacteristicKey["CurrentHeaterCoolerState"] = "CurrentHeaterCoolerState";
50
37
  CharacteristicKey["CurrentHeatingCoolingState"] = "CurrentHeatingCoolingState";
51
38
  CharacteristicKey["CurrentRelativeHumidity"] = "CurrentRelativeHumidity";
52
39
  CharacteristicKey["CurrentTemperature"] = "CurrentTemperature";
53
- CharacteristicKey["FilterChangeIndication"] = "FilterChangeIndication";
54
- CharacteristicKey["FilterLifeLevel"] = "FilterLifeLevel";
55
40
  CharacteristicKey["HeatingThresholdTemperature"] = "HeatingThresholdTemperature";
56
41
  CharacteristicKey["Hue"] = "Hue";
57
- CharacteristicKey["InUse"] = "InUse";
58
- CharacteristicKey["IsConfigured"] = "IsConfigured";
59
42
  CharacteristicKey["LeakDetected"] = "LeakDetected";
60
43
  CharacteristicKey["LockCurrentState"] = "LockCurrentState";
61
44
  CharacteristicKey["LockPhysicalControls"] = "LockPhysicalControls";
62
45
  CharacteristicKey["LockTargetState"] = "LockTargetState";
63
46
  CharacteristicKey["MotionDetected"] = "MotionDetected";
64
- CharacteristicKey["NitrogenDioxideDensity"] = "NitrogenDioxideDensity";
65
- CharacteristicKey["ObstructionDetected"] = "ObstructionDetected";
66
47
  CharacteristicKey["OccupancyDetected"] = "OccupancyDetected";
67
48
  CharacteristicKey["On"] = "On";
68
49
  CharacteristicKey["OutletInUse"] = "OutletInUse";
69
- CharacteristicKey["OzoneDensity"] = "OzoneDensity";
70
- CharacteristicKey["PM10Density"] = "PM10Density";
71
- CharacteristicKey["PM2_5Density"] = "PM2_5Density";
72
- CharacteristicKey["RemainingDuration"] = "RemainingDuration";
73
- CharacteristicKey["ResetFilterIndication"] = "ResetFilterIndication";
74
- CharacteristicKey["RotationDirection"] = "RotationDirection";
75
50
  CharacteristicKey["RotationSpeed"] = "RotationSpeed";
76
51
  CharacteristicKey["Saturation"] = "Saturation";
77
52
  CharacteristicKey["SecuritySystemCurrentState"] = "SecuritySystemCurrentState";
78
53
  CharacteristicKey["SecuritySystemTargetState"] = "SecuritySystemTargetState";
79
- CharacteristicKey["SetDuration"] = "SetDuration";
80
54
  CharacteristicKey["SmokeDetected"] = "SmokeDetected";
81
55
  CharacteristicKey["StatusActive"] = "StatusActive";
82
56
  CharacteristicKey["StatusFault"] = "StatusFault";
83
57
  CharacteristicKey["StatusLowBattery"] = "StatusLowBattery";
84
58
  CharacteristicKey["StatusTampered"] = "StatusTampered";
85
- CharacteristicKey["SulphurDioxideDensity"] = "SulphurDioxideDensity";
86
59
  CharacteristicKey["SwingMode"] = "SwingMode";
87
- CharacteristicKey["TargetAirPurifierState"] = "TargetAirPurifierState";
88
- CharacteristicKey["TargetDoorState"] = "TargetDoorState";
89
- CharacteristicKey["TargetFanState"] = "TargetFanState";
90
60
  CharacteristicKey["TargetHeaterCoolerState"] = "TargetHeaterCoolerState";
91
61
  CharacteristicKey["TargetHeatingCoolingState"] = "TargetHeatingCoolingState";
92
62
  CharacteristicKey["TargetRelativeHumidity"] = "TargetRelativeHumidity";
93
63
  CharacteristicKey["TargetTemperature"] = "TargetTemperature";
94
64
  CharacteristicKey["TemperatureDisplayUnits"] = "TemperatureDisplayUnits";
95
- CharacteristicKey["ValveType"] = "ValveType";
96
- CharacteristicKey["VOCDensity"] = "VOCDensity";
97
65
  })(CharacteristicKey || (CharacteristicKey = {}));
98
66
  export var TemperatureUnits;
99
67
  (function (TemperatureUnits) {
100
68
  TemperatureUnits["CELSIUS"] = "C";
101
69
  TemperatureUnits["FAHRENHEIT"] = "F";
102
70
  })(TemperatureUnits || (TemperatureUnits = {}));
103
- export var ValveType;
104
- (function (ValveType) {
105
- ValveType["GENERIC_VALVE"] = "GENERIC_VALVE";
106
- ValveType["IRRIGATION"] = "IRRIGATION";
107
- ValveType["SHOWER_HEAD"] = "SHOWER_HEAD";
108
- ValveType["WATER_FAUCET"] = "WATER_FAUCET";
109
- })(ValveType || (ValveType = {}));
110
71
  //# sourceMappingURL=enums.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAkBX;AAlBD,WAAY,aAAa;IACvB,4DAA2C,CAAA;IAC3C,8DAA6C,CAAA;IAC7C,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,kDAAiC,CAAA;IACjC,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,4CAA2B,CAAA;IAC3B,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,oDAAmC,CAAA;IACnC,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;IACjC,4CAA2B,CAAA;IAC3B,kCAAiB,CAAA;IACjB,wDAAuC,CAAA;IACvC,0CAAyB,CAAA;AAC3B,CAAC,EAlBW,aAAa,KAAb,aAAa,QAkBxB;AAED,MAAM,CAAN,IAAY,iBA2CX;AA3CD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,kDAA6B,CAAA;IAC7B,8CAAyB,CAAA;IACzB,oEAA+C,CAAA;IAC/C,8DAAyC,CAAA;IACzC,sEAAiD,CAAA;IACjD,sEAAiD,CAAA;IACjD,gEAA2C,CAAA;IAC3C,wEAAmD,CAAA;IACnD,0DAAqC,CAAA;IACrC,8DAAyC,CAAA;IACzC,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,0EAAqD,CAAA;IACrD,8EAAyD,CAAA;IACzD,wEAAmD,CAAA;IACnD,8DAAyC,CAAA;IACzC,gFAA2D,CAAA;IAC3D,gCAAW,CAAA;IACX,kDAA6B,CAAA;IAC7B,0DAAqC,CAAA;IACrC,kEAA6C,CAAA;IAC7C,wDAAmC,CAAA;IACnC,sDAAiC,CAAA;IACjC,4DAAuC,CAAA;IACvC,8BAAS,CAAA;IACT,gDAA2B,CAAA;IAC3B,oDAA+B,CAAA;IAC/B,8CAAyB,CAAA;IACzB,8EAAyD,CAAA;IACzD,4EAAuD,CAAA;IACvD,oDAA+B,CAAA;IAC/B,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,4CAAuB,CAAA;IACvB,wEAAmD,CAAA;IACnD,4EAAuD,CAAA;IACvD,sEAAiD,CAAA;IACjD,4DAAuC,CAAA;IACvC,wEAAmD,CAAA;AACrD,CAAC,EA3CW,iBAAiB,KAAjB,iBAAiB,QA2C5B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}
@@ -7,15 +7,14 @@ export declare class MQTT {
7
7
  private readonly log;
8
8
  private readonly broker;
9
9
  private readonly options;
10
- private static readonly INSTANCES;
11
- private readonly onConnectCallbacks;
12
- private readonly onConnectMessages;
10
+ private static INSTANCES;
11
+ private onConnectCallbacks;
13
12
  private client;
14
13
  private shouldReconnect;
15
14
  private isReconnecting;
16
15
  private reconnectCount;
17
- private readonly listeners;
18
- static connect(log: Log, config: MQTTConfig | undefined, caller: string, onConnect: OnConnectCallback): MQTT | undefined;
16
+ private listeners;
17
+ static connect(log: Log, config: MQTTConfig, caller: string, onConnect: OnConnectCallback): MQTT | undefined;
19
18
  private constructor();
20
19
  private get host();
21
20
  private connect;
@@ -4,8 +4,8 @@ import { strings } from '../i18n/i18n.js';
4
4
  import { LogType } from '../tools/log.js';
5
5
  import { toPrimitive } from '../tools/primitive.js';
6
6
  import { SECOND, MINUTE } from '../tools/time.js';
7
+ import { assert } from '../tools/validation.js';
7
8
  const DELAYS = [5 * SECOND, 10 * SECOND, 30 * SECOND, 2 * MINUTE, 5 * MINUTE];
8
- const DEFAULT_BROKER = 'mqtt://127.0.0.1/';
9
9
  function toTopicObject(rawTopic) {
10
10
  let base;
11
11
  let jsonPath;
@@ -34,37 +34,39 @@ export class MQTT {
34
34
  options;
35
35
  static INSTANCES = new Map();
36
36
  onConnectCallbacks = [];
37
- onConnectMessages = new Map();
38
37
  client = undefined;
39
38
  shouldReconnect = false;
40
39
  isReconnecting = false;
41
40
  reconnectCount = 0;
42
41
  listeners = new Map();
43
- static connect(log, config = undefined, caller, onConnect) {
42
+ static connect(log, config, caller, onConnect) {
43
+ if (!assert(log, caller, config, 'broker')) {
44
+ return;
45
+ }
44
46
  let additionalOptions = {};
45
- const configOptions = config?.options ?? '{}';
46
47
  try {
47
- additionalOptions = JSON.parse(configOptions);
48
+ if (config.options) {
49
+ additionalOptions = JSON.parse(config.options);
50
+ }
48
51
  }
49
52
  catch (err) {
50
- log.error(`${strings.mqttClient.badOptions}:\n"${configOptions}"`, this.caller);
53
+ log.error(`${strings.mqttClient.badOptions}:\n"${config.options}"`, this.caller);
51
54
  return;
52
55
  }
53
56
  const options = {
54
57
  reconnectPeriod: 0,
55
- username: config?.username ?? process.env.EASYMQTT_USERNAME,
56
- password: config?.password ?? process.env.EASYMQTT_PASSWORD,
58
+ username: config.username,
59
+ password: config.password,
57
60
  ...additionalOptions,
58
61
  };
59
- let seed = DEFAULT_BROKER;
60
- const broker = config?.broker ?? process.env.EASYMQTT_BROKER ?? DEFAULT_BROKER;
62
+ let seed;
61
63
  try {
62
- const url = new URL(broker);
64
+ const url = new URL(config.broker);
63
65
  url.port = url.port.length ? url.port : '1883';
64
66
  seed = `${url.protocol}//${url.host}|${JSON.stringify(options)}`;
65
67
  }
66
68
  catch (error) {
67
- seed = broker;
69
+ seed = config.broker;
68
70
  }
69
71
  const id = createHash('md5').update(seed).digest('hex').slice(0, 4);
70
72
  let instance = MQTT.INSTANCES.get(id);
@@ -73,31 +75,16 @@ export class MQTT {
73
75
  if (instance.client?.connected) {
74
76
  onConnect(instance);
75
77
  }
76
- }
77
- else {
78
- log.ifVerbose(strings.mqttClient.new, caller, id);
79
- instance = new MQTT(log, broker, options);
80
- MQTT.INSTANCES.set(id, instance);
81
- instance.connect();
82
- }
83
- instance.onConnectCallbacks.push(onConnect);
84
- const onConnectMessages = config?.onConnect;
85
- if (onConnectMessages !== undefined) {
86
- const errorLog = '\n[ { "topic": "example/topic", "message": "example message" } ]';
87
- if (!Array.isArray(onConnectMessages)) {
88
- log.error(strings.mqttClient.badMessages, errorLog);
89
- }
90
78
  else {
91
- for (const message of onConnectMessages) {
92
- if (message.topic === undefined || message.message === undefined) {
93
- log.error(strings.mqttClient.badMessages, errorLog);
94
- continue;
95
- }
96
- const key = `${message.topic}|${message.message}`;
97
- instance?.onConnectMessages.set(key, message);
98
- }
79
+ instance.onConnectCallbacks.push(onConnect);
99
80
  }
81
+ return instance;
100
82
  }
83
+ log.ifVerbose(strings.mqttClient.new, caller, id);
84
+ instance = new MQTT(log, config.broker, options);
85
+ MQTT.INSTANCES.set(id, instance);
86
+ instance.onConnectCallbacks.push(onConnect);
87
+ instance.connect();
101
88
  return instance;
102
89
  }
103
90
  constructor(log, broker, options) {
@@ -119,12 +106,9 @@ export class MQTT {
119
106
  this.client = mqtt.connect(this.broker, this.options);
120
107
  this.client.on('connect', () => {
121
108
  this.log.ifVerbose(strings.mqttClient.connected, this.host);
122
- this.onConnectCallbacks.forEach(callback => {
123
- callback(this);
124
- });
125
- this.onConnectMessages.forEach(message => {
126
- this.publish(message.topic, message.message);
127
- });
109
+ while (this.onConnectCallbacks.length > 0) {
110
+ this.onConnectCallbacks.pop()(this);
111
+ }
128
112
  });
129
113
  this.client.on('message', (topic, message) => this.messageReceived(topic, message.toString()));
130
114
  this.client.on('close', () => this.connectionClosed());
@@ -172,7 +156,7 @@ export class MQTT {
172
156
  else {
173
157
  message = value.toString();
174
158
  }
175
- this.client.publish(topic.base, message, this.options);
159
+ this.client.publish(topic.base, message);
176
160
  this.log.ifVerbose(`${strings.mqttClient.publish} — ${topic.base} ${message}`, this.host);
177
161
  }
178
162
  messageReceived(topic, message) {
@@ -1 +1 @@
1
- {"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../src/model/mqtt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../src/model/mqtt.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { PlatformConfig as HBPlatformConfig } from 'homebridge';
2
2
  export type ServiceType = typeof import('homebridge').Service;
3
3
  export type CharacteristicType = typeof import('homebridge').Characteristic;
4
- import { AccessoryType, TemperatureUnits, ValveType } from './enums.js';
4
+ import { AccessoryType, TemperatureUnits } from './enums.js';
5
5
  import { Assertable } from '../tools/validation.js';
6
6
  export type PlatformConfig = HBPlatformConfig & {
7
7
  accessories?: BaseAccessoryConfig[];
@@ -9,21 +9,13 @@ export type PlatformConfig = HBPlatformConfig & {
9
9
  export type TemperatureConfig = {
10
10
  temperatureUnits?: TemperatureUnits;
11
11
  };
12
- export type AddonConfig = Assertable & {};
13
- export type FilterMaintenanceConfig = AddonConfig & {
14
- topicGetFilterChangeIndication: string;
15
- topicGetFilterLifeLevel?: string;
16
- topicResetFilterIndication?: string;
17
- valueFilterChange: string;
18
- valueFilterReset: string;
19
- };
20
12
  type ErrorStatusConfig = {
21
13
  topicGetStatusFault?: string;
22
14
  topicGetStatusTampered?: string;
23
15
  valueFault?: string;
24
16
  valueTampered?: string;
25
17
  };
26
- export type InfoConfig = Assertable & {
18
+ type InfoConfig = Assertable & {
27
19
  id: string;
28
20
  name: string;
29
21
  type: AccessoryType;
@@ -35,22 +27,16 @@ type AdditionalInfoConfig = InfoConfig & {
35
27
  serialNumber?: string;
36
28
  version?: string;
37
29
  };
38
- export type MQTTMessage = Assertable & {
39
- topic: string;
40
- message: string;
41
- };
42
30
  export type MQTTConfig = Assertable & {
43
- broker?: string;
31
+ broker: string;
44
32
  username?: string;
45
33
  password?: string;
46
34
  options?: string;
47
- onConnect?: MQTTMessage[];
48
35
  };
49
36
  export type MQTTAccessoryConfig = Assertable & {
37
+ mqtt: MQTTConfig;
50
38
  info: InfoConfig;
51
- mqtt?: MQTTConfig;
52
39
  customCharacteristics?: CustomCharacteristicConfig[];
53
- resetOnRestart?: boolean;
54
40
  disableLogging: boolean;
55
41
  };
56
42
  export type CustomCharacteristicConfig = Assertable & {
@@ -89,21 +75,6 @@ export type OutletConfig = OnOffConfig & {
89
75
  };
90
76
  export type SwitchConfig = OnOffConfig & {};
91
77
  export type SensorConfig = BaseAccessoryConfig & ErrorStatusConfig & {};
92
- export type AirSensorConfig = SensorConfig & {
93
- topicGetAirQuality: string;
94
- topicGetNitrogenDioxideDensity?: string;
95
- topicGetOzoneDensity?: string;
96
- topicGetPM10Density?: string;
97
- topicGetPM2_5Density?: string;
98
- topicGetSulphurDioxideDensity?: string;
99
- topicGetVOCDensity?: string;
100
- valueAQExcellent?: string;
101
- valueAQFair?: string;
102
- valueAQGood?: string;
103
- valueAQInferior?: string;
104
- valueAQPoor?: string;
105
- valueAQUnknown?: string;
106
- };
107
78
  export type COSensorConfig = SensorConfig & {
108
79
  topicGetCarbonMonoxideDetected: string;
109
80
  topicGetCarbonMonoxideLevel?: string;
@@ -145,94 +116,50 @@ export type SmokeSensorConfig = SensorConfig & {
145
116
  export type TemperatureSensorConfig = SensorConfig & TemperatureConfig & {
146
117
  topicGetCurrentTemperature: string;
147
118
  };
148
- export type TemperatureControlConfig = BaseAccessoryConfig & TemperatureConfig & {
119
+ export type ClimateControlConfig = BaseAccessoryConfig & TemperatureConfig & {
149
120
  topicGetCoolingThresholdTemperature?: string;
150
121
  topicGetCurrentTemperature: string;
151
122
  topicGetHeatingThresholdTemperature?: string;
152
123
  topicSetCoolingThresholdTemperature?: string;
153
124
  topicSetHeatingThresholdTemperature?: string;
154
125
  };
155
- export type ThermostatConfig = TemperatureControlConfig & {
156
- topicGetCurrentHeatingCoolingState: string;
157
- topicGetCurrentRelativeHumidity?: string;
158
- topicGetTargetHeatingCoolingState: string;
159
- topicGetTargetRelativeHumidity?: string;
160
- topicGetTargetTemperature: string;
161
- topicSetTargetHeatingCoolingState: string;
162
- topicSetTargetRelativeHumidity?: string;
163
- topicSetTargetTemperature: string;
164
- valueModeAuto?: string;
165
- valueModeCool?: string;
166
- valueModeHeat?: string;
167
- valueModeOff?: string;
168
- };
169
- export type ActiveClimateConfig = TemperatureControlConfig & {
126
+ export type HeaterCoolerConfig = ClimateControlConfig & {
170
127
  topicGetActive: string;
128
+ topicGetCurrentHeaterCoolerState: string;
171
129
  topicGetLockPhysicalControls?: string;
172
130
  topicGetRotationSpeed?: string;
173
131
  topicGetSwingMode?: string;
132
+ topicGetTargetHeaterCoolerState: string;
174
133
  topicSetActive: string;
175
134
  topicSetLockPhysicalControls?: string;
176
135
  topicSetRotationSpeed?: string;
177
136
  topicSetSwingMode?: string;
137
+ topicSetTargetHeaterCoolerState: string;
178
138
  valueControlLock?: string;
179
139
  valueControlUnlock?: string;
140
+ valueModeAuto?: string;
141
+ valueModeCool?: string;
142
+ valueModeHeat?: string;
143
+ valueModeIdle?: string;
144
+ valueModeInactive?: string;
180
145
  valueStateActive: string;
181
146
  valueStateInactive: string;
182
147
  valueSwingEnabled?: string;
183
148
  valueSwingDisabled?: string;
184
149
  };
185
- export type FanV2Config = ActiveClimateConfig & {
186
- topicGetCurrentFanState?: string;
187
- topicGetRotationDirection?: string;
188
- topicGetTargetFanState?: string;
189
- topicSetRotationDirection?: string;
190
- topicSetTargetFanState?: string;
191
- valueDirectionClockwise?: string;
192
- valueDirectionCounterClockwise?: string;
193
- valueModeAuto?: string;
194
- valueModeBlowing?: string;
195
- valueModeIdle?: string;
196
- valueModeInactive?: string;
197
- valueModeManual?: string;
198
- };
199
- export type HeaterCoolerConfig = ActiveClimateConfig & FilterMaintenanceConfig & {
200
- topicGetCurrentHeaterCoolerState: string;
201
- topicGetTargetHeaterCoolerState: string;
202
- topicSetTargetHeaterCoolerState: string;
150
+ export type ThermostatConfig = ClimateControlConfig & {
151
+ topicGetCurrentHeatingCoolingState: string;
152
+ topicGetCurrentRelativeHumidity?: string;
153
+ topicGetTargetHeatingCoolingState: string;
154
+ topicGetTargetRelativeHumidity?: string;
155
+ topicGetTargetTemperature: string;
156
+ topicSetTargetHeatingCoolingState: string;
157
+ topicSetTargetRelativeHumidity?: string;
158
+ topicSetTargetTemperature: string;
203
159
  valueModeAuto?: string;
204
160
  valueModeCool?: string;
205
161
  valueModeHeat?: string;
206
- valueModeIdle?: string;
207
- valueModeInactive?: string;
208
- };
209
- export type PurifierConfig = ActiveClimateConfig & FilterMaintenanceConfig & {
210
- topicGetCurrentPurifierState: string;
211
- topicGetTargetPurifierState: string;
212
- topicSetTargetPurifierState: string;
213
- valueModeAuto?: string;
214
- valueModeIdle?: string;
215
- valueModeInactive?: string;
216
- valueModeManual?: string;
217
- valueModePurifying?: string;
218
- };
219
- export type GarageDoorConfig = LockConfig & {
220
- topicGetCurrentDoorState: string;
221
- topicGetCurrentLockState?: string;
222
- topicGetObstructionDetected: string;
223
- topicGetTargetDoorState: string;
224
- topicGetTargetLockState?: string;
225
- topicSetTargetDoorState: string;
226
- topicSetTargetLockState?: string;
227
- valueDoorObstructed: string;
228
- valueDoorStateClosed?: string;
229
- valueDoorStateClosing?: string;
230
- valueDoorStateOpen?: string;
231
- valueDoorStateOpening?: string;
232
- valueDoorStateStopped?: string;
233
- valueLockStateJammed?: string;
234
- valueLockStateSecured?: string;
235
- valueLockStateUnsecured?: string;
162
+ valueModeOff?: string;
236
163
  };
237
164
  export type LockConfig = BaseAccessoryConfig & {
238
165
  topicGetCurrentLockState: string;
@@ -255,22 +182,4 @@ export type SecurityConfig = BaseAccessoryConfig & ErrorStatusConfig & {
255
182
  valueDisarm?: string;
256
183
  valueAlarmTriggered?: string;
257
184
  };
258
- export type ValveConfig = BaseAccessoryConfig & {
259
- valveType?: ValveType;
260
- topicGetStatusFault?: string;
261
- topicGetValveActive: string;
262
- topicGetValveInUse: string;
263
- topicGetValveIsConfigured?: string;
264
- topicGetValveRemainingDuration?: string;
265
- topicGetValveSetDuration?: string;
266
- topicSetValveActive: string;
267
- topicSetValveIsConfigured?: string;
268
- topicSetValveSetDuration?: string;
269
- valueActive: string;
270
- valueConfigured?: string;
271
- valueFault?: string;
272
- valueInactive: string;
273
- valueInUse: string;
274
- valueNotConfigured?: string;
275
- };
276
185
  export {};
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "displayName": "Homebridge Easy MQTT",
5
5
  "description": "Homebridge plugin for easy control of MQTT devices",
6
6
  "type": "module",
7
- "version": "1.4.0-beta.16",
7
+ "version": "1.4.0-beta.3",
8
8
  "homepage": "https://github.com/mpatfield/homebridge-easy-mqtt#readme",
9
9
  "repository": {
10
10
  "type": "git",