matterbridge-dyson-robot 1.4.2 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -1
- package/README.md +1 -0
- package/dist/dyson-device.d.ts +3 -1
- package/dist/dyson-device.d.ts.map +1 -1
- package/dist/dyson-device.js +7 -3
- package/dist/dyson-device.js.map +1 -1
- package/dist/dyson-mqtt-360.d.ts +2 -1
- package/dist/dyson-mqtt-360.d.ts.map +1 -1
- package/dist/dyson-mqtt-360.js +3 -6
- package/dist/dyson-mqtt-360.js.map +1 -1
- package/dist/dyson-mqtt-air.d.ts +2 -1
- package/dist/dyson-mqtt-air.d.ts.map +1 -1
- package/dist/dyson-mqtt-air.js +3 -6
- package/dist/dyson-mqtt-air.js.map +1 -1
- package/dist/dyson-mqtt-cache.d.ts +17 -0
- package/dist/dyson-mqtt-cache.d.ts.map +1 -0
- package/dist/dyson-mqtt-cache.js +36 -0
- package/dist/dyson-mqtt-cache.js.map +1 -0
- package/dist/dyson-mqtt-client-mock.d.ts.map +1 -1
- package/dist/dyson-mqtt-client-mock.js +0 -1
- package/dist/dyson-mqtt-client-mock.js.map +1 -1
- package/dist/dyson-mqtt-filter.d.ts +1 -1
- package/dist/dyson-mqtt-filter.js +1 -1
- package/dist/dyson-mqtt.d.ts +9 -5
- package/dist/dyson-mqtt.d.ts.map +1 -1
- package/dist/dyson-mqtt.js +62 -11
- package/dist/dyson-mqtt.js.map +1 -1
- package/dist/platform.d.ts +4 -2
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +50 -41
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +1 -1
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +1 -1
- package/dist/settings.js.map +1 -1
- package/dist/ti/config-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-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 +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [v1.6.0] - 2025-10-08
|
|
8
|
+
### Changed
|
|
9
|
+
* Cope with devices that are unreachable during start-up by using cached device details (if available).
|
|
10
|
+
* No MQTT connection is attempted for devices disabled via `blackList` or `whiteList`.
|
|
11
|
+
|
|
12
|
+
## [v1.5.0] - 2025-10-04
|
|
13
|
+
### Changed
|
|
14
|
+
* Compatibility with Matterbridge version 3.4.0.
|
|
15
|
+
* Use Dyson's official Matter Vendor ID (`0x139E`).
|
|
16
|
+
* Updated dependencies.
|
|
17
|
+
|
|
7
18
|
## [v1.4.2] - 2025-09-29
|
|
8
19
|
### Fixed
|
|
9
20
|
* Accept `CURRENT-STATE` MQTT messages from Dyson 360 Heurist. (#13)
|
|
@@ -182,7 +193,9 @@ All notable changes to this project will be documented in this file.
|
|
|
182
193
|
|
|
183
194
|
Copyright © 2025 Alexander Thoukydides
|
|
184
195
|
|
|
185
|
-
[Unreleased]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.
|
|
196
|
+
[Unreleased]: https://github.com/thoukydides/matterbridge-dyson-robot/compare/v1.6.0...HEAD
|
|
197
|
+
[v1.6.0]: https://github.com/thoukydides/homebridge-homeconnect/compare/v1.5.0...v1.6.0
|
|
198
|
+
[v1.5.0]: https://github.com/thoukydides/homebridge-homeconnect/compare/v1.4.2...v1.5.0
|
|
186
199
|
[v1.4.2]: https://github.com/thoukydides/homebridge-homeconnect/compare/v1.4.1...v1.4.2
|
|
187
200
|
[v1.4.1]: https://github.com/thoukydides/homebridge-homeconnect/compare/v1.4.0...v1.4.1
|
|
188
201
|
[v1.4.0]: https://github.com/thoukydides/homebridge-homeconnect/compare/v1.3.3...v1.4.0
|
package/README.md
CHANGED
|
@@ -420,6 +420,7 @@ This plugin has been tested with the following devices:
|
|
|
420
420
|
| Dyson Pure Hot+Cool | HP04/HP06 | `527` | | MQTT logs
|
|
421
421
|
| Dyson Purifier Hot+Cool | HP07 | `527E` | | MQTT logs
|
|
422
422
|
| Dyson Purifier Hot+Cool Formaldehyde | HP09 | `527K` | | MQTT logs
|
|
423
|
+
| Dyson Purifier Hot+Cool | HP1/HP11 | `527M` | | [FireHelmet](https://github.com/FireHelmet) ([#14](https://github.com/thoukydides/matterbridge-dyson-robot/issues/14))
|
|
423
424
|
| Dyson Purifier Big + Quiet Formaldehyde | BP03 | `664` | `0664PF.00.08.005.0002` | Developer
|
|
424
425
|
|
|
425
426
|
It should also work with other Dyson robot vacuums and air treatment devices, although some modifications may be required for full compatibility.
|
package/dist/dyson-device.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ import { DysonDevice } from './dyson-device-base.js';
|
|
|
2
2
|
import { Config } from './config-types.js';
|
|
3
3
|
import { AnsiLogger } from 'matterbridge/logger';
|
|
4
4
|
import { DeviceConfigMqtt } from './dyson-mqtt-client-live.js';
|
|
5
|
-
|
|
5
|
+
import NodePersist from 'node-persist';
|
|
6
|
+
export declare const MQTT_CACHE_FALLBACK_DELAY: number;
|
|
7
|
+
export declare function createDysonDevice(log: AnsiLogger, config: Config, persist: NodePersist.LocalStorage, device: DeviceConfigMqtt): Promise<DysonDevice>;
|
|
6
8
|
export declare function isSupportedModel(rootTopic: string): boolean;
|
|
7
9
|
//# sourceMappingURL=dyson-device.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-device.d.ts","sourceRoot":"","sources":["../src/dyson-device.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA0BrD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-device.d.ts","sourceRoot":"","sources":["../src/dyson-device.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA0BrD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,WAAW,MAAM,cAAc,CAAC;AA+BvC,eAAO,MAAM,yBAAyB,QAAU,CAAC;AAGjD,wBAAsB,iBAAiB,CACnC,GAAG,EAAS,UAAU,EACtB,MAAM,EAAM,MAAM,EAClB,OAAO,EAAK,WAAW,CAAC,YAAY,EACpC,MAAM,EAAM,gBAAgB,GAC7B,OAAO,CAAC,WAAW,CAAC,CAatB;AAGD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE3D"}
|
package/dist/dyson-device.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// Copyright © 2025 Alexander Thoukydides
|
|
3
3
|
import { DysonDevice360Eye, DysonDevice360Heurist, DysonDevice360VisNav } from './dyson-device-360.js';
|
|
4
4
|
import { DysonDeviceAirCool, DysonDeviceAirCoolDesk, DysonDeviceAirCoolE, DysonDeviceAirCoolK, DysonDeviceAirCoolM, DysonDeviceAirCoolLink, DysonDeviceAirCoolLinkDesk, DysonDeviceAirHotCool, DysonDeviceAirHotCoolE, DysonDeviceAirHotCoolK, DysonDeviceAirHotCoolM, DysonDeviceAirHotCoolLink, DysonDeviceAirHotCoolLinkA, DysonDeviceAirHumidifyCool, DysonDeviceAirHumidifyCoolE, DysonDeviceAirHumidifyCoolK, DysonDeviceAirBigQuiet, DysonDeviceCool } from './dyson-device-air.js';
|
|
5
|
+
import { MS } from './utils.js';
|
|
5
6
|
import { logError } from './log-error.js';
|
|
6
7
|
// List of constructors for Dyson devices
|
|
7
8
|
const DYSON_DEVICE_TYPES = [
|
|
@@ -29,17 +30,20 @@ const DYSON_DEVICE_TYPES = [
|
|
|
29
30
|
DysonDeviceAirBigQuiet,
|
|
30
31
|
DysonDeviceCool
|
|
31
32
|
];
|
|
33
|
+
// Delay before falling back to using cached status (if any)
|
|
34
|
+
// (must be less than Matterbridge's 120 second platform initialisation timeout)
|
|
35
|
+
export const MQTT_CACHE_FALLBACK_DELAY = 60 * MS;
|
|
32
36
|
// Dyson device factory
|
|
33
|
-
export async function createDysonDevice(log, config, device) {
|
|
37
|
+
export async function createDysonDevice(log, config, persist, device) {
|
|
34
38
|
// Select the appropriate class for this device
|
|
35
39
|
const { rootTopic } = device;
|
|
36
40
|
const deviceClass = DYSON_DEVICE_TYPES.find((device) => device.model.type === rootTopic);
|
|
37
41
|
if (!deviceClass)
|
|
38
42
|
throw new Error(`Unknown Dyson device type: ${rootTopic}`);
|
|
39
43
|
// Create the MQTT client and wait for it to finish initialising
|
|
40
|
-
const mqtt = new deviceClass.mqttConstructor(log, config, device);
|
|
44
|
+
const mqtt = new deviceClass.mqttConstructor(log, config, persist, device);
|
|
41
45
|
mqtt.on('error', err => { logError(log, 'MQTT Event', err); });
|
|
42
|
-
await mqtt.waitUntilInitialised();
|
|
46
|
+
await mqtt.waitUntilInitialised(MQTT_CACHE_FALLBACK_DELAY);
|
|
43
47
|
// Create the Dyson device itself
|
|
44
48
|
return new deviceClass(log, config, device, mqtt);
|
|
45
49
|
}
|
package/dist/dyson-device.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-device.js","sourceRoot":"","sources":["../src/dyson-device.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAGzC,OAAO,EACH,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC3B,2BAA2B,EAC3B,sBAAsB,EACtB,eAAe,EAClB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-device.js","sourceRoot":"","sources":["../src/dyson-device.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAGzC,OAAO,EACH,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC3B,2BAA2B,EAC3B,sBAAsB,EACtB,eAAe,EAClB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,EAAE,EAAuB,MAAM,YAAY,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,yCAAyC;AACzC,MAAM,kBAAkB,GAAG;IACvB,kCAAkC;IAClC,iBAAiB;IACjB,qBAAqB;IACrB,oBAAoB;IACpB,mCAAmC;IACnC,kBAAkB;IAClB,sBAAsB;IACtB,mBAAmB;IACnB,mBAAmB;IACnB,mBAAmB;IACnB,sBAAsB;IACtB,0BAA0B;IAC1B,qBAAqB;IACrB,sBAAsB;IACtB,sBAAsB;IACtB,sBAAsB;IACtB,yBAAyB;IACzB,0BAA0B;IAC1B,0BAA0B;IAC1B,2BAA2B;IAC3B,2BAA2B;IAC3B,sBAAsB;IACtB,eAAe;CACT,CAAC;AAEX,4DAA4D;AAC5D,gFAAgF;AAChF,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,EAAE,CAAC;AAEjD,uBAAuB;AACvB,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACnC,GAAsB,EACtB,MAAkB,EAClB,OAAoC,EACpC,MAA4B;IAE5B,+CAA+C;IAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC7B,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IACzF,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAC;IAE7E,gEAAgE;IAChE,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,QAAQ,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,MAAM,IAAI,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAE3D,iCAAiC;IACjC,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAwC,CAAC,CAAC;AAC1F,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAC9C,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AAChF,CAAC"}
|
package/dist/dyson-mqtt-360.d.ts
CHANGED
|
@@ -5,10 +5,11 @@ import { TypeMap as DysonMsgMap360 } from './ti/dyson-360-msg-types.js';
|
|
|
5
5
|
import { Dyson360MsgCurrentState, Dyson360MsgStateChange } from './dyson-360-msg-types.js';
|
|
6
6
|
import { Dyson360PowerMode } from './dyson-360-types.js';
|
|
7
7
|
import { DeviceConfigMqtt } from './dyson-mqtt-client-live.js';
|
|
8
|
+
import NodePersist from 'node-persist';
|
|
8
9
|
export type DysonMqttStatus360 = Omit<Dyson360MsgCurrentState, 'msg' | 'time'>;
|
|
9
10
|
export type DysonMqtt360Action = 'START' | 'PAUSE' | 'RESUME' | 'ABORT';
|
|
10
11
|
export declare class DysonMqtt360 extends DysonMqtt<DysonMsgMap360, DysonMqttStatus360> {
|
|
11
|
-
constructor(log: AnsiLogger, config: Config, device: DeviceConfigMqtt);
|
|
12
|
+
constructor(log: AnsiLogger, config: Config, persist: NodePersist.LocalStorage, device: DeviceConfigMqtt);
|
|
12
13
|
convertStateChange(msg: Dyson360MsgStateChange): Dyson360MsgCurrentState;
|
|
13
14
|
updateState(msg: Dyson360MsgCurrentState): void;
|
|
14
15
|
commandAction(msg: DysonMqtt360Action): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-360.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-360.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAEH,OAAO,IAAI,cAAc,EAC5B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACH,uBAAuB,EACvB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGH,iBAAiB,EACpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-360.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-360.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAEH,OAAO,IAAI,cAAc,EAC5B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACH,uBAAuB,EACvB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAGH,iBAAiB,EACpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,WAAW,MAAM,cAAc,CAAC;AAiBvC,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,uBAAuB,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;AAG/E,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AAGxE,qBAAa,YAAa,SAAQ,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;gBAG/D,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB;IAqBxG,kBAAkB,CAAC,GAAG,EAAE,sBAAsB,GAAG,uBAAuB;IAOxE,WAAW,CAAC,GAAG,EAAE,uBAAuB,GAAG,IAAI;IAW/C,aAAa,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrD,YAAY,CAAC,sBAAsB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAMzE"}
|
package/dist/dyson-mqtt-360.js
CHANGED
|
@@ -21,8 +21,8 @@ const DYSON_MQTT_CONFIG_360 = {
|
|
|
21
21
|
// Dyson MQTT client for robot vacuums
|
|
22
22
|
export class DysonMqtt360 extends DysonMqtt {
|
|
23
23
|
// Construct a new MQTT client
|
|
24
|
-
constructor(log, config, device) {
|
|
25
|
-
super(log, config, device, DYSON_MQTT_CONFIG_360);
|
|
24
|
+
constructor(log, config, persist, device) {
|
|
25
|
+
super(log, config, persist, device, DYSON_MQTT_CONFIG_360);
|
|
26
26
|
// Handle MQTT events
|
|
27
27
|
this.on('subscribed', tryListener(this, async () =>
|
|
28
28
|
// Request the current status when (re)connected
|
|
@@ -51,10 +51,7 @@ export class DysonMqtt360 extends DysonMqtt {
|
|
|
51
51
|
this.status.faults = undefined; // (ensure faults get cleared)
|
|
52
52
|
Object.assign(this.status, status);
|
|
53
53
|
// State is fully initialised after the first message has been received
|
|
54
|
-
|
|
55
|
-
this.status.initialised = true;
|
|
56
|
-
this.log.info('MQTT client initialisation complete');
|
|
57
|
-
}
|
|
54
|
+
this.updateInitialised();
|
|
58
55
|
}
|
|
59
56
|
// Publish a robot vacuum command to perform an action
|
|
60
57
|
commandAction(msg) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-360.js","sourceRoot":"","sources":["../src/dyson-mqtt-360.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAIzC,OAAO,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACH,QAAQ,IAAI,mBAAmB,EAElC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAKzC,OAAO,EACH,oBAAoB,EACpB,oBAAoB,EAEvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-360.js","sourceRoot":"","sources":["../src/dyson-mqtt-360.ts"],"names":[],"mappings":"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"}
|
package/dist/dyson-mqtt-air.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { DysonAirCurrentSensorData } from './dyson-air-sensor-types.js';
|
|
|
8
8
|
import { DysonAirProductState } from './dyson-air-state-types.js';
|
|
9
9
|
import { DysonMsgAny } from './dyson-mqtt-parse.js';
|
|
10
10
|
import { DeviceConfigMqtt } from './dyson-mqtt-client-live.js';
|
|
11
|
+
import NodePersist from 'node-persist';
|
|
11
12
|
type ProductStateNumericEnumKeys = 'cflr' | 'fnsp' | 'nmdv' | 'sltm';
|
|
12
13
|
declare const PRODUCT_STATE_NUMERIC_KEYS: readonly ["hmax", "hflr", "filf", "osal", "osau", "cdrr", "cltr", "humt", "rect"];
|
|
13
14
|
type ProductStateNumericKeys = typeof PRODUCT_STATE_NUMERIC_KEYS[number];
|
|
@@ -28,7 +29,7 @@ export type DysonMqttStatusAirSensor = {
|
|
|
28
29
|
export type DysonMqttStatusAir = Partial<Pick<DysonAirMsgHello, 'version'>> & DysonMqttProductState & DysonMqttStatusAirSensor & Partial<Faults>;
|
|
29
30
|
export declare class DysonMqttAir extends DysonMqtt<DysonMsgMapAir, DysonMqttStatusAir> {
|
|
30
31
|
private initialiseMsgs;
|
|
31
|
-
constructor(log: AnsiLogger, config: Config, device: DeviceConfigMqtt);
|
|
32
|
+
constructor(log: AnsiLogger, config: Config, persist: NodePersist.LocalStorage, device: DeviceConfigMqtt);
|
|
32
33
|
updateStateFromMessage(msg: DysonMsgAny<DysonMsgMapAir>): void;
|
|
33
34
|
checkIfInitialised(msg: DysonMsgAny<DysonMsgMapAir>): void;
|
|
34
35
|
updateProductInfo(msg: DysonAirMsgHello): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-air.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-air.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAEH,OAAO,IAAI,cAAc,EAC5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EACH,wBAAwB,EACxB,uBAAuB,EACvB,yCAAyC,EACzC,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAKH,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EAG1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-air.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-air.ts"],"names":[],"mappings":"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"}
|
package/dist/dyson-mqtt-air.js
CHANGED
|
@@ -27,8 +27,8 @@ export class DysonMqttAir extends DysonMqtt {
|
|
|
27
27
|
'ENVIRONMENTAL-CURRENT-SENSOR-DATA'
|
|
28
28
|
]);
|
|
29
29
|
// Construct a new MQTT client
|
|
30
|
-
constructor(log, config, device) {
|
|
31
|
-
super(log, config, device, DYSON_MQTT_CONFIG_AIR);
|
|
30
|
+
constructor(log, config, persist, device) {
|
|
31
|
+
super(log, config, persist, device, DYSON_MQTT_CONFIG_AIR);
|
|
32
32
|
// Handle MQTT events
|
|
33
33
|
this.on('subscribed', tryListener(this, async () => {
|
|
34
34
|
// Request the current status when (re)connected
|
|
@@ -66,10 +66,7 @@ export class DysonMqttAir extends DysonMqtt {
|
|
|
66
66
|
// Check whether all required messages have been received
|
|
67
67
|
checkIfInitialised(msg) {
|
|
68
68
|
this.initialiseMsgs.delete(msg.msg);
|
|
69
|
-
|
|
70
|
-
this.status.initialised = true;
|
|
71
|
-
this.log.info('MQTT client initialisation complete');
|
|
72
|
-
}
|
|
69
|
+
this.updateInitialised(this.initialiseMsgs.size === 0);
|
|
73
70
|
}
|
|
74
71
|
// Update hardware and software state from a received message
|
|
75
72
|
updateProductInfo(msg) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-air.js","sourceRoot":"","sources":["../src/dyson-mqtt-air.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAEzC,OAAO,EAAE,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACH,QAAQ,IAAI,mBAAmB,EAElC,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AASrD,OAAO,EACH,wBAAwB,EACxB,qBAAqB,EACrB,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EAC1B,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-air.js","sourceRoot":"","sources":["../src/dyson-mqtt-air.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import EventEmitter from 'events';
|
|
2
|
+
import { AnsiLogger } from 'matterbridge/logger';
|
|
3
|
+
import NodePersist from 'node-persist';
|
|
4
|
+
export interface DysonMqttCacheEventMap<S> {
|
|
5
|
+
error: [unknown];
|
|
6
|
+
restored: [S];
|
|
7
|
+
}
|
|
8
|
+
export declare class DysonMqttCache<S> extends EventEmitter<DysonMqttCacheEventMap<S>> {
|
|
9
|
+
readonly log: AnsiLogger;
|
|
10
|
+
readonly persist: NodePersist.LocalStorage;
|
|
11
|
+
readonly serialNumber: string;
|
|
12
|
+
constructor(log: AnsiLogger, persist: NodePersist.LocalStorage, serialNumber: string);
|
|
13
|
+
get key(): string;
|
|
14
|
+
restore(): Promise<void>;
|
|
15
|
+
store(status: S): Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=dyson-mqtt-cache.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-cache.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-cache.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,WAAW,MAAM,cAAc,CAAC;AAMvC,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACrC,KAAK,EAAO,CAAC,OAAO,CAAC,CAAC;IACtB,QAAQ,EAAI,CAAC,CAAC,CAAC,CAAC;CACnB;AAGD,qBAAa,cAAc,CAAC,CAAC,CAAE,SAAQ,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IAItE,QAAQ,CAAC,GAAG,EAAY,UAAU;IAClC,QAAQ,CAAC,OAAO,EAAQ,WAAW,CAAC,YAAY;IAChD,QAAQ,CAAC,YAAY,EAAG,MAAM;gBAFrB,GAAG,EAAY,UAAU,EACzB,OAAO,EAAQ,WAAW,CAAC,YAAY,EACvC,YAAY,EAAG,MAAM;IASlC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAGK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxB,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
// Matterbridge plugin for Dyson robot vacuum and air treatment devices
|
|
2
|
+
// Copyright © 2025 Alexander Thoukydides
|
|
3
|
+
import EventEmitter from 'events';
|
|
4
|
+
// Cache version
|
|
5
|
+
const MQTT_CACHE_VERSION = 1;
|
|
6
|
+
// Cache Dyson MQTT status to allow start-up when device is offline
|
|
7
|
+
export class DysonMqttCache extends EventEmitter {
|
|
8
|
+
log;
|
|
9
|
+
persist;
|
|
10
|
+
serialNumber;
|
|
11
|
+
// Create a new MQTT cache
|
|
12
|
+
constructor(log, persist, serialNumber) {
|
|
13
|
+
super({ captureRejections: true });
|
|
14
|
+
this.log = log;
|
|
15
|
+
this.persist = persist;
|
|
16
|
+
this.serialNumber = serialNumber;
|
|
17
|
+
// Attempt to restore any previously cached status
|
|
18
|
+
void this.restore();
|
|
19
|
+
}
|
|
20
|
+
// Construct a persistent storage key for the cache
|
|
21
|
+
get key() {
|
|
22
|
+
return `mqtt-cache-v${MQTT_CACHE_VERSION}:${this.serialNumber}`;
|
|
23
|
+
}
|
|
24
|
+
// Retrieve the cached status, if any
|
|
25
|
+
async restore() {
|
|
26
|
+
const status = await this.persist.getItem(this.key);
|
|
27
|
+
if (!status)
|
|
28
|
+
return;
|
|
29
|
+
this.emit('restored', status);
|
|
30
|
+
}
|
|
31
|
+
// Store the current status in the cache
|
|
32
|
+
async store(status) {
|
|
33
|
+
await this.persist.setItem(this.key, status);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=dyson-mqtt-cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-cache.js","sourceRoot":"","sources":["../src/dyson-mqtt-cache.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAEzC,OAAO,YAAY,MAAM,QAAQ,CAAC;AAIlC,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,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,mDAAmD;IACnD,IAAI,GAAG;QACH,OAAO,eAAe,kBAAkB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;IACpE,CAAC;IAED,qCAAqC;IACrC,KAAK,CAAC,OAAO;QACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAkB,CAAC;QACrE,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAClC,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-client-mock.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-client-mock.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAGH,kBAAkB,EAClB,UAAU,EACb,MAAM,MAAM,CAAC;AAgBd,qBAAa,mBAAoB,SAAQ,eAAe;IASP,QAAQ,CAAC,YAAY,EAAE,gBAAgB;IANpF,OAAO,CAAC,KAAK,CAAgB;IAG7B,OAAO,CAAC,KAAK,CAAM;gBAGP,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAW,YAAY,EAAE,gBAAgB;IAK9E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-client-mock.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt-client-mock.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAGH,kBAAkB,EAClB,UAAU,EACb,MAAM,MAAM,CAAC;AAgBd,qBAAa,mBAAoB,SAAQ,eAAe;IASP,QAAQ,CAAC,YAAY,EAAE,gBAAgB;IANpF,OAAO,CAAC,KAAK,CAAgB;IAG7B,OAAO,CAAC,KAAK,CAAM;gBAGP,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAW,YAAY,EAAE,gBAAgB;IAK9E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BtC,YAAY,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAO5D,cAAc,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAkBhE,QAAQ,CAAC,GAAG,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;CAKxD"}
|
|
@@ -38,7 +38,6 @@ export class DysonMqttClientMock extends DysonMqttClient {
|
|
|
38
38
|
}
|
|
39
39
|
// Emit the next message from the log file, if any
|
|
40
40
|
async emitNextMessage() {
|
|
41
|
-
// HERE - Delay most messages until after Matterbridge has properly started
|
|
42
41
|
// Delay between messages
|
|
43
42
|
await setTimeout(MESSAGE_INTERVAL);
|
|
44
43
|
// Check for more messages
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt-client-mock.js","sourceRoot":"","sources":["../src/dyson-mqtt-client-mock.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAIzC,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;AAElD,wDAAwD;AACxD,MAAM,mBAAmB,GAAK,EAAE,GAAG,EAAE,CAAC,CAAE,aAAa;AACrD,MAAM,gBAAgB,GAAQ,GAAG,CAAC,CAAM,kBAAkB;AAE1D,4DAA4D;AAC5D,MAAM,cAAc,GAAU,eAAe,CAAC;AAE9C,kCAAkC;AAClC,MAAM,iBAAiB,GAAO,KAAK,CAAC;AAEpC,iEAAiE;AACjE,MAAM,OAAO,mBAAoB,SAAQ,eAAe;IASE;IAPtD,+BAA+B;IACvB,KAAK,GAAa,EAAE,CAAC;IAE7B,mCAAmC;IAC3B,KAAK,GAAG,EAAE,CAAC;IAEnB,8BAA8B;IAC9B,YAAY,GAAe,EAAE,MAAc,EAAW,YAA8B;QAChF,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAD+B,iBAAY,GAAZ,YAAY,CAAkB;IAEpF,CAAC;IAED,2EAA2E;IAC3E,KAAK,CAAC,OAAO;QACT,kEAAkE;QAClE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAEjF,0BAA0B;QAC1B,MAAM,MAAM,GAAmB,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAE7B,4CAA4C;QAC5C,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;IAChC,CAAC;IAED,kDAAkD;IAClD,KAAK,CAAC,eAAe;QACjB,
|
|
1
|
+
{"version":3,"file":"dyson-mqtt-client-mock.js","sourceRoot":"","sources":["../src/dyson-mqtt-client-mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DysonMsg } from './dyson-types.js';
|
|
2
2
|
import { AnsiLogger } from 'matterbridge/logger';
|
|
3
3
|
export type DysonMqttFiltered = 'duplicate' | 'reordered';
|
|
4
|
-
export declare class
|
|
4
|
+
export declare class DysonMqttFilter {
|
|
5
5
|
readonly log: AnsiLogger;
|
|
6
6
|
readonly lastMsg: Map<string, DysonMsg>;
|
|
7
7
|
constructor(log: AnsiLogger);
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright © 2025 Alexander Thoukydides
|
|
3
3
|
import { isDeepStrictEqual } from 'node:util';
|
|
4
4
|
// Filter received Dyson MQTT messages for reordering and duplication
|
|
5
|
-
export class
|
|
5
|
+
export class DysonMqttFilter {
|
|
6
6
|
log;
|
|
7
7
|
// The most recent message of each type (indexed by msg)
|
|
8
8
|
lastMsg = new Map;
|
package/dist/dyson-mqtt.d.ts
CHANGED
|
@@ -7,14 +7,15 @@ import { DysonMqttSubscribeConfig } from './dyson-mqtt-subscribe.js';
|
|
|
7
7
|
import { DysonMqttFiltered } from './dyson-mqtt-filter.js';
|
|
8
8
|
import { AsyncEventEmitter } from './async-eventemitter.js';
|
|
9
9
|
import { DeviceConfigMqtt } from './dyson-mqtt-client-live.js';
|
|
10
|
+
import NodePersist from 'node-persist';
|
|
10
11
|
export interface DysonMqttConfig<T> {
|
|
11
12
|
topics: DysonMqttSubscribeConfig;
|
|
12
13
|
messages: DysonMqttParserConfig<T>;
|
|
13
14
|
}
|
|
15
|
+
export type DysonMqttState = 'starting' | 'startingWithCache' | 'initialised' | 'stopped';
|
|
14
16
|
export interface DysonMqttStatusBase {
|
|
15
17
|
reachable: boolean;
|
|
16
|
-
|
|
17
|
-
stopped: boolean;
|
|
18
|
+
mqttState: DysonMqttState;
|
|
18
19
|
}
|
|
19
20
|
export type DysonMqttStatus<T> = T & DysonMqttStatusBase;
|
|
20
21
|
export interface DysonMqttEventMapBase {
|
|
@@ -35,17 +36,20 @@ export interface DysonMqttLike extends EventEmitter {
|
|
|
35
36
|
export declare abstract class DysonMqtt<T, S> extends AsyncEventEmitter<DysonMqttEventMap<T>> implements DysonMqttLike {
|
|
36
37
|
readonly log: AnsiLogger;
|
|
37
38
|
readonly config: Config;
|
|
39
|
+
readonly persist: NodePersist.LocalStorage;
|
|
38
40
|
readonly deviceConfig: DeviceConfigMqtt;
|
|
39
41
|
readonly mqttConfig: DysonMqttConfig<T>;
|
|
40
42
|
private mqtt;
|
|
41
43
|
private mqttConnection;
|
|
42
44
|
private mqttSubscribe;
|
|
43
45
|
private mqttFilter;
|
|
46
|
+
private mqttCache;
|
|
44
47
|
readonly status: DysonMqttStatus<S>;
|
|
45
|
-
constructor(log: AnsiLogger, config: Config, deviceConfig: DeviceConfigMqtt, mqttConfig: DysonMqttConfig<T>);
|
|
46
|
-
downTimerHandle: Map<string, NodeJS.Timeout>;
|
|
48
|
+
constructor(log: AnsiLogger, config: Config, persist: NodePersist.LocalStorage, deviceConfig: DeviceConfigMqtt, mqttConfig: DysonMqttConfig<T>);
|
|
49
|
+
downTimerHandle: Map<string, NodeJS.Timeout | undefined>;
|
|
47
50
|
updateReachable(key: 'mqtt' | 'msg', reachable: boolean): void;
|
|
48
|
-
|
|
51
|
+
updateInitialised(initialised?: boolean): void;
|
|
52
|
+
waitUntilInitialised(cacheFallbackDelay?: number): Promise<void>;
|
|
49
53
|
stop(): Promise<void>;
|
|
50
54
|
publish(...[msg, params]: PublishArgs<T, 'time'>): Promise<void>;
|
|
51
55
|
logPayload(direction: 'publish' | 'receive', topic: string, payload: DysonMsg, filter?: DysonMqttFiltered): void;
|
package/dist/dyson-mqtt.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACH,qBAAqB,EACrB,WAAW,EAEd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEH,wBAAwB,EAC3B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAmB,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EACH,gBAAgB,EAGnB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt.d.ts","sourceRoot":"","sources":["../src/dyson-mqtt.ts"],"names":[],"mappings":"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"}
|
package/dist/dyson-mqtt.js
CHANGED
|
@@ -6,10 +6,11 @@ import { dysonMqttParse } from './dyson-mqtt-parse.js';
|
|
|
6
6
|
import { DysonMqttSubscribe } from './dyson-mqtt-subscribe.js';
|
|
7
7
|
import { DysonMqttConnection } from './dyson-mqtt-connect.js';
|
|
8
8
|
import { inspect } from 'util';
|
|
9
|
-
import {
|
|
9
|
+
import { DysonMqttFilter } from './dyson-mqtt-filter.js';
|
|
10
10
|
import { AsyncEventEmitter } from './async-eventemitter.js';
|
|
11
11
|
import { DysonMqttClientLocal, DysonMqttClientRemote } from './dyson-mqtt-client-live.js';
|
|
12
12
|
import { DysonMqttClientMock } from './dyson-mqtt-client-mock.js';
|
|
13
|
+
import { DysonMqttCache } from './dyson-mqtt-cache.js';
|
|
13
14
|
;
|
|
14
15
|
// Minimum disconnection time before indicating device not reachable
|
|
15
16
|
const MIN_DOWN_TIME = 5 * MS; // 5 seconds
|
|
@@ -19,6 +20,7 @@ const UNREACHABLE_MESSAGES = ['GOODBYE', 'GONE-AWAY'];
|
|
|
19
20
|
export class DysonMqtt extends AsyncEventEmitter {
|
|
20
21
|
log;
|
|
21
22
|
config;
|
|
23
|
+
persist;
|
|
22
24
|
deviceConfig;
|
|
23
25
|
mqttConfig;
|
|
24
26
|
// The MQTT client
|
|
@@ -26,17 +28,18 @@ export class DysonMqtt extends AsyncEventEmitter {
|
|
|
26
28
|
mqttConnection;
|
|
27
29
|
mqttSubscribe;
|
|
28
30
|
mqttFilter;
|
|
31
|
+
mqttCache;
|
|
29
32
|
// The current status
|
|
30
33
|
status = {
|
|
31
34
|
reachable: false,
|
|
32
|
-
|
|
33
|
-
stopped: false
|
|
35
|
+
mqttState: 'starting'
|
|
34
36
|
};
|
|
35
37
|
// Construct a new MQTT client
|
|
36
|
-
constructor(log, config, deviceConfig, mqttConfig) {
|
|
38
|
+
constructor(log, config, persist, deviceConfig, mqttConfig) {
|
|
37
39
|
super({ captureRejections: true });
|
|
38
40
|
this.log = log;
|
|
39
41
|
this.config = config;
|
|
42
|
+
this.persist = persist;
|
|
40
43
|
this.deviceConfig = deviceConfig;
|
|
41
44
|
this.mqttConfig = mqttConfig;
|
|
42
45
|
// Create the MQTT client
|
|
@@ -61,7 +64,7 @@ export class DysonMqtt extends AsyncEventEmitter {
|
|
|
61
64
|
this.updateReachable('mqtt', true);
|
|
62
65
|
});
|
|
63
66
|
// Handle received MQTT messages
|
|
64
|
-
this.mqttFilter = new
|
|
67
|
+
this.mqttFilter = new DysonMqttFilter(log);
|
|
65
68
|
this.mqtt.on('message', tryListener(this, (topic, payload) => {
|
|
66
69
|
// Check the received topic and message
|
|
67
70
|
const topicStatus = this.mqttSubscribe.checkTopic(topic);
|
|
@@ -76,9 +79,20 @@ export class DysonMqtt extends AsyncEventEmitter {
|
|
|
76
79
|
this.emit('status');
|
|
77
80
|
}
|
|
78
81
|
}));
|
|
82
|
+
// Attempt to restore cached status
|
|
83
|
+
this.mqttCache = new DysonMqttCache(log, persist, serialNumber);
|
|
84
|
+
this.mqttCache.on('error', err => this.emit('error', err));
|
|
85
|
+
this.mqttCache.on('restored', cachedStatus => {
|
|
86
|
+
if (this.status.mqttState !== 'starting')
|
|
87
|
+
return;
|
|
88
|
+
const newStatus = { ...cachedStatus, ...this.status, mqttState: 'startingWithCache' };
|
|
89
|
+
Object.assign(this.status, newStatus);
|
|
90
|
+
this.log.info('MQTT status restored from cache');
|
|
91
|
+
this.emit('status');
|
|
92
|
+
});
|
|
79
93
|
}
|
|
80
94
|
// Update the device reachability, with hysteresis on unreachable indications
|
|
81
|
-
downTimerHandle = new Map();
|
|
95
|
+
downTimerHandle = new Map([['msg', undefined]]);
|
|
82
96
|
updateReachable(key, reachable) {
|
|
83
97
|
if (reachable) {
|
|
84
98
|
// Cancel any pending down timer for this reason
|
|
@@ -93,7 +107,8 @@ export class DysonMqtt extends AsyncEventEmitter {
|
|
|
93
107
|
}
|
|
94
108
|
else {
|
|
95
109
|
// Only start down timer if not already running
|
|
96
|
-
if (!this.downTimerHandle.has(key) && this.status.reachable
|
|
110
|
+
if (!this.downTimerHandle.has(key) && this.status.reachable
|
|
111
|
+
&& this.status.mqttState !== 'stopped') {
|
|
97
112
|
this.log.debug(`Starting down timer for '${key}'`);
|
|
98
113
|
const handle = setTimeout(() => {
|
|
99
114
|
// Mark the device as not reachable after a delay
|
|
@@ -107,15 +122,51 @@ export class DysonMqtt extends AsyncEventEmitter {
|
|
|
107
122
|
}
|
|
108
123
|
}
|
|
109
124
|
}
|
|
125
|
+
// Update the initialisation status
|
|
126
|
+
updateInitialised(initialised = true) {
|
|
127
|
+
if (!initialised)
|
|
128
|
+
return;
|
|
129
|
+
if (this.status.mqttState === 'initialised' || this.status.mqttState === 'stopped')
|
|
130
|
+
return;
|
|
131
|
+
this.status.mqttState = 'initialised';
|
|
132
|
+
this.log.info('MQTT client initialisation complete');
|
|
133
|
+
}
|
|
110
134
|
// Wait until the device is reachable and all initial state has been received
|
|
111
|
-
async waitUntilInitialised() {
|
|
112
|
-
|
|
113
|
-
|
|
135
|
+
async waitUntilInitialised(cacheFallbackDelay) {
|
|
136
|
+
let timeoutSignal;
|
|
137
|
+
if (cacheFallbackDelay !== undefined)
|
|
138
|
+
timeoutSignal = AbortSignal.timeout(cacheFallbackDelay);
|
|
139
|
+
// Normal case is to wait for MQTT initialisation
|
|
140
|
+
while (!this.status.reachable || this.status.mqttState !== 'initialised') {
|
|
141
|
+
try {
|
|
142
|
+
await this.onceAsync('status', timeoutSignal);
|
|
143
|
+
}
|
|
144
|
+
catch (err) {
|
|
145
|
+
if (!(err instanceof Error && err.name === 'AbortError'))
|
|
146
|
+
throw err;
|
|
147
|
+
// Timeout occurred, so fallback to cached status (if any)
|
|
148
|
+
if (this.status.mqttState === 'startingWithCache' || this.status.mqttState === 'initialised')
|
|
149
|
+
break;
|
|
150
|
+
timeoutSignal = undefined;
|
|
151
|
+
}
|
|
114
152
|
}
|
|
153
|
+
// Warn if continuing with degraded status
|
|
154
|
+
if (this.status.mqttState === 'startingWithCache')
|
|
155
|
+
this.log.warn('Continuing using cached MQTT device status');
|
|
156
|
+
if (!this.status.reachable)
|
|
157
|
+
this.log.warn('Continuing without MQTT connection to device');
|
|
115
158
|
}
|
|
116
159
|
// Stop the MQTT client
|
|
117
160
|
async stop() {
|
|
118
|
-
this.status.
|
|
161
|
+
if (this.status.mqttState === 'stopped')
|
|
162
|
+
return;
|
|
163
|
+
// Save the current status in the cache if fully initialised
|
|
164
|
+
if (this.status.mqttState === 'initialised') {
|
|
165
|
+
await this.mqttCache.store(this.status);
|
|
166
|
+
this.log.info('MQTT status saved to cache');
|
|
167
|
+
}
|
|
168
|
+
// Disconnect the MQTT client
|
|
169
|
+
this.status.mqttState = 'stopped';
|
|
119
170
|
await this.mqttConnection.stop();
|
|
120
171
|
}
|
|
121
172
|
// Publish a command
|
package/dist/dyson-mqtt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dyson-mqtt.js","sourceRoot":"","sources":["../src/dyson-mqtt.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAGzC,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAElF,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAGH,cAAc,EACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,kBAAkB,EAErB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAqB,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAEH,oBAAoB,EACpB,qBAAqB,EACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"dyson-mqtt.js","sourceRoot":"","sources":["../src/dyson-mqtt.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.d.ts
CHANGED
|
@@ -1,19 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MatterbridgeDynamicPlatform, PlatformConfig, PlatformMatterbridge } from 'matterbridge';
|
|
2
2
|
import { AnsiLogger, LogLevel } from 'matterbridge/logger';
|
|
3
3
|
import NodePersist from 'node-persist';
|
|
4
4
|
import { Config } from './config-types.js';
|
|
5
5
|
import { FilterLogger } from './logger-filter.js';
|
|
6
6
|
import { DysonDevice } from './dyson-device-base.js';
|
|
7
|
+
import { DeviceConfigMqtt } from './dyson-mqtt-client-live.js';
|
|
7
8
|
export declare class PlatformDyson extends MatterbridgeDynamicPlatform {
|
|
8
9
|
config: Config & PlatformConfig;
|
|
9
10
|
log: FilterLogger;
|
|
10
11
|
persist: NodePersist.LocalStorage;
|
|
11
12
|
devices: DysonDevice[];
|
|
12
|
-
constructor(matterbridge:
|
|
13
|
+
constructor(matterbridge: PlatformMatterbridge, log: AnsiLogger, config: PlatformConfig);
|
|
13
14
|
onConfigChanged(config: PlatformConfig): Promise<void>;
|
|
14
15
|
onChangeLoggerLevel(logLevel: LogLevel): Promise<void>;
|
|
15
16
|
onAction(action: string, value?: string, id?: string, config?: PlatformConfig): Promise<void>;
|
|
16
17
|
onStart(reason?: string): Promise<void>;
|
|
18
|
+
createDevice(deviceConfig: DeviceConfigMqtt): Promise<void>;
|
|
17
19
|
onConfigure(): Promise<void>;
|
|
18
20
|
onShutdown(reason?: string): Promise<void>;
|
|
19
21
|
get devicesDescription(): string;
|
package/dist/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,2BAA2B,EAC3B,cAAc,EACd,oBAAoB,EACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAS,QAAQ,EAAO,MAAM,qBAAqB,CAAC;AACvE,OAAO,WAAW,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAK/D,qBAAa,aAAc,SAAQ,2BAA2B;IAGlD,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC;IAChC,GAAG,EAAK,YAAY,CAAC;IAG7B,OAAO,EAAS,WAAW,CAAC,YAAY,CAAC;IAGzC,OAAO,EAAS,WAAW,EAAE,CAAM;gBAGvB,YAAY,EAAE,oBAAoB,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc;IAexE,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/D,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CpF,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8ChD,YAAY,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwDlD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB5B,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBzD,IAAI,kBAAkB,IAAI,MAAM,CAE/B;CACJ"}
|
package/dist/platform.js
CHANGED
|
@@ -124,49 +124,58 @@ export class PlatformDyson extends MatterbridgeDynamicPlatform {
|
|
|
124
124
|
await this.ready;
|
|
125
125
|
// Create and register Matter devices for each Dyson device
|
|
126
126
|
await this.clearSelect();
|
|
127
|
-
await Promise.all(mappedDevices.map(async (deviceConfig) =>
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
const endpoints = validatedDevice ? device.getEndpoints(validatedEntities) : [];
|
|
147
|
-
if (!endpoints.length) {
|
|
148
|
-
const lists = !validatedDevice ? ['blackList', 'whiteList']
|
|
149
|
-
: ['entityBlackList', 'entityWhiteList', 'deviceEntityBlackList'];
|
|
150
|
-
const filtered = lists.filter(list => this.config[list].length);
|
|
151
|
-
deviceLog.info(`Device disabled via ${formatList(filtered)}`);
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
let description = `Registering ${plural(endpoints.length, 'device')}`;
|
|
155
|
-
if (entities.length)
|
|
156
|
-
description += ` with: ${formatList(entityResults)}`;
|
|
157
|
-
deviceLog.info(description);
|
|
158
|
-
this.devices.push(device);
|
|
159
|
-
await Promise.all(endpoints.map(async (endpoint) => {
|
|
160
|
-
await this.registerDevice(endpoint);
|
|
161
|
-
await endpoint.postRegister();
|
|
162
|
-
}));
|
|
163
|
-
}
|
|
127
|
+
await Promise.all(mappedDevices.map(async (deviceConfig) => this.createDevice(deviceConfig)));
|
|
128
|
+
this.log.info(`Registered ${this.devicesDescription}`);
|
|
129
|
+
}
|
|
130
|
+
// Create a single device, but do not register it with Matterbridge
|
|
131
|
+
async createDevice(deviceConfig) {
|
|
132
|
+
const { serialNumber, name: deviceName } = deviceConfig;
|
|
133
|
+
const deviceLog = new PrefixLogger(this.log, deviceName);
|
|
134
|
+
const logFiltered = (lists) => {
|
|
135
|
+
const hasEntries = (configItem) => Array.isArray(configItem) ? configItem.length
|
|
136
|
+
: typeof configItem === 'object' && Object.keys(configItem).length;
|
|
137
|
+
const filtered = lists.filter(list => hasEntries(this.config[list]));
|
|
138
|
+
deviceLog.info(`Device disabled via ${formatList(filtered)}`);
|
|
139
|
+
};
|
|
140
|
+
try {
|
|
141
|
+
// Validate the device as a whole
|
|
142
|
+
this.setSelectDevice(serialNumber, deviceName, undefined, 'hub');
|
|
143
|
+
if (!this.validateDevice(serialNumber)) {
|
|
144
|
+
logFiltered(['blackList', 'whiteList']);
|
|
145
|
+
return;
|
|
164
146
|
}
|
|
165
|
-
|
|
166
|
-
|
|
147
|
+
// Create the device instance
|
|
148
|
+
const device = await createDysonDevice(deviceLog, this.config, this.persist, deviceConfig);
|
|
149
|
+
// Validate the device's main functions
|
|
150
|
+
const entities = device.getEntities();
|
|
151
|
+
const entityResults = [];
|
|
152
|
+
const validatedEntities = entities.filter(({ name, description }) => {
|
|
153
|
+
this.setSelectDeviceEntity(serialNumber, name, description, 'component');
|
|
154
|
+
const result = this.validateEntity(serialNumber, name);
|
|
155
|
+
entityResults.push(result ? `${GREEN}${name} ✔${RI}` : `${RED}${name} ✘${RI}`);
|
|
156
|
+
return result;
|
|
157
|
+
}).map(({ name }) => name);
|
|
158
|
+
// Determine which endpoints to create
|
|
159
|
+
const endpoints = device.getEndpoints(validatedEntities);
|
|
160
|
+
if (!endpoints.length) {
|
|
161
|
+
logFiltered(['entityBlackList', 'entityWhiteList', 'deviceEntityBlackList']);
|
|
162
|
+
await device.stop();
|
|
163
|
+
return;
|
|
167
164
|
}
|
|
168
|
-
|
|
169
|
-
|
|
165
|
+
// Register the device and its endpoints with Matterbridge
|
|
166
|
+
let description = `Registering ${plural(endpoints.length, 'device')}`;
|
|
167
|
+
if (entities.length)
|
|
168
|
+
description += ` with: ${formatList(entityResults)}`;
|
|
169
|
+
deviceLog.info(description);
|
|
170
|
+
this.devices.push(device);
|
|
171
|
+
await Promise.all(endpoints.map(async (endpoint) => {
|
|
172
|
+
await this.registerDevice(endpoint);
|
|
173
|
+
await endpoint.postRegister();
|
|
174
|
+
}));
|
|
175
|
+
}
|
|
176
|
+
catch (err) {
|
|
177
|
+
logError(deviceLog, 'Creating device', err);
|
|
178
|
+
}
|
|
170
179
|
}
|
|
171
180
|
// Configure and initialise the devices when the platform is commissioned
|
|
172
181
|
async onConfigure() {
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAEzC,OAAO,
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/dist/settings.d.ts
CHANGED
|
@@ -6,5 +6,5 @@ export declare const PLUGIN_VERSION: string;
|
|
|
6
6
|
export declare const PLUGIN_URL: string;
|
|
7
7
|
export declare const DEFAULT_CONFIG: Readonly<Partial<Config>>;
|
|
8
8
|
export declare const VENDOR_NAME = "Dyson";
|
|
9
|
-
export declare const VENDOR_ID =
|
|
9
|
+
export declare const VENDOR_ID = 5022;
|
|
10
10
|
//# sourceMappingURL=settings.d.ts.map
|
package/dist/settings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAc3C,eAAO,MAAM,OAAO,wBAAyB,CAAC;AAC9C,eAAO,MAAM,WAAW,QAAkB,CAAC;AAC3C,eAAO,MAAM,aAAa,QAAuB,CAAC;AAClD,eAAO,MAAM,cAAc,QAAkB,CAAC;AAC9C,eAAO,MAAM,UAAU,QAAuB,CAAC;AAG/C,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAmBpD,CAAC;AAGF,eAAO,MAAM,WAAW,UAAU,CAAC;AACnC,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAc3C,eAAO,MAAM,OAAO,wBAAyB,CAAC;AAC9C,eAAO,MAAM,WAAW,QAAkB,CAAC;AAC3C,eAAO,MAAM,aAAa,QAAuB,CAAC;AAClD,eAAO,MAAM,cAAc,QAAkB,CAAC;AAC9C,eAAO,MAAM,UAAU,QAAuB,CAAC;AAG/C,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAmBpD,CAAC;AAGF,eAAO,MAAM,WAAW,UAAU,CAAC;AACnC,eAAO,MAAM,SAAS,OAAW,CAAC"}
|
package/dist/settings.js
CHANGED
package/dist/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAWrC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AACzF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAgB,CAAC;AAE/E,uBAAuB;AACvB,MAAM,CAAC,MAAM,OAAO,GAAU,OAAO,CAAC,OAAO,CAAC;AAC9C,MAAM,CAAC,MAAM,WAAW,GAAM,OAAO,CAAC,IAAI,CAAC;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAI,OAAO,CAAC,WAAW,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;AAC9C,MAAM,CAAC,MAAM,UAAU,GAAO,OAAO,CAAC,QAAQ,CAAC;AAE/C,gCAAgC;AAChC,MAAM,CAAC,MAAM,cAAc,GAA8B;IACrD,SAAS,EAAe,EAAE;IAC1B,SAAS,EAAe,EAAE;IAC1B,eAAe,EAAS,EAAE;IAC1B,eAAe,EAAS,CAAC,uBAAuB,EAAE,iBAAiB,EAAE,oBAAoB,CAAC;IAC1F,qBAAqB,EAAG,EAAE;IAC1B,kBAAkB,EAAM,gBAAgB;IACxC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI;QAC3B,YAAY,EAAE;YACV,KAAK,EAAO,KAAK;YACjB,KAAK,EAAO,OAAO,CAAC,GAAG,CAAC,WAAW;SACtC;KACJ,CAAC;IACF,aAAa,EAAW,KAAK;IAC7B,eAAe,EAAS,IAAI;IAC5B,WAAW,EAAa,cAAc;IACtC,KAAK,EAAmB,KAAK;IAC7B,aAAa,EAAW,EAAE;IAC1B,oBAAoB,EAAI,KAAK;CAChC,CAAC;AAEF,cAAc;AACd,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC;AACnC,MAAM,CAAC,MAAM,SAAS,GAAK,MAAM,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yCAAyC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAWrC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AACzF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAgB,CAAC;AAE/E,uBAAuB;AACvB,MAAM,CAAC,MAAM,OAAO,GAAU,OAAO,CAAC,OAAO,CAAC;AAC9C,MAAM,CAAC,MAAM,WAAW,GAAM,OAAO,CAAC,IAAI,CAAC;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAI,OAAO,CAAC,WAAW,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;AAC9C,MAAM,CAAC,MAAM,UAAU,GAAO,OAAO,CAAC,QAAQ,CAAC;AAE/C,gCAAgC;AAChC,MAAM,CAAC,MAAM,cAAc,GAA8B;IACrD,SAAS,EAAe,EAAE;IAC1B,SAAS,EAAe,EAAE;IAC1B,eAAe,EAAS,EAAE;IAC1B,eAAe,EAAS,CAAC,uBAAuB,EAAE,iBAAiB,EAAE,oBAAoB,CAAC;IAC1F,qBAAqB,EAAG,EAAE;IAC1B,kBAAkB,EAAM,gBAAgB;IACxC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI;QAC3B,YAAY,EAAE;YACV,KAAK,EAAO,KAAK;YACjB,KAAK,EAAO,OAAO,CAAC,GAAG,CAAC,WAAW;SACtC;KACJ,CAAC;IACF,aAAa,EAAW,KAAK;IAC7B,eAAe,EAAS,IAAI;IAC5B,WAAW,EAAa,cAAc;IACtC,KAAK,EAAmB,KAAK;IAC7B,aAAa,EAAW,EAAE;IAC1B,oBAAoB,EAAI,KAAK;CAChC,CAAC;AAEF,cAAc;AACd,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC;AACnC,MAAM,CAAC,MAAM,SAAS,GAAK,MAAM,CAAC,CAAC,oCAAoC"}
|
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
|
-
// 2025-
|
|
2
|
+
// 2025-10-08T16:31:20.407Z
|
|
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
|
-
// 2025-
|
|
2
|
+
// 2025-10-08T16:31:20.409Z
|
|
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-air-sensor-types.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// This module was automatically generated by node ts-interface-post.ts
|
|
2
|
-
// 2025-
|
|
2
|
+
// 2025-10-08T16:31:20.410Z
|
|
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
|
-
// 2025-
|
|
2
|
+
// 2025-10-08T16:31:20.411Z
|
|
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
|
-
// 2025-
|
|
2
|
+
// 2025-10-08T16:31:20.414Z
|
|
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.
|
|
5
|
+
"version": "1.6.0",
|
|
6
6
|
"license": "ISC",
|
|
7
7
|
"keywords": [
|
|
8
8
|
"Matterbridge",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"main": "dist/index.js",
|
|
60
60
|
"engines": {
|
|
61
61
|
"node": "^24.9.0 || ^22.19.0 || ^20.19.5",
|
|
62
|
-
"matterbridge": "^3.
|
|
62
|
+
"matterbridge": "^3.3.0"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"mqtt": "^5.14.1",
|
|
@@ -75,16 +75,16 @@
|
|
|
75
75
|
"@eslint/js": "^9.30.1",
|
|
76
76
|
"@tsconfig/node20": "^20.1.6",
|
|
77
77
|
"@types/eslint__js": "^8.42.3",
|
|
78
|
-
"@types/node": "^20.19.
|
|
78
|
+
"@types/node": "^20.19.19",
|
|
79
79
|
"@types/node-persist": "^3.1.8",
|
|
80
80
|
"@types/semver": "^7.7.1",
|
|
81
|
-
"eslint": "^9.
|
|
81
|
+
"eslint": "^9.37.0",
|
|
82
82
|
"globals": "^16.4.0",
|
|
83
83
|
"rimraf": "^6.0.1",
|
|
84
84
|
"ts-interface-builder": "^0.3.3",
|
|
85
85
|
"tsx": "^4.20.6",
|
|
86
|
-
"typescript": "^5.9.
|
|
87
|
-
"typescript-eslint": "^8.
|
|
86
|
+
"typescript": "^5.9.3",
|
|
87
|
+
"typescript-eslint": "^8.45.0"
|
|
88
88
|
},
|
|
89
89
|
"scripts": {
|
|
90
90
|
"presetup-matterbridge-github-clone": "rimraf $MATTERBRIDGE_DIR",
|