homebridge-tasmota 0.2.0-beta.13 → 0.2.0-beta.15
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/.github/{npm-version-script.js → npm-version-script-esm.js} +8 -8
- package/.github/workflows/Build and Publish.yml +2 -2
- package/dist/TasmotaService.d.ts +21 -11
- package/dist/TasmotaService.js +77 -53
- package/dist/TasmotaService.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.js +7 -6
- package/dist/index.js.map +1 -1
- package/dist/lib/Mqtt.d.ts +19 -5
- package/dist/lib/Mqtt.js +96 -116
- package/dist/lib/Mqtt.js.map +1 -1
- package/dist/platform.d.ts +25 -9
- package/dist/platform.js +192 -221
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +6 -0
- package/dist/settings.js +8 -5
- package/dist/settings.js.map +1 -1
- package/dist/tasmotaBinarySensorService.d.ts +8 -3
- package/dist/tasmotaBinarySensorService.js +38 -22
- package/dist/tasmotaBinarySensorService.js.map +1 -1
- package/dist/tasmotaFanService.d.ts +12 -3
- package/dist/tasmotaFanService.js +57 -38
- package/dist/tasmotaFanService.js.map +1 -1
- package/dist/tasmotaGarageService.d.ts +39 -3
- package/dist/tasmotaGarageService.js +117 -58
- package/dist/tasmotaGarageService.js.map +1 -1
- package/dist/tasmotaLightService.d.ts +15 -6
- package/dist/tasmotaLightService.js +124 -169
- package/dist/tasmotaLightService.js.map +1 -1
- package/dist/tasmotaSensorService.d.ts +8 -3
- package/dist/tasmotaSensorService.js +217 -65
- package/dist/tasmotaSensorService.js.map +1 -1
- package/dist/tasmotaSwitchService.d.ts +16 -3
- package/dist/tasmotaSwitchService.js +118 -33
- package/dist/tasmotaSwitchService.js.map +1 -1
- package/dist/utils.d.ts +33 -0
- package/dist/utils.js +266 -0
- package/dist/utils.js.map +1 -0
- package/dist/utils.test.d.ts +1 -0
- package/dist/utils.test.js +53 -0
- package/dist/utils.test.js.map +1 -0
- package/eslint.config.js +35 -0
- package/package.json +16 -19
- package/beta.sh +0 -21
- package/notes.MD +0 -1
- package/publish.sh +0 -21
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
* This scripts queries the npm registry to pull out the latest version for a given tag.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
import assert from 'node:assert'
|
|
8
|
+
import child_process from 'node:child_process'
|
|
9
|
+
import fs from 'node:fs'
|
|
10
|
+
import process from 'node:process'
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
import semver from 'semver'
|
|
13
13
|
|
|
14
14
|
const BRANCH_VERSION_PATTERN = /^([A-Z]+)-(\d+\.\d+\.\d+)$/i
|
|
15
15
|
|
|
@@ -19,9 +19,9 @@ const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf8'))
|
|
|
19
19
|
const refArgument = process.argv[2]
|
|
20
20
|
const tagArgument = process.argv[3] || 'latest'
|
|
21
21
|
|
|
22
|
-
if (refArgument
|
|
22
|
+
if (refArgument === null) {
|
|
23
23
|
console.error('ref argument is missing')
|
|
24
|
-
console.error('Usage: npm-version-script.js <ref> [tag]')
|
|
24
|
+
console.error('Usage: npm-version-script-esm.js <ref> [tag]')
|
|
25
25
|
process.exit(1)
|
|
26
26
|
}
|
|
27
27
|
|
|
@@ -50,7 +50,7 @@ function desiredTargetVersion(ref) {
|
|
|
50
50
|
const branchName = ref.slice('refs/heads/'.length)
|
|
51
51
|
|
|
52
52
|
const results = branchName.match(BRANCH_VERSION_PATTERN)
|
|
53
|
-
if (results
|
|
53
|
+
if (results !== null) {
|
|
54
54
|
if (results[1] !== tagArgument) {
|
|
55
55
|
console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`)
|
|
56
56
|
}
|
|
@@ -85,7 +85,7 @@ jobs:
|
|
|
85
85
|
needs: [get_tags, create_documentation]
|
|
86
86
|
name: Publish Release Version
|
|
87
87
|
if: ${{ needs.get_tags.outputs.BRANCH_NAME == 'main' }}
|
|
88
|
-
uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
|
|
88
|
+
uses: homebridge/.github/.github/workflows/npm-publish-esm.yml@latest
|
|
89
89
|
with:
|
|
90
90
|
install_cmd: npm ci
|
|
91
91
|
secrets:
|
|
@@ -97,7 +97,7 @@ jobs:
|
|
|
97
97
|
needs: [get_tags, create_documentation]
|
|
98
98
|
name: Publish Test Version - ${{ needs.get_tags.outputs.BRANCH_NAME }}
|
|
99
99
|
if: ${{ needs.get_tags.outputs.BRANCH_NAME != 'main' }}
|
|
100
|
-
uses: homebridge/.github/.github/workflows/npm-publish.yml@latest
|
|
100
|
+
uses: homebridge/.github/.github/workflows/npm-publish-esm.yml@latest
|
|
101
101
|
with:
|
|
102
102
|
tag: ${{ needs.get_tags.outputs.TARGET_IMAGE_TAG }}
|
|
103
103
|
dynamically_adjust_version: true
|
package/dist/TasmotaService.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
|
-
import { Characteristic, PlatformAccessory, Service } from 'homebridge';
|
|
2
|
-
import
|
|
1
|
+
import { Characteristic, CharacteristicValue, Nullable, PlatformAccessory, Service } from 'homebridge';
|
|
2
|
+
import nunjucks from 'nunjucks';
|
|
3
|
+
import { tasmotaPlatform } from './platform.js';
|
|
4
|
+
/**
|
|
5
|
+
* Platform Accessory
|
|
6
|
+
* An instance of this class is created for each accessory your platform registers
|
|
7
|
+
* Each accessory may expose multiple services of different service types.
|
|
8
|
+
*/
|
|
3
9
|
interface Subscription {
|
|
4
10
|
event: string;
|
|
5
11
|
callback: any;
|
|
@@ -8,23 +14,27 @@ export declare class TasmotaService {
|
|
|
8
14
|
readonly platform: tasmotaPlatform;
|
|
9
15
|
readonly accessory: PlatformAccessory;
|
|
10
16
|
protected readonly uniq_id: string;
|
|
11
|
-
service
|
|
12
|
-
protected characteristic
|
|
17
|
+
service?: Service;
|
|
18
|
+
protected characteristic?: Characteristic;
|
|
13
19
|
protected device_class: string;
|
|
14
|
-
statusSubscribe
|
|
15
|
-
availabilitySubscribe
|
|
20
|
+
statusSubscribe?: Subscription;
|
|
21
|
+
availabilitySubscribe?: Subscription;
|
|
16
22
|
fakegato: string;
|
|
17
|
-
nunjucksEnvironment:
|
|
23
|
+
nunjucksEnvironment: nunjucks.Environment;
|
|
18
24
|
protected uuid: string;
|
|
19
25
|
constructor(platform: tasmotaPlatform, accessory: PlatformAccessory, uniq_id: string);
|
|
20
26
|
enableFakegato(): void;
|
|
21
27
|
enableStatus(): void;
|
|
22
28
|
deviceClassToHKCharacteristic(device_class: string): any;
|
|
23
29
|
refresh(): void;
|
|
24
|
-
statusUpdate(topic:
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
30
|
+
statusUpdate(topic: string, message: Buffer): 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
|
+
availabilityUpdate(topic: string, message: Buffer): void;
|
|
36
|
+
delta(value1: Nullable<CharacteristicValue> | undefined, value2: Nullable<CharacteristicValue> | undefined): boolean;
|
|
37
|
+
parseValue(valueTemplate: string, value: string): string;
|
|
28
38
|
}
|
|
29
39
|
export declare function isTrue(value: string | boolean | number): boolean;
|
|
30
40
|
export {};
|
package/dist/TasmotaService.js
CHANGED
|
@@ -1,23 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
1
|
+
import createDebug from 'debug';
|
|
2
|
+
import os from 'node:os';
|
|
3
|
+
import nunjucks from 'nunjucks';
|
|
4
|
+
const debug = createDebug('Tasmota:Service');
|
|
5
|
+
export class TasmotaService {
|
|
6
|
+
platform;
|
|
7
|
+
accessory;
|
|
8
|
+
uniq_id;
|
|
9
|
+
service;
|
|
10
|
+
characteristic;
|
|
11
|
+
device_class;
|
|
12
|
+
statusSubscribe;
|
|
13
|
+
availabilitySubscribe;
|
|
14
|
+
fakegato;
|
|
15
|
+
nunjucksEnvironment;
|
|
16
|
+
uuid;
|
|
13
17
|
constructor(platform, accessory, uniq_id) {
|
|
14
18
|
this.platform = platform;
|
|
15
19
|
this.accessory = accessory;
|
|
16
20
|
this.uniq_id = uniq_id;
|
|
21
|
+
this.fakegato = '';
|
|
17
22
|
this.uuid = this.platform.api.hap.uuid.generate(this.accessory.context.device[this.uniq_id].uniq_id);
|
|
18
23
|
this.device_class = accessory.context.device[this.uniq_id].dev_cla;
|
|
19
|
-
this.nunjucksEnvironment = new
|
|
24
|
+
this.nunjucksEnvironment = new nunjucks.Environment();
|
|
25
|
+
// Home Assistant device template filters
|
|
20
26
|
this.nunjucksEnvironment.addFilter('is_defined', (val, cb) => {
|
|
27
|
+
// console.log('is_defined', val, cb);
|
|
21
28
|
if (val || val === 0) {
|
|
22
29
|
cb(null, val);
|
|
23
30
|
}
|
|
@@ -25,15 +32,19 @@ class TasmotaService {
|
|
|
25
32
|
cb(new Error('missing key'), val);
|
|
26
33
|
}
|
|
27
34
|
}, true);
|
|
35
|
+
function float(val) {
|
|
36
|
+
return (Number.parseFloat(val));
|
|
37
|
+
}
|
|
28
38
|
this.nunjucksEnvironment.addGlobal('float', float);
|
|
29
|
-
|
|
30
|
-
|
|
39
|
+
nunjucks.installJinjaCompat();
|
|
40
|
+
nunjucks.configure({
|
|
31
41
|
autoescape: true,
|
|
32
42
|
});
|
|
33
43
|
}
|
|
34
44
|
enableFakegato() {
|
|
35
|
-
|
|
36
|
-
|
|
45
|
+
// Enable historical logging
|
|
46
|
+
if (this.platform.config.history && !this.accessory.context.fakegatoService?.addEntry) {
|
|
47
|
+
const hostname = os.hostname().split('.')[0];
|
|
37
48
|
this.accessory.context.fakegatoService = new this.platform.FakeGatoHistoryService('custom', this.accessory, {
|
|
38
49
|
storage: 'fs',
|
|
39
50
|
minutes: this.platform.config.historyInterval ?? 10,
|
|
@@ -52,13 +63,13 @@ class TasmotaService {
|
|
|
52
63
|
if (this.accessory.context.device[this.uniq_id].stat_t) {
|
|
53
64
|
this.platform.log.debug('Creating statusUpdate listener for %s %s', this.accessory.context.device[this.uniq_id].stat_t, this.accessory.context.device[this.uniq_id].name);
|
|
54
65
|
this.statusSubscribe = { event: this.accessory.context.device[this.uniq_id].stat_t, callback: this.statusUpdate.bind(this) };
|
|
55
|
-
this.
|
|
56
|
-
this.
|
|
66
|
+
this.platform.mqttHost.on(this.accessory.context.device[this.uniq_id].stat_t, this.statusUpdate.bind(this));
|
|
67
|
+
this.platform.mqttHost.statusSubscribe(this.accessory.context.device[this.uniq_id].stat_t);
|
|
57
68
|
}
|
|
58
69
|
if (this.accessory.context.device[this.uniq_id].avty_t) {
|
|
59
70
|
this.availabilitySubscribe = { event: this.accessory.context.device[this.uniq_id].avty_t, callback: this.availabilityUpdate.bind(this) };
|
|
60
|
-
this.
|
|
61
|
-
this.availabilitySubscribe = this.
|
|
71
|
+
this.platform.mqttHost.on(this.accessory.context.device[this.uniq_id].avty_t, this.availabilityUpdate.bind(this));
|
|
72
|
+
this.availabilitySubscribe = this.platform.mqttHost.availabilitySubscribe(this.accessory.context.device[this.uniq_id].avty_t);
|
|
62
73
|
}
|
|
63
74
|
else {
|
|
64
75
|
this.platform.log.warn('Warning: Availability not supported for: %s', this.accessory.context.device[this.uniq_id].name);
|
|
@@ -68,88 +79,101 @@ class TasmotaService {
|
|
|
68
79
|
deviceClassToHKCharacteristic(device_class) {
|
|
69
80
|
switch (device_class) {
|
|
70
81
|
case '-dt24-amp':
|
|
71
|
-
case '_energy_current':
|
|
82
|
+
case '_energy_current': // Amps
|
|
72
83
|
return (this.platform.CustomCharacteristics.ElectricCurrent);
|
|
73
|
-
case '_energy_voltage':
|
|
74
|
-
case '-dt24-volt':
|
|
84
|
+
case '_energy_voltage': // Voltage
|
|
85
|
+
case '-dt24-volt': // dt24
|
|
75
86
|
return (this.platform.CustomCharacteristics.Voltage);
|
|
76
|
-
case '_energy_power':
|
|
77
|
-
case '-dt24-watt':
|
|
87
|
+
case '_energy_power': // Watts
|
|
88
|
+
case '-dt24-watt': // dt24
|
|
78
89
|
return (this.platform.CustomCharacteristics.CurrentConsumption);
|
|
79
|
-
case '_energy_total':
|
|
90
|
+
case '_energy_total': // Total Kilowatts
|
|
80
91
|
case '-dt24-watt-hour':
|
|
81
92
|
return (this.platform.CustomCharacteristics.TotalConsumption);
|
|
82
93
|
break;
|
|
83
94
|
}
|
|
84
95
|
}
|
|
85
96
|
refresh() {
|
|
97
|
+
// Get current status for accessory/service on startup
|
|
98
|
+
// Wild cards in topic break this
|
|
99
|
+
// eslint-disable-next-line no-useless-escape
|
|
86
100
|
if (this.accessory.context.device[this.uniq_id].stat_t && !this.accessory.context.device[this.uniq_id].stat_t.match('/\+|#/g')) {
|
|
87
101
|
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`;
|
|
88
|
-
this.
|
|
102
|
+
this.platform.mqttHost.sendMessage(teleperiod, this.platform.teleperiod.toString());
|
|
89
103
|
}
|
|
90
104
|
}
|
|
91
105
|
statusUpdate(topic, message) {
|
|
92
|
-
debug('statusUpdate for "%s" on topic "%s" ->', this.service
|
|
106
|
+
debug('statusUpdate for "%s" on topic "%s" ->', this.service?.displayName, topic, message.toString());
|
|
93
107
|
this.accessory.context.timeout = this.platform.autoCleanup(this.accessory);
|
|
94
108
|
try {
|
|
95
109
|
let value = this.parseValue(this.accessory.context.device[this.uniq_id].val_tpl, message.toString());
|
|
110
|
+
// Sensor value tweaks or adjustments needed for homekit
|
|
96
111
|
switch (this.device_class) {
|
|
97
112
|
case 'temperature':
|
|
98
113
|
if (this.accessory.context.device[this.uniq_id].unit_of_meas.toUpperCase() === 'F') {
|
|
99
|
-
value = Math.round((value - 32) * 5 / 9 * 10) / 10;
|
|
114
|
+
value = String(Math.round((Number(value) - 32) * 5 / 9 * 10) / 10);
|
|
100
115
|
}
|
|
101
116
|
break;
|
|
102
117
|
case 'illuminance':
|
|
103
|
-
|
|
118
|
+
// normalize LX in the range homebridge expects
|
|
119
|
+
value = String(Number(value) < 0.0001 ? 0.0001 : (Number(value) > 100000 ? 100000 : value));
|
|
104
120
|
break;
|
|
105
121
|
case 'co2':
|
|
106
|
-
if (value > 1200) {
|
|
107
|
-
this.service
|
|
122
|
+
if (Number(value) > 1200) {
|
|
123
|
+
this.service?.setCharacteristic(this.platform.Characteristic.CarbonDioxideDetected, this.platform.Characteristic.CarbonDioxideDetected.CO2_LEVELS_ABNORMAL);
|
|
108
124
|
}
|
|
109
125
|
else {
|
|
110
|
-
this.service
|
|
126
|
+
this.service?.setCharacteristic(this.platform.Characteristic.CarbonDioxideDetected, this.platform.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL);
|
|
111
127
|
}
|
|
112
128
|
break;
|
|
113
129
|
}
|
|
114
|
-
if (value
|
|
130
|
+
if (this.characteristic?.value !== value && this.delta(String(this.characteristic?.value), String(value))) {
|
|
131
|
+
this.platform.log.info('Updating \'%s:%s\' to %s', this.service?.displayName, this.characteristic?.displayName ?? '', value);
|
|
115
132
|
}
|
|
116
133
|
else {
|
|
117
|
-
|
|
118
|
-
this.platform.log.info('Updating \'%s:%s\' to %s', this.service.displayName, this.characteristic.displayName ?? '', value);
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
-
this.platform.log.debug('Updating \'%s:%s\' to %s', this.service.displayName, this.characteristic.displayName ?? '', value);
|
|
122
|
-
}
|
|
134
|
+
this.platform.log.debug('Updating \'%s:%s\' to %s', this.service?.displayName, this.characteristic?.displayName ?? '', value);
|
|
123
135
|
}
|
|
124
|
-
this.characteristic
|
|
136
|
+
this.characteristic?.updateValue(value);
|
|
125
137
|
}
|
|
126
138
|
catch (err) {
|
|
127
139
|
this.platform.log.error('ERROR: Message Parse Error', topic, message.toString());
|
|
140
|
+
this.platform.log.debug(String((err && err.message ? err.message : err)));
|
|
128
141
|
}
|
|
129
142
|
}
|
|
143
|
+
/**
|
|
144
|
+
* Handle "LWT" Last Will and Testament messages from Tasmota
|
|
145
|
+
* These are sent when the device is no longer available from the MQTT server.
|
|
146
|
+
*/
|
|
130
147
|
availabilityUpdate(topic, message) {
|
|
131
|
-
|
|
148
|
+
// debug("availabilityUpdate", this, topic, message.toString());
|
|
149
|
+
this.platform.log.info('Marking accessory \'%s\' to %s', this.service?.displayName, message.toString());
|
|
132
150
|
if (message.toString() === this.accessory.context.device[this.uniq_id].pl_not_avail) {
|
|
133
151
|
const availability = new Error(`${this.accessory.displayName} ${message.toString()}`);
|
|
134
|
-
this.characteristic
|
|
152
|
+
this.characteristic?.updateValue(availability);
|
|
135
153
|
}
|
|
136
154
|
else {
|
|
137
|
-
|
|
155
|
+
// debug("availabilityUpdate", this.characteristic);
|
|
156
|
+
this.characteristic?.updateValue(this.characteristic?.value);
|
|
138
157
|
}
|
|
139
158
|
}
|
|
159
|
+
// Utility functions for status update
|
|
140
160
|
delta(value1, value2) {
|
|
141
|
-
|
|
161
|
+
// debug("delta", (parseInt(value1) !== parseInt(value2)));
|
|
162
|
+
return (Number.parseInt(String(value1)) !== Number.parseInt(String(value2)));
|
|
142
163
|
}
|
|
143
164
|
parseValue(valueTemplate, value) {
|
|
144
165
|
try {
|
|
145
166
|
if (valueTemplate) {
|
|
146
|
-
|
|
167
|
+
// debug('nunjucksEnvironment', this, this.nunjucksEnvironment);
|
|
168
|
+
const template = nunjucks.compile(valueTemplate, this.nunjucksEnvironment);
|
|
169
|
+
// debug('nunjucksEnvironment', template, this.nunjucksEnvironment, value);
|
|
147
170
|
const result = template.render({ value_json: JSON.parse(value) });
|
|
171
|
+
// debug('nunjucksEnvironment-result', valueTemplate, value, result);
|
|
148
172
|
if (result) {
|
|
149
173
|
return result;
|
|
150
174
|
}
|
|
151
175
|
else {
|
|
152
|
-
return
|
|
176
|
+
return '';
|
|
153
177
|
}
|
|
154
178
|
}
|
|
155
179
|
else {
|
|
@@ -157,14 +181,14 @@ class TasmotaService {
|
|
|
157
181
|
}
|
|
158
182
|
}
|
|
159
183
|
catch (err) {
|
|
184
|
+
// this.platform.log.error('ERROR: Template Parsing error', err.message);
|
|
185
|
+
// debug('ERROR: Template Parsing error', valueTemplate, value);
|
|
186
|
+
// return (err);
|
|
160
187
|
}
|
|
188
|
+
return '';
|
|
161
189
|
}
|
|
162
190
|
}
|
|
163
|
-
|
|
164
|
-
function float(val) {
|
|
165
|
-
return (Number.parseFloat(val));
|
|
166
|
-
}
|
|
167
|
-
function isTrue(value) {
|
|
191
|
+
export function isTrue(value) {
|
|
168
192
|
if (typeof (value) === 'string') {
|
|
169
193
|
value = value.trim().toLowerCase();
|
|
170
194
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { tasmotaPlatform } from './platform.js';
|
|
2
|
+
import { PLATFORM_NAME } from './settings.js';
|
|
3
|
+
/**
|
|
4
|
+
* This method registers the platform with Homebridge
|
|
5
|
+
*/
|
|
6
|
+
export default (api) => {
|
|
7
|
+
api.registerPlatform(PLATFORM_NAME, tasmotaPlatform);
|
|
7
8
|
};
|
|
8
9
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;GAEG;AACH,eAAe,CAAC,GAAQ,EAAQ,EAAE;IAChC,GAAG,CAAC,gBAAgB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;AACvD,CAAC,CAAC"}
|
package/dist/lib/Mqtt.d.ts
CHANGED
|
@@ -1,8 +1,22 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
+
interface Config {
|
|
3
|
+
mqttHost: string;
|
|
4
|
+
mqttUsername?: string;
|
|
5
|
+
mqttPassword?: string;
|
|
6
|
+
}
|
|
2
7
|
export declare class Mqtt extends EventEmitter {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
+
private connection;
|
|
9
|
+
private wildCardTopics;
|
|
10
|
+
constructor(config: Config);
|
|
11
|
+
private setupConnectionHandlers;
|
|
12
|
+
private handleMessage;
|
|
13
|
+
private handleHomeAssistantMessage;
|
|
14
|
+
private handleDefaultMessage;
|
|
15
|
+
availabilitySubscribe(topic: string): undefined;
|
|
16
|
+
statusSubscribe(topic: string): void;
|
|
17
|
+
sendMessage(topic: string, message: string): void;
|
|
18
|
+
private isWildcardTopic;
|
|
19
|
+
private getWildcardTopic;
|
|
20
|
+
private mqttWildcard;
|
|
8
21
|
}
|
|
22
|
+
export {};
|