mqtt2matter 0.3.0 → 0.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +73 -0
- package/README.md +1 -0
- package/dist/config/schema.d.ts +2 -0
- package/dist/families/cover.js +52 -26
- package/dist/families/cover.js.map +1 -1
- package/dist/families/fan.d.ts +2 -0
- package/dist/families/fan.js +17 -0
- package/dist/families/fan.js.map +1 -1
- package/dist/families/index.d.ts +2 -0
- package/dist/families/index.js +2 -1
- package/dist/families/index.js.map +1 -1
- package/dist/importers/ha/generate.d.ts +13 -1
- package/dist/importers/ha/generate.js +47 -4
- package/dist/importers/ha/generate.js.map +1 -1
- package/dist/importers/ha/sync.d.ts +11 -1
- package/dist/importers/ha/sync.js +88 -26
- package/dist/importers/ha/sync.js.map +1 -1
- package/dist/importers/sync.d.ts +18 -1
- package/dist/importers/sync.js +35 -6
- package/dist/importers/sync.js.map +1 -1
- package/dist/importers/z2m/generate.js +1 -1
- package/dist/importers/z2m/generate.js.map +1 -1
- package/dist/matter/bridge.js +1 -1
- package/dist/matter/bridge.js.map +1 -1
- package/dist/matter/ids.d.ts +1 -1
- package/dist/matter/ids.js +2 -2
- package/dist/matter/ids.js.map +1 -1
- package/dist/model/options.d.ts +2 -0
- package/dist/model/options.js +8 -3
- package/dist/model/options.js.map +1 -1
- package/dist/model/presets.d.ts +14 -1
- package/dist/model/presets.js +95 -17
- package/dist/model/presets.js.map +1 -1
- package/dist/model/schema.d.ts +13 -1
- package/dist/model/schema.js +16 -4
- package/dist/model/schema.js.map +1 -1
- package/dist/server/config-store.js +2 -2
- package/dist/server/config-store.js.map +1 -1
- package/dist/server/importers.d.ts +4 -2
- package/dist/server/importers.js.map +1 -1
- package/dist/server/server.d.ts +5 -0
- package/dist/server/server.js +54 -1
- package/dist/server/server.js.map +1 -1
- package/docs/api.md +7 -6
- package/docs/architecture.md +1 -1
- package/docs/config.md +39 -24
- package/docs/importers.md +41 -15
- package/package.json +2 -1
- package/presets/mqtt-smarthome/button.json +1 -1
- package/presets/mqtt-smarthome/contact.json +1 -1
- package/presets/mqtt-smarthome/cover.json +1 -1
- package/presets/mqtt-smarthome/dimmer.json +1 -1
- package/presets/mqtt-smarthome/humidity.json +1 -1
- package/presets/mqtt-smarthome/light.json +1 -1
- package/presets/mqtt-smarthome/occupancy.json +1 -1
- package/presets/mqtt-smarthome/switch.json +1 -1
- package/presets/mqtt-smarthome/temperature.json +1 -1
- package/presets/openbeken/color-light.json +1 -1
- package/presets/openbeken/ct-light.json +1 -1
- package/presets/openbeken/dimmer.json +1 -1
- package/presets/openbeken/humidity.json +1 -1
- package/presets/openbeken/relay.json +1 -1
- package/presets/openbeken/temperature.json +1 -1
- package/presets/shelly-gen1/dimmer.json +1 -1
- package/presets/shelly-gen1/door-window.json +1 -1
- package/presets/shelly-gen1/ht.json +1 -1
- package/presets/shelly-gen1/relay-pm.json +1 -1
- package/presets/shelly-gen1/relay.json +1 -1
- package/presets/shelly-gen1/roller.json +1 -1
- package/presets/shelly-gen2/cover.json +1 -1
- package/presets/shelly-gen2/dimmer.json +1 -1
- package/presets/shelly-gen2/ht.json +1 -1
- package/presets/shelly-gen2/i4.json +1 -1
- package/presets/shelly-gen2/switch-pm.json +1 -1
- package/presets/shelly-gen2/switch.json +1 -1
- package/presets/tasmota/climate.json +1 -1
- package/presets/tasmota/color-light.json +1 -1
- package/presets/tasmota/ct-light.json +1 -1
- package/presets/tasmota/dimmer.json +1 -1
- package/presets/tasmota/relay.json +1 -1
- package/presets/tasmota/shutter.json +1 -1
- package/presets/tasmota/temperature-humidity.json +1 -1
- package/presets/tasmota/temperature.json +1 -1
- package/presets/valetudo/vacuum.json +1 -1
- package/presets/wled/dimmer.json +1 -1
- package/presets/wled/light.json +1 -1
- package/ui/dist/assets/index-Bl_bpL_0.js +10 -0
- package/ui/dist/assets/index-DsAb-xhK.css +1 -0
- package/ui/dist/index.html +2 -2
- package/ui/dist/licenses.json +1 -1
- package/ui/dist/assets/index-1HdbTkGD.css +0 -1
- package/ui/dist/assets/index-tiKYDC-5.js +0 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,78 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.3.2
|
|
4
|
+
|
|
5
|
+
- **A device key or endpoint id with a `.` is refused** with a validation error that names it and says why:
|
|
6
|
+
matter.js uses `.` as the separator of its endpoint id paths and refused such a device when the bridge built
|
|
7
|
+
it. The configuration schema, `POST /api/devices` and `PUT /api/devices/:key`, the UI's key fields and the
|
|
8
|
+
importers agree now: the Home Assistant importer turns a `.` in a device identifier or entity id into `_`, the
|
|
9
|
+
Zigbee2MQTT importer one in an endpoint name. A configuration file with such a key no longer loads — such a
|
|
10
|
+
device never worked, so nothing that ran is lost; rename its key (`a.b` → `a-b`).
|
|
11
|
+
- **A Home Assistant binary sensor announced without a `device_class` gets its sensor type chosen on the Adopt
|
|
12
|
+
page.** Some publishers (camera motion sensors from an NVR's MQTT plugin, for one) announce motion as a plain
|
|
13
|
+
on/off binary sensor; the importer listed it as unmapped and a device whose only function it was could not be
|
|
14
|
+
adopted. The details of such an entry now offer a type per sensor — motion / occupancy, contact, water leak,
|
|
15
|
+
frost, smoke, CO, battery low, battery charging — or "not mapped"; the entity is generated as if it had
|
|
16
|
+
announced that class, and the device becomes adoptable. Nothing is guessed from names. The choice is stored in
|
|
17
|
+
the device's `source.raw.classes` and kept across re-syncs; an adopted device can be given a type later
|
|
18
|
+
("Apply"). Such entries are shown without "show unsupported".
|
|
19
|
+
- **API**: `GET /api/adopt` entries carry `unclassed: [{id, name, class?}]`; `POST /api/adopt/:kind/:key`
|
|
20
|
+
takes `classes: {<entity id>: <class> | null}` (Home Assistant only, `400` for an unknown entity or class).
|
|
21
|
+
- **Fixed: an improvement of an importer never reached the devices adopted before it.** The re-sync regenerated
|
|
22
|
+
the device's old baseline from its stored description with the _current_ importer, so when only the importer
|
|
23
|
+
had changed (not the zigbee2mqtt or Home Assistant description), old and new baseline were the same: the device
|
|
24
|
+
stayed `unchanged` on the Adopt page, offered no "Update", and what the older importer had generated differently
|
|
25
|
+
counted as your edits (a fan adopted before 0.2.0 never got its auto mode, and showed edits nobody made). Now the
|
|
26
|
+
baseline a device was adopted or last updated from is stored with it (`source.baseline`) and compared with the
|
|
27
|
+
one generated now: an importer improvement shows the device as `updated`, "Update" applies it and keeps your
|
|
28
|
+
real edits, an edit on a part the importer changed too is reported as a conflict as before, and the edit count
|
|
29
|
+
counts only your edits. Both importers.
|
|
30
|
+
- **Devices adopted before 0.3.2** have no stored baseline yet: they are judged as before, and get one at their
|
|
31
|
+
next update or re-sync ("Re-sync" on the Adopt page stores it for every adopted device at once). An importer fix from
|
|
32
|
+
before that cannot be detected for them — its difference still counts as an edit; re-adopt such a device or
|
|
33
|
+
make the change by hand.
|
|
34
|
+
- **Configuration**: `source.baseline` is an addition (the device as generated, without its `source`; it makes
|
|
35
|
+
an adopted device's entry in the file about half again as large). Nothing to change in a file.
|
|
36
|
+
- **Fixed along**: `POST /api/adopt/resync` rewrote and rebuilt every adopted device, changed or not (the file's
|
|
37
|
+
key order differed from the importer's); now only the devices whose content changed.
|
|
38
|
+
- **Fixed: the device editor's sections overlapped** when a device was taller than the page (several child
|
|
39
|
+
endpoints): the page shrank them instead of scrolling. It scrolls now.
|
|
40
|
+
- **Fixed: a fan's percent set from a controller failed when its command half has a template** — only 0 and 100
|
|
41
|
+
reached the device through the mode. The template of a written attribute now sees the family's fields, as the
|
|
42
|
+
documentation says: `percent`, `mode` and `speed` for a fan. Zigbee2MQTT fans with numbered speeds (IKEA
|
|
43
|
+
STARKVIND) take any percent again; their template needed `percent`, which was undefined on this path.
|
|
44
|
+
- **Fixed: a roller blind without movement reports showed wrong states in the controllers while it moved**
|
|
45
|
+
(IKEA FYRTUR and KADRILJ through Zigbee2MQTT, which echoes a commanded position right away and then reports the
|
|
46
|
+
travel about once a second). After a command the blind jumped to the target at once, then back, and showed the
|
|
47
|
+
wrong direction; a move started at the blind and stopped there kept "opening" or "closing" for up to 30 s, until
|
|
48
|
+
the next move turned it around. Now the echo filter (`options.cover.echoFilter`, on for these blinds) also holds
|
|
49
|
+
back the echoed target until the travel is reported — a cover that reports only where it ended still gets there,
|
|
50
|
+
after the report gap — so a command shows its target and the real travel; and a movement whose reports stop ends
|
|
51
|
+
`reportGap` seconds after the last one.
|
|
52
|
+
- **Configuration**: `options.cover.reportGap` is new (seconds, default `3`): how long a running movement waits
|
|
53
|
+
for its next position report. `reportTimeout` (default `30`) keeps applying until a command's first report and
|
|
54
|
+
after a stop, and to covers with movement reports (`motion`). Raise `reportGap` for a cover that reports its
|
|
55
|
+
travel less often than every few seconds. The device editor offers it.
|
|
56
|
+
|
|
57
|
+
## 0.3.1
|
|
58
|
+
|
|
59
|
+
- **Fixed: creating a device from a preset replaced the device created before.** The dialog derived the key from
|
|
60
|
+
the device name, the presets' default names were generic ("Switch"), and `PUT /api/devices/:key` creates or
|
|
61
|
+
replaces — so the second device silently took the first one's place. Now the suggested key is never one a
|
|
62
|
+
device has (`switch`, `switch-2`, `switch-3`, …), a taken key is named and refused in the preset dialog, the
|
|
63
|
+
create dialog and the duplicate prompt, and the UI creates through the new `POST /api/devices` (`{key, device}`,
|
|
64
|
+
`409` when the key exists), which can never replace a device; `PUT` stays for edits.
|
|
65
|
+
- **Presets name the device after what identifies it** instead of a generic "Switch", "Relay" or "Light": the
|
|
66
|
+
mqtt-smarthome item with its slashes as spaces (`kitchen/light` → "kitchen light"), the Tasmota topic, the Shelly device id or MQTT prefix, the WLED topic,
|
|
67
|
+
the OpenBeken client, the Valetudo identifier — with the channel or relay index where the preset is one channel
|
|
68
|
+
of a device (`shellyplus2pm-… 1`, `plug-1 2`, `obk-th temperature`). A preset's default may reference other
|
|
69
|
+
variables (`"%item%"`), `%item|words%` with the value's slashes as spaces. In the dialog the name follows those
|
|
70
|
+
fields while you type, until you edit it yourself; a cleared name follows again.
|
|
71
|
+
- **Preset format**: a variable's `default` may reference other variables (`"default": "%topic% %index%"`);
|
|
72
|
+
where no value is given, the references are resolved from the other values and the result trimmed. A
|
|
73
|
+
reference to an undeclared variable or a cycle is a preset problem. An addition: every preset that was valid
|
|
74
|
+
stays valid and yields the same device.
|
|
75
|
+
|
|
3
76
|
## 0.3.0
|
|
4
77
|
|
|
5
78
|
- The Presets page has a search box: every word must occur in a preset's name, vendor, id or description
|
package/README.md
CHANGED
|
@@ -161,6 +161,7 @@ has a built-in Matter controller and MQTT.
|
|
|
161
161
|
npm run lint # eslint + prettier
|
|
162
162
|
npm run typecheck
|
|
163
163
|
npm test # vitest: unit tests, the strict dry run, and end-to-end tests with an in-process broker and matter.js node
|
|
164
|
+
npm run test:ui # vitest: the UI's unit tests (messages in both languages, model helpers, router, formatting)
|
|
164
165
|
npm run test:e2e # Playwright: the UI against the real stack on ephemeral ports (Chromium in CI, Firefox elsewhere; PW_BROWSER overrides)
|
|
165
166
|
npm run dev:ui # Vite with hot reload, the API proxied to a running mqtt2matter on 127.0.0.1:8282 (UI_API overrides)
|
|
166
167
|
```
|
package/dist/config/schema.d.ts
CHANGED
|
@@ -121,6 +121,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
121
121
|
key: z.ZodOptional<z.ZodString>;
|
|
122
122
|
version: z.ZodOptional<z.ZodString>;
|
|
123
123
|
raw: z.ZodOptional<z.ZodUnknown>;
|
|
124
|
+
baseline: z.ZodOptional<z.ZodUnknown>;
|
|
124
125
|
orphaned: z.ZodOptional<z.ZodBoolean>;
|
|
125
126
|
}, z.core.$strict>>;
|
|
126
127
|
availability: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodObject<{
|
|
@@ -430,6 +431,7 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
430
431
|
cover: z.ZodPrefault<z.ZodObject<{
|
|
431
432
|
echoFilter: z.ZodDefault<z.ZodBoolean>;
|
|
432
433
|
reportTimeout: z.ZodDefault<z.ZodNumber>;
|
|
434
|
+
reportGap: z.ZodDefault<z.ZodNumber>;
|
|
433
435
|
tolerance: z.ZodDefault<z.ZodNumber>;
|
|
434
436
|
}, z.core.$strict>>;
|
|
435
437
|
climate: z.ZodPrefault<z.ZodObject<{
|
package/dist/families/cover.js
CHANGED
|
@@ -3,13 +3,18 @@
|
|
|
3
3
|
device's position reports drive the current position; `operationalStatus` follows from target vs
|
|
4
4
|
current; a report timeout ends a movement nobody reported the end of; an external move (a report while
|
|
5
5
|
no command is in flight) writes a predicted target — the direction's extreme — before the current
|
|
6
|
-
position, so controllers deriving the direction from target/current show it
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
6
|
+
position, so controllers deriving the direction from target/current show it. Two timeouts end a movement
|
|
7
|
+
nobody reported the end of: `reportTimeout` while a command waits for its first report, `reportGap` once
|
|
8
|
+
reports arrive (a cover reporting its travel stops reporting when it stops). The echo filter holds back
|
|
9
|
+
what a bridge like zigbee2mqtt publishes right after a command before the cover moves: the old position
|
|
10
|
+
repeated (until a second report or the report timeout) and the commanded target itself (until a report
|
|
11
|
+
of the travel drops it, or for the report gap: then it was the only report, the end of the movement).
|
|
12
|
+
State-only covers and `moving`/`motor_state` reports bind the composite `motion`; they report the end of
|
|
13
|
+
a movement, so their position reports keep the report timeout. Tilt runs the same machine on its own
|
|
14
|
+
attributes. */
|
|
10
15
|
import { MovementDirection, MovementType, WindowCoveringServer as BaseWindowCoveringServer, } from '@matter/main/behaviors/window-covering';
|
|
11
16
|
import { WindowCovering } from '@matter/main/clusters/window-covering';
|
|
12
|
-
import { contextOf, hasCommand, hasFeature, route, scratch } from "./registry.js";
|
|
17
|
+
import { contextOf, hasCommand, hasFeature, hasStatus, route, scratch } from "./registry.js";
|
|
13
18
|
const { MovementStatus } = WindowCovering;
|
|
14
19
|
export const LIFT_TARGET_KEY = 'WindowCovering.targetPositionLiftPercent100ths';
|
|
15
20
|
export const TILT_TARGET_KEY = 'WindowCovering.targetPositionTiltPercent100ths';
|
|
@@ -19,6 +24,8 @@ export const STOP_KEY = 'WindowCovering.stopMotion';
|
|
|
19
24
|
export const MOTION_KEY = 'WindowCovering.motion';
|
|
20
25
|
const OPEN = 0;
|
|
21
26
|
const CLOSED = 10000;
|
|
27
|
+
/** a report at the commanded target this far from the current position is taken for an echo (a fifth of the travel) */
|
|
28
|
+
const ECHO_JUMP = 2000;
|
|
22
29
|
const LIFT = {
|
|
23
30
|
name: 'lift',
|
|
24
31
|
current: 'currentPositionLiftPercent100ths',
|
|
@@ -37,7 +44,7 @@ function axisState(context, axis) {
|
|
|
37
44
|
return scratch(context, `cover.${axis.name}`, () => ({
|
|
38
45
|
inFlight: false,
|
|
39
46
|
awaitingFirstReport: true,
|
|
40
|
-
|
|
47
|
+
candidate: undefined,
|
|
41
48
|
external: false,
|
|
42
49
|
timer: undefined,
|
|
43
50
|
viaUpDown: false,
|
|
@@ -50,14 +57,14 @@ function clearTimer(state) {
|
|
|
50
57
|
state.timer = undefined;
|
|
51
58
|
}
|
|
52
59
|
}
|
|
53
|
-
function armTimeout(context, axis, state, onExpiry) {
|
|
60
|
+
function armTimeout(context, axis, state, seconds, onExpiry) {
|
|
54
61
|
clearTimer(state);
|
|
55
62
|
state.timer = setTimeout(() => {
|
|
56
63
|
state.timer = undefined;
|
|
57
64
|
onExpiry().catch((error) => {
|
|
58
65
|
context.log.error(`cover ${axis.name}: report timeout handling failed`, error);
|
|
59
66
|
});
|
|
60
|
-
},
|
|
67
|
+
}, seconds * 1000);
|
|
61
68
|
state.timer.unref();
|
|
62
69
|
}
|
|
63
70
|
function wcState(context) {
|
|
@@ -71,7 +78,7 @@ async function stopAxis(context, axis, state, snapTargetTo) {
|
|
|
71
78
|
state.inFlight = false;
|
|
72
79
|
state.external = false;
|
|
73
80
|
state.stopping = false;
|
|
74
|
-
state.
|
|
81
|
+
state.candidate = undefined;
|
|
75
82
|
const current = wcState(context);
|
|
76
83
|
const patch = {
|
|
77
84
|
operationalStatus: { ...current.operationalStatus, [axis.name]: MovementStatus.Stopped },
|
|
@@ -87,10 +94,16 @@ async function stopAxis(context, axis, state, snapTargetTo) {
|
|
|
87
94
|
}
|
|
88
95
|
await setWc(context, patch);
|
|
89
96
|
}
|
|
97
|
+
/** seconds without a report before a movement whose reports arrive counts as ended */
|
|
98
|
+
function gapSeconds(context) {
|
|
99
|
+
const { reportGap, reportTimeout } = context.options.cover;
|
|
100
|
+
// a cover with movement reports says when it stops; its position may be reported less often
|
|
101
|
+
return hasStatus(context, MOTION_KEY) ? reportTimeout : reportGap;
|
|
102
|
+
}
|
|
90
103
|
/** a device's position report on an axis */
|
|
91
104
|
async function reportPosition(context, axis, value) {
|
|
92
105
|
const state = axisState(context, axis);
|
|
93
|
-
const { tolerance, echoFilter } = context.options.cover;
|
|
106
|
+
const { tolerance, echoFilter, reportTimeout } = context.options.cover;
|
|
94
107
|
const wc = wcState(context);
|
|
95
108
|
const previous = wc[axis.current];
|
|
96
109
|
const target = wc[axis.target];
|
|
@@ -100,23 +113,36 @@ async function reportPosition(context, axis, value) {
|
|
|
100
113
|
return;
|
|
101
114
|
}
|
|
102
115
|
if (state.inFlight) {
|
|
103
|
-
if (
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
116
|
+
if (echoFilter && previous !== null && target !== null) {
|
|
117
|
+
if (state.awaitingFirstReport && value === previous && target !== value) {
|
|
118
|
+
// the old position repeated right after the command; wait for a second opinion
|
|
119
|
+
state.awaitingFirstReport = false;
|
|
120
|
+
armTimeout(context, axis, state, reportTimeout, async () => {
|
|
121
|
+
await stopAxis(context, axis, state, value);
|
|
122
|
+
});
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
if (Math.abs(value - target) <= tolerance && Math.abs(value - previous) > ECHO_JUMP) {
|
|
126
|
+
// the commanded target echoed before the cover moved: hold it back (repeats too) until the travel
|
|
127
|
+
// is reported; if nothing follows, it was the only report and the movement ended there
|
|
128
|
+
state.awaitingFirstReport = false;
|
|
129
|
+
if (state.candidate === undefined) {
|
|
130
|
+
state.candidate = value;
|
|
131
|
+
armTimeout(context, axis, state, gapSeconds(context), async () => {
|
|
132
|
+
await stopAxis(context, axis, state, value);
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
111
137
|
}
|
|
112
138
|
state.awaitingFirstReport = false;
|
|
113
|
-
state.
|
|
139
|
+
state.candidate = undefined;
|
|
114
140
|
if (target !== null && Math.abs(value - target) <= tolerance) {
|
|
115
141
|
await stopAxis(context, axis, state, value);
|
|
116
142
|
return;
|
|
117
143
|
}
|
|
118
144
|
await setWc(context, { [axis.current]: value });
|
|
119
|
-
armTimeout(context, axis, state, async () => {
|
|
145
|
+
armTimeout(context, axis, state, gapSeconds(context), async () => {
|
|
120
146
|
await stopAxis(context, axis, state);
|
|
121
147
|
});
|
|
122
148
|
return;
|
|
@@ -142,7 +168,7 @@ async function reportPosition(context, axis, value) {
|
|
|
142
168
|
return;
|
|
143
169
|
}
|
|
144
170
|
await setWc(context, { [axis.current]: value });
|
|
145
|
-
armTimeout(context, axis, state, async () => {
|
|
171
|
+
armTimeout(context, axis, state, gapSeconds(context), async () => {
|
|
146
172
|
await stopAxis(context, axis, state);
|
|
147
173
|
});
|
|
148
174
|
}
|
|
@@ -164,7 +190,7 @@ async function reportMotion(context, value) {
|
|
|
164
190
|
liftState.external = true;
|
|
165
191
|
}
|
|
166
192
|
await setWc(context, patch);
|
|
167
|
-
armTimeout(context, LIFT, liftState, async () => {
|
|
193
|
+
armTimeout(context, LIFT, liftState, context.options.cover.reportTimeout, async () => {
|
|
168
194
|
await stopAxis(context, LIFT, liftState);
|
|
169
195
|
});
|
|
170
196
|
return;
|
|
@@ -273,8 +299,8 @@ export class WindowCoveringServer extends BaseWindowCoveringServer {
|
|
|
273
299
|
state.inFlight = true;
|
|
274
300
|
state.external = false;
|
|
275
301
|
state.awaitingFirstReport = true;
|
|
276
|
-
state.
|
|
277
|
-
armTimeout(context, axis, state, async () => {
|
|
302
|
+
state.candidate = undefined;
|
|
303
|
+
armTimeout(context, axis, state, context.options.cover.reportTimeout, async () => {
|
|
278
304
|
context.log.info(`cover ${axis.name}: no position report within the timeout, movement counts as ended`);
|
|
279
305
|
await stopAxis(context, axis, state);
|
|
280
306
|
});
|
|
@@ -291,14 +317,14 @@ export class WindowCoveringServer extends BaseWindowCoveringServer {
|
|
|
291
317
|
clearTimer(state);
|
|
292
318
|
state.inFlight = false;
|
|
293
319
|
state.external = false;
|
|
294
|
-
state.
|
|
320
|
+
state.candidate = undefined;
|
|
295
321
|
if (applied || !hasFeature(context, 'WindowCovering', axis.positionAware)) {
|
|
296
322
|
await stopAxis(context, axis, state);
|
|
297
323
|
}
|
|
298
324
|
else {
|
|
299
325
|
// the device reports where it stopped; until then (or the timeout) the movement goes on
|
|
300
326
|
state.stopping = true;
|
|
301
|
-
armTimeout(context, axis, state, async () => {
|
|
327
|
+
armTimeout(context, axis, state, context.options.cover.reportTimeout, async () => {
|
|
302
328
|
await stopAxis(context, axis, state);
|
|
303
329
|
});
|
|
304
330
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cover.js","sourceRoot":"","sources":["../../src/families/cover.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cover.js","sourceRoot":"","sources":["../../src/families/cover.ts"],"names":[],"mappings":"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"}
|
package/dist/families/fan.d.ts
CHANGED
|
@@ -10,6 +10,8 @@ export declare class FanControlServer extends BaseFanControlServer {
|
|
|
10
10
|
}
|
|
11
11
|
export declare function percentToMode(context: FamilyContext, percent: number): number;
|
|
12
12
|
export declare function modeToPercent(context: FamilyContext, mode: number): number | undefined;
|
|
13
|
+
/** the fields a written attribute's command template sees, as on the family's own routes */
|
|
14
|
+
export declare function fanWriteFields(context: FamilyContext, attribute: string, value: unknown): Record<string, unknown>;
|
|
13
15
|
/** a controller wrote `fanMode` or `percentSetting` (already applied): keep the rest consistent, publish the rest */
|
|
14
16
|
export declare function fanWrite(context: FamilyContext, attribute: string, value: unknown): Promise<void>;
|
|
15
17
|
/** the device reported: a percent sets setting and current (and the mode unless bound), a mode the percent */
|
package/dist/families/fan.js
CHANGED
|
@@ -61,6 +61,23 @@ function speedPatch(context, percent) {
|
|
|
61
61
|
const speed = Math.round((percent / 100) * speedMax);
|
|
62
62
|
return { speedSetting: speed, speedCurrent: speed };
|
|
63
63
|
}
|
|
64
|
+
/** the fields a written attribute's command template sees, as on the family's own routes */
|
|
65
|
+
export function fanWriteFields(context, attribute, value) {
|
|
66
|
+
if (typeof value !== 'number') {
|
|
67
|
+
return {};
|
|
68
|
+
}
|
|
69
|
+
if (attribute === 'percentSetting') {
|
|
70
|
+
return { percent: value };
|
|
71
|
+
}
|
|
72
|
+
if (attribute === 'fanMode') {
|
|
73
|
+
const percent = modeToPercent(context, value);
|
|
74
|
+
return percent === undefined ? { mode: value } : { percent, mode: value };
|
|
75
|
+
}
|
|
76
|
+
if (attribute === 'speedSetting' && context.options.fan.speedMax > 0) {
|
|
77
|
+
return { percent: Math.round((value / context.options.fan.speedMax) * 100), speed: value };
|
|
78
|
+
}
|
|
79
|
+
return {};
|
|
80
|
+
}
|
|
64
81
|
/** a controller wrote `fanMode` or `percentSetting` (already applied): keep the rest consistent, publish the rest */
|
|
65
82
|
export async function fanWrite(context, attribute, value) {
|
|
66
83
|
if (attribute === 'percentSetting' && typeof value === 'number') {
|
package/dist/families/fan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fan.js","sourceRoot":"","sources":["../../src/families/fan.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fan.js","sourceRoot":"","sources":["../../src/families/fan.ts"],"names":[],"mappings":"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"}
|
package/dist/families/index.d.ts
CHANGED
|
@@ -13,6 +13,8 @@ export interface Family {
|
|
|
13
13
|
status?: (context: FamilyContext | undefined, attribute: string, value: Decoded) => Promise<Record<string, unknown> | boolean>;
|
|
14
14
|
/** a controller wrote a writable attribute (already applied) */
|
|
15
15
|
write?: (context: FamilyContext, attribute: string, value: unknown) => Promise<void>;
|
|
16
|
+
/** the template fields of a written attribute's command half (the fan's `percent`, `mode`, `speed`) */
|
|
17
|
+
writeFields?: (context: FamilyContext, attribute: string, value: unknown) => Record<string, unknown>;
|
|
16
18
|
/** writable attributes the family watches even without a mapping (the fan derives one from the other) */
|
|
17
19
|
writes?: readonly string[];
|
|
18
20
|
/** the event channel of the cluster */
|
package/dist/families/index.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
dispatches. */
|
|
6
6
|
import { climateDefaults, climateFeatures, ThermostatServer } from "./climate.js";
|
|
7
7
|
import { coverStatus, WindowCoveringServer } from "./cover.js";
|
|
8
|
-
import { FanControlServer, fanStatus, fanWrite } from "./fan.js";
|
|
8
|
+
import { FanControlServer, fanStatus, fanWrite, fanWriteFields } from "./fan.js";
|
|
9
9
|
import { ColorControlServer, colorStatusPatch, LevelControlServer } from "./light.js";
|
|
10
10
|
import { DoorLockServer } from "./lock.js";
|
|
11
11
|
import { OnOffServer } from "./on-off.js";
|
|
@@ -108,6 +108,7 @@ export const FAMILIES = [
|
|
|
108
108
|
}),
|
|
109
109
|
status: fanStatus,
|
|
110
110
|
write: fanWrite,
|
|
111
|
+
writeFields: fanWriteFields,
|
|
111
112
|
writes: ['fanMode', 'percentSetting', 'speedSetting'],
|
|
112
113
|
},
|
|
113
114
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/families/index.ts"],"names":[],"mappings":"AAAA;;;;iBAIiB;AAMjB,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAChF,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAC,gBAAgB,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AAC/
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/families/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { DeviceInput } from '../../model/index.ts';
|
|
2
|
-
import type { Generated } from '../sync.ts';
|
|
2
|
+
import type { Generated, UnclassedEntity } from '../sync.ts';
|
|
3
3
|
import { type DeviceInfo, deviceIdentity, type EntityConfig, type Origin } from './types.ts';
|
|
4
4
|
export declare const SOURCE_KIND = "ha-discovery";
|
|
5
5
|
/** bumped when the generator's output for the same raw description changes */
|
|
@@ -20,8 +20,20 @@ export interface RawDevice {
|
|
|
20
20
|
device: DeviceInfo;
|
|
21
21
|
origin?: Origin;
|
|
22
22
|
entities: RawEntity[];
|
|
23
|
+
/**
|
|
24
|
+
* the user's choice for binary sensors announced without a `device_class`, by entity id: the class the
|
|
25
|
+
* entity is generated as. Kept here so a re-sync regenerates the same device; never guessed.
|
|
26
|
+
*/
|
|
27
|
+
classes?: Record<string, string>;
|
|
23
28
|
}
|
|
24
29
|
export declare function isRaw(value: unknown): value is RawDevice;
|
|
30
|
+
/**
|
|
31
|
+
* The `device_class`es of a binary sensor the generator maps, with the Matter device type each becomes: the
|
|
32
|
+
* types a user can choose for a binary sensor announced without a class.
|
|
33
|
+
*/
|
|
34
|
+
export declare const BINARY_SENSOR_CLASSES: Readonly<Record<string, string>>;
|
|
35
|
+
/** the binary sensors of a device that are announced without a `device_class` and would be generated otherwise */
|
|
36
|
+
export declare function unclassedEntities(raw: RawDevice): UnclassedEntity[];
|
|
25
37
|
export declare function rawHash(raw: RawDevice): string;
|
|
26
38
|
/** a device key the schema accepts: `ha:` plus the identity, cleaned; long ones are cut and hashed */
|
|
27
39
|
export declare function deviceKey(identity: string): string;
|
|
@@ -26,12 +26,55 @@ export function isRaw(value) {
|
|
|
26
26
|
typeof raw.identity === 'string' &&
|
|
27
27
|
Array.isArray(raw.entities));
|
|
28
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* The `device_class`es of a binary sensor the generator maps, with the Matter device type each becomes: the
|
|
31
|
+
* types a user can choose for a binary sensor announced without a class.
|
|
32
|
+
*/
|
|
33
|
+
export const BINARY_SENSOR_CLASSES = {
|
|
34
|
+
motion: 'OccupancySensor',
|
|
35
|
+
occupancy: 'OccupancySensor',
|
|
36
|
+
presence: 'OccupancySensor',
|
|
37
|
+
moving: 'OccupancySensor',
|
|
38
|
+
opening: 'ContactSensor',
|
|
39
|
+
door: 'ContactSensor',
|
|
40
|
+
window: 'ContactSensor',
|
|
41
|
+
garage_door: 'ContactSensor',
|
|
42
|
+
moisture: 'WaterLeakDetector',
|
|
43
|
+
cold: 'WaterFreezeDetector',
|
|
44
|
+
smoke: 'SmokeCoAlarm',
|
|
45
|
+
carbon_monoxide: 'SmokeCoAlarm',
|
|
46
|
+
battery: 'PowerSource',
|
|
47
|
+
battery_charging: 'PowerSource',
|
|
48
|
+
};
|
|
49
|
+
/** the binary sensors of a device that are announced without a `device_class` and would be generated otherwise */
|
|
50
|
+
export function unclassedEntities(raw) {
|
|
51
|
+
return raw.entities
|
|
52
|
+
.filter((e) => e.component === 'binary_sensor' &&
|
|
53
|
+
str(e.config.device_class) === undefined &&
|
|
54
|
+
str(e.config.entity_category) === undefined &&
|
|
55
|
+
e.config.enabled_by_default !== false)
|
|
56
|
+
.map((e) => {
|
|
57
|
+
const chosen = raw.classes?.[e.id];
|
|
58
|
+
return { id: e.id, name: entityName(e), ...(chosen === undefined ? {} : { class: chosen }) };
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
/** the raw description with the chosen classes applied: a chosen entity reads as if it had that class */
|
|
62
|
+
function withChosenClasses(raw) {
|
|
63
|
+
const chosen = raw.classes ?? {};
|
|
64
|
+
const open = new Set(unclassedEntities(raw).map((e) => e.id));
|
|
65
|
+
return raw.entities.map((entity) => {
|
|
66
|
+
const deviceClass = chosen[entity.id];
|
|
67
|
+
return deviceClass !== undefined && open.has(entity.id) && BINARY_SENSOR_CLASSES[deviceClass] !== undefined
|
|
68
|
+
? { ...entity, config: { ...entity.config, device_class: deviceClass } }
|
|
69
|
+
: entity;
|
|
70
|
+
});
|
|
71
|
+
}
|
|
29
72
|
export function rawHash(raw) {
|
|
30
73
|
return `${GENERATOR_VERSION}.${createHash('sha256').update(JSON.stringify(raw)).digest('hex').slice(0, 12)}`;
|
|
31
74
|
}
|
|
32
75
|
/** a device key the schema accepts: `ha:` plus the identity, cleaned; long ones are cut and hashed */
|
|
33
76
|
export function deviceKey(identity) {
|
|
34
|
-
const cleaned = identity.replace(/[^A-Za-z0-9
|
|
77
|
+
const cleaned = identity.replace(/[^A-Za-z0-9:_-]/g, '_');
|
|
35
78
|
const key = `ha:${cleaned}`;
|
|
36
79
|
if (key.length <= MAX_KEY) {
|
|
37
80
|
return key;
|
|
@@ -41,7 +84,7 @@ export function deviceKey(identity) {
|
|
|
41
84
|
}
|
|
42
85
|
/** an endpoint id the schema accepts */
|
|
43
86
|
export function endpointId(name) {
|
|
44
|
-
const cleaned = name.replace(/[^A-Za-z0-9
|
|
87
|
+
const cleaned = name.replace(/[^A-Za-z0-9:_-]/g, '_').slice(0, MAX_KEY);
|
|
45
88
|
return /^[A-Za-z0-9]/.test(cleaned) ? cleaned : `e${cleaned}`;
|
|
46
89
|
}
|
|
47
90
|
const IEEE = /^(?:0x)?([0-9a-fA-F]{16})$/;
|
|
@@ -947,7 +990,7 @@ class Builder {
|
|
|
947
990
|
}
|
|
948
991
|
default:
|
|
949
992
|
this.skip(entity, deviceClass === undefined
|
|
950
|
-
? 'no device_class; a binary sensor without one has no Matter sensor type'
|
|
993
|
+
? 'no device_class; a binary sensor without one has no Matter sensor type until one is chosen'
|
|
951
994
|
: `device_class ${deviceClass} has no Matter sensor type`);
|
|
952
995
|
}
|
|
953
996
|
}
|
|
@@ -1340,7 +1383,7 @@ class Builder {
|
|
|
1340
1383
|
/** the baseline for a device description, or — when nothing of it maps onto Matter — only the reasons */
|
|
1341
1384
|
export function generateReport(raw) {
|
|
1342
1385
|
const builder = new Builder();
|
|
1343
|
-
builder.walk(raw
|
|
1386
|
+
builder.walk(withChosenClasses(raw));
|
|
1344
1387
|
const area = label(str(raw.device.suggested_area));
|
|
1345
1388
|
const endpoints = builder.endpoints(area);
|
|
1346
1389
|
if (endpoints === undefined) {
|