homebridge-tasmota 0.2.0-beta.1 → 0.2.0-beta.2
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/CHANGELOG.md +9 -0
- package/config.schema.json +1 -1
- package/dist/TasmotaService.d.ts +0 -10
- package/dist/TasmotaService.js +10 -35
- package/dist/TasmotaService.js.map +1 -1
- package/dist/index.d.ts +0 -4
- package/dist/lib/CustomCharacteristics.d.ts +0 -1
- package/dist/lib/CustomCharacteristics.js +0 -7
- package/dist/lib/CustomCharacteristics.js.map +1 -1
- package/dist/lib/Mqtt.d.ts +0 -1
- package/dist/lib/Mqtt.js +0 -40
- package/dist/lib/Mqtt.js.map +1 -1
- package/dist/platform.d.ts +0 -10
- package/dist/platform.js +8 -103
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +0 -7
- package/dist/settings.js +0 -6
- package/dist/settings.js.map +1 -1
- package/dist/tasmotaBinarySensorService.d.ts +0 -6
- package/dist/tasmotaBinarySensorService.js +1 -21
- package/dist/tasmotaBinarySensorService.js.map +1 -1
- package/dist/tasmotaFanService.d.ts +0 -10
- package/dist/tasmotaFanService.js +5 -28
- package/dist/tasmotaFanService.js.map +1 -1
- package/dist/tasmotaGarageService.d.ts +0 -35
- package/dist/tasmotaGarageService.js +2 -60
- package/dist/tasmotaGarageService.js.map +1 -1
- package/dist/tasmotaLightService.d.ts +0 -10
- package/dist/tasmotaLightService.js +21 -150
- package/dist/tasmotaLightService.js.map +1 -1
- package/dist/tasmotaSensorService.d.ts +0 -6
- package/dist/tasmotaSensorService.js +25 -178
- package/dist/tasmotaSensorService.js.map +1 -1
- package/dist/tasmotaSwitchService.d.ts +0 -14
- package/dist/tasmotaSwitchService.js +3 -96
- package/dist/tasmotaSwitchService.js.map +1 -1
- package/hbconfig/config.json +80 -77
- package/package.json +1 -1
- package/dist/TasmotaService.d.ts.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/lib/CustomCharacteristics.d.ts.map +0 -1
- package/dist/lib/Mqtt.d.ts.map +0 -1
- package/dist/platform.d.ts.map +0 -1
- package/dist/settings.d.ts.map +0 -1
- package/dist/tasmotaBinarySensorService.d.ts.map +0 -1
- package/dist/tasmotaFanService.d.ts.map +0 -1
- package/dist/tasmotaGarageService.d.ts.map +0 -1
- package/dist/tasmotaLightService.d.ts.map +0 -1
- package/dist/tasmotaSensorService.d.ts.map +0 -1
- package/dist/tasmotaSwitchService.d.ts.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/).
|
|
4
4
|
|
|
5
|
+
## 0.2.0 (2024-10-10)
|
|
6
|
+
|
|
7
|
+
## [Version 0.1.12](https://github.com/northernman54/homebridge-tasmota/compare/v0.1.18...v0.1.12)
|
|
8
|
+
|
|
9
|
+
#### Changes
|
|
10
|
+
|
|
11
|
+
- Support for homebridge 2.0
|
|
12
|
+
- Minor exception fixes
|
|
13
|
+
|
|
5
14
|
## 0.1.18 (2024-06-09)
|
|
6
15
|
|
|
7
16
|
## [Version 0.1.18](https://github.com/northernman54/homebridge-tasmota/compare/v0.1.16...v0.1.18)
|
package/config.schema.json
CHANGED
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"type": "number",
|
|
41
41
|
"required": false,
|
|
42
42
|
"placeholder": 24,
|
|
43
|
-
"description": "Cleanup of devices no longer connected too or responding on the network. Time is in hours, defaults to 1 Day."
|
|
43
|
+
"description": "Cleanup of devices no longer connected too or responding on the network. Time is in hours, defaults to 1 Day. Maximum value is 596 hours ( 24 days )."
|
|
44
44
|
},
|
|
45
45
|
"debug": {
|
|
46
46
|
"title": "Debug Logging",
|
package/dist/TasmotaService.d.ts
CHANGED
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { Service, PlatformAccessory, Characteristic } from 'homebridge';
|
|
2
2
|
import { tasmotaPlatform } from './platform';
|
|
3
|
-
/**
|
|
4
|
-
* Platform Accessory
|
|
5
|
-
* An instance of this class is created for each accessory your platform registers
|
|
6
|
-
* Each accessory may expose multiple services of different service types.
|
|
7
|
-
*/
|
|
8
3
|
interface Subscription {
|
|
9
4
|
event: string;
|
|
10
5
|
callback: any;
|
|
@@ -28,14 +23,9 @@ export declare class TasmotaService {
|
|
|
28
23
|
deviceClassToHKCharacteristic(device_class: string): any;
|
|
29
24
|
refresh(): void;
|
|
30
25
|
statusUpdate(topic: any, message: any): void;
|
|
31
|
-
/**
|
|
32
|
-
* Handle "LWT" Last Will and Testament messages from Tasmota
|
|
33
|
-
* These are sent when the device is no longer available from the MQTT server.
|
|
34
|
-
*/
|
|
35
26
|
availabilityUpdate(topic: any, message: any): void;
|
|
36
27
|
delta(value1: any, value2: any): boolean;
|
|
37
28
|
parseValue(valueTemplate: string, value: string): any;
|
|
38
29
|
}
|
|
39
30
|
export declare function isTrue(value: string | boolean | number): boolean;
|
|
40
31
|
export {};
|
|
41
|
-
//# sourceMappingURL=TasmotaService.d.ts.map
|
package/dist/TasmotaService.js
CHANGED
|
@@ -13,14 +13,11 @@ class TasmotaService {
|
|
|
13
13
|
this.platform = platform;
|
|
14
14
|
this.accessory = accessory;
|
|
15
15
|
this.uniq_id = uniq_id;
|
|
16
|
-
/* eslint-disable */
|
|
17
16
|
this.CustomCharacteristic = require('./lib/CustomCharacteristics')(platform.Service, platform.Characteristic);
|
|
18
17
|
this.uuid = this.platform.api.hap.uuid.generate(this.accessory.context.device[this.uniq_id].uniq_id);
|
|
19
18
|
this.device_class = accessory.context.device[this.uniq_id].dev_cla;
|
|
20
19
|
this.nunjucksEnvironment = new nunjucks_1.default.Environment();
|
|
21
|
-
// Home Assistant device template filters
|
|
22
20
|
this.nunjucksEnvironment.addFilter('is_defined', function (val, cb) {
|
|
23
|
-
// console.log('is_defined', val, cb);
|
|
24
21
|
if (val || val === 0) {
|
|
25
22
|
cb(null, val);
|
|
26
23
|
}
|
|
@@ -35,13 +32,11 @@ class TasmotaService {
|
|
|
35
32
|
});
|
|
36
33
|
}
|
|
37
34
|
enableFakegato() {
|
|
38
|
-
|
|
39
|
-
var _a, _b;
|
|
40
|
-
if (this.platform.config.history && this.fakegato && !((_a = this.accessory.context.fakegatoService) === null || _a === void 0 ? void 0 : _a.addEntry)) {
|
|
35
|
+
if (this.platform.config.history && this.fakegato && !this.accessory.context.fakegatoService?.addEntry) {
|
|
41
36
|
var hostname = os_1.default.hostname().split(".")[0];
|
|
42
37
|
this.accessory.context.fakegatoService = new this.platform.FakeGatoHistoryService('custom', this.accessory, {
|
|
43
38
|
storage: 'fs',
|
|
44
|
-
minutes:
|
|
39
|
+
minutes: this.platform.config.historyInterval ?? 10,
|
|
45
40
|
log: this.platform.log,
|
|
46
41
|
filename: hostname + "_" + this.uniq_id + '_persist.json',
|
|
47
42
|
});
|
|
@@ -73,35 +68,31 @@ class TasmotaService {
|
|
|
73
68
|
deviceClassToHKCharacteristic(device_class) {
|
|
74
69
|
switch (device_class) {
|
|
75
70
|
case '-dt24-amp':
|
|
76
|
-
case '_energy_current':
|
|
71
|
+
case '_energy_current':
|
|
77
72
|
return (this.CustomCharacteristic.ElectricCurrent);
|
|
78
|
-
case '_energy_voltage':
|
|
79
|
-
case '-dt24-volt':
|
|
73
|
+
case '_energy_voltage':
|
|
74
|
+
case '-dt24-volt':
|
|
80
75
|
return (this.CustomCharacteristic.Voltage);
|
|
81
|
-
case '_energy_power':
|
|
82
|
-
case '-dt24-watt':
|
|
76
|
+
case '_energy_power':
|
|
77
|
+
case '-dt24-watt':
|
|
83
78
|
return (this.CustomCharacteristic.CurrentConsumption);
|
|
84
|
-
case '_energy_total':
|
|
79
|
+
case '_energy_total':
|
|
85
80
|
case '-dt24-watt-hour':
|
|
86
81
|
return (this.CustomCharacteristic.TotalConsumption);
|
|
87
82
|
break;
|
|
88
83
|
}
|
|
89
84
|
}
|
|
90
85
|
refresh() {
|
|
91
|
-
// Get current status for accessory/service on startup
|
|
92
|
-
// Wild cards in topic break this
|
|
93
86
|
if (this.accessory.context.device[this.uniq_id].stat_t && !this.accessory.context.device[this.uniq_id].stat_t.match('/\+|#/g')) {
|
|
94
87
|
const teleperiod = this.accessory.context.device[this.uniq_id].stat_t.substr(0, this.accessory.context.device[this.uniq_id].stat_t.lastIndexOf('/') + 1).replace('tele', 'cmnd') + 'teleperiod';
|
|
95
88
|
this.accessory.context.mqttHost.sendMessage(teleperiod, this.platform.teleperiod.toString());
|
|
96
89
|
}
|
|
97
90
|
}
|
|
98
91
|
statusUpdate(topic, message) {
|
|
99
|
-
var _a, _b;
|
|
100
92
|
debug('statusUpdate', this.service.displayName, topic, message.toString());
|
|
101
93
|
this.accessory.context.timeout = this.platform.autoCleanup(this.accessory);
|
|
102
94
|
try {
|
|
103
95
|
let value = this.parseValue(this.accessory.context.device[this.uniq_id].val_tpl, message.toString());
|
|
104
|
-
// Sensor value tweaks or adjustments needed for homekit
|
|
105
96
|
switch (this.device_class) {
|
|
106
97
|
case 'temperature':
|
|
107
98
|
if (this.accessory.context.device[this.uniq_id].unit_of_meas.toUpperCase() === 'F') {
|
|
@@ -109,7 +100,6 @@ class TasmotaService {
|
|
|
109
100
|
}
|
|
110
101
|
break;
|
|
111
102
|
case 'illuminance':
|
|
112
|
-
// normalize LX in the range homebridge expects
|
|
113
103
|
value = (value < 0.0001 ? 0.0001 : (value > 100000 ? 100000 : value));
|
|
114
104
|
break;
|
|
115
105
|
case 'co2':
|
|
@@ -122,14 +112,13 @@ class TasmotaService {
|
|
|
122
112
|
break;
|
|
123
113
|
}
|
|
124
114
|
if (value instanceof Error) {
|
|
125
|
-
// Error has already been handled
|
|
126
115
|
}
|
|
127
116
|
else {
|
|
128
117
|
if (this.characteristic.value != value && this.delta(this.characteristic.value, value)) {
|
|
129
|
-
this.platform.log.info('Updating \'%s:%s\' to %s', this.service.displayName,
|
|
118
|
+
this.platform.log.info('Updating \'%s:%s\' to %s', this.service.displayName, this.characteristic.displayName ?? '', value);
|
|
130
119
|
}
|
|
131
120
|
else {
|
|
132
|
-
this.platform.log.debug('Updating \'%s:%s\' to %s', this.service.displayName,
|
|
121
|
+
this.platform.log.debug('Updating \'%s:%s\' to %s', this.service.displayName, this.characteristic.displayName ?? '', value);
|
|
133
122
|
}
|
|
134
123
|
}
|
|
135
124
|
this.characteristic.updateValue(value);
|
|
@@ -138,35 +127,24 @@ class TasmotaService {
|
|
|
138
127
|
this.platform.log.error('ERROR: Message Parse Error', topic, message.toString());
|
|
139
128
|
}
|
|
140
129
|
}
|
|
141
|
-
/**
|
|
142
|
-
* Handle "LWT" Last Will and Testament messages from Tasmota
|
|
143
|
-
* These are sent when the device is no longer available from the MQTT server.
|
|
144
|
-
*/
|
|
145
130
|
availabilityUpdate(topic, message) {
|
|
146
|
-
// debug("availabilityUpdate", this, topic, message.toString());
|
|
147
131
|
this.platform.log.info('Marking accessory \'%s\' to %s', this.service.displayName, message);
|
|
148
132
|
if (message.toString() === this.accessory.context.device[this.uniq_id].pl_not_avail) {
|
|
149
133
|
const availability = new Error(this.accessory.displayName + ' ' + message.toString());
|
|
150
134
|
this.characteristic.updateValue(availability);
|
|
151
135
|
}
|
|
152
136
|
else {
|
|
153
|
-
// debug("availabilityUpdate", this.characteristic);
|
|
154
137
|
this.characteristic.updateValue(this.characteristic.value);
|
|
155
138
|
}
|
|
156
139
|
}
|
|
157
|
-
// Utility functions for status update
|
|
158
140
|
delta(value1, value2) {
|
|
159
|
-
// debug("delta", (parseInt(value1) !== parseInt(value2)));
|
|
160
141
|
return (parseInt(value1) !== parseInt(value2));
|
|
161
142
|
}
|
|
162
143
|
parseValue(valueTemplate, value) {
|
|
163
144
|
try {
|
|
164
145
|
if (valueTemplate) {
|
|
165
|
-
// debug('nunjucksEnvironment', this, this.nunjucksEnvironment);
|
|
166
146
|
var template = nunjucks_1.default.compile(valueTemplate, this.nunjucksEnvironment);
|
|
167
|
-
// debug('nunjucksEnvironment', template, this.nunjucksEnvironment, value);
|
|
168
147
|
const result = template.render({ value_json: JSON.parse(value) });
|
|
169
|
-
// debug('nunjucksEnvironment-result', valueTemplate, value, result);
|
|
170
148
|
if (result) {
|
|
171
149
|
return result;
|
|
172
150
|
}
|
|
@@ -179,9 +157,6 @@ class TasmotaService {
|
|
|
179
157
|
}
|
|
180
158
|
}
|
|
181
159
|
catch (err) {
|
|
182
|
-
// this.platform.log.error('ERROR: Template Parsing error', err.message);
|
|
183
|
-
// debug('ERROR: Template Parsing error', valueTemplate, value);
|
|
184
|
-
// return (err);
|
|
185
160
|
}
|
|
186
161
|
}
|
|
187
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":";;;;;;AAEA,wDAAgC;AAChC,4CAAoB;AAEpB,kDAAgC;AAEhC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,iBAAiB,CAAC,CAAC;AAY7C,MAAa,cAAc;IAWzB,YACkB,QAAyB,EACzB,SAA4B,EACzB,OAAe;QAFlB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,cAAS,GAAT,SAAS,CAAmB;QACzB,YAAO,GAAP,OAAO,CAAQ;
|
|
1
|
+
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
const inherits = require('util').inherits;
|
|
3
2
|
let Service, Characteristic;
|
|
4
3
|
module.exports = function (Service, Characteristic) {
|
|
@@ -14,7 +13,6 @@ module.exports = function (Service, Characteristic) {
|
|
|
14
13
|
};
|
|
15
14
|
CustomCharacteristic.Voltage.UUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52';
|
|
16
15
|
inherits(CustomCharacteristic.Voltage, Characteristic);
|
|
17
|
-
// Aka Amps
|
|
18
16
|
CustomCharacteristic.ElectricCurrent = function () {
|
|
19
17
|
Characteristic.call(this, 'Electric Current', CustomCharacteristic.ElectricCurrent.UUID);
|
|
20
18
|
this.setProps({
|
|
@@ -26,7 +24,6 @@ module.exports = function (Service, Characteristic) {
|
|
|
26
24
|
};
|
|
27
25
|
CustomCharacteristic.ElectricCurrent.UUID = 'E863F126-079E-48FF-8F27-9C2605A29F52';
|
|
28
26
|
inherits(CustomCharacteristic.ElectricCurrent, Characteristic);
|
|
29
|
-
// Aka watts
|
|
30
27
|
CustomCharacteristic.CurrentConsumption = function () {
|
|
31
28
|
Characteristic.call(this, 'Current Consumption', CustomCharacteristic.CurrentConsumption.UUID);
|
|
32
29
|
this.setProps({
|
|
@@ -38,7 +35,6 @@ module.exports = function (Service, Characteristic) {
|
|
|
38
35
|
};
|
|
39
36
|
CustomCharacteristic.CurrentConsumption.UUID = 'E863F10D-079E-48FF-8F27-9C2605A29F52';
|
|
40
37
|
inherits(CustomCharacteristic.CurrentConsumption, Characteristic);
|
|
41
|
-
// Aka kilowatts
|
|
42
38
|
CustomCharacteristic.TotalConsumption = function () {
|
|
43
39
|
Characteristic.call(this, 'Total Consumption', CustomCharacteristic.TotalConsumption.UUID);
|
|
44
40
|
this.setProps({
|
|
@@ -64,12 +60,9 @@ module.exports = function (Service, Characteristic) {
|
|
|
64
60
|
};
|
|
65
61
|
CustomCharacteristic.AtmosphericPressureLevel.UUID = 'E863F10F-079E-48FF-8F27-9C2605A29F52';
|
|
66
62
|
inherits(CustomCharacteristic.AtmosphericPressureLevel, Characteristic);
|
|
67
|
-
// courtesy of https://github.com/robi-van-kinobi/homebridge-cubesensors
|
|
68
63
|
CustomCharacteristic.AtmosphericPressureSensor = function (displayName, subtype) {
|
|
69
64
|
Service.call(this, displayName, CustomCharacteristic.AtmosphericPressureSensor.UUID, subtype);
|
|
70
|
-
// Required Characteristics
|
|
71
65
|
this.addCharacteristic(CustomCharacteristic.AtmosphericPressureLevel);
|
|
72
|
-
// Optional Characteristics
|
|
73
66
|
this.addOptionalCharacteristic(Characteristic.StatusActive);
|
|
74
67
|
this.addOptionalCharacteristic(Characteristic.StatusFault);
|
|
75
68
|
this.addOptionalCharacteristic(Characteristic.StatusLowBattery);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomCharacteristics.js","sourceRoot":"","sources":["../../src/lib/CustomCharacteristics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CustomCharacteristics.js","sourceRoot":"","sources":["../../src/lib/CustomCharacteristics.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/Mqtt.d.ts
CHANGED
package/dist/lib/Mqtt.js
CHANGED
|
@@ -18,21 +18,8 @@ class Mqtt extends events_1.EventEmitter {
|
|
|
18
18
|
};
|
|
19
19
|
connection = mqtt_1.default.connect('mqtt://' + config.mqttHost, options);
|
|
20
20
|
super();
|
|
21
|
-
// debug("this", this);
|
|
22
|
-
// debug("Connecting", this);
|
|
23
21
|
connection.on('connect', function () {
|
|
24
|
-
// debug("Connected", this);
|
|
25
22
|
connection.subscribe("homeassistant/#");
|
|
26
|
-
/*
|
|
27
|
-
connection.subscribe("tele/+/STATE");
|
|
28
|
-
connection.subscribe("tele/+/SENSOR");
|
|
29
|
-
connection.subscribe("tele/+/LWT");
|
|
30
|
-
connection.subscribe("stat/+/RESULT");
|
|
31
|
-
connection.subscribe("+/tele/STATE");
|
|
32
|
-
connection.subscribe("+/tele/SENSOR");
|
|
33
|
-
connection.subscribe("+/tele/LWT");
|
|
34
|
-
connection.subscribe("+/stat/RESULT");
|
|
35
|
-
*/
|
|
36
23
|
});
|
|
37
24
|
connection.on('reconnect', function () {
|
|
38
25
|
console.error('ERROR: mqtt reconnect to', config.mqttHost);
|
|
@@ -41,7 +28,6 @@ class Mqtt extends events_1.EventEmitter {
|
|
|
41
28
|
console.error('ERROR: mqtt connection error ', config.mqttHost, err);
|
|
42
29
|
});
|
|
43
30
|
connection.on('message', (topic, message) => {
|
|
44
|
-
// debug("Message: Topic %s -> %s", topic, message.toString());
|
|
45
31
|
const subject = topic.split('/');
|
|
46
32
|
switch (subject[0]) {
|
|
47
33
|
case "homeassistant":
|
|
@@ -56,7 +42,6 @@ class Mqtt extends events_1.EventEmitter {
|
|
|
56
42
|
case "light":
|
|
57
43
|
case "fan":
|
|
58
44
|
case "garageDoor":
|
|
59
|
-
// debug("emit", subject[1], this);
|
|
60
45
|
this.emit('Discovered', topic, device);
|
|
61
46
|
break;
|
|
62
47
|
}
|
|
@@ -68,7 +53,6 @@ class Mqtt extends events_1.EventEmitter {
|
|
|
68
53
|
}
|
|
69
54
|
else if (topic.endsWith('config')) {
|
|
70
55
|
this.emit('Remove', topic);
|
|
71
|
-
// debug('Remove', topic);
|
|
72
56
|
}
|
|
73
57
|
break;
|
|
74
58
|
default:
|
|
@@ -83,18 +67,14 @@ class Mqtt extends events_1.EventEmitter {
|
|
|
83
67
|
});
|
|
84
68
|
}
|
|
85
69
|
availabilitySubscribe(topic) {
|
|
86
|
-
// debug('availabilitySubscribe', topic);
|
|
87
70
|
connection.subscribe(topic);
|
|
88
71
|
}
|
|
89
72
|
statusSubscribe(topic) {
|
|
90
73
|
connection.subscribe(topic);
|
|
91
|
-
// fix for openmqttgateway
|
|
92
74
|
if (topic.includes('+') || topic.includes('#')) {
|
|
93
|
-
// debug('statusSubscribe - wildcard', topic);
|
|
94
75
|
wildCardTopics.push({ "topic": topic });
|
|
95
76
|
}
|
|
96
77
|
else {
|
|
97
|
-
// debug('statusSubscribe - not wildcard', topic);
|
|
98
78
|
}
|
|
99
79
|
}
|
|
100
80
|
sendMessage(topic, message) {
|
|
@@ -109,43 +89,23 @@ class Mqtt extends events_1.EventEmitter {
|
|
|
109
89
|
}
|
|
110
90
|
exports.Mqtt = Mqtt;
|
|
111
91
|
function isWildcardTopic(topic) {
|
|
112
|
-
// debug("isWildcardTopic", topic, wildCardTopics);
|
|
113
92
|
var match = false;
|
|
114
93
|
var index = wildCardTopics.findIndex((wildcard) => {
|
|
115
|
-
// debug("mqttWildcard", topic, wildcard.topic);
|
|
116
94
|
if (mqttWildcard(topic, wildcard.topic)) {
|
|
117
|
-
// debug("match", topic, wildcard.topic);
|
|
118
95
|
match = true;
|
|
119
96
|
}
|
|
120
97
|
});
|
|
121
|
-
// debug("done", topic, match);
|
|
122
98
|
return match;
|
|
123
99
|
}
|
|
124
100
|
function getWildcardTopic(topic) {
|
|
125
|
-
// debug("getWildcardTopic", topic, wildCardTopics);
|
|
126
101
|
var match = "";
|
|
127
102
|
var index = wildCardTopics.findIndex(function (wildcard) {
|
|
128
103
|
if (mqttWildcard(topic, wildcard.topic)) {
|
|
129
|
-
// debug("getWildcardTopic - match", topic, wildcard.topic);
|
|
130
104
|
match = wildcard.topic;
|
|
131
105
|
}
|
|
132
106
|
});
|
|
133
|
-
// debug("get-done", topic, wildCardTopics[index]);
|
|
134
107
|
return match;
|
|
135
108
|
}
|
|
136
|
-
/*
|
|
137
|
-
* mqttWildcard('test/foo/bar', 'test/foo/bar'); // []
|
|
138
|
-
* mqttWildcard('test/foo/bar', 'test/+/bar'); // ['foo']
|
|
139
|
-
* mqttWildcard('test/foo/bar', 'test/#'); // ['foo/bar']
|
|
140
|
-
* mqttWildcard('test/foo/bar/baz', 'test/+/#'); // ['foo', 'bar/baz']
|
|
141
|
-
* mqttWildcard('test/foo/bar/baz', 'test/+/+/baz'); // ['foo', 'bar']
|
|
142
|
-
|
|
143
|
-
* mqttWildcard('test', 'test/#'); // []
|
|
144
|
-
* mqttWildcard('test/', 'test/#'); // ['']
|
|
145
|
-
|
|
146
|
-
* mqttWildcard('test/foo/bar', 'test/+'); // null
|
|
147
|
-
* mqttWildcard('test/foo/bar', 'test/nope/bar'); // null
|
|
148
|
-
*/
|
|
149
109
|
function mqttWildcard(topic, wildcard) {
|
|
150
110
|
if (topic === wildcard) {
|
|
151
111
|
return [];
|
package/dist/lib/Mqtt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mqtt.js","sourceRoot":"","sources":["../../src/lib/Mqtt.ts"],"names":[],"mappings":";;;;;;AAAA,gDAA8B;AAC9B,kDAAgC;AAEhC,mCAAsC;AAEtC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,cAAc,CAAC,CAAC;AAC1C,IAAI,UAAU,CAAC;AAEf,IAAI,cAAc,GAAQ,EAAE,CAAC;AAE7B,MAAa,IAAK,SAAQ,qBAAY;IAGpC,YAAY,MAAM;QAChB,IAAI,OAAO,GAAG;YACZ,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;YACtC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;SACvC,CAAA;QACD,UAAU,GAAG,cAAU,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Mqtt.js","sourceRoot":"","sources":["../../src/lib/Mqtt.ts"],"names":[],"mappings":";;;;;;AAAA,gDAA8B;AAC9B,kDAAgC;AAEhC,mCAAsC;AAEtC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,cAAc,CAAC,CAAC;AAC1C,IAAI,UAAU,CAAC;AAEf,IAAI,cAAc,GAAQ,EAAE,CAAC;AAE7B,MAAa,IAAK,SAAQ,qBAAY;IAGpC,YAAY,MAAM;QAChB,IAAI,OAAO,GAAG;YACZ,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;YACtC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE;SACvC,CAAA;QACD,UAAU,GAAG,cAAU,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,KAAK,EAAE,CAAC;QAGR,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE;YAEvB,UAAU,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAW1C,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE;YACzB,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,UAAS,GAAG;YACjC,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAG1C,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEjC,QAAQ,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,KAAK,eAAe;oBAElB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBAClD,IAAI;4BACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;4BAE9C,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;4BAEhC,QAAQ,OAAO,CAAC,CAAC,CAAC,EAAE;gCAClB,KAAK,QAAQ,CAAC;gCACd,KAAK,QAAQ,CAAC;gCACd,KAAK,eAAe,CAAC;gCACrB,KAAK,OAAO,CAAC;gCACb,KAAK,KAAK,CAAC;gCACX,KAAK,YAAY;oCAEf,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;oCACvC,MAAM;6BAET;yBACF;wBAAC,OAAO,KAAK,EAAE;4BACd,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;4BACvB,KAAK,CAAC,cAAc,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;yBAC3C;qBACF;yBAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;qBAE5B;oBACD,MAAM;gBACR;oBACE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACzC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;oBACjC,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE;wBAC1B,KAAK,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACtE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;qBACtE;oBACD,MAAM;aACT;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAAK;QAEzB,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,eAAe,CAAC,KAAK;QACnB,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAE9C,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SACzC;aAAM;SAEN;IACH,CAAC;IAED,WAAW,CAAC,KAAK,EAAE,OAAO;QACxB,KAAK,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACrC,IAAI,OAAO,IAAI,KAAK,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,KAAK,CAAC,CAAC;SACpD;IACH,CAAC;CACF;AA1GD,oBA0GC;AAED,SAAS,eAAe,CAAC,KAAK;IAE5B,IAAI,KAAK,GAAY,KAAK,CAAC;IAC3B,IAAI,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;QAEhD,IAAI,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE;YAEvC,KAAK,GAAG,IAAI,CAAC;SACd;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAK;IAE7B,IAAI,KAAK,GAAW,EAAE,CAAC;IACvB,IAAI,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,UAAS,QAAQ;QACpD,IAAI,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE;YAEvC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAgBD,SAAS,YAAY,CAAC,KAAK,EAAE,QAAQ;IACnC,IAAI,KAAK,KAAK,QAAQ,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;SAAM,IAAI,QAAQ,KAAK,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,CAAC;KAChB;IAED,IAAI,GAAG,GAAQ,EAAE,CAAC;IAElB,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;QACnC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAChB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChB;aAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACvB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/B,OAAO,GAAG,CAAC;SACZ;aAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC;SACb;KACF;IAED,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAChB,CAAC,IAAI,CAAC,CAAC;KACR;IAED,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC"}
|
package/dist/platform.d.ts
CHANGED
|
@@ -23,17 +23,8 @@ export declare class tasmotaPlatform implements DynamicPlatformPlugin {
|
|
|
23
23
|
FakeGatoHistoryService: any;
|
|
24
24
|
teleperiod: number;
|
|
25
25
|
constructor(log: Logger, config: any, api: API);
|
|
26
|
-
/**
|
|
27
|
-
* This function is invoked when homebridge restores cached accessories from disk at startup.
|
|
28
|
-
* It should be used to setup event handlers for characteristics and update respective values.
|
|
29
|
-
*/
|
|
30
26
|
configureAccessory(accessory: PlatformAccessory): void;
|
|
31
27
|
isTopicAllowed(topic: string, filter: string, filterAllow: Array<string>, filterDeny: Array<string>): boolean;
|
|
32
|
-
/**
|
|
33
|
-
* This is an example method showing how to register discovered accessories.
|
|
34
|
-
* Accessories must only be registered once, previously created accessories
|
|
35
|
-
* must not be registered again to prevent "duplicate UUID" errors.
|
|
36
|
-
*/
|
|
37
28
|
discoverDevices(): void;
|
|
38
29
|
discoveryOveride(uniq_id: string, message: any): any;
|
|
39
30
|
serviceCleanup(uniq_id: string, existingAccessory: PlatformAccessory): void;
|
|
@@ -41,4 +32,3 @@ export declare class tasmotaPlatform implements DynamicPlatformPlugin {
|
|
|
41
32
|
accessoryCleanup(existingAccessory: PlatformAccessory): void;
|
|
42
33
|
cleanupDefunctAccessories(): void;
|
|
43
34
|
}
|
|
44
|
-
//# sourceMappingURL=platform.d.ts.map
|