matterbridge-dyson-robot 1.10.11 → 1.10.12
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 +8 -3
- package/dist/dyson-mqtt-cache.js +14 -6
- package/dist/dyson-mqtt-cache.js.map +1 -1
- package/dist/dyson-mqtt-client-mock.js +18 -7
- package/dist/dyson-mqtt-client-mock.js.map +1 -1
- package/dist/dyson-mqtt-connect.js +32 -28
- package/dist/dyson-mqtt-connect.js.map +1 -1
- package/dist/endpoint-air.js +30 -13
- package/dist/endpoint-air.js.map +1 -1
- package/dist/periodic.js +19 -17
- package/dist/periodic.js.map +1 -1
- package/dist/ti/config-types.js +1 -1
- package/dist/ti/dyson-360-cloud-types.js +1 -1
- package/dist/ti/dyson-360-msg-types.js +1 -1
- package/dist/ti/dyson-360-types.js +1 -1
- package/dist/ti/dyson-air-cloud-types.js +1 -1
- package/dist/ti/dyson-air-msg-types.js +1 -1
- package/dist/ti/dyson-air-sensor-types.js +1 -1
- package/dist/ti/dyson-air-state-types.js +1 -1
- package/dist/ti/dyson-air-types.js +1 -1
- package/dist/ti/dyson-cloud-types.js +1 -1
- package/dist/ti/dyson-types.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [v1.10.12] - 2026-06-13
|
|
8
|
+
### Fixed
|
|
9
|
+
* Fixed control of air treatment machines. (#33)
|
|
10
|
+
|
|
7
11
|
## [v1.10.11] - 2026-06-13
|
|
8
12
|
### Changed
|
|
9
13
|
* Retry failures connecting to the Dyson cloud API (instead of just for HTTP status codes).
|
|
@@ -377,9 +381,10 @@ All notable changes to this project will be documented in this file.
|
|
|
377
381
|
|
|
378
382
|
Copyright © 2025-2026 Alexander Thoukydides
|
|
379
383
|
|
|
380
|
-
[Unreleased]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.
|
|
381
|
-
[v1.10.
|
|
382
|
-
[v1.10.
|
|
384
|
+
[Unreleased]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.12...HEAD
|
|
385
|
+
[v1.10.12]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.11...v1.10.12
|
|
386
|
+
[v1.10.11]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.10...v1.10.11
|
|
387
|
+
[v1.10.10]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.9...v1.10.10
|
|
383
388
|
[v1.10.9]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.8...v1.10.9
|
|
384
389
|
[v1.10.8]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.7...v1.10.8
|
|
385
390
|
[v1.10.7]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.10.6...v1.10.7
|
package/dist/dyson-mqtt-cache.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Matterbridge plugin for Dyson robot vacuum and air treatment devices
|
|
2
2
|
// Copyright © 2025-2026 Alexander Thoukydides
|
|
3
3
|
import EventEmitter from 'events';
|
|
4
|
+
import { logError } from './log-error.js';
|
|
4
5
|
// Cache version
|
|
5
6
|
const MQTT_CACHE_VERSION = 1;
|
|
6
7
|
// Cache Dyson MQTT status to allow start-up when device is offline
|
|
@@ -15,18 +16,25 @@ export class DysonMqttCache extends EventEmitter {
|
|
|
15
16
|
this.persist = persist;
|
|
16
17
|
this.serialNumber = serialNumber;
|
|
17
18
|
// Attempt to restore any previously cached status
|
|
18
|
-
|
|
19
|
+
this.restore();
|
|
19
20
|
}
|
|
20
21
|
// Construct a persistent storage key for the cache
|
|
21
22
|
get key() {
|
|
22
23
|
return `mqtt-cache-v${MQTT_CACHE_VERSION}:${this.serialNumber}`;
|
|
23
24
|
}
|
|
24
25
|
// Retrieve the cached status, if any
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
restore() {
|
|
27
|
+
void (async () => {
|
|
28
|
+
try {
|
|
29
|
+
const status = await this.persist.getItem(this.key);
|
|
30
|
+
if (!status)
|
|
31
|
+
return;
|
|
32
|
+
this.emit('restored', status);
|
|
33
|
+
}
|
|
34
|
+
catch (err) {
|
|
35
|
+
logError(this.log, 'MQTT Cache Restore', err);
|
|
36
|
+
}
|
|
37
|
+
})();
|
|
30
38
|
}
|
|
31
39
|
// Store the current status in the cache
|
|
32
40
|
async store(status) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-cache.js","sourceRoot":"","sources":["../src/dyson-mqtt-cache.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,8CAA8C;AAE9C,OAAO,YAAY,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-cache.js","sourceRoot":"","sources":["../src/dyson-mqtt-cache.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,8CAA8C;AAE9C,OAAO,YAAY,MAAM,QAAQ,CAAC;AAGlC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,gBAAgB;AAChB,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAQ7B,mEAAmE;AACnE,MAAM,OAAO,cAAkB,SAAQ,YAAuC;IAI7D;IACA;IACA;IAJb,0BAA0B;IAC1B,YACa,GAAyB,EACzB,OAAuC,EACvC,YAAqB;QAE9B,KAAK,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;QAJ1B,QAAG,GAAH,GAAG,CAAsB;QACzB,YAAO,GAAP,OAAO,CAAgC;QACvC,iBAAY,GAAZ,YAAY,CAAS;QAI9B,kDAAkD;QAClD,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,mDAAmD;IACnD,IAAI,GAAG;QACH,OAAO,eAAe,kBAAkB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;IACpE,CAAC;IAED,qCAAqC;IACrC,OAAO;QACH,KAAK,CAAC,KAAK,IAAI,EAAE;YACb,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAkB,CAAC;gBACrE,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC;QACL,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED,wCAAwC;IACxC,KAAK,CAAC,KAAK,CAAC,MAAS;QACjB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;CACJ"}
|
|
@@ -4,6 +4,7 @@ import { DysonMqttClient } from './dyson-mqtt-client-base.js';
|
|
|
4
4
|
import { readFile } from 'node:fs/promises';
|
|
5
5
|
import { assertIsDefined, formatList, MS, plural } from './utils.js';
|
|
6
6
|
import { setTimeout } from 'node:timers/promises';
|
|
7
|
+
import { logError } from './log-error.js';
|
|
7
8
|
// Interval between messages when replaying the log file
|
|
8
9
|
const INITIALISE_INTERVAL = 35 * MS; // 35 seconds
|
|
9
10
|
const MESSAGE_INTERVAL = 100; // 10 milliseconds
|
|
@@ -34,18 +35,28 @@ export class DysonMqttClientMock extends DysonMqttClient {
|
|
|
34
35
|
const packet = { cmd: 'connack', sessionPresent: false };
|
|
35
36
|
this.emit('connect', packet);
|
|
36
37
|
// Start emitting messages from the log file
|
|
37
|
-
|
|
38
|
+
this.playbackMessages();
|
|
39
|
+
}
|
|
40
|
+
// Emit the sequence of messages from the log file
|
|
41
|
+
playbackMessages() {
|
|
42
|
+
void (async () => {
|
|
43
|
+
try {
|
|
44
|
+
while (await this.emitNextMessage()) { /* empty */ }
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
logError(this.log, 'MQTT Mock Playback', err);
|
|
48
|
+
}
|
|
49
|
+
})();
|
|
38
50
|
}
|
|
39
51
|
// Emit the next message from the log file, if any
|
|
40
52
|
async emitNextMessage() {
|
|
41
|
-
//
|
|
42
|
-
await setTimeout(MESSAGE_INTERVAL);
|
|
43
|
-
// Check for more messages
|
|
53
|
+
// Retrieve the next message
|
|
44
54
|
const line = this.lines.shift();
|
|
45
55
|
if (!line) {
|
|
46
56
|
this.log.debug('End of MQTT log file reached');
|
|
47
|
-
return;
|
|
57
|
+
return false;
|
|
48
58
|
}
|
|
59
|
+
// Check for more messages
|
|
49
60
|
if (line === INITIALISE_MARKER) {
|
|
50
61
|
// Extra delay for initialisation after the first few messages
|
|
51
62
|
this.log.debug('Pausing MQTT log file playback');
|
|
@@ -54,13 +65,13 @@ export class DysonMqttClientMock extends DysonMqttClient {
|
|
|
54
65
|
}
|
|
55
66
|
else {
|
|
56
67
|
// Assume all messages come from the status topic
|
|
68
|
+
await setTimeout(MESSAGE_INTERVAL);
|
|
57
69
|
const topic = this.topic;
|
|
58
70
|
const payload = Buffer.from(line);
|
|
59
71
|
const packet = { cmd: 'publish', topic, payload, qos: 0, dup: false, retain: false };
|
|
60
72
|
this.emit('message', topic, payload, packet);
|
|
61
73
|
}
|
|
62
|
-
|
|
63
|
-
void this.emitNextMessage();
|
|
74
|
+
return true;
|
|
64
75
|
}
|
|
65
76
|
// Ignore requests to publish messages
|
|
66
77
|
publishAsync(...args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-client-mock.js","sourceRoot":"","sources":["../src/dyson-mqtt-client-mock.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,8CAA8C;AAI9C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAO9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-client-mock.js","sourceRoot":"","sources":["../src/dyson-mqtt-client-mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,41 +58,45 @@ export class DysonMqttConnection {
|
|
|
58
58
|
this.log.info('MQTT client closed stream after failed connection attempt');
|
|
59
59
|
}
|
|
60
60
|
// Try to (re)establish the connection again
|
|
61
|
-
|
|
61
|
+
this.reconnect();
|
|
62
62
|
});
|
|
63
63
|
// Attempt the initial connection
|
|
64
|
-
|
|
64
|
+
this.start();
|
|
65
65
|
}
|
|
66
66
|
// Attempt a reconnection
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
catch (err) {
|
|
80
|
-
if (!(err instanceof Error && err.name === 'AbortError')) {
|
|
81
|
-
logError(this.log, 'MQTT Reconnect', err);
|
|
67
|
+
reconnect() {
|
|
68
|
+
void (async () => {
|
|
69
|
+
try {
|
|
70
|
+
// Wait for the backoff before reconnecting
|
|
71
|
+
this.log.info(`MQTT client reconnecting in ${formatMilliseconds(this.backoff)}...`);
|
|
72
|
+
const { signal } = this.terminate;
|
|
73
|
+
await setTimeout(this.backoff, undefined, { signal });
|
|
74
|
+
// Attempt the reconnection
|
|
75
|
+
this.log.info('MQTT client attempting reconnection...');
|
|
76
|
+
await this.mqtt.connect();
|
|
77
|
+
// Increase backoff for the next attempt
|
|
78
|
+
this.backoff = Math.min(this.backoff * BACKOFF_FACTOR, BACKOFF_MAX);
|
|
82
79
|
}
|
|
83
|
-
|
|
84
|
-
|
|
80
|
+
catch (err) {
|
|
81
|
+
if (!(err instanceof Error && err.name === 'AbortError')) {
|
|
82
|
+
logError(this.log, 'MQTT Reconnect', err);
|
|
83
|
+
}
|
|
84
|
+
// (Don't retry if failed before attempting reconnection)
|
|
85
|
+
}
|
|
86
|
+
});
|
|
85
87
|
}
|
|
86
88
|
// Attempt the initial connection
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
start() {
|
|
90
|
+
void (async () => {
|
|
91
|
+
try {
|
|
92
|
+
this.log.info('Starting MQTT client...');
|
|
93
|
+
await this.mqtt.connect();
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
logError(this.log, 'MQTT Start', err);
|
|
97
|
+
// (Don't retry if failed before attempting connection)
|
|
98
|
+
}
|
|
99
|
+
})();
|
|
96
100
|
}
|
|
97
101
|
// Stop the MQTT client
|
|
98
102
|
async stop() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-connect.js","sourceRoot":"","sources":["../src/dyson-mqtt-connect.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,8CAA8C;AAI9C,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,gCAAgC;AAChC,MAAM,WAAW,GAAc,CAAC,GAAG,EAAE,CAAC,CAAE,2BAA2B;AACnE,MAAM,WAAW,GAAa,EAAE,GAAG,EAAE,CAAC,CAAE,2BAA2B;AACnE,MAAM,cAAc,GAAU,CAAC,CAAC,CAAQ,iCAAiC;AACzE,MAAM,oBAAoB,GAAI,EAAE,GAAG,EAAE,CAAC,CAAE,mCAAmC;AAE3E,wCAAwC;AACxC,MAAM,OAAO,mBAAmB;IAWf;IACA;IACA;IAXb,gCAAgC;IAChC,SAAS,GAAS,IAAI,eAAe,EAAE,CAAC;IAExC,oCAAoC;IACpC,OAAO,GAAW,WAAW,CAAC;IAC9B,WAAW,CAAY;IAEvB,8BAA8B;IAC9B,YACa,GAAqB,EACrB,MAAiB,EACjB,IAA0B;QAF1B,QAAG,GAAH,GAAG,CAAkB;QACrB,WAAM,GAAN,MAAM,CAAW;QACjB,SAAI,GAAJ,IAAI,CAAsB;QAEnC,wDAAwD;QACxD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACzB,mDAAmD;YACnD,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAC5C,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS;gBAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YACrF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;YACjB,4BAA4B;YAC5B,QAAQ,CAAC,GAAG,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC7C,8DAA8D;QAClE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAChB,iDAAiD;YACjD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;gBACjE,OAAO;YACX,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC7C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;gBAC7B,MAAM,WAAW,GAAG,mCAAmC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpF,IAAI,MAAM,GAAG,oBAAoB,EAAE,CAAC;oBAChC,oDAAoD;oBACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACJ,qDAAqD;oBACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,6CAA6C,CAAC,CAAC;oBAC3E,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC;gBAC/B,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;YAC/E,CAAC;YAED,4CAA4C;YAC5C,
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-connect.js","sourceRoot":"","sources":["../src/dyson-mqtt-connect.ts"],"names":[],"mappings":"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"}
|
package/dist/endpoint-air.js
CHANGED
|
@@ -251,18 +251,25 @@ let EndpointsAir = (() => {
|
|
|
251
251
|
const { onOff: onOffHandler, ...otherHandlers } = handlers;
|
|
252
252
|
this.subscribeAttributes(endpoint, fanControlBehavior, 'Fan Control', otherHandlers);
|
|
253
253
|
// Install On/Off command handlers
|
|
254
|
-
const setOnOff =
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
254
|
+
const setOnOff = (command, newValue) => {
|
|
255
|
+
void (async () => {
|
|
256
|
+
try {
|
|
257
|
+
this.log.debug(`On/Off command: ${command}`);
|
|
258
|
+
const oldValue = endpoint.getAttribute(onOffBehavior, 'onOff', this.log);
|
|
259
|
+
assertIsBoolean(oldValue);
|
|
260
|
+
newValue ??= !oldValue; // (for Toggle command)
|
|
261
|
+
// Call the handler
|
|
262
|
+
await onOffHandler(newValue, oldValue);
|
|
263
|
+
// (status update will set the OnOff attribute)
|
|
264
|
+
}
|
|
265
|
+
catch (err) {
|
|
266
|
+
logError(this.log, `Fan Command ${command}`, err);
|
|
267
|
+
}
|
|
268
|
+
})();
|
|
262
269
|
};
|
|
263
|
-
endpoint.addCommandHandler('on', () => {
|
|
264
|
-
endpoint.addCommandHandler('off', () => {
|
|
265
|
-
endpoint.addCommandHandler('toggle', () => {
|
|
270
|
+
endpoint.addCommandHandler('on', () => { setOnOff('On', true); });
|
|
271
|
+
endpoint.addCommandHandler('off', () => { setOnOff('Off', false); });
|
|
272
|
+
endpoint.addCommandHandler('toggle', () => { setOnOff('Toggle'); });
|
|
266
273
|
}
|
|
267
274
|
// Install Thermostat cluster handlers
|
|
268
275
|
setThermostatHandlers(handlers) {
|
|
@@ -290,9 +297,10 @@ let EndpointsAir = (() => {
|
|
|
290
297
|
}
|
|
291
298
|
// Subscribe to attribute updates
|
|
292
299
|
subscribeAttributes(endpoint, cluster, name, handlers) {
|
|
300
|
+
const attributes = new Set(this.getClusterAttributes(endpoint, cluster));
|
|
293
301
|
const handlersList = Object.entries(handlers);
|
|
294
|
-
for (const
|
|
295
|
-
if (!handler)
|
|
302
|
+
for (const [attribute, handler] of handlersList) {
|
|
303
|
+
if (!handler || !attributes.has(attribute))
|
|
296
304
|
continue;
|
|
297
305
|
const description = `${name} ${attribute.toString()}`;
|
|
298
306
|
// Wrapper around handler to trap errors and flush the change cache
|
|
@@ -316,6 +324,15 @@ let EndpointsAir = (() => {
|
|
|
316
324
|
endpoint.subscribeAttribute(cluster, attribute, wrapper, this.log);
|
|
317
325
|
}
|
|
318
326
|
}
|
|
327
|
+
// Get the list of all attributes on a specific cluster
|
|
328
|
+
getClusterAttributes(endpoint, cluster) {
|
|
329
|
+
const attributes = [];
|
|
330
|
+
endpoint.forEachAttribute((clusterName, _clusterId, attributeName) => {
|
|
331
|
+
if (clusterName === cluster.id)
|
|
332
|
+
attributes.push(attributeName);
|
|
333
|
+
});
|
|
334
|
+
return attributes;
|
|
335
|
+
}
|
|
319
336
|
// Update the Bridged Device Basic Information cluster attributes
|
|
320
337
|
async updateReachable(reachable) {
|
|
321
338
|
await Promise.all(this.bridged.map(e => e.updateReachable(reachable)));
|
package/dist/endpoint-air.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-air.js","sourceRoot":"","sources":["../src/endpoint-air.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"endpoint-air.js","sourceRoot":"","sources":["../src/endpoint-air.ts"],"names":[],"mappings":"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"}
|
package/dist/periodic.js
CHANGED
|
@@ -29,7 +29,7 @@ export class Periodic {
|
|
|
29
29
|
constructor(log, config) {
|
|
30
30
|
this.log = log;
|
|
31
31
|
this.config = config;
|
|
32
|
-
|
|
32
|
+
this.restartWatchdog();
|
|
33
33
|
this.runPeriodicPromise = this.runPeriodic();
|
|
34
34
|
}
|
|
35
35
|
// Stop the periodic operation, waiting for any in-progress operation
|
|
@@ -45,7 +45,7 @@ export class Periodic {
|
|
|
45
45
|
// Reset the watchdog and reschedule the next operation
|
|
46
46
|
up() {
|
|
47
47
|
// Restart the watchdog timer
|
|
48
|
-
|
|
48
|
+
this.restartWatchdog();
|
|
49
49
|
// Reschedule the next operation
|
|
50
50
|
this.lastActivityTime = Date.now();
|
|
51
51
|
this.abortInterval?.abort();
|
|
@@ -81,22 +81,24 @@ export class Periodic {
|
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
// (Re)start the watchdog timer
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
catch (err) {
|
|
96
|
-
if (!(err instanceof Error && err.name === 'AbortError')) {
|
|
97
|
-
logError(this.log, this.config.name, err);
|
|
84
|
+
restartWatchdog() {
|
|
85
|
+
void (async () => {
|
|
86
|
+
try {
|
|
87
|
+
// Abort any existing watchdog
|
|
88
|
+
this.abortWatchdog?.abort();
|
|
89
|
+
// Start a new watchdog
|
|
90
|
+
this.abortWatchdog = new AbortController();
|
|
91
|
+
const { signal } = this.abortWatchdog;
|
|
92
|
+
await setTimeout(this.config.watchdog, undefined, { signal });
|
|
93
|
+
// The timeout has occurred, so change the status to 'Down'
|
|
94
|
+
this.setStatus(PeriodicStatus.Down);
|
|
98
95
|
}
|
|
99
|
-
|
|
96
|
+
catch (err) {
|
|
97
|
+
if (!(err instanceof Error && err.name === 'AbortError')) {
|
|
98
|
+
logError(this.log, this.config.name, err);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
})();
|
|
100
102
|
}
|
|
101
103
|
}
|
|
102
104
|
//# sourceMappingURL=periodic.js.map
|
package/dist/periodic.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"periodic.js","sourceRoot":"","sources":["../src/periodic.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,8CAA8C;AAI9C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,0BAA0B;AAC1B,MAAM,CAAN,IAAY,cAA0C;AAAtD,WAAY,cAAc;IAAG,yDAAS,CAAA;IAAE,mDAAM,CAAA;IAAE,+CAAI,CAAA;AAAC,CAAC,EAA1C,cAAc,KAAd,cAAc,QAA4B;AAAA,CAAC;AAWvD,0DAA0D;AAC1D,MAAM,OAAO,QAAQ;IAoBJ;IACA;IAnBb,iDAAiD;IACjD,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC;IAEhC,qCAAqC;IAC7B,aAAa,CAAmB;IAChC,aAAa,CAAmB;IAExC,qCAAqC;IAC7B,OAAO,GAAG,IAAI,CAAC;IAEvB,+BAA+B;IACvB,gBAAgB,GAAG,CAAC,CAAC;IAE7B,8BAA8B;IACtB,kBAAkB,CAAgB;IAE1C,iCAAiC;IACjC,YACa,GAAqB,EACrB,MAAyB;QADzB,QAAG,GAAH,GAAG,CAAkB;QACrB,WAAM,GAAN,MAAM,CAAmB;QAElC,
|
|
1
|
+
{"version":3,"file":"periodic.js","sourceRoot":"","sources":["../src/periodic.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,8CAA8C;AAI9C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,0BAA0B;AAC1B,MAAM,CAAN,IAAY,cAA0C;AAAtD,WAAY,cAAc;IAAG,yDAAS,CAAA;IAAE,mDAAM,CAAA;IAAE,+CAAI,CAAA;AAAC,CAAC,EAA1C,cAAc,KAAd,cAAc,QAA4B;AAAA,CAAC;AAWvD,0DAA0D;AAC1D,MAAM,OAAO,QAAQ;IAoBJ;IACA;IAnBb,iDAAiD;IACjD,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC;IAEhC,qCAAqC;IAC7B,aAAa,CAAmB;IAChC,aAAa,CAAmB;IAExC,qCAAqC;IAC7B,OAAO,GAAG,IAAI,CAAC;IAEvB,+BAA+B;IACvB,gBAAgB,GAAG,CAAC,CAAC;IAE7B,8BAA8B;IACtB,kBAAkB,CAAgB;IAE1C,iCAAiC;IACjC,YACa,GAAqB,EACrB,MAAyB;QADzB,QAAG,GAAH,GAAG,CAAkB;QACrB,WAAM,GAAN,MAAM,CAAmB;QAElC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACjD,CAAC;IAED,qEAAqE;IACrE,KAAK,CAAC,IAAI;QACN,+DAA+D;QAC/D,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAE9B,oDAAoD;QACpD,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,uDAAuD;IACvD,EAAE;QACE,6BAA6B;QAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;QAEvB,gCAAgC;QAChC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACnC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC;QAE5B,iCAAiC;QACjC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,iBAAiB;IACT,SAAS,CAAC,MAAsB;QACpC,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;IACL,CAAC;IAED,mDAAmD;IAC3C,KAAK,CAAC,WAAW;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC;gBACD,+CAA+C;gBAC/C,IAAI,CAAC,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;gBACtC,MAAM,eAAe,GAAI,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACnF,MAAM,UAAU,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEzD,wBAAwB;gBACxB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAEzB,gEAAgE;gBAChE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;oBACvD,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,+BAA+B;IACvB,eAAe;QACnB,KAAK,CAAC,KAAK,IAAI,EAAE;YACb,IAAI,CAAC;gBACD,8BAA8B;gBAC9B,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC;gBAE5B,uBAAuB;gBACvB,IAAI,CAAC,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;gBACtC,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAE9D,2DAA2D;gBAC3D,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;oBACvD,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;YACL,CAAC;QACL,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;CACJ"}
|
package/dist/ti/config-types.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.491Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-360-cloud-types-ti.js';
|
|
5
5
|
import { typeSuite as importedTypeSuite0 } from './dyson-360-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.492Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-360-msg-types-ti.js';
|
|
5
5
|
import { typeSuite as importedTypeSuite0 } from './dyson-360-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.493Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-air-cloud-types-ti.js';
|
|
5
5
|
import { typeSuite as importedTypeSuite0 } from './dyson-air-state-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.493Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-air-msg-types-ti.js';
|
|
5
5
|
import { typeSuite as importedTypeSuite0 } from './dyson-360-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.493Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-air-sensor-types-ti.js';
|
|
5
5
|
import { typeSuite as importedTypeSuite0 } from './dyson-air-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.494Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-air-state-types-ti.js';
|
|
5
5
|
import { typeSuite as importedTypeSuite0 } from './dyson-air-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2026-06-
|
|
2
|
+
// 2026-06-13T18:13:02.495Z
|
|
3
3
|
import { createCheckers } from 'ts-interface-checker';
|
|
4
4
|
import exportedTypeSuite from './dyson-cloud-types-ti.js';
|
|
5
5
|
// Type definitions
|
package/dist/ti/dyson-types.js
CHANGED
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "matterbridge-dyson-robot",
|
|
3
3
|
"description": "A Matterbridge plugin that connects Dyson robot vacuums and air treatment devices to the Matter smart home ecosystem via their local or cloud MQTT APIs.",
|
|
4
4
|
"displayName": "Dyson Robot",
|
|
5
|
-
"version": "1.10.
|
|
5
|
+
"version": "1.10.12",
|
|
6
6
|
"license": "ISC",
|
|
7
7
|
"keywords": [
|
|
8
8
|
"Matterbridge",
|