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/dist/model/presets.js
CHANGED
|
@@ -3,15 +3,24 @@
|
|
|
3
3
|
values. The format is fixed here; the shipped presets for Tasmota, Shelly and ESPHome come later and
|
|
4
4
|
users add their own as JSON files. A placeholder is `%name%`; `variables` declares each with a label
|
|
5
5
|
and a default, so an editor can ask for them. Substitution is textual over the JSON of the template,
|
|
6
|
-
so a placeholder can stand in a topic, a payload or a template string alike.
|
|
6
|
+
so a placeholder can stand in a topic, a payload or a template string alike. A default may itself
|
|
7
|
+
name other variables (`"default": "%item%"`, `"%item|words%"` with the value's slashes as spaces): it is
|
|
8
|
+
resolved from their values when no value is given, so a device's default name can be what identifies it. */
|
|
7
9
|
import { z } from 'zod';
|
|
8
10
|
import { DeviceSchema } from "./schema.js";
|
|
9
11
|
export const PLACEHOLDER_PATTERN = /%([A-Za-z_][A-Za-z0-9_]*)%/g;
|
|
12
|
+
/** a reference in a default: `%name%`, or `%name|words%` for the value with its slashes as spaces */
|
|
13
|
+
export const DEFAULT_REFERENCE_PATTERN = /%([A-Za-z_][A-Za-z0-9_]*)(?:\|(words))?%/g;
|
|
14
|
+
/** a referenced value as a default takes it: `words` turns `kitchen/ceiling` into `kitchen ceiling` */
|
|
15
|
+
export function referenceValue(value, modifier) {
|
|
16
|
+
return modifier === 'words' ? value.replace(/\//g, ' ').replace(/\s+/g, ' ').trim() : value;
|
|
17
|
+
}
|
|
10
18
|
export const PresetVariableSchema = z
|
|
11
19
|
.object({
|
|
12
20
|
/** what the editor asks for */
|
|
13
21
|
label: z.string().min(1),
|
|
14
22
|
description: z.string().optional(),
|
|
23
|
+
/** may reference other variables (`%item%`): resolved from their values, then trimmed */
|
|
15
24
|
default: z.string().optional(),
|
|
16
25
|
/** no default and not optional: the user must fill it */
|
|
17
26
|
optional: z.boolean().default(false),
|
|
@@ -49,7 +58,14 @@ export function placeholdersOf(preset) {
|
|
|
49
58
|
}
|
|
50
59
|
return [...names].sort();
|
|
51
60
|
}
|
|
52
|
-
/**
|
|
61
|
+
/** the variables a default references */
|
|
62
|
+
function referencesOf(text) {
|
|
63
|
+
return [...text.matchAll(DEFAULT_REFERENCE_PATTERN)].map((match) => match[1] ?? '');
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* parse a preset file's JSON; every placeholder must be declared in `variables`, and a default may reference
|
|
67
|
+
* only declared variables, without a cycle
|
|
68
|
+
*/
|
|
53
69
|
export function parsePreset(raw) {
|
|
54
70
|
const result = PresetSchema.safeParse(raw);
|
|
55
71
|
if (!result.success) {
|
|
@@ -60,33 +76,95 @@ export function parsePreset(raw) {
|
|
|
60
76
|
if (undeclared.length > 0) {
|
|
61
77
|
throw new PresetError(`preset ${preset.id}: placeholders without a variable: ${undeclared.join(', ')}`);
|
|
62
78
|
}
|
|
79
|
+
for (const [name, variable] of Object.entries(preset.variables)) {
|
|
80
|
+
const references = referencesOf(variable.default ?? '');
|
|
81
|
+
const unknown = references.filter((ref) => !(ref in preset.variables));
|
|
82
|
+
if (unknown.length > 0) {
|
|
83
|
+
throw new PresetError(`preset ${preset.id}: the default of ${name} references undeclared variables: ${unknown.join(', ')}`);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
const cycle = defaultCycle(preset);
|
|
87
|
+
if (cycle !== undefined) {
|
|
88
|
+
throw new PresetError(`preset ${preset.id}: the defaults reference each other in a cycle: ${cycle.join(' → ')}`);
|
|
89
|
+
}
|
|
63
90
|
return preset;
|
|
64
91
|
}
|
|
65
|
-
|
|
66
|
-
|
|
92
|
+
/** the first cycle among the defaults' references, as the names on it */
|
|
93
|
+
function defaultCycle(preset) {
|
|
94
|
+
const done = new Set();
|
|
95
|
+
const visit = (name, path) => {
|
|
96
|
+
const at = path.indexOf(name);
|
|
97
|
+
if (at >= 0) {
|
|
98
|
+
return [...path.slice(at), name];
|
|
99
|
+
}
|
|
100
|
+
if (done.has(name)) {
|
|
101
|
+
return undefined;
|
|
102
|
+
}
|
|
103
|
+
for (const ref of referencesOf(preset.variables[name]?.default ?? '')) {
|
|
104
|
+
const found = visit(ref, [...path, name]);
|
|
105
|
+
if (found !== undefined) {
|
|
106
|
+
return found;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
done.add(name);
|
|
110
|
+
return undefined;
|
|
111
|
+
};
|
|
112
|
+
for (const name of Object.keys(preset.variables)) {
|
|
113
|
+
const found = visit(name, []);
|
|
114
|
+
if (found !== undefined) {
|
|
115
|
+
return found;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return undefined;
|
|
67
119
|
}
|
|
68
120
|
/**
|
|
69
|
-
* The
|
|
70
|
-
*
|
|
121
|
+
* The value of every variable: the given one, else its default with the references to other variables
|
|
122
|
+
* resolved the same way and the result trimmed, else empty for an optional one. A variable without a value,
|
|
123
|
+
* a default or `optional` is missing.
|
|
71
124
|
*/
|
|
72
|
-
export function
|
|
125
|
+
export function presetValues(preset, values) {
|
|
73
126
|
const missing = [];
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
if (
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
127
|
+
const resolved = new Map();
|
|
128
|
+
const resolve = (name) => {
|
|
129
|
+
const known = resolved.get(name);
|
|
130
|
+
if (known !== undefined) {
|
|
131
|
+
return known;
|
|
132
|
+
}
|
|
133
|
+
const variable = preset.variables[name];
|
|
134
|
+
const given = values[name];
|
|
135
|
+
let value;
|
|
136
|
+
if (given !== undefined) {
|
|
137
|
+
value = given;
|
|
138
|
+
}
|
|
139
|
+
else if (variable?.default !== undefined) {
|
|
140
|
+
value = variable.default
|
|
141
|
+
.replace(DEFAULT_REFERENCE_PATTERN, (_m, ref, modifier) => referenceValue(resolve(ref), modifier))
|
|
142
|
+
.trim();
|
|
82
143
|
}
|
|
83
144
|
else {
|
|
84
|
-
|
|
145
|
+
if (variable !== undefined && !variable.optional) {
|
|
146
|
+
missing.push(name);
|
|
147
|
+
}
|
|
148
|
+
value = '';
|
|
85
149
|
}
|
|
86
|
-
|
|
150
|
+
resolved.set(name, value);
|
|
151
|
+
return value;
|
|
152
|
+
};
|
|
153
|
+
const filled = Object.fromEntries(Object.keys(preset.variables).map((name) => [name, resolve(name)]));
|
|
87
154
|
if (missing.length > 0) {
|
|
88
155
|
throw new PresetError(`preset ${preset.id}: missing values for ${missing.join(', ')}`);
|
|
89
156
|
}
|
|
157
|
+
return filled;
|
|
158
|
+
}
|
|
159
|
+
function escapeForJson(value) {
|
|
160
|
+
return JSON.stringify(value).slice(1, -1);
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* The device entry a preset yields for the user's values. Values are substituted into the JSON text, so
|
|
164
|
+
* they are escaped as JSON strings; a placeholder that forms a whole JSON string stays a string.
|
|
165
|
+
*/
|
|
166
|
+
export function applyPreset(preset, values) {
|
|
167
|
+
const filled = presetValues(preset, values);
|
|
90
168
|
const text = JSON.stringify(preset.device).replace(PLACEHOLDER_PATTERN, (_m, name) => escapeForJson(filled[name] ?? ''));
|
|
91
169
|
let raw;
|
|
92
170
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../src/model/presets.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../src/model/presets.ts"],"names":[],"mappings":"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"}
|
package/dist/model/schema.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
/**
|
|
2
|
+
/**
|
|
3
|
+
* a device key: the stable Matter endpoint id, so Matter endpoint numbers stay stable across restarts. No `.`:
|
|
4
|
+
* matter.js uses it as the separator of its endpoint id paths and refuses an endpoint id that contains one.
|
|
5
|
+
*/
|
|
3
6
|
export declare const DEVICE_KEY_PATTERN: RegExp;
|
|
7
|
+
/** why a key or endpoint id was refused */
|
|
8
|
+
export declare const DEVICE_KEY_MESSAGE = "a device key is 1\u201364 characters of A\u2013Z a\u2013z 0\u20139 : _ - and starts with a letter or digit; no \".\" (matter.js uses it as its path separator)";
|
|
9
|
+
export declare const ENDPOINT_ID_MESSAGE = "an endpoint id is 1\u201364 characters of A\u2013Z a\u2013z 0\u20139 : _ - and starts with a letter or digit; no \".\" (matter.js uses it as its path separator)";
|
|
4
10
|
/** `Cluster.attribute` in matter.js' names, e.g. `OnOff.onOff`, `LevelControl.currentLevel` */
|
|
5
11
|
export declare const ATTRIBUTE_PATTERN: RegExp;
|
|
6
12
|
/** `Cluster.command` in matter.js' names, e.g. `WindowCovering.stopMotion`, `Identify.identify` */
|
|
@@ -914,6 +920,7 @@ export declare const EndpointSchema: z.ZodObject<{
|
|
|
914
920
|
cover: z.ZodPrefault<z.ZodObject<{
|
|
915
921
|
echoFilter: z.ZodDefault<z.ZodBoolean>;
|
|
916
922
|
reportTimeout: z.ZodDefault<z.ZodNumber>;
|
|
923
|
+
reportGap: z.ZodDefault<z.ZodNumber>;
|
|
917
924
|
tolerance: z.ZodDefault<z.ZodNumber>;
|
|
918
925
|
}, z.core.$strict>>;
|
|
919
926
|
climate: z.ZodPrefault<z.ZodObject<{
|
|
@@ -957,6 +964,7 @@ export declare const SourceSchema: z.ZodObject<{
|
|
|
957
964
|
key: z.ZodOptional<z.ZodString>;
|
|
958
965
|
version: z.ZodOptional<z.ZodString>;
|
|
959
966
|
raw: z.ZodOptional<z.ZodUnknown>;
|
|
967
|
+
baseline: z.ZodOptional<z.ZodUnknown>;
|
|
960
968
|
orphaned: z.ZodOptional<z.ZodBoolean>;
|
|
961
969
|
}, z.core.$strict>;
|
|
962
970
|
export type Source = z.infer<typeof SourceSchema>;
|
|
@@ -1036,6 +1044,7 @@ export declare const DeviceSchema: z.ZodObject<{
|
|
|
1036
1044
|
key: z.ZodOptional<z.ZodString>;
|
|
1037
1045
|
version: z.ZodOptional<z.ZodString>;
|
|
1038
1046
|
raw: z.ZodOptional<z.ZodUnknown>;
|
|
1047
|
+
baseline: z.ZodOptional<z.ZodUnknown>;
|
|
1039
1048
|
orphaned: z.ZodOptional<z.ZodBoolean>;
|
|
1040
1049
|
}, z.core.$strict>>;
|
|
1041
1050
|
availability: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodObject<{
|
|
@@ -1345,6 +1354,7 @@ export declare const DeviceSchema: z.ZodObject<{
|
|
|
1345
1354
|
cover: z.ZodPrefault<z.ZodObject<{
|
|
1346
1355
|
echoFilter: z.ZodDefault<z.ZodBoolean>;
|
|
1347
1356
|
reportTimeout: z.ZodDefault<z.ZodNumber>;
|
|
1357
|
+
reportGap: z.ZodDefault<z.ZodNumber>;
|
|
1348
1358
|
tolerance: z.ZodDefault<z.ZodNumber>;
|
|
1349
1359
|
}, z.core.$strict>>;
|
|
1350
1360
|
climate: z.ZodPrefault<z.ZodObject<{
|
|
@@ -1401,6 +1411,7 @@ export declare const DevicesSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
|
1401
1411
|
key: z.ZodOptional<z.ZodString>;
|
|
1402
1412
|
version: z.ZodOptional<z.ZodString>;
|
|
1403
1413
|
raw: z.ZodOptional<z.ZodUnknown>;
|
|
1414
|
+
baseline: z.ZodOptional<z.ZodUnknown>;
|
|
1404
1415
|
orphaned: z.ZodOptional<z.ZodBoolean>;
|
|
1405
1416
|
}, z.core.$strict>>;
|
|
1406
1417
|
availability: z.ZodOptional<z.ZodUnion<readonly [z.ZodPipe<z.ZodObject<{
|
|
@@ -1710,6 +1721,7 @@ export declare const DevicesSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
|
1710
1721
|
cover: z.ZodPrefault<z.ZodObject<{
|
|
1711
1722
|
echoFilter: z.ZodDefault<z.ZodBoolean>;
|
|
1712
1723
|
reportTimeout: z.ZodDefault<z.ZodNumber>;
|
|
1724
|
+
reportGap: z.ZodDefault<z.ZodNumber>;
|
|
1713
1725
|
tolerance: z.ZodDefault<z.ZodNumber>;
|
|
1714
1726
|
}, z.core.$strict>>;
|
|
1715
1727
|
climate: z.ZodPrefault<z.ZodObject<{
|
package/dist/model/schema.js
CHANGED
|
@@ -6,8 +6,14 @@
|
|
|
6
6
|
MQTT with independent `status` (device → Matter) and `command` (Matter → device) halves. */
|
|
7
7
|
import { z } from 'zod';
|
|
8
8
|
import { OptionsSchema } from "./options.js";
|
|
9
|
-
/**
|
|
10
|
-
|
|
9
|
+
/**
|
|
10
|
+
* a device key: the stable Matter endpoint id, so Matter endpoint numbers stay stable across restarts. No `.`:
|
|
11
|
+
* matter.js uses it as the separator of its endpoint id paths and refuses an endpoint id that contains one.
|
|
12
|
+
*/
|
|
13
|
+
export const DEVICE_KEY_PATTERN = /^[A-Za-z0-9][A-Za-z0-9:_-]{0,63}$/;
|
|
14
|
+
/** why a key or endpoint id was refused */
|
|
15
|
+
export const DEVICE_KEY_MESSAGE = 'a device key is 1–64 characters of A–Z a–z 0–9 : _ - and starts with a letter or digit; no "." (matter.js uses it as its path separator)';
|
|
16
|
+
export const ENDPOINT_ID_MESSAGE = 'an endpoint id is 1–64 characters of A–Z a–z 0–9 : _ - and starts with a letter or digit; no "." (matter.js uses it as its path separator)';
|
|
11
17
|
/** `Cluster.attribute` in matter.js' names, e.g. `OnOff.onOff`, `LevelControl.currentLevel` */
|
|
12
18
|
export const ATTRIBUTE_PATTERN = /^[A-Z][A-Za-z0-9]*\.[a-z][A-Za-z0-9]*$/;
|
|
13
19
|
/** `Cluster.command` in matter.js' names, e.g. `WindowCovering.stopMotion`, `Identify.identify` */
|
|
@@ -174,7 +180,7 @@ export function mappingTarget(mapping) {
|
|
|
174
180
|
export const EndpointSchema = z
|
|
175
181
|
.object({
|
|
176
182
|
/** the endpoint's id within the device; `main` is the bridged node itself, others are children */
|
|
177
|
-
id: z.string().regex(DEVICE_KEY_PATTERN).default('main'),
|
|
183
|
+
id: z.string().regex(DEVICE_KEY_PATTERN, ENDPOINT_ID_MESSAGE).default('main'),
|
|
178
184
|
/** matter.js device type names, e.g. `OnOffPlugInUnit`, `DimmableLight`; the first is the endpoint's type */
|
|
179
185
|
deviceTypes: z.array(z.string().min(1)).min(1),
|
|
180
186
|
/** cluster features to enable on top of the device types' defaults, e.g. `{PowerSource: ['Battery']}` */
|
|
@@ -194,6 +200,9 @@ export const SourceSchema = z
|
|
|
194
200
|
key: z.string().optional(),
|
|
195
201
|
version: z.string().optional(),
|
|
196
202
|
raw: z.unknown().optional(),
|
|
203
|
+
/** the baseline the importer generated when the device was adopted or last re-synced (a device without
|
|
204
|
+
its `source`): what tells the user's edits from the importer's output on the next re-sync */
|
|
205
|
+
baseline: z.unknown().optional(),
|
|
197
206
|
/** the discovered description disappeared; the device stays until removed by hand */
|
|
198
207
|
orphaned: z.boolean().optional(),
|
|
199
208
|
})
|
|
@@ -239,5 +248,8 @@ export const DeviceSchema = z
|
|
|
239
248
|
message: 'endpoint ids within a device must be unique',
|
|
240
249
|
path: ['endpoints'],
|
|
241
250
|
});
|
|
242
|
-
export const DevicesSchema = z.record(z.string().regex(DEVICE_KEY_PATTERN,
|
|
251
|
+
export const DevicesSchema = z.record(z.string().regex(DEVICE_KEY_PATTERN, DEVICE_KEY_MESSAGE), DeviceSchema, {
|
|
252
|
+
// zod reports a refused record key as "Invalid key in record"; say which rule it broke
|
|
253
|
+
error: (issue) => (issue.code === 'invalid_key' ? DEVICE_KEY_MESSAGE : undefined),
|
|
254
|
+
});
|
|
243
255
|
//# sourceMappingURL=schema.js.map
|
package/dist/model/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/model/schema.ts"],"names":[],"mappings":"AAAA;;;;;8FAK8F;AAE9F,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAE3C
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/model/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { mkdir, rename, writeFile } from 'node:fs/promises';
|
|
|
6
6
|
import { dirname } from 'node:path';
|
|
7
7
|
import { z } from 'zod';
|
|
8
8
|
import { ConfigSchema } from "../config/schema.js";
|
|
9
|
-
import { DEVICE_KEY_PATTERN, DeviceSchema } from "../model/schema.js";
|
|
9
|
+
import { DEVICE_KEY_MESSAGE, DEVICE_KEY_PATTERN, DeviceSchema } from "../model/schema.js";
|
|
10
10
|
import { HttpError } from "./http.js";
|
|
11
11
|
function isRecord(value) {
|
|
12
12
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
@@ -69,7 +69,7 @@ export class ConfigStore {
|
|
|
69
69
|
}
|
|
70
70
|
static checkKey(key) {
|
|
71
71
|
if (!DEVICE_KEY_PATTERN.test(key)) {
|
|
72
|
-
throw new HttpError(400,
|
|
72
|
+
throw new HttpError(400, `${key}: ${DEVICE_KEY_MESSAGE}`);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
/** store a device raw and return it parsed; the file is written */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/server/config-store.ts"],"names":[],"mappings":"AAAA;;;qGAGqG;AAErG,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,YAAY,EAAc,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAC,kBAAkB,EAAE,YAAY,EAAoB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/server/config-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ import type { Logger } from '../log.ts';
|
|
|
3
3
|
import type { DevicesInput } from '../model/schema.ts';
|
|
4
4
|
import type { TopicCache } from '../mqtt/topic-cache.ts';
|
|
5
5
|
export type { AdoptOptions, AdoptResult, SyncEntry };
|
|
6
|
+
/** the adopt options of every importer; `classes` only the Home Assistant importer takes */
|
|
7
|
+
export type ImporterAdoptOptions = ha.HaAdoptOptions;
|
|
6
8
|
export interface Importer {
|
|
7
9
|
readonly kind: 'z2m' | 'ha-discovery';
|
|
8
10
|
/** the topics to subscribe for the source */
|
|
@@ -14,7 +16,7 @@ export interface Importer {
|
|
|
14
16
|
/** what adopting would do to `devices`; nothing is touched */
|
|
15
17
|
diff(devices: DevicesInput): SyncEntry[];
|
|
16
18
|
/** the devices record after adopting, with the report */
|
|
17
|
-
adopt(devices: DevicesInput, options?:
|
|
19
|
+
adopt(devices: DevicesInput, options?: ImporterAdoptOptions): AdoptResult;
|
|
18
20
|
}
|
|
19
21
|
export declare class Z2mImporter implements Importer {
|
|
20
22
|
readonly kind: "z2m";
|
|
@@ -36,5 +38,5 @@ export declare class HaImporter implements Importer {
|
|
|
36
38
|
handle(topic: string, payload: Buffer): boolean;
|
|
37
39
|
load(cache: TopicCache): void;
|
|
38
40
|
diff(devices: DevicesInput): SyncEntry[];
|
|
39
|
-
adopt(devices: DevicesInput, options?:
|
|
41
|
+
adopt(devices: DevicesInput, options?: ImporterAdoptOptions): AdoptResult;
|
|
40
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importers.js","sourceRoot":"","sources":["../../src/server/importers.ts"],"names":[],"mappings":"AAAA;;;;mDAImD;AAEnD,OAAO,EAAsC,EAAE,EAAkB,GAAG,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"importers.js","sourceRoot":"","sources":["../../src/server/importers.ts"],"names":[],"mappings":"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"}
|
package/dist/server/server.d.ts
CHANGED
|
@@ -112,6 +112,11 @@ export declare class Server {
|
|
|
112
112
|
private importer;
|
|
113
113
|
/** the importers' reports over the file's devices, each entry tagged with its importer */
|
|
114
114
|
private adoptReport;
|
|
115
|
+
/**
|
|
116
|
+
* The `classes` of an adopt request — entity id → a binary sensor class, or null to clear the choice —
|
|
117
|
+
* checked against the entry's binary sensors without a class; undefined when none were sent.
|
|
118
|
+
*/
|
|
119
|
+
private chosenClasses;
|
|
115
120
|
/** write the devices an adoption changed into the file and the bridge; returns the keys written */
|
|
116
121
|
private applyAdoption;
|
|
117
122
|
private authRoutes;
|
package/dist/server/server.js
CHANGED
|
@@ -19,6 +19,8 @@ import { AuthConfigSchema } from "../config/schema.js";
|
|
|
19
19
|
import { Auth, hashPassword } from "./auth.js";
|
|
20
20
|
import { HttpError, Router, sendJson, serveStatic } from "./http.js";
|
|
21
21
|
import { Updater } from "./update.js";
|
|
22
|
+
import { BINARY_SENSOR_CLASSES } from "../importers/ha/generate.js";
|
|
23
|
+
import { deepEqual } from "../importers/patch.js";
|
|
22
24
|
import { loadPresets } from "./presets.js";
|
|
23
25
|
import { RuntimeStats } from "./stats.js";
|
|
24
26
|
import { previewCommand, previewStatus } from "./preview.js";
|
|
@@ -38,6 +40,10 @@ function isRecord(value) {
|
|
|
38
40
|
}
|
|
39
41
|
/** what answers without a login: the login itself, and what the UI needs to show it */
|
|
40
42
|
const PUBLIC_PATHS = new Set(['/api/auth', '/api/auth/login', '/api/auth/logout']);
|
|
43
|
+
/** a value as it would be written: undefined members dropped */
|
|
44
|
+
function asJson(value) {
|
|
45
|
+
return value === undefined ? undefined : JSON.parse(JSON.stringify(value));
|
|
46
|
+
}
|
|
41
47
|
function body(request) {
|
|
42
48
|
return isRecord(request.body) ? request.body : {};
|
|
43
49
|
}
|
|
@@ -457,6 +463,37 @@ export class Server {
|
|
|
457
463
|
const devices = this.store.rawDevices;
|
|
458
464
|
return this.importers().flatMap((importer) => importer.diff(devices).map((entry) => ({ ...entry, importer: importer.kind })));
|
|
459
465
|
}
|
|
466
|
+
/**
|
|
467
|
+
* The `classes` of an adopt request — entity id → a binary sensor class, or null to clear the choice —
|
|
468
|
+
* checked against the entry's binary sensors without a class; undefined when none were sent.
|
|
469
|
+
*/
|
|
470
|
+
chosenClasses(importer, key, devices, value) {
|
|
471
|
+
if (value === undefined) {
|
|
472
|
+
return undefined;
|
|
473
|
+
}
|
|
474
|
+
if (importer.kind !== 'ha-discovery') {
|
|
475
|
+
throw new HttpError(400, 'classes: only the Home Assistant importer takes them');
|
|
476
|
+
}
|
|
477
|
+
if (!isRecord(value)) {
|
|
478
|
+
throw new HttpError(400, 'classes: an object of entity id → class (or null)');
|
|
479
|
+
}
|
|
480
|
+
const open = new Set(importer
|
|
481
|
+
.diff(devices)
|
|
482
|
+
.find((e) => e.key === key)
|
|
483
|
+
?.unclassed?.map((e) => e.id) ?? []);
|
|
484
|
+
const classes = {};
|
|
485
|
+
for (const [entity, deviceClass] of Object.entries(value)) {
|
|
486
|
+
if (!open.has(entity)) {
|
|
487
|
+
throw new HttpError(400, `classes: ${key} has no binary sensor ${entity} without a class`);
|
|
488
|
+
}
|
|
489
|
+
if (deviceClass !== null &&
|
|
490
|
+
(typeof deviceClass !== 'string' || !Object.hasOwn(BINARY_SENSOR_CLASSES, deviceClass))) {
|
|
491
|
+
throw new HttpError(400, `classes: ${JSON.stringify(deviceClass)} is not one of ${Object.keys(BINARY_SENSOR_CLASSES).join(', ')}`);
|
|
492
|
+
}
|
|
493
|
+
classes[entity] = deviceClass;
|
|
494
|
+
}
|
|
495
|
+
return classes;
|
|
496
|
+
}
|
|
460
497
|
/** write the devices an adoption changed into the file and the bridge; returns the keys written */
|
|
461
498
|
async applyAdoption(before, after, only) {
|
|
462
499
|
const written = [];
|
|
@@ -464,7 +501,9 @@ export class Server {
|
|
|
464
501
|
if (only !== undefined && !only.has(key)) {
|
|
465
502
|
continue;
|
|
466
503
|
}
|
|
467
|
-
|
|
504
|
+
// the file's key order is the schema's, the importer's is its own: compare the content, or every
|
|
505
|
+
// re-sync would rewrite and rebuild every adopted device
|
|
506
|
+
if (deepEqual(asJson(before[key]), asJson(device))) {
|
|
468
507
|
continue;
|
|
469
508
|
}
|
|
470
509
|
await this.saveDevice(key, device);
|
|
@@ -611,6 +650,18 @@ export class Server {
|
|
|
611
650
|
});
|
|
612
651
|
this.authRoutes();
|
|
613
652
|
r.add('GET', '/api/devices', () => this.listDevices());
|
|
653
|
+
r.add('POST', '/api/devices', async (request, response) => {
|
|
654
|
+
// create only: an existing key is 409, so no client replaces a device by accident (PUT does)
|
|
655
|
+
const b = body(request);
|
|
656
|
+
const key = b.key;
|
|
657
|
+
if (typeof key !== 'string' || key === '') {
|
|
658
|
+
throw new HttpError(400, 'expected {key, device}');
|
|
659
|
+
}
|
|
660
|
+
if (this.app.config.devices[key] !== undefined) {
|
|
661
|
+
throw new HttpError(409, `a device with the key ${key} exists already`, { key });
|
|
662
|
+
}
|
|
663
|
+
sendJson(response, 201, await this.saveDevice(key, b.device));
|
|
664
|
+
});
|
|
614
665
|
r.add('GET', '/api/devices/:key', (request) => this.deviceJson(request.params.key ?? ''));
|
|
615
666
|
r.add('PUT', '/api/devices/:key', async (request) => {
|
|
616
667
|
return await this.saveDevice(request.params.key ?? '', request.body);
|
|
@@ -773,12 +824,14 @@ export class Server {
|
|
|
773
824
|
const force = b.force === true;
|
|
774
825
|
const replace = force && b.replace === true;
|
|
775
826
|
const before = structuredClone(this.store.rawDevices);
|
|
827
|
+
const classes = this.chosenClasses(importer, key, before, b.classes);
|
|
776
828
|
const { devices, report } = importer.adopt(before, {
|
|
777
829
|
keys: [key],
|
|
778
830
|
resync: true,
|
|
779
831
|
orphan: false,
|
|
780
832
|
force,
|
|
781
833
|
replace,
|
|
834
|
+
...(classes === undefined ? {} : { classes: { [key]: classes } }),
|
|
782
835
|
});
|
|
783
836
|
const entry = report.find((e) => e.key === key);
|
|
784
837
|
if (entry === undefined) {
|