mqtt2matter 0.3.1 → 0.4.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.
Files changed (77) hide show
  1. package/CHANGELOG.md +78 -0
  2. package/README.md +18 -0
  3. package/dist/config/schema.d.ts +2 -0
  4. package/dist/engine/payload.d.ts +6 -3
  5. package/dist/engine/payload.js +8 -1
  6. package/dist/engine/payload.js.map +1 -1
  7. package/dist/engine/runtime.js +4 -0
  8. package/dist/engine/runtime.js.map +1 -1
  9. package/dist/engine/template.d.ts +1 -20
  10. package/dist/engine/template.js +4 -263
  11. package/dist/engine/template.js.map +1 -1
  12. package/dist/families/color.d.ts +3 -22
  13. package/dist/families/color.js +7 -144
  14. package/dist/families/color.js.map +1 -1
  15. package/dist/families/cover.js +52 -26
  16. package/dist/families/cover.js.map +1 -1
  17. package/dist/families/fan.d.ts +2 -0
  18. package/dist/families/fan.js +17 -0
  19. package/dist/families/fan.js.map +1 -1
  20. package/dist/families/index.d.ts +2 -0
  21. package/dist/families/index.js +2 -1
  22. package/dist/families/index.js.map +1 -1
  23. package/dist/importers/ha/areas.d.ts +1 -6
  24. package/dist/importers/ha/areas.js +5 -278
  25. package/dist/importers/ha/areas.js.map +1 -1
  26. package/dist/importers/ha/generate.d.ts +13 -1
  27. package/dist/importers/ha/generate.js +47 -4
  28. package/dist/importers/ha/generate.js.map +1 -1
  29. package/dist/importers/ha/source.d.ts +11 -9
  30. package/dist/importers/ha/source.js +22 -63
  31. package/dist/importers/ha/source.js.map +1 -1
  32. package/dist/importers/ha/sync.d.ts +11 -1
  33. package/dist/importers/ha/sync.js +88 -26
  34. package/dist/importers/ha/sync.js.map +1 -1
  35. package/dist/importers/ha/templates.d.ts +3 -14
  36. package/dist/importers/ha/templates.js +7 -248
  37. package/dist/importers/ha/templates.js.map +1 -1
  38. package/dist/importers/ha/types.d.ts +2 -78
  39. package/dist/importers/ha/types.js +1 -472
  40. package/dist/importers/ha/types.js.map +1 -1
  41. package/dist/importers/sync.d.ts +18 -1
  42. package/dist/importers/sync.js +35 -6
  43. package/dist/importers/sync.js.map +1 -1
  44. package/dist/importers/z2m/generate.js +1 -1
  45. package/dist/importers/z2m/generate.js.map +1 -1
  46. package/dist/matter/bridge.js +1 -1
  47. package/dist/matter/bridge.js.map +1 -1
  48. package/dist/matter/ids.d.ts +1 -1
  49. package/dist/matter/ids.js +2 -2
  50. package/dist/matter/ids.js.map +1 -1
  51. package/dist/model/options.d.ts +2 -0
  52. package/dist/model/options.js +8 -3
  53. package/dist/model/options.js.map +1 -1
  54. package/dist/model/schema.d.ts +13 -1
  55. package/dist/model/schema.js +16 -4
  56. package/dist/model/schema.js.map +1 -1
  57. package/dist/mqtt/client.d.ts +17 -3
  58. package/dist/mqtt/client.js +70 -13
  59. package/dist/mqtt/client.js.map +1 -1
  60. package/dist/server/config-store.js +2 -2
  61. package/dist/server/config-store.js.map +1 -1
  62. package/dist/server/importers.d.ts +4 -2
  63. package/dist/server/importers.js.map +1 -1
  64. package/dist/server/server.d.ts +5 -0
  65. package/dist/server/server.js +42 -1
  66. package/dist/server/server.js.map +1 -1
  67. package/docs/api.md +5 -5
  68. package/docs/architecture.md +1 -1
  69. package/docs/config.md +26 -20
  70. package/docs/importers.md +43 -17
  71. package/package.json +3 -2
  72. package/ui/dist/assets/index-Bl_bpL_0.js +10 -0
  73. package/ui/dist/assets/index-DsAb-xhK.css +1 -0
  74. package/ui/dist/index.html +2 -2
  75. package/ui/dist/licenses.json +1 -1
  76. package/ui/dist/assets/index-1HdbTkGD.css +0 -1
  77. package/ui/dist/assets/index-CoG5Wu5Q.js +0 -10
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/model/schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/model/schema.ts"],"names":[],"mappings":"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"}
@@ -8,9 +8,12 @@ export interface MqttOptions {
8
8
  clientId?: string | undefined;
9
9
  /** ms between reconnects (mqtt.js default 1000) */
10
10
  reconnectPeriod?: number;
11
- /** ms to wait for the first connection in `connect()`; default 30 s */
11
+ /** ms to wait for the first connection in `connect()`; default: wait until the broker is there */
12
12
  connectTimeout?: number;
13
13
  }
14
+ /** the first connection error is logged at once, the next ones after 10 s, 20 s, 40 s … at most every 10 min */
15
+ export declare const ERROR_LOG_FIRST_DELAY_MS = 10000;
16
+ export declare const ERROR_LOG_MAX_DELAY_MS = 600000;
14
17
  export interface PublishOptions {
15
18
  retain?: boolean;
16
19
  qos?: 0 | 1 | 2;
@@ -18,7 +21,6 @@ export interface PublishOptions {
18
21
  export interface MqttEvents {
19
22
  connect: [];
20
23
  close: [];
21
- error: [Error];
22
24
  message: [topic: string, payload: Buffer, retain: boolean];
23
25
  }
24
26
  export declare class MqttClient extends EventEmitter<MqttEvents> {
@@ -27,10 +29,22 @@ export declare class MqttClient extends EventEmitter<MqttEvents> {
27
29
  private readonly log;
28
30
  private client;
29
31
  private readonly subscriptions;
32
+ /** connection errors since the last one logged */
33
+ private suppressedErrors;
34
+ private nextErrorLog;
35
+ private errorLogDelay;
36
+ private wasConnected;
37
+ private abortConnect;
30
38
  constructor(options: MqttOptions, log: Logger);
31
39
  get connected(): boolean;
32
- /** connect and resolve on the first CONNACK; rejects after `connectTimeout` or on a refused connection */
40
+ /**
41
+ * Connect and resolve on the first CONNACK. Without `connectTimeout` it waits as long as the broker is away
42
+ * (mqtt.js retries every `reconnectPeriod`); with one it rejects after that time, naming the last error.
43
+ */
33
44
  connect(): Promise<void>;
45
+ /** log a connection error now, or count it until the backoff has passed */
46
+ private logError;
47
+ private resetErrorLog;
34
48
  /** subscribe once; mqtt.js re-subscribes after a reconnect (clean session, so we keep the list ourselves too) */
35
49
  subscribe(topic: string): Promise<void>;
36
50
  publish(topic: string, payload: string | Buffer, options?: PublishOptions): Promise<void>;
@@ -1,14 +1,25 @@
1
1
  /* The MQTT connection: mqtt.js with reconnect, the subscriptions it re-establishes itself, a message
2
- event with the raw payload, and the topic cache fed with everything that arrives. */
2
+ event with the raw payload, and the topic cache fed with everything that arrives. A connection error never
3
+ ends the process: mqtt.js keeps reconnecting, and the errors are logged with a backoff so a broker that is
4
+ away for hours does not fill the log. */
3
5
  import { EventEmitter } from 'node:events';
4
6
  import mqtt, {} from 'mqtt';
5
7
  import { TopicCache } from "./topic-cache.js";
8
+ /** the first connection error is logged at once, the next ones after 10 s, 20 s, 40 s … at most every 10 min */
9
+ export const ERROR_LOG_FIRST_DELAY_MS = 10_000;
10
+ export const ERROR_LOG_MAX_DELAY_MS = 600_000;
6
11
  export class MqttClient extends EventEmitter {
7
12
  cache = new TopicCache();
8
13
  options;
9
14
  log;
10
15
  client;
11
16
  subscriptions = new Set();
17
+ /** connection errors since the last one logged */
18
+ suppressedErrors = 0;
19
+ nextErrorLog = 0;
20
+ errorLogDelay = ERROR_LOG_FIRST_DELAY_MS;
21
+ wasConnected = false;
22
+ abortConnect;
12
23
  constructor(options, log) {
13
24
  super();
14
25
  this.options = options;
@@ -17,7 +28,10 @@ export class MqttClient extends EventEmitter {
17
28
  get connected() {
18
29
  return this.client?.connected ?? false;
19
30
  }
20
- /** connect and resolve on the first CONNACK; rejects after `connectTimeout` or on a refused connection */
31
+ /**
32
+ * Connect and resolve on the first CONNACK. Without `connectTimeout` it waits as long as the broker is away
33
+ * (mqtt.js retries every `reconnectPeriod`); with one it rejects after that time, naming the last error.
34
+ */
21
35
  async connect() {
22
36
  if (this.client !== undefined) {
23
37
  return;
@@ -35,36 +49,77 @@ export class MqttClient extends EventEmitter {
35
49
  }
36
50
  const client = mqtt.connect(this.options.url, clientOptions);
37
51
  this.client = client;
52
+ let lastError;
38
53
  client.on('connect', () => {
39
- this.log.info(`connected to ${this.options.url}`);
54
+ const errors = this.suppressedErrors;
55
+ this.resetErrorLog();
56
+ this.wasConnected = true;
57
+ this.log.info(`connected to ${this.options.url}${errors > 0 ? ` (${errors} more connection error(s) not logged)` : ''}`);
40
58
  this.emit('connect');
41
59
  });
42
60
  client.on('close', () => {
43
- this.log.warn(`connection to ${this.options.url} closed`);
61
+ // mqtt.js closes after every failed attempt too; only losing a connection is worth a line
62
+ if (this.wasConnected) {
63
+ this.wasConnected = false;
64
+ this.log.warn(`connection to ${this.options.url} closed, reconnecting`);
65
+ }
44
66
  this.emit('close');
45
67
  });
46
68
  client.on('error', (error) => {
47
- this.log.error('mqtt error', error);
48
- this.emit('error', error);
69
+ lastError = error;
70
+ this.logError(error);
49
71
  });
50
72
  client.on('message', (topic, payload, packet) => {
51
73
  this.cache.store(topic, payload, packet.retain);
52
74
  this.emit('message', topic, payload, packet.retain);
53
75
  });
54
76
  await new Promise((resolve, reject) => {
55
- const timeout = setTimeout(() => {
56
- reject(new Error(`no connection to ${this.options.url} within ${this.options.connectTimeout ?? 30_000} ms`));
57
- }, this.options.connectTimeout ?? 30_000);
77
+ const timeoutMs = this.options.connectTimeout;
78
+ const timeout = timeoutMs === undefined
79
+ ? undefined
80
+ : setTimeout(() => {
81
+ this.abortConnect = undefined;
82
+ reject(new Error(`no connection to ${this.options.url} within ${timeoutMs} ms` +
83
+ (lastError === undefined ? '' : `: ${lastError.message}`)));
84
+ }, timeoutMs);
85
+ this.abortConnect = (error) => {
86
+ clearTimeout(timeout);
87
+ reject(error);
88
+ };
89
+ const waiting = setTimeout(() => {
90
+ if (!client.connected) {
91
+ this.log.warn(`waiting for the broker at ${this.options.url}`);
92
+ }
93
+ }, 2000);
94
+ waiting.unref();
58
95
  client.once('connect', () => {
59
96
  clearTimeout(timeout);
97
+ clearTimeout(waiting);
98
+ this.abortConnect = undefined;
60
99
  resolve();
61
100
  });
62
- client.once('error', (error) => {
63
- clearTimeout(timeout);
64
- reject(error);
65
- });
66
101
  });
67
102
  }
103
+ /** log a connection error now, or count it until the backoff has passed */
104
+ logError(error) {
105
+ const now = Date.now();
106
+ if (now < this.nextErrorLog) {
107
+ this.suppressedErrors += 1;
108
+ return;
109
+ }
110
+ const more = this.suppressedErrors;
111
+ this.suppressedErrors = 0;
112
+ this.nextErrorLog = now + this.errorLogDelay;
113
+ this.log.error(`mqtt error: ${error.message}` +
114
+ (more > 0 ? ` (and ${more} more since the last one logged)` : '') +
115
+ `; retrying, the next error is logged in ${Math.round(this.errorLogDelay / 1000)} s at the earliest`);
116
+ this.errorLogDelay = Math.min(this.errorLogDelay * 2, ERROR_LOG_MAX_DELAY_MS);
117
+ }
118
+ resetErrorLog() {
119
+ this.suppressedErrors = 0;
120
+ this.nextErrorLog = 0;
121
+ this.errorLogDelay = ERROR_LOG_FIRST_DELAY_MS;
122
+ }
68
123
  /** subscribe once; mqtt.js re-subscribes after a reconnect (clean session, so we keep the list ourselves too) */
69
124
  async subscribe(topic) {
70
125
  if (this.subscriptions.has(topic)) {
@@ -86,6 +141,8 @@ export class MqttClient extends EventEmitter {
86
141
  async close() {
87
142
  const client = this.client;
88
143
  this.client = undefined;
144
+ this.abortConnect?.(new Error('closed before the broker was reached'));
145
+ this.abortConnect = undefined;
89
146
  if (client !== undefined) {
90
147
  await client.endAsync();
91
148
  }
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mqtt/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mqtt/client.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, 'a device key is 1–64 characters of A–Z a–z 0–9 : . _ -');
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;AACvF,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAEpC,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAUD,uEAAuE;AACvE,MAAM,CAAC,MAAM,aAAa,GAAG;IACzB,MAAM;IACN,SAAS;IACT,KAAK;IACL,UAAU;IACV,WAAW;IACX,SAAS;IACT,QAAQ;IACR,SAAS;IACT,WAAW;CACL,CAAC;AAEX,MAAM,OAAO,WAAW;IACX,IAAI,CAAS;IACb,GAAG,CAA0B;IAC7B,MAAM,CAAS;IACf,UAAU,CAAoB;IAC/B,OAAO,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAEnD,YAAY,OAA2B;QACnC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,4CAA4C;IAC5C,IAAI,UAAU;QACV,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QACjC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,SAAS,CAAC,GAAW;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,6DAA6D;IAC7D,WAAW;QACP,MAAM,QAAQ,GAA4B,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC9B,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,+EAA+E;IAC/E,MAAM,CAAC,WAAW,CAAC,GAAY;QAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,uBAAuB,EAAE;gBAC9C,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACxC,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;oBACtC,OAAO,EAAE,KAAK,CAAC,OAAO;iBACzB,CAAC,CAAC;aACN,CAAC,CAAC;QACP,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAW;QACvB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,wDAAwD,CAAC,CAAC;QACvF,CAAC;IACL,CAAC;IAED,mEAAmE;IACnE,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,GAAY;QACtC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC;QAChC,gEAAgE;QAChE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,8EAA8E;IAC9E,KAAK,CAAC,YAAY,CAAC,GAAY;QAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,gCAAgC,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,IAAI,GAA4B,EAAC,GAAG,IAAI,CAAC,GAAG,EAAC,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBACzB,gEAAgE;gBAChE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,EAAC,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,EAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,EAAE,GAAG,CAAC,MAA+B,EAAE,IAAY,EAAW,EAAE,CAClE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAU,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QACxG,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gBACxE,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,uDAAuD,CAAC,CAAC;YAC7F,CAAC;QACL,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC1B,gEAAgE;gBAChE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,uFAAuF;IACvF,KAAK,CAAC,cAAc,CAAC,GAA4B;QAC7C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,4EAA4E;IAC5E,KAAK,CAAC,KAAK;QACP,MAAM,GAAG,GAAG,KAAK,IAAmB,EAAE;YAClC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;YACnD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,MAAM,CAAC;YAC9C,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,OAAO,CAAC;IACvB,CAAC;CACJ"}
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,kBAAkB,EAAE,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AAC3G,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAEpC,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAUD,uEAAuE;AACvE,MAAM,CAAC,MAAM,aAAa,GAAG;IACzB,MAAM;IACN,SAAS;IACT,KAAK;IACL,UAAU;IACV,WAAW;IACX,SAAS;IACT,QAAQ;IACR,SAAS;IACT,WAAW;CACL,CAAC;AAEX,MAAM,OAAO,WAAW;IACX,IAAI,CAAS;IACb,GAAG,CAA0B;IAC7B,MAAM,CAAS;IACf,UAAU,CAAoB;IAC/B,OAAO,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAEnD,YAAY,OAA2B;QACnC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,4CAA4C;IAC5C,IAAI,UAAU;QACV,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QACjC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,SAAS,CAAC,GAAW;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,6DAA6D;IAC7D,WAAW;QACP,MAAM,QAAQ,GAA4B,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC9B,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,+EAA+E;IAC/E,MAAM,CAAC,WAAW,CAAC,GAAY;QAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,uBAAuB,EAAE;gBAC9C,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACxC,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;oBACtC,OAAO,EAAE,KAAK,CAAC,OAAO;iBACzB,CAAC,CAAC;aACN,CAAC,CAAC;QACP,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAW;QACvB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,kBAAkB,EAAE,CAAC,CAAC;QAC9D,CAAC;IACL,CAAC;IAED,mEAAmE;IACnE,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,GAAY;QACtC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC;QAChC,gEAAgE;QAChE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,8EAA8E;IAC9E,KAAK,CAAC,YAAY,CAAC,GAAY;QAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,gCAAgC,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,IAAI,GAA4B,EAAC,GAAG,IAAI,CAAC,GAAG,EAAC,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBACzB,gEAAgE;gBAChE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,EAAC,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,EAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,EAAE,GAAG,CAAC,MAA+B,EAAE,IAAY,EAAW,EAAE,CAClE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAU,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QACxG,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gBACxE,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,uDAAuD,CAAC,CAAC;YAC7F,CAAC;QACL,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC1B,gEAAgE;gBAChE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,uFAAuF;IACvF,KAAK,CAAC,cAAc,CAAC,GAA4B;QAC7C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,4EAA4E;IAC5E,KAAK,CAAC,KAAK;QACP,MAAM,GAAG,GAAG,KAAK,IAAmB,EAAE;YAClC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;YACnD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,MAAM,CAAC;YAC9C,MAAM,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,OAAO,CAAC;IACvB,CAAC;CACJ"}
@@ -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?: AdoptOptions): AdoptResult;
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?: AdoptOptions): AdoptResult;
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":"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"}
1
+ {"version":3,"file":"importers.js","sourceRoot":"","sources":["../../src/server/importers.ts"],"names":[],"mappings":"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"}
@@ -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;
@@ -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
- if (JSON.stringify(before[key]) === JSON.stringify(device)) {
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);
@@ -785,12 +824,14 @@ export class Server {
785
824
  const force = b.force === true;
786
825
  const replace = force && b.replace === true;
787
826
  const before = structuredClone(this.store.rawDevices);
827
+ const classes = this.chosenClasses(importer, key, before, b.classes);
788
828
  const { devices, report } = importer.adopt(before, {
789
829
  keys: [key],
790
830
  resync: true,
791
831
  orphan: false,
792
832
  force,
793
833
  replace,
834
+ ...(classes === undefined ? {} : { classes: { [key]: classes } }),
794
835
  });
795
836
  const entry = report.find((e) => e.key === key);
796
837
  if (entry === undefined) {